Clean up ebuild, use scripts from debian, maintainer back to mobile@, fixes bugs #126131 and #170213

Package-Manager: portage-2.1.2.7

5 files changed, 101 insertions, 23 deletions

diff --git a/sys-power/acpid/ChangeLog b/sys-power/acpid/ChangeLog
index 5865d81e226d..2e5da8c82f07 100644
--- a/sys-power/acpid/ChangeLog
+++ b/sys-power/acpid/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-power/acpid
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/ChangeLog,v 1.25 2007/02/23 10:55:56 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/ChangeLog,v 1.26 2007/05/10 17:11:39 genstef Exp $
+
+*acpid-1.0.4-r5 (10 May 2007)
+
+  10 May 2007; Stefan Schweizer <genstef@gentoo.org> metadata.xml,
+  +acpid-1.0.4-r5.ebuild:
+  Clean up ebuild, use scripts from debian, maintainer back to mobile@, fixes
+  bugs #126131 and #170213
 
 *acpid-1.0.4-r4 (23 Feb 2007)
 
diff --git a/sys-power/acpid/Manifest b/sys-power/acpid/Manifest
index fa119a998ab5..81aeb8e3dd02 100644
--- a/sys-power/acpid/Manifest
+++ b/sys-power/acpid/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX acpid-1.0.4-default 663 RMD160 5e40661ec9112c3cc675a0d283e96311d2d159f1 SHA1 e74b2f7388c303fc3d3e33c0500d4b8185474dce SHA256 2b18111978043d68848983a54dfc946dd9b9b15592d0f4dc33491599dbe24b23
 MD5 414d143f4c5e83c422f706f671820e6d files/acpid-1.0.4-default 663
 RMD160 5e40661ec9112c3cc675a0d283e96311d2d159f1 files/acpid-1.0.4-default 663
@@ -26,6 +23,7 @@ MD5 93bffbf08d9e95d058022bc0acda46e3 files/acpid.conf.d 121
 RMD160 ee78388bf9c2c7651903ee6cef4a50e222b5c339 files/acpid.conf.d 121
 SHA256 f1dd8a60d192cddf412edbdb21e5ca5140cabe78e51864a2b537b9872a0f1e8c files/acpid.conf.d 121
 DIST acpid-1.0.4.tar.gz 23416 RMD160 ddf3cb4e2df7126c71130f89086473b1aa8656b1 SHA1 229376815a861d798755c789727151dc0b2bc8a0 SHA256 032a95967f8dd8a227ee1771de4a2646becc4d0f1123568faeca931006ec8f5f
+DIST acpid_1.0.4-7.1.diff.gz 10356 RMD160 92ec19825915a354b167a33a093c2d7231d5b848 SHA1 4f5b2abb8304a3edcbf32506bf8b31c91ccefe8d SHA256 a268a9c3adbe79cee3d0a1ed4eb2fa849039d1d7e9d0aba0e81f55078d42e7f4
 EBUILD acpid-1.0.4-r2.ebuild 1849 RMD160 59986a9125158722fd44e120c239f897a13b37bb SHA1 2fe19c87b9bc5dfc487ab784a24bb7272ca411b4 SHA256 f03bb1b6c4dde5c83a4a8ece004b63e0f86f8ecc049c3c4065a03f7d164e56a5
 MD5 5f94609ff1bd14adc579c926eb0bce3c acpid-1.0.4-r2.ebuild 1849
 RMD160 59986a9125158722fd44e120c239f897a13b37bb acpid-1.0.4-r2.ebuild 1849
@@ -38,14 +36,18 @@ EBUILD acpid-1.0.4-r4.ebuild 1853 RMD160 7c08db9cd1291d2d2c6d16dff67229b6a561522
 MD5 aef1213fe4ff3ae00cc8191b8a0d4899 acpid-1.0.4-r4.ebuild 1853
 RMD160 7c08db9cd1291d2d2c6d16dff67229b6a5615223 acpid-1.0.4-r4.ebuild 1853
 SHA256 07ad85ada5d41dbb617f5cf3d08fdf23b4d9098aacd2cbd1973708c7fe881dd1 acpid-1.0.4-r4.ebuild 1853
-MISC ChangeLog 5868 RMD160 fe55f775ce5497944fca58bf226105c40344ee1c SHA1 c0336269398a58a1c8456a52c0ea5b098edcd763 SHA256 85666ab0d5065db147746e1028ca836c758e1c5e511b6615e400a4dc21e5c6db
-MD5 b4cec7dc1c8dfc2d04a8ea503ee0d9cf ChangeLog 5868
-RMD160 fe55f775ce5497944fca58bf226105c40344ee1c ChangeLog 5868
-SHA256 85666ab0d5065db147746e1028ca836c758e1c5e511b6615e400a4dc21e5c6db ChangeLog 5868
-MISC metadata.xml 253 RMD160 e3bc24e63aaa256a4dc8e70fbcbc5c0b0e86ba08 SHA1 d9c5af7907f5402acde630a1dc29a72c25f11998 SHA256 235e0815d900e939a6090405c7ac09371fd8292a6c09be516067adc6ebe58950
-MD5 325189cc7d254bb60c1cdc44ec4d6485 metadata.xml 253
-RMD160 e3bc24e63aaa256a4dc8e70fbcbc5c0b0e86ba08 metadata.xml 253
-SHA256 235e0815d900e939a6090405c7ac09371fd8292a6c09be516067adc6ebe58950 metadata.xml 253
+EBUILD acpid-1.0.4-r5.ebuild 1764 RMD160 3641fd9fa8e872128972d19a68a1cd49f52852bb SHA1 e3a1ccad445b7378b49a7e0412b9447e7b771112 SHA256 68deffb74e9136d3a62b5971b6e49f340c0e47ebaf2948ade2aee1b306905825
+MD5 a52ea8dc01fd2a8db6f223a7ce739283 acpid-1.0.4-r5.ebuild 1764
+RMD160 3641fd9fa8e872128972d19a68a1cd49f52852bb acpid-1.0.4-r5.ebuild 1764
+SHA256 68deffb74e9136d3a62b5971b6e49f340c0e47ebaf2948ade2aee1b306905825 acpid-1.0.4-r5.ebuild 1764
+MISC ChangeLog 6097 RMD160 7d30cd9b8bb66f286a03d203788e63258ae81897 SHA1 84890a63cac102d82e2dae2c0ba1e07ebf032f3a SHA256 39499b3eca7c5f5e87ff5745e95a96883d4efc3272e867749e727965bd0f8aa7
+MD5 a1e49bcf3268e27cbcd5b74588920171 ChangeLog 6097
+RMD160 7d30cd9b8bb66f286a03d203788e63258ae81897 ChangeLog 6097
+SHA256 39499b3eca7c5f5e87ff5745e95a96883d4efc3272e867749e727965bd0f8aa7 ChangeLog 6097
+MISC metadata.xml 159 RMD160 54af1e9a61e5ed1b49b2bbbf3ef2278999c66b13 SHA1 bce3da4745192397c9a08bdbcf7e4914eac9b77b SHA256 ed3a0d440cfa5672284f4172ebde0ea6506c1a38e9a3ed9f14f3d2c093aac42f
+MD5 19fd766bac8e110b4620363a1ace26dd metadata.xml 159
+RMD160 54af1e9a61e5ed1b49b2bbbf3ef2278999c66b13 metadata.xml 159
+SHA256 ed3a0d440cfa5672284f4172ebde0ea6506c1a38e9a3ed9f14f3d2c093aac42f metadata.xml 159
 MD5 46612b0044e029d74a3cd52522aacd5a files/digest-acpid-1.0.4-r2 232
 RMD160 326422a4846448ae50d821c0c3e025be9f8cb3ef files/digest-acpid-1.0.4-r2 232
 SHA256 61dade4778db94978731c78df8c379a1ccb344b5d8727267e5f05fa71ef85538 files/digest-acpid-1.0.4-r2 232
@@ -55,10 +57,6 @@ SHA256 61dade4778db94978731c78df8c379a1ccb344b5d8727267e5f05fa71ef85538 files/di
 MD5 46612b0044e029d74a3cd52522aacd5a files/digest-acpid-1.0.4-r4 232
 RMD160 326422a4846448ae50d821c0c3e025be9f8cb3ef files/digest-acpid-1.0.4-r4 232
 SHA256 61dade4778db94978731c78df8c379a1ccb344b5d8727267e5f05fa71ef85538 files/digest-acpid-1.0.4-r4 232
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
-
-iD8DBQFF4kVd8bi6rjpTunYRAr0aAKCp9ngcGZVkhMqiBgiQvHn7nRhPBACeIrNv
-Y4i+UUQt8LskfFeeCfmLvmE=
-=KIbG
------END PGP SIGNATURE-----
+MD5 349700818182a91dfcd8a26ff1c61681 files/digest-acpid-1.0.4-r5 479
+RMD160 206971462108f1adb2b196764de26a1ba130dfb1 files/digest-acpid-1.0.4-r5 479
+SHA256 cf4ac1c52d7ba61781915be0bca9c2c4d3df8bd32910ab9b54846c3984a369f5 files/digest-acpid-1.0.4-r5 479
diff --git a/sys-power/acpid/acpid-1.0.4-r5.ebuild b/sys-power/acpid/acpid-1.0.4-r5.ebuild
new file mode 100644
index 000000000000..2c494de1aedf
--- /dev/null
+++ b/sys-power/acpid/acpid-1.0.4-r5.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/acpid-1.0.4-r5.ebuild,v 1.1 2007/05/10 17:11:39 genstef Exp $
+
+inherit eutils toolchain-funcs
+
+DV="acpid_1.0.4-7.1"
+DESCRIPTION="Daemon for Advanced Configuration and Power Interface"
+HOMEPAGE="http://acpid.sourceforge.net"
+SRC_URI="mirror://sourceforge/acpid/${P}.tar.gz
+	mirror://debian/pool/main/a/acpid/${DV}.diff.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 -ppc ~x86"
+IUSE="doc logrotate"
+
+DEPEND="sys-apps/sed"
+RDEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ../${DV}.diff
+}
+
+src_compile() {
+	# DO NOT COMPILE WITH OPTIMISATIONS (bug #22365)
+	# That is a note to the devs.  IF you are a user, go ahead and optimise
+	# if you want, but we won't support bugs associated with that.
+	emake CC="$(tc-getCC)" INSTPREFIX="${D}" || die "emake failed"
+}
+
+src_install() {
+	# needed since the Makefile doesn't do 'mkdir -p $(BINDIR)'
+	dodir /usr/bin
+
+	emake INSTPREFIX="${D}" install || die "emake install failed"
+
+	exeinto /etc/acpi
+	doexe examples/default.sh
+	insinto /etc/acpi/events
+	doins examples/default
+
+	dodoc README Changelog TODO
+
+	newinitd ${FILESDIR}/${P}-init.d acpid
+
+	docinto examples
+	dodoc samples/{acpi_handler.sh,sample.conf}
+	dodoc examples/ac{,.sh}
+
+	docinto examples/battery
+	dodoc samples/battery/*
+
+	docinto examples/panasonic
+	dodoc samples/panasonic/*
+
+	if use logrotate; then
+		insinto /etc/logrotate.d
+		newins debian/acpid.logrotate acpid
+	fi
+}
+
+pkg_postinst() {
+	echo
+	einfo "You may wish to read the Gentoo Linux Power Management Guide,"
+	einfo "which can be found online at:"
+	einfo "    http://www.gentoo.org/doc/en/power-management-guide.xml"
+	echo
+}
diff --git a/sys-power/acpid/files/digest-acpid-1.0.4-r5 b/sys-power/acpid/files/digest-acpid-1.0.4-r5
new file mode 100644
index 000000000000..d2770602fc44
--- /dev/null
+++ b/sys-power/acpid/files/digest-acpid-1.0.4-r5
@@ -0,0 +1,6 @@
+MD5 3aff94e92186e99ed5fd6dcee2db7c74 acpid-1.0.4.tar.gz 23416
+RMD160 ddf3cb4e2df7126c71130f89086473b1aa8656b1 acpid-1.0.4.tar.gz 23416
+SHA256 032a95967f8dd8a227ee1771de4a2646becc4d0f1123568faeca931006ec8f5f acpid-1.0.4.tar.gz 23416
+MD5 de7e2e01ffb8e8bb36d040ace01e0052 acpid_1.0.4-7.1.diff.gz 10356
+RMD160 92ec19825915a354b167a33a093c2d7231d5b848 acpid_1.0.4-7.1.diff.gz 10356
+SHA256 a268a9c3adbe79cee3d0a1ed4eb2fa849039d1d7e9d0aba0e81f55078d42e7f4 acpid_1.0.4-7.1.diff.gz 10356
diff --git a/sys-power/acpid/metadata.xml b/sys-power/acpid/metadata.xml
index b51edd611c30..b27ff8eb4ed6 100644
--- a/sys-power/acpid/metadata.xml
+++ b/sys-power/acpid/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>mobile</herd>
-<maintainer>
-  <email>chutzpah@gentoo.org</email>
-  <name>Patrick McLean</name>
-</maintainer>
 </pkgmetadata>