[gentoo-commits] gentoo-x86 commit in sys-libs/ncurses: ncurses-5.9-r2.ebuild ChangeLog

["Mike Frysinger (vapier)" <vapier@gentoo.org>]

vapier      12/10/23 20:07:18

  Modified:             ncurses-5.9-r2.ebuild ChangeLog
  Log:
  Bypass dumb pkg-config install checks #438922 by Benjamin Peterson.
  
  (Portage version: 2.2.0_alpha131/cvs/Linux x86_64)

Revision  Changes    Path
1.16                 sys-libs/ncurses/ncurses-5.9-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/ncurses/ncurses-5.9-r2.ebuild?rev=1.16&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/ncurses/ncurses-5.9-r2.ebuild?rev=1.16&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/ncurses/ncurses-5.9-r2.ebuild?r1=1.15&r2=1.16

Index: ncurses-5.9-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.9-r2.ebuild,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ncurses-5.9-r2.ebuild	29 Jul 2012 16:50:07 -0000	1.15
+++ ncurses-5.9-r2.ebuild	23 Oct 2012 20:07:18 -0000	1.16
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.9-r2.ebuild,v 1.15 2012/07/29 16:50:07 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.9-r2.ebuild,v 1.16 2012/10/23 20:07:18 vapier Exp $
 
 EAPI="1"
 inherit eutils flag-o-matic toolchain-funcs
@@ -32,9 +32,6 @@
 	epatch "${FILESDIR}"/${PN}-5.7-nongnu.patch
 	epatch "${FILESDIR}"/${PN}-5.9-rxvt-unicode-9.15.patch #192083 #383871
 	epatch "${FILESDIR}"/${PN}-5.9-fix-clang-build.patch #417763
-	sed -i \
-		-e '/^PKG_CONFIG_LIBDIR/s:=.*:=$(libdir)/pkgconfig:' \
-		misc/Makefile.in || die
 }
 
 src_compile() {
@@ -66,6 +63,12 @@
 	cd "${WORKDIR}"/$1
 	shift
 
+	# ncurses is dumb and doesn't install .pc files unless pkg-config
+	# is also installed.  Force the tests to go our way.  Note that it
+	# doesn't actually use pkg-config ... it just looks for set vars.
+	tc-export PKG_CONFIG
+	export PKG_CONFIG_LIBDIR="/usr/$(get_libdir)/pkgconfig"
+
 	# The chtype/mmask-t settings below are to retain ABI compat
 	# with ncurses-5.4 so dont change em !
 	local conf_abi="



1.212                sys-libs/ncurses/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/ncurses/ChangeLog?rev=1.212&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/ncurses/ChangeLog?rev=1.212&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/ncurses/ChangeLog?r1=1.211&r2=1.212

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -r1.211 -r1.212
--- ChangeLog	29 Jul 2012 16:50:07 -0000	1.211
+++ ChangeLog	23 Oct 2012 20:07:18 -0000	1.212
@@ -1,6 +1,9 @@
 # ChangeLog for sys-libs/ncurses
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.211 2012/07/29 16:50:07 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.212 2012/10/23 20:07:18 vapier Exp $
+
+  23 Oct 2012; Mike Frysinger <vapier@gentoo.org> ncurses-5.9-r2.ebuild:
+  Bypass dumb pkg-config install checks #438922 by Benjamin Peterson.
 
   29 Jul 2012; Raúl Porcel <armin76@gentoo.org> ncurses-5.9-r2.ebuild:
   alpha/sparc stable wrt #413897