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

(Portage version: 2.1.11.62/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

3 files changed, 7 insertions, 154 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/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
-}