amd64/ppc/ppc64 stable wrt #416725 with systemd workaround, see the ebuild for has_version

Package-Manager: portage-2.2.0_alpha116/cvs/Linux x86_64

3 files changed, 26 insertions, 17 deletions

diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog
index ae2e92eeacc3..d0a24995957e 100644
--- a/sys-apps/dbus/ChangeLog
+++ b/sys-apps/dbus/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/dbus
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.347 2012/07/20 23:07:03 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.348 2012/07/21 16:13:51 ssuominen Exp $
+
+  21 Jul 2012; Samuli Suominen <ssuominen@gentoo.org> dbus-1.6.2.ebuild:
+  amd64/ppc/ppc64 stable wrt #416725
+
+  21 Jul 2012; Samuli Suominen <ssuominen@gentoo.org> dbus-1.6.2.ebuild:
+  Use has_version instead of dependency for sys-apps/systemd regarding
+  stabilization. This is only for 1.6.2 and will be left as-is for 1.6.4.
 
 *dbus-1.6.4 (20 Jul 2012)
 
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 4b66ab5a9473..f3a4462d0030 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -14,18 +14,18 @@ DIST dbus-1.6.4.tar.gz 1927446 SHA256 5fba6b7a415d761a843fb8e0aee72db61cf13057a9
 EBUILD dbus-1.4.16.ebuild 4866 SHA256 36a2c944cd2350a3efbd89dbe3fbcab573379ccdc533312cc04277f828308260 SHA512 f9a6905c2f7ab16280667a421baf1afaaa14e5d84f730b96ffd611d8b4a0a5af33b6b4a89c9b7c9d143977544b548a94467d5f7e4272f76e489b650d522601e6 WHIRLPOOL af6286903eeabac04480738e4e7cdcaff6bd00ac56b8892472dcdc829e97681bacc8d3a87f7a177083559719adc8851c992869694e43293311f9e608286be313
 EBUILD dbus-1.4.20.ebuild 4991 SHA256 8a4e0409946c9733a91aea1a005fcb878a3b8eea323083699c58416702ccb0c1 SHA512 747db1a7593d2160977775e79a20c657ece3baf9141720151c7b9295cd1bd9bd27c4d5b56b4d199cd391d894e1fc66c5a3dc4dc28d71d433b7ef1c78cc8756d7 WHIRLPOOL 5400811f6ba2bb4224b6dbbd7fd7aef554428a721c6b20dbaee5d3fd500fffa6120db43c87797719ca1a7844ba3b5ad7f1110197e1b02145e2ccaed8e4407ea1
 EBUILD dbus-1.6.0.ebuild 5025 SHA256 743bcffdaaa69d3828ca651ab408a450c4ccd0a92f4b1f1af497aa075cfeb87f SHA512 3b89a8ec300f685e63e1cdaf4144daeca3154a75a7cf1c0ba2259784cad96d474ff23c4c0f4de58dd115a7d5c30c71f460988e1958fee3558ee82d67c67841c9 WHIRLPOOL 27833077cb782b8a756095c90b702a3c17b5288fb74c7e9c60cf5c5e73522f494474e51f0b2748396838ce80d2449eff3af5e3acb799519e4c0b194848be9051
-EBUILD dbus-1.6.2.ebuild 5018 SHA256 08a0393fae5eba1132f488cddec75504500d4631d1db12c7b95c02dab612da7e SHA512 f61ba37b65cc1711531bba182a47939f2efae08f311a3ae8b364547f52fb86562bea30e89d837e013108e7c251cad29298906919fe72ff44eb594695c0499d0c WHIRLPOOL f802fc8f4a141c8c3dbaff8ebc6faa4046b3ab47f6ef5f46bc98d1aa4b6bbeb5f0c007cf5a93e055658a86ad4733a16cb8e6897214c385ef086cb8458b66c8a7
+EBUILD dbus-1.6.2.ebuild 5112 SHA256 a3008ad0ea1417c76a0ce2535cc1aa512ef1a70592ff3d63b1ae5c1e1790f54b SHA512 4f5f29bb5040f9ed740acb10bf4a1416fc3700179b4fb696d4495c71e7775a6ca476defa8422ef5d9ea6d327d7d7541bdac2915a729ed5527ebe6f6c0ce65cd2 WHIRLPOOL 1c02a7819257403bef6821f821cc07ab746e75d39469a3c5a3c17b52027cb05a7f8a1e40560b2a7cbc38370292302a78221321cd8f7e42c9d09903669f04e732
 EBUILD dbus-1.6.4.ebuild 4997 SHA256 c57259b100d8fa40f5ae0fde82a7c4dbe67d43107b3cbd35da34148e3cc82a5b SHA512 3ffa0b64ce5849ef5f066376d5c802534f6490b44df95e70e29d03c11618c2e2b14f6709a6b5ac2f70d7ea8c44635e584bae85f4226452233a837ff4d01a9689 WHIRLPOOL af1ba5aa5be48673d7c3acb92b2cb10eb79185ccd2c0f21745e708bfc7abdb3c18f9c9b0f582756ea7ab721ba1c0498d0cda23372cfbd91ac250531401e9481a
-MISC ChangeLog 51377 SHA256 b624746f6487effda6d8c601098d570621d3f781ba05db8c327c49c94dce151f SHA512 0940ef7bda12dd7ed6dbedb0d3b5f3a193cb3fb507771da49a3d49eed7fafc82cbac44603047ecf7176028c5c0bcb012229de5bf7e0841fea04f80e52e23bb34 WHIRLPOOL 5befb80681a2cb1efdf6503214860008c4042780559ee5cd6a5941a6c577f975f84faa8e37419902f6a89996b66391aa1a19ed2e7f305380cc422356f1f5b974
+MISC ChangeLog 51707 SHA256 c5a50b8720d51d724cf10d47a69cc52a1f0775a470f79dcb96f284c8e7c8d46c SHA512 2e9e3e7c9807226ee5d0b8d3177225fe53ab2ce9ff8ee21d9a3e8068534909f30075ac60a5ef5242084a5dd4b3c3e994c4861c6ebee374720c368aa77ac01d16 WHIRLPOOL 4b9a13ccde39fcaf0c5b83afb16db2bc797ab87b90e17c3933047b31192a739c9bcce50c4f08bf274e38169ff7ef26c36151a4819a4d6bc21012ec005b135acf
 MISC metadata.xml 342 SHA256 5db8eac45a8872150729ee08297c2a19468336c3b9412e9f8e64ca2a2f5406c3 SHA512 01e10de9adb42a26339a096215305853c646c23c533df70ad044f92109d2138efe86465b00462d649f1d0e8ea1896320e09a571fcbe95318c5df9024d8f65b19 WHIRLPOOL 303cd9e4e6451ddf37da658766c877b960942f8a170948b60e6f4b1d72e7d3df5f4b4bf4fb92016caacaa611198e77aefaeedd5d3706c538b0bd0b5c086fabba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJQCeL+AAoJEEdUh39IaPFND8YH/j6LY+/AvZpZ5UFxRqMehujh
-52hQVfpb1v8a3CpzT1/vTFwTP/xUmHo5djzeo8/klNVz75xG60O3xhaW9VXIA/qC
-7l7KGCbs03scSyHRXnroqeaw+qhnql6OBWLYH1U0Lx8h9/pwAFulJOT26EGceb1r
-VgIFyrkDSBwBgit4Pgci0d5pzA6Lvjn+opNvhs9dddc+5QJV7I0rILjmeVhuBLt7
-r3AEcbXsKkrEJN6TNUYENIwJyI+bz+tRy3A9rlGoxEZpdbnelWPtABZ9ZnSk98Xi
-nysbJvZhN2ClnFSKs/Jd0DIhbx/c/MsveowXwbnFArg6GEnPuOpXiV5me40f/mk=
-=RGR5
+iQEcBAEBAgAGBQJQCtOiAAoJEEdUh39IaPFNlLQH/0Ybaq6JY6g7/mC7ognmr6aB
+spLH2ji2dpZ0sKWgUj9vqEWLf8/vLrnQguNNaW8irwgldJMsOKhVJ4RU0GgO4byC
+fUwJ/wv/foOHt7O+QqCdHhMv0qo7v/LnFcPIXECGBzpJaEw1FeKLTYFt+3iXmJrI
+f76kv3QBd18c5DROdCvBI9Ef/win1NigsF5n0uof9gcIVDJy8LtQP0xpLgO0/k74
+zCKgmGf9lRcYvuy/bARtKBrO8OYli68hpfEclTaB+G+aIX6AaNnl++6MuSFmZDJ3
+dfr1sPZ5GM8wcC2IKwMsjrm7sl0zvXUHPdLpbsdYUZ2ETy+uBZxN42W+TEu88E4=
+=oUYi
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/dbus/dbus-1.6.2.ebuild b/sys-apps/dbus/dbus-1.6.2.ebuild
index 729fd530523b..8dfcea34864a 100644
--- a/sys-apps/dbus/dbus-1.6.2.ebuild
+++ b/sys-apps/dbus/dbus-1.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.6.2.ebuild,v 1.2 2012/07/20 15:06:46 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.6.2.ebuild,v 1.3 2012/07/21 16:13:51 ssuominen Exp $
 
 EAPI=4
 inherit autotools eutils linux-info flag-o-matic python systemd virtualx user
@@ -11,7 +11,7 @@ SRC_URI="http://dbus.freedesktop.org/releases/dbus/${P}.tar.gz"
 
 LICENSE="|| ( AFL-2.1 GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="debug doc selinux static-libs systemd test X"
 
 RDEPEND=">=dev-libs/expat-2
@@ -19,7 +19,6 @@ RDEPEND=">=dev-libs/expat-2
 		sec-policy/selinux-dbus
 		sys-libs/libselinux
 		)
-	systemd? ( >=sys-apps/systemd-32 )
 	X? (
 		x11-libs/libX11
 		x11-libs/libXt
@@ -71,14 +70,18 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf
-
 	# so we can get backtraces from apps
 	append-flags -rdynamic
 
+	# temp. hack for stable wrt #416725#c5
+	local myconf=( --disable-systemd )
+	if use systemd && has_version sys-apps/systemd; then
+		myconf=( --enable-systemd )
+	fi
+
 	# libaudit is *only* used in DBus wrt SELinux support, so disable it, if
 	# not on an SELinux profile.
-	myconf=(
+	myconf+=(
 		--localstatedir=/var
 		--docdir=/usr/share/doc/${PF}
 		--htmldir=/usr/share/doc/${PF}/html
@@ -90,7 +93,6 @@ src_configure() {
 		$(use_enable selinux libaudit)
 		$(use_enable kernel_linux inotify)
 		$(use_enable kernel_FreeBSD kqueue)
-		$(use_enable systemd)
 		--disable-embedded-tests
 		--disable-modular-tests
 		$(use_enable debug stats)