Version bump, disable kerberos optional patch as it looks to be broken until we have a new one (#475526 by Paolo Stivanin), refix bash-completion dir using eclass (#477390 by Alphat-PC), include epatch_user as eautoreconf will be needed as much time as we carry the optional patches, be sure eautoreconf is also run for egg-list-box stuff, ensure timedated.c and .h files are dropped completely (upstream bug #704822). Drop old

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

3 files changed, 43 insertions, 21 deletions

diff --git a/gnome-base/gnome-control-center/ChangeLog b/gnome-base/gnome-control-center/ChangeLog
index 04d3943cf347..146ae162c51d 100644
--- a/gnome-base/gnome-control-center/ChangeLog
+++ b/gnome-base/gnome-control-center/ChangeLog
@@ -1,6 +1,17 @@
 # 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.129 2013/06/09 19:12:30 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.130 2013/07/25 17:55:12 pacho Exp $
+
+*gnome-control-center-3.8.4.1 (25 Jul 2013)
+
+  25 Jul 2013; Pacho Ramos <pacho@gentoo.org>
+  +gnome-control-center-3.8.4.1.ebuild, -gnome-control-center-3.8.2.ebuild:
+  Version bump, disable kerberos optional patch as it looks to be broken until
+  we have a new one (#475526 by Paolo Stivanin), refix bash-completion dir using
+  eclass (#477390 by Alphat-PC), include epatch_user as eautoreconf will be
+  needed as much time as we carry the optional patches, be sure eautoreconf is
+  also run for egg-list-box stuff, ensure timedated.c and .h files are dropped
+  completely (upstream bug #704822). Drop old
 
 *gnome-control-center-3.8.3 (09 Jun 2013)
 
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index 9d97e7666320..f8e2d2e1950b 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -18,18 +18,18 @@ AUX gnome-control-center-3.8.0-paths.patch 2178 SHA256 3c8e3a8232262cb92d0416bd2
 AUX gnome-control-center-3.8.1.5-optional-modemmanager.patch 1082 SHA256 21bf87ddd13a0615084115c5e09b6a8358bf597899b66c46a885672f2293a63f SHA512 60880c161b5fd0fc96b9748af336b805d9b41d5e58cb676355381a3c2c2fa7354b68c10b676829bee5e35f3c4c2b06a6b101a0c17ac7020744fee9ae980eb0e0 WHIRLPOOL a68e6b0ae5f9d6f1c48164901dc2a7d17330540e1b0b54735360436311d049f4d104f23d684d2339bb9bc9c678e4ba0dbb21a108a7da5ea2260f0a0c5ce04f12
 DIST gnome-control-center-2.32.1.tar.bz2 2280217 SHA256 7c568b57358e5c08f4d8dd76dbac7df2539135ad081872b60514b7a8ac797e66 SHA512 dc84bd222d1a2db0c4d10c56739e1d9da18945c579ae184f69080aa4b6fa0f0b908c5beafe82a82b6277630d685bed98fe8418421db4275653afbe302d810872 WHIRLPOOL 9b0fe4ed2bb741496642a57e178ca43049d53c71d9a82d311dc5a3ab6dfaf28019a8fa1b41a218b2ede11b4d0ac735034604dd9d952cb215e12327e71d0e69f4
 DIST gnome-control-center-3.6.3.tar.xz 4877812 SHA256 2ae23972bc64f62b4facd12dd5adce212bda02491eb6e56bbf195332157d21fb SHA512 77cd68349dc7f58714fbd121a34ec73a5c3e67c7a42a08c20a8dfdcfc9cefdec47af0f09130b7e3f0407cb7a786234b2619fdb76462c3bdb2bbc548294bfd444 WHIRLPOOL bf4ba1b6c9cb17f6b5f22003ee89af051ad152dd5671ffe01ba5cc0339d51659a8af7c629755726d305caf75c1fe4629b268fc269862751bc24317d323395697
-DIST gnome-control-center-3.8.2.tar.xz 6827684 SHA256 abf6c1acb0b82631e730cb32762deff905fd4f776b89b475b8e732dc73a9d1fb SHA512 3d3199969205c62a8e6039053675965a7d2b7069cd0ddb26b5568e652227084801c024c2d9c4da80e3f733419ff5159e3e360495355be13d3348755a50deedca WHIRLPOOL f2d829564918c899cf7511127f8ba9b4b77df2b9feb8ab3f2dc1d07c191e12362944547e31be531252f3d3107fa89d5483ddbfe60d001ec3a798bb5dea4e69ac
 DIST gnome-control-center-3.8.3.tar.xz 6899396 SHA256 e78a5b01692ccfe825e079d795d9e9610fcb94853c0e6d747b2d8d36dead9d84 SHA512 5b4738535e759607b305f6b962917155f949f64c2f18c80cf6cf13b4a18275dba703afca48f5abba46c326fe32248520080f1b838c958bc0a0df011fe07a379f WHIRLPOOL 006bac04738c4617d4f3d761707a97a16e21b95b84c15bef7543688dfd5b737d4c3e78b9f4d58f0a3fe1fe78ab337596f895a36324635655bee27ae402f2e6d4
+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.2.ebuild 5000 SHA256 a07913698c66ff3da726685b874a02138a561255f74df6f5cb5a1c25f35f2c06 SHA512 df857bcdfecd71a2c3735439cc0b77758c3f25faa8ece17701fcca3b1824b4a9e0ce899733b30e8faa7bd7c97f9ffe80fbdf76aaea21bb65053a81cdcbdb5524 WHIRLPOOL e943491b7d999b6eb9cda08c03de00ce42b7a4fa5d8c40e77830adab5ea18851c9183b6614a6e493c17ea0c2ae018699238c393007832c3c3234b384c9980ca4
 EBUILD gnome-control-center-3.8.3.ebuild 5209 SHA256 9ed98315397b8e9af13bcc9518871bb2f2f2ee5406ada708176f27d05b894892 SHA512 a59bc2527fb676264d4c3457036b937bb4514d1ee0a5526b1c1947c01138b8cf90b45fa6040c49b435f84d3a7d898556ff5e0222322b6bb93d6287844f94ab4e WHIRLPOOL 82010005b0ef79733b1ab57666c773111e94a08bfd49d26d0bfd3056254322194784c3d200cea9c83721e914a52c0ba396b36273ef79a36414bd23feab6fcd49
-MISC ChangeLog 63166 SHA256 efbc402b0aa4472ced19b016d93aa87a7cda21e7f9344d9a08ba7ff3146ef640 SHA512 45a63838affac422b1a56971709b106465df8fda95ddb7de98c36ce87b682e4b23f62315eea383cef2f7bea426ea82b959fc871476f22390accd793176c6aa5f WHIRLPOOL 6880802bbc8181e6b029a01c67b309027ae7427de8f40ab367f80adf86984cd4d0dd22b76a78796237ae8063fcde947d5cf0ab0a5a93757318cea1d87fc0ddf3
+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
 MISC metadata.xml 747 SHA256 1780f48a525b476ec5d3472ceab620769f7498980b57d2f5b55787832ac3912e SHA512 2c90dc956fd5a5462432fe1ac537851bf848b1d109fa190dea47ed58b0f44422895e5f4ea6bbafbd31d2121c5ad9c7870b3ef4e20eb7396a905f68a10ae0d0f3 WHIRLPOOL 80276e19b1d4d24263d8dbfc1e0425365115fd94d34977f146309aea893163936cf0d3f7d1fbe68ba3caa4209e4dacf95d4d8ee266a5dfe30e16a3fd2c7a6e9b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlG0058ACgkQCaWpQKGI+9THogCdH4P8mvBhbsHzwNza8KjZrHzq
-4FkAnRIhqn/ov8l2DDKUynKlvARPu3dP
-=xW7Z
+iEYEAREIAAYFAlHxZoEACgkQCaWpQKGI+9RI+gCfeBxdCG/GiUrXdDsSxjVPYeer
+Z64An1+WxI6wiuWHB1I5dHLnor+cr4Qi
+=xSwT
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.8.2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.8.4.1.ebuild
index d5528b64b7c1..734454eca29d 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.8.2.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.8.4.1.ebuild
@@ -1,19 +1,21 @@
 # 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.2.ebuild,v 1.1 2013/05/14 20:56:31 pacho Exp $
+# $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 $
 
 EAPI="5"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
 
-inherit autotools eutils gnome2
+inherit autotools bash-completion-r1 eutils gnome2
 
-DESCRIPTION="GNOME Desktop Configuration Tool"
+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 modemmanager +socialweb systemd v4l"
+
+# kerberos optional patch is broken, bug #475526
+IUSE="+bluetooth +colord +cups +gnome-online-accounts +i18n input_devices_wacom modemmanager +socialweb systemd 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
@@ -21,13 +23,16 @@ 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
+#
+# gnome-shell/gnome-control-center/mutter/gnome-settings-daemon better to be in sync for 3.8.3
+# https://mail.gnome.org/archives/gnome-announce-list/2013-June/msg00005.html
 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.7.3[colord?,policykit]
+	>=gnome-base/gnome-settings-daemon-3.8.3[colord?,policykit]
 	>=gnome-base/libgnomekbd-2.91.91
 
 	app-text/iso-codes
@@ -51,6 +56,8 @@ COMMON_DEPEND="
 	x11-libs/libXxf86misc
 	>=x11-libs/libXi-1.2
 
+	virtual/krb5
+
 	bluetooth? ( >=net-wireless/gnome-bluetooth-3.5.5:= )
 	colord? ( >=x11-misc/colord-0.1.29 )
 	cups? (
@@ -58,7 +65,6 @@ COMMON_DEPEND="
 		>=net-fs/samba-3.6.14-r1[smbclient] )
 	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8.1 )
 	i18n? ( >=app-i18n/ibus-1.4.99 )
-	kerberos? ( virtual/krb5 )
 	modemmanager? ( >=net-misc/modemmanager-0.7.990 )
 	socialweb? ( net-libs/libsocialweb )
 	systemd? ( >=sys-apps/systemd-31 )
@@ -70,6 +76,7 @@ COMMON_DEPEND="
 		>=dev-libs/libwacom-0.6
 		>=x11-libs/libXi-1.2 )
 "
+# kerberos? ( virtual/krb5 )
 # <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 )
@@ -110,8 +117,8 @@ DEPEND="${COMMON_DEPEND}
 #	gnome-base/gnome-common
 
 src_prepare() {
-	# Gentoo handles completions in a different directory, bug #465094
-	sed -i 's|^completiondir =.*|completiondir = $(datadir)/bash-completion|' \
+	# Gentoo handles completions in a different directory, bugs #465094 and #
+	sed -i "s|^completiondir =.*|completiondir = $(get_bashcompdir)|" \
 		shell/Makefile.am || die "sed completiondir failed"
 
 	# Make some panels optional; requires eautoreconf
@@ -119,7 +126,8 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-3.8.0-optional-r1.patch"
 
 	# https://bugzilla.gnome.org/686840
-	epatch "${FILESDIR}/${PN}-3.7.4-optional-kerberos.patch"
+	# Broken: https://bugs.gentoo.org/show_bug.cgi?id=475526
+#	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"
@@ -128,19 +136,22 @@ src_prepare() {
 	# Make modemmanager optional, bug 463852, upstream bug #700145
 	epatch "${FILESDIR}/${PN}-3.8.1.5-optional-modemmanager.patch"
 
+	epatch_user
 	eautoreconf
-	gnome2_src_prepare
+	cd egg-list-box/ && eautoreconf && cd ..
 
 	# 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
+	# 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
 }
 
 src_configure() {
 	# FIXME: add $(use_with kerberos) support?
-	! use kerberos && G2CONF+=" KRB5_CONFIG=$(type -P true)"
+#	! use kerberos && G2CONF+=" KRB5_CONFIG=$(type -P true)"
 
 	gnome2_src_configure \
 		--disable-update-mimedb \