Re-add fbsd port patch, adapted from the original port by Simon Schubert by debian people, bug #196646

Package-Manager: portage-2.1.4

4 files changed, 38 insertions, 17 deletions

diff --git a/media-sound/cdparanoia/ChangeLog b/media-sound/cdparanoia/ChangeLog
index 9d0835dddcf5..dd76609a40c2 100644
--- a/media-sound/cdparanoia/ChangeLog
+++ b/media-sound/cdparanoia/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/cdparanoia
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/ChangeLog,v 1.66 2007/12/12 17:56:25 jer Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/ChangeLog,v 1.67 2008/01/19 19:10:11 aballier Exp $
+
+  19 Jan 2008; Alexis Ballier <aballier@gentoo.org>
+  cdparanoia-3.10_pre0.ebuild:
+  Re-add fbsd port patch, adapted from the original port by Simon Schubert by
+  debian people, bug #196646
 
   12 Dec 2007; Jeroen Roovers <jer@gentoo.org> cdparanoia-3.10_pre0.ebuild:
   Stable for HPPA (bug #200102).
diff --git a/media-sound/cdparanoia/Manifest b/media-sound/cdparanoia/Manifest
index 15b24e62fa46..8dc04dd93714 100644
--- a/media-sound/cdparanoia/Manifest
+++ b/media-sound/cdparanoia/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 3.9.8-gcc34.patch 772 RMD160 c13aac76c54ac969e45a87b26f56fc62a4a72d07 SHA1 8bb7aafc54a70b558b97c88ac4a54f7535039851 SHA256 ffe735303a300d358ba99fc85f6d28c4bc7bc7ce90bf42b9838803fcc99cf150
 MD5 8dfcb53296c1e66ba13fb02d81eef39b files/3.9.8-gcc34.patch 772
 RMD160 c13aac76c54ac969e45a87b26f56fc62a4a72d07 files/3.9.8-gcc34.patch 772
@@ -54,14 +57,15 @@ AUX flex-configure-LANG.patch 1686 RMD160 4ff8355af81705058fd411910dfae94887bcd8
 MD5 e0ebf10eb8bf4542ae57ba591daa68a4 files/flex-configure-LANG.patch 1686
 RMD160 4ff8355af81705058fd411910dfae94887bcd884 files/flex-configure-LANG.patch 1686
 SHA256 dc9386b88eac48c282d63d0be7e7be81d4a0a08035a8b97138a61133e057bcea files/flex-configure-LANG.patch 1686
+DIST cdparanoia-3.10_pre0-fbsd.patch.bz2 12161 RMD160 ff4b67a0f30bcf62c5d0d26e681a7014cf39cabe SHA1 0ccadcbd26e501de511c39d8cf51cb138934fde3 SHA256 8f168b799367029279ee04d64720ec2d1bc1baa1b03856f1e1ef834f77a6ffb7
 DIST cdparanoia-3.9.8-SG_IO-patches.tar.gz 18149 RMD160 231a546dbd9d23bec7ebe00b34457b17c0367eb1 SHA1 be4f8ccf54b783cc38b91d92c507c324303dd5ef SHA256 090f84e5e23eaf2a4700c7f69abd2998c578072b1c9b8187dcf6b721d8ac1902
 DIST cdparanoia-3.9.8-fbsd-2.patch.bz2 7345 RMD160 217902fa5f455b2388a3568420aaea2d1fd6e219 SHA1 139d86d9d7cbb87dd7e005bc2b44b91e29e933a8 SHA256 a3e09610ddb5630e9f4a951eb0d96f84fb80e320c8f9cc71fe312f839c7f198c
 DIST cdparanoia-III-10pre0.src.tgz 138783 RMD160 e06c86b74501326daab1210dfcef17e6a0449254 SHA1 e82fd5c2ba683b5788f7e13c6a1ed15c62d7bb30 SHA256 49bc647c0a255c654c6f175bcc50fde006b402c5372ab71be7bb7dcdc57b1e62
 DIST cdparanoia-III-alpha9.8.src.tgz 116591 RMD160 d9225165f83b5386c58db263d6918a7006df1481 SHA1 04cc33a7d22d6255f6239e3e74195506b3bdde06 SHA256 1b79fae1aedc692f87d1344410f5c6b666961afccdc78bc5c4c257c450dfa008
-EBUILD cdparanoia-3.10_pre0.ebuild 1263 RMD160 bf48c81e8cb3c95a73dfb288f0eca1a91f62114c SHA1 71089961f66e28606f501366240ffcd4055db20c SHA256 b8d24594685dfe48ffd928293427dc2a6ba3dedaad452669d8e8588f2b074c49
-MD5 1156a208c3434d9766f2db59733b7e6d cdparanoia-3.10_pre0.ebuild 1263
-RMD160 bf48c81e8cb3c95a73dfb288f0eca1a91f62114c cdparanoia-3.10_pre0.ebuild 1263
-SHA256 b8d24594685dfe48ffd928293427dc2a6ba3dedaad452669d8e8588f2b074c49 cdparanoia-3.10_pre0.ebuild 1263
+EBUILD cdparanoia-3.10_pre0.ebuild 1352 RMD160 b2a41b6336f9f8a0d21a3c920c6b97154d1734a7 SHA1 3383ce68f4fe4e7f06d0d3867e77e8c6a5db0616 SHA256 425b62d25b5a71283c8b8717dc96e7cfb76e5443888bf0e45783cf382ec38f73
+MD5 357078b028bed1ecfc066033e220dc7a cdparanoia-3.10_pre0.ebuild 1352
+RMD160 b2a41b6336f9f8a0d21a3c920c6b97154d1734a7 cdparanoia-3.10_pre0.ebuild 1352
+SHA256 425b62d25b5a71283c8b8717dc96e7cfb76e5443888bf0e45783cf382ec38f73 cdparanoia-3.10_pre0.ebuild 1352
 EBUILD cdparanoia-3.9.8-r3.ebuild 1954 RMD160 2f103a50a51cde9d3ecb5bc406ce2c8c464a6b23 SHA1 e4903dfee719468fd33ac782ab2363b42407e742 SHA256 21a9a4236ffde35c42860320207787eec26bcf7dde123bf2f5d531c901dd2e1e
 MD5 f6a201e02787b8cd9ee0fad685342e62 cdparanoia-3.9.8-r3.ebuild 1954
 RMD160 2f103a50a51cde9d3ecb5bc406ce2c8c464a6b23 cdparanoia-3.9.8-r3.ebuild 1954
@@ -70,20 +74,27 @@ EBUILD cdparanoia-3.9.8-r5.ebuild 2441 RMD160 fab2a0ac3611aa927365845b44649e2083
 MD5 b5cdc7fdaa0861707300d281188d98ec cdparanoia-3.9.8-r5.ebuild 2441
 RMD160 fab2a0ac3611aa927365845b44649e208358d456 cdparanoia-3.9.8-r5.ebuild 2441
 SHA256 423c423ff813bfab20f549a30c1f7bba9643ab12a70a86f89b19d4baabf7db36 cdparanoia-3.9.8-r5.ebuild 2441
-MISC ChangeLog 9962 RMD160 bec41f3a99879b4febccee421344383264873e4d SHA1 865fe23c9220dff99881f9f0db2fe7317d8547b5 SHA256 129f5e019dca25a778bdd9e98fe83579496afba2faa030ceb330b11f8817f793
-MD5 3775ec568c80647191aec442c86d964f ChangeLog 9962
-RMD160 bec41f3a99879b4febccee421344383264873e4d ChangeLog 9962
-SHA256 129f5e019dca25a778bdd9e98fe83579496afba2faa030ceb330b11f8817f793 ChangeLog 9962
+MISC ChangeLog 10158 RMD160 7c23bb376992e4e9eb901c0008dcc1b7e5923709 SHA1 88ba7193d1c0af52fd078fd86fb4f866259842fe SHA256 ecd780640afc3528a648f440a7fc2ea36200ddc18a01bd269de8f55c240b4781
+MD5 9617c42b3a526d63d22a5eeadb3ecd1e ChangeLog 10158
+RMD160 7c23bb376992e4e9eb901c0008dcc1b7e5923709 ChangeLog 10158
+SHA256 ecd780640afc3528a648f440a7fc2ea36200ddc18a01bd269de8f55c240b4781 ChangeLog 10158
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata.xml 158
-MD5 dc91195c51f43cb1881fea073c5af81c files/digest-cdparanoia-3.10_pre0 268
-RMD160 a37da09fd50fe591a3338a39314e5ad33791ebc7 files/digest-cdparanoia-3.10_pre0 268
-SHA256 1dda83228e398b147c6ea47361dd2783df365713d1eb4fc8a5cf1c66e3cd0440 files/digest-cdparanoia-3.10_pre0 268
+MD5 be4bd9a769e2ee78b7142e83ab35d945 files/digest-cdparanoia-3.10_pre0 551
+RMD160 ad03fa5ce2fd5b8f33753074854f514f5688c444 files/digest-cdparanoia-3.10_pre0 551
+SHA256 3ecbcff0b10286d057ee64ea382d21f414a1206678add71853986c4a34c382c5 files/digest-cdparanoia-3.10_pre0 551
 MD5 5e0f413495df8354be7fcfc91a67b890 files/digest-cdparanoia-3.9.8-r3 563
 RMD160 fa436a26536ef5db4c7fe6d621e7f1fdd6436791 files/digest-cdparanoia-3.9.8-r3 563
 SHA256 774c16fe16f991623a0941ce4cba1169471103a20588644da693aaacfbd5e941 files/digest-cdparanoia-3.9.8-r3 563
 MD5 19602787f2923ce3f7f374ba22e686d0 files/digest-cdparanoia-3.9.8-r5 548
 RMD160 491601913ac0118f561bcb45bc8ede53f6645f9e files/digest-cdparanoia-3.9.8-r5 548
 SHA256 8e489eed670d3494db158053dafec572f7f2acb344c74578b2acded7a66af01e files/digest-cdparanoia-3.9.8-r5 548
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHkkscvFcC4BYPU0oRAivNAJ9L6moaWYyCTAkKAM8QIaqBIkijowCgxsNp
+kpJ/IlvEFVJiJ7Nyc/uq/zI=
+=pCtk
+-----END PGP SIGNATURE-----
diff --git a/media-sound/cdparanoia/cdparanoia-3.10_pre0.ebuild b/media-sound/cdparanoia/cdparanoia-3.10_pre0.ebuild
index 915a8cd8819d..f634440da33e 100644
--- a/media-sound/cdparanoia/cdparanoia-3.10_pre0.ebuild
+++ b/media-sound/cdparanoia/cdparanoia-3.10_pre0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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_pre0.ebuild,v 1.13 2007/12/12 17:56:25 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/cdparanoia-3.10_pre0.ebuild,v 1.14 2008/01/19 19:10:11 aballier Exp $
 
 WANT_AUTOCONF=2.1
 
@@ -10,11 +10,12 @@ MY_P=${PN}-III-$(get_version_component_range 2)$(get_version_component_range 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"
+SRC_URI="http://downloads.xiph.org/releases/cdparanoia/${MY_P}.src.tgz
+	mirror://gentoo/${P}-fbsd.patch.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
 
 S="${WORKDIR}"/${MY_P}
@@ -26,6 +27,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-include-cdda_interface_h.patch
 	epatch "${FILESDIR}"/${P}-use-destdir.patch
 	epatch "${FILESDIR}"/${P}-Makefile.in.patch
+	epatch "${WORKDIR}/${P}-fbsd.patch"
 
 	mv configure.guess config.guess
 	mv configure.sub config.sub
diff --git a/media-sound/cdparanoia/files/digest-cdparanoia-3.10_pre0 b/media-sound/cdparanoia/files/digest-cdparanoia-3.10_pre0
index b1de6520e52f..8d09e26cfd30 100644
--- a/media-sound/cdparanoia/files/digest-cdparanoia-3.10_pre0
+++ b/media-sound/cdparanoia/files/digest-cdparanoia-3.10_pre0
@@ -1,3 +1,6 @@
+MD5 283e4f7ac1381e926732eed76f0bc0cf cdparanoia-3.10_pre0-fbsd.patch.bz2 12161
+RMD160 ff4b67a0f30bcf62c5d0d26e681a7014cf39cabe cdparanoia-3.10_pre0-fbsd.patch.bz2 12161
+SHA256 8f168b799367029279ee04d64720ec2d1bc1baa1b03856f1e1ef834f77a6ffb7 cdparanoia-3.10_pre0-fbsd.patch.bz2 12161
 MD5 104b99604ea1422ef87b32d15903171f cdparanoia-III-10pre0.src.tgz 138783
 RMD160 e06c86b74501326daab1210dfcef17e6a0449254 cdparanoia-III-10pre0.src.tgz 138783
 SHA256 49bc647c0a255c654c6f175bcc50fde006b402c5372ab71be7bb7dcdc57b1e62 cdparanoia-III-10pre0.src.tgz 138783