Version bump, bug #295867. Clean up old revisions.

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

8 files changed, 32 insertions, 268 deletions

diff --git a/sys-power/pm-utils/ChangeLog b/sys-power/pm-utils/ChangeLog
index 91b78de79a8f..82d0c9f2dcee 100644
--- a/sys-power/pm-utils/ChangeLog
+++ b/sys-power/pm-utils/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-power/pm-utils
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/pm-utils/ChangeLog,v 1.28 2009/11/30 06:36:23 josejx Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/pm-utils/ChangeLog,v 1.29 2010/01/24 21:49:56 eva Exp $
+
+*pm-utils-1.2.6.1 (24 Jan 2010)
+
+  24 Jan 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -pm-utils-1.1.1.ebuild, -pm-utils-1.1.2.1.ebuild, -pm-utils-1.2.3.ebuild,
+  -pm-utils-1.2.3-r1.ebuild, -files/pm-utils-1.2.3-service-status.patch,
+  -pm-utils-1.2.4.ebuild, +pm-utils-1.2.6.1.ebuild:
+  Version bump, bug #295867. Clean up old revisions.
 
   30 Nov 2009; Joseph Jezak <josejx@gentoo.org> pm-utils-1.2.5.ebuild:
   Marked ppc64 stable.
diff --git a/sys-power/pm-utils/Manifest b/sys-power/pm-utils/Manifest
index b5f9add45719..6cff87359fcb 100644
--- a/sys-power/pm-utils/Manifest
+++ b/sys-power/pm-utils/Manifest
@@ -1,24 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX pm-utils-1.2.3-service-status.patch 524 RMD160 f1254757ede88d3c4753ae7e1aa475c5bd912fe7 SHA1 85d0b822dd50c67eaee2a69ef823601553ff6b1a SHA256 91704d64eae56a6ff8db648eb40f61840234625bb4ade9223d3f4bcd0fa403e3
-DIST pm-utils-1.1.1.tar.gz 143103 RMD160 009cff3428d9c27b47fb874da4c06a12fd8f14d7 SHA1 8ba604f19ed997641573c179e1f06492ed3003d6 SHA256 63187cc7667026c0a798e10549825ed087a7759a5beead4b7db937c868cc3bad
-DIST pm-utils-1.1.2.1.tar.gz 158307 RMD160 8524ec9b668c679664a4b2bf6fe0364434529ae5 SHA1 f16b94aec360f98e783bce741c1343912674956e SHA256 5019dc87196e24c1cc054f3cbf88237d67b3f2d451fa9ae5831435f53e8c67dd
-DIST pm-utils-1.2.3.tar.gz 176568 RMD160 0294a6b59647665e55fea810fd38bd352577668d SHA1 ec513f3742d6fc78eec7115bd003af3c36ae931f SHA256 e098fce7db4999e390a7332abf31b23b95c11515e48c1ff1818b11bf6ac26d07
-DIST pm-utils-1.2.4.tar.gz 177347 RMD160 854c7810eade1d9877d50fc6eb07518200016d03 SHA1 597b217c522de08c2fdfe31f01af1e356a73b0a6 SHA256 7c8a4a16adc16dd68bce527063c6a366cbcdf257114edecec91b3dad40e5b465
 DIST pm-utils-1.2.5.tar.gz 174592 RMD160 987a795e0cada9aeabcab2053d1de33af2635e7a SHA1 1e413f65d947179a675ab5d1ee1ac4dd06314cb6 SHA256 84cf07c7771ffe91c1b6f3a60c43fc76a44ae8d6c90e47bfdd6b1a7482a0e4ce
-EBUILD pm-utils-1.1.1.ebuild 1445 RMD160 1a007bb54bef19665595e4e3bf08f519677d3c3f SHA1 f7d51e1fc2d03719db2e55f9c490640d482a5a5a SHA256 3ee21a1bdcce6c33e57fc9e569df1d438a2a3c6b1701db9df12f9395136bade3
-EBUILD pm-utils-1.1.2.1.ebuild 1464 RMD160 0c102b5e8cd319a54319ff564ad0cc6bdbc7d8b4 SHA1 9661d9a5860259f735856dd2efda4148f8e74018 SHA256 41eb63117a4216d4bfb2a20de7522de665ebd34f6fe463253e33f8ae666df546
-EBUILD pm-utils-1.2.3-r1.ebuild 1675 RMD160 9bada30eed78bad18a6d57b12e9b7dccf0abb777 SHA1 05f907461ae0c7eea5ae8a077b1b6f0cd734706f SHA256 d2c0fa95cd73642078148aa0e7e85f6ce6eb145bac2aaea1271b7fe707d874b2
-EBUILD pm-utils-1.2.3.ebuild 1412 RMD160 e22f91a2b34c4a50f372c1e95242362389e37e0c SHA1 f7d8d7a9fa9493c81a14a2b963a0d531f357e27e SHA256 53433db427d9159380317fb4a9ff107a80eef84d808962862b47103117537d8c
-EBUILD pm-utils-1.2.4.ebuild 1524 RMD160 0b94d7d0d042011dc104d48592e05d15770e7e44 SHA1 696a990e0e7603a7aa580b0f347ee17b70bcc66a SHA256 7258a658def57fea5816f6304c9731948f58ddd8b250152cddba48180b025c4d
+DIST pm-utils-1.2.6.1.tar.gz 183819 RMD160 d47ca38f34d1cf89caee6b55d90670cf7fbc292e SHA1 84e421aaac5a0c98f8f078c2184419b02dd92d68 SHA256 e5ad45930b20931bed9a44678f72fd53ff85f2a0fc694d9ea2c02180431c5e35
 EBUILD pm-utils-1.2.5.ebuild 1631 RMD160 5197fae7c6da3c3ecbf0ec5431d94c31d8874f1c SHA1 cf7d15cb07f376503b1a47771b5d467431620bf7 SHA256 6cd03cb334243d6dcaa75fc8e684176842ebabc0d633add68001b9d220b3fa67
-MISC ChangeLog 3988 RMD160 bddd549e894ca5c7c3532639668ce0f9cd30cd97 SHA1 55245ebb5ca553d8489af607720a5433175f88ad SHA256 116cdbcb2fe5231b8368be894510911f6e001418f0374102a1b8d3bb895fdef6
+EBUILD pm-utils-1.2.6.1.ebuild 1630 RMD160 7e9c2b3c2ba379e5a8c78c0c0df4c47cfd3c68ca SHA1 69e5e7f9c5127a09484e2c9480851f35c2b88391 SHA256 16ab545ac97e39f82e9fe2950e4a61a15a057a0459071d65b8e47965d19a6617
+MISC ChangeLog 4327 RMD160 8e7c221dcfa23bc07a88aa20f72b722dbcabda9b SHA1 52dfc3d9bc37a3001d800499905758be1c441121 SHA256 f5293d0d1c177d7eef773abfb0d0e9f1d37323d35c865dc113da0654a0473db9
 MISC metadata.xml 251 RMD160 41781b66e083e1e4c11e135fe44eb40da50f15d6 SHA1 b61dc16b3f4c1ee71546729e1fd3c09f2b8ce153 SHA256 d0d5a53d56e26d590db0a3ca7280afbcca426b8f57f47477631a230d9e1f2125
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAksTZ8wACgkQcsIHjyDViGQKmQCgnRG+kNhRa8sKkrf3OZf+xL8u
-OdgAoN+Xa5ImLoGbGngOTak2gr1rBCeo
-=7MUY
+iEUEARECAAYFAktcwIoACgkQ1fmVwcYIWAb1+gCXRrlqMWQzuPeRqdatsF/50nEI
+9QCg5lgUSBR128qWE0zl4j6tPY7FIQQ=
+=1OpF
 -----END PGP SIGNATURE-----
diff --git a/sys-power/pm-utils/files/pm-utils-1.2.3-service-status.patch b/sys-power/pm-utils/files/pm-utils-1.2.3-service-status.patch
deleted file mode 100644
index b1cb0c426b71..000000000000
--- a/sys-power/pm-utils/files/pm-utils-1.2.3-service-status.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-# https://bugs.gentoo.org/attachment.cgi?id=178922
-# Fix status detection under gentoo
-#
-# functions.in |    3 ++-
-# 1 file changed, 2 insertions(+), 1 deletion(-)
-#
---- a/pm/functions.in	2009-01-18 21:11:52.000000000 +0100
-+++ b/pm/functions.in	2009-01-18 21:12:19.000000000 +0100
-@@ -141,7 +141,8 @@
- 
- stopservice()
- {
--	if service "$1" status 2>/dev/null | grep -c -q running; then
-+	if service "$1" status 2>/dev/null | grep -q -e running -e started
-+	then
- 		touch "${STORAGEDIR}/service:$1"
- 		service "$1" stop
- 	fi
diff --git a/sys-power/pm-utils/pm-utils-1.1.1.ebuild b/sys-power/pm-utils/pm-utils-1.1.1.ebuild
deleted file mode 100644
index a815a133f969..000000000000
--- a/sys-power/pm-utils/pm-utils-1.1.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/pm-utils/pm-utils-1.1.1.ebuild,v 1.3 2009/01/15 22:06:51 maekke Exp $
-
-inherit autotools eutils
-
-DESCRIPTION="Suspend and hibernation utilties for HAL"
-HOMEPAGE="http://pm-utils.freedesktop.org/"
-SRC_URI="http://pm-utils.freedesktop.org/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa debug networkmanager ntp video_cards_intel video_cards_radeon"
-
-RDEPEND=">=sys-apps/hal-0.5.10
-		 >=sys-apps/dbus-1.0.0
-		 !sys-power/powermgmt-base
-		 >=sys-apps/util-linux-2.13
-		 alsa? ( media-sound/alsa-utils )
-		 networkmanager? ( net-misc/networkmanager )
-		 ntp? ( net-misc/ntp )
-		 !video_cards_intel? ( sys-apps/vbetool )
-		 video_cards_radeon? ( app-laptop/radeontool )"
-DEPEND="!sys-power/powermgmt-base"
-
-src_unpack() {
-	local ignore="01grub"
-
-	unpack ${A}
-	cd "${S}"
-
-	touch "${S}/gentoo"
-
-	use debug && echo 'PM_DEBUG="true"' > "${S}/gentoo"
-
-	use alsa           || ignore="${ignore} 60alsa"
-	use networkmanager || ignore="${ignore} 10NetworkManager"
-	use ntp            || ignore="${ignore} 90clock"
-
-	echo "HOOK_BLACKLIST=\"${ignore}\"" > "${S}/gentoo"
-}
-
-src_compile() {
-	econf || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	insinto /etc/pm/config.d/
-	doins "${S}/gentoo"
-}
diff --git a/sys-power/pm-utils/pm-utils-1.1.2.1.ebuild b/sys-power/pm-utils/pm-utils-1.1.2.1.ebuild
deleted file mode 100644
index 773958ac8d91..000000000000
--- a/sys-power/pm-utils/pm-utils-1.1.2.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/pm-utils/pm-utils-1.1.2.1.ebuild,v 1.2 2008/10/23 15:08:51 remi Exp $
-
-inherit autotools eutils
-
-DESCRIPTION="Suspend and hibernation utilties for HAL"
-HOMEPAGE="http://pm-utils.freedesktop.org/"
-SRC_URI="http://pm-utils.freedesktop.org/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug networkmanager ntp video_cards_intel video_cards_radeon"
-
-RDEPEND=">=sys-apps/hal-0.5.10
-		 >=sys-apps/dbus-1.0.0
-		 !sys-power/powermgmt-base
-		 >=sys-apps/util-linux-2.13
-		 alsa? ( media-sound/alsa-utils )
-		 networkmanager? ( net-misc/networkmanager )
-		 ntp? ( net-misc/ntp )
-		 !video_cards_intel? ( sys-apps/vbetool )
-		 video_cards_radeon? ( app-laptop/radeontool )"
-DEPEND="!sys-power/powermgmt-base
-		app-text/xmlto"
-
-src_unpack() {
-	local ignore="01grub"
-
-	unpack ${A}
-	cd "${S}"
-
-	touch "${S}/gentoo"
-
-	use debug && echo 'PM_DEBUG="true"' > "${S}/gentoo"
-
-	use alsa           || ignore="${ignore} 60alsa"
-	use networkmanager || ignore="${ignore} 10NetworkManager"
-	use ntp            || ignore="${ignore} 90clock"
-
-	echo "HOOK_BLACKLIST=\"${ignore}\"" > "${S}/gentoo"
-}
-
-src_compile() {
-	econf || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	insinto /etc/pm/config.d/
-	doins "${S}/gentoo"
-}
diff --git a/sys-power/pm-utils/pm-utils-1.2.3-r1.ebuild b/sys-power/pm-utils/pm-utils-1.2.3-r1.ebuild
deleted file mode 100644
index bd2bafec447b..000000000000
--- a/sys-power/pm-utils/pm-utils-1.2.3-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/pm-utils/pm-utils-1.2.3-r1.ebuild,v 1.4 2009/02/16 14:20:36 chainsaw Exp $
-
-inherit eutils
-
-DESCRIPTION="Suspend and hibernation utilties for HAL"
-HOMEPAGE="http://pm-utils.freedesktop.org/"
-SRC_URI="http://pm-utils.freedesktop.org/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="alsa debug networkmanager ntp video_cards_intel video_cards_radeon"
-
-RDEPEND=">=sys-apps/hal-0.5.10
-		 >=sys-apps/dbus-1.0.0
-		 !sys-power/powermgmt-base
-		 >=sys-apps/util-linux-2.13
-		 alsa? ( media-sound/alsa-utils )
-		 networkmanager? ( net-misc/networkmanager )
-		 ntp? ( net-misc/ntp )
-		 !ppc? (
-			 !video_cards_intel? ( sys-apps/vbetool )
-			 video_cards_radeon? ( app-laptop/radeontool )
-		 )"
-DEPEND="!sys-power/powermgmt-base
-		app-text/xmlto"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# fix status detection, bug #255431
-	epatch "${FILESDIR}/${P}-service-status.patch"
-
-	# fix pkg-config file, bug #254492
-	sed -e 's:${pm_libdir):${pm_libdir}:' -i pm-utils.pc.in || die "sed failed"
-
-	local ignore="01grub"
-	use networkmanager || ignore="${ignore} 55NetworkManager"
-	use ntp            || ignore="${ignore} 90clock"
-
-	touch "${S}/gentoo"
-	use debug && echo 'PM_DEBUG="true"' >> "${S}/gentoo"
-	echo "HOOK_BLACKLIST=\"${ignore}\"" >> "${S}/gentoo"
-}
-
-src_compile() {
-	econf
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS ChangeLog NEWS README* TODO || die "dodoc failed"
-
-	insinto /etc/pm/config.d/
-	doins "${S}/gentoo"
-}
diff --git a/sys-power/pm-utils/pm-utils-1.2.3.ebuild b/sys-power/pm-utils/pm-utils-1.2.3.ebuild
deleted file mode 100644
index a67fa6860264..000000000000
--- a/sys-power/pm-utils/pm-utils-1.2.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/pm-utils/pm-utils-1.2.3.ebuild,v 1.3 2009/01/09 19:47:54 josejx Exp $
-
-DESCRIPTION="Suspend and hibernation utilties for HAL"
-HOMEPAGE="http://pm-utils.freedesktop.org/"
-SRC_URI="http://pm-utils.freedesktop.org/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="alsa debug networkmanager ntp video_cards_intel video_cards_radeon"
-
-RDEPEND=">=sys-apps/hal-0.5.10
-		 >=sys-apps/dbus-1.0.0
-		 !sys-power/powermgmt-base
-		 >=sys-apps/util-linux-2.13
-		 alsa? ( media-sound/alsa-utils )
-		 networkmanager? ( net-misc/networkmanager )
-		 ntp? ( net-misc/ntp )
-		 !ppc? (
-			 !video_cards_intel? ( sys-apps/vbetool )
-			 video_cards_radeon? ( app-laptop/radeontool )
-		 )"
-DEPEND="!sys-power/powermgmt-base
-		app-text/xmlto"
-
-src_unpack() {
-	local ignore="01grub"
-
-	unpack ${A}
-	cd "${S}"
-
-	touch "${S}/gentoo"
-
-	use debug && echo 'PM_DEBUG="true"' > "${S}/gentoo"
-
-	use networkmanager || ignore="${ignore} 10NetworkManager"
-	use ntp            || ignore="${ignore} 90clock"
-
-	echo "HOOK_BLACKLIST=\"${ignore}\"" > "${S}/gentoo"
-}
-
-src_compile() {
-	econf || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	insinto /etc/pm/config.d/
-	doins "${S}/gentoo"
-}
diff --git a/sys-power/pm-utils/pm-utils-1.2.4.ebuild b/sys-power/pm-utils/pm-utils-1.2.6.1.ebuild
index 73cd23b42a9e..74f5749e77d0 100644
--- a/sys-power/pm-utils/pm-utils-1.2.4.ebuild
+++ b/sys-power/pm-utils/pm-utils-1.2.6.1.ebuild
@@ -1,33 +1,35 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/pm-utils/pm-utils-1.2.4.ebuild,v 1.4 2009/04/26 19:19:31 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/pm-utils/pm-utils-1.2.6.1.ebuild,v 1.1 2010/01/24 21:49:56 eva Exp $
 
 EAPI="2"
 
 inherit autotools eutils
 
-DESCRIPTION="Suspend and hibernation utilties for HAL"
+DESCRIPTION="Suspend and hibernation utilities for HAL"
 HOMEPAGE="http://pm-utils.freedesktop.org/"
 SRC_URI="http://pm-utils.freedesktop.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="alsa debug networkmanager ntp video_cards_intel video_cards_radeon"
 
 RDEPEND=">=sys-apps/hal-0.5.10
-	>=sys-apps/dbus-1.0.0
+	>=sys-apps/dbus-1
 	!sys-power/powermgmt-base
 	>=sys-apps/util-linux-2.13
 	alsa? ( media-sound/alsa-utils )
 	networkmanager? ( net-misc/networkmanager )
 	ntp? ( net-misc/ntp )
 	!ppc? (
-		!video_cards_intel? ( sys-apps/vbetool )
-		video_cards_radeon? ( app-laptop/radeontool )
+		!ppc64? (
+			!video_cards_intel? ( sys-apps/vbetool )
+			video_cards_radeon? ( app-laptop/radeontool )
+		)
 	)"
-DEPEND="!sys-power/powermgmt-base
-	app-text/xmlto"
+DEPEND="!sys-power/powermgmt-base"
+# XXX: app-text/xmlto usage is automagic
 
 src_prepare() {
 	local ignore="01grub"
@@ -44,6 +46,10 @@ src_prepare() {
 	eautoreconf
 }
 
+src_configure() {
+	econf --docdir=/usr/share/doc/${P}
+}
+
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"