From 4760e46538dfd76afdab51da564f92b7902c8b91 Mon Sep 17 00:00:00 2001
From: "EinvalSledge@gmail.com"
 <EinvalSledge@gmail.com@a0fa61bc-5347-0410-a1a9-7f54aa4e1825>
Date: Wed, 26 Sep 2012 16:14:30 +0000
Subject: [PATCH]   * Clean up movement to eyeD3, remove id3v2 remnants. Thanks
 to vskytta     for the patch. Closes issue 74.

git-svn-id: http://abcde.googlecode.com/svn/trunk@368 a0fa61bc-5347-0410-a1a9-7f54aa4e1825
---
 README     | 2 +-
 abcde      | 6 ++----
 abcde.1    | 8 ++++----
 abcde.conf | 4 ++--
 changelog  | 2 ++
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/README b/README
index 264b577..e482178 100644
--- a/README
+++ b/README
@@ -216,7 +216,7 @@ abcde requires the following backend tools to work:
   It's available in Debian or http://linukz.org/cd-discid.shtml
 * An HTTP retrieval program: wget, fetch (FreeBSD) or curl (MacOSX)
 * id3, an id3 tagging program. Available at: http://lly.org/~rcw/id3/
-* id3v2, an id3 version 2.0 tagger. http://id3v2.sourceforge.net/
+* eyeD3, an id3 version 2.0 tagger. http://eyed3.nicfit.net/
 * (optional) distmp3, a client/server for distributed mp3 encoding.
   You can get distmp3 at http://wlug.westbo.se/medlprog/medlprog.html
 
diff --git a/abcde b/abcde
index f9ea19f..b2d31d0 100755
--- a/abcde
+++ b/abcde
@@ -3206,7 +3206,6 @@ MPPENC=mppenc
 AACENC=faac
 
 ID3=id3
-ID3V2=id3v2
 EYED3=eyeD3
 VORBISCOMMENT=vorbiscomment
 METAFLAC=metaflac
@@ -3258,7 +3257,7 @@ MPPENCOPTS=
 AACENCOPTS=
 
 ID3OPTS=
-ID3V2OPTS=
+EYED3OPTS="--set-encoding=utf16-LE"
 CDPARANOIAOPTS=
 CDDA2WAVOPTS=
 DAGRABOPTS=
@@ -3874,9 +3873,8 @@ if [ "$ID3TAGV" = "1" ]; then
 	TAGGEROPTS="$ID3OPTS"
 else
 	TAGGER="$EYED3"
-	TAGGEROPTS="$ID3V2OPTS"
+	TAGGEROPTS="$EYED3OPTS"
 	ID3SYNTAX=eyed3
-	TAGGEROPTS="--set-encoding=utf16-LE $ID3V2OPTS"
 fi
 
 # NOGAP is specific to lame. Other encoders fail ...
diff --git a/abcde.1 b/abcde.1
index a3be57b..446becc 100644
--- a/abcde.1
+++ b/abcde.1
@@ -357,7 +357,7 @@ with \fBdistmp3\fR (DISTMP3NICE).
 .B PATHNAMES
 The following configuration file options specify the pathnames of their
 respective utilities: LAME, TOOLAME, GOGO, BLADEENC, L3ENC, XINGMP3ENC, MP3ENC,
-VORBIZE, OGGENC, FLAC, SPEEXENC, MPPENC, AACEND, ID3, ID3V2, EYED3, METAFLAC,
+VORBIZE, OGGENC, FLAC, SPEEXENC, MPPENC, AACEND, ID3, EYED3, EYED3, METAFLAC,
 CDPARANOIA, CDDA2WAV, CDDAFS, CDDISCID, CDDBTOOL, EJECT, MD5SUM, DISTMP3,
 VORBISCOMMENT, NORMALIZE, CDSPEED, MP3GAIN, VORBISGAIN, MPPGAIN, MKCUE, MKTOC,
 CUE2DISCID (see option "\-X"), DIFF and HTTPGET.
@@ -366,7 +366,7 @@ CUE2DISCID (see option "\-X"), DIFF and HTTPGET.
 If you wish to specify command-line options to any of the programs \fBabcde\fR uses,
 set the following configuration file options: LAMEOPTS, TOOLAMEOPTS, GOGOOPTS,
 BLADEENCOPTS, L3ENCOPTS, XINGMP3ENCOPTS, MP3ENCOPTS, VORBIZEOPTS, OGGENCOPTS,
-FLACOPTS, SPEEXENCOPTS, MPPENCOPTS, AACENCOPTS, ID3OPTS, ID3V2OPTS, MP3GAINOPTS,
+FLACOPTS, SPEEXENCOPTS, MPPENCOPTS, AACENCOPTS, ID3OPTS, EYED3OPTS, MP3GAINOPTS,
 CDPARANOIAOPTS, CDDA2WAVOPTS, CDDAFSOPTS, CDDBTOOLOPTS, EJECTOPTS, DISTMP3OPTS,
 NORMALIZEOPTS, CDSPEEDOPTS, MKCUEOPTS, VORBISCOMMMENTOPTS, METAFLACOPTS,
 DIFFOPTS, FLACGAINOPTS, VORBISGAINOPTS and HTTPGETOPTS.
@@ -566,7 +566,7 @@ Perl and some Musicbrainz libraries) can be used to retrieve CDDB
 information about the CD.
 .TP
 .B *
-(for MP3s) id3 or id3v2, id3 v1 and v2 tagging programs.
+(for MP3s) id3 or eyeD3, id3 v1 and v2 tagging programs.
 .TP
 .B *
 (optional) distmp3, a client/server for distributed mp3 encoding.
@@ -593,7 +593,7 @@ information about the CD.
 .BR mppenc (1),
 .BR faac (1),
 .BR id3 (1),
-.BR id3v2 (1),
+.BR eyeD3 (1),
 .BR wget (1),
 .BR fetch (1),
 .BR cd-discid (1),
diff --git a/abcde.conf b/abcde.conf
index 033146e..3abab9c 100644
--- a/abcde.conf
+++ b/abcde.conf
@@ -130,7 +130,7 @@
 #AACENC=faac
 
 #ID3=id3
-#ID3V2=id3v2
+#EYED3=eyeD3
 #CDPARANOIA=cdparanoia
 #CDDA2WAV=icedax
 #CDDAFS=cp
@@ -188,7 +188,7 @@
 #AACENCOPTS=
 
 #ID3OPTS=
-#ID3V2OPTS=
+#EYED3OPTS="--set-encoding=utf16-LE"
 #CDPARANOIAOPTS=
 #CDDA2WAVOPTS=
 #CDDAFSOPTS="-f"
diff --git a/changelog b/changelog
index 227c211..678d59b 100644
--- a/changelog
+++ b/changelog
@@ -4,6 +4,8 @@ abcde 2.5.5
     Closes issue 71.
   * USEID3 and USEID3V2 variables are unused now, so remove them. Thanks
     to vskytta for the patch. Closes issue 73.
+  * Clean up movement to eyeD3, remove id3v2 remnants. Thanks to vskytta
+    for the patch. Closes issue 74.
 
  -- Steve McIntyre <93sam@debian.org>  Tue, 18 Sep 2012 12:42:11 +0100
 
-- 
2.20.1