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

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

4 files changed, 24 insertions, 59 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/Manifest b/app-misc/uptimed/Manifest
index c0d2037df9a3..6566a3f93e56 100644
--- a/app-misc/uptimed/Manifest
+++ b/app-misc/uptimed/Manifest
@@ -2,16 +2,24 @@
 Hash: SHA256
 
 AUX uptimed.init 845 SHA256 687589dbae26e42af4d0693baad6ac86270b5eb2d2f5fcbacf3554a6cbd24f85 SHA512 513cffb666c821d60a2a1d5bbb36b854bff84c4249d8ac27779e82b5ca9e9824aa432c0812d247c469e9a9ab4dadf104cddaa8224b891e39d0a2c0ebc409134e WHIRLPOOL 44c3593a7ac3ac6976bd7cb8bb6fa02eda1ed552b2d4212e53dac05f51b8778e272942c16f48f8af0196f61ebcd970d99f8b3e725d15e6038dde194476442b0e
-DIST uptimed-0.3.16.tar.bz2 197338 SHA256 f508ff5e98fab9c1bc0c342bf03cc6d1c01a24f2c7ab7ea8fcbfda477e16b12b SHA512 b6a51c0b30059767bd260b25cc43647c24f32bb9bcd5a3ff895ece800dbeb03d7de64cbdcec4f5571ea42ee72d38ea665733f59f74aecdc5e20a4e1c7b3a5123 WHIRLPOOL b7170beb21a742adcc0c25fb36636a3c4212727ba89b6585e4a0d066f2d323abcef6bbfa204c01afa82b92d6f958b354e9aeaad468c6384159e82cf5753396e2
 DIST uptimed-0.3.17.tar.bz2 269102 SHA256 524ce8984c0d0a780a32025ba3ffb980e5eec3d78e65cf68c91edec7fe833a06 SHA512 d462fa435b07bc335738dfccddd374aaa94fe2671a652afb8cb85d5e69e2148c296dec2a575ef074675e64e5453cb2d0807f80b191d9aeb5233168a617e842c5 WHIRLPOOL 38ce1ec75a0a3b82d448d85f256dce4b77265e59dead4557c8a039056bd2f230355cffb90a776badc351315d072c10d227744905b8fcc6b3f6f32ac7d6492125
-EBUILD uptimed-0.3.16-r6.ebuild 1285 SHA256 175cc8d41bd5dc39e3f9923b9a9b0b3e6c43b50c6e9d1c5d5d0271c173c2149f SHA512 f3e1b513561987de2f713b201ac9124700873fa5e7d3954f8021255469e90bd3a76d55614a90168175594d264c00ffc95b536eed8bba21b40182291cbaf73ba2 WHIRLPOOL b4916f99ab2f5ad41bb1a4a5139b05383d1fc68592413adfcc39199aae0ce50a0e301208071eb079a25e9efb1b9a0d779e1a0abf098822914f35bb70fcd8f076
-EBUILD uptimed-0.3.17-r1.ebuild 1314 SHA256 b78a5116ef024ccf4c64a2aac2c182e837b5156f65f7d29cc814bea1a05ce91f SHA512 95e83c2dd66bb7965689c5df04f279f252270475a864ca9a6ddd48b947710ea901a30841413d16fb3b5844becc307dd4f49649c34bab9fb194b40c08201e1442 WHIRLPOOL 00717d7277a1a710823117a2af74d8d9d9b8e3cc3b2d39d6a87ba74648cfbbb6a9e60b289e43db2a34c8f0b9f9eb36c944cdd77d90c530bf8e1552c9aa30fe9f
-MISC ChangeLog 12304 SHA256 2fca508d7bef825f8753ca831ec3da509817d972acb05903d38d4d3cabeae2c4 SHA512 43703ef3a5d7a08dc3600efc011db7263f0a5f9a0ff032db417ace7dd611ef5e5165bb3c9ab5ed8dadd0b04923afde650672af1bbce67064f387a490eba11d12 WHIRLPOOL 156f0d9bdbeba13a2e9677d2f88193c3c189a3f1d654aeebeb5c38074e8906a5d44aa9c23186f49d48538bdf9de382a4b5fd27f50185cece0c7dc9329c567684
+EBUILD uptimed-0.3.17-r1.ebuild 1427 SHA256 aed29ad15f2fd927b8317dc372421154b72ab66e2415169bc2a0014712d6c48c SHA512 4187f49c7bdaab03c9ea92b9a065238b5b38695be168bdbd1fde96abaf08b1b474f9185d366aa6faee401ea225af9a86cf365157aa779dddb5efaece000c4d9c WHIRLPOOL 9cda58c1ef8b5dbffc5a50319c3f61beb2ed51fa56017c681fc43ffedb145be3cf4515eb8f4a7625c498ca54374af29e0e09675da4f4ac2e01898c29faf00135
+MISC ChangeLog 12490 SHA256 cec4d6f3b8df65fd4c435e946fe3b377e683bf5973c3751a02bd859cb42b9904 SHA512 782674f308bf515ed5867611b11fb6a920206aed92a6a8826f589d15388e760d0adc003aac1ddda824101eeb8a2cd1093e74b12a9ac7e2acfa72905d2d21d811 WHIRLPOOL 8ca4180e646a113224961465e3014f3686c6dc030a1cc38edcaa1fb0cd965b08cfbd139ca5a5285d86fb0485e7bf6f2eb4c5c73ec832ecb2abdf4a7deb24100f
 MISC metadata.xml 237 SHA256 97e2852866e146fd242be6cddceb93aebc2b28056cdafa3ff688a0cfc97a5065 SHA512 d21eed02cc15021ad5f18c4c932afdf4d6cfbb64a243764b61914aac9e57f6089ebb9e3a37e136e5bb7bf4f28d29bba49279d52a75acc3a6f921c770213758a5 WHIRLPOOL 92462bf73803127a88d9e2a02503d36efd2b8f1c938f3f2c00145db02871ea9ce241eba371138b6ab80c4774f858250b5eba08886ff355c0f212bfbc2cda3d9f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEvYLUACgkQVWmRsqeSphNDOACfS8g3tV88a1AwQEEaWu9/Znc8
-qQ4AnRjR62w506UQxnEn0LavnmarJl9B
-=thYw
+iQIcBAEBCAAGBQJRfjw9AAoJEPiazRVxLXTF89cP/0ooGuoH0c1q3kdMctTZcpdd
++BS1cvvEgWXi2xKj5sjyws8EVlISJrExi91eW9RQCeSzujNSbgPEv+N8edMazAnx
+0Z+FYCWYGUBV31S9SRvLHQYo90j2DGam1eN9EoNSS3yA6MHBEkWY8rqtVy3YOuZz
+HnpHOgkJr/AkvxFsWhGSLo4rHwH45OWFDvoKeccm5OmpE+MALTuvufYJsyD/3sOJ
+r97ONfByDZ/gNFXPXx399I3CupM2SPevOij3PdYNIjZLSnzQp3jds+dR8x7LiTw+
+olHjEmX4NSqDv9Eo5D+0eJY73rTqSP6GouZ5zHHAhxMgsktwkGWATl2OGl6qQypA
+eItn9+OA5TWKHC4aV6teCi/HiqGj5rV1T6YZhYSt5xIeZy1AEhKmcwxmhAYW7L8M
+BEiIweF9WUSwsRmGvNQmPmy3Ur/dYyew9rNboeVW8xrN7d5+GPOqvT+KPRZjv9No
+AOCDL4vZY4cftVd2B1ATQ/EqtB/MTQGC/i2Jbqp+khntpP4HWYaHYp74CR6ttYPh
+akdKCwggQ3Rw0i3Y90b0x2+syvgjxVzPAJ2/q7OoTujuZuSySNJ+xxhxl9jkhx9S
+sbdRdQpz+7pB6FbLk19L+lS4Jivfng2kOfByw4EQyBypFWueSIBZZorHEc6D2sr2
+98LJtzBfM1Ny4P5cKLqM
+=lXJw
 -----END PGP SIGNATURE-----
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
 }