diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2013-03-07 12:37:45 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2013-03-07 12:37:45 +0000 |
| commit | 5817a801f8e7755d52b4953a4e0b329bebf9c1c3 (patch) | |
| tree | 7b11874c97714ce72b78e44f7a3cdcd847a6559b /sys-fs/ncdu | |
| parent | keyword ~amd64-linux and ~x86-linux (diff) | |
| download | gentoo-2-5817a801f8e7755d52b4953a4e0b329bebf9c1c3.tar.gz gentoo-2-5817a801f8e7755d52b4953a4e0b329bebf9c1c3.tar.bz2 gentoo-2-5817a801f8e7755d52b4953a4e0b329bebf9c1c3.zip | |
sys-fs/ncdu: Add fix for building against ncurses[tinfo]
(Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key 70EB7916)
Diffstat (limited to 'sys-fs/ncdu')
| -rw-r--r-- | sys-fs/ncdu/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-fs/ncdu/files/ncdu-1.9-pkgconfig.patch | 39 | ||||
| -rw-r--r-- | sys-fs/ncdu/ncdu-1.9.ebuild | 15 |
3 files changed, 55 insertions, 5 deletions
diff --git a/sys-fs/ncdu/ChangeLog b/sys-fs/ncdu/ChangeLog index 21cd153d2ad4..cf132b1f8aa8 100644 --- a/sys-fs/ncdu/ChangeLog +++ b/sys-fs/ncdu/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-fs/ncdu # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/ncdu/ChangeLog,v 1.41 2013/03/07 12:29:33 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/ncdu/ChangeLog,v 1.42 2013/03/07 12:37:45 jlec Exp $ + + 07 Mar 2013; Justin Lecher <jlec@gentoo.org> ncdu-1.9.ebuild, + +files/ncdu-1.9-pkgconfig.patch: + Add fix for building against ncurses[tinfo] 07 Mar 2013; Justin Lecher <jlec@gentoo.org> ncdu-1.9.ebuild: Correct UDE dep for ncurses diff --git a/sys-fs/ncdu/files/ncdu-1.9-pkgconfig.patch b/sys-fs/ncdu/files/ncdu-1.9-pkgconfig.patch new file mode 100644 index 000000000000..0d180b34239f --- /dev/null +++ b/sys-fs/ncdu/files/ncdu-1.9-pkgconfig.patch @@ -0,0 +1,39 @@ + configure.in | 21 ++++++++++++--------- + 1 file changed, 12 insertions(+), 9 deletions(-) + +diff --git a/configure.in b/configure.in +index f4a4a2d..1333234 100644 +--- a/configure.in ++++ b/configure.in +@@ -36,19 +36,22 @@ AC_ARG_WITH([ncursesw], + AC_HELP_STRING([--with-ncursesw], [compile/link with wide-char ncurses library @<:@default@:>@]), + [ncurses=ncursesw]) + if test "$ncurses" = "auto" -o "$ncurses" = "ncursesw"; then +- AC_CHECK_LIB([ncursesw], +- [initscr], +- [LIBS="$LIBS -lncursesw"; ncurses=ncursesw], +- [ncurses=ncurses]) ++ PKG_CHECK_MODULES([NCURSES], [ncursesw], [LIBS="$LIBS $NCURSES_LIBS"; ncurses=ncursesw], ++ [AC_CHECK_LIB([ncursesw], ++ [initscr], ++ [LIBS="$LIBS -lncursesw"; ncurses=ncursesw], ++ [ncurses=ncurses]) ++ ]) + fi + if test "$ncurses" = "ncurses"; then +- AC_CHECK_LIB([ncurses], +- [initscr], +- [LIBS="$LIBS -lncurses"], +- [AC_MSG_ERROR(ncurses library is required)]) ++ PKG_CHECK_MODULES([NCURSES], [ncurses], [LIBS="$LIBS $NCURSES_LIBS"], ++ [AC_CHECK_LIB([ncurses], ++ [initscr], ++ [LIBS="$LIBS -lncurses"], ++ [AC_MSG_ERROR(ncurses library is required)]) ++ ]) + fi + + + + AC_OUTPUT([Makefile]) +- diff --git a/sys-fs/ncdu/ncdu-1.9.ebuild b/sys-fs/ncdu/ncdu-1.9.ebuild index 12c6c72cbecf..943f939d45c8 100644 --- a/sys-fs/ncdu/ncdu-1.9.ebuild +++ b/sys-fs/ncdu/ncdu-1.9.ebuild @@ -1,8 +1,12 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/ncdu/ncdu-1.9.ebuild,v 1.7 2013/03/07 12:29:33 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/ncdu/ncdu-1.9.ebuild,v 1.8 2013/03/07 12:37:45 jlec Exp $ -EAPI=4 +EAPI=5 + +AUTOTOOLS_AUTORECONF=true + +inherit autotools-utils DESCRIPTION="NCurses Disk Usage" HOMEPAGE="http://dev.yorhel.nl/ncdu/" @@ -13,5 +17,8 @@ SLOT="0" KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos" IUSE="" -DEPEND="sys-libs/ncurses[unicode]" -RDEPEND="${DEPEND}" +RDEPEND="sys-libs/ncurses[unicode]" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +PATCHES=( "${FILESDIR}"/${P}-pkgconfig.patch ) |