Version bump, thanks to Bjoern Ottervik <bjorn.ottervik@gmail.com> for reporting in bug #237673

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26.5 x86_64

5 files changed, 225 insertions, 2 deletions

diff --git a/media-sound/cdparanoia/ChangeLog b/media-sound/cdparanoia/ChangeLog
index 1b5e312b7a6f..95ca88d27cc3 100644
--- a/media-sound/cdparanoia/ChangeLog
+++ b/media-sound/cdparanoia/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/cdparanoia
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/ChangeLog,v 1.86 2008/06/29 11:08:31 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/ChangeLog,v 1.87 2008/09/21 21:42:42 aballier Exp $
+
+*cdparanoia-3.10.2 (21 Sep 2008)
+
+  21 Sep 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/cdparanoia-3.10.2-Makefile.in.patch,
+  +files/cdparanoia-3.10.2-use-destdir.patch, +cdparanoia-3.10.2.ebuild:
+  Version bump, thanks to Bjoern Ottervik <bjorn.ottervik@gmail.com> for
+  reporting in bug #237673
 
 *cdparanoia-3.10.0 (29 Jun 2008)
 
diff --git a/media-sound/cdparanoia/Manifest b/media-sound/cdparanoia/Manifest
index d1251207cbd6..2e34e22e16ee 100644
--- a/media-sound/cdparanoia/Manifest
+++ b/media-sound/cdparanoia/Manifest
@@ -1,13 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX cdparanoia-3.10.2-Makefile.in.patch 3559 RMD160 86c0762fb313558a4756137616dac46e9feb75cc SHA1 ef421e719c1a696806669e70a353a4bc39953d5a SHA256 2335a43de616287cc0d70faac4debc093a7f597306d512e865a0ba4b333d1963
+AUX cdparanoia-3.10.2-use-destdir.patch 2547 RMD160 a9faefb416ead6f19b529449e66dcf3cfd3c2606 SHA1 7200044af3d9e7cdfea1aa5d8cd599e824698aa4 SHA256 41b039b07a1f57271ef3a6587cc104b549e57f15281ee26172c994a8616aca64
 AUX cdparanoia-3.10_pre0-Makefile.in.patch 3584 RMD160 10ac6ad1a8527fc5da86884cecbd7b7cd92c4900 SHA1 fc42f969bb256693608e4fe3722aedeb5073dc5a SHA256 7dd769f0aca16d6b7d83a07e3d76b64f2294b6ed0a6aeaa84fd0b7348369ffcb
 AUX cdparanoia-3.10_pre0-include-cdda_interface_h.patch 556 RMD160 42832206bf52a3629559d8090f57b3e74d64a421 SHA1 677c0c96de896277a2cf2ce811889e67c195af12 SHA256 c3dabd747091f2d3f2335f523b44a1ef5ab4b9c908fbd76b9d9feb5f40dd95f8
 AUX cdparanoia-3.10_pre0-log-summary.patch 3298 RMD160 8448ec99c118e4a1df0d0b1dc2b2160b676d7eb0 SHA1 dc469de93f8d74c5c6831a5d3c79d8abf4ee5b86 SHA256 96eb2701ab42149c95c33728335dbb59a1baaf39abb23970234bfef0d1003da6
 AUX cdparanoia-3.10_pre0-use-destdir.patch 2642 RMD160 e51cb050ba0fbdab19d37b39e2de1e9ff76d7afc SHA1 76fc4e94413692b3adfc2dfd1fb5f4f9d393be00 SHA256 5e163cf20db04a6c495fd103c0248ab578b3ea167267d908d5d5c86daaa813c3
 DIST cdparanoia-3.10_pre0-fbsd.patch.bz2 12161 RMD160 ff4b67a0f30bcf62c5d0d26e681a7014cf39cabe SHA1 0ccadcbd26e501de511c39d8cf51cb138934fde3 SHA256 8f168b799367029279ee04d64720ec2d1bc1baa1b03856f1e1ef834f77a6ffb7
 DIST cdparanoia-III-10.0.src.tgz 171776 RMD160 c398f1246c7629a976fd8f4c9ae5c63188a4e048 SHA1 302efff74cfe5c73710b713dcfd93306b5c0ffc2 SHA256 850d624c74ded6b26570fc2d0e6d6cb9f48eb601a78a1721981b7f24cb39136e
+DIST cdparanoia-III-10.2.src.tgz 183236 RMD160 d6c4ea9cc4aa4d5bcca4985e668ea6142d53cc55 SHA1 1901e20d3a370ca6afa4c76a9ef30d3f03044320 SHA256 005db45ef4ee017f5c32ec124f913a0546e77014266c6a1c50df902a55fe64df
 DIST cdparanoia-III-10pre0.src.tgz 138783 RMD160 e06c86b74501326daab1210dfcef17e6a0449254 SHA1 e82fd5c2ba683b5788f7e13c6a1ed15c62d7bb30 SHA256 49bc647c0a255c654c6f175bcc50fde006b402c5372ab71be7bb7dcdc57b1e62
 DIST cdparanoia-III-10pre2.src.tgz 172099 RMD160 47249f1eb544ff9792bbcbdfab4feefd5b349d2c SHA1 28715586aceacdc26dfa0038b48d01d47296fd54 SHA256 2fc4a9bc0a283af1cb7a9ce3173dab3938dff0fd05127ac610bb7532c0d28762
 EBUILD cdparanoia-3.10.0.ebuild 1263 RMD160 6ede6de4796f78a3879095ce219e61c57fa87326 SHA1 4666d83a0e253ae3652fcda97a0d112f41e6499d SHA256 7294b6dd15b9ea5c5dc5bcd13299bf241ab95e2d995c3abfe43b00af025d5f3e
+EBUILD cdparanoia-3.10.2.ebuild 1200 RMD160 fede9acab692fa10b008df6708edf8b5a83428cd SHA1 0d5ca9f7a8de076e9b6b7cd62d0cf2677d56deab SHA256 d7ffa056f2a8aa6bc5afc071af93d41f2839192574e17fc0d063c8130db856dc
 EBUILD cdparanoia-3.10_pre0-r1.ebuild 1377 RMD160 381708ae6058f61649bdbad0c0e1c29ff702de36 SHA1 51e75764fcf8edfb3edafce1acc49fdad62b55de SHA256 0974cc961d777c6f1e539d22fef6f2839873efe604b2f7c2a8b8224bd30aa669
 EBUILD cdparanoia-3.10_pre2.ebuild 1291 RMD160 0184827c0f81e4ee7b12d2a0327b01a99eddb235 SHA1 886712392c03f33ed85c87347758df91829be19c SHA256 4176afda3455375d0b41a58196e61119a431ad80493cd2e5e8a6bdc06fc8be4c
-MISC ChangeLog 13213 RMD160 9825b23988a439696b6fe54c2ed4b8f762e0666b SHA1 277042020018fb815b58277a4ba6b989ecb6f1da SHA256 f8d4c679fa3c058605f53f78fff0effe3dc41bad616572717a319873e12e5dc7
+MISC ChangeLog 13519 RMD160 df39e310d9e1047d6263787761f7787264408b15 SHA1 d1cc4caf0d3740a2e0310fd1f871fb68c16fe8e4 SHA256 6c4942ea83b2c98948e1aecc8cc01078010c287403ee27982fedda2a866ab0e1
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkjWv9gACgkQvFcC4BYPU0q27wCggo18aRyzAwkvbpkYESJeUMIH
+eDoAoJVKgAqnv/zIU3yS+5P4A9XqBcBy
+=tpNj
+-----END PGP SIGNATURE-----
diff --git a/media-sound/cdparanoia/cdparanoia-3.10.2.ebuild b/media-sound/cdparanoia/cdparanoia-3.10.2.ebuild
new file mode 100644
index 000000000000..c90d2f0c8e10
--- /dev/null
+++ b/media-sound/cdparanoia/cdparanoia-3.10.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/cdparanoia-3.10.2.ebuild,v 1.1 2008/09/21 21:42:42 aballier Exp $
+
+inherit autotools eutils flag-o-matic libtool toolchain-funcs versionator
+
+MY_P=${PN}-III-$(get_version_component_range 2-3)
+
+DESCRIPTION="an advanced CDDA reader with error correction"
+HOMEPAGE="http://www.xiph.org/paranoia"
+SRC_URI="http://downloads.xiph.org/releases/cdparanoia/${MY_P}.src.tgz"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch \
+		"${FILESDIR}"/${PN}-3.10.2-use-destdir.patch \
+		"${FILESDIR}"/${PN}-3.10.2-Makefile.in.patch
+
+	mv configure.guess config.guess
+	mv configure.sub config.sub
+	sed -i -e '/configure.\(guess\|sub\)/d' configure.in || die "sed failed."
+
+	eautoconf
+	elibtoolize
+}
+
+src_compile() {
+	tc-export CC AR RANLIB
+	append-flags -I"${S}/interface"
+	econf
+	emake OPT="${CFLAGS}" || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc README
+}
diff --git a/media-sound/cdparanoia/files/cdparanoia-3.10.2-Makefile.in.patch b/media-sound/cdparanoia/files/cdparanoia-3.10.2-Makefile.in.patch
new file mode 100644
index 000000000000..76ced48970c4
--- /dev/null
+++ b/media-sound/cdparanoia/files/cdparanoia-3.10.2-Makefile.in.patch
@@ -0,0 +1,104 @@
+Index: cdparanoia-III-10.2/interface/Makefile.in
+===================================================================
+--- cdparanoia-III-10.2.orig/interface/Makefile.in
++++ cdparanoia-III-10.2/interface/Makefile.in
+@@ -10,6 +10,7 @@ srcdir=@srcdir@
+ FLAGS=@SBPCD_H@ @UCDROM_H@ @TYPESIZES@ @CFLAGS@
+ OPT=@OPT@ $(FLAGS)
+ DEBUG=@DEBUG@ -DCDDA_TEST
++LIBFLAGS = -fPIC
+ CC=@CC@
+ LD=@CC@
+ LDFLAGS=@LDFLAGS@ $(FLAGS)
+@@ -20,6 +21,8 @@ CPPFLAGS+=-D_REENTRANT
+ 
+ OFILES = scan_devices.o	common_interface.o cooked_interface.o interface.o\
+ 	scsi_interface.o smallft.o toc.o test_interface.o
++LOFILES = scan_devices.lo common_interface.lo cooked_interface.lo interface.lo\
++	scsi_interface.lo smallft.lo toc.lo test_interface.lo
+ 
+ export VERSION
+ 
+@@ -32,8 +35,7 @@ lib:	
+ 	$(MAKE) libcdda_interface.a CFLAGS="$(OPT)" 
+ 
+ slib:	
+-	$(MAKE) lessmessy
+-	$(MAKE) libcdda_interface.so CFLAGS="$(OPT) -fpic" 
++	$(MAKE) libcdda_interface.so CFLAGS="$(OPT)" 
+ 	[ -e libcdda_interface.so.0 ] || ln -s libcdda_interface.so libcdda_interface.so.0
+ 
+ test:	
+@@ -45,14 +47,17 @@ libcdda_interface.a: 	$(OFILES)	
+ 	$(AR) -r libcdda_interface.a $(OFILES)
+ 	$(RANLIB) libcdda_interface.a
+ 
+-libcdda_interface.so: 	$(OFILES)	
+-	$(CC) -fpic -shared -o libcdda_interface.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_interface.so.0 $(OFILES) $(LIBS)
++libcdda_interface.so: 	$(LOFILES)	
++	$(CC) $(LDFLAGS) $(LIBFLAGS) -shared -o libcdda_interface.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_interface.so.0 $(LOFILES) $(LIBS)
+ 	[ -e libcdda_interface.so.0 ] || ln -s libcdda_interface.so.0.$(VERSION) libcdda_interface.so.0
+ 	[ -e libcdda_interface.so ] || ln -s libcdda_interface.so.0.$(VERSION) libcdda_interface.so
+ 
+ .c.o:
+ 	$(CC) $(CFLAGS) -c $<
+ 
++%.lo: %.c
++	$(CC) $(CFLAGS) $(LIBFLAGS) -c $< -o $@
++
+ lessmessy:
+ 	-rm  -f *.o core *~ *.out
+ 
+Index: cdparanoia-III-10.2/paranoia/Makefile.in
+===================================================================
+--- cdparanoia-III-10.2.orig/paranoia/Makefile.in
++++ cdparanoia-III-10.2/paranoia/Makefile.in
+@@ -11,6 +11,7 @@ srcdir=@srcdir@
+ FLAGS=@TYPESIZES@ @CFLAGS@
+ OPT=@OPT@ $(FLAGS)
+ DEBUG=@DEBUG@ 
++LIBFLAGS = -fPIC
+ CC=@CC@
+ LD=@CC@
+ LDFLAGS=@LDFLAGS@ $(FLAGS)
+@@ -20,8 +21,9 @@ CPPFLAGS+=-D_REENTRANT
+ 
+ OFILES = paranoia.o p_block.o overlap.o gap.o isort.o 
+ #TFILES = isort.t gap.t p_block.t paranoia.t
++LOFILES = paranoia.lo p_block.lo overlap.lo gap.lo isort.lo 
+ 
+-LIBS = ../interface/libcdda_interface.a -lm
++LIBS = ../interface/libcdda_interface.so -lm
+ export VERSION
+ 
+ all: lib slib
+@@ -33,8 +35,7 @@ lib:	
+ 	$(MAKE) libcdda_paranoia.a CFLAGS="$(OPT)" 
+ 
+ slib:	
+-	$(MAKE) lessmessy
+-	$(MAKE) libcdda_paranoia.so CFLAGS="$(OPT) -fpic" 
++	$(MAKE) libcdda_paranoia.so CFLAGS="$(OPT)" 
+ 
+ #test:	$(TFILES)
+ #
+@@ -43,14 +44,17 @@ libcdda_paranoia.a: 	$(OFILES)	
+ 	$(AR) -r libcdda_paranoia.a $(OFILES)
+ 	$(RANLIB) libcdda_paranoia.a
+ 
+-libcdda_paranoia.so: 	$(OFILES)	
+-	$(CC) -fpic -shared -o libcdda_paranoia.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(OFILES) -L ../interface -lcdda_interface
++libcdda_paranoia.so: 	$(LOFILES)	
++	$(CC) $(LDFLAGS) $(LIBSFLAGS) -shared -o libcdda_paranoia.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(LOFILES) -L ../interface -lcdda_interface
+ 	[ -e libcdda_paranoia.so.0 ] || ln -s libcdda_paranoia.so.0.$(VERSION) libcdda_paranoia.so.0
+ 	[ -e libcdda_paranoia.so ] || ln -s libcdda_paranoia.so.0.$(VERSION) libcdda_paranoia.so
+ 
+ .c.o:
+ 	$(CC) $(CFLAGS) -c $<
+ 
++%.lo: %.c
++	$(CC) $(CFLAGS) $(LIBFLAGS) -c $< -o $@
++
+ .c.t:
+ 	$(CC) -g -DTEST $(DEBUG) -o $@ $< $(LIBS)
+ 	$@
diff --git a/media-sound/cdparanoia/files/cdparanoia-3.10.2-use-destdir.patch b/media-sound/cdparanoia/files/cdparanoia-3.10.2-use-destdir.patch
new file mode 100644
index 000000000000..b1b360558b81
--- /dev/null
+++ b/media-sound/cdparanoia/files/cdparanoia-3.10.2-use-destdir.patch
@@ -0,0 +1,51 @@
+Index: cdparanoia-III-10.2/Makefile.in
+===================================================================
+--- cdparanoia-III-10.2.orig/Makefile.in
++++ cdparanoia-III-10.2/Makefile.in
+@@ -63,28 +63,28 @@ slib:
+ 	cd paranoia && $(MAKE) slib
+ 
+ install:
+-	$(INSTALL) -d -m 0755 $(BINDIR)
+-	$(INSTALL) -m 755 $(srcdir)/cdparanoia $(BINDIR)
+-	$(INSTALL) -d -m 0755 $(MANDIR)
+-	$(INSTALL) -d -m 0755 $(MANDIR)/man1
+-	$(INSTALL) -m 0644 $(srcdir)/cdparanoia.1 $(MANDIR)/man1
+-	$(INSTALL) -d -m 0755 $(INCLUDEDIR)
+-	$(INSTALL) -m 0644 $(srcdir)/paranoia/cdda_paranoia.h $(INCLUDEDIR)
+-	$(INSTALL) -d -m 0755 $(LIBDIR)
+-	$(INSTALL) -m 0644 $(srcdir)/paranoia/libcdda_paranoia.so.0.$(VERSION) $(LIBDIR)
+-	$(INSTALL) -m 0644 $(srcdir)/paranoia/libcdda_paranoia.a $(LIBDIR)
+-	$(INSTALL) -m 0644 $(srcdir)/interface/cdda_interface.h $(INCLUDEDIR)
+-	$(INSTALL) -m 0644 $(srcdir)/interface/libcdda_interface.so.0.$(VERSION) $(LIBDIR)
+-	$(INSTALL) -m 0644 $(srcdir)/interface/libcdda_interface.a $(LIBDIR)
+-	$(INSTALL) -m 0644 $(srcdir)/utils.h $(INCLUDEDIR)
++	$(INSTALL) -d -m 0755 $(DESTDIR)$(BINDIR)
++	$(INSTALL) -m 755 $(srcdir)/cdparanoia $(DESTDIR)$(BINDIR)
++	$(INSTALL) -d -m 0755 $(DESTDIR)$(MANDIR)
++	$(INSTALL) -d -m 0755 $(DESTDIR)$(MANDIR)/man1
++	$(INSTALL) -m 0644 $(srcdir)/cdparanoia.1 $(DESTDIR)$(MANDIR)/man1
++	$(INSTALL) -d -m 0755 $(DESTDIR)$(INCLUDEDIR)
++	$(INSTALL) -m 0644 $(srcdir)/paranoia/cdda_paranoia.h $(DESTDIR)$(INCLUDEDIR)
++	$(INSTALL) -d -m 0755 $(DESTDIR)$(LIBDIR)
++	$(INSTALL) -m 0644 $(srcdir)/paranoia/libcdda_paranoia.so.0.$(VERSION) $(DESTDIR)$(LIBDIR)
++	$(INSTALL) -m 0644 $(srcdir)/paranoia/libcdda_paranoia.a $(DESTDIR)$(LIBDIR)
++	$(INSTALL) -m 0644 $(srcdir)/interface/cdda_interface.h $(DESTDIR)$(INCLUDEDIR)
++	$(INSTALL) -m 0644 $(srcdir)/interface/libcdda_interface.so.0.$(VERSION) $(DESTDIR)$(LIBDIR)
++	$(INSTALL) -m 0644 $(srcdir)/interface/libcdda_interface.a $(DESTDIR)$(LIBDIR)
++	$(INSTALL) -m 0644 $(srcdir)/utils.h $(DESTDIR)$(INCLUDEDIR)
+ 	ln -fs libcdda_interface.so.0.$(VERSION) \
+-		$(LIBDIR)/libcdda_interface.so.0
++		$(DESTDIR)$(LIBDIR)/libcdda_interface.so.0
+ 	ln -fs libcdda_interface.so.0.$(VERSION) \
+-		$(LIBDIR)/libcdda_interface.so
++		$(DESTDIR)$(LIBDIR)/libcdda_interface.so
+ 	ln -fs libcdda_paranoia.so.0.$(VERSION) \
+-		$(LIBDIR)/libcdda_paranoia.so.0
++		$(DESTDIR)$(LIBDIR)/libcdda_paranoia.so.0
+ 	ln -fs libcdda_paranoia.so.0.$(VERSION) \
+-		$(LIBDIR)/libcdda_paranoia.so
++		$(DESTDIR)$(LIBDIR)/libcdda_paranoia.so
+ 
+ cdparanoia:	$(OFILES) $(LIBDEP)
+ 		$(LD) $(CFLAGS) $(LDFLAGS) $(OFILES) \