Fix configure.ac for >=automake-1.13 (bug #467582). Removed old

(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

3 files changed, 9 insertions, 52 deletions

diff --git a/app-misc/uptimed/ChangeLog b/app-misc/uptimed/ChangeLog
index 31c005374fa0..601076c02d6e 100644
--- a/app-misc/uptimed/ChangeLog
+++ b/app-misc/uptimed/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/uptimed
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/uptimed/ChangeLog,v 1.95 2013/02/28 13:50:44 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/uptimed/ChangeLog,v 1.96 2013/04/29 09:24:12 polynomial-c Exp $
+
+  29 Apr 2013; Lars Wendler <polynomial-c@gentoo.org>
+  -uptimed-0.3.16-r6.ebuild, uptimed-0.3.17-r1.ebuild:
+  Fix configure.ac for >=automake-1.13 (bug #467582). Removed old.
 
   28 Feb 2013; Jeroen Roovers <jer@gentoo.org> uptimed-0.3.17-r1.ebuild:
   Stable for HPPA (bug #457250).
diff --git a/app-misc/uptimed/uptimed-0.3.16-r6.ebuild b/app-misc/uptimed/uptimed-0.3.16-r6.ebuild
deleted file mode 100644
index ff7217d1e7e2..000000000000
--- a/app-misc/uptimed/uptimed-0.3.16-r6.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/uptimed/uptimed-0.3.16-r6.ebuild,v 1.1 2012/12/24 09:27:05 polynomial-c Exp $
-
-inherit autotools user
-
-DESCRIPTION="System uptime record daemon that keeps track of your highest uptimes"
-HOMEPAGE="http://podgorny.cz/uptimed"
-SRC_URI="http://podgorny.cz/uptimed/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-pkg_setup() {
-	enewgroup uptimed
-	enewuser uptimed -1 -1 -1 uptimed
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# respect DESTDIR
-	sed -i -e 's|-d \(/var/spool.*\)$|-d $(DESTDIR)\1|' Makefile.am || \
-		die "sed failed."
-
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	keepdir /var/spool/uptimed
-	fowners uptimed:uptimed /var/spool/uptimed
-	dodoc ChangeLog README TODO AUTHORS CREDITS INSTALL.cgi sample-cgi/*
-	newinitd "${FILESDIR}"/uptimed.init uptimed
-}
-
-pkg_postinst() {
-	einfo "Fixing permissions in /var/spool/${PN}"
-	chown -R uptimed:uptimed /var/spool/${PN}
-	echo
-	elog "Start uptimed with '/etc/init.d/uptimed start'"
-	elog "To view your uptime records, use the command 'uprecords'."
-	echo
-}
diff --git a/app-misc/uptimed/uptimed-0.3.17-r1.ebuild b/app-misc/uptimed/uptimed-0.3.17-r1.ebuild
index bd1e5c4e43c6..cbe989371e89 100644
--- a/app-misc/uptimed/uptimed-0.3.17-r1.ebuild
+++ b/app-misc/uptimed/uptimed-0.3.17-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/uptimed/uptimed-0.3.17-r1.ebuild,v 1.9 2013/02/28 13:50:44 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/uptimed/uptimed-0.3.17-r1.ebuild,v 1.10 2013/04/29 09:24:12 polynomial-c Exp $
 
 EAPI=5
 
@@ -22,9 +22,9 @@ pkg_setup() {
 
 src_prepare() {
 	# respect DESTDIR
-	sed -i -e 's|-d \(/var/spool.*\)$|-d $(DESTDIR)\1|' Makefile.am || \
-		die "sed failed."
-
+	sed -i -e 's|-d \(/var/spool.*\)$|-d $(DESTDIR)\1|' Makefile.am || die
+	# fix configure.ac for >=automake-1.13 (bug #467582)
+	sed 's@AM_CONFIG_HEADER@AC_CONFIG_HEADERS@' -i configure.ac || die
 	eautoreconf
 }