Since libxml2 will never get pulled into stage2, change the check to be more accurate by checking ROOT, instead. Thanks to Andrew Gaffney <agaffney@gentoo.org> for pointing this out.

Package-Manager: portage-2.1.4

4 files changed, 30 insertions, 15 deletions

diff --git a/dev-libs/libxml2/ChangeLog b/dev-libs/libxml2/ChangeLog
index 7f31617966ac..da0e97a607db 100644
--- a/dev-libs/libxml2/ChangeLog
+++ b/dev-libs/libxml2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libxml2
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/ChangeLog,v 1.203 2008/02/05 03:16:30 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/ChangeLog,v 1.204 2008/02/08 19:29:16 wolf31o2 Exp $
+
+  08 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
+  libxml2-2.6.30-r1.ebuild:
+  Since libxml2 will never get pulled into stage2, change the check to be more
+  accurate by checking ROOT, instead. Thanks to Andrew Gaffney
+  <agaffney@gentoo.org> for pointing this out.
 
   05 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
   libxml2-2.6.30-r1.ebuild:
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index bd178b93d337..46451a9ae5ad 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -10,14 +10,14 @@ DIST xsts-2002-01-16.tar.gz 6894439 RMD160 e8905fe1451a1c367b0104af24edca73bad1d
 DIST xsts-2006-11-06.tar.gz 4349266 RMD160 a64caae64dd82c703a94fa63ce1291dc289df376 SHA1 fff51a184bdd310f5b177a87503df2288db83e40 SHA256 542db1d583061f3f713481aab6aa6cb382efec87716d74b94c4a0155981e2d09
 EBUILD libxml2-2.6.28.ebuild 3227 RMD160 40551e351871540f3a278cb88110a6d427b5d91a SHA1 26431b6f08f1d31d53b9302453463279dd43af3d SHA256 70768612278c3c9e9ded9575d2c7120b91ca62408a933378a70081c6d66a2760
 EBUILD libxml2-2.6.29.ebuild 3124 RMD160 ad1c943d31a5e6d63195cae84266064cc90ba424 SHA1 9c583f48de50b7e4e095b838590abd6dd9870402 SHA256 dcbc9c3598c8717a0867e8e16033da3fb92ce532a6393e22261bf1e133f5c4f6
-EBUILD libxml2-2.6.30-r1.ebuild 3518 RMD160 742f17bde7a679d353cc1c1dbcb4222fa29b3b1d SHA1 388d22b22d0bebfd843e0d3f0ab11a7ce6b241fa SHA256 d34fe129e081533a726ffeb2f918c77dd3cdc9ae78124dbaa5983b06679eabff
+EBUILD libxml2-2.6.30-r1.ebuild 3461 RMD160 fc6436cd78c1b7bc61257e3229558fec4ae73dd6 SHA1 e3ac2c25c402ce0be461984a74ed05f8d48ced92 SHA256 25b12e5b7b2af8f0d31b594400e9b6724fb3c9b8ef4561ef49170a61ef0dc55a
 EBUILD libxml2-2.6.30.ebuild 3112 RMD160 f1dea1dd1096017d8702d42e2b0431d7309cfbc2 SHA1 33c64e224815225eaaf704df83aeacde8dd6bab8 SHA256 6d173dce141009909c22d489c0ce15b261bd153ccca5d9d5d1ef9f77486cec6a
-MISC ChangeLog 25720 RMD160 90e98947bc9eb505df2bea2a2a8377f4e40d2930 SHA1 51c7806878f29b08c830f0d216dc94768dea1a24 SHA256 f2ea4da95130bd2fe450b9c3dc17cee7d20cc63ddd4bcc583c94363a953f937d
+MISC ChangeLog 25992 RMD160 aad9f09cb92245ea82f975e37141589cddcc03f6 SHA1 a554a0b7ae0f10d4d303dcda1d1622455f383d60 SHA256 88085aeaab7a648f8afc59db45e279f5d732add14dff2a605cc6225a83ae46ea
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.8 (GNU/Linux)
 
-iD8DBQFHp9TRkT4lNIS36YERAoyuAKCTPHJQ1BH+v2w5On0tkrwDcqFuKgCeLfdS
-d13n77rvcYH0QDWpOKLx10s=
-=USkC
+iEYEARECAAYFAkesrZAACgkQkT4lNIS36YERkwCgvClxMAtMvEWZkzvwK2q6GYjB
+j1IAoLB/zu35wI0jgg8r9AzYCIKBqGz5
+=qgG0
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libxml2/libxml2-2.6.30-r1.ebuild b/dev-libs/libxml2/libxml2-2.6.30-r1.ebuild
index af4ea26b0380..4f8d1825c84a 100644
--- a/dev-libs/libxml2/libxml2-2.6.30-r1.ebuild
+++ b/dev-libs/libxml2/libxml2-2.6.30-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.6.30-r1.ebuild,v 1.2 2008/02/05 03:16:30 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.6.30-r1.ebuild,v 1.3 2008/02/08 19:29:16 wolf31o2 Exp $
 
 inherit libtool flag-o-matic eutils
 
@@ -97,10 +97,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	# We don't want to do the xmlcatalog during stage1/stage2, as xmlcatalog
-	# will not be in / and stage1 builds to ROOT=/tmp/stage1root while stage2
-	# doesn't pull in this package.  This fixes bug #208887.
-	if use build || use bootstrap
+	# We don't want to do the xmlcatalog during stage1, as xmlcatalog will not
+	# be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887.
+	if [[ "${ROOT}" != "/" ]]
 	then
 		elog "Skipping XML catalog creation for stage building (bug #208887)."
 	else
diff --git a/dev-libs/qof/Manifest b/dev-libs/qof/Manifest
index be9d17407bf1..c66dd3b1182f 100644
--- a/dev-libs/qof/Manifest
+++ b/dev-libs/qof/Manifest
@@ -1,8 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX qof-0.7.2-remove_spurious_CFLAGS.patch 1871 RMD160 04969f05620d71466886120d3c0fe6453f0b92f1 SHA1 9beb5d00f0c47c525114fe0eb0c7bb8de27f8e8c SHA256 129f672ede55a1772eeaa933c6eee6c2602ddc691c08f653f9cfd62194d60bf5
 AUX qof-0.7.4-remove_spurious_CFLAGS.patch 1971 RMD160 98537cbac64fdc709d5ccd09276184359eaa8874 SHA1 e3a19561bbf2b364e37c62589954c39d94012770 SHA256 65120ddf0d29dcc21d64ff873c875affc024a61f2f9a6a8685d843fd54c5fce1
 DIST qof-0.7.2.tar.gz 866343 RMD160 6cbfec970c8cddda9a6ac1520c67361eb77ce92a SHA1 d23455835cdb513a2f1a4c6bfa286a2d0886dd4c SHA256 643359de7833c9fe661fcfc6fc0dc6e3f390bce55041eba123a495e661366990
-DIST qof-0.7.4.tar.gz 905986 RMD160 6258fafeb35c260aff4f576f3a2eac4903c073c0 SHA1 d867aff74136a15bd8bc151c39bbca17a2505f86 SHA256 87b33cd2823cc5d7bf659eadbe9b9c83be0d4257c4827284093704e33ac8abb8
+DIST qof-0.7.5.tar.gz 906010 RMD160 3e0ab118c2c5c1d760f2a9445183e77659f692c7 SHA1 9d7453fca0910c401180b8c8eda7443442633803 SHA256 39dbb47f59ef33d4754f622c4afcc201862743dbd974172f19be0c19cb53428c
 EBUILD qof-0.7.2.ebuild 684 RMD160 ca25f9916bd626274791864858dcb789c3cb9ad5 SHA1 4e24966f64a17c7566e6b83bf9abc0bd4fe49511 SHA256 1170b454785eb568519a0567a307d49f3c0b031802887e5ac20fbb80c31aa44e
-EBUILD qof-0.7.4.ebuild 1026 RMD160 598eb2b0ba96883b816f75a258edbc35c35d21fa SHA1 5422819adad24135f73044f112a9e5566c670b26 SHA256 69ae1120e1959e42b4f0a45b6d29efc6bc46eebb62a88c3b4de48b79bcbba402
-MISC ChangeLog 2218 RMD160 71acdce1bdd3c0557f319b6d0e3c4c6edd338111 SHA1 3065e18da89f700848c0ca6754ebd898b261de43 SHA256 63461219706727d23a6f91d7b16e741f9f3083b28c7d6eefa6a5913557c0f0b6
+EBUILD qof-0.7.5.ebuild 1033 RMD160 169239fefdb2240363f9ec20b9964275539a3768 SHA1 7d3c5d98dce58637e2ed1b91a537977df8e1e552 SHA256 b4bb6b348882ed371ce9be037b0b8bfceb7fc76a066ac43ddb82e6f9eaeb7a79
+MISC ChangeLog 2368 RMD160 8f7da33f77dbf713c487c923935058e96e309c5f SHA1 30caee141d84bb002f37178eb5725f0e7fda2383 SHA256 0c5e1cb99595b5a5ecbca73f3fb26cb13f09fed81ef6f45c449e55dfbc47550c
 MISC metadata.xml 266 RMD160 5fab2514b0096eb1d0710e344d8828acbae236f6 SHA1 082dda7e7d22e86401cba8b8ff225120298f397c SHA256 992d6326c9154489d434561200ae16feff9c42d7c0075e0a6b9dfa39f554f86f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHrK6/NQqtfCuFneMRAvKvAJ9WW3RvFypUIvtsVzYOswLkAdDZowCfYyrO
+UCgCkUk7MqxKboIEZY3wVDY=
+=4jU8
+-----END PGP SIGNATURE-----