summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEray Aslan <eras@gentoo.org>2013-02-28 13:43:44 +0000
committerEray Aslan <eras@gentoo.org>2013-02-28 13:43:44 +0000
commit3d1498a8e3aa32d6939b6bac7d3330002490b990 (patch)
tree958dcda070f19ca7ed8f294edc2c55d8ac3b8cd6 /app-crypt
parentStable for HPPA (bug #458800). (diff)
downloadgentoo-2-3d1498a8e3aa32d6939b6bac7d3330002490b990.tar.gz
gentoo-2-3d1498a8e3aa32d6939b6bac7d3330002490b990.tar.bz2
gentoo-2-3d1498a8e3aa32d6939b6bac7d3330002490b990.zip
Fix building with ncurses[tinfo]
(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 0x77F1F175586A3B1F)
Diffstat (limited to 'app-crypt')
-rw-r--r--app-crypt/mit-krb5-appl/ChangeLog9
-rw-r--r--app-crypt/mit-krb5-appl/files/mit-krb5-appl-tinfo.patch12
-rw-r--r--app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3.ebuild19
3 files changed, 31 insertions, 9 deletions
diff --git a/app-crypt/mit-krb5-appl/ChangeLog b/app-crypt/mit-krb5-appl/ChangeLog
index 252875b4e5c2..f05a33de6ff8 100644
--- a/app-crypt/mit-krb5-appl/ChangeLog
+++ b/app-crypt/mit-krb5-appl/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-crypt/mit-krb5-appl
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5-appl/ChangeLog,v 1.35 2012/12/16 19:42:35 ulm Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5-appl/ChangeLog,v 1.36 2013/02/28 13:43:44 eras Exp $
+
+ 28 Feb 2013; Eray Aslan <eras@gentoo.org> +files/mit-krb5-appl-tinfo.patch,
+ mit-krb5-appl-1.0.3.ebuild:
+ Fix building with ncurses[tinfo]
16 Dec 2012; Ulrich Müller <ulm@gentoo.org> mit-krb5-appl-1.0.3.ebuild:
Fix LICENSE, see NOTICE file, bug 447296.
@@ -131,4 +135,3 @@
30 Apr 2010; Jeremy Olexa <darkside@gentoo.org> +mit-krb5-appl-1.0.ebuild,
+metadata.xml:
New ebuild by Eray Aslan, bug 312481
-
diff --git a/app-crypt/mit-krb5-appl/files/mit-krb5-appl-tinfo.patch b/app-crypt/mit-krb5-appl/files/mit-krb5-appl-tinfo.patch
new file mode 100644
index 000000000000..54c18665d336
--- /dev/null
+++ b/app-crypt/mit-krb5-appl/files/mit-krb5-appl-tinfo.patch
@@ -0,0 +1,12 @@
+--- configure.ac 2011-07-11 22:34:17.000000000 +0300
++++ configure.ac 2013-02-28 15:12:24.693841664 +0200
+@@ -152,7 +152,8 @@
+ [AC_DEFINE(TERMCAP,1,[Define if termcap library is available])
+ LIBS="$LIBS -ltermcap"])
+ AC_CHECK_LIB(curses,setupterm,LIBS="$LIBS -lcurses",
+- [AC_CHECK_LIB(ncurses,setupterm,LIBS="$LIBS -lncurses")])
++ [AC_CHECK_LIB(ncurses,setupterm,LIBS="$LIBS -lncurses",
++ [AC_CHECK_LIB(tinfo,setupterm,LIBS="$LIBS -lncurses")])])
+ AC_CHECK_FUNCS(setupterm)
+ TELNET_LIBS="$LIBS"
+ TELNETD_LIBS="$LIBS"
diff --git a/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3.ebuild b/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3.ebuild
index 40f8a367fe26..985077d5b724 100644
--- a/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3.ebuild
+++ b/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3.ebuild,v 1.9 2012/12/16 19:42:35 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3.ebuild,v 1.10 2013/02/28 13:43:44 eras Exp $
EAPI=4
-inherit flag-o-matic versionator eutils
+inherit autotools eutils flag-o-matic toolchain-funcs versionator
MY_P=${P/mit-}
MAJOR_MINOR="$( get_version_component_range 1-2 )"
@@ -20,7 +20,8 @@ IUSE=""
RDEPEND=">=app-crypt/mit-krb5-1.8.0
sys-libs/e2fsprogs-libs
sys-libs/ncurses"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
S=${WORKDIR}/${MY_P}
@@ -29,10 +30,16 @@ src_unpack() {
unpack ./"${MY_P}".tar.gz
}
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-tinfo.patch"
+ sed -i -e "s/-lncurses/$($(tc-getPKG_CONFIG) --libs ncurses)/" configure.ac
+ eautoreconf
+}
+
src_configure() {
append-flags "-I/usr/include/et"
- append-flags -fno-strict-aliasing
- append-flags -fno-strict-overflow
+ append-cppflags -fno-strict-aliasing
+ append-cppflags -fno-strict-overflow
econf
}