Fix patch so that it actually do something useful for FreeBSD 6.x (what we have now) and 7; add ~x86-fbsd keyword.

Package-Manager: portage-2.1.2-r1

10 files changed, 42 insertions, 83 deletions

diff --git a/media-sound/cdcd/ChangeLog b/media-sound/cdcd/ChangeLog
index 25aa1a5d63b7..1946c4ef372d 100644
--- a/media-sound/cdcd/ChangeLog
+++ b/media-sound/cdcd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/cdcd
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cdcd/ChangeLog,v 1.25 2006/06/16 21:13:53 flameeyes Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cdcd/ChangeLog,v 1.26 2007/01/21 19:57:24 flameeyes Exp $
+
+*cdcd-0.6.6-r2 (21 Jan 2007)
+
+  21 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/cdcd-0.6.4-gentoo.patch, files/cdcd-0.6.6-fbsd.patch,
+  -cdcd-0.6.4.ebuild, -cdcd-0.6.6-r1.ebuild, +cdcd-0.6.6-r2.ebuild:
+  Fix patch so that it actually do something useful for FreeBSD 6.x (what we
+  have now) and 7; add ~x86-fbsd keyword.
 
   16 Jun 2006; Diego Pettenò <flameeyes@gentoo.org> cdcd-0.6.4.ebuild,
   cdcd-0.6.6.ebuild, cdcd-0.6.6-r1.ebuild:
diff --git a/media-sound/cdcd/Manifest b/media-sound/cdcd/Manifest
index 26670831b11a..8166d303b957 100644
--- a/media-sound/cdcd/Manifest
+++ b/media-sound/cdcd/Manifest
@@ -1,49 +1,37 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX cdcd-0.6.4-gentoo.patch 346 RMD160 66b3950cc5d34b5060715938857ca5462f215b0b SHA1 589f6120bf03cab10a329f86d70bcfebad8574c9 SHA256 0981c1101f5e367992c0454ca679eb8b82423d523e70e597ab126f604345ccd8
-MD5 87fbaee82f519b5db720d80f64dbed8e files/cdcd-0.6.4-gentoo.patch 346
-RMD160 66b3950cc5d34b5060715938857ca5462f215b0b files/cdcd-0.6.4-gentoo.patch 346
-SHA256 0981c1101f5e367992c0454ca679eb8b82423d523e70e597ab126f604345ccd8 files/cdcd-0.6.4-gentoo.patch 346
-AUX cdcd-0.6.6-fbsd.patch 811 RMD160 d6cfd3223241e313aa3c4bf156e740097248df44 SHA1 a869fb603f6daf4079454c1d3c73f3e06c615a99 SHA256 13f12aff578280c25a592762d784a3cb9e40b3a485f87a178c6cd6bae2fcdd27
-MD5 7e17a3eb77b8594b8d24a6fd9ac374ba files/cdcd-0.6.6-fbsd.patch 811
-RMD160 d6cfd3223241e313aa3c4bf156e740097248df44 files/cdcd-0.6.6-fbsd.patch 811
-SHA256 13f12aff578280c25a592762d784a3cb9e40b3a485f87a178c6cd6bae2fcdd27 files/cdcd-0.6.6-fbsd.patch 811
-DIST cdcd-0.6.4.tar.gz 215706
-DIST cdcd-0.6.6.tar.gz 246286
-EBUILD cdcd-0.6.4.ebuild 723 RMD160 41a08a3dbd16ec24dcdc0179a439b99f9f06cefc SHA1 5609f7357046b0b373501bbd697e7ae66ed47e5b SHA256 237a0ee6624c45593e44893448f403fc1b02eb8f479a255c393e18eba7c9a6e7
-MD5 05021f3294b4c1bf86bdaa521770b243 cdcd-0.6.4.ebuild 723
-RMD160 41a08a3dbd16ec24dcdc0179a439b99f9f06cefc cdcd-0.6.4.ebuild 723
-SHA256 237a0ee6624c45593e44893448f403fc1b02eb8f479a255c393e18eba7c9a6e7 cdcd-0.6.4.ebuild 723
-EBUILD cdcd-0.6.6-r1.ebuild 757 RMD160 00e4584e486b330b9c9047a0f1ef1dbcc5c93699 SHA1 b52d52feb12e292d38fa2e5e1c067f69b9b4bbbe SHA256 4dc8c1b9cb41aba1d267b8d60c62e2bc0fa3f4427a4f5e843e4e8004b4e8c71b
-MD5 42c1bca33a43629d6a6f9b645d5824f5 cdcd-0.6.6-r1.ebuild 757
-RMD160 00e4584e486b330b9c9047a0f1ef1dbcc5c93699 cdcd-0.6.6-r1.ebuild 757
-SHA256 4dc8c1b9cb41aba1d267b8d60c62e2bc0fa3f4427a4f5e843e4e8004b4e8c71b cdcd-0.6.6-r1.ebuild 757
+AUX cdcd-0.6.6-fbsd.patch 814 RMD160 3020fdcfbcdba6f8a60348d7b389615a5a03d93a SHA1 682918f4386a82d22ab5bf29a8c984bfc3a02793 SHA256 ac14b0525df5ba601b1e1bd9b51a1d3f413c03ab3dc1d4c26af59f2174fb5811
+MD5 bda72135fef3189dd6581f8a7fb6fa4e files/cdcd-0.6.6-fbsd.patch 814
+RMD160 3020fdcfbcdba6f8a60348d7b389615a5a03d93a files/cdcd-0.6.6-fbsd.patch 814
+SHA256 ac14b0525df5ba601b1e1bd9b51a1d3f413c03ab3dc1d4c26af59f2174fb5811 files/cdcd-0.6.6-fbsd.patch 814
+DIST cdcd-0.6.6.tar.gz 246286 RMD160 bad6c63af74f352b00f4517db6497f4de2fc680e SHA1 704577aec65895d7cf6553f5d1ed32d12b2ed6bc SHA256 06ae2508926b7d1f811d9ce9a53991f8886aef078db4cde617125bda24fbf717
+EBUILD cdcd-0.6.6-r2.ebuild 767 RMD160 025a2d86aa8d656fa7b58f998da17712c5109f11 SHA1 6c44950f4ecce11943f1af85c06c2920922754d2 SHA256 731c61d77fd4588464b0153a0262a820502dfc5dcc64f6bf6fa05b5dacfeea42
+MD5 fd59fb5a5070fa05185fb756de099377 cdcd-0.6.6-r2.ebuild 767
+RMD160 025a2d86aa8d656fa7b58f998da17712c5109f11 cdcd-0.6.6-r2.ebuild 767
+SHA256 731c61d77fd4588464b0153a0262a820502dfc5dcc64f6bf6fa05b5dacfeea42 cdcd-0.6.6-r2.ebuild 767
 EBUILD cdcd-0.6.6.ebuild 641 RMD160 cad19f77b43af6399ab377a760f407d789434c21 SHA1 5ca9f69623bb9cf894d4b7be22459ca5366867ee SHA256 b805e3b5f145ecad628dbd9feec58151ccf080393152d5a6ef944c0577f184ca
 MD5 0c0affdffe0003b8909044f209f93d3c cdcd-0.6.6.ebuild 641
 RMD160 cad19f77b43af6399ab377a760f407d789434c21 cdcd-0.6.6.ebuild 641
 SHA256 b805e3b5f145ecad628dbd9feec58151ccf080393152d5a6ef944c0577f184ca cdcd-0.6.6.ebuild 641
-MISC ChangeLog 3372 RMD160 2d2362ad9cd667f591d21e7eae267cd412c587de SHA1 a4f6243c9f9f5fb1f6db99103549ea05a1d18801 SHA256 bd079f48f9dd01127a9c757f4fecc06dfc2a87cb7468275b4d638a4a916d4196
-MD5 f72a7d5a4de47d28bbfc50d2c4a1aa03 ChangeLog 3372
-RMD160 2d2362ad9cd667f591d21e7eae267cd412c587de ChangeLog 3372
-SHA256 bd079f48f9dd01127a9c757f4fecc06dfc2a87cb7468275b4d638a4a916d4196 ChangeLog 3372
+MISC ChangeLog 3706 RMD160 00dd406cce5cdb4bbdb44cbdbd773f39e72301fd SHA1 0cc266845c8cf4241b768c9a2bacdc4d34f4b1db SHA256 6523ef92c89772e32dd94d65bc79a7502a00e94cf93feec880c14c61e649bce2
+MD5 881e0756887d6e03417573d2096f528e ChangeLog 3706
+RMD160 00dd406cce5cdb4bbdb44cbdbd773f39e72301fd ChangeLog 3706
+SHA256 6523ef92c89772e32dd94d65bc79a7502a00e94cf93feec880c14c61e649bce2 ChangeLog 3706
 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 0046c0fdb538d85b9b5fd853815a0956 files/digest-cdcd-0.6.4 62
-RMD160 db78fe72ad8b6c5e976bc52e0928e07af719b247 files/digest-cdcd-0.6.4 62
-SHA256 59551d442dcceab9178f69fd7f9015626e03148cad2d374b5d83bb75f297319f files/digest-cdcd-0.6.4 62
-MD5 e177c90f7b82ca5b8744a9f573dce5f0 files/digest-cdcd-0.6.6 62
-RMD160 f0f0f2d43b375757b6fef69d7d9a19a0dd22fbbe files/digest-cdcd-0.6.6 62
-SHA256 3ec6fec8505485bda48a0db16f514071a3df7095bb83cd49d6f4b5d1ab5fde27 files/digest-cdcd-0.6.6 62
-MD5 e177c90f7b82ca5b8744a9f573dce5f0 files/digest-cdcd-0.6.6-r1 62
-RMD160 f0f0f2d43b375757b6fef69d7d9a19a0dd22fbbe files/digest-cdcd-0.6.6-r1 62
-SHA256 3ec6fec8505485bda48a0db16f514071a3df7095bb83cd49d6f4b5d1ab5fde27 files/digest-cdcd-0.6.6-r1 62
+MD5 85b3f078e87201014bd24405c7f8e8f5 files/digest-cdcd-0.6.6 232
+RMD160 e9a0bb5442b6d4f6b8ef7f0393a43b65ef09ef2c files/digest-cdcd-0.6.6 232
+SHA256 bdc2f2dce4e417cc445a930ce4543ad973a1273f1ac4d239921efb96c4199541 files/digest-cdcd-0.6.6 232
+MD5 85b3f078e87201014bd24405c7f8e8f5 files/digest-cdcd-0.6.6-r2 232
+RMD160 e9a0bb5442b6d4f6b8ef7f0393a43b65ef09ef2c files/digest-cdcd-0.6.6-r2 232
+SHA256 bdc2f2dce4e417cc445a930ce4543ad973a1273f1ac4d239921efb96c4199541 files/digest-cdcd-0.6.6-r2 232
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
+Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFEkx8YAiZjviIA2XgRArLSAJ4isSfXWqv1yrmyBaqpecVV5Y992QCfYDk6
-ptpCa9FK5MYaFZ3s+Nbo1zA=
-=EWX1
+iD8DBQFFs8WqAiZjviIA2XgRAt/YAKDryO6hRKoTXVV/hCzFfq8bCGGZSQCfeEW8
+voRlyJQqG6RCYDUGayg4M/Q=
+=s74m
 -----END PGP SIGNATURE-----
diff --git a/media-sound/cdcd/cdcd-0.6.4.ebuild b/media-sound/cdcd/cdcd-0.6.4.ebuild
deleted file mode 100644
index 7715cabc5236..000000000000
--- a/media-sound/cdcd/cdcd-0.6.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cdcd/cdcd-0.6.4.ebuild,v 1.16 2006/06/16 21:13:53 flameeyes Exp $
-
-IUSE=""
-
-inherit eutils
-
-DESCRIPTION="a simple yet powerful command line cd player"
-SRC_URI="mirror://sourceforge/libcdaudio/${P}.tar.gz"
-HOMEPAGE="http://cdcd.undergrid.net/"
-DEPEND=">=sys-libs/ncurses-5.0
-	>=sys-libs/readline-4.0
-	>=media-libs/libcdaudio-0.99.4"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc ~amd64 ppc64"
-
-src_unpack() {
-	unpack ${A}
-
-	epatch "${FILESDIR}/cdcd-0.6.4-gentoo.patch"
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS COPYING ChangeLog NEWS README
-}
diff --git a/media-sound/cdcd/cdcd-0.6.6-r1.ebuild b/media-sound/cdcd/cdcd-0.6.6-r2.ebuild
index 310d40be9bd0..038b9885edb2 100644
--- a/media-sound/cdcd/cdcd-0.6.6-r1.ebuild
+++ b/media-sound/cdcd/cdcd-0.6.6-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cdcd/cdcd-0.6.6-r1.ebuild,v 1.3 2006/06/16 21:13:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cdcd/cdcd-0.6.6-r2.ebuild,v 1.1 2007/01/21 19:57:24 flameeyes Exp $
 
 IUSE=""
 
@@ -15,7 +15,7 @@ DEPEND=">=sys-libs/ncurses-5.0
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
 src_unpack() {
 	unpack ${A}
diff --git a/media-sound/cdcd/files/cdcd-0.6.4-gentoo.patch b/media-sound/cdcd/files/cdcd-0.6.4-gentoo.patch
deleted file mode 100644
index c226c702765d..000000000000
--- a/media-sound/cdcd/files/cdcd-0.6.4-gentoo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cdcd-0.6.4/configure.jj	2003-02-02 12:29:03.000000000 +0000
-+++ cdcd-0.6.4/configure	2003-02-02 12:29:24.000000000 +0000
-@@ -3216,7 +3216,7 @@
-    { (exit 1); exit 1; }; }
- fi
- 
--LIBS="-lcurses -lreadline"
-+LIBS="-lreadline -lcurses"
- 
- # It's better to have this string in one single place.
- LIBCDAUDIO_MISSING="couldn't locate libcdaudio."
diff --git a/media-sound/cdcd/files/cdcd-0.6.6-fbsd.patch b/media-sound/cdcd/files/cdcd-0.6.6-fbsd.patch
index 8b171bcbf23b..12056efed0aa 100644
--- a/media-sound/cdcd/files/cdcd-0.6.6-fbsd.patch
+++ b/media-sound/cdcd/files/cdcd-0.6.6-fbsd.patch
@@ -6,7 +6,7 @@ diff -ur cdcd-0.6.6/configure.ac cdcd-0.6.6-fbsd/configure.ac
      have_libcdaudio=1
      ;;
 +   
-+  *freebsd5.*)
++  *freebsd[567]*)
 +    default_device=/dev/cd0
 +    have_cdaudio=1
 +    ;;
diff --git a/media-sound/cdcd/files/digest-cdcd-0.6.4 b/media-sound/cdcd/files/digest-cdcd-0.6.4
deleted file mode 100644
index ac60eda027fd..000000000000
--- a/media-sound/cdcd/files/digest-cdcd-0.6.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 33513cab08609026aac7823936162886 cdcd-0.6.4.tar.gz 215706
diff --git a/media-sound/cdcd/files/digest-cdcd-0.6.6 b/media-sound/cdcd/files/digest-cdcd-0.6.6
index 488fd4d6ab0e..749444cef1bd 100644
--- a/media-sound/cdcd/files/digest-cdcd-0.6.6
+++ b/media-sound/cdcd/files/digest-cdcd-0.6.6
@@ -1 +1,3 @@
 MD5 dc17f2e275c7214cb693f6abb50f29fb cdcd-0.6.6.tar.gz 246286
+RMD160 bad6c63af74f352b00f4517db6497f4de2fc680e cdcd-0.6.6.tar.gz 246286
+SHA256 06ae2508926b7d1f811d9ce9a53991f8886aef078db4cde617125bda24fbf717 cdcd-0.6.6.tar.gz 246286
diff --git a/media-sound/cdcd/files/digest-cdcd-0.6.6-r1 b/media-sound/cdcd/files/digest-cdcd-0.6.6-r1
deleted file mode 100644
index 488fd4d6ab0e..000000000000
--- a/media-sound/cdcd/files/digest-cdcd-0.6.6-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 dc17f2e275c7214cb693f6abb50f29fb cdcd-0.6.6.tar.gz 246286
diff --git a/media-sound/cdcd/files/digest-cdcd-0.6.6-r2 b/media-sound/cdcd/files/digest-cdcd-0.6.6-r2
new file mode 100644
index 000000000000..749444cef1bd
--- /dev/null
+++ b/media-sound/cdcd/files/digest-cdcd-0.6.6-r2
@@ -0,0 +1,3 @@
+MD5 dc17f2e275c7214cb693f6abb50f29fb cdcd-0.6.6.tar.gz 246286
+RMD160 bad6c63af74f352b00f4517db6497f4de2fc680e cdcd-0.6.6.tar.gz 246286
+SHA256 06ae2508926b7d1f811d9ce9a53991f8886aef078db4cde617125bda24fbf717 cdcd-0.6.6.tar.gz 246286