Fix minor ebuild issues and require gl (per configure). systemd is not a build option, it is used at runtime.

Package-Manager: portage-2.2.0_alpha188/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

4 files changed, 32 insertions, 27 deletions

diff --git a/gnome-base/gnome-control-center/ChangeLog b/gnome-base/gnome-control-center/ChangeLog
index 146ae162c51d..2b72387ac0fb 100644
--- a/gnome-base/gnome-control-center/ChangeLog
+++ b/gnome-base/gnome-control-center/ChangeLog
@@ -1,6 +1,11 @@
 # 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.130 2013/07/25 17:55:12 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.131 2013/07/26 07:01:05 eva Exp $
+
+  26 Jul 2013; Gilles Dartiguelongue <eva@gentoo.org>
+  gnome-control-center-3.8.3.ebuild, gnome-control-center-3.8.4.1.ebuild:
+  Fix minor ebuild issues and require gl (per configure). systemd is not a
+  build option, it is used at runtime.
 
 *gnome-control-center-3.8.4.1 (25 Jul 2013)
 
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index f8e2d2e1950b..214425d8dc01 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -22,14 +22,14 @@ DIST gnome-control-center-3.8.3.tar.xz 6899396 SHA256 e78a5b01692ccfe825e079d795
 DIST gnome-control-center-3.8.4.1.tar.xz 6707796 SHA256 3cfc5b93ca12f498c075f5b5356e0af4a0aaee003c0a90a4309bc12876f40c55 SHA512 8bb9544c07c89593d6e438fb10072326d2f16ecd0ccc62838c61e62f05f70cf99f69e063fff7e0a13dc2c82b14adebf7868ae2e746a56024bc3be659092ec95d WHIRLPOOL 68d2cdbf1406522d248db0a4c5ab1d2d60e8ca78b0a006eb2fceea072c22a44faa20df9b807251646aeb29d5a3b1ca545555c268e8880cff119c924e9dafb69a
 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.3.ebuild 5209 SHA256 9ed98315397b8e9af13bcc9518871bb2f2f2ee5406ada708176f27d05b894892 SHA512 a59bc2527fb676264d4c3457036b937bb4514d1ee0a5526b1c1947c01138b8cf90b45fa6040c49b435f84d3a7d898556ff5e0222322b6bb93d6287844f94ab4e WHIRLPOOL 82010005b0ef79733b1ab57666c773111e94a08bfd49d26d0bfd3056254322194784c3d200cea9c83721e914a52c0ba396b36273ef79a36414bd23feab6fcd49
-EBUILD gnome-control-center-3.8.4.1.ebuild 5506 SHA256 6c1cd33439ec3e85cc812281a5b4498108c0cb90c2d0545bcc649ccc5fc27cc0 SHA512 7aee995a958e704b4324e6467b740435ed54d423a49948e417444b239c3fe42b1524969119b2184dd3b5ceb936bcf206ace73aa79a47321b5faa52f4a2b1e53d WHIRLPOOL 428196f53f75dfd80e54d72dcd11cbb02cdcf91584baf4ee5da34984257cb8cb952ba78077ad5a9323c89d026b28f691736be136d79c6317e46621f5484fefef
-MISC ChangeLog 63774 SHA256 0b5239a35f91e09301aa68a579c821d8e5f7ce6d944b3e72d3e85d9f7846e3f8 SHA512 7b6d421b84c1a7c0c8bab434419fe3987ca2e6e67db35ec867c29e06da103e5088f94d58aa9f81c18a24c8fa4e2287341aebc9208cfd486ac878ac85c19a4abf WHIRLPOOL bcab1180b273eaa63fd204662ce39ae06910b7d377f17ef9dc62e5a35eb64eb63353c249530565021bf8b619334cec61ea5be8e3f635c74b26389d607425f07f
+EBUILD gnome-control-center-3.8.3.ebuild 5168 SHA256 2046667a597cba2992b055da53f774f12a93d1cb3b514da8c76cf5f5751caad3 SHA512 5dd831d4d0ca4b05af7b48906d17485c568dcc83d9ceedd16bb70e9c04f0964f1dae0ad183252a1d1b6de407f9bde5cb64de5ada2a954fba16c5719f7d6862ad WHIRLPOOL 4bb01901659374242304da13b08337391fa573cba0e809a0e71afb4743656e42f00c61665dd7266b661902535ff25600fe8e1c4401400b3a20e43a47d0f0bdb7
+EBUILD gnome-control-center-3.8.4.1.ebuild 5465 SHA256 1c2c182633071a99f3eb351a21bce3aed00740697708d73805ad7a83c8965902 SHA512 da5bf48964221e3bb5ac8d260e026e8418a7dd82bdd91b8608ce264a1b35c2c2c97af5e548035177f93035d5d5a9e5f4f8acd71528bf0e2f1b7ac465c6478fe2 WHIRLPOOL 4280b1a91a0ce4afb67f0e7c79dc0f1f17693704c8ea12681ed51b4d73fd30b5375ca118afe0bffe806f62c5c1e1a3bfc320dfb68e945e7a5b7bb084cf5e4d5e
+MISC ChangeLog 64015 SHA256 d50d3dcf83b1cbf8d86a7d573408e3a548b03eabc39354bebbb373fbbb1d0eb6 SHA512 a9e440996b7ad0fd96d5ae6ac5dc189130e42b7c812329feb1bf0885b74b85b8ffed83b9df3314ef30ec569acb23a138d08163d6b724e8eff4744e83459e5e11 WHIRLPOOL 49c3190e9f949f43edf10f4db9ca78b0274517329831b70f16b2222ae1f48feb16e59e6b0ce18b597dbc3eb5a8792b7115c1bb47c56cc8203c323c96a60fd994
 MISC metadata.xml 747 SHA256 1780f48a525b476ec5d3472ceab620769f7498980b57d2f5b55787832ac3912e SHA512 2c90dc956fd5a5462432fe1ac537851bf848b1d109fa190dea47ed58b0f44422895e5f4ea6bbafbd31d2121c5ad9c7870b3ef4e20eb7396a905f68a10ae0d0f3 WHIRLPOOL 80276e19b1d4d24263d8dbfc1e0425365115fd94d34977f146309aea893163936cf0d3f7d1fbe68ba3caa4209e4dacf95d4d8ee266a5dfe30e16a3fd2c7a6e9b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlHxZoEACgkQCaWpQKGI+9RI+gCfeBxdCG/GiUrXdDsSxjVPYeer
-Z64An1+WxI6wiuWHB1I5dHLnor+cr4Qi
-=xSwT
+iEYEAREIAAYFAlHyHrEACgkQ1fmVwcYIWAbPCACg4NsqOnZC5VjFET24Pzei6qVY
+t60AnRfzeXf62Y/UfoX6MTEFvHCrUXU+
+=CmlM
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.8.3.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.8.3.ebuild
index 97712dc4c691..533ef26c0a5b 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.8.3.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.8.3.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.3.ebuild,v 1.1 2013/06/09 19:12:30 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.8.3.ebuild,v 1.2 2013/07/26 07:01:05 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -13,7 +13,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/"
 
 LICENSE="GPL-2+"
 SLOT="2"
-IUSE="+bluetooth +colord +cups +gnome-online-accounts +i18n input_devices_wacom kerberos modemmanager +socialweb systemd v4l"
+IUSE="+bluetooth +colord +cups +gnome-online-accounts +i18n input_devices_wacom kerberos modemmanager +socialweb v4l"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 
 # False positives caused by nested configure scripts
@@ -27,13 +27,12 @@ QA_CONFIGURE_OPTIONS=".*"
 COMMON_DEPEND="
 	>=dev-libs/glib-2.35.1:2
 	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=x11-libs/gtk+-3.7.7:3
+	>=x11-libs/gtk+-3.7.10:3
 	>=gnome-base/gsettings-desktop-schemas-3.7.2.2
 	>=gnome-base/gnome-desktop-3.7.5:3=
 	>=gnome-base/gnome-settings-daemon-3.8.3[colord?,policykit]
 	>=gnome-base/libgnomekbd-2.91.91
 
-	app-text/iso-codes
 	dev-libs/libpwquality
 	dev-libs/libxml2:2
 	gnome-base/gnome-menus:3
@@ -44,11 +43,12 @@ COMMON_DEPEND="
 	>=media-sound/pulseaudio-2[glib]
 	>=sys-auth/polkit-0.97
 	>=sys-power/upower-0.9.1
-	>=x11-libs/libnotify-0.7.3
+	>=x11-libs/libnotify-0.7.3:0=
 
 	>=gnome-extra/nm-applet-0.9.7.995
 	>=net-misc/networkmanager-0.9.8[modemmanager?]
 
+	virtual/opengl
 	x11-apps/xmodmap
 	x11-libs/libX11
 	x11-libs/libXxf86misc
@@ -64,13 +64,12 @@ COMMON_DEPEND="
 	kerberos? ( virtual/krb5 )
 	modemmanager? ( >=net-misc/modemmanager-0.7.990 )
 	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
+		>=dev-libs/libwacom-0.7
 		>=x11-libs/libXi-1.2 )
 "
 # <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
@@ -78,8 +77,10 @@ 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
-		  >=x11-misc/colord-0.1.29 )
+	colord? (
+		>=gnome-extra/gnome-color-manager-3
+		>=x11-misc/colord-0.1.29
+		>=x11-libs/colord-gtk-0.1.24 )
 	cups? (
 		>=app-admin/system-config-printer-gnome-1.3.5
 		net-print/cups-pk-helper )
@@ -156,7 +157,6 @@ src_configure() {
 		$(use_enable i18n ibus) \
 		$(use_enable modemmanager) \
 		$(use_with socialweb libsocialweb) \
-		$(use_enable systemd) \
 		$(use_with v4l cheese) \
 		$(use_enable input_devices_wacom wacom)
 }
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.8.4.1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.8.4.1.ebuild
index 734454eca29d..3fb9fbb44b6a 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.8.4.1.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.8.4.1.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.4.1.ebuild,v 1.1 2013/07/25 17:55:12 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.8.4.1.ebuild,v 1.2 2013/07/26 07:01:05 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -15,7 +15,7 @@ LICENSE="GPL-2+"
 SLOT="2"
 
 # kerberos optional patch is broken, bug #475526
-IUSE="+bluetooth +colord +cups +gnome-online-accounts +i18n input_devices_wacom modemmanager +socialweb systemd v4l" #kerberos
+IUSE="+bluetooth +colord +cups +gnome-online-accounts +i18n input_devices_wacom modemmanager +socialweb v4l" #kerberos
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 
 # False positives caused by nested configure scripts
@@ -29,13 +29,12 @@ QA_CONFIGURE_OPTIONS=".*"
 COMMON_DEPEND="
 	>=dev-libs/glib-2.35.1:2
 	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=x11-libs/gtk+-3.7.7:3
+	>=x11-libs/gtk+-3.7.10:3
 	>=gnome-base/gsettings-desktop-schemas-3.7.2.2
 	>=gnome-base/gnome-desktop-3.7.5:3=
 	>=gnome-base/gnome-settings-daemon-3.8.3[colord?,policykit]
 	>=gnome-base/libgnomekbd-2.91.91
 
-	app-text/iso-codes
 	dev-libs/libpwquality
 	dev-libs/libxml2:2
 	gnome-base/gnome-menus:3
@@ -46,11 +45,12 @@ COMMON_DEPEND="
 	>=media-sound/pulseaudio-2[glib]
 	>=sys-auth/polkit-0.97
 	>=sys-power/upower-0.9.1
-	>=x11-libs/libnotify-0.7.3
+	>=x11-libs/libnotify-0.7.3:0=
 
 	>=gnome-extra/nm-applet-0.9.7.995
 	>=net-misc/networkmanager-0.9.8[modemmanager?]
 
+	virtual/opengl
 	x11-apps/xmodmap
 	x11-libs/libX11
 	x11-libs/libXxf86misc
@@ -67,13 +67,12 @@ COMMON_DEPEND="
 	i18n? ( >=app-i18n/ibus-1.4.99 )
 	modemmanager? ( >=net-misc/modemmanager-0.7.990 )
 	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
+		>=dev-libs/libwacom-0.7
 		>=x11-libs/libXi-1.2 )
 "
 # kerberos? ( virtual/krb5 )
@@ -82,8 +81,10 @@ 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
-		  >=x11-misc/colord-0.1.29 )
+	colord? (
+		>=gnome-extra/gnome-color-manager-3
+		>=x11-misc/colord-0.1.29
+		>=x11-libs/colord-gtk-0.1.24 )
 	cups? (
 		>=app-admin/system-config-printer-gnome-1.3.5
 		net-print/cups-pk-helper )
@@ -164,7 +165,6 @@ src_configure() {
 		$(use_enable i18n ibus) \
 		$(use_enable modemmanager) \
 		$(use_with socialweb libsocialweb) \
-		$(use_enable systemd) \
 		$(use_with v4l cheese) \
 		$(use_enable input_devices_wacom wacom)
 }