Re-add the FreeBSD patch and ~x86-fbsd keyword. See bug #157382.

Package-Manager: portage-2.1.2_rc2-r5

4 files changed, 33 insertions, 15 deletions

diff --git a/app-admin/gamin/ChangeLog b/app-admin/gamin/ChangeLog
index 6bca11f092a6..b68d0cf04d67 100644
--- a/app-admin/gamin/ChangeLog
+++ b/app-admin/gamin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-admin/gamin
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gamin/ChangeLog,v 1.53 2006/12/07 00:34:15 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gamin/ChangeLog,v 1.54 2006/12/07 00:52:39 flameeyes Exp $
+
+  07 Dec 2006; Diego Pettenò <flameeyes@gentoo.org> gamin-0.1.8.ebuild:
+  Re-add the FreeBSD patch and ~x86-fbsd keyword. See bug #157382.
 
 *gamin-0.1.8 (07 Dec 2006)
 
diff --git a/app-admin/gamin/Manifest b/app-admin/gamin/Manifest
index 3b665d023e08..80e71ffe5506 100644
--- a/app-admin/gamin/Manifest
+++ b/app-admin/gamin/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST gamin-0.1.7-freebsd.patch.bz2 5217 RMD160 22ee7ccac4cca87188bf299404186d3c5ea08475 SHA1 31ca1fdf8e21f9a0ac3a98b7865e3ab0d3c6c471 SHA256 8c77200b1fac6f1a65819a38ab54767f8a25ffbe990cde5f500eec040d815fbf
 DIST gamin-0.1.7.tar.gz 542061 RMD160 440b6afc682806b33aa275e3b8a593dc7e3f93de SHA1 bde971a10a3510626d501db3a746370c8931612a SHA256 8272c64356e1310353f2411b2cabd211468edbf8ce312d58aeef55889e79361a
 DIST gamin-0.1.8.tar.gz 564530 RMD160 3ad723480f840d67daedb9bc10a93b48ba34bc47 SHA1 5dacc8c452d4aa5dc81eb6bee4a4bdc52fbfbe36 SHA256 be22f69b4797db510f4270ff0e228dd027e99e561ac5f5d38be595be7e82d203
@@ -5,14 +8,14 @@ EBUILD gamin-0.1.7.ebuild 1447 RMD160 882c287b54401c4fbbd66ba930a79d58ac22fe6a S
 MD5 585e639e5ccc9115e71bc630e4cd37ab gamin-0.1.7.ebuild 1447
 RMD160 882c287b54401c4fbbd66ba930a79d58ac22fe6a gamin-0.1.7.ebuild 1447
 SHA256 526a81d1bcad77b2adfb5e311a66bd17aefddff2a4a4c8a299cccd39d7650fa8 gamin-0.1.7.ebuild 1447
-EBUILD gamin-0.1.8.ebuild 1058 RMD160 b9949f3414c079b1cb73cd8986552ad6691586b3 SHA1 fa9f231cd5db7cc12f45cfe79985ec24981dc48e SHA256 78b856717142cddbc6709c4412180d55698d88d7fc0fd577901af77ff78b9567
-MD5 26da72f511b93e628ed922e1045710e1 gamin-0.1.8.ebuild 1058
-RMD160 b9949f3414c079b1cb73cd8986552ad6691586b3 gamin-0.1.8.ebuild 1058
-SHA256 78b856717142cddbc6709c4412180d55698d88d7fc0fd577901af77ff78b9567 gamin-0.1.8.ebuild 1058
-MISC ChangeLog 8104 RMD160 b92416882e24504afa5de53a8ccf49062d6dbcd0 SHA1 e3eb8451894f28ab55be49619327ef6eeca53b8b SHA256 1eaae155cbc7b905c9ca0a9f62a0778b84ffe173f118a76a63c02e9f114bae59
-MD5 53fb731b3500229e84b2578dc3320716 ChangeLog 8104
-RMD160 b92416882e24504afa5de53a8ccf49062d6dbcd0 ChangeLog 8104
-SHA256 1eaae155cbc7b905c9ca0a9f62a0778b84ffe173f118a76a63c02e9f114bae59 ChangeLog 8104
+EBUILD gamin-0.1.8.ebuild 1214 RMD160 277c8faad38ae6ba2ec7e7ede4bc24a5c4bbbac1 SHA1 91ab205db1481f875e48710ce43bcee8358a12f3 SHA256 99bf73bed7373b6824781497aafc7437912ac1faf78ca14c4c1212389be13af7
+MD5 092ebf85dea709976547412a57bb9273 gamin-0.1.8.ebuild 1214
+RMD160 277c8faad38ae6ba2ec7e7ede4bc24a5c4bbbac1 gamin-0.1.8.ebuild 1214
+SHA256 99bf73bed7373b6824781497aafc7437912ac1faf78ca14c4c1212389be13af7 gamin-0.1.8.ebuild 1214
+MISC ChangeLog 8251 RMD160 dfaa2e16b279489c48ff22e207f0e1504b1b8924 SHA1 121009e8517b03c5e0da54f19243c49107d6ff1e SHA256 388bd71330611f6f54c7f3eab85a8133b242fdfaff8051ba65325ea2d09305b5
+MD5 9c9a8dbb3355352c476e39c9b5c70072 ChangeLog 8251
+RMD160 dfaa2e16b279489c48ff22e207f0e1504b1b8924 ChangeLog 8251
+SHA256 388bd71330611f6f54c7f3eab85a8133b242fdfaff8051ba65325ea2d09305b5 ChangeLog 8251
 MISC metadata.xml 279 RMD160 a2c8771d3c22773c9764746f59c57dfd77169263 SHA1 d48640481a509f9a86f06ae5ef35ab84a6de1f2c SHA256 b82ac6b8096e516fb3cdc312cdca1b72b65c3a890b0c8cf9c425a893c0a1cdae
 MD5 875135e8740bafa4dab79ee592cf9744 metadata.xml 279
 RMD160 a2c8771d3c22773c9764746f59c57dfd77169263 metadata.xml 279
@@ -20,6 +23,13 @@ SHA256 b82ac6b8096e516fb3cdc312cdca1b72b65c3a890b0c8cf9c425a893c0a1cdae metadata
 MD5 469372237b50836ef50ad51b93c9bf96 files/digest-gamin-0.1.7 497
 RMD160 7062a11132fc5e1d4f3313ce32e42873ebf6d4f5 files/digest-gamin-0.1.7 497
 SHA256 65c5ef16d64495211c6d24b345c15af401df9ad0c4baad29eb3b2095421f6ef9 files/digest-gamin-0.1.7 497
-MD5 3087fddff51ed2ee137ab658eaf4a4a6 files/digest-gamin-0.1.8 235
-RMD160 ce4941327d941a885128c9d308baaa801626a49e files/digest-gamin-0.1.8 235
-SHA256 983e758958235145e289a7577176c899e6006ab3007983db568a5d0c119f36a6 files/digest-gamin-0.1.8 235
+MD5 02be5e02e5b766fb11a75eaa24df26f9 files/digest-gamin-0.1.8 497
+RMD160 cb691a43dbc12abdf906dcf954b858a93eb61732 files/digest-gamin-0.1.8 497
+SHA256 3a8802928bc0baff287ef9e512ffbac9bcb1d9b8dde31e665764fa268a48af3a files/digest-gamin-0.1.8 497
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFd2XwAiZjviIA2XgRAhOGAKCFRVbM8mORgpwWjk9XfrgCAwP6SgCeP+/E
+N4WKWxUCo2yo4iS18Fierd0=
+=NGui
+-----END PGP SIGNATURE-----
diff --git a/app-admin/gamin/files/digest-gamin-0.1.8 b/app-admin/gamin/files/digest-gamin-0.1.8
index c5c511693c18..0215ddba62d3 100644
--- a/app-admin/gamin/files/digest-gamin-0.1.8
+++ b/app-admin/gamin/files/digest-gamin-0.1.8
@@ -1,3 +1,6 @@
+MD5 fe942c8202fdee10e1bf139ae8a698a0 gamin-0.1.7-freebsd.patch.bz2 5217
+RMD160 22ee7ccac4cca87188bf299404186d3c5ea08475 gamin-0.1.7-freebsd.patch.bz2 5217
+SHA256 8c77200b1fac6f1a65819a38ab54767f8a25ffbe990cde5f500eec040d815fbf gamin-0.1.7-freebsd.patch.bz2 5217
 MD5 985022c8b1b993e471d528fd0e14ffbe gamin-0.1.8.tar.gz 564530
 RMD160 3ad723480f840d67daedb9bc10a93b48ba34bc47 gamin-0.1.8.tar.gz 564530
 SHA256 be22f69b4797db510f4270ff0e228dd027e99e561ac5f5d38be595be7e82d203 gamin-0.1.8.tar.gz 564530
diff --git a/app-admin/gamin/gamin-0.1.8.ebuild b/app-admin/gamin/gamin-0.1.8.ebuild
index 8034a6fb565b..5968ad0357cb 100644
--- a/app-admin/gamin/gamin-0.1.8.ebuild
+++ b/app-admin/gamin/gamin-0.1.8.ebuild
@@ -1,16 +1,17 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gamin/gamin-0.1.8.ebuild,v 1.1 2006/12/07 00:34:15 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gamin/gamin-0.1.8.ebuild,v 1.2 2006/12/07 00:52:39 flameeyes Exp $
 
 inherit autotools eutils libtool
 
 DESCRIPTION="Library providing the FAM File Alteration Monitor API"
 HOMEPAGE="http://www.gnome.org/~veillard/gamin/"
-SRC_URI="http://www.gnome.org/~veillard/gamin/sources/${P}.tar.gz"
+SRC_URI="http://www.gnome.org/~veillard/gamin/sources/${P}.tar.gz
+	kernel_FreeBSD? ( mirror://gentoo/${PN}-0.1.7-freebsd.patch.bz2 )"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="debug doc"
 
 RDEPEND=">=dev-libs/glib-2
@@ -25,6 +26,7 @@ src_unpack() {
 	unpack ${A}
 
 	cd ${S}
+	use kernel_FreeBSD && epatch "${DISTDIR}/${PN}-0.1.7-freebsd.patch.bz2"
 
 	# Do not remove
 	elibtoolize