nls fix thanks again to Daniel Drake, fixing bug #47373 by Jordan <lx_xero@comcast.net>

5 files changed, 23 insertions, 16 deletions

diff --git a/media-sound/easytag/ChangeLog b/media-sound/easytag/ChangeLog
index 03a3726ff5c4..6ca97b4ba12e 100644
--- a/media-sound/easytag/ChangeLog
+++ b/media-sound/easytag/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/easytag
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/easytag/ChangeLog,v 1.20 2004/04/09 16:18:40 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/easytag/ChangeLog,v 1.21 2004/04/09 22:39:57 seemant Exp $
+
+*easytag-0.31_pre2-r1 (09 Apr 2004)
+
+  09 Apr 2004; Seemant Kulleen <seemant@gentoo.org>
+  easytag-0.31_pre2-r1.ebuild, easytag-0.31_pre2.ebuild:
+  nls fix thanks again to Daniel Drake, fixing bug #47373 by Jordan
+  <lx_xero@comcast.net>
 
   09 Apr 2004; Seemant Kulleen <seemant@gentoo.org> easytag-0.30c.ebuild,
   easytag-0.30d.ebuild, easytag-0.31_pre2.ebuild:
diff --git a/media-sound/easytag/Manifest b/media-sound/easytag/Manifest
index afba150fd16a..63119aa74839 100644
--- a/media-sound/easytag/Manifest
+++ b/media-sound/easytag/Manifest
@@ -1,9 +1,9 @@
-MD5 e4206ae8adaf533931ba97176828104d ChangeLog 3947
-MD5 bb581b933b5ec0e4238fedc55168fedc easytag-0.30c.ebuild 1480
 MD5 4b3530d67c2f286baea4cf70a36e57f3 easytag-0.30d.ebuild 1598
+MD5 de437313ce6040393bebecbfc01ec201 easytag-0.31_pre2-r1.ebuild 1825
+MD5 bb581b933b5ec0e4238fedc55168fedc easytag-0.30c.ebuild 1480
+MD5 69b6ad159737cf5c0d1338e5f958a92e ChangeLog 4186
 MD5 b8ca490eb4cbf24dca497d295311e4ac metadata.xml 317
-MD5 fae6993113f576c00ad87b2e270420ab easytag-0.31_pre2.ebuild 1819
+MD5 74413f66c0d8b3d33e33a147394de9e7 files/digest-easytag-0.31_pre2-r1 138
 MD5 e032b0a7fe4897ec0e7dad2ef9002639 files/digest-easytag-0.30c 278
 MD5 0dc3e112a9f2e10861c7608a584f9423 files/digest-easytag-0.30d 349
-MD5 0d0b0d688540cb0de56dafcbb17d9583 files/digest-easytag-0.31_pre2 138
 MD5 a767d8be7a9435927acebb4b1ca9df4c files/easytag-0.30.2-fix-configure.patch 648
diff --git a/media-sound/easytag/easytag-0.31_pre2.ebuild b/media-sound/easytag/easytag-0.31_pre2-r1.ebuild
index 6151120588ac..3341022426cc 100644
--- a/media-sound/easytag/easytag-0.31_pre2.ebuild
+++ b/media-sound/easytag/easytag-0.31_pre2-r1.ebuild
@@ -1,25 +1,27 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/easytag/easytag-0.31_pre2.ebuild,v 1.4 2004/04/09 17:49:42 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/easytag/easytag-0.31_pre2-r1.ebuild,v 1.1 2004/04/09 22:39:57 seemant Exp $
 
 IUSE="nls oggvorbis flac gtk2"
 
 MY_PV=${PV/1_pre/0.}
 MY_P=${PN}-${MY_PV}
+DSD_PATCH=${MY_P}-dsd2.patch
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="EasyTAG mp3/ogg ID3 tag editor"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
-	gtk2? http://www.reactivated.net/patches/easytag-0.30/${MY_P}-dsd1.patch"
+	gtk2? http://www.reactivated.net/patches/easytag-0.30/${DSD_PATCH}"
 HOMEPAGE="http://easytag.sourceforge.net/"
 
-RDEPEND=">=sys-devel/autoconf-2.53
-	>=media-libs/id3lib-3.8.2
-	gtk2? ( >=x11-libs/gtk+-2.4.0 )
+RDEPEND=">=media-libs/id3lib-3.8.2
+	gtk2? ( =x11-libs/gtk+-2.4* )
 	!gtk2? ( =x11-libs/gtk+-1.2* )
 	flac? ( >=media-libs/flac-1.1.0 )
 	oggvorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
 
 DEPEND="${RDEPEND}
+	>=sys-devel/automake-1.7*
+	>=sys-devel/autoconf-2.5*
 	>=sys-apps/sed-4.0.5"
 
 SLOT="0"
@@ -30,7 +32,7 @@ src_unpack() {
 	unpack ${MY_P}.tar.bz2
 	cd ${S}
 	if [ `use gtk2` ] ; then
-		epatch ${DISTDIR}/${MY_P}-dsd1.patch
+		epatch ${DISTDIR}/${DSD_PATCH}
 		export WANT_AUTOMAKE=1.7
 		export WANT_AUTOCONF=2.5
 		ebegin "Remaking configure script (be patient)"
@@ -46,10 +48,8 @@ src_unpack() {
 src_compile() {
 	local myconf
 
-	#use_enable breaks this
-	use oggvorbis || myconf="--disable-ogg"
-
 	econf \
+	`use_enable oggvorbis ogg` \
 	`use_enable nls` \
 	`use_enable flac` \
 	${myconf} || die "econf failed"
diff --git a/media-sound/easytag/files/digest-easytag-0.31_pre2 b/media-sound/easytag/files/digest-easytag-0.31_pre2
deleted file mode 100644
index b334112480c1..000000000000
--- a/media-sound/easytag/files/digest-easytag-0.31_pre2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 5e80c60db9eda3c3dfc79110359c0554 easytag-0.30.2.tar.bz2 1049767
-MD5 ae7faff1c3586e9c9de1929920d0821f easytag-0.30.2-dsd1.patch 754742
diff --git a/media-sound/easytag/files/digest-easytag-0.31_pre2-r1 b/media-sound/easytag/files/digest-easytag-0.31_pre2-r1
new file mode 100644
index 000000000000..aeeb880a48c5
--- /dev/null
+++ b/media-sound/easytag/files/digest-easytag-0.31_pre2-r1
@@ -0,0 +1,2 @@
+MD5 5e80c60db9eda3c3dfc79110359c0554 easytag-0.30.2.tar.bz2 1049767
+MD5 742ac1fa502145e1a00cf799f73b2902 easytag-0.30.2-dsd2.patch 756353