Use latest Debian patchset. Respect CFLAGS and LDFLAGS. Strip X11R6 directories.

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

3 files changed, 90 insertions, 3 deletions

diff --git a/sys-apps/apmd/ChangeLog b/sys-apps/apmd/ChangeLog
index f0f7ec1fa0c9..c17de80e11e0 100644
--- a/sys-apps/apmd/ChangeLog
+++ b/sys-apps/apmd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/apmd
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/ChangeLog,v 1.38 2007/07/22 06:22:14 dberkholz Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/ChangeLog,v 1.39 2010/07/08 11:25:40 ssuominen Exp $
+
+*apmd-3.2.2_p14 (08 Jul 2010)
+
+  08 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +apmd-3.2.2_p14.ebuild:
+  Use latest Debian patchset. Respect CFLAGS and LDFLAGS. Strip X11R6
+  directories.
 
   22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; apmd-3.0.2-r3.ebuild,
   apmd-3.2.0.ebuild, apmd-3.2.1_p4.ebuild, apmd-3.2.2_p5.ebuild:
diff --git a/sys-apps/apmd/Manifest b/sys-apps/apmd/Manifest
index c19538375b37..04dcfd83b0f8 100644
--- a/sys-apps/apmd/Manifest
+++ b/sys-apps/apmd/Manifest
@@ -1,8 +1,10 @@
 AUX apmd-no-on_ac_power_script.patch 4057 RMD160 fbfafa74939d219daf11d7d964bb820f95072cce SHA1 1ff59af7fc54df593a585f091b25c794f332f175 SHA256 32d85e1328426482693a29305bc8c892e232ddb628b36b6818cfa3cb9099820c
 AUX apmd.confd 161 RMD160 b9017e4fdcb4554c6c7b67d560efe2135f88f310 SHA1 4e1f966e936a0fe94ff5991b3773b60f4789b1a0 SHA256 3e984cccf976443ada013ea80a759b47a3c618cdc036b5979bc348bb26210957
 AUX apmd.rc6 672 RMD160 86ce76611e496f65bbc174995f7575b06bde333b SHA1 5e3626bdd4aeea147cb01b7322a7b9e3fe1287d7 SHA256 121ad43e5da300f36d5536aa3ddc6f0c41c612063b22c3d033832fe9f0dde34d
+DIST apmd_3.2.2-14.diff.gz 19195 RMD160 12b0e46b9cbfd8b82e052e2dc106f75cc68becf0 SHA1 4d3a6d72fdd2caf38a2b9e678c5c897359625fe8 SHA256 7905ff96be93d725544d0040e425c42f9c05580db3c272f11cff75b9aa89d430
 DIST apmd_3.2.2-5.diff.gz 28232 RMD160 b82ad14bdcdcab149df0ae1b08c4dba7a6631c53 SHA1 2c13a569590f3b00f8223cd796ce882aeec1a8aa SHA256 b67021ab7dfb2d3b21bd12ba42fcc5f46481680ac640dafe9fd90d076d19a73d
 DIST apmd_3.2.2.orig.tar.gz 72757 RMD160 d6433f4b8cd537e574fde2df56f45982b8da13aa SHA1 2697ba78724a22b76e871b27363b6bdefa9baa38 SHA256 7f7d9f60b7766b852881d40b8ff91d8e39fccb0d1d913102a5c75a2dbb52332d
+EBUILD apmd-3.2.2_p14.ebuild 1956 RMD160 27a7bd3e2bc97a3668ed2cc665d9f26bdc0b3167 SHA1 5e30fde5be09eb4b140f11e56de4f04a6f11ef79 SHA256 5d40012b4841e6646abfb98acfd16eabbc95cad3b6ae950afea6d59800250fe4
 EBUILD apmd-3.2.2_p5.ebuild 2016 RMD160 07034cc9cfe433a1a0bc5ebe815e6fde1c9eba4e SHA1 3874692aa3559e9f1950fd97a4bb7c75372481d5 SHA256 53e97bda3f3f705f87b355da99a85726a928067c3e3f60174a1caa09eed33f01
-MISC ChangeLog 5927 RMD160 d12f6cbe82486b18476c9fbf1424111b8f10c243 SHA1 46f4cb6367ca05d52ef931791e887206906b81a0 SHA256 b5dc2ae7f64f5978730d6d62ce6b8e79ec0c6c4eb3df539e4eef975298a613ee
+MISC ChangeLog 6124 RMD160 e33a1dd399e161de60ec2d85583f2f59a475c122 SHA1 553a2fc20e3bc5e8e8424255d67a68c36c40e6b0 SHA256 1ed58efa5334e887247203c86424856e9ffdc7840c36f26dc42f2c634a525586
 MISC metadata.xml 159 RMD160 54af1e9a61e5ed1b49b2bbbf3ef2278999c66b13 SHA1 bce3da4745192397c9a08bdbcf7e4914eac9b77b SHA256 ed3a0d440cfa5672284f4172ebde0ea6506c1a38e9a3ed9f14f3d2c093aac42f
diff --git a/sys-apps/apmd/apmd-3.2.2_p14.ebuild b/sys-apps/apmd/apmd-3.2.2_p14.ebuild
new file mode 100644
index 000000000000..139b95e88669
--- /dev/null
+++ b/sys-apps/apmd/apmd-3.2.2_p14.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2010 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_p14.ebuild,v 1.1 2010/07/08 11:25:40 ssuominen Exp $
+
+EAPI=2
+inherit eutils multilib toolchain-funcs
+
+MY_PV=${PV%_p*}
+MY_P=${PN}_${MY_PV}
+PATCHV=${PV#*_p}
+
+DESCRIPTION="Advanced Power Management Daemon"
+HOMEPAGE="http://packages.qa.debian.org/a/apmd.html"
+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 ~arm ~ppc ~ppc64 ~x86"
+IUSE="nls X"
+
+RDEPEND=">=sys-apps/debianutils-1.16
+	>=sys-power/powermgmt-base-1.31
+	X? ( x11-libs/libX11
+		x11-libs/libXaw
+		x11-libs/libXmu
+		x11-libs/libSM
+		x11-libs/libICE
+		x11-libs/libXt
+		x11-libs/libXext )"
+DEPEND="${RDEPEND}
+	virtual/os-headers"
+
+S=${WORKDIR}/${PN}-${MY_PV}.orig
+
+src_prepare() {
+	epatch "${WORKDIR}"/${MY_P}-${PATCHV}.diff
+
+	if ! use X; then
+		sed -i \
+			-e 's:\(EXES=.*\)xapm:\1:' \
+			-e 's:\(.*\)\$(LT_INSTALL).*xapm.*$:\1echo:' \
+			Makefile || die
+	fi
+
+	# use system headers and skip on_ac_power
+	rm -f on_ac_power*
+
+	sed -i \
+		-e '/on_ac_power/d' \
+		-e 's:-I/usr/src/linux/include -I/usr/X11R6/include::' \
+		-e 's:-L/usr/X11R6/lib::' \
+		Makefile || die
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die
+}
+
+src_install() {
+	dodir /usr/sbin
+	emake DESTDIR="${D}" PREFIX=/usr LIBDIR=/usr/$(get_libdir) install || die
+
+	keepdir /etc/apm/{event.d,suspend.d,resume.d,other.d,scripts.d}
+	exeinto /etc/apm
+	doexe debian/apmd_proxy || die
+	dodoc AUTHORS {,apmsleep.}README debian/{changelog,README.Debian}
+
+	doman *.{1,8} || die
+
+	# note: apmd_proxy.conf is currently disabled and not used, thus
+	# not installed - liquidx (01 Mar 2004)
+
+	newconfd "${FILESDIR}"/apmd.confd apmd || die
+	newinitd "${FILESDIR}"/apmd.rc6 apmd || die
+
+	use nls || rm -rf "${D}"/usr/share/man/fr
+}