old, remove refs. to non-existing upower version

Package-Manager: portage-2.2.13/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 17 insertions, 106 deletions

diff --git a/mate-extra/mate-power-manager/ChangeLog b/mate-extra/mate-power-manager/ChangeLog
index 86b5ee7821ea..cd18796a4243 100644
--- a/mate-extra/mate-power-manager/ChangeLog
+++ b/mate-extra/mate-power-manager/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mate-extra/mate-power-manager
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-power-manager/ChangeLog,v 1.13 2014/09/19 17:00:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-power-manager/ChangeLog,v 1.14 2014/09/19 17:04:21 ssuominen Exp $
+
+  19 Sep 2014; Samuli Suominen <ssuominen@gentoo.org>
+  -mate-power-manager-1.8.0.ebuild:
+  old
 
   19 Sep 2014; Samuli Suominen <ssuominen@gentoo.org>
   mate-power-manager-1.6.3.ebuild:
diff --git a/mate-extra/mate-power-manager/Manifest b/mate-extra/mate-power-manager/Manifest
index 293279227125..141a3a2499cb 100644
--- a/mate-extra/mate-power-manager/Manifest
+++ b/mate-extra/mate-power-manager/Manifest
@@ -11,18 +11,17 @@ AUX mate-power-manager-1.8.0-r1-remove-battery-recall-logic.patch 9292 SHA256 c2
 DIST mate-power-manager-1.6.3.tar.xz 3362188 SHA256 465b8d88d25333c9a5f0dd9a34720cac6024e21e574378d1d49326e1ff1d253b SHA512 dfc17688a60aa19109af39f1436ed3f8a5acbfa1a89b128c4619356574a5df73e058366ca53626be04bed6ff37d2ebefa8a04b4efca7d3ce96e5753594e14769 WHIRLPOOL 8993f97df88ebd1d71da7480d1c09529c8df924f0d33f268b3f84f1d81914eca278a2eebb1e5465fb59937e875ec970cbd7ee5c307aa92120c8441b270ac1640
 DIST mate-power-manager-1.8.0.tar.xz 3339588 SHA256 3d83b7736b0b6256242db3b9efaa18530b4ba6d80b146eafaf511230ae926d9f SHA512 f91b195e384138ce0881f53f4d3e8924d422445ac258de2138da16ab29999cd367b2e37c226e5d56e698bc54b82c8996b3263a638702f45b2f96ffabbceca479 WHIRLPOOL 31a423d25abd488bceb13354cabc3f80844f791060339ea38d4fa12f8ac80d1d4a4c94c8e07af7ba489fd5da98f7bbdfbf4edebe339926e91e0d39747ddb3a34
 EBUILD mate-power-manager-1.6.3.ebuild 2423 SHA256 8a701eff7d9ad6357034605947786694b5c043adb54d26d0ef1d46d200ab4a9f SHA512 e67d48bfa41aa168bbf01f37a73bf17e044049f5149a3be6d4f95a0c9256fed0ae991ba6d73b3b3c1ed0618e37438eb147b29cc3401dde0ae074150294ea17f4 WHIRLPOOL 7bb32307981c243200021950b0279d9b985999326bdfe052dab1f377c2e7608b3fb63e6efaeaaf83c9f6d2a9ba7a27d8edfd64212c11aa0d44f923f9a5eb67d6
-EBUILD mate-power-manager-1.8.0-r1.ebuild 3107 SHA256 7d64cd7d4b167b78be97c887a5b23a812a2b17f29584b0daa3a98501a833c646 SHA512 acc6700b38c9142661347679241b80b967b42faef137c004f935c16f6068308c207704bfceb4179c4ba6841d5a1bdad99d0c614405287dcd561bb0dedbe0c0d5 WHIRLPOOL fb31b1d3c2db625265428ee35624d1dd7abe36fa4b4cb62c193dece53d5b7dc1390e5b13d2da37946731d5b329bdc55882dba70e2b8879965ca74e5f367f694f
-EBUILD mate-power-manager-1.8.0.ebuild 2393 SHA256 f712da72c29fa6a9d207d7d888d6b04586bc43d9727c2ea1f5fd22dbf9e3d177 SHA512 d1ac72b5dcfa4ef5ce121081a0bdfe655b39fb8051fce64b98017266c8265b627fbf20cb09dae5916fc104d3ed558c6687be24563a578022b9a0bb08a38914cc WHIRLPOOL 1d9a56f1e39b9693c0b6dc9911dc61830e723823a33f87bec94486b72308831fe88bda1a05109cbe0918363639295388ee15161c55e669a5129671ba6e31235a
-MISC ChangeLog 2885 SHA256 716d1eae48efcf76dfd4d8a55c918314e4e21a3a9132a7bfed4821133b52f01a SHA512 eac5354ec6bee46faa503cbd5de09cab908503a510e0cd41e6b5d90f2ed0fa0f322ec56229a95867a227a9bc0e7837589c053de969c17c47499f849dfb28da18 WHIRLPOOL 8e8416de8c85cfb02d326b9c06108a8eac3c037c85b7c1c9e17ea790ae1fb1bed2b2e2dbed5f8a47825456b3902894a7b97ccf0ce6ccae72c2687a9372ef3fa9
+EBUILD mate-power-manager-1.8.0-r1.ebuild 3120 SHA256 432039afbb29e8171ef174833d95dfd41ca632987b0f58dabeb956fedd5f68de SHA512 781aa30ae2b06571014445b0b7bd32900bef7535a3ee1ffc0b88542e9443cfa4ebc27b4f982843fd2985d7991201a6c1e65f7bb7f377741bd0868d485889399e WHIRLPOOL 541db568dedccc3dbde6315c088171535cccd3e0301e4667fa0603fd71876a69388f315b6bc1ce362efc594b6dbac0e6296b264f15d76b5f0ad82fc6ed15c34f
+MISC ChangeLog 2982 SHA256 50b12eae4760478ddd415611e326cd99a2d9baadb7a90f1dbf07a38e02bce060 SHA512 c8ec3e0fa016b8c700a6c164cff5f17fce2c9729275ffee0a304e10821c349fb4deb7307a2d6aa6467f550a53d2ef010d3b81989167d4a6f8fde68c38a329a4c WHIRLPOOL e170a8fe788943c1ea874a7735ff98d79995b9731e0a62167465a41f08894b66ef5de66ecebfe275200efd0a7b44ca222380458344819b6c5d9483f4372859c5
 MISC metadata.xml 468 SHA256 138877fb0154af1e9e2ed98f927a16daa6f49d3a8312b8e469fc92fa54232ae8 SHA512 318497639aa45f81e65e89d59820977fe89a618dff7844c13bf3a1d875ac9407f8b190c6ea6d4e9aed6f97b1bc96b7f821d1222fc605729af8c783f620c1358b WHIRLPOOL 2112944a997e20ed2609f0e9d1f99ae80c2dca2f57631d953fdc38f68a19905dd137584a756f07dcf79b26dc16b8780dced00f2f87e394a46cc641ac0d9c377f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUHGEvAAoJEEdUh39IaPFNQnAH/0ZUxb92Ixrmq1lI8eDPE/es
-aoyCw62xAGPyMlttaQvv6SDjL3uR8wcmZ4/eKbcm/f0jbuHAXui9uLiGFDTov1Fi
-y44ect4zgU0bjUZRHNjGX5GivBAYApQhfG56TosdusZJ4dgEbpwNPOyTzWohEeYH
-A4zIZ6ERPW9wRURgLvHu5CButszSxfweIkxSvSFB3o9jPYxvFpAIKshHwceo3ir0
-5mEoC5wnFG5Z26OWornEeU0P3K0Uvl4ELtNDk+Ge7Pxo38/9UuLh6HoNpk+dORsv
-I42OKF96EZnV3w8FMyoK9hsBUe5f5/U3atW5irqRr9LrhAsWDCWEhapT/Q+OGjc=
-=XFGM
+iQEcBAEBCAAGBQJUHGIRAAoJEEdUh39IaPFNY08H/3UM+BE6GpIRYRq8TKN2chQ5
+mX/7Pvla2R7nzncuxu8Ms/kmMCH1/P0CIHG0Y8bwaYnwvZNfB7eOftr6b+NuY7Pj
+5/AZWuThvSI/g17M/7zKAp2Au5IWH6quOv+SdCgi2f9UTULEHXEsQYz8LB4C6Adv
+KhkFUN9ftQPK7YPOumy4XX2PerlqaoeHJz80xHPp1GW4nmOGld1tiTLqzTHVtFoh
+5hgrD4w6fVS7WNGHa/LAsicltfb+yJYRuUbOzMliD6Gb89db7x3bCaF/XdnTlfDt
+dn0Rsz4n9MvL0E/c/lHUOpbRzsNs2Z0aFQYva5ZE+DCKOzkq4eeodjgCodZnq/c=
+=IgIR
 -----END PGP SIGNATURE-----
diff --git a/mate-extra/mate-power-manager/mate-power-manager-1.8.0-r1.ebuild b/mate-extra/mate-power-manager/mate-power-manager-1.8.0-r1.ebuild
index fd845b2f8c5e..e8464abcab5a 100644
--- a/mate-extra/mate-power-manager/mate-power-manager-1.8.0-r1.ebuild
+++ b/mate-extra/mate-power-manager/mate-power-manager-1.8.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-power-manager/mate-power-manager-1.8.0-r1.ebuild,v 1.6 2014/07/02 09:47:53 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-power-manager/mate-power-manager-1.8.0-r1.ebuild,v 1.7 2014/09/19 17:04:21 ssuominen Exp $
 
 EAPI="5"
 
@@ -28,7 +28,7 @@ COMMON_DEPEND="app-text/rarian:0
 	>=dev-libs/glib-2.13:2
 	>=media-libs/libcanberra-0.10:0[gtk]
 	>=sys-apps/dbus-1:0
-	|| ( >=sys-power/upower-0.9.1 sys-power/upower-pm-utils	)
+	|| ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 )
 	>=x11-apps/xrandr-1.2:0
 	>=x11-libs/cairo-1:0
 	>=x11-libs/gdk-pixbuf-2.11:2
@@ -55,7 +55,7 @@ DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext:*
 	virtual/pkgconfig:*
 	man? ( app-text/docbook-sgml-utils:0
-			>=app-text/docbook-sgml-dtd-4.3 )"
+		>=app-text/docbook-sgml-dtd-4.3 )"
 
 src_prepare() {
 	# Upstreamed patches
diff --git a/mate-extra/mate-power-manager/mate-power-manager-1.8.0.ebuild b/mate-extra/mate-power-manager/mate-power-manager-1.8.0.ebuild
deleted file mode 100644
index b12b6d8353ef..000000000000
--- a/mate-extra/mate-power-manager/mate-power-manager-1.8.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-power-manager/mate-power-manager-1.8.0.ebuild,v 1.3 2014/05/31 20:40:24 tomwij Exp $
-
-EAPI="5"
-
-GCONF_DEBUG="no"
-
-inherit gnome2 versionator
-
-MATE_BRANCH="$(get_version_component_range 1-2)"
-
-SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
-DESCRIPTION="A session daemon for MATE that makes it easy to manage your laptop or desktop system"
-HOMEPAGE="http://mate-desktop.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="+applet gnome-keyring man policykit test unique"
-
-# Interactive testsuite.
-RESTRICT="test"
-
-COMMON_DEPEND="app-text/rarian:0
-	>=dev-libs/dbus-glib-0.70:0
-	>=dev-libs/glib-2.13:2
-	>=media-libs/libcanberra-0.10:0[gtk]
-	>=sys-apps/dbus-1:0
-	|| (
-		( >=sys-power/upower-0.9.1 <sys-power/upower-0.99 )
-		sys-power/upower-pm-utils
-	)
-	>=x11-apps/xrandr-1.2:0
-	>=x11-libs/cairo-1:0
-	>=x11-libs/gdk-pixbuf-2.11:2
-	>=x11-libs/gtk+-2.17.7:2
-	x11-libs/libX11:0
-	x11-libs/libXext:0
-	x11-libs/libXrandr:0
-	>=x11-libs/libnotify-0.7:0
-	x11-libs/pango:0
-	applet? ( >=mate-base/mate-panel-1.6:0 )
-	gnome-keyring? ( >=gnome-base/gnome-keyring-3:0 )
-	unique? ( >=dev-libs/libunique-0.9.4:1 )"
-
-RDEPEND="${COMMON_DEPEND}
-	policykit? ( >=mate-extra/mate-polkit-1.6:0 )"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.3
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.35:*
-	x11-proto/randrproto:0
-	>=x11-proto/xproto-7.0.15:0
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	man? ( app-text/docbook-sgml-utils:0
-			>=app-text/docbook-sgml-dtd-4.3 )"
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# This needs to be after eautoreconf to prevent problems like bug #356277
-	# Remove the docbook2man rules here since it's not handled by a proper
-	# parameter in configure.in.
-	if ! use man; then
-		sed -e 's:@HAVE_DOCBOOK2MAN_TRUE@.*::' -i man/Makefile.in \
-			|| die "docbook sed failed"
-	fi
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable applet applets) \
-		$(use_enable test tests) \
-		$(use_enable unique) \
-		$(use_with gnome-keyring keyring) \
-		--enable-compile-warnings=minimum \
-		--enable-unique \
-		--with-gtk=2.0
-}
-
-DOCS="AUTHORS HACKING NEWS README TODO"
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-
-	dbus-launch Xemake check || die "Test phase failed"
-}