Install pkg-config files.

Package-Manager: portage-2.2.0_alpha75/cvs/Linux x86_64

diff --git a/sys-libs/ncurses/ChangeLog b/sys-libs/ncurses/ChangeLog
index 2cf44bb58596e420b3b5af905f5f551c99f5e195..29c518274252fe6eb60592ecaff44f87cf367f93 100644 (file)
--- a/sys-libs/ncurses/ChangeLog
+++ b/sys-libs/ncurses/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/ncurses
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.190 2011/11/13 20:06:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.191 2011/11/21 22:08:23 vapier Exp $
+
+*ncurses-5.9-r1 (21 Nov 2011)
+
+  21 Nov 2011; Mike Frysinger <vapier@gentoo.org> +ncurses-5.9-r1.ebuild:
+  Install pkg-config files.
 
   13 Nov 2011; Mike Frysinger <vapier@gentoo.org> -ncurses-5.6-r2.ebuild,
   -ncurses-5.7-r3.ebuild, -ncurses-5.7-r5.ebuild, -ncurses-5.7-r6.ebuild:

diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index 213e6999b904ea39f31e46fb3e735a810e51f16b..0a79609d1ef7be961712024cd64fccccb8995704 100644 (file)
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -14,13 +14,14 @@ AUX ncurses-5.8-rxvt-unicode.patch 3724 RMD160 d6b46469ce0078ec08e1fa405f0a1d939
 DIST ncurses-5.7.tar.gz 2445052 RMD160 a19ca026d32255f5a4d22eb006d65182041e0234 SHA1 8233ee56ed84ae05421e4e6d6db6c1fe72ee6797 SHA256 0a9bdea5c7de8ded5c9327ed642915f2cc380753f12d4ad120ef7da3ea3498f4
 DIST ncurses-5.9.tar.gz 2826473 RMD160 dd7dffe38fcc908230ce3e036b71ced2d270ac9e SHA1 3e042e5f2c7223bffdaac9646a533b8c758b65b5 SHA256 9046298fb440324c9d4135ecea7879ffed8546dd1b58e59430ea07a4633f563b
 EBUILD ncurses-5.7-r7.ebuild 5126 RMD160 9292a311c2eee95af143369891be944d8f1c7995 SHA1 53bd7470945a2fdf3d760c4d8b6aad27bba5b4a4 SHA256 768d9c817523e94b07aa031e95466bee13bcbedf0bb96115a8a2eab67fc84c6e
+EBUILD ncurses-5.9-r1.ebuild 5245 RMD160 52a9207cf00490931ac7fa8cef0a1d3ceb183fb8 SHA1 49d71a1a7517c8566480e130955e6d020d78e581 SHA256 8e234b5c9604475f64f07824c0356797edf5ffe6761f37a389dfb7c781671090
 EBUILD ncurses-5.9.ebuild 4889 RMD160 a77a9a494441fb1b23aeb4730e25895e0e501fb0 SHA1 420fbfa6b4dd1b9c88ac2911e90f56038c0cf6f0 SHA256 89c2a21edc3e256b9dde5096145387a94f784d82f993774c45c8e7d570b6914e
-MISC ChangeLog 27573 RMD160 7658138f810e00e13457811164515d0444c787b0 SHA1 300df67da7c04399bb5189e2e37bc4c41ef4e233 SHA256 7d2eecea882c7d5266f907e9e79c9f54de3bbfa1f27dfdb688a103b534fe0c79
+MISC ChangeLog 27707 RMD160 845176451cd1de6edc10aabd5826a107ba13266c SHA1 9059342b613b5bdee1b87af5047f41bd75ce3892 SHA256 92ca5c189a8dd9764c2da18b1fe0bd61613f32b1623766bdb2b7dded12409057
 MISC metadata.xml 320 RMD160 cd60b146f09101932293157c33ac98f273c92783 SHA1 47c720e1ec7ce4a1c4de36edeac9cfd10004bbae SHA256 906f778ea6ad65cad63404d3bd4126d32dcaef8fa0dd81d0108fd20630594779
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk7AI0cACgkQaC/OocHi7JaU+gEAnnKlzF3xh/VY7OMimPJxyIGk
-aejgVrJlitrGDbMTO2kA/i+9tuAqqzY1le1uSyJPjHFBnB8+M15aKBed48R2mm9A
-=wDcR
+iF4EAREIAAYFAk7Ky94ACgkQaC/OocHi7JYajgD/eD9/JJ4uERbLWsJ9WRvjfJtE
+ZIQYhPAIz1efxm9y3l8BAIWY21w/x5F0BMiq+UbQhnhSEjvABCPSBMCbImVnLWxq
+=KiUh
 -----END PGP SIGNATURE-----

diff --git a/sys-libs/ncurses/ncurses-5.9-r1.ebuild b/sys-libs/ncurses/ncurses-5.9-r1.ebuild
new file mode 100644 (file)
index 0000000..0da4732
--- /dev/null
+++ b/sys-libs/ncurses/ncurses-5.9-r1.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.9-r1.ebuild,v 1.1 2011/11/21 22:08:23 vapier Exp $
+
+EAPI="1"
+inherit eutils flag-o-matic toolchain-funcs
+
+MY_PV=${PV:0:3}
+PV_SNAP=${PV:4}
+MY_P=${PN}-${MY_PV}
+DESCRIPTION="console display library"
+HOMEPAGE="http://www.gnu.org/software/ncurses/ http://dickey.his.com/ncurses/"
+SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="5"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="ada +cxx debug doc gpm minimal profile static-libs trace unicode"
+
+DEPEND="gpm? ( sys-libs/gpm )"
+#      berkdb? ( sys-libs/db )"
+RDEPEND="!<x11-terms/rxvt-unicode-9.06-r3"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+       [[ -n ${PV_SNAP} ]] && epatch "${WORKDIR}"/${MY_P}-${PV_SNAP}-patch.sh
+       epatch "${FILESDIR}"/${PN}-5.8-gfbsd.patch
+       epatch "${FILESDIR}"/${PN}-5.7-nongnu.patch
+       epatch "${FILESDIR}"/${PN}-5.8-rxvt-unicode.patch #192083
+       sed -i \
+               -e '/^PKG_CONFIG_LIBDIR/s:=.*:=$(libdir)/pkgconfig:' \
+               misc/Makefile.in || die
+}
+
+src_compile() {
+       unset TERMINFO #115036
+       tc-export BUILD_CC
+       export BUILD_CPPFLAGS+=" -D_GNU_SOURCE" #214642
+
+       # when cross-compiling, we need to build up our own tic
+       # because people often don't keep matching host/target
+       # ncurses versions #249363
+       if tc-is-cross-compiler && ! ROOT=/ has_version ~sys-libs/${P} ; then
+               make_flags="-C progs tic"
+               CHOST=${CBUILD} \
+               CFLAGS=${BUILD_CFLAGS} \
+               CXXFLAGS=${BUILD_CXXFLAGS} \
+               CPPFLAGS=${BUILD_CPPFLAGS} \
+               LDFLAGS="${BUILD_LDFLAGS} -static" \
+               do_compile cross --without-shared --with-normal
+       fi
+
+       make_flags=""
+       do_compile narrowc
+       use unicode && do_compile widec --enable-widec --includedir=/usr/include/ncursesw
+}
+do_compile() {
+       ECONF_SOURCE=${S}
+
+       mkdir "${WORKDIR}"/$1
+       cd "${WORKDIR}"/$1
+       shift
+
+       # The chtype/mmask-t settings below are to retain ABI compat
+       # with ncurses-5.4 so dont change em !
+       local conf_abi="
+               --with-chtype=long \
+               --with-mmask-t=long \
+               --disable-ext-colors \
+               --disable-ext-mouse \
+               --without-pthread \
+               --without-reentrant \
+       "
+       # We need the basic terminfo files in /etc, bug #37026.  We will
+       # add '--with-terminfo-dirs' and then populate /etc/terminfo in
+       # src_install() ...
+#              $(use_with berkdb hashed-db)
+       econf \
+               --with-terminfo-dirs="/etc/terminfo:/usr/share/terminfo" \
+               --with-shared \
+               --without-hashed-db \
+               $(use_with ada) \
+               $(use_with cxx) \
+               $(use_with cxx cxx-binding) \
+               $(use_with debug) \
+               $(use_with profile) \
+               $(use_with gpm) \
+               --disable-termcap \
+               --enable-symlinks \
+               --with-rcs-ids \
+               --with-manpage-format=normal \
+               --enable-const \
+               --enable-colorfgbg \
+               --enable-echo \
+               --enable-pc-files \
+               $(use_enable !ada warnings) \
+               $(use_with debug assertions) \
+               $(use_enable debug leaks) \
+               $(use_with debug expanded) \
+               $(use_with !debug macros) \
+               $(use_with trace) \
+               ${conf_abi} \
+               "$@"
+
+       # A little hack to fix parallel builds ... they break when
+       # generating sources so if we generate the sources first (in
+       # non-parallel), we can then build the rest of the package
+       # in parallel.  This is not really a perf hit since the source
+       # generation is quite small.
+       emake -j1 sources || die
+       # For some reason, sources depends on pc-files which depends on
+       # compiled libraries which depends on sources which ...
+       # Manually delete the pc-files file so the install step will
+       # create the .pc files we want.
+       rm -f misc/pc-files
+       emake ${make_flags} || die
+}
+
+src_install() {
+       # use the cross-compiled tic (if need be) #249363
+       export PATH=${WORKDIR}/cross/progs:${PATH}
+
+       # install unicode version second so that the binaries in /usr/bin
+       # support both wide and narrow
+       cd "${WORKDIR}"/narrowc
+       emake DESTDIR="${D}" install || die
+       if use unicode ; then
+               cd "${WORKDIR}"/widec
+               emake DESTDIR="${D}" install || die
+       fi
+
+       # Move libncurses{,w} into /lib
+       gen_usr_ldscript -a ncurses
+       use unicode && gen_usr_ldscript -a ncursesw
+       ln -sf libncurses.so "${D}"/usr/$(get_libdir)/libcurses.so || die
+       use static-libs || rm "${D}"/usr/$(get_libdir)/*.a
+
+#      if ! use berkdb ; then
+               # We need the basic terminfo files in /etc, bug #37026
+               einfo "Installing basic terminfo files in /etc..."
+               for x in ansi console dumb linux rxvt rxvt-unicode screen sun vt{52,100,102,200,220} \
+                                xterm xterm-color xterm-xfree86
+               do
+                       local termfile=$(find "${D}"/usr/share/terminfo/ -name "${x}" 2>/dev/null)
+                       local basedir=$(basename $(dirname "${termfile}"))
+
+                       if [[ -n ${termfile} ]] ; then
+                               dodir /etc/terminfo/${basedir}
+                               mv ${termfile} "${D}"/etc/terminfo/${basedir}/
+                               dosym ../../../../etc/terminfo/${basedir}/${x} \
+                                       /usr/share/terminfo/${basedir}/${x}
+                       fi
+               done
+
+               # Build fails to create this ...
+               dosym ../share/terminfo /usr/$(get_libdir)/terminfo
+#      fi
+
+       echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" > "${T}"/50ncurses
+       doenvd "${T}"/50ncurses
+
+       use minimal && rm -r "${D}"/usr/share/terminfo*
+       # Because ncurses5-config --terminfo returns the directory we keep it
+       keepdir /usr/share/terminfo #245374
+
+       cd "${S}"
+       dodoc ANNOUNCE MANIFEST NEWS README* TO-DO doc/*.doc
+       use doc && dohtml -r doc/html/
+}