diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2014-10-25 12:50:52 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2014-10-25 12:50:52 +0000 |
| commit | 6f6fbe14d0d3482886023ccda5651487d4ede5e2 (patch) | |
| tree | 87be3fe3c72bb264310630ba9a295dfdee344fe8 /app-misc | |
| parent | bump to 2.0.31 (diff) | |
| download | gentoo-2-6f6fbe14d0d3482886023ccda5651487d4ede5e2.tar.gz gentoo-2-6f6fbe14d0d3482886023ccda5651487d4ede5e2.tar.bz2 gentoo-2-6f6fbe14d0d3482886023ccda5651487d4ede5e2.zip | |
Fix building against sys-libs/ncurses[tinfo] (bug #526738).
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'app-misc')
| -rw-r--r-- | app-misc/delay/ChangeLog | 10 | ||||
| -rw-r--r-- | app-misc/delay/delay-1.6-r2.ebuild | 28 | ||||
| -rw-r--r-- | app-misc/delay/files/delay-1.6-headers.patch | 10 | ||||
| -rw-r--r-- | app-misc/delay/files/delay-1.6-tinfo.patch | 16 |
4 files changed, 62 insertions, 2 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/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) + |