Fix building against sys-libs/ncurses[tinfo] (bug #526738).

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

5 files changed, 76 insertions, 3 deletions

diff --git a/app-misc/delay/ChangeLog b/app-misc/delay/ChangeLog
index d97a62ef87ab..a3cec35ea29c 100644
--- a/app-misc/delay/ChangeLog
+++ b/app-misc/delay/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/delay
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/delay/ChangeLog,v 1.29 2012/03/19 08:04:13 jlec Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/delay/ChangeLog,v 1.30 2014/10/25 12:50:52 jer Exp $
+
+*delay-1.6-r2 (25 Oct 2014)
+
+  25 Oct 2014; Jeroen Roovers <jer@gentoo.org> +delay-1.6-r2.ebuild,
+  +files/delay-1.6-headers.patch, +files/delay-1.6-tinfo.patch:
+  Fix building against sys-libs/ncurses[tinfo] (bug #526738).
 
   19 Mar 2012; Justin Lecher <jlec@gentoo.org> -delay-1.6.ebuild:
   Cleaned old
diff --git a/app-misc/delay/Manifest b/app-misc/delay/Manifest
index 1e5f31877a23..e199608924c2 100644
--- a/app-misc/delay/Manifest
+++ b/app-misc/delay/Manifest
@@ -1,4 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+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
 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
-MISC ChangeLog 3387 SHA256 6b2c25319dea8f4a35f8430383569a0961f57dbb4ee2bcb366e6ab720b7936cd SHA512 4c228eca06b08f7499e10c27ed9322eaee9be16dddcf52e29017a04bdeeaad1c1394e728fb1954218d2c1834cb6d92ea955854b4cfbc20dfa1989b99b1122e9e WHIRLPOOL 3b7d13a4bb3b4aecc75650438673a953d01edb8da58ee65ef3097331ac54010becc97229e14ce7bdbc23ed930577391b44cc8e21b375fa84facb8490e7494c53
+EBUILD delay-1.6-r2.ebuild 756 SHA256 5bc7305556c339b04e30d3972785698fbad8ed78a8a0b660a312634d4f68aae8 SHA512 eee1de6bbd9a36c469161193947c847883428105e755084dd19be4df0a59ccc2a2378eeb82b25959b7e0ac4890ee8ab79300246f9fe451322dbdeef95274c1ae WHIRLPOOL 5c04bd00fe52aa373d713f222aa8d268f5f3b945c38554594bb60492f11f9ee2c784eb29597b637037a9e65560351c1a699d3de1f24d175e132ad174965a1199
+MISC ChangeLog 3611 SHA256 3245ca8b7dbb6e06d6631f86a64e55affcfa587ff62ed2cc46b5fef7d6931fb9 SHA512 abacfdd14d2109df9d1d5bd048365e5fbf53249732acbd0348bd9f7b386e6df0c448fc889d03118c87f8a6ff23344a8348293f7515c4d1d6ba0d17bf84a4c3d8 WHIRLPOOL be1c1a832c2b8091fbf92c3845f1573551c4000197c3a3822e142cb3e7028061ddf023e6fd6097ebeb961b2936363a14a8c27d45c73dd2c7505c9dad7dcb2f4f
 MISC metadata.xml 165 SHA256 75ca85c472d4181ae0de529c83826baaebe75d9e750ee6621758b5096bceffcd SHA512 d99326d50355f1fa041618844027c043a114e7e63dec3c2d6c0c6023a5863bde8e62706bed974a394e21ce2e64ddf5539750c30e5913dacb39ed37cfd62e6eb3 WHIRLPOOL bb8b8cc1c4d9312dfe9015934c3c315a1ea6b9b6da2db22b231b434fd144ee7690ec2e242a1fba9c8e601610dc5cc9061c1995dd33c5b59c78a19a71f71d7a76
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iEYEAREIAAYFAlRLnK0ACgkQVWmRsqeSphOwfQCffkz1h0hC67GhPBcrNePnMQJZ
+Bb4An1+ebvzF3tr9I7V9OPpSj0490MY4
+=zJL+
+-----END PGP SIGNATURE-----
diff --git a/app-misc/delay/delay-1.6-r2.ebuild b/app-misc/delay/delay-1.6-r2.ebuild
new file mode 100644
index 000000000000..376ea7988b19
--- /dev/null
+++ b/app-misc/delay/delay-1.6-r2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 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.1 2014/10/25 12:50:52 jer Exp $
+
+EAPI=5
+inherit autotools eutils toolchain-funcs
+
+DESCRIPTION="Sleeplike program that counts down the number of seconds specified"
+HOMEPAGE="http://onegeek.org/~tom/software/delay/"
+SRC_URI="http://onegeek.org/~tom/software/delay/dl/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos"
+
+RDEPEND="sys-libs/ncurses"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-headers.patch \
+		"${FILESDIR}"/${P}-tinfo.patch
+
+	eautoreconf
+}
diff --git a/app-misc/delay/files/delay-1.6-headers.patch b/app-misc/delay/files/delay-1.6-headers.patch
new file mode 100644
index 000000000000..5098435d7652
--- /dev/null
+++ b/app-misc/delay/files/delay-1.6-headers.patch
@@ -0,0 +1,10 @@
+--- a/delay.c
++++ b/delay.c
+@@ -17,6 +17,7 @@
+ */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <time.h>
+ #include <sys/time.h>
+ #include <unistd.h>
diff --git a/app-misc/delay/files/delay-1.6-tinfo.patch b/app-misc/delay/files/delay-1.6-tinfo.patch
new file mode 100644
index 000000000000..102304e141fc
--- /dev/null
+++ b/app-misc/delay/files/delay-1.6-tinfo.patch
@@ -0,0 +1,16 @@
+--- a/configure.in
++++ b/configure.in
+@@ -35,8 +35,11 @@
+ AC_STRUCT_TM
+ AC_STRUCT_TM_GMTOFF
+ 
+-AC_CHECK_LIB(curses, initscr)
+-AC_CHECK_HEADERS(curses.h)
++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_OUTPUT(Makefile)
+