Version bump, newer accountsservice needed (#542706 by Kobboi), drop old.

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

4 files changed, 17 insertions, 184 deletions

diff --git a/gnome-base/gnome-control-center/ChangeLog b/gnome-base/gnome-control-center/ChangeLog
index 5ca442eff520..161f29727e20 100644
--- a/gnome-base/gnome-control-center/ChangeLog
+++ b/gnome-base/gnome-control-center/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/gnome-control-center
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.162 2015/03/15 13:22:17 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.163 2015/03/19 11:38:11 pacho Exp $
+
+*gnome-control-center-3.14.3 (19 Mar 2015)
+
+  19 Mar 2015; Pacho Ramos <pacho@gentoo.org>
+  +gnome-control-center-3.14.3.ebuild, -gnome-control-center-3.12.1-r2.ebuild,
+  -gnome-control-center-3.14.2.ebuild:
+  Version bump, newer accountsservice needed (#542706 by Kobboi), drop old.
 
   15 Mar 2015; Pacho Ramos <pacho@gentoo.org>
   gnome-control-center-3.14.2-r1.ebuild:
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index 2c9dbd828e00..e491064c6509 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -8,16 +8,16 @@ AUX gnome-control-center-3.14.0-optional.patch 19466 SHA256 154aff2082e4c9009e4b
 AUX gnome-control-center-3.14.2-networkmanager-version.patch 2255 SHA256 fd54ec2c32eba9318d111c13ddb3d4f74985586af65182471917556599b58eb3 SHA512 88ec790e9d129f5b6006c2cb0b4b36a99b9609e408c6d8669f2a7421cbc24e249fa77bb82550f327aae13d4e5bba6ae57a70f5465a41e6c25452084a604edf7a WHIRLPOOL 65f8e63cc6adcca6269821e4326be66a7b035f12dc563704957b1472827ba1c61e19e5ffa055307758737122f2b4616d92ee55041f08f627700056e1711003c2
 DIST gnome-control-center-3.12.1.tar.xz 6866544 SHA256 5297d448eff0ec58f6c0ad9fbd1b94bed0a850496df0ee65571c0622b49c1582 SHA512 35b765fc11182b0f7eec6bc31934f51ccbf01dde9f2e7deed6c84ca9811bd0a00783d75bd3fab7004fe41cc29740b6d6e0a7f3c6391a482eefcab0129d0278fe WHIRLPOOL 294a2f81a1b225814fd895dc7b579f0dec9c360983d3d683b4ff5bd47dd9ac91a84088485f872a7ef95e05f021469da9eaf5d987bd537a062f9a1525c03c4b47
 DIST gnome-control-center-3.14.2.tar.xz 6938572 SHA256 b15e188b3d45c86d71f4d8cb297829cf190be81f22ce76dc74c7b4232bd0652a SHA512 c5bcdcae87f32cf4b0f9d99709dfe7fcb48e5086945d1685ce94c3996022ff5bf4c82994bbec28e0cf91c9c85309638225536e1dcca06b96cdbaf1ff38f2ae6b WHIRLPOOL 3188ff540a8a01a6479c529f4fe629d2b695b185f762291691a6aefd0f815af382afca2ed8c4ff56e4e5161b3cabe751d507625e4638856034982d2e408000a5
+DIST gnome-control-center-3.14.3.tar.xz 6984324 SHA256 21f49787cf708e591f53b6d2a6e1c059037a62726f23b9513b0d116996066e15 SHA512 2c0af090b00e4352ad7bae7937ed3eeecc88cee963a037961446fe492da1c6637a71700eba40a5ab5bc5233df774b621f5e1757214431919c48b2afb01ff8f9d WHIRLPOOL 9bf8499c907088b6dfa27a647c7f0a193f04941ef6b484dfe2add24b21a3dd42f3d84aa6b4c1cfe804337bdbbc398edbd1fc5b2d4058738d9425bf63f6a5286e
 EBUILD gnome-control-center-3.12.1-r1.ebuild 5021 SHA256 382d52bbc8294eaac4bc9d2daf878c0720007a18b3712ff5be12b5ad90316bfd SHA512 c601e47473fd60af2da56529ee1b883e055ee398a4d08a9cc028671e00e0ceb5316cb17a486385f1e242efb8bf5e5623f487ff42c8b9119d30cc50687d4f40b3 WHIRLPOOL fa6236ecd93946911b6e3ecdcc1c0a42ac919bf058afca79beb557142c5f6317f9fdd470de486770960a74adf9c2318676577a4c99ff86bd5676b7077f52d196
-EBUILD gnome-control-center-3.12.1-r2.ebuild 5147 SHA256 6e2aeee17151737b861ba8553f7e215357d1517918c22d79847e05e44948ca91 SHA512 9fc5d85d7046405d7724a7fa34ad33b055a49b53b5283f3b80350fd9064995ca291a33eeb9e46ec88d2002a9ade6f1ab324b98a145ea6fa0573ea089cd84bdd7 WHIRLPOOL b95d2bcd8d086f16c8c87d82db75e674b0a2b37c039eef4f6806cf9002426974ca575903128e483048325f4bad447288341911c9c42d4e4e1e8d0378ea91dd13
 EBUILD gnome-control-center-3.14.2-r1.ebuild 5131 SHA256 1f57155c7dae5f0db839f32aba875e4e23f89923273ec71d64bd448a6c320e81 SHA512 4d4013fdcee974cb36445cd980397fff4453734d79b80c21fa8a27dc5c977d0c90d762b4d488c334e764462ca2d525043c62e0c39433182f69f2ee80572785f8 WHIRLPOOL 1df36a1d6d08b325a6773f88c11dcc6e0dfe111f2dfb3e0c4bfdd9a7c7db0fc801f598340aad1d0b80a342f840e73e4cca264463ec77658cc7a33bcef7adf29c
-EBUILD gnome-control-center-3.14.2.ebuild 5004 SHA256 6dc5d4894eef7bf8abee2396fd243a7dd9c1ce55f7dceabdd5dbf5b249b7d879 SHA512 6497014c7c9c1e04ca62bb2296ea8faf30e11c4fedf6932f55067ff956c3333f6fd4cda76499ea848a2f556d28985a2edbedb52a7f968a5b7889ea64e38a2d6b WHIRLPOOL 38e12952cfa3887d7e912b8587b3fa1ee5f6cff08e887ae49e8b9fc2fa5b016007da21b32ef8ea4921089a789826ce5045684c576723f9457681caff8e78bec2
-MISC ChangeLog 71077 SHA256 a1799bb7213d165dd2a463ab287c22dcbc3cd46f4670a2eb216a4331be5d35a0 SHA512 2aff3866cbacde45690ba823776d29e6b809cf20840e789e7be916c37dd8fd57ad50577acc51f6a1077f1b3c7f87c9f0698dadb926f230e0b4d43da40ca3400e WHIRLPOOL 145369a8da803d4c6680b627c7e2217f8c4cad76b6ee000a9759bf57b4a453080cc35569cdd8469af3def8ca130d691e8f19a980c41c1705dce6c86805ad1cfc
+EBUILD gnome-control-center-3.14.3.ebuild 4833 SHA256 84d293ba656a803351341d23683029a38beefd39e685bfb76da2ff62b5cf2273 SHA512 56b677092637f6591c8c7d45d71a6011292335d3c191b56cecd873c0e1e1aa5ccb5d3e42c407eb4f1dd614cf96d7ca9e6a30f4ad763d2b80315b683b3bfb5a45 WHIRLPOOL e08f61fd5a40c8ce2e3131c83e86e51ac51f084afe784cc1ac6da63ccbf56866c4e0800935e832b898dc30d95fd3ef2d27ef887ab2f6f5f517597546e4e92f5d
+MISC ChangeLog 71362 SHA256 2a7a2aa9109a0569b92af8a37330eebdd5bcabaf68d272e9e9630f53e9135a55 SHA512 7f91690f499156184063ce913b5bb0a20594f24c98bf8393d8fdd516bf6f6037bce58619c3e2ea46bd835d2d27fea19f09f9ee7b85008b911dc8816901b7229c WHIRLPOOL 2b40e5a93959f3c9663c25760e6f1387e37b362ebfd8454b2bb88e69f976350e51a3f36ed7226dad97b90390293f3c470ef8eaccd77edb9f0b640a9411c7eac7
 MISC metadata.xml 498 SHA256 fb46c54dc3e3ce2c8297d67292cd0ecadbdadf8c22a50437f8a03fd5b6ec9dc2 SHA512 ae1ff3489b7d037af4d1a550538e0cadfa815f6afcaa76b73afb3fa7d87d888c1ae5b3642416e9eb0cf0c2ba4f70a5ed1f5a9ccbb1d63320fc444ac3c3aed2d3 WHIRLPOOL 94896b01f55c9a411cf85eda67cdebba03f2e32a723094f9f839e04c5096d09b63b4ac0895b7ddb70bc0ba3ef2ea4aeb6eba650e926fbaef155554a768fad970
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlUFh3wACgkQCaWpQKGI+9QvSACePYS7nzHRDbuUgpg4blvspCJ/
-mKIAnRcR1Oidl+pd+GdAbwhwZnsSfyil
-=0AeL
+iEYEAREIAAYFAlUKtQ8ACgkQCaWpQKGI+9RhcgCeNSdqPenpktEuHp3tudS9a0Yt
+f4oAniaNqHRAFQzdjAzFq0hGnSpxsqiS
+=8wRU
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.12.1-r2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.12.1-r2.ebuild
deleted file mode 100644
index d74cfa6b751d..000000000000
--- a/gnome-base/gnome-control-center/gnome-control-center-3.12.1-r2.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2015 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.12.1-r2.ebuild,v 1.1 2015/01/12 17:07:48 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
-
-inherit autotools bash-completion-r1 eutils gnome2
-
-DESCRIPTION="GNOME's main interface to configure various aspects of the desktop"
-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 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
-QA_CONFIGURE_OPTIONS=".*"
-
-# 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
-#
-# kerberos unfortunately means mit-krb5; build fails with heimdal
-
-# FIXME: modemmanager is not optional
-#        networkmanager is not optional
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.39.91:2
-	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=x11-libs/gtk+-3.11.1:3
-	>=gnome-base/gsettings-desktop-schemas-3.9.91
-	>=gnome-base/gnome-desktop-3.11.3:3=
-	>=gnome-base/gnome-settings-daemon-3.8.3[colord?,policykit]
-
-	>=dev-libs/libpwquality-1.2.2
-	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.99:=
-	>=x11-libs/libnotify-0.7.3:0=
-
-	>=gnome-extra/nm-applet-0.9.7.995
-	>=net-misc/networkmanager-0.9.8[modemmanager]
-	>=net-misc/modemmanager-0.7.990
-
-	virtual/opengl
-	x11-apps/xmodmap
-	x11-libs/libX11
-	x11-libs/libXxf86misc
-	>=x11-libs/libXi-1.2
-
-	bluetooth? ( >=net-wireless/gnome-bluetooth-3.11.1:= )
-	colord? (
-		net-libs/libsoup:2.4
-		>=x11-misc/colord-0.1.34:0=
-		>=x11-libs/colord-gtk-0.1.24 )
-	cups? (
-		>=net-print/cups-1.4[dbus]
-		|| ( >=net-fs/samba-3.6.14-r1[smbclient] >=net-fs/samba-4.0.0[client] ) )
-	gnome-online-accounts? (
-		>=media-libs/grilo-0.2.6:0.2
-		>=net-libs/gnome-online-accounts-3.9.90 )
-	i18n? ( >=app-i18n/ibus-1.5.2 )
-	kerberos? ( app-crypt/mit-krb5 )
-	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.7
-		>=media-libs/clutter-1.11.3:1.0
-		media-libs/clutter-gtk:1.0
-		>=x11-libs/libXi-1.2 )
-"
-# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
-# libgnomekbd needed only for gkbd-keyboard-display tool
-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 )
-	cups? (
-		>=app-admin/system-config-printer-gnome-1.3.5
-		net-print/cups-pk-helper )
-	input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] )
-	i18n? ( >=gnome-base/libgnomekbd-3 )
-
-	!<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() {
-	# Gentoo handles completions in a different directory, bugs #465094 and #477390
-	sed -i "s|^completiondir =.*|completiondir = $(get_bashcompdir)|" \
-		shell/Makefile.am || die "sed completiondir failed"
-
-	# Make some panels and dependencies optional; requires eautoreconf
-	# https://bugzilla.gnome.org/686840, 697478, 700145
-	epatch "${FILESDIR}"/${PN}-3.12.1-optional-r1.patch
-
-	# Fix some absolute paths to be appropriate for Gentoo
-	epatch "${FILESDIR}"/${PN}-3.10.2-gentoo-paths.patch
-
-	# Fix NM version checking, bug #536224 (from 3.14 branch)
-	epatch "${FILESDIR}"/${PN}-3.12.1-networkmanager-version.patch
-
-	epatch_user
-
-	eautoreconf
-
-	# panels/datetime/Makefile.am gets touched by "gentoo-paths" patch.
-	# We need to touch timedated{c,h} to prevent them from being
-	# regenerated (bug #415901)
-	# Upstream think they should be removed, preventing compilation errors too
-	# (https://bugzilla.gnome.org/704822)
-	[[ -f panels/datetime/timedated.h ]] && rm -f panels/datetime/timedated.h
-	[[ -f panels/datetime/timedated.c ]] && rm -f panels/datetime/timedated.c
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--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_enable kerberos) \
-		$(use_with v4l cheese) \
-		$(use_enable input_devices_wacom wacom)
-}
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.14.2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.14.3.ebuild
index b7139ead9608..91dc23674c91 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.14.2.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.14.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.14.2.ebuild,v 1.1 2014/12/22 21:35:02 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.14.3.ebuild,v 1.1 2015/03/19 11:38:11 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -21,12 +21,6 @@ QA_CONFIGURE_OPTIONS=".*"
 
 # 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
-#
-# kerberos unfortunately means mit-krb5; build fails with heimdal
-
-# FIXME: modemmanager is not optional
-#        networkmanager is not optional
-
 COMMON_DEPEND="
 	>=dev-libs/glib-2.39.91:2
 	>=x11-libs/gdk-pixbuf-2.23.0:2
@@ -84,7 +78,7 @@ COMMON_DEPEND="
 # libgnomekbd needed only for gkbd-keyboard-display tool
 RDEPEND="${COMMON_DEPEND}
 	|| ( ( app-admin/openrc-settingsd sys-auth/consolekit ) >=sys-apps/systemd-31 )
-	>=sys-apps/accountsservice-0.6.30
+	>=sys-apps/accountsservice-0.6.33
 	x11-themes/gnome-icon-theme-symbolic
 	colord? ( >=gnome-extra/gnome-color-manager-3 )
 	cups? (
@@ -113,8 +107,6 @@ DEPEND="${COMMON_DEPEND}
 	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
 
-	cups? ( sys-apps/sed )
-
 	gnome-base/gnome-common
 "
 # Needed for autoreconf