summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2015-01-09 14:03:18 +0000
committerJustin Lecher <jlec@gentoo.org>2015-01-09 14:03:18 +0000
commit46733d65e9bc217f3435da7420051ea8ed48212d (patch)
tree4dce9c7315bd56cbbb4092851331439ac5e0e14f /app-misc/delay
parentStable on alpha, bug 533744 (diff)
downloadhistorical-46733d65e9bc217f3435da7420051ea8ed48212d.tar.gz
historical-46733d65e9bc217f3435da7420051ea8ed48212d.tar.bz2
historical-46733d65e9bc217f3435da7420051ea8ed48212d.zip
app-misc/delay: Fix problems with older and newer autotools, #536096
Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0xB9D4F231BD1558AB!
Diffstat (limited to 'app-misc/delay')
-rw-r--r--app-misc/delay/ChangeLog6
-rw-r--r--app-misc/delay/Manifest40
-rw-r--r--app-misc/delay/delay-1.6-r2.ebuild5
-rw-r--r--app-misc/delay/files/delay-1.6-tinfo.patch6
-rw-r--r--app-misc/delay/metadata.xml2
5 files changed, 34 insertions, 25 deletions
diff --git a/app-misc/delay/ChangeLog b/app-misc/delay/ChangeLog
index 923f7c11be7d..e410d64c61cb 100644
--- a/app-misc/delay/ChangeLog
+++ b/app-misc/delay/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-misc/delay
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/delay/ChangeLog,v 1.31 2015/01/09 13:46:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/delay/ChangeLog,v 1.32 2015/01/09 14:03:17 jlec Exp $
+
+ 09 Jan 2015; Justin Lecher <jlec@gentoo.org> delay-1.6-r2.ebuild,
+ files/delay-1.6-tinfo.patch, metadata.xml:
+ Fix problems with older and newer autotools, #536096
09 Jan 2015; Agostino Sarubbo <ago@gentoo.org> delay-1.6-r2.ebuild:
Stable for amd64, wrt bug #534868
diff --git a/app-misc/delay/Manifest b/app-misc/delay/Manifest
index e66332c9fb8b..1ab0ae066b9a 100644
--- a/app-misc/delay/Manifest
+++ b/app-misc/delay/Manifest
@@ -1,27 +1,29 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
AUX delay-1.6-headers.patch 156 SHA256 b5636d9652c488c573e5e53cf66efb7cf191b95cfc5e9e608d6992e795426e09 SHA512 5482c96f6c2f9ce5f0183751d36360a22b3bfc7e29c23ba13022e51f0f2569b77014be4544c95e7b76cb3947118b36ae5dd94afb26c1951bc7f4b0746d120ac1 WHIRLPOOL 5ea4ed98bf328fd0e9c22883410046ebe260ce0b98352b6bc490b8777ad04f3bb63692d42c554fe60e341a327aa3b4474bc2312a1c91bc01a7f2d2daddcc2b43
-AUX delay-1.6-tinfo.patch 344 SHA256 7ec88cb5e9f7153573f80a678002420bf4d39f0c03a3aad179d6763e06a4f2ec SHA512 1694216b3a71ef1f05cc1ce765910c80f44c90128c52453b48fbd9a2d5c4e2f4710256920317d95bbfbaf18302a561aded3a3fa9a1f8b3df88c242754a415f35 WHIRLPOOL 0a251bb3b3092702af7867c0c80b3b5f0be465dae81aa15a4833b3bd7d16eb5a4474b8950830cf2280951d05eb9ef48ba577823d59d903e4098973c66670e905
+AUX delay-1.6-tinfo.patch 352 SHA256 cc55dd42383c6de72c246f9154258a76a531bbff0200a9adfbff262c91b5b465 SHA512 462e098e1a03ad1743fc758ca7ffabaeea07c430c24e5db6daffb786494176f91b1e6d99a34e867237ecd97fa4be8def415a14db6c53c9ea7b6ab4af3cf600a2 WHIRLPOOL a5aba228096b2bda3a4855e9f7517e27a5bfa5fb75db30919049ad7a03031c700b7a5065e59784a83552f2760eb252c6a5e60743315d565537c2359381d6ba38
DIST delay-1.6.tar.gz 69860 SHA256 3097a25fc0d0091402fc9dbc6aa395fd5141028bcdc99baa5d3438ca04f78ca2 SHA512 45d34b768082ff2e4a73f1af63239f6b9e418f1cb46e5945606c0e8830ba2b8c14eeb21d7e0776ef669d2834ed6dcc66c3ddb0225c182c77e85b18b5b28d5d43 WHIRLPOOL 836b7baafc377a2a53df1507ed5da667b30d7551393a77be729ff2ecf89ce6792b818d14807a7f76034046b22daf7ca8e441348832ada85809ebc6c14df7f16b
EBUILD delay-1.6-r1.ebuild 719 SHA256 1c479d21fdf27eda3999d488eaf9688bec5b1749a6caddd7dc3228549d09a73b SHA512 78af0be621cbce26a3e222ac79abe49d9d1a10d912ec14e05cd5bae18c22658cadc681d0c8418557730f6752afd55a1846f32847aa1b3d0746174ca3a4a18ecd WHIRLPOOL 466f2628d72ae7d12713ae0f1777bda15e0d540b552d966f5feca11a0718eb1234109f5299b7d9d42d95acc579d2312af940a9edfeab20d9bf50ae9f7f5dfe4a
-EBUILD delay-1.6-r2.ebuild 755 SHA256 be966ab313b18cf558aa06e62d83e31ffa0516eacdff18e86eaf379efe5811d1 SHA512 94a927e7355e24e587c06b0535ecd8dbfdd658ebb94e022ae3a06164976667e697015f4d2a6659d603fbc1c4e83a751a7ad1c821b0213603e5d079c03b900566 WHIRLPOOL e2e06d13126274053c02db4844d8041fbe1386f0672447119f13a6e4dc247bc4287d7a256393d368aac973748a4b50f6ad1c7fa2120e3c3d39db03fb1b5244dd
-MISC ChangeLog 3718 SHA256 ddd05955833c177e7df9d75420e9e47beeda6f4e7f58e22d58908fa88df3aca8 SHA512 e776fbbb3b580d04693ac1ff98aa3ee46d449f4e9e8a1da7e1903d382aff5cda4259f48d0967b0c9763dc5003ec3685e26f61c4ee735ee1387ae75921d572025 WHIRLPOOL 36efbc7ffc7694df54dbafab046ebb2a904fa37b1bdab68e3d3a8b1ad123d2ffadf854cf5809d33a840d1ea95277cc809d8292faf64de8cdd4da5c658f86814d
-MISC metadata.xml 165 SHA256 75ca85c472d4181ae0de529c83826baaebe75d9e750ee6621758b5096bceffcd SHA512 d99326d50355f1fa041618844027c043a114e7e63dec3c2d6c0c6023a5863bde8e62706bed974a394e21ce2e64ddf5539750c30e5913dacb39ed37cfd62e6eb3 WHIRLPOOL bb8b8cc1c4d9312dfe9015934c3c315a1ea6b9b6da2db22b231b434fd144ee7690ec2e242a1fba9c8e601610dc5cc9061c1995dd33c5b59c78a19a71f71d7a76
+EBUILD delay-1.6-r2.ebuild 795 SHA256 a48f36b4ce3f3a7c532023f0ed4a5e66097e2c436ccd44f6084a9496fdbac78a SHA512 ec80fd1075cbd155e3bf6df963c5e9dc31dbaddc1f74e7d31f676e5011ce7310a4679b528791716142877f56769dbf1f1ceab181d094d10febe76ed4003a68ff WHIRLPOOL 14511d10895711af24f54ebb7aabb4b3ee3e9449ccb725dcff3e88cfd92f25380a48867a773e479c05018c7db96acb43ae83317d8570f9c8ff2b548f841cfcd1
+MISC ChangeLog 3888 SHA256 81c64f8505f6f754021b72c3cee4d80c5fc97d5d6ea54318a58093cc15d966ac SHA512 687eb63d8fd895f5235a3124f9fa4c424499d1f4286978552e2eed32d40fe03152260ad87109fb605f71ed11daf51d89582d93e38f009be56c5167110c1f4795 WHIRLPOOL 3c22a2bba608c856a4a2caf5f6947edac609bd099c4231a455e8f20d4194c17a2cd4e7a8a87d871f5cdc69f22f2dca5c2eaec1edbdbdac4083f8e052b5268d4a
+MISC metadata.xml 166 SHA256 064eb80cc86913e2a47d1088f1b0ebd5b64b5dab1c73d38b8501cd77891cfbbf SHA512 3fc05bf28a906b223e9bb5baeac755dd7e4edb755b5a6c054c3e4d46d294f28df948e1195e71d5a836783daefafa53fe1417aacc0ba17dd49e9b10d51e99c275 WHIRLPOOL 814a3f6a650e4373ac90ba43969b8dab3215f5da936ef5e180fe134adc05a571dc1390c80be173797c421de7f22488b19979353f7aa52536bbfcf6e0541bf748
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
-iQIcBAEBCAAGBQJUr9ufAAoJELp701BxlEWfT+YP/A7AuhkVlj10DkGcVHQ0uiWa
-yqzrsa6B4BlstnDEUUKOGLDFFeTfrCb2Bnjsjox8Akp8hSSicAyHqYkbHhgBx36o
-l3Br0YCcMLB1QB+L8HT1KiSDVSQ6jyS5slQHpB9NnOBdSPPOAZZVdv2L7sMABH4d
-myCJSiyz7pQ7iELiQcLW/xEvrvAnEmZa+zsRCM2GJwaJFFE+JhlZqu6n97xuEf/w
-mmE1yCMfYPmqxljcYTx8/diIeU+ok8oEP/AmhJSYPSNHEFlHZR2np662HdqAwPzw
-ET7BV14USpk+ka/1mNtXuGpDhf6QWCTZyLGmeNKc9lGidLLwfYjq9P1vEyWTujlf
-M35TythEYNU7pMKSMST8tck9j5jvtSbw8AFei7avqtkhVKUeehls+os6JRaSnono
-G3+DQ/lLwapTivsJ5Aq8sdd8cths0wGZOKm7JG4vqd6F2AU3bs9yTW98rDYDXf++
-9j1/cdsJ1GoNJOVzf/5GlY+4DhuDiA8F8MdaIlgz2ztjahE9A7r6aSj2ds/YmTyr
-PSfmAY5hL2VmaX6HiuYVm4gwrUBX3CtoHOn4s7jUJOcEE50l3bRHV45X7nJHDbgY
-Z1dUMjHWCBOxAl+hImjnG0mCoNhDJp04EBplxKqU3TDyx7WjunxK3vJE3KkbNCxQ
-2R0n1RmfLc/iJr6RTLce
-=dSbW
+iQJ8BAEBCgBmBQJUr9+mXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir11wP/i+UvZ66pP6PjTQbLk7+goq9
+Vo/enswM2x5SjwIf96hX/1eKxAwzOqrtNGlkSH6Zv42zQrlCCF3wIB11e9XcwRZS
+ZIGqAJf8bPndlqWvZNyPvJZPElhXYytfomM5M29MfZCl6HogqQI+6iYRudL2wGAm
+pqMZYvvTYlnnY4WaqDUGn6XjYpVBFEZrVjXhikfEsQsuqyJjW+Oet/GknmLNvLna
+iAx6bOudmJatumgeBqgG4o3hNMTS0e0B5Fgb0sM3KZ98cxOLGkS5iE+2GZrVNZc+
+HqXuw3U+oKh90TbqR47Z3cfIPvnZoAt7v3HZ7et8yJi2cRQyGns1Ju77jAWSkiT3
+wxLxvlNjvasWsC/VWZQgdCzgpp1I3yX2Hvj4oFokzD05ubunm1ELOpzqHfPKEcn9
+3jTqaJvC+OI2H37/QMPuB+FBacXzLTthYY9Dcwd3B9lPcEbJH25K4Qq1vV8ys6Nc
+3FBb1J8jXCj65p4B4Slgyz4KITbTeKzTF+cJIDrjP991HTAzBBBEbgwPBJUoxsW2
+kxfbZ6VmYD53/ERZCG9oKqhQSj2ioq29NhNvDbuwelv02iDJQFosH+hTQggWnKg5
+8pJjj+VTiPVVoE8uQI8IEJr7RzVN7pCHJS9d/Gv2Bix5zPXDuhv6YuwjNa30jLkE
+BmZw2iWQmGE28gR/a4N7
+=qoJn
-----END PGP SIGNATURE-----
diff --git a/app-misc/delay/delay-1.6-r2.ebuild b/app-misc/delay/delay-1.6-r2.ebuild
index 66c4e37d3b2f..3158a14790cc 100644
--- a/app-misc/delay/delay-1.6-r2.ebuild
+++ b/app-misc/delay/delay-1.6-r2.ebuild
@@ -1,8 +1,9 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/delay/delay-1.6-r2.ebuild,v 1.2 2015/01/09 13:46:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/delay/delay-1.6-r2.ebuild,v 1.3 2015/01/09 14:03:17 jlec Exp $
EAPI=5
+
inherit autotools eutils toolchain-funcs
DESCRIPTION="Sleeplike program that counts down the number of seconds specified"
@@ -24,5 +25,7 @@ src_prepare() {
"${FILESDIR}"/${P}-headers.patch \
"${FILESDIR}"/${P}-tinfo.patch
+ mv configure.in configure.ac || die
+
eautoreconf
}
diff --git a/app-misc/delay/files/delay-1.6-tinfo.patch b/app-misc/delay/files/delay-1.6-tinfo.patch
index 102304e141fc..37a7fb27cdc6 100644
--- a/app-misc/delay/files/delay-1.6-tinfo.patch
+++ b/app-misc/delay/files/delay-1.6-tinfo.patch
@@ -6,11 +6,11 @@
-AC_CHECK_LIB(curses, initscr)
-AC_CHECK_HEADERS(curses.h)
-+PKG_CHECK_MODULES(ncurses,ncurses,
++PKG_CHECK_MODULES([ncurses],[ncurses],[
+ LIBS="$LIBS $ncurses_LIBS"
+ AC_DEFINE([HAVE_CURSES_H])
-+ AC_DEFINE([HAVE_LIBCURSES]),
-+ AC_MSG_ERROR([ncurses not found]))
++ AC_DEFINE([HAVE_LIBCURSES])],
++ [AC_MSG_ERROR([ncurses not found])])
AC_OUTPUT(Makefile)
diff --git a/app-misc/delay/metadata.xml b/app-misc/delay/metadata.xml
index 40149c995561..f23b9cae1593 100644
--- a/app-misc/delay/metadata.xml
+++ b/app-misc/delay/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>shell-tools</herd>
+ <herd>shell-tools</herd>
</pkgmetadata>