diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2010-09-28 05:24:35 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-09-28 05:24:35 +0000 |
commit | c19b82c256ba0e6f83e4f47a3b24aab51ed2958a (patch) | |
tree | 05eab47fc2c3872701319e2cb58c7d63320f4996 /sys-power | |
parent | old (diff) | |
download | gentoo-2-c19b82c256ba0e6f83e4f47a3b24aab51ed2958a.tar.gz gentoo-2-c19b82c256ba0e6f83e4f47a3b24aab51ed2958a.tar.bz2 gentoo-2-c19b82c256ba0e6f83e4f47a3b24aab51ed2958a.zip |
old
(Portage version: 2.2_rc87/cvs/Linux x86_64)
Diffstat (limited to 'sys-power')
-rw-r--r-- | sys-power/pm-utils/Manifest | 14 | ||||
-rw-r--r-- | sys-power/pm-utils/files/1.3.0-fix_autotools.patch | 53 | ||||
-rw-r--r-- | sys-power/pm-utils/files/1.3.0-on_ac_power-upower.patch | 89 | ||||
-rw-r--r-- | sys-power/pm-utils/pm-utils-1.3.0-r2.ebuild | 57 |
4 files changed, 0 insertions, 213 deletions
diff --git a/sys-power/pm-utils/Manifest b/sys-power/pm-utils/Manifest index 2300794da284..0c15b402c2e6 100644 --- a/sys-power/pm-utils/Manifest +++ b/sys-power/pm-utils/Manifest @@ -1,18 +1,4 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -AUX 1.3.0-fix_autotools.patch 1858 RMD160 75f3cf306ce146f0fdeb21db1c73b9271c88b0b9 SHA1 8a94d9e6d096fed747cbb0a99bdea439e52ff1c8 SHA256 911e25a3565addb2cd8222e503ac9b98ca285e6ab83577b7f8032c8f1e32b32d -AUX 1.3.0-on_ac_power-upower.patch 2948 RMD160 5ffeff42862ac80eef619bc10391b3d1047ec8cf SHA1 86c7d9dfc59c7ba75e1bcb68f9f1600b34faf656 SHA256 95c776aa43bba1f364e813691294726c9c4ff825454fe2d6c729380b17ab4392 -DIST pm-utils-1.3.0.tar.gz 197344 RMD160 52d257a5440bbdafd7d814351b9a59deb36536ba SHA1 30f6c0a7f470d2c2874d3b13046c1883363c06f3 SHA256 586cc4a6d40e5d659d9d634ba9d3cde6268a0543fd7f29026a3069bcd726806e DIST pm-utils-1.4.1.tar.gz 208687 RMD160 04798d6d3aa3bbbfbca6dc48037916b425714108 SHA1 9aacb9b4a5f11f751d94f5257c6c54460f106197 SHA256 8ed899032866d88b2933a1d34cc75e8ae42dcde20e1cc21836baaae3d4370c0b -EBUILD pm-utils-1.3.0-r2.ebuild 1525 RMD160 860395d927a51227374c2b336441034b51803987 SHA1 000cd9979105b54202a49a9d9d9b6b2100811aa8 SHA256 dd7b1d42dc5296e32dedec8b62c481df66c6f9f785eef5c591b47bb051c1119a EBUILD pm-utils-1.4.1.ebuild 1562 RMD160 1a9fef6015fa7d7e5e367abff772e49f941a87ed SHA1 bf500123b7a7aac45008f4ae5a140942b3eabb7c SHA256 a8513586697895257fcc5ac9004f2b884f757377880007e8743e2945bee3dc60 MISC ChangeLog 8245 RMD160 59c7da3f5cd785eeb2fc834e8ab821841c0d16e0 SHA1 908bbe1cc9df601b8297cfedc71dcda67d70fb82 SHA256 71413c85ebd6024816ec83ca17c316570678e311fec5bcd8a956f2f48b2357e3 MISC metadata.xml 333 RMD160 28ff42d27d929095e83151b3a6bc06e9acdc1a10 SHA1 bd2334f7ff7c962f0d98678472e7feb673b942b6 SHA256 f06c34f767b411fcbc763a18bfd022d40fd4eb7fb38d3d14473a47064685bbda ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.16 (GNU/Linux) - -iEYEARECAAYFAkyIUSwACgkQcsIHjyDViGSWhgCg1UiSqBsVfIMfA6y1/nBIcU3+ -Zn8AnRq8NJJd4TrGB1TCtRZXiKZc1Gwf -=87ri ------END PGP SIGNATURE----- diff --git a/sys-power/pm-utils/files/1.3.0-fix_autotools.patch b/sys-power/pm-utils/files/1.3.0-fix_autotools.patch deleted file mode 100644 index 8dda68cffb80..000000000000 --- a/sys-power/pm-utils/files/1.3.0-fix_autotools.patch +++ /dev/null @@ -1,53 +0,0 @@ -./configure --disable-manpages for controlling xmlto depend - ---- configure.ac -+++ configure.ac -@@ -8,28 +8,28 @@ - AC_PROG_LN_S - - dnl --------------------------------------------------------------------------- --dnl - Extra verbose warning switches --dnl --------------------------------------------------------------------------- --CPPFLAGS="$CPPFLAGS -Wall -Werror" -- --dnl --------------------------------------------------------------------------- --dnl - Debugging switches --dnl --------------------------------------------------------------------------- --CPPFLAGS="$CPPFLAGS -g" -- --dnl --------------------------------------------------------------------------- - dnl - Manual page build - dnl --------------------------------------------------------------------------- --AC_PATH_PROG(XMLTO, xmlto, no) --AM_CONDITIONAL(HAVE_XMLTO, [test "x$XMLTO" != xno]) -- --dnl --------------------------------------------------------------------------- --dnl - Make paths available for source files --dnl --------------------------------------------------------------------------- --AC_SUBST(SYSCONFDIR, $sysconfdir) --AC_SUBST(DATADIR, $datadir) --AC_SUBST(BINDIR, $bindir) --AC_SUBST(SBINDIR, $sbindir) -+AC_ARG_ENABLE([manpages], -+ AC_HELP_STRING([--disable-manpages], -+ [Disable manpage generating via xmlto [[default=auto]]]), -+ [MAN="$enableval"], -+ [MAN=auto]) -+ AC_PATH_PROG(XMLTO, xmlto, no) -+ AS_IF([test "x$MAN" = "xyes"], -+ [ -+ AS_IF([test "x$XMLTO" = "xno"], -+ [AC_MSG_ERROR([Manpage generating requested but xmlto not found.]) -+ ]) -+ ], -+ [test "x${MAN}" != "xno"], -+ [ -+ AS_IF([test "x$XMLTO" != "xno"], -+ [MAN="yes"], -+ [MAN="no"]) -+ ]) -+AM_CONDITIONAL(HAVE_XMLTO, [test "x$MAN" != xno]) -+AC_MSG_RESULT([checking whether to build manpages... $MAN]) - - dnl --------------------------------------------------------------------------- - dnl - Makefiles, etc. diff --git a/sys-power/pm-utils/files/1.3.0-on_ac_power-upower.patch b/sys-power/pm-utils/files/1.3.0-on_ac_power-upower.patch deleted file mode 100644 index 4483ef00749c..000000000000 --- a/sys-power/pm-utils/files/1.3.0-on_ac_power-upower.patch +++ /dev/null @@ -1,89 +0,0 @@ -From e8d0b58a9df080f021d04b4c2d358003974092f3 Mon Sep 17 00:00:00 2001 -From: Michal Schmidt <mschmidt@redhat.com> -Date: Tue, 23 Feb 2010 13:57:05 +0000 -Subject: on_ac_power: support UPower (new name for DeviceKit-power) - -DeviceKit-power got renamed to UPower and its D-Bus interface changed -accordingly. - -Try UPower first in on_ac_power. -If it fails, try DeviceKit-power. -It if fails too, try hal. - -Also update documentation. - -Signed-off-by: Michael Biebl <mbiebl@gmail.com> ---- -diff --git a/man/pm-action.xml b/man/pm-action.xml -index ccb4153..6e9f639 100644 ---- a/man/pm-action.xml -+++ b/man/pm-action.xml -@@ -104,7 +104,7 @@ - For some options external programs are needed. - </para> - <para> -- These commands will usually be called by <command>DeviceKit-power</command> -+ These commands will usually be called by <command>UPower</command> - or <command>hald</command> when triggered to do so by a program - in a desktop session such as <command>gnome-power-manager</command>. - Calling them from the command line is also possible, but it is not -diff --git a/man/pm-is-supported.xml b/man/pm-is-supported.xml -index 88bb9fd..d07c87d 100644 ---- a/man/pm-is-supported.xml -+++ b/man/pm-is-supported.xml -@@ -89,7 +89,7 @@ - <para> - The intended purpose of <command>&dhpackage;</command> is to - find out which power management modes are supported by the -- system. hald(8) will call it to do just that. (Note that DeviceKit-power -+ system. hald(8) will call it to do just that. (Note that UPower - does not use this.) - </para> - </refsect1> -@@ -161,10 +161,6 @@ - <!-- In alpabetical order. --> - <para> - <citerefentry> -- <refentrytitle>DeviceKit-power</refentrytitle> -- <manvolnum>7</manvolnum> -- </citerefentry>, -- <citerefentry> - <refentrytitle>hald</refentrytitle> - <manvolnum>8</manvolnum> - </citerefentry>, -@@ -175,6 +171,10 @@ - <citerefentry> - <refentrytitle>s2both</refentrytitle> - <manvolnum>8</manvolnum> -+ </citerefentry>, -+ <citerefentry> -+ <refentrytitle>UPower</refentrytitle> -+ <manvolnum>7</manvolnum> - </citerefentry> - </para> - </refsect1> -diff --git a/src/on_ac_power b/src/on_ac_power -index fdbcb36..1f9c59e 100755 ---- a/src/on_ac_power -+++ b/src/on_ac_power -@@ -30,7 +30,17 @@ - # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - # - --# prefer DeviceKit-power if available -+# prefer UPower if available -+if s="$(dbus-send --system --print-reply \ -+ --dest=org.freedesktop.UPower \ -+ /org/freedesktop/UPower \ -+ org.freedesktop.DBus.Properties.Get \ -+ string:org.freedesktop.UPower string:OnBattery)"; then -+ echo "$s" | grep -q 'boolean false' -+ exit $? -+fi -+ -+# try its old name 'DeviceKit-power' too - if s="$(dbus-send --system --print-reply \ - --dest=org.freedesktop.DeviceKit.Power \ - /org/freedesktop/DeviceKit/Power \ --- -cgit v0.8.3-6-g21f6 diff --git a/sys-power/pm-utils/pm-utils-1.3.0-r2.ebuild b/sys-power/pm-utils/pm-utils-1.3.0-r2.ebuild deleted file mode 100644 index a8f4858a9116..000000000000 --- a/sys-power/pm-utils/pm-utils-1.3.0-r2.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# 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.3.0-r2.ebuild,v 1.9 2010/07/03 21:32:49 ssuominen Exp $ - -EAPI=2 -inherit autotools eutils - -DESCRIPTION="Suspend and hibernation utilities" -HOMEPAGE="http://pm-utils.freedesktop.org/" -SRC_URI="http://pm-utils.freedesktop.org/releases/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ppc ppc64 x86" -IUSE="alsa debug networkmanager ntp video_cards_intel video_cards_radeon" - -vbetool="!video_cards_intel? ( sys-apps/vbetool )" -RDEPEND=" - !sys-power/powermgmt-base - sys-apps/dbus - >=sys-apps/util-linux-2.13 - sys-power/pm-quirks - alsa? ( media-sound/alsa-utils ) - networkmanager? ( net-misc/networkmanager ) - ntp? ( net-misc/ntp ) - amd64? ( ${vbetool} ) - x86? ( ${vbetool} ) - video_cards_radeon? ( app-laptop/radeontool )" -DEPEND="app-text/xmlto - app-text/docbook-xml-dtd:4.5" - -src_prepare() { - local ignore="01grub" - use networkmanager || ignore+=" 55NetworkManager" - use ntp || ignore+=" 90clock" - - use debug && echo 'PM_DEBUG="true"' > "${S}/gentoo" - echo "HOOK_BLACKLIST=\"${ignore}\"" >> "${S}/gentoo" - - epatch "${FILESDIR}"/${PV}-fix_autotools.patch \ - "${FILESDIR}"/${PV}-on_ac_power-upower.patch - - eautoreconf -} - -src_configure() { - econf \ - --docdir=/usr/share/doc/${PF} -} - -src_install() { - emake DESTDIR="${D}" install || die - dodoc AUTHORS ChangeLog NEWS pm/HOWTO* README* TODO || die - - insinto /etc/pm/config.d - doins gentoo || die -} |