swap the foo-bundled logic to enable proper masking, revbump because of the various changes

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

4 files changed, 30 insertions, 21 deletions

diff --git a/sci-geosciences/googleearth/ChangeLog b/sci-geosciences/googleearth/ChangeLog
index bc991b4824e2..3c88f8b2a5de 100644
--- a/sci-geosciences/googleearth/ChangeLog
+++ b/sci-geosciences/googleearth/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-geosciences/googleearth
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/ChangeLog,v 1.44 2013/02/10 15:45:05 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/ChangeLog,v 1.45 2013/02/10 16:50:14 hasufell Exp $
+
+*googleearth-7.0.2.8415-r2 (10 Feb 2013)
+
+  10 Feb 2013; Julian Ospald <hasufell@gentoo.org>
+  -googleearth-7.0.2.8415-r1.ebuild, +googleearth-7.0.2.8415-r2.ebuild,
+  metadata.xml:
+  swap the foo-bundled logic to enable proper masking, revbump because of the
+  various changes
 
   10 Feb 2013; Julian Ospald <hasufell@gentoo.org>
   googleearth-7.0.2.8415-r1.ebuild:
diff --git a/sci-geosciences/googleearth/Manifest b/sci-geosciences/googleearth/Manifest
index a208c3468f5a..49cb1e32cf55 100644
--- a/sci-geosciences/googleearth/Manifest
+++ b/sci-geosciences/googleearth/Manifest
@@ -19,18 +19,18 @@ EBUILD googleearth-5.2.1.1588.ebuild 5050 SHA256 d255198952a233dd2ef0b3b38a94f91
 EBUILD googleearth-6.0.2.2074.ebuild 5594 SHA256 be46e5b760b61cdb03c2eb619fd3136e8dcee2c65e805ba96cf3b3723116fed1 SHA512 c571bc7598e8d6723d48ab09aab969ac37449db37c3ca264905b45840169a3ba5115882735a73fe96b21e62b06ccc40364d0640d0130947e227f9296c27bbd96 WHIRLPOOL d8f216b7028e4a5ec8ecb3cdf15db01e515e3bb64e1db79f0935fc660c650343b0a287c067cfd0d88087bedf6a3ee5e90e5efc0e1585d7f8f40aaa3569a806b9
 EBUILD googleearth-6.0.3.2197.ebuild 5314 SHA256 7343f140a32d51a96e9dddbf4e0988aefac78275a74804077b03510e21a79ea0 SHA512 fd174bf1f7e588a6f8db8b364968733d2ec10409a059b7b51119179f6e3154beaeee1de94fd1909d2305d5e8fe5e03fb093bc35ae6990eb2a920f6b3be2306c3 WHIRLPOOL 3502b7a9527a21ab0f1948e92924c76325e1318042fa310aa7cb013827992cd23389d5edb0931d35833a7d1416018775d68c79313a7dacfd14bafb6cd4d150c9
 EBUILD googleearth-6.2.2.6613.ebuild 5731 SHA256 34909ff86643d41e9f0dac51ca0526b2fbd4d444afc831097cf192950fb9f37e SHA512 c5fba34a570acb7ae5497fd0cde8f56d3982b7f87189d644a7ec7bf2eaeee15ef0b0d0a2f7bdb08f2d83804937174f87b19b77bac92016ad8f78fc45b6e026a0 WHIRLPOOL d92f9c3434a3a725fe7a6185dd651511a4342330f4dfe70b431f69204bf26a5870c537e16c4be0586bc957f294ce865bc4763d1d9bef624490f48a51ce7d63c0
-EBUILD googleearth-7.0.2.8415-r1.ebuild 6055 SHA256 39d385f6f2fe9ff0f26b506ba3a07915fb43fac91f514d8357661ef10d3059d5 SHA512 23efdd3371ee0324733025767f747edbcbf71ba664962b0493e6f7203dc0827a018e0fb9c55c44c4221ab6eb043c48d2e7a13c75560d1ea8ea1bdc034a4d9588 WHIRLPOOL 3e2daba407dbc972be75502aab0457e0633f38c3d7eb18b028aaa6b31df676e9a539326a8592f36cea5e5a3a1da9ad03567623709deb260caa0c29d09b79434b
+EBUILD googleearth-7.0.2.8415-r2.ebuild 5934 SHA256 e5ed84a2fe6b6a94fa4b302dd084283289062087141cefa0a8282d642bfb7716 SHA512 2a50720f5bd1eec080f177a1a2e1097651fa45772ea235b0aaf5650aa15e65f0f69f1dc8ec9ca29233bc396284a85c1c4e6cac45c272074d079a8f0b03cdf436 WHIRLPOOL 67612ce3e55c849211229c2c9c127dbdab27bb9e2971fc666d7689d255104f65a65db7ad9d672797e85260f515c096b2d24af54c097cb4aa4ba92236ee7181af
 EBUILD googleearth-7.0.2.8415.ebuild 5953 SHA256 b9daf0a978c40dd6db4c8536f332391a00347533d60f28a6c69931ca617150bb SHA512 aaed762e41ccaf7e78dbbad6f8eb50dc714f0bd8c8c659e63b4f27025765af227c241f6f11fd9186c497138e0a1f88afbef3c929e99392ab5a6b863dcc91f2f1 WHIRLPOOL 6f10bbebc7f0839a61f58f05c1e0c7edc96b1c9c8c87c323d705cc379269489644352e23ae4b91a77dd25fbf6a340482ce38a58d4d9333717b575dcc70dc5028
-MISC ChangeLog 19860 SHA256 5c3c2cf536081ac38a511d0502078920074ee8591eaacea13808046ede923e96 SHA512 3545bcd422a805d6c13fa5a94a78283f10561709810ff00246972859996370d278509fe405a0ea8f2eb65c6135863dc76dabff1036e615e62ca60c704cd481bc WHIRLPOOL 3b57ea9ddfeb1e5f41825148108d1fb3d9587c97101b6595e89a4774872b3839795f6dd9e29ca0389da30a7f4c5bfc624081c4f7278820ae3c4483942dc29c0c
-MISC metadata.xml 524 SHA256 8e119c5dc5c4a8756360aa74fbadac995719e08623737ea0c92f7e4c8673a674 SHA512 29e7f68c97977a406b8fe0e31f38ee677e6e06f7dc6b80eef3b975e5a86e933c04924a249193235bd4cd02fd52553d8d6127bb432b261ca2a53d742ab9ee065e WHIRLPOOL 58b8dcaaba193b8c742aa762ab2716bf678883880917f58da52b8349ccd06a5b037a534b05f80ee9cbd3a1c62c469c761c09d9bc558911d33ff90db42447c18d
+MISC ChangeLog 20138 SHA256 9fe07ce6f4f4347c0f4d7a42631aabb819eaab8c0e7055ffd19660e6d1f2f912 SHA512 e1ae5aa373b78ebece188727f174ac5c63ccbf7930faa732b14b2ef879686ab5d9f7c1108a1b09f399a5c01f408f650f5e6c2269fba0092a9a3c2ed337c43955 WHIRLPOOL 6f44bd4ab57341b3d4f451a556737e69cc603afae05e3d32ee1ae8f06d9b73efd72b018cefdc6998ec02eea53d98b6c49ac8e03a58b9fc0a1003a70a28253f89
+MISC metadata.xml 719 SHA256 6d81d4e369e72eb574dba94657ac9d9d53afb76f54e1c2500fca5afd159b7c85 SHA512 683487d3c32f59cf0745cb9c0cca7f0b55517ddf6487e51643689da0b0a9150427d05fdbd05148c3aa3532d1101f36d96f0d96983aded0fb98350ed5e8119915 WHIRLPOOL 445449e004576f7ef94e6b4da87e42d70e85ae1c7f567ca9c9f2ad7e508ffc26b17504994c9faee9eaa0e1cb27c73d758ac19c9d459cfbcf3c3fb3e98d13da3d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRF8CDAAoJEFpvPKfnPDWzDDcH+waZXpd20ZoK5FPJpfbO+gtW
-9dey1VSZ4ADuSuNM09o9BJGfLTdVtFhIv05IvLB8lnonc//lQi89cxqptqGfIc3J
-+qpDsC0Brqk4SsDsi3wDTITOgIv58th8QfcIxMzZKLTTM6D72EEw7OcMd6BY2s99
-edcJU8fhyzcS9yPdIpaByIsBO0P7afdZCJL6aw1ukmZ8GxWRVGiaFsg3d6iKBkUn
-cPu1xQNHnYrdfSjfRNWZs0GhTzCguktxUyhyVH8Fi/8cW6cbV7IWZY2MU2AUTjeb
-mpKaMMLCwjnSd7KVQvPMtS/FMyXrC9wQXWaELDHYp+EimLCzUCaUXmgS+aduN0o=
-=aB7U
+iQEcBAEBCAAGBQJRF8/JAAoJEFpvPKfnPDWz0S0IAK/QX0xeBAn8ExhC87CrXlWm
+3xkVtWUKiFtr4FlyIMj/McFNs3OYdczbbXV8qnTU9mhNoiklc3DjeVMTNvugY0TY
+u0jDamLwTOYOATO2dF6hP7rsXAjgWUZ43lF9pPsLrobO7powfb8wTxdx5FNtr0dW
+jI0jG3dXcO2//GpoiaCFiVlWG8pFae0adzcM8Mnm7HyiS5H5Xbc4wxXJ734r8zpw
+cfmp/YvsUYeoN1XLWCb7DHcbpfVcA4urmz1tCFMoBx0RT8LgtX5O3+Fre0kZi0SG
+r7j5OP0WQUpJw0aFH7/Crp4ujAQLR7bqAwif1lVDpHrdnVs+hptxlwsvfzUaTYA=
+=1RvA
 -----END PGP SIGNATURE-----
diff --git a/sci-geosciences/googleearth/googleearth-7.0.2.8415-r1.ebuild b/sci-geosciences/googleearth/googleearth-7.0.2.8415-r2.ebuild
index 51140b153ab1..1128c96a8a84 100644
--- a/sci-geosciences/googleearth/googleearth-7.0.2.8415-r1.ebuild
+++ b/sci-geosciences/googleearth/googleearth-7.0.2.8415-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/googleearth-7.0.2.8415-r1.ebuild,v 1.3 2013/02/10 15:45:05 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/googleearth-7.0.2.8415-r2.ebuild,v 1.1 2013/02/10 16:50:14 hasufell Exp $
 
 EAPI=5
 
@@ -19,7 +19,7 @@ LICENSE="googleearth GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 RESTRICT="mirror strip"
-IUSE="mdns-bundled +qt-bundled"
+IUSE="+system-mdns system-qt"
 
 GCC_NEEDED="4.2"
 QA_PREBUILT="*"
@@ -39,20 +39,20 @@ RDEPEND="|| ( >=sys-devel/gcc-${GCC_NEEDED}[cxx] >=sys-devel/gcc-${GCC_NEEDED}[-
 		x11-libs/libXdmcp
 		sys-libs/zlib
 		dev-libs/glib:2
-		!qt-bundled? (
+		system-qt? (
 			>=x11-libs/qt-core-4.5.3:4
 			>=x11-libs/qt-gui-4.5.3:4
 			>=x11-libs/qt-webkit-4.5.3:4
 		)
 		net-misc/curl
 		sci-libs/gdal
-		!mdns-bundled? ( sys-auth/nss-mdns )
+		system-mdns? ( sys-auth/nss-mdns )
 	)
 	amd64? (
 		>=app-emulation/emul-linux-x86-xlibs-20081109
 		>=app-emulation/emul-linux-x86-baselibs-20081109
 		app-emulation/emul-linux-x86-opengl
-		!qt-bundled? (
+		system-qt? (
 			>=app-emulation/emul-linux-x86-qtlibs-20091231-r1
 		)
 	)
@@ -87,12 +87,12 @@ src_unpack() {
 
 	unpack googleearth-libexpat-2.1.0-novisibility.tar.xz
 
-	if ! use qt-bundled; then
+	if use system-qt; then
 		rm -v libQt{Core,Gui,Network,WebKit}.so.4 qt.conf || die
 		rm -rv plugins/imageformats || die
 	fi
 	rm -v libcurl.so.4 || die
-	if ! use mdns-bundled; then
+	if use system-mdns; then
 		rm -v libnss_mdns4_minimal.so.2 || die
 	fi
 
@@ -161,9 +161,8 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	elog "The qt-bundled flag is now enabled by default due to crashes on startup with system Qt."
-	elog "Testing and reporting outcome with/without the flag is welcome (bug #319813)."
-	elog "If it crashes in both cases, disabling tips is reported to help (bug #354281):"
+	elog "The system-qt flag is disabled by default due to crashes on startup with system Qt."
+	elog "Do not report bugs if you attempt to enable this masked flag."
 	elog ""
 	elog "When you get a crash starting Google Earth, try adding a file ~./config/Google/GoogleEarthPlus.conf"
 	elog "the following options:"
diff --git a/sci-geosciences/googleearth/metadata.xml b/sci-geosciences/googleearth/metadata.xml
index b28e80e846f5..576b8f9cff63 100644
--- a/sci-geosciences/googleearth/metadata.xml
+++ b/sci-geosciences/googleearth/metadata.xml
@@ -8,5 +8,7 @@
 	<use>
 		<flag name="qt-bundled">Use bundled Qt4 libraries instead of system ones. Recommended only for troubleshooting.</flag>
 		<flag name="mdns-bundled">Use bundled nss-mdns library instead of depending on sys-auth/nss-mdns. Enable this if you want to avoid the deptree.</flag>
+	    <flag name="system-qt">Use Qt4 libraries from portage instead of the bundled ones.</flag>
+	    <flag name="system-mdns">Use nss-mdns library from portagen instead of the bundled one.</flag>
 	</use>
 </pkgmetadata>