Rewrite systemd dependency (#468908 by Fabio Erculiani), drop old.

Package-Manager: portage-2.1.11.62/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 12 insertions, 160 deletions

diff --git a/gnome-base/gnome-control-center/ChangeLog b/gnome-base/gnome-control-center/ChangeLog
index f8fa4cdab1a7..8343013ab29c 100644
--- a/gnome-base/gnome-control-center/ChangeLog
+++ b/gnome-base/gnome-control-center/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gnome-control-center
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.124 2013/04/07 09:19:11 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.125 2013/05/07 18:47:12 pacho Exp $
+
+  07 May 2013; Pacho Ramos <pacho@gentoo.org>
+  -gnome-control-center-3.8.0.ebuild, gnome-control-center-3.8.0-r1.ebuild:
+  Rewrite systemd dependency (#468908 by Fabio Erculiani), drop old.
 
 *gnome-control-center-3.8.0-r1 (07 Apr 2013)
 
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index acff43c8c190..26ce506c1f5d 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -20,14 +20,13 @@ DIST gnome-control-center-3.6.3.tar.xz 4877812 SHA256 2ae23972bc64f62b4facd12dd5
 DIST gnome-control-center-3.8.0.tar.xz 6793712 SHA256 154653d45c224eb5daf5a756e145989c2477fc4b448af20a5b62dbb897dd74f7 SHA512 abffd5b5942c02db8ca3263faab2c4e76865f5d3b4666a6d830c6b62e87e3a922bd7564d7c3bca21e2d8394a4efb505035fe685a189a0837cdbd3a81e9a6c970 WHIRLPOOL e50737d74e54eb8675d7ab4b8199306fcb28eaa6c0cb3317f41a68e07ed9b03c3f5b02ad04bbe68e639e72e835f78941f0f4967f86cac0c677c66273fe132eac
 EBUILD gnome-control-center-2.32.1-r1.ebuild 2686 SHA256 575724aa369631c48fef3810bc831abc687fe38e30df4f25e7af600fc998e270 SHA512 2b792066b1c09eb4433a87222732c9dc4e3df593699454da57e9d4f3939f0c593429c8b2b3e712d2508700fc03b8e8e1066efa65348bc2016dee0d21c4089a92 WHIRLPOOL 8b7f2d6b9a66581efb5b31b8573d67acbce8d450ca303eab36641ef429e8fa6e88aa299c525cd223155ad67299926c56a0dfd432b8414672284424642117d92a
 EBUILD gnome-control-center-3.6.3-r1.ebuild 4559 SHA256 d532e2601572d312f367ee885aedf2f9b057b2ea1151bbf4bb2051f5633bb892 SHA512 db7dd4fdc00654669da0c0213714eb9a966f4a5ac1d98b5455eb1470fdb31c5d31ace30793c2e32f9fecf42adc58aac6e2d2e581e9f73e6eb3d9e6618447d2dd WHIRLPOOL c5bf7f6bcc5ee2eda5bc351975ed9143f9b31a14af3f250cdfc8d82189485eeea5db5f236b29be74ea59914151500d4a3841854146a8f163b58f45228ffd5db8
-EBUILD gnome-control-center-3.8.0-r1.ebuild 4419 SHA256 ca31257544e57a63393e569eb9a163d8349bcefa5a7ac7fcc5bc16b9326570b1 SHA512 23db384f2dc69fe77e5ffbfd54e4d426da5116bcd6df0d09814ac0f6a8ef5740bdaa7efac3a734f5ce2840836c69e28278e41fd602f2ed7e7cef2b4b98787ae0 WHIRLPOOL efec3c6365c8ff1772e0706ab051ee4cb5686be89fe7a270568dd767280ce5ad4dbe26805540b00d325576d9f7650448ef938d21976dddaa228fc5d0ac5e2430
-EBUILD gnome-control-center-3.8.0.ebuild 4510 SHA256 6d40653b948d250f0d4a544c1c61ff49517a6c9995407d1e216a1ececcf45f97 SHA512 e530738fc7fd142642353e31f76d3c6302abd7f72b321212aaf2a67fefdf038efed387e74dd7e2348e22f4e77c52543fd954a3ab738c14e227175f4830bb4c39 WHIRLPOOL 0fb2db01869ee5aefe54dc225824bb753c8b9d3fa73fddb5e11f6e9cfbc3d6f49f7e8bda0cd82a47de6bb8cf75a975c4c311572c1967e050aacbb6c69d7b3215
-MISC ChangeLog 61986 SHA256 d927e351203f7d25f381f33b418279497b2b261a27d043ef9e68dc31b6ebdea0 SHA512 cfbcec1751f0dbb3a3dce8726949d47244f9e09134bcf39d8974c831d9ca9c2fe27a20860ebed67309dd58f003cff463836c4a1418e27ba00cd85d1b08a18733 WHIRLPOOL ce22055da3d452c52bf0fb6af2fff9b57069113f3483d2001f66e6d9319adc3eceab03cdd747bbb517309f747e84ce59bf5eeb690e23bd6b7deb2807cb330b9e
+EBUILD gnome-control-center-3.8.0-r1.ebuild 4434 SHA256 35e96e4eaff1294824e3fb761e16a6fff0db3a0af0ab3a56f22dd83d9ebda7be SHA512 9606a3741fd09d34f2dfcdbea82157ca9cc5156b4b2cf75b12884cd35a3ff39ed9a28b1c9959c8353a13b94da65365b00599fb63ca64ddaea7d5b8de9983b783 WHIRLPOOL f5a254df7aae387935dfa9b92d4b2e301852ef73c3a9d17f75928d3f031082f64967408d783c561d06f63ce807760d254602b20696d295e0e148f3562c1f60a7
+MISC ChangeLog 62178 SHA256 669b2978023ebaa2511e37d9805778b445f85f195536141a71eb5dff17c063cb SHA512 89d6504c5a38a2a599d0046cea2bb734e477c01f36b53915c46afcef0a4fd2d4137c7277c35a08ac20b0115d1cef55efd3d626d39c83f8777cc7dc127849cc1e WHIRLPOOL ed37e86680fa183ec2a46a10f8f86e1008a38223ce183ddd4f9b34a24e05ae6745d6c074a4bee8aabba608232801db87f1e63e7038c9ffb6c70eceb4764c6c0d
 MISC metadata.xml 626 SHA256 c9a75efab859ae7807307d84c8c849b4b1c3874bfbb598934146295b5a3f4328 SHA512 be29f660669a454fa1d237dff0045fb574ca9919351e685bb15866a700995ee2de2c7379a60441d08830dfd1d5d5c43a74e731e2a2e92a13109959a42353a87f WHIRLPOOL 1b967098d536cffb46d6b1ae877fa131c7672eb17dd0f49d62dc97a8b6157efb6371664b63a71269aa951e3f59b68e6bce86d037204f4f43242b649081828fcb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlFhOhEACgkQCaWpQKGI+9QucACfXALt/BdcjFQuz5aAJ08l2EX2
-br4Ani7zzhiIFdfU6nabzgW7UBQMi/O5
-=JAwA
+iEYEAREIAAYFAlGJTDEACgkQCaWpQKGI+9RmDQCfUe2azafPXQLvSNYjr4OxvN5s
+1IYAnAt30xI5DSxj/es1X+18pWsK1Iax
+=3SIx
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.8.0-r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.8.0-r1.ebuild
index b0da8db6ac49..f80c419730c5 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.8.0-r1.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.8.0-r1.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/gnome-base/gnome-control-center/gnome-control-center-3.8.0-r1.ebuild,v 1.1 2013/04/07 09:19:11 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.8.0-r1.ebuild,v 1.2 2013/05/07 18:47:12 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -66,6 +66,7 @@ COMMON_DEPEND="
 "
 # <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
 RDEPEND="${COMMON_DEPEND}
+	|| ( ( app-admin/openrc-settingsd sys-auth/consolekit ) >=sys-apps/systemd-31 )
 	>=sys-apps/accountsservice-0.6.30
 	x11-themes/gnome-icon-theme-symbolic
 	colord? ( >=gnome-extra/gnome-color-manager-3
@@ -73,9 +74,6 @@ RDEPEND="${COMMON_DEPEND}
 	cups? (
 		>=app-admin/system-config-printer-gnome-1.3.5
 		net-print/cups-pk-helper )
-	!systemd? (
-		app-admin/openrc-settingsd
-		sys-auth/consolekit )
 	input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] )
 
 	!<gnome-base/gdm-2.91.94
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.8.0.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.8.0.ebuild
deleted file mode 100644
index c8bc2f8f46b8..000000000000
--- a/gnome-base/gnome-control-center/gnome-control-center-3.8.0.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.8.0.ebuild,v 1.1 2013/03/28 23:08:07 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="GNOME Desktop Configuration Tool"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2+"
-SLOT="2"
-IUSE="+bluetooth +colord +cups +gnome-online-accounts +i18n input_devices_wacom kerberos +networkmanager +socialweb systemd v4l"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-
-# XXX: NetworkManager-0.9 support is automagic, make hard-dep once it's released
-#
-# gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login
-# g-s-d[policykit] needed for bug #403527
-COMMON_DEPEND="
-	>=dev-libs/glib-2.35.1:2
-	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=x11-libs/gtk+-3.7.7:3
-	>=gnome-base/gsettings-desktop-schemas-3.7.2.2
-	>=gnome-base/gnome-desktop-3.7.5:3=
-	>=gnome-base/gnome-settings-daemon-3.6[colord?,policykit]
-	>=gnome-base/libgnomekbd-2.91.91
-
-	app-text/iso-codes
-	dev-libs/libpwquality
-	dev-libs/libxml2:2
-	gnome-base/gnome-menus:3
-	gnome-base/libgtop:2
-	media-libs/fontconfig
-
-	>=media-libs/libcanberra-0.13[gtk3]
-	>=media-sound/pulseaudio-2[glib]
-	>=sys-auth/polkit-0.97
-	>=sys-power/upower-0.9.1
-	>=x11-libs/libnotify-0.7.3
-
-	x11-apps/xmodmap
-	x11-libs/libX11
-	x11-libs/libXxf86misc
-	>=x11-libs/libXi-1.2
-
-	bluetooth? ( >=net-wireless/gnome-bluetooth-3.5.5:= )
-	colord? ( >=x11-misc/colord-0.1.29 )
-	cups? ( >=net-print/cups-1.4[dbus] )
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.5.90 )
-	i18n? ( >=app-i18n/ibus-1.4.99 )
-	kerberos? ( virtual/krb5 )
-	networkmanager? (
-		>=gnome-extra/nm-applet-0.9.7.995
-		>=net-misc/networkmanager-0.9.8[modemmanager] )
-	socialweb? ( net-libs/libsocialweb )
-	systemd? ( >=sys-apps/systemd-31 )
-	v4l? (
-		media-libs/gstreamer:1.0
-		media-libs/clutter-gtk:1.0
-		>=media-video/cheese-3.5.91 )
-	input_devices_wacom? (
-		>=dev-libs/libwacom-0.6
-		>=x11-libs/libXi-1.2 )
-"
-# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
-RDEPEND="${COMMON_DEPEND}
-	>=sys-apps/accountsservice-0.6.30
-	x11-themes/gnome-icon-theme-symbolic
-	colord? ( >=gnome-extra/gnome-color-manager-3
-		  >=x11-misc/colord-0.1.29 )
-	cups? (
-		>=app-admin/system-config-printer-gnome-1.3.5
-		net-print/cups-pk-helper )
-	!systemd? (
-		app-admin/openrc-settingsd
-		sys-auth/consolekit )
-	input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] )
-
-	!<gnome-base/gdm-2.91.94
-	!<gnome-extra/gnome-color-manager-3.1.2
-	!gnome-extra/gnome-media[pulseaudio]
-	!<gnome-extra/gnome-media-2.32.0-r300
-	!<net-wireless/gnome-bluetooth-3.3.2
-"
-# PDEPEND to avoid circular dependency
-PDEPEND=">=gnome-base/gnome-session-2.91.6-r1"
-DEPEND="${COMMON_DEPEND}
-	x11-proto/xproto
-	x11-proto/xf86miscproto
-	x11-proto/kbproto
-
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	>=dev-util/intltool-0.40.1
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-
-	cups? ( sys-apps/sed )
-
-	gnome-base/gnome-common
-"
-# Needed for autoreconf
-#	gnome-base/gnome-common
-
-src_prepare() {
-	# Make some panels optional; requires eautoreconf
-	epatch "${FILESDIR}/${PN}-3.8.0-optional.patch"
-
-	# https://bugzilla.gnome.org/show_bug.cgi?id=686840
-	epatch "${FILESDIR}/${PN}-3.7.4-optional-kerberos.patch"
-
-	# Fix some absolute paths to be appropriate for Gentoo
-	epatch "${FILESDIR}/${PN}-3.8.0-paths-makefiles.patch"
-	epatch "${FILESDIR}/${PN}-3.8.0-paths.patch"
-
-	eautoreconf
-	gnome2_src_prepare
-
-	# panels/datetime/Makefile.am gets touched as a result of something in our
-	# src_prepare(). We need to touch timedated{c,h} to prevent them from being
-	# regenerated (bug #415901)
-	[[ -f panels/datetime/timedated.h ]] && touch panels/datetime/timedated.h
-	[[ -f panels/datetime/timedated.c ]] && touch panels/datetime/timedated.c
-}
-
-src_configure() {
-	G2CONF="${G2CONF}
-		--disable-update-mimedb
-		--disable-static
-		--enable-documentation
-		$(use_enable bluetooth)
-		$(use_enable colord color)
-		$(use_enable cups)
-		$(use_enable gnome-online-accounts goa)
-		$(use_enable i18n ibus)
-		$(use_with socialweb libsocialweb)
-		$(use_enable systemd)
-		$(use_with v4l cheese)
-		$(use_enable input_devices_wacom wacom)"
-	# XXX: $(use_with kerberos) # for 3.7.x
-	if ! use kerberos; then
-		G2CONF+=" KRB5_CONFIG=$(type -P true)"
-	fi
-	gnome2_src_configure
-}