4 files changed, 13 insertions, 64 deletions
diff --git a/sys-power/acpid/ChangeLog b/sys-power/acpid/ChangeLog
index 986089075f08..84745822444b 100644
--- a/sys-power/acpid/ChangeLog
+++ b/sys-power/acpid/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-power/acpid
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/ChangeLog,v 1.98 2012/11/25 18:59:25 armin76 Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/ChangeLog,v 1.99 2013/01/03 12:59:15 miska Exp $
+
+  03 Jan 2013; Michal Hrusecky <miska@gentoo.org> -acpid-2.0.16-r1.ebuild,
+  acpid-2.0.17.ebuild, metadata.xml:
+  Taking over and fixing bug #440422 and bug #434522
 
   25 Nov 2012; Raúl Porcel <armin76@gentoo.org> acpid-2.0.17.ebuild:
   ia64 stable wrt #434522
diff --git a/sys-power/acpid/acpid-2.0.16-r1.ebuild b/sys-power/acpid/acpid-2.0.16-r1.ebuild
deleted file mode 100644
index 8efa2c25f002..000000000000
--- a/sys-power/acpid/acpid-2.0.16-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/acpid-2.0.16-r1.ebuild,v 1.6 2012/11/25 15:11:36 swift Exp $
-
-EAPI=4
-inherit systemd
-
-DESCRIPTION="Daemon for Advanced Configuration and Power Interface"
-HOMEPAGE="http://tedfelix.com/linux/acpid-netlink.html"
-SRC_URI="http://tedfelix.com/linux/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ia64 -ppc x86"
-IUSE="selinux"
-
-RDEPEND="selinux? ( sec-policy/selinux-apm )"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	econf --docdir=/usr/share/doc/${PF}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	newdoc kacpimon/README README.kacpimon
-	dodoc -r samples
-	rm -f "${D}"/usr/share/doc/${PF}/COPYING
-
-	exeinto /etc/acpi
-	newexe "${FILESDIR}"/${PN}-1.0.6-default.sh default.sh
-	insinto /etc/acpi/events
-	newins "${FILESDIR}"/${PN}-1.0.4-default default
-
-	newinitd "${FILESDIR}"/${PN}-2.0.16-init.d ${PN}
-	newconfd "${FILESDIR}"/${PN}-2.0.16-conf.d ${PN}
-
-	systemd_dounit "${FILESDIR}"/systemd/${PN}.{service,socket}
-}
-
-pkg_postinst() {
-	if ! has_version 'sys-power/acpid'; then
-		elog
-		elog "You may wish to read the Gentoo Linux Power Management Guide,"
-		elog "which can be found online at:"
-		elog "http://www.gentoo.org/doc/en/power-management-guide.xml"
-		elog
-	fi
-
-	# files/systemd/acpid.socket -> ListenStream=/run/acpid.socket
-	mkdir -p "${ROOT}"/run
-
-	if ! grep -qs "^tmpfs.*/run " "${ROOT}"/proc/mounts ; then
-		echo
-		ewarn "You should reboot the system now to get /run mounted with tmpfs!"
-	fi
-}
diff --git a/sys-power/acpid/acpid-2.0.17.ebuild b/sys-power/acpid/acpid-2.0.17.ebuild
index 4a6f77480e94..a7ede5eac9c6 100644
--- a/sys-power/acpid/acpid-2.0.17.ebuild
+++ b/sys-power/acpid/acpid-2.0.17.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/acpid-2.0.17.ebuild,v 1.6 2012/11/25 18:59:25 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/acpid-2.0.17.ebuild,v 1.7 2013/01/03 12:59:15 miska Exp $
 
 EAPI=4
 inherit systemd
@@ -40,7 +40,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	if ! has_version 'sys-power/acpid'; then
+	if [[ -z "$REPLACING_VERSIONS" ]]; then
 		elog
 		elog "You may wish to read the Gentoo Linux Power Management Guide,"
 		elog "which can be found online at:"
diff --git a/sys-power/acpid/metadata.xml b/sys-power/acpid/metadata.xml
index 4538a68724a6..ed2991e7123c 100644
--- a/sys-power/acpid/metadata.xml
+++ b/sys-power/acpid/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
+<maintainer>
+<email>miska@gentoo.org</email>
+<name>Michal Hrušecký</name>
+</maintainer>
 </pkgmetadata>