Revision bump to fix linking issue. Only changes in files/id3lib-3.8.3-zlib.patch were made, and it's a QA fix directly into stable. Removing old versions.

9 files changed, 95 insertions, 184 deletions

diff --git a/media-libs/id3lib/ChangeLog b/media-libs/id3lib/ChangeLog
index b28049449f51..14133e182bcc 100644
--- a/media-libs/id3lib/ChangeLog
+++ b/media-libs/id3lib/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-libs/id3lib
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/id3lib/ChangeLog,v 1.27 2004/08/27 02:13:26 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/id3lib/ChangeLog,v 1.28 2004/09/13 02:18:06 eradicator Exp $
+
+*id3lib-3.8.3-r3 (12 Sep 2004)
+
+  12 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/id3lib-3.8.0-gcc3.patch, +files/id3lib-3.8.3-zlib.patch,
+  -id3lib-3.8.0.ebuild, -id3lib-3.8.3-r1.ebuild, +id3lib-3.8.3-r3.ebuild:
+  Revision bump to fix linking issue. Only changes in
+  files/id3lib-3.8.3-zlib.patch were made, and it's a QA fix directly into
+  stable. Removing old versions.
 
   26 Aug 2004; Tom Gall <tgall@gentoo.org> id3lib-3.8.3-r2.ebuild:
   stable on ppc64, bug #58311
diff --git a/media-libs/id3lib/Manifest b/media-libs/id3lib/Manifest
index adb83c14d59f..6a39ecff5200 100644
--- a/media-libs/id3lib/Manifest
+++ b/media-libs/id3lib/Manifest
@@ -1,9 +1,11 @@
-MD5 e40ccef8bcfc4aba03f009fc4707627f ChangeLog 3830
 MD5 b0a7910c7ff93f4769cffcc47846981a id3lib-3.8.0.ebuild 1271
 MD5 49a1c634d23ef1e722cc3914c6493da5 id3lib-3.8.3-r1.ebuild 927
-MD5 76b1df6d2d985be416c9fe592c5a422d id3lib-3.8.3-r2.ebuild 1266
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 e40ccef8bcfc4aba03f009fc4707627f ChangeLog 3830
+MD5 76b1df6d2d985be416c9fe592c5a422d id3lib-3.8.3-r2.ebuild 1266
+MD5 fbc993d13c9ea4efad04cbd69d2f412a id3lib-3.8.3-r3.ebuild 1284
 MD5 fe615fff8136cfc3fc0fe0e83a522b68 files/digest-id3lib-3.8.0 64
 MD5 202375b32b2a80a367a2230716144988 files/digest-id3lib-3.8.3-r1 64
-MD5 202375b32b2a80a367a2230716144988 files/digest-id3lib-3.8.3-r2 64
 MD5 21b2333db59cc116a7e3c96563fe9ccd files/id3lib-3.8.0-gcc3.patch 2707
+MD5 202375b32b2a80a367a2230716144988 files/digest-id3lib-3.8.3-r2 64
+MD5 202375b32b2a80a367a2230716144988 files/digest-id3lib-3.8.3-r3 64
diff --git a/media-libs/id3lib/files/digest-id3lib-3.8.0 b/media-libs/id3lib/files/digest-id3lib-3.8.0
deleted file mode 100644
index 998cc67f8b02..000000000000
--- a/media-libs/id3lib/files/digest-id3lib-3.8.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9d5947e2c25c846b03faadfb8c6e8601 id3lib-3.8.0.tar.gz 934333
diff --git a/media-libs/id3lib/files/digest-id3lib-3.8.3-r1 b/media-libs/id3lib/files/digest-id3lib-3.8.3-r3
index cfb850ce9d1e..cfb850ce9d1e 100644
--- a/media-libs/id3lib/files/digest-id3lib-3.8.3-r1
+++ b/media-libs/id3lib/files/digest-id3lib-3.8.3-r3
diff --git a/media-libs/id3lib/files/id3lib-3.8.0-gcc3.patch b/media-libs/id3lib/files/id3lib-3.8.0-gcc3.patch
deleted file mode 100644
index 12c8bc5ab37a..000000000000
--- a/media-libs/id3lib/files/id3lib-3.8.0-gcc3.patch
+++ /dev/null
@@ -1,97 +0,0 @@
---- include/id3/id3lib_strings.h.orig	2002-08-21 16:41:11.000000000 -0600
-+++ include/id3/id3lib_strings.h	2002-08-21 16:40:32.000000000 -0600
-@@ -30,6 +30,94 @@
- 
- #include <string>
- 
-+#if (defined(__GNUC__) && (__GNUC__ >= 3) || (defined(_MSC_VER) && _MSC_VER > 1000))
-+namespace std
-+{
-+  template<>
-+    struct char_traits<unsigned char>
-+    {
-+      typedef unsigned char char_type;
-+      // Unsigned as wint_t in unsigned.
-+      typedef unsigned long  	int_type;
-+      typedef streampos 	pos_type;
-+      typedef streamoff 	off_type;
-+      typedef mbstate_t 	state_type;
-+      
-+      static void 
-+      assign(char_type& __c1, const char_type& __c2)
-+      { __c1 = __c2; }
-+
-+      static bool 
-+      eq(const char_type& __c1, const char_type& __c2)
-+      { return __c1 == __c2; }
-+
-+      static bool 
-+      lt(const char_type& __c1, const char_type& __c2)
-+      { return __c1 < __c2; }
-+
-+      static int 
-+      compare(const char_type* __s1, const char_type* __s2, size_t __n)
-+      { 
-+	for (size_t __i = 0; __i < __n; ++__i)
-+	  if (!eq(__s1[__i], __s2[__i]))
-+	    return lt(__s1[__i], __s2[__i]) ? -1 : 1;
-+	return 0; 
-+      }
-+
-+      static size_t
-+      length(const char_type* __s)
-+      { 
-+	const char_type* __p = __s; 
-+	while (__p) 
-+	  ++__p; 
-+	return (__p - __s); 
-+      }
-+
-+      static const char_type* 
-+      find(const char_type* __s, size_t __n, const char_type& __a)
-+      { 
-+	for (const char_type* __p = __s; size_t(__p - __s) < __n; ++__p)
-+	  if (*__p == __a) return __p;
-+	return 0;
-+      }
-+
-+      static char_type* 
-+      move(char_type* __s1, const char_type* __s2, size_t __n)
-+      { return (char_type*) memmove(__s1, __s2, __n * sizeof(char_type)); }
-+
-+      static char_type* 
-+      copy(char_type* __s1, const char_type* __s2, size_t __n)
-+      { return (char_type*) memcpy(__s1, __s2, __n * sizeof(char_type)); }
-+
-+      static char_type* 
-+      assign(char_type* __s, size_t __n, char_type __a)
-+      { 
-+	for (char_type* __p = __s; __p < __s + __n; ++__p) 
-+	  assign(*__p, __a);
-+        return __s; 
-+      }
-+
-+      static char_type 
-+      to_char_type(const int_type& __c)
-+      { return char_type(); }
-+
-+      static int_type 
-+      to_int_type(const char_type& __c) { return int_type(); }
-+
-+      static bool 
-+      eq_int_type(const int_type& __c1, const int_type& __c2)
-+      { return __c1 == __c2; }
-+
-+      static int_type 
-+      eof() { return static_cast<int_type>(-1); }
-+
-+      static int_type 
-+      not_eof(const int_type& __c)
-+      { return eq_int_type(__c, eof()) ? int_type(0) : __c; }
-+    };
-+} // namespace std
-+#endif
-+
- namespace dami
- {
-   typedef std::basic_string<char>           String;
diff --git a/media-libs/id3lib/files/id3lib-3.8.3-zlib.patch b/media-libs/id3lib/files/id3lib-3.8.3-zlib.patch
new file mode 100644
index 000000000000..177320bc17a3
--- /dev/null
+++ b/media-libs/id3lib/files/id3lib-3.8.3-zlib.patch
@@ -0,0 +1,23 @@
+diff -Naur id3lib-3.8.3.orig/Makefile.am id3lib-3.8.3/Makefile.am
+--- id3lib-3.8.3.orig/Makefile.am	2003-03-01 16:23:00.000000000 -0800
++++ id3lib-3.8.3/Makefile.am	2004-09-12 19:05:39.564456828 -0700
+@@ -28,7 +28,7 @@
+ endif
+ 
+ SUBDIRS =  . m4 $(zlib_subdir) doc include id3com src examples
+-DIST_SUBDIRS = . m4 zlib doc include id3com src examples prj libprj
++DIST_SUBDIRS = . m4 $(zlib_subdir) doc include id3com src examples prj libprj
+ 
+ INCLUDES = @ID3LIB_DEBUG_FLAGS@
+ 
+diff -Naur id3lib-3.8.3.orig/src/Makefile.am id3lib-3.8.3/src/Makefile.am
+--- id3lib-3.8.3.orig/src/Makefile.am	2003-03-01 16:23:00.000000000 -0800
++++ id3lib-3.8.3/src/Makefile.am	2004-09-12 19:08:30.814149521 -0700
+@@ -77,6 +77,7 @@
+ endif
+ 
+ libid3_la_LDFLAGS = \
++  -lz \
+   -version-info $(LT_VERSION) \
+   -release $(LT_RELEASE) \
+   -export-dynamic
diff --git a/media-libs/id3lib/id3lib-3.8.0.ebuild b/media-libs/id3lib/id3lib-3.8.0.ebuild
deleted file mode 100644
index bf6d830898b4..000000000000
--- a/media-libs/id3lib/id3lib-3.8.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/id3lib/id3lib-3.8.0.ebuild,v 1.11 2004/07/01 07:56:24 eradicator Exp $
-
-MY_P=${P/_/}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="Id3 library for C/C++"
-SRC_URI="mirror://sourceforge/id3lib/${MY_P}.tar.gz"
-HOMEPAGE="http://id3lib.sourceforge.net/"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="x86 ppc sparc "
-
-IUSE=""
-
-DEPEND="virtual/libc"
-
-src_unpack() {
-
-	unpack ${A}
-
-	if [ "`gcc --version | cut -f1 -d.`" == "3" ] ||
-	   ([ -n "${CXX}" ] && [ "`${CXX} --version | cut -f1 -d.`" == "3" ]) ||
-	   [ "`gcc --version|grep gcc|cut -f1 -d.|cut -f3 -d\ `" == "3" ]
-	then
-		cd ${S}
-		# Removed azarah's patch for _pre2 (doesn't seem to be
-		# necessary for gcc3.2), added the following for 3.8.0 from
-		# Michael Best <gentoo@pendragon.org> (Bug #6840)
-		patch -p0 <${FILESDIR}/${P}-gcc3.patch || die
-	fi
-}
-
-src_compile() {
-
-	export CPPFLAGS="${CPPFLAGS} -Wno-deprecated"
-
-	econf || die
-	emake || die
-}
-
-src_install() {
-
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS COPYING ChangeLog HISTORY INSTALL README THANKS TODO
-#	some example programs to be placed in docs dir.
-	make clean
-	cp -a examples ${D}/usr/share/doc/${PF}/examples
-}
diff --git a/media-libs/id3lib/id3lib-3.8.3-r1.ebuild b/media-libs/id3lib/id3lib-3.8.3-r1.ebuild
deleted file mode 100644
index 23188828f2f2..000000000000
--- a/media-libs/id3lib/id3lib-3.8.3-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/id3lib/id3lib-3.8.3-r1.ebuild,v 1.13 2004/07/01 07:56:24 eradicator Exp $
-
-MY_P=${P/_/}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="Id3 library for C/C++"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-HOMEPAGE="http://id3lib.sourceforge.net/"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="x86 ppc sparc alpha hppa amd64 ia64 ~mips"
-
-IUSE=""
-
-DEPEND="virtual/libc"
-
-export CPPFLAGS="${CPPFLAGS} -Wno-deprecated"
-
-src_install() {
-
-	make DESTDIR=${D} install || die "Install failed"
-	dosym /usr/lib/libid3-3.8.so.3 /usr/lib/libid3-3.8.so.0.0.0
-	dosym /usr/lib/libid3-3.8.so.0.0.0 /usr/lib/libid3-3.8.so.0
-
-	dodoc AUTHORS COPYING ChangeLog HISTORY INSTALL README THANKS TODO
-#	some example programs to be placed in docs dir.
-	make clean
-	cp -a examples ${D}/usr/share/doc/${PF}/examples
-}
diff --git a/media-libs/id3lib/id3lib-3.8.3-r3.ebuild b/media-libs/id3lib/id3lib-3.8.3-r3.ebuild
new file mode 100644
index 000000000000..0f42f2d38843
--- /dev/null
+++ b/media-libs/id3lib/id3lib-3.8.3-r3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/id3lib/id3lib-3.8.3-r3.ebuild,v 1.1 2004/09/13 02:18:06 eradicator Exp $
+
+IUSE="doc"
+
+inherit eutils
+
+MY_P=${P/_/}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="Id3 library for C/C++"
+HOMEPAGE="http://id3lib.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="x86 ppc sparc ~mips alpha hppa amd64 ~ia64 ppc64"
+
+RDEPEND="sys-libs/zlib"
+DEPEND="sys-devel/autoconf
+	sys-devel/libtool"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${P}-zlib.patch
+
+	export WANT_AUTOMAKE=1.6
+	export WANT_AUTOCONF=2.5
+
+	libtoolize --force --copy || die
+	aclocal || die
+	automake || die
+	autoconf || die
+}
+
+src_compile() {
+	export CPPFLAGS="${CPPFLAGS} -Wno-deprecated"
+	econf || die
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "Install failed"
+	dosym /usr/lib/libid3-3.8.so.3 /usr/lib/libid3-3.8.so.0.0.0
+	dosym /usr/lib/libid3-3.8.so.0.0.0 /usr/lib/libid3-3.8.so.0
+
+	dodoc AUTHORS ChangeLog HISTORY INSTALL README THANKS TODO
+
+	# some example programs to be placed in docs dir.
+	if use doc; then
+		cp -a examples ${D}/usr/share/doc/${PF}/examples
+		cd ${D}/usr/share/doc/${PF}/examples
+		make distclean
+	fi
+}