Version bump, drop old

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

3 files changed, 49 insertions, 30 deletions

diff --git a/gnome-base/gnome-control-center/ChangeLog b/gnome-base/gnome-control-center/ChangeLog
index bf39bd7d76c8..2fcc023c6296 100644
--- a/gnome-base/gnome-control-center/ChangeLog
+++ b/gnome-base/gnome-control-center/ChangeLog
@@ -1,6 +1,12 @@
 # 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.127 2013/05/12 09:02:01 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.128 2013/05/14 20:56:31 pacho Exp $
+
+*gnome-control-center-3.8.2 (14 May 2013)
+
+  14 May 2013; Pacho Ramos <pacho@gentoo.org>
+  +gnome-control-center-3.8.2.ebuild, -gnome-control-center-3.8.0-r1.ebuild:
+  Version bump, drop old
 
 *gnome-control-center-3.8.1.5 (12 May 2013)
 
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index 972513eeda85..af9dc546a1f9 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.0.tar.xz 6793712 SHA256 154653d45c224eb5daf5a756e145989c2477fc4b448af20a5b62dbb897dd74f7 SHA512 abffd5b5942c02db8ca3263faab2c4e76865f5d3b4666a6d830c6b62e87e3a922bd7564d7c3bca21e2d8394a4efb505035fe685a189a0837cdbd3a81e9a6c970 WHIRLPOOL e50737d74e54eb8675d7ab4b8199306fcb28eaa6c0cb3317f41a68e07ed9b03c3f5b02ad04bbe68e639e72e835f78941f0f4967f86cac0c677c66273fe132eac
 DIST gnome-control-center-3.8.1.5.tar.xz 6809712 SHA256 6756a97eb8e89fe16bd5e50ab85d7f0e4e0fb7fa4e9df5ab49a97de03033d211 SHA512 344fb8a09b04fdf3714e5d3e7e5f52d73283898ebc1f9de059da900010ae6ab9e4bf1219ed57a2f4a83a1505dd0eaac085ab738efeb54c7047c75792a8f1dd0a WHIRLPOOL d9668827b82f95af9db03677ee32fff6a4f17f4b12be784e3ca7a9400ab084c288478409a012444264052a3f3f7819b11996a659c94de6efabbe57c4d79d2ceb
+DIST gnome-control-center-3.8.2.tar.xz 6827684 SHA256 abf6c1acb0b82631e730cb32762deff905fd4f776b89b475b8e732dc73a9d1fb SHA512 3d3199969205c62a8e6039053675965a7d2b7069cd0ddb26b5568e652227084801c024c2d9c4da80e3f733419ff5159e3e360495355be13d3348755a50deedca WHIRLPOOL f2d829564918c899cf7511127f8ba9b4b77df2b9feb8ab3f2dc1d07c191e12362944547e31be531252f3d3107fa89d5483ddbfe60d001ec3a798bb5dea4e69ac
 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 4436 SHA256 b84f7f7cb9444c99820ab9f76e20625b00612a3900e7aed1c6a89df3d94afd42 SHA512 c7d4bcd8427654033e1f1ba84a10b4bc8fce54515356cc0110859077f995110817c86e08e58e201af41b9895be5eba12f483c08a7d8b882d38438f792682b925 WHIRLPOOL 27f7d5832632dd0d8b2761e9af2916d6e7346194a2475feb9ced9c26670330941cd9f19aa491fba8fdea70e951cb4e6746d474f9ca9885a287e88b7514042e52
 EBUILD gnome-control-center-3.8.1.5.ebuild 5002 SHA256 627921c5c9841db514ce2347e834e541a589af77546a35ba717db9c1e4585800 SHA512 c0f4529ed7a2eb97f8e0422b696cc76ada9672d1e49edcad0b313f762fdd387e358e62bdc5780fa2ec483ec2d2b0640d1f52829f359c3b5a5522b4c43f6ad084 WHIRLPOOL 334d68373e430bbecbdc5156c644007a33d2d680317437a5a8c19e9740b6571f65e9b4f694dd0e6a29daea6d6d5433e0ecf5211a82c070eb353ef15e0196ae7f
-MISC ChangeLog 62783 SHA256 299c53c161453fd07bb775a4a7051b49e5b18d8a7355dbd73f168d2f6bee02e8 SHA512 45231a46b0dfa53c8df50d6c88b4feba35cb3bb2732e413f729ca5deaa11fd9cf6eea591d836a958d6539543269cd772c8b6028cd4148e9c6af757d2c8d158f5 WHIRLPOOL 53746ff42224d4abbad59fc8c6c9fd8ba33024b17471f1524b623f33a8b156cd27eb9d4c62a7bfa239813bf1fc38c8221018b4b2d07011d34c6726c7f324e44f
+EBUILD gnome-control-center-3.8.2.ebuild 5000 SHA256 a07913698c66ff3da726685b874a02138a561255f74df6f5cb5a1c25f35f2c06 SHA512 df857bcdfecd71a2c3735439cc0b77758c3f25faa8ece17701fcca3b1824b4a9e0ce899733b30e8faa7bd7c97f9ffe80fbdf76aaea21bb65053a81cdcbdb5524 WHIRLPOOL e943491b7d999b6eb9cda08c03de00ce42b7a4fa5d8c40e77830adab5ea18851c9183b6614a6e493c17ea0c2ae018699238c393007832c3c3234b384c9980ca4
+MISC ChangeLog 62975 SHA256 c8fe7f65ea70f2af57ec49d05d12ef9d5e23035d49bac0014c8651ce1b9ca7e5 SHA512 2b5bcc286a8f26b1d52cd2fbaaf8641ca73e84679d5f28937a37249a63e6793c5142b6baf6bbc3c5033acd400089ab744dfbc17e88e28f81bf2bd61cf362dac6 WHIRLPOOL 1c9cb8b24ce134337cd31437eb4d505af93afae718e372298a70fd14668ea7a1039ee7f80a9346e5d4daeb354b93738eed4da2a88ce5cf936657dc4aa97ea9c2
 MISC metadata.xml 747 SHA256 1780f48a525b476ec5d3472ceab620769f7498980b57d2f5b55787832ac3912e SHA512 2c90dc956fd5a5462432fe1ac537851bf848b1d109fa190dea47ed58b0f44422895e5f4ea6bbafbd31d2121c5ad9c7870b3ef4e20eb7396a905f68a10ae0d0f3 WHIRLPOOL 80276e19b1d4d24263d8dbfc1e0425365115fd94d34977f146309aea893163936cf0d3f7d1fbe68ba3caa4209e4dacf95d4d8ee266a5dfe30e16a3fd2c7a6e9b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlGPWosACgkQCaWpQKGI+9R5lACfRRH7W2xF2qczP+dkQa+gNziz
-rCwAn1mwIbojtvgfxMlegTdLqL2zzTcP
-=1VYK
+iEYEAREIAAYFAlGSpQAACgkQCaWpQKGI+9Q+sACfQUZBwVZsrQc4jac8FYmtxj4M
+Lr0Aniy1iOe8upgBgohN+pVtvlZO7uCF
+=4aWY
 -----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.2.ebuild
index 46efd4b8f0c1..d5528b64b7c1 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.2.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.3 2013/05/09 20:08:56 pacho Exp $
+# $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 $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -9,13 +9,16 @@ GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
 inherit autotools eutils gnome2
 
 DESCRIPTION="GNOME Desktop Configuration Tool"
-HOMEPAGE="http://www.gnome.org/"
+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 +socialweb systemd v4l"
+IUSE="+bluetooth +colord +cups +gnome-online-accounts +i18n input_devices_wacom kerberos modemmanager +socialweb systemd 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
 COMMON_DEPEND="
@@ -41,7 +44,7 @@ COMMON_DEPEND="
 	>=x11-libs/libnotify-0.7.3
 
 	>=gnome-extra/nm-applet-0.9.7.995
-	>=net-misc/networkmanager-0.9.8[modemmanager]
+	>=net-misc/networkmanager-0.9.8[modemmanager?]
 
 	x11-apps/xmodmap
 	x11-libs/libX11
@@ -50,10 +53,13 @@ COMMON_DEPEND="
 
 	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 )
+	cups? (
+		>=net-print/cups-1.4[dbus]
+		>=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 )
 	v4l? (
@@ -84,6 +90,7 @@ RDEPEND="${COMMON_DEPEND}
 "
 # PDEPEND to avoid circular dependency
 PDEPEND=">=gnome-base/gnome-session-2.91.6-r1"
+
 DEPEND="${COMMON_DEPEND}
 	x11-proto/xproto
 	x11-proto/xf86miscproto
@@ -103,6 +110,10 @@ 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|' \
+		shell/Makefile.am || die "sed completiondir failed"
+
 	# Make some panels optional; requires eautoreconf
 	# https://bugzilla.gnome.org/697478
 	epatch "${FILESDIR}/${PN}-3.8.0-optional-r1.patch"
@@ -114,6 +125,9 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-3.8.0-paths-makefiles.patch"
 	epatch "${FILESDIR}/${PN}-3.8.0-paths.patch"
 
+	# Make modemmanager optional, bug 463852, upstream bug #700145
+	epatch "${FILESDIR}/${PN}-3.8.1.5-optional-modemmanager.patch"
+
 	eautoreconf
 	gnome2_src_prepare
 
@@ -125,22 +139,21 @@ src_prepare() {
 }
 
 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)"
 	# FIXME: add $(use_with kerberos) support?
-	if ! use kerberos; then
-		G2CONF+=" KRB5_CONFIG=$(type -P true)"
-	fi
-	gnome2_src_configure
+	! use kerberos && G2CONF+=" KRB5_CONFIG=$(type -P true)"
+
+	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 modemmanager) \
+		$(use_with socialweb libsocialweb) \
+		$(use_enable systemd) \
+		$(use_with v4l cheese) \
+		$(use_enable input_devices_wacom wacom)
 }