Version bump closes bug #50010.

7 files changed, 75 insertions, 42 deletions

diff --git a/media-sound/id3v2/ChangeLog b/media-sound/id3v2/ChangeLog
index 137e6e4059dd..0f6a36d3585e 100644
--- a/media-sound/id3v2/ChangeLog
+++ b/media-sound/id3v2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/id3v2
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/id3v2/ChangeLog,v 1.12 2004/04/21 14:13:04 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/id3v2/ChangeLog,v 1.13 2004/05/04 19:25:18 eradicator Exp $
+
+*id3v2-0.1.10 (04 May 2004)
+
+  04 May 2004; Jeremy Huddleston <eradicator@gentoo.org> id3v2-0.1.10.ebuild,
+  id3v2-0.1.9.ebuild, files/id3v2-0.1.10-noinline.patch:
+  Version bump closes bug #50010.
 
   21 Apr 2004; Gustavo Zacarias <gustavoz@gentoo.org> id3v2-0.1.9-r1.ebuild:
   keyworded sparc
diff --git a/media-sound/id3v2/Manifest b/media-sound/id3v2/Manifest
index 5b2ead436b89..a7ccb73a258d 100644
--- a/media-sound/id3v2/Manifest
+++ b/media-sound/id3v2/Manifest
@@ -1,9 +1,10 @@
-MD5 03b3d42777d5c6334681d9275760bddd ChangeLog 1613
 MD5 f2ecb2259eb875a8d938ca3dc77c6f78 id3v2-0.1.7.ebuild 760
+MD5 f923a3345523742b64210650c1dfb923 id3v2-0.1.10.ebuild 1040
 MD5 ba2f3cb21541df67cfd45096ba5f75dc id3v2-0.1.9-r1.ebuild 950
-MD5 32d854a4f8e9e238b8d9ae3e7e9edb01 id3v2-0.1.9.ebuild 783
+MD5 4563ffa41b861ebb7145eb2a490e63f1 ChangeLog 1814
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 d99b419340bbb9a9027cbf9a6f70c0ac files/digest-id3v2-0.1.7 62
-MD5 c6d37db10f48d3d1bd9a5ff283f8095d files/digest-id3v2-0.1.9 62
+MD5 faa1968a6beab48f51e58bfc2cb66bf2 files/digest-id3v2-0.1.10 63
 MD5 c6d37db10f48d3d1bd9a5ff283f8095d files/digest-id3v2-0.1.9-r1 62
+MD5 d83139c5005dc921def0cf8550f53526 files/id3v2-0.1.10-noinline.patch 491
 MD5 735e277d7328b86d3b121b158473d939 files/id3v2-0.1.9-alpha.patch 679
diff --git a/media-sound/id3v2/files/digest-id3v2-0.1.10 b/media-sound/id3v2/files/digest-id3v2-0.1.10
new file mode 100644
index 000000000000..9f35fe6973d3
--- /dev/null
+++ b/media-sound/id3v2/files/digest-id3v2-0.1.10
@@ -0,0 +1 @@
+MD5 a4a5130e49b6451ced32e208a2f9aeab id3v2-0.1.10.tar.gz 26419
diff --git a/media-sound/id3v2/files/digest-id3v2-0.1.9 b/media-sound/id3v2/files/digest-id3v2-0.1.9
deleted file mode 100644
index 5906a6bd07f2..000000000000
--- a/media-sound/id3v2/files/digest-id3v2-0.1.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 544862d82224312595bf5a45422d1a49 id3v2-0.1.9.tar.gz 21144
diff --git a/media-sound/id3v2/files/id3v2-0.1.10-noinline.patch b/media-sound/id3v2/files/id3v2-0.1.10-noinline.patch
new file mode 100644
index 000000000000..f1aa3647b079
--- /dev/null
+++ b/media-sound/id3v2/files/id3v2-0.1.10-noinline.patch
@@ -0,0 +1,17 @@
+--- genre.cpp.orig	2004-05-04 12:13:01.548353000 -0700
++++ genre.cpp	2004-05-04 12:14:32.018353000 -0700
+@@ -200,12 +200,12 @@
+       147, 113, 18, 51, 130, 144, 60, 70, 31, 72, 27, 28 } ;
+ #endif  // SORT_RUNTIME
+ 
+-inline int GetGenreCount()
++int GetGenreCount()
+ {
+     return genre_count;
+ }
+ 
+-inline const char *GetGenreFromNum(int genre_id)
++const char *GetGenreFromNum(int genre_id)
+ {
+     if ((genre_id >= 0) && (genre_id < GetGenreCount()))
+         return genre_table[genre_id];
diff --git a/media-sound/id3v2/id3v2-0.1.10.ebuild b/media-sound/id3v2/id3v2-0.1.10.ebuild
new file mode 100644
index 000000000000..fcc15e62de21
--- /dev/null
+++ b/media-sound/id3v2/id3v2-0.1.10.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/id3v2/id3v2-0.1.10.ebuild,v 1.1 2004/05/04 19:25:18 eradicator Exp $
+
+inherit eutils
+
+IUSE=""
+
+DESCRIPTION="A command line editor for id3v2 tags."
+HOMEPAGE="http://id3v2.sourceforge.net/"
+SRC_URI="mirror://sourceforge/id3v2/${P}.tar.gz"
+RESTRICT="nomirror"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64"
+
+DEPEND="media-libs/id3lib"
+
+src_unpack()
+{
+	unpack ${A} && cd ${S} || die "unpack failed"
+
+	# The tarball came with a compiled binary. ;^)
+	make clean
+
+	# Use our own CXXFLAGS
+	sed -i -e "/g++/ s|-g|${CXXFLAGS}|" Makefile || die "sed failed"
+
+	# Fix segfault on alpha (and probably other architectures)
+	epatch ${FILESDIR}/${PN}-0.1.9-alpha.patch
+
+	# Fix global functions being declared inline
+	epatch ${FILESDIR}/${P}-noinline.patch
+}
+
+src_compile()
+{
+	emake || die
+}
+
+src_install()
+{
+	dobin id3v2
+	doman id3v2.1
+	dodoc COPYING INSTALL README
+}
diff --git a/media-sound/id3v2/id3v2-0.1.9.ebuild b/media-sound/id3v2/id3v2-0.1.9.ebuild
deleted file mode 100644
index 5fc79ffdc4f2..000000000000
--- a/media-sound/id3v2/id3v2-0.1.9.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/id3v2/id3v2-0.1.9.ebuild,v 1.6 2004/04/20 16:47:36 eradicator Exp $
-
-IUSE=""
-
-DESCRIPTION="A command line editor for id3v2 tags."
-HOMEPAGE="http://id3v2.sourceforge.net/"
-SRC_URI="mirror://sourceforge/id3v2/${P}.tar.gz"
-
-DEPEND="media-libs/id3lib"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa "
-
-src_unpack()
-{
-	unpack "${A}"
-	cd "${S}"
-	# The tarball came with a compiled binary. ;^)
-	make clean
-	sed -e "/g++/ s|-g|${CFLAGS}|" < Makefile > Makefile.hacked
-	mv Makefile.hacked Makefile
-}
-
-src_compile()
-{
-	emake || die
-}
-
-src_install()
-{
-	dobin id3v2
-	doman id3v2.1
-	dodoc COPYING INSTALL README
-}