Fix incorrect built_with_use test, bug #258283.

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

4 files changed, 18 insertions, 14 deletions

diff --git a/app-pda/gnome-pilot/ChangeLog b/app-pda/gnome-pilot/ChangeLog
index d7528016e118..4ba31c3509bd 100644
--- a/app-pda/gnome-pilot/ChangeLog
+++ b/app-pda/gnome-pilot/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-pda/gnome-pilot
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/gnome-pilot/ChangeLog,v 1.51 2009/01/12 21:49:07 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/gnome-pilot/ChangeLog,v 1.52 2009/02/22 21:31:25 eva Exp $
+
+  22 Feb 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  gnome-pilot-2.0.16-r1.ebuild, gnome-pilot-2.0.17.ebuild:
+  Fix incorrect built_with_use test, bug #258283.
 
 *gnome-pilot-2.0.17 (12 Jan 2009)
 
diff --git a/app-pda/gnome-pilot/Manifest b/app-pda/gnome-pilot/Manifest
index 1f1e1ffb895b..276d0fb97999 100644
--- a/app-pda/gnome-pilot/Manifest
+++ b/app-pda/gnome-pilot/Manifest
@@ -5,14 +5,14 @@ AUX gnome-pilot-2.0.15-as-needed.patch 615 RMD160 fbe474f52251eba860153a17e94db2
 AUX gnome-pilot-2.0.16-hal-0.5.11.patch 1253 RMD160 2bf5f22787d3abec7db8dccce2cf4b953bcd8fb2 SHA1 5fdefcb86f24b27159f1a08f81cda1885e395b60 SHA256 8edab795c9bc9536f66d4fc69026ba8429d92cbee285913ec51ed489994b15ec
 DIST gnome-pilot-2.0.16.tar.bz2 829677 RMD160 13c0fec7ab9ed987e5c80d8ceaf68e0eea47ea42 SHA1 2a80852b09f41b55df16c7f1130e6d437bfe4dee SHA256 3ae8da427269a122e72aca025b01fc5f5c5a402efadd0e98e107d8a9453f6a56
 DIST gnome-pilot-2.0.17.tar.bz2 837105 RMD160 bbd3f94a1e9edb99a10d698272ae0c7bb48dd643 SHA1 2d56b0b642293967de3ee6a93d2ae67c2562e367 SHA256 ef157162c6963289855493d07de4956b43753909082299bb59791c8a8436211a
-EBUILD gnome-pilot-2.0.16-r1.ebuild 1566 RMD160 91e40745d032a42fb9178f4499c59e786b6efc76 SHA1 af476d37b20ed7dfefac99aabddc80899a004844 SHA256 f67dd6f06946779bd993657ca4e116cd2931cd43b344fc348d85ec5f6c174745
-EBUILD gnome-pilot-2.0.17.ebuild 1527 RMD160 14062b4a54359ec0872d94064df62310744437b7 SHA1 02b9b6d01a4f793059a3b0d068635558218542b2 SHA256 552d4213576b750848d120d1e14ceb8f48572a9af81145da678358d20edc2512
-MISC ChangeLog 12641 RMD160 b5b31335d6ec298add1b8cad02d815688fd02db4 SHA1 5aabc5556fe117a77aebd9c1e5311c73ee2dd099 SHA256 2a0e709d9b06a6b360df94870776f9b4d4e2f18d64c79bb3c425e93931f81351
+EBUILD gnome-pilot-2.0.16-r1.ebuild 1614 RMD160 a0a9a4a56248025235f8f3159bdf42c5ab0a2155 SHA1 0ae2a0987ab668a66056a1db44d31b82c7893931 SHA256 692ca74a6f4b6ffed3578ac96d259d3a216273a69b3837d8c32199a666be73d4
+EBUILD gnome-pilot-2.0.17.ebuild 1543 RMD160 e98921bce16a2d684ced543996ad130d9fe4bc8a SHA1 442188341f18db874b8aec065fb53d08a6d2c85c SHA256 c191f140bd4181f56a2c4447528f98afa5179b960ac72ea12ab95bc8c5059ca7
+MISC ChangeLog 12805 RMD160 a0475f10cce44a4c6147a8a6d112cb9506d1ac5f SHA1 c2d2d3dbb3581b9acccd413a15671a5b77f8fefb SHA256 840621abef0fffb04c991edc63b864c6f0bab29fa0cd9a69f7a354134132bf66
 MISC metadata.xml 175 RMD160 5a758a9c6be5886bcabe17412a27ddb9c4c1a091 SHA1 5f39f2aee5dc458e1f1184425ff00a600cfbeb93 SHA256 ad69c13297c0e440519a25f99fdcefd579e75f58d652bb174055ae0c827b8543
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAklrut4ACgkQ1fmVwcYIWAYRegCeMV1ehSDoJKSWWiuxvQZb2Qh3
-+pQAoMIN1mQnCJnIBJcHbdluRQZ1eyPb
-=jqHa
+iEYEARECAAYFAkmhxDMACgkQ1fmVwcYIWAawIgCgqAjdATH1vbx7UM/eGJBFL1qp
+GUYAnRMyh0EE1HYZbMLHwOFK9YlP/qux
+=hMxf
 -----END PGP SIGNATURE-----
diff --git a/app-pda/gnome-pilot/gnome-pilot-2.0.16-r1.ebuild b/app-pda/gnome-pilot/gnome-pilot-2.0.16-r1.ebuild
index 830672cd1bc6..af2018f18da4 100644
--- a/app-pda/gnome-pilot/gnome-pilot-2.0.16-r1.ebuild
+++ b/app-pda/gnome-pilot/gnome-pilot-2.0.16-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/gnome-pilot/gnome-pilot-2.0.16-r1.ebuild,v 1.4 2008/09/20 11:13:24 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/gnome-pilot/gnome-pilot-2.0.16-r1.ebuild,v 1.5 2009/02/22 21:31:25 eva Exp $
 
 inherit gnome2 eutils autotools
 
@@ -53,12 +53,12 @@ src_unpack() {
 	# Fix use with hal-0.5.11
 	epatch "${FILESDIR}/${P}-hal-0.5.11.patch"
 
+	intltoolize --force --copy --automake || die "intltoolize failed"
 	eautoreconf
-	intltoolize --force || die
 }
 
 pkg_postinst() {
-	if ! built_with_use app-pda/pilot-link bluetooth; then
+	if ! built_with_use --missing false app-pda/pilot-link bluetooth; then
 		elog "if you want bluetooth support, please rebuild app-pda/pilot-link"
 		elog "echo 'app-pda/pilot-link bluetooth >> /etc/portage/package.use"
 	fi
diff --git a/app-pda/gnome-pilot/gnome-pilot-2.0.17.ebuild b/app-pda/gnome-pilot/gnome-pilot-2.0.17.ebuild
index 8223b2452192..5efd85bb12bc 100644
--- a/app-pda/gnome-pilot/gnome-pilot-2.0.17.ebuild
+++ b/app-pda/gnome-pilot/gnome-pilot-2.0.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/gnome-pilot/gnome-pilot-2.0.17.ebuild,v 1.1 2009/01/12 21:49:07 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/gnome-pilot/gnome-pilot-2.0.17.ebuild,v 1.2 2009/02/22 21:31:25 eva Exp $
 
 inherit gnome2 eutils autotools
 
@@ -55,7 +55,7 @@ src_unpack() {
 }
 
 pkg_postinst() {
-	if ! built_with_use app-pda/pilot-link bluetooth; then
+	if ! built_with_use --missing false app-pda/pilot-link bluetooth; then
 		elog "if you want bluetooth support, please rebuild app-pda/pilot-link"
 		elog "echo 'app-pda/pilot-link bluetooth >> /etc/portage/package.use"
 	fi