Move patchset to mirrors since everything is now from upstream or sent to upstream trac.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

8 files changed, 21 insertions, 199 deletions

diff --git a/media-sound/cdparanoia/ChangeLog b/media-sound/cdparanoia/ChangeLog
index c27967f25bcc..a231edff5069 100644
--- a/media-sound/cdparanoia/ChangeLog
+++ b/media-sound/cdparanoia/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/cdparanoia
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/ChangeLog,v 1.100 2009/05/23 03:29:39 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/ChangeLog,v 1.101 2009/06/20 19:09:28 ssuominen Exp $
+
+  20 Jun 2009; Samuli Suominen <ssuominen@gentoo.org>
+  cdparanoia-3.10.2-r3.ebuild, -files/cdparanoia-3.10.2-Makefile.in.patch,
+  -files/cdparanoia-3.10.2-include-cdda_interface_h.patch,
+  -files/cdparanoia-3.10.2-ppc64.patch,
+  -files/cdparanoia-3.10.2-use-destdir.patch:
+  Move patchset to mirrors. See, http://trac.xiph.org for source tree and
+  tickets where everything this is from or sent to.
 
   23 May 2009; Jeroen Roovers <jer@gentoo.org> cdparanoia-3.10.2-r3.ebuild:
   Stable for HPPA (bug #267726).
diff --git a/media-sound/cdparanoia/Manifest b/media-sound/cdparanoia/Manifest
index 67e8c8718232..728a5fd58e2a 100644
--- a/media-sound/cdparanoia/Manifest
+++ b/media-sound/cdparanoia/Manifest
@@ -1,9 +1,5 @@
-AUX cdparanoia-3.10.2-Makefile.in.patch 3559 RMD160 86c0762fb313558a4756137616dac46e9feb75cc SHA1 ef421e719c1a696806669e70a353a4bc39953d5a SHA256 2335a43de616287cc0d70faac4debc093a7f597306d512e865a0ba4b333d1963
-AUX cdparanoia-3.10.2-include-cdda_interface_h.patch 447 RMD160 0b30b61d8df76420e491af85464c72b3753a86da SHA1 67e9c6a05bd942d35736b4a597ef21695ccc7ab9 SHA256 d85b5997954283696202d403f8adcabba265381b797e656ef8e6fb90807de73c
-AUX cdparanoia-3.10.2-ppc64.patch 547 RMD160 e2e4d14873b3d4ad20cd68774ad68fec0c0caffd SHA1 946e045260d67b4f1788726e7776f6fd41516599 SHA256 64152830e0483444a4323b39ebcac52d09172e65e84c0df0f43b5285c3e073ba
-AUX cdparanoia-3.10.2-use-destdir.patch 2547 RMD160 a9faefb416ead6f19b529449e66dcf3cfd3c2606 SHA1 7200044af3d9e7cdfea1aa5d8cd599e824698aa4 SHA256 41b039b07a1f57271ef3a6587cc104b549e57f15281ee26172c994a8616aca64
-DIST cdparanoia-3.10.2-gcc43.patch.bz2 4281 RMD160 8a190d57be6d5c37930161dec65e62ffcf0cb5eb SHA1 ce11055564fbef6b8ec952594d150eee4afd52bd SHA256 5ee177a42759f623279d23a0e6466ee064604487c6238c3336f059c20690f376
+DIST cdparanoia-III-10.2-patches-1.tbz2 6090 RMD160 84065ce383a229b92547228f859543732495f8f8 SHA1 e3c764b57797e69b2d1a684c9c75dc4da0b08f01 SHA256 0cf03536bb8c86a9a2045d1cf2f959a32898efbf68a0bc633e5b351b66ec0a52
 DIST cdparanoia-III-10.2.src.tgz 183236 RMD160 d6c4ea9cc4aa4d5bcca4985e668ea6142d53cc55 SHA1 1901e20d3a370ca6afa4c76a9ef30d3f03044320 SHA256 005db45ef4ee017f5c32ec124f913a0546e77014266c6a1c50df902a55fe64df
-EBUILD cdparanoia-3.10.2-r3.ebuild 1329 RMD160 51d20c54351e402b5b5682f28f2c06715a4cf345 SHA1 27ce7625e22b56d4bb7977ed4f125f93dfc60bdf SHA256 f67331f0fcaa41890cabf12416e1ff49a17122a9a037436b44745d3d17024e37
-MISC ChangeLog 15696 RMD160 8f8b90971a49b1602f1be35a7bb9a46c1f929ccc SHA1 e592481e03733abcf96f2a32e84cff81aa5636c6 SHA256 50597904cc99e7a31b65619fa5e4186a0a19d08b5e8a7d3c0ee0a59b763d1006
-MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
+EBUILD cdparanoia-3.10.2-r3.ebuild 1241 RMD160 82430bf576cd1aebaf4518727e234ebf2c896e90 SHA1 0478df1804f0f751be830bcc9005b3c680c5164b SHA256 1a4f1e189f3a332edae9c1e7bd3bd5b2d7ff44c67c9a2545de1ba7faba074164
+MISC ChangeLog 16103 RMD160 489d635c20a6d1e1a1f5548e59e90ee4b79f5ecd SHA1 9dae7c76761c3f908c932d1b595b1346f46d8381 SHA256 90a9f05aa8ac16267a2669f1cc80693dce51f1611abc7c4b27e96f618c373a6b
+MISC metadata.xml 159 RMD160 568344dc99ebe68c2e2d43d268d186757532144d SHA1 3f9589301dbaa4363c56de0f309cf792d8c38b63 SHA256 eb5b8cfa9aed067cd72d6439beac2dd0abdba30248f27e4b337012b493a18369
diff --git a/media-sound/cdparanoia/cdparanoia-3.10.2-r3.ebuild b/media-sound/cdparanoia/cdparanoia-3.10.2-r3.ebuild
index c0c7fb49eafa..9778550d3ae0 100644
--- a/media-sound/cdparanoia/cdparanoia-3.10.2-r3.ebuild
+++ b/media-sound/cdparanoia/cdparanoia-3.10.2-r3.ebuild
@@ -1,17 +1,16 @@
 # Copyright 1999-2009 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-r3.ebuild,v 1.6 2009/05/23 03:29:39 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/cdparanoia-3.10.2-r3.ebuild,v 1.7 2009/06/20 19:09:28 ssuominen Exp $
 
 EAPI=2
-
 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/${PN}/${MY_P}.src.tgz
-	mirror://gentoo/${P}-gcc43.patch.bz2"
+	http://dev.gentoo.org/~ssuominen/distfiles/${MY_P}-patches-1.tbz2
+	mirror://gentoo/${MY_P}-patches-1.tbz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
@@ -21,14 +20,11 @@ IUSE=""
 S=${WORKDIR}/${MY_P}
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-use-destdir.patch \
-		"${FILESDIR}"/${P}-Makefile.in.patch \
-		"${WORKDIR}"/${P}-gcc43.patch \
-		"${FILESDIR}"/${P}-ppc64.patch \
-		"${FILESDIR}"/${P}-include-cdda_interface_h.patch
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patches
 
 	mv configure.guess config.guess
 	mv configure.sub config.sub
+
 	sed -i -e '/configure.\(guess\|sub\)/d' configure.in || die "sed failed"
 
 	eautoconf
@@ -36,8 +32,8 @@ src_prepare() {
 }
 
 src_configure() {
-	tc-export CC AR RANLIB
-	append-flags -I"${S}/interface"
+	tc-export AR CC RANLIB
+	append-flags -I../interface
 	econf
 }
 
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
deleted file mode 100644
index 76ced48970c4..000000000000
--- a/media-sound/cdparanoia/files/cdparanoia-3.10.2-Makefile.in.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-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-include-cdda_interface_h.patch b/media-sound/cdparanoia/files/cdparanoia-3.10.2-include-cdda_interface_h.patch
deleted file mode 100644
index facc197151c7..000000000000
--- a/media-sound/cdparanoia/files/cdparanoia-3.10.2-include-cdda_interface_h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur cdparanoia-III-10.2.orig/paranoia/cdda_paranoia.h cdparanoia-III-10.2/paranoia/cdda_paranoia.h
---- cdparanoia-III-10.2.orig/paranoia/cdda_paranoia.h	2008-09-11 20:09:40.000000000 +0000
-+++ cdparanoia-III-10.2/paranoia/cdda_paranoia.h	2009-04-30 11:21:26.000000000 +0000
-@@ -39,6 +39,7 @@
- #endif
- 
- #include <stdio.h>
-+#include <cdda_interface.h>
- 
- extern char *paranoia_version();
- extern cdrom_paranoia *paranoia_init(cdrom_drive *d);
diff --git a/media-sound/cdparanoia/files/cdparanoia-3.10.2-ppc64.patch b/media-sound/cdparanoia/files/cdparanoia-3.10.2-ppc64.patch
deleted file mode 100644
index 63091084bf60..000000000000
--- a/media-sound/cdparanoia/files/cdparanoia-3.10.2-ppc64.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur cdparanoia-III-10.2.orig/interface/interface.c cdparanoia-III-10.2/interface/interface.c
---- cdparanoia-III-10.2.orig/interface/interface.c	2008-09-11 13:43:52.000000000 +0300
-+++ cdparanoia-III-10.2/interface/interface.c	2008-11-28 04:43:53.000000000 +0200
-@@ -118,7 +118,7 @@
- 	if(d->bigendianp==-1) /* not determined yet */
- 	  d->bigendianp=data_bigendianp(d);
- 	
--	if(d->bigendianp!=bigendianp()){
-+	if(buffer && d->bigendianp!=bigendianp()){
- 	  int i;
- 	  u_int16_t *p=(u_int16_t *)buffer;
- 	  long els=sectors*CD_FRAMESIZE_RAW/2;
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
deleted file mode 100644
index b1b360558b81..000000000000
--- a/media-sound/cdparanoia/files/cdparanoia-3.10.2-use-destdir.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-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) \
diff --git a/media-sound/cdparanoia/metadata.xml b/media-sound/cdparanoia/metadata.xml
index e1774e3d9ad7..ae573a60407f 100644
--- a/media-sound/cdparanoia/metadata.xml
+++ b/media-sound/cdparanoia/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+	<herd>sound</herd>
 </pkgmetadata>