new upstream release, patch to remove on_ac_power script, fix modular x dependencies

(Portage version: 2.1_pre4-r1)

7 files changed, 286 insertions, 11 deletions

diff --git a/sys-apps/apmd/ChangeLog b/sys-apps/apmd/ChangeLog
index 8268fe1df015..bc8ae9d58d23 100644
--- a/sys-apps/apmd/ChangeLog
+++ b/sys-apps/apmd/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for sys-apps/apmd
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/ChangeLog,v 1.26 2005/11/09 07:19:24 compnerd Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/ChangeLog,v 1.27 2006/02/12 08:50:00 steev Exp $
+
+  12 Feb 2006; Steev Klimaszewski <steev@gentoo.org>
+  +files/apmd-no-on_ac_power_script.patch, apmd-3.0.2-r3.ebuild,
+  apmd-3.2.0.ebuild, +apmd-3.2.2_p5.ebuild:
+  Fix apmd 3.0.2 and 3.2.0 ebuilds for modular x dependencies.
+
+*apmd-3.2.2_p5 (12 Feb 2006)
+
+  12 Feb 2006; Steev Klimaszewski <steev@gentoo.org>
+  +files/apmd-no-on_ac_power_script.patch, +apmd-3.2.2_p5.ebuild:
+  New upstream release, also remove on_ac_power script since we now depend on
+  powermgmt-base.
 
   10 Nov 2005; Saleem Abdulrasool <compnerd@gentoo.org>
   apmd-3.2.1_p4.ebuild:
diff --git a/sys-apps/apmd/Manifest b/sys-apps/apmd/Manifest
index eb5302b11f00..5fe82864eb44 100644
--- a/sys-apps/apmd/Manifest
+++ b/sys-apps/apmd/Manifest
@@ -1,14 +1,51 @@
-MD5 c69b7ddde24380ff318642f9d2bc0326 ChangeLog 3960
-MD5 88e3463d354ae8c261776456764ad06e apmd-3.0.2-r3.ebuild 1781
-MD5 27e5317f463949dfc99f018f5fcc2527 apmd-3.2.0.ebuild 1856
+MD5 1c05bf123b3a1c665cfa53a4860fce43 ChangeLog 4206
+RMD160 13658dfc3f41eeda32bc0296653353637e4b75db ChangeLog 4206
+SHA256 4725b5c58c17db27a5a2a7a5c599f0f7635638b97709a1c5eedb79798edbcf35 ChangeLog 4206
+MD5 5fd247e8f68721b9d3075e869f18fd39 apmd-3.0.2-r3.ebuild 1932
+RMD160 3218e82bda2bb8e9e106b06172bddcec04695f4e apmd-3.0.2-r3.ebuild 1932
+SHA256 a5f0e3e825e63ef0e0da42fc96683c614134938a5d1520f66f1e26f26f49bd0e apmd-3.0.2-r3.ebuild 1932
+MD5 fd60ca92c096523de03f0bfb75416ae6 apmd-3.2.0.ebuild 2006
+RMD160 34c2d78e2e75b5d7cafd7174e625e277a4969e00 apmd-3.2.0.ebuild 2006
+SHA256 534807911a64d2011cdb20975d5f156affc54f2c1e7458a78d413f32d138bc0c apmd-3.2.0.ebuild 2006
 MD5 b1f0bde94ec7b38f1065226d075862df apmd-3.2.1_p4.ebuild 1881
+RMD160 4fc2655262c62bd6daf9963be4910a613be3e8d8 apmd-3.2.1_p4.ebuild 1881
+SHA256 122c9046affbd33f1ca547fbda1ea8cc728fda454e77d3327fefc74e0f12cd92 apmd-3.2.1_p4.ebuild 1881
+MD5 c5fc4dcba2e7948f9e15a893311e0f0b apmd-3.2.2_p5.ebuild 1968
+RMD160 54ac835411f6b7266587fcf2aa32f5fab1a368c9 apmd-3.2.2_p5.ebuild 1968
+SHA256 722ce9edd8a730baabe5290c0fbc2f83fc19d5f2f4c5c01e8354351caef77021 apmd-3.2.2_p5.ebuild 1968
 MD5 bed1c6668552bbf528df267c302a75eb files/apmd-3.2.0.kernel26x.patch 627
+RMD160 6d3c919f9032c418b95ea4544d137c383048838d files/apmd-3.2.0.kernel26x.patch 627
+SHA256 5cb5c097dcf18a8e00f16c36e96bf1acb460a4aaa59e36cc14634f22ce68aebf files/apmd-3.2.0.kernel26x.patch 627
+MD5 5e54c304ecfa384d9f8295aab9fb1b7a files/apmd-no-on_ac_power_script.patch 4057
+RMD160 fbfafa74939d219daf11d7d964bb820f95072cce files/apmd-no-on_ac_power_script.patch 4057
+SHA256 32d85e1328426482693a29305bc8c892e232ddb628b36b6818cfa3cb9099820c files/apmd-no-on_ac_power_script.patch 4057
 MD5 5aa18e3b8ad79d8893bddb038e29ab98 files/apmd.confd 161
+RMD160 b9017e4fdcb4554c6c7b67d560efe2135f88f310 files/apmd.confd 161
+SHA256 3e984cccf976443ada013ea80a759b47a3c618cdc036b5979bc348bb26210957 files/apmd.confd 161
 MD5 02fc246d5b2fde52708927cb672239f1 files/apmd.kernel26x.patch 644
+RMD160 43dd4216fcf97ea79a4fbfa94a794f4cd2e4f70b files/apmd.kernel26x.patch 644
+SHA256 eb1a65c3c165197200f24dfe8495182e36b88ab0c5df9912be8b74d7322b2e86 files/apmd.kernel26x.patch 644
 MD5 bdb989641f5be7797a3232a8691ebc66 files/apmd.rc6 672
+RMD160 86ce76611e496f65bbc174995f7575b06bde333b files/apmd.rc6 672
+SHA256 121ad43e5da300f36d5536aa3ddc6f0c41c612063b22c3d033832fe9f0dde34d files/apmd.rc6 672
 MD5 ad21c10734c08e19968e2c8c9560957c files/apmsleep.c.diff 367
+RMD160 f2a178039d1375e66e1eea065ea1a67a845d1ccc files/apmsleep.c.diff 367
+SHA256 d5249757b83d832e3d0042ba5dee8856c6b21f7420a2fa62fc35c63e461a9548 files/apmsleep.c.diff 367
 MD5 253b79375ab72606e4fdf89109ed2c03 files/apmsleep.c.diff.3.2.0 301
+RMD160 2fe32822ce93d429d36dd5b7ec81bf0ae842b147 files/apmsleep.c.diff.3.2.0 301
+SHA256 d168aeddbf9926b9f104f586d2332f7770113d29bfd12399a1c03b739f39dcc1 files/apmsleep.c.diff.3.2.0 301
 MD5 7bb0220959a949bad3d9726cf05ebcf9 files/digest-apmd-3.0.2-r3 61
+RMD160 240008ef6816764e68207e022c31e87701cd47c4 files/digest-apmd-3.0.2-r3 61
+SHA256 28860a9b7361049e0adaec726e7a1c78c3f7083a5fe8f0cfdb97b5de6dc20836 files/digest-apmd-3.0.2-r3 61
 MD5 a2b499e3ffda161e88b518f5b830a434 files/digest-apmd-3.2.0 66
+RMD160 180bc1c5755d0f779a8d1cb2fe3fe4086039e48a files/digest-apmd-3.2.0 66
+SHA256 13259b495d20037c80fd8dec025bf001f3068e8ec5bf1517bdd586e97c1319ad files/digest-apmd-3.2.0 66
 MD5 d37ae27d1835ba334535714614c799dd files/digest-apmd-3.2.1_p4 130
+RMD160 289c23eb3edada34c3da90971053907388436e61 files/digest-apmd-3.2.1_p4 130
+SHA256 5465884a6510e60920ef82b006c2a236c7e1fa3d2130b03ad4fe52362b8c27b1 files/digest-apmd-3.2.1_p4 130
+MD5 c1051eb24b92f90468fdd3458d57e3d9 files/digest-apmd-3.2.2_p5 482
+RMD160 10f08b00ec3422036499a9b95a481ce1ccf8da9f files/digest-apmd-3.2.2_p5 482
+SHA256 6e30474dfe576440b1609ffb171e93dc451d6dd360b6aaf96e3cb363a4ee5595 files/digest-apmd-3.2.2_p5 482
 MD5 19fd766bac8e110b4620363a1ace26dd metadata.xml 159
+RMD160 54af1e9a61e5ed1b49b2bbbf3ef2278999c66b13 metadata.xml 159
+SHA256 ed3a0d440cfa5672284f4172ebde0ea6506c1a38e9a3ed9f14f3d2c093aac42f metadata.xml 159
diff --git a/sys-apps/apmd/apmd-3.0.2-r3.ebuild b/sys-apps/apmd/apmd-3.0.2-r3.ebuild
index 970904a5d991..d78385ed8c90 100644
--- a/sys-apps/apmd/apmd-3.0.2-r3.ebuild
+++ b/sys-apps/apmd/apmd-3.0.2-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/apmd-3.0.2-r3.ebuild,v 1.19 2005/01/04 11:52:56 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/apmd-3.0.2-r3.ebuild,v 1.20 2006/02/12 08:50:00 steev Exp $
 
 inherit eutils
 
@@ -17,7 +17,15 @@ KEYWORDS="x86 amd64 ppc"
 
 
 DEPEND=">=sys-apps/debianutils-1.16
-	X? ( virtual/x11 )"
+	X? ( || ( ( x11-libs/libX11
+				x11-libs/libXaw
+				x11-libs/libXmu
+				x11-libs/libSM
+				x11-libs/libICE
+				x11-libs/libXt
+				x11-libs/libXext )
+				virtual/x11 ) )"
+
 
 src_unpack() {
 	unpack ${A} ; cd ${S}
diff --git a/sys-apps/apmd/apmd-3.2.0.ebuild b/sys-apps/apmd/apmd-3.2.0.ebuild
index 06756c4a2101..6cc64e2c1606 100644
--- a/sys-apps/apmd/apmd-3.2.0.ebuild
+++ b/sys-apps/apmd/apmd-3.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/apmd-3.2.0.ebuild,v 1.12 2005/07/09 16:00:13 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/apmd-3.2.0.ebuild,v 1.13 2006/02/12 08:50:00 steev Exp $
 
 inherit eutils
 
@@ -17,7 +17,14 @@ KEYWORDS="~x86 ~amd64 ~ppc"
 
 
 DEPEND=">=sys-apps/debianutils-1.16
-	X? ( virtual/x11 )"
+	X? ( || ( ( x11-libs/libX11
+				x11-libs/libXaw
+				x11-libs/libXmu
+				x11-libs/libSM
+				x11-libs/libICE
+				x11-libs/libXt
+				x11-libs/libXext )
+				virtual/x11 ) )"
 
 src_unpack() {
 	unpack ${A} ; cd ${S}
diff --git a/sys-apps/apmd/apmd-3.2.2_p5.ebuild b/sys-apps/apmd/apmd-3.2.2_p5.ebuild
new file mode 100644
index 000000000000..2682aab026ad
--- /dev/null
+++ b/sys-apps/apmd/apmd-3.2.2_p5.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/apmd-3.2.2_p5.ebuild,v 1.1 2006/02/12 08:50:00 steev Exp $
+
+inherit eutils multilib
+
+MY_PV="${PV%_p*}"
+MY_P="${PN}_${MY_PV}"
+PATCHV="${PV#*_p}"
+
+DESCRIPTION="Advanced Power Management Daemon"
+HOMEPAGE="http://www.worldvisions.ca/~apenwarr/apmd/"
+SRC_URI="mirror://debian/pool/main/a/apmd/${MY_P}.orig.tar.gz
+	mirror://debian/pool/main/a/apmd/${MY_P}-${PATCHV}.diff.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="X nls"
+
+RDEPEND=">=sys-apps/debianutils-1.16
+	>=sys-power/powermgmt-base-1.22
+	X? ( || ( ( x11-libs/libX11
+				x11-libs/libXaw
+				x11-libs/libXmu
+				x11-libs/libSM
+				x11-libs/libICE
+				x11-libs/libXt
+				x11-libs/libXext )
+				virtual/x11 ) )"
+DEPEND="${RDEPEND}
+	virtual/os-headers"
+
+S=${WORKDIR}/${PN}-${MY_PV}.orig
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${WORKDIR}"/${MY_P}-${PATCHV}.diff
+	# We depend on powermgmt-base now, so no need to install the script
+	# included with apmd.
+	epatch "${FILESDIR}"/${PN}-no-on_ac_power_script.patch
+
+	if ! use X ; then
+		sed -i \
+			-e 's:\(EXES=.*\)xapm:\1:' \
+			-e 's:\(.*\)\$(LT_INSTALL).*xapm.*$:\1echo:' \
+			"${S}"/Makefile \
+			|| die "sed failed"
+	fi
+}
+
+src_compile() {
+	emake || die "emake failed"
+}
+
+src_install() {
+	dodir /usr/sbin
+
+	make DESTDIR="${D}" PREFIX=/usr LIBDIR=/usr/$(get_libdir) install \
+		|| die "install failed"
+
+	keepdir /etc/apm/{event.d,suspend.d,resume.d,other.d,scripts.d}
+	exeinto /etc/apm
+	doexe debian/apmd_proxy || die "doexe failed"
+	dodoc AUTHORS apmsleep.README README debian/README.Debian \
+		debian/changelog* debian/copyright*
+
+	doman *.1 *.8
+
+	# note: apmd_proxy.conf is currently disabled and not used, thus
+	#       not installed - liquidx (01 Mar 2004)
+
+	insinto /etc/conf.d
+	newins "${FILESDIR}"/apmd.confd apmd || die "newins failed"
+	exeinto /etc/init.d
+	newexe "${FILESDIR}"/apmd.rc6 apmd || die "newexe failed"
+
+	use nls || rm -rf "${D}"/usr/share/man/fr
+}
diff --git a/sys-apps/apmd/files/apmd-no-on_ac_power_script.patch b/sys-apps/apmd/files/apmd-no-on_ac_power_script.patch
new file mode 100644
index 000000000000..43d71dcb06f3
--- /dev/null
+++ b/sys-apps/apmd/files/apmd-no-on_ac_power_script.patch
@@ -0,0 +1,125 @@
+diff -urN apmd-3.2.2.orig.orig/Makefile apmd-3.2.2.orig/Makefile
+--- apmd-3.2.2.orig.orig/Makefile	2006-02-12 02:21:34.000000000 -0600
++++ apmd-3.2.2.orig/Makefile	2006-02-12 02:22:15.000000000 -0600
+@@ -107,7 +107,6 @@
+ 	$(LT_INSTALL)        apmd        $(DESTDIR)$(SBINDIR)
+ 	$(LT_INSTALL)        xapm        $(DESTDIR)$(BINDIR)
+ 	$(LT_INSTALL)        apmsleep    $(DESTDIR)$(BINDIR)
+-	install              on_ac_power $(DESTDIR)$(BINDIR)
+ 	install       -m 644 apm.h       $(DESTDIR)$(INCDIR)
+ 
+ .PHONY:	clean distclean
+diff -urN apmd-3.2.2.orig.orig/on_ac_power apmd-3.2.2.orig/on_ac_power
+--- apmd-3.2.2.orig.orig/on_ac_power	2006-02-12 02:21:34.000000000 -0600
++++ apmd-3.2.2.orig/on_ac_power	1969-12-31 18:00:00.000000000 -0600
+@@ -1,62 +0,0 @@
+-#!/bin/sh
+-#
+-# Returns 0 (true) if on AC power
+-#         1 (false) if not on AC power
+-#         255 (false) if can't tell
+-#
+-# Example shell script:
+-#     if on_ac_power; then
+-#       echo We're on AC power
+-#     else
+-#       echo Can't say we're on AC power
+-#     fi
+-
+-set -e
+-
+-# ACPI
+-#
+-# This algorithm is complicated by the possibility of multiple AC
+-# adapters.  We scan the ac_adapter directory looking for adapters
+-# that have known states.  If any adapter is on-line, we return 0.  If
+-# no adapters are on-line but one or more are off-line, we return 1.
+-#
+-if acpi_available && [ -d /proc/acpi/ac_adapter ]; then
+-    OFF_LINE_P=no
+-    for FN in /proc/acpi/ac_adapter/*; do
+-	if [ -d "${FN}" ]; then
+-	    if [ -r "${FN}/state" ]; then
+-		grep --quiet on-line "${FN}/state" && exit 0
+-		grep --quiet off-line "${FN}/state" && OFF_LINE_P=yes
+-	    elif [ -r "${FN}/status" ]; then
+-		grep --quiet on-line "${FN}/status" && exit 0
+-		grep --quiet off-line "${FN}/status" && OFF_LINE_P=yes
+-	    fi
+-	fi
+-    done
+-    [ "${OFF_LINE_P}" = "yes" ] && exit 1
+-fi
+-
+-# APM
+-if apm_available && [ -r /proc/apm ]; then
+-    exec awk </proc/apm '
+-	BEGIN { ret = 255 }
+-	/^[0-9.a-zA-Z]* [0-9.]* 0x.. 0x../ {
+-		if ($4 == "0x01") { ret = 0; exit }
+-		else if ($4 == "0x00") { ret = 1; exit }
+-	}
+-	END { exit ret }
+-    '
+-fi
+-
+-# PMU
+-if [ -r /proc/pmu/info ]; then
+-    exec awk </proc/pmu/info '
+-	BEGIN { ret = 255 }
+-	/^AC Power.*1$/ { ret = 0; exit }
+-	/^AC Power.*0$/ { ret = 1; exit }
+-	END { exit ret }
+-    '
+-fi
+-
+-# nothing is available
+-exit 255
+diff -urN apmd-3.2.2.orig.orig/on_ac_power.1 apmd-3.2.2.orig/on_ac_power.1
+--- apmd-3.2.2.orig.orig/on_ac_power.1	2006-02-12 02:21:34.000000000 -0600
++++ apmd-3.2.2.orig/on_ac_power.1	1969-12-31 18:00:00.000000000 -0600
+@@ -1,44 +0,0 @@
+-.\"                                      Hey, EMACS: -*- nroff -*-
+-.\" First parameter, NAME, should be all caps
+-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+-.\" other parameters are allowed: see man(7), man(1)
+-.TH ON_AC_POWER 1 "January 2004" "" ""
+-.\" Please adjust this date whenever revising the manpage.
+-.\"
+-.\" Some roff macros, for reference:
+-.\" .nh        disable hyphenation
+-.\" .hy        enable hyphenation
+-.\" .ad l      left justify
+-.\" .ad b      justify to both left and right margins
+-.\" .nf        disable filling
+-.\" .fi        enable filling
+-.\" .br        insert line break
+-.\" .sp <n> insert n+1 empty lines
+-.\" for manpage-specific macros, see man(7)
+-.SH NAME
+-on_ac_power \- test whether the computer is running on line power
+-.SH SYNOPSIS
+-.B on_ac_power
+-.SH DESCRIPTION
+-The command succeeds (status 0) if the system is using line power
+-and fails (status other than 0) otherwise.
+-It is designed to be easy to use in shell scripts.
+-.SH OPTIONS
+-None.
+-.SH "EXIT STATUS"
+-.br
+-.nf
+-\fB0\fR (true)    System is on line power
+-\fB1\fR (false)   System is not on line power
+-\fB255\fR (false) Power status could not be determined
+-.SH FILES
+-.br
+-.nf
+-.ta \w'/proc/apm   'u
+-\fI/proc/apm\fR         APM status information file
+-.nf
+-.ta \w'/proc/acpi/ 'u
+-\fI/proc/acpi\fR        ACPI status information directory
+-.SH AUTHOR
+-This manual page was written by Steve Dodd <steved@loth.demon.co.uk>
+-and was updated by Thomas Hood.
diff --git a/sys-apps/apmd/files/digest-apmd-3.2.2_p5 b/sys-apps/apmd/files/digest-apmd-3.2.2_p5
new file mode 100644
index 000000000000..a2e1a193e1be
--- /dev/null
+++ b/sys-apps/apmd/files/digest-apmd-3.2.2_p5
@@ -0,0 +1,6 @@
+MD5 8d0d82ad91f3f89ed504719ec806ff33 apmd_3.2.2-5.diff.gz 28232
+RMD160 b82ad14bdcdcab149df0ae1b08c4dba7a6631c53 apmd_3.2.2-5.diff.gz 28232
+SHA256 b67021ab7dfb2d3b21bd12ba42fcc5f46481680ac640dafe9fd90d076d19a73d apmd_3.2.2-5.diff.gz 28232
+MD5 b1e6309e8331e0f4e6efd311c2d97fa8 apmd_3.2.2.orig.tar.gz 72757
+RMD160 d6433f4b8cd537e574fde2df56f45982b8da13aa apmd_3.2.2.orig.tar.gz 72757
+SHA256 7f7d9f60b7766b852881d40b8ff91d8e39fccb0d1d913102a5c75a2dbb52332d apmd_3.2.2.orig.tar.gz 72757