Version bump for Gnome 3.6. Clean up old revisions.

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

5 files changed, 38 insertions, 162 deletions

diff --git a/gnome-extra/gnome-power-manager/ChangeLog b/gnome-extra/gnome-power-manager/ChangeLog
index 13eec7da6603..c9cb3c4405d1 100644
--- a/gnome-extra/gnome-power-manager/ChangeLog
+++ b/gnome-extra/gnome-power-manager/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/gnome-power-manager
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/ChangeLog,v 1.177 2012/07/15 17:41:20 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/ChangeLog,v 1.178 2012/12/25 22:06:33 eva Exp $
+
+*gnome-power-manager-3.6.0 (25 Dec 2012)
+
+  25 Dec 2012; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-power-manager-2.32.0-r2.ebuild, -gnome-power-manager-3.2.1.ebuild,
+  +gnome-power-manager-3.6.0.ebuild, metadata.xml:
+  Version bump for Gnome 3.6. Clean up old revisions.
 
   15 Jul 2012; Raúl Porcel <armin76@gentoo.org>
   gnome-power-manager-2.32.0-r3.ebuild:
diff --git a/gnome-extra/gnome-power-manager/Manifest b/gnome-extra/gnome-power-manager/Manifest
index d07c7e07c3ed..1eb1cdeffb6f 100644
--- a/gnome-extra/gnome-power-manager/Manifest
+++ b/gnome-extra/gnome-power-manager/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX gnome-power-manager-2.32.0-close-fd.patch 741 SHA256 66711f18dfa9c491ea0aaf911617fb189d4616f96795ac314ef8eb6d7fc05b5f SHA512 fb053bdccdbaff9f51011ce006c858ed14aed7b8c034d925001d2ad0fbf7c791dd572d8b2460e1c5f5eec1ef94117616b94649fab496649eca418e2e2c7dbff9 WHIRLPOOL 190ca2254b3da25dc311f399da48b53a7548ace1c8d8ffd6f09976eef41d47a5683ecafb4485fafaaad6d69821b1267e6577660d42bdd889773d1f83b94203cc
 AUX gnome-power-manager-2.32.0-convert-percentage.patch 1012 SHA256 3580861a2ed7e783ad07c95c42c99b6f000b96033eda352c259680e3973c2242 SHA512 5450bc57c5f1bce083cc3ee65c2eeae279ca4e3d18606a6e234d18347af00472c3f94215f7ccfd9abf8a84bb35305ea0ee0a79ac3a1a19536db47554a9cca5a6 WHIRLPOOL 6f7fd204fa3464eead351092e1f82f32aa5705c12d71a2871b0ba74f6afbcd5dfe5dd257feb26ebb73573b45e737540618ed1b8a9f8ad7aaec1da4ddb0766199
@@ -9,18 +9,17 @@ AUX gnome-power-manager-2.32.0-no-xfce.patch 1253 SHA256 a08eb3ff292bba66dd0c347
 AUX gnome-power-manager-2.32.0-xbacklight-crash.patch 858 SHA256 b4ebcd2aa0c012fb6e5cd7c09643801af0ad30ae0ba51d93e9c3793325fc390a SHA512 b004db4daf2f602996860ea2bb908294202c535f587d7971ccfd383225c765c66694e932ee49fa4165d5172506110ed0644dbacf3b696226816108ea36988774 WHIRLPOOL 399977f9ac5228259f3e8fff494cfd44765dfd0c19ca382f0b39927d03a6557b7a793f63f653f98276915bb2dc0da1d0264a0da1e3f92802877af9fa3b97ca9f
 DIST gnome-power-manager-2.32.0-keyboard-backlight.patch.xz 16632 SHA256 3f57906b0fea33ab1e6fa20e8772ae7dd685413a7ae64e182b15a80bc4d1a58b SHA512 4ea404bffbc5a6360419f346dc0fc9df22f097dd3ad826de8d35d6a9d0debfd15870150fbf954fd462ca988d3c75b8ed2e869e9f0d0e92905d9a8de7ff5d81ad WHIRLPOOL ab839ac342d8fd60aeba7d65e62d7fed2bbf44874273a0f25e5d9bf08b6d8cfc490b49445f96149d9de64e923a6cebafcda5f2e7f10d4fb4aae281ee999b74f2
 DIST gnome-power-manager-2.32.0.tar.bz2 3892164 SHA256 17fa301bf7e133285c0e054ae3be2b0f690c48f59b09f67e04d6ed339b330476 SHA512 dc6addb33d2a7d486209342613df0037f1d3a7099f7a7b4b8ce29255276191e367a49774c0b14b6c4341a192f56154454db9e3fca06d73195fd311ba832185fa WHIRLPOOL c8314490b22ee6dec0c6acac77459e5008f7c0c99b9c304c7ed6c2f4c0333ab18394e60c7bcb81e3441bc9fd04f59fb2ad38bf594766dce14ae97a98152f2fca
-DIST gnome-power-manager-3.2.1.tar.xz 734932 SHA256 11bc604dd237e28eb08a67e6d507c3edebb96a43a3483390bd0c8100a206dbdb
-DIST gnome-power-manager-3.4.0.tar.xz 742884 SHA256 2c47786a1ed85b6ba48ad5e74e2584ab7cbc0127fda46359ec4671b1c0286c71
-EBUILD gnome-power-manager-2.32.0-r2.ebuild 3846 SHA256 46fb055a73ec6c222385bb867e3d1317bb236885720b474b7e167ed2fd5098d4 SHA512 e4b68f6c687224b46df68d671462e9fa47deb92d0ff70c6f77093f94334ccc61e661a0a382757cfc2abdf7ef0ec9fb0a02f7127cd69d5ac6f1e131a1df31cbdf WHIRLPOOL 76c2779a4f7d95aa9737b9c2ffcc2eb9070991e61c4340f83a269efdc96146f1d9355dee6c87b9065a5e4b791d39fe4dbdf1a1a6a90727129eaae8967848e0f1
+DIST gnome-power-manager-3.4.0.tar.xz 742884 SHA256 2c47786a1ed85b6ba48ad5e74e2584ab7cbc0127fda46359ec4671b1c0286c71 SHA512 61368639c411b2c85d8f707ba438a372138f54e08a86f47b0f2265a2e40aed5dfd8e9db4d5c3a9becdb93e07aac3c637ce92ca9109b4b41d8bbac8ef891ec1ec WHIRLPOOL 238d2f0d4dcec1208d285ceae4d809f06d871eb96df3fd8168590af85a896dfdcff332a347feea7a0fb123890e164669c1bf6e22b7c39ba58c09b93d9810391f
+DIST gnome-power-manager-3.6.0.tar.xz 744040 SHA256 176023d51d544a888bcd07611f2c1adaedfe2e20796f3fb97fba59f6330851c6 SHA512 d14e3d9c6a620bcc549bf1b78a98d1cc3a168ff12b10a9cd5144067da07431b440cf28cab2eedc6def7516ab16ee88aa64652f749f6784ab7968ad3c8cabec76 WHIRLPOOL 18ae47cce00812f837e884bbed0fcb4bb8c63e9234ea7987259c7d49bac2df637e4b0cccf1c01833a3b38bb0b10ea091b1761c42d1b0ec21832a5e204eb6cb60
 EBUILD gnome-power-manager-2.32.0-r3.ebuild 3956 SHA256 a5aa17a1c06f44e7e74a77d8e849f2089275f0aeaf540c7f8784c0642cddf48b SHA512 7f38a71d688eb5aa07dc8037521825ddeb9bc1361206d56651d8ecb7e8475949c96d628e49e901d0fc7836db0c55d7d5edf8026c747b2e61dc930b640dbfcdba WHIRLPOOL 63c763eaa79bc2bb5b8c7e8018c68112910d32f8e17514f105ad0e12186c84560be3fc3158e676f41e9c712f77bc855d03c3ce12de63fd4dfe21736366466f8f
-EBUILD gnome-power-manager-3.2.1.ebuild 1775 SHA256 50e069fb3585eb1b68e9aea995a56b7d6f0a5af3b17e866a13abfb8d7c51b9d1 SHA512 e0dff0b5c256a041b30dc3f30f7af01d265b87ce16c721444ad32d48096223e91446e8c3fffba38eefdc0df747d00fdb6770d179e86e83c7820abcf2b85dc216 WHIRLPOOL e9646c93c68ecda9805e1d95d70dd1b4a45de9f53b00079834f0716406d2fb1547128736460463ff4c58663fd8eb24be6a53d62fb910929d5a129add8568d67a
 EBUILD gnome-power-manager-3.4.0.ebuild 1808 SHA256 29088875890f9947de6862ba42a71b3619acdd982b0614122d06e2dd29a1b862 SHA512 b98f5cc0beb69024885b6624d45c3d6be38858e56c59ef5c10c091956f076e0a6fc429228b487f9ebf94fdddc4386693f3e46d0fdd23430fe886e3e5a04645c9 WHIRLPOOL 47895b3035fe75308480a804419173742319c2a7647a09acb8c39cbd1c2d1e11ae1b08c1f130c5f714e5daa58d4cccd73cd722629c38ec8c80b2f13635405c42
-MISC ChangeLog 30356 SHA256 2a153b5f816cb33783856fc4679a47e81f0dafd7754e201fceb4b9e3efdbf20f SHA512 a8d020e54e4b542f79e8cdf5785d04db13aa4a8b818272be30fd58fb5ba861523d5b3fc8ae197a7d573b6c40f598b7bcc8ddfbfc7f876d56fc10ff24c1235936 WHIRLPOOL 2c2c7c1c88fa7dab93c50eceaa295d5db44c854d99461b06e3cd9d61cfcc9e096a89a04700dcb08d364cd1f4cc37c6280793113ba07d105b82ab10e8bf1829d1
-MISC metadata.xml 401 SHA256 6c07ca73308c0284c064e45eecff3b959b6d84c5cdf0b557eca7b4fc398ea639 SHA512 460d57aeaa510818e084bcb4dc1cde0b4d4773c95e752a16277d5bc2bc182e8919e95e0901e59a490b15b6eb2456b08fdf8c22e26e772fe1cc00dd41902a18c1 WHIRLPOOL 081527fc56f9959ee1ffa11d5f32c3fa586adefdb8e901f7dfc7a15bb8d5991a6ffc2dcd22e704ffe46ae6e4afde5cf6dcf0eee50096a0ec3489aa03b1447a71
+EBUILD gnome-power-manager-3.6.0.ebuild 1614 SHA256 4eaf9c1ff9f41ccf8849c2954924fbf6a1bf334a79b03c12c4820189159f8e93 SHA512 502080940d36d9b2db96def30282d82f3a2cd46b088237e1d19ed48e4d336795433992464b95c306d5cefdcfdcff14266ea5f830d7412e952016581211e270f6 WHIRLPOOL 2fa55f7762d8c9075352c391a44cf07ed74da401bbd3666841c40372a6bab7cf1f518453935b5cce103c5f2e265c63846d862825796507f5c3156260970e2fe2
+MISC ChangeLog 30630 SHA256 31303aea490921b41442bdba3ef2d2dbe72d5542f08105d2f3d22d8c4c3a8917 SHA512 98d9d32477b7f0ffc749add1cf311391235fbf9561098e9478482165cf25ac1128fe79bc7112e78f6c00fddf3304beb8aa0703a60a78d01aeace1699ff89ce6f WHIRLPOOL 8679f806ea7a5a82f09f8a2af8d68777f0e15dc52f62e46d3dfb6259c298060944a0964548604c371000743adb994bf6fd2cd824f92710132a240c351c147c84
+MISC metadata.xml 400 SHA256 1c5d6e0a437c1a1c04299a5d1823ab8551019bd7ae120dac19670cc72fa22cf7 SHA512 7b119f2023d172590e884096d474fba4ff2bd95bdb2ff6b5390401ff5ffd3efd66cd2a0ac3b54be3389b5c88113eaa2cee77a90d6e71861e1ecf7bdefd853a56 WHIRLPOOL 01491b961fffe22ea484b375eebdbcd6ed0a9d255b85fbd2e790bb33c21c324dec33029546fed6b2a9c439f0ae613e7ee68554b723d08a7b74e5a3eb133e34fc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAlADAMYACgkQuQc30/atMkAkdQCfbflJBki95UDyBX+OgjVzO8CM
-kCwAn09+oNQzw0a9qAFAbimk3Xw7ooB8
-=BJkd
+iEYEAREIAAYFAlDaI2oACgkQ1fmVwcYIWAZyYgCgiolYT946CcmdbaD5HNYCvsIE
+JPYAoLj1e1H27lYf0dMZ5FnSz5lMFuK3
+=A/Kn
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-2.32.0-r2.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-2.32.0-r2.ebuild
deleted file mode 100644
index ba400e14a78f..000000000000
--- a/gnome-extra/gnome-power-manager/gnome-power-manager-2.32.0-r2.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/gnome-power-manager-2.32.0-r2.ebuild,v 1.7 2012/05/05 06:25:24 jdhore Exp $
-
-EAPI="4"
-GNOME_TARBALL_SUFFIX="bz2"
-GCONF_DEBUG="no"
-
-inherit autotools eutils gnome2 virtualx
-
-DESCRIPTION="A session daemon for GNOME that makes it easy to manage your laptop or desktop system"
-HOMEPAGE="http://projects.gnome.org/gnome-power-manager/"
-SRC_URI="${SRC_URI} http://dev.gentoo.org/~pacho/gnome/${PN}-2.32.0-keyboard-backlight.patch.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="+applet doc policykit test"
-
-# FIXME: Interactive testsuite (upstream ? I'm so...pessimistic)
-RESTRICT="test"
-
-COMMON_DEPEND=">=dev-libs/glib-2.13.0:2
-	>=x11-libs/gtk+-2.17.7:2
-	>=gnome-base/gnome-keyring-0.6.0
-	>=dev-libs/dbus-glib-0.71
-	>=x11-libs/libnotify-0.4.3
-	>=x11-libs/libwnck-2.10.0:1
-	>=x11-libs/cairo-1
-	>=gnome-base/gconf-2.10:2[policykit?]
-	>=media-libs/libcanberra-0.10[gtk]
-	>=sys-power/upower-0.9.1
-	>=dev-libs/libunique-1.1:1
-	>=x11-apps/xrandr-1.3
-	>=x11-proto/xproto-7.0.15
-	x11-libs/libX11
-	x11-libs/libXext
-	applet? (
-		|| ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 )
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	>=sys-auth/consolekit-0.4[policykit?]
-	policykit? ( gnome-extra/polkit-gnome )"
-DEPEND="${COMMON_DEPEND}
-	x11-proto/randrproto
-
-	sys-devel/gettext
-	app-text/scrollkeeper
-	app-text/docbook-xml-dtd:4.3
-	virtual/pkgconfig
-	>=dev-util/intltool-0.35
-	>=app-text/gnome-doc-utils-0.3.2
-	doc? (
-		app-text/xmlto
-		app-text/docbook-sgml-utils
-		app-text/docbook-xml-dtd:4.4
-		app-text/docbook-sgml-dtd:4.1
-		app-text/docbook-xml-dtd:4.1.2 )"
-
-# docbook-sgml-utils and docbook-sgml-dtd-4.1 used for creating man pages
-# (files under ${S}/man).
-# docbook-xml-dtd-4.4 and -4.1.2 are used by the xml files under ${S}/docs.
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		$(use_enable applet applets)
-		$(use_enable doc docbook-docs)
-		$(use_enable policykit gconf-defaults)
-		$(use_enable test tests)
-		--enable-compile-warnings=minimum"
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
-
-	# Fix intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
-		|| die "sed libtoolize failed"
-
-	# Drop debugger CFLAGS from configure
-	sed -e 's:^CPPFLAGS="$CPPFLAGS -g"$::g' \
-		-i configure.ac configure || die "debugger sed failed"
-
-	# glibc splits this out, whereas other libc's do not tend to
-	if use elibc_glibc; then
-		sed -e 's/-lresolv//' \
-			-i configure.ac configure || die "resolv sed failed"
-	fi
-
-	# Fixed bgo#644143, how to convert from percentage to discrete and vice-versa.
-	epatch "${FILESDIR}/${P}-convert-percentage.patch"
-
-	# Don't try to close a non-opened fd
-	epatch "${FILESDIR}/${P}-close-fd.patch"
-
-	# Do not use g-p-m in XFCE
-	epatch "${FILESDIR}/${PN}-2.32.0-no-xfce.patch"
-
-	# Don't crash on systems which don't have XBACKLIGHT
-	epatch "${FILESDIR}/${PN}-2.32.0-xbacklight-crash.patch"
-
-	# Add keyboard backlight support including dimming on idle and keyboard control
-	epatch "${WORKDIR}/${PN}-2.32.0-keyboard-backlight.patch"
-
-	# FIXME: This is required to prevent maintainer mode after "debugger sed"
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-
-	gnome2_src_prepare
-
-	# This needs to be after eautoreconf to prevent problems like bug #356277
-	if ! use doc; then
-		# Remove the docbook2man rules here since it's not handled by a proper
-		# parameter in configure.in.
-		sed -e 's:@HAVE_DOCBOOK2MAN_TRUE@.*::' -i man/Makefile.in \
-			|| die "docbook sed failed"
-	fi
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	dbus-launch Xemake check || die "Test phase failed"
-}
diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-3.2.1.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-3.6.0.ebuild
index 8736b28eacd3..89d21eef89cc 100644
--- a/gnome-extra/gnome-power-manager/gnome-power-manager-3.2.1.ebuild
+++ b/gnome-extra/gnome-power-manager/gnome-power-manager-3.6.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/gnome-power-manager-3.2.1.ebuild,v 1.3 2012/05/14 01:57:33 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/gnome-power-manager-3.6.0.ebuild,v 1.1 2012/12/25 22:06:33 eva Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="no"
 
 inherit eutils gnome2 virtualx
@@ -12,44 +12,40 @@ HOMEPAGE="http://www.gnome.org/projects/gnome-power-manager/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="test"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
-# FIXME: Interactive testsuite (upstream ? I'm so...pessimistic)
-RESTRICT="test"
-
-COMMON_DEPEND=">=dev-libs/glib-2.25.9
-	>=x11-libs/gtk+-2.91.7:3
-	>=x11-libs/cairo-1.0.0
-	>=sys-power/upower-0.9.1"
+COMMON_DEPEND="
+	>=dev-libs/glib-2.31.10
+	>=x11-libs/gtk+-3.3.8:3
+	>=x11-libs/cairo-1
+	>=sys-power/upower-0.9.1
+"
 RDEPEND="${COMMON_DEPEND}
-	x11-themes/gnome-icon-theme-symbolic"
+	x11-themes/gnome-icon-theme-symbolic
+"
 DEPEND="${COMMON_DEPEND}
-	x11-proto/randrproto
-
-	sys-devel/gettext
-	app-text/scrollkeeper
-	app-text/docbook-sgml-utils
 	app-text/docbook-sgml-dtd:4.1
-	virtual/pkgconfig
-	>=dev-util/intltool-0.35
+	app-text/docbook-sgml-utils
 	>=app-text/gnome-doc-utils-0.3.2
-	test? ( sys-apps/dbus )"
+	app-text/scrollkeeper
+	>=dev-util/intltool-0.35
+	sys-devel/gettext
+	x11-proto/randrproto
+	virtual/pkgconfig
+	test? ( sys-apps/dbus )
+"
 
 # docbook-sgml-utils and docbook-sgml-dtd-4.1 used for creating man pages
 # (files under ${S}/man).
 # docbook-xml-dtd-4.4 and -4.1.2 are used by the xml files under ${S}/docs.
 
-pkg_setup() {
+src_prepare() {
 	G2CONF="${G2CONF}
 		$(use_enable test tests)
-		--disable-strict
 		--enable-compile-warnings=minimum
 		--disable-schemas-compile"
-	DOCS="AUTHORS ChangeLog NEWS README"
-}
 
-src_prepare() {
 	gnome2_src_prepare
 
 	# Drop debugger CFLAGS from configure
diff --git a/gnome-extra/gnome-power-manager/metadata.xml b/gnome-extra/gnome-power-manager/metadata.xml
index e7934f2eab69..0c1a047c61ab 100644
--- a/gnome-extra/gnome-power-manager/metadata.xml
+++ b/gnome-extra/gnome-power-manager/metadata.xml
@@ -10,4 +10,3 @@
 		<flag name='applet'>Build battery monitor applet</flag>
 	</use>
 </pkgmetadata>
-