Search for ncurses via pkg-config files.

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

diff --git a/app-editors/nano/ChangeLog b/app-editors/nano/ChangeLog
index 1cdc633b4ce7e9ffc5a324b9cc4fd428414f84ec..a6f421c298b1839763f38201338c8d3a28f9e5bb 100644 (file)
--- a/app-editors/nano/ChangeLog
+++ b/app-editors/nano/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/nano
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/ChangeLog,v 1.265 2011/08/29 18:08:00 grobian Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/ChangeLog,v 1.266 2012/01/01 07:34:31 vapier Exp $
+
+  01 Jan 2012; Mike Frysinger <vapier@gentoo.org> nano-2.3.1-r1.ebuild,
+  +files/nano-2.3.1-ncurses-pkg-config.patch:
+  Search for ncurses via pkg-config files.
 
 *nano-2.3.1-r1 (29 Aug 2011)
 

diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index c378b0e172e9a138191ab94b809817691cfec627..042dc89f371810ca300d2c9b6b98b3db03a044c0 100644 (file)
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX awk.nanorc 1504 RMD160 c932525ef987d799b255d308a1d354a56d3302a7 SHA1 22da2f05cabf3ae14a85352133315712816cab7b SHA256 c4fb326c9a11a56220dd8a566918c389794fd25e1cc3fda94c5925e5367977bb
 AUX css.nanorc 327 RMD160 a2d28f8f74c53b46d85d6ad986ad7dde7b3b7e50 SHA1 184cc1768789564d795398240ac814a9ae9f835d SHA256 0c2ea24540d9a87abb8c68e5eb042d396ec91a58cd53ea135b5548ea92c67913
@@ -7,6 +7,7 @@ AUX gentoo.nanorc 2578 RMD160 65460270bc9e9e8041570124ccc510311761403d SHA1 e431
 AUX nano-1.3.12-fix2.patch 481 RMD160 8c86b8bed823db226e5c7492c4bcd371e3ec6619 SHA1 96eb32aad43f86d51a67e3cd218b77bf01f64d95 SHA256 4c074af7006e583c0d5a3e8f25a13dc511200cf771934f75a464669dbb73eab1
 AUX nano-1.3.12-path.patch 6465 RMD160 9e7777d4bb908f83c65d50d833a011025c676379 SHA1 a97ea431823d2336c9946d856168799d54333e7a SHA256 ebc54d890a3d2ab8c435b4cee3790e8920c055db9fce86312e8ab1457bfdf721
 AUX nano-1.3.12-scroll.patch 1357 RMD160 0ff451539b959ed1b48995cacec0ee5938f51390 SHA1 c6da5900c9fa9d017d90301e978e3dda991949d4 SHA256 5f44b124d829c3a1d98be782de90728e425e8cd8c7fac73fe36c8dfaa97d4773
+AUX nano-2.3.1-ncurses-pkg-config.patch 1401 RMD160 225fec4f5991ecf56cded5ec746d77ffd26e7446 SHA1 20ab0142d98fbbd93ef38051c0345ba2502d081c SHA256 dbb472978eb92d4a5518710daaa5861f20e2d2d29c9e683b5f1d125e303018c2
 AUX xml.nanorc 260 RMD160 eeb168220d7a96ba20c8a537b24e850211bf8cee SHA1 c74a37a415aaa119453060114a06c1dd7291b663 SHA256 d8de59f2993d921801e38127043a05b07277373b32714e7489d0947b3415a406
 DIST nano-1.3.12.tar.gz 1250777 RMD160 f594c4805af873718828b0aedba06c1f89946458 SHA1 70ff08220ebd00399569d64d308a2edc54505264 SHA256 f5537b8a988618fa8524b6a4b0a6950184d37db983b4521ad843b98845da571c
 DIST nano-2.0.9.tar.gz 1403773 RMD160 a2356cdd1779ab5312307a8eb462516eeaa6e943 SHA1 fce55a02b2809a141258b3c1715d8fd95e004234 SHA256 6d212385680d29dcda35dda7801da19c80182a8bc6bc6d5cf7533034c853d37f
@@ -17,16 +18,24 @@ EBUILD nano-1.3.12-r1.ebuild 2047 RMD160 f096061b21b0af08aaf52a563a3c25844efb0b2
 EBUILD nano-2.0.9.ebuild 1967 RMD160 56bdf6d7f511b72b16393a2afa5755f704ab40b2 SHA1 7aa740fc850d913f4e227d0c2abed01c98576451 SHA256 9a58ab861d5909bc63dd5dc83d27c04bbf414de98d44cf64b56e825f699e9848
 EBUILD nano-2.1.10.ebuild 2129 RMD160 015db613f78790a707d6bc26f4ba8111704308ea SHA1 55c7a947776a0cd2be8ba467689c5ec81d435860 SHA256 1fa1ede2e5cc32ca4e9df85c0fe9d319463444e4f64e4bba787f182c12b32fb8
 EBUILD nano-2.2.5.ebuild 2354 RMD160 e38e6e835f708fcd8a3f9719943c4905753c3f63 SHA1 6dd71ba6ca7c84057ba8696301efae357cde5bbb SHA256 bb2c6fe8fedf8e7396bd056ead857d816dfb1943f9fbc0a7e7e5701004a73991
-EBUILD nano-2.3.1-r1.ebuild 2366 RMD160 832f1661d41d47f36fd73f7ae5e7eb8db2a6473e SHA1 2fe8c5295dca9562a7850734cade8b4d569a7623 SHA256 e1571bf61af6a9bd64eb6be003f77a10e8e5fbd33febe90c057092c913cfddb0
+EBUILD nano-2.3.1-r1.ebuild 2084 RMD160 163c00d822cd2fa43dcab2bdb940a4c584d929cd SHA1 44b6e613486f88688c4ca4fa1801ff8e3b45cf47 SHA256 2cd08920720b3781603b5cd53146acebfb528e574ba25fb4f4995784312030d9
 EBUILD nano-2.3.1.ebuild 2226 RMD160 ae8756b443a044a560b340c3d741890c9ffbc591 SHA1 61e251eaef429c373bb1d391045b28494c72ebb2 SHA256 c5d2d20d13bf85f122958c5f169701aeda6e388fe34e16e4989e759534a1f155
-MISC ChangeLog 30803 RMD160 dc541a92d76c5a537489757880f55f89416c1b37 SHA1 d1e1aaa5989c78f40be5b36089be0bc7f107f266 SHA256 ea6b70c50902bb5a54340eef6dc3bdc7f40de603824ea544f027e0961555d749
+MISC ChangeLog 30964 RMD160 c261809392eeaa724dd9abad6ea555b4fbe24a0f SHA1 c4e42d7f78576af5268b53111be71f2d7bc9e286 SHA256 410de2d43d08cc3bc6f52a318c549c3e92632973d1f71a1293757ebb8369a150
 MISC metadata.xml 1368 RMD160 3862963e8f61860d028dcdc77f367514b653d51c SHA1 f18c3048ce17601267301071bb7fcec8e73d0812 SHA256 50fbac90b4e7b9a12b68ca370b82fa4a5628102352c77608cea7b67fabd833a5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk58/F8ACgkQfXuS5UK5QB3V7AP/bfM6sWuMSfrEvtz4aaDn00oN
-gur3ibuvi6va3wv6Jp5m4W3WSqKbzoilDd8qUumtf7jCTai32FSu/3VO1MvGpj2n
-+05UflnbumloU3dNrX6DGyAqVHw+Lga2fWTngP6qVG99kw3bt36geWq0woWfeQyi
-lX1qg2NQzjSiDKqrpI8=
-=8ch4
+iQIcBAEBAgAGBQJPAAyNAAoJELEHsLL7fEFW/PkP/2cUU5aMmtQJyFNxp2qwlRET
+83rhdA5h7FPlug8MMxkxzENtWUueJihA5a0A6UOMjl/K9YtY63XSFfTjbY3C96AA
+5geB8jj6gls6Uc6e/il7HMlp1xUgK3QhbcqsyqJMoTdvW5diDjIO6cDZht0vkndd
+U9dDNp+6ufhqytsyknWb5EuPeMbK4pG6RLfwIvdjYVy32Q7blThIpdYGk2nN0DQB
+oR1NbKcvMcyvtoEHZccOssIPluApphOTWyJnPANAUoOh1OtfVy4HXD5UTXfpM8D/
+MFTsjAntWKiJrVetUx52bKVbeLOl+drTLtTIkFweiCJ4OcDvTiUffc9F5FFCb/t9
+pkNheMBAowrpkjvTdoG8hNw6JKTa3mbqvlp3KM51C7u3/mSFKjttW9YTLNs1bCG3
+7iW3hyGuVq3GI0qzSPNMbAlgbj6zC1YbPNkjeR8XOoceev18H0Smald7eZovoLAA
+0+jBn2xrW6MO2Z+/1P+p3f7STUqoK3jX3VxloenVZOKwC/vnk6K3lFhp2LhkfiNe
+FqnG+9j/1rrO8vESwGALUqSn7aTukNjaTgE3WHk27na9g/nylDcNpsDJyOdSKZ07
+eSTTq4WZksV5YXDQMJFRyai9ypZ+7RwkFSIF9ui2D8UfKj3dzuPS/uDYGKNUaX76
+a3bMPuskQChRZKVOl7lF
+=z2N2
 -----END PGP SIGNATURE-----

diff --git a/app-editors/nano/files/nano-2.3.1-ncurses-pkg-config.patch b/app-editors/nano/files/nano-2.3.1-ncurses-pkg-config.patch
new file mode 100644 (file)
index 0000000..84bd0b7
--- /dev/null
+++ b/app-editors/nano/files/nano-2.3.1-ncurses-pkg-config.patch
@@ -0,0 +1,52 @@
+From c662db58448fefe86184117e6bab5799e43eccf1 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sun, 1 Jan 2012 02:26:16 -0500
+Subject: [PATCH] search ncurses via pkg-config first
+
+Newer ncurses installs include pkg-config files which tell us the right
+-I/-L paths we need, so default to that before trying the legacy ways.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ configure.ac |   18 ++++++++++++++++++
+ 1 files changed, 18 insertions(+), 0 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 1f61ae4..05308be 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -35,6 +35,7 @@ AC_PROG_CC
+ AC_PROG_LN_S
+ AC_ISC_POSIX
+ AC_SYS_LARGEFILE
++PKG_PROG_PKG_CONFIG
+ 
+ dnl Internationalization macros.
+ 
+@@ -439,6 +440,23 @@ AC_CHECK_FUNCS(getopt_long)
+ dnl Checks for libraries.
+ 
+ if eval "test x$CURSES_LIB_NAME = x"; then
++    if test x$enable_utf8 != xno; then
++      PKG_CHECK_MODULES([NCURSESW], [ncursesw], [
++          CURSES_LIB=$NCURSESW_LIBS
++          CPPFLAGS="$NCURSESW_CFLAGS $CPPFLAGS"
++          CURSES_LIB_NAME=ncursesw
++          CURSES_LIB_WIDE=yes
++      ], [:])
++    else
++      PKG_CHECK_MODULES([NCURSES], [ncurses], [
++          CURSES_LIB=$NCURSES_LIBS
++          CPPFLAGS="$NCURSES_CFLAGS $CPPFLAGS"
++          CURSES_LIB_NAME=ncurses
++      ], [:])
++    fi
++fi
++
++if eval "test x$CURSES_LIB_NAME = x"; then
+     AC_CHECK_HEADERS(ncurses.h)
+ 
+     if test x$enable_utf8 != xno; then
+-- 
+1.7.6.1
+

diff --git a/app-editors/nano/nano-2.3.1-r1.ebuild b/app-editors/nano/nano-2.3.1-r1.ebuild
index e3c58d263f262e8ea2e52b421e42b95b103c0e40..66bc3b16e18705b3532439ee694dc436ddf806ff 100644 (file)
--- a/app-editors/nano/nano-2.3.1-r1.ebuild
+++ b/app-editors/nano/nano-2.3.1-r1.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/nano-2.3.1-r1.ebuild,v 1.1 2011/08/29 18:08:00 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/nano-2.3.1-r1.ebuild,v 1.2 2012/01/01 07:34:31 vapier Exp $
 
 EAPI="3"
-inherit eutils
+
+inherit eutils autotools
 if [[ ${PV} == "9999" ]] ; then
        ESVN_REPO_URI="svn://svn.savannah.gnu.org/nano/trunk/nano"
-       inherit subversion
+       inherit subversion autotools
 else
        MY_P=${PN}-${PV/_}
        SRC_URI="http://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz"
@@ -20,16 +21,15 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug justify minimal ncurses nls slang spell unicode"
 
-DEPEND=">=sys-libs/ncurses-5.2[unicode?]
+RDEPEND=">=sys-libs/ncurses-5.9-r1[unicode?]
        nls? ( sys-devel/gettext )
        !ncurses? ( slang? ( sys-libs/slang ) )"
+DEPEND="${RDEPEND}
+       dev-util/pkgconfig"
 
 src_prepare() {
-       if [[ ! -e configure ]] ; then
-               ./autogen.sh || die
-       fi
-       # Prefix fix for odd ncursesw logic, bug #361251
-       sed -i -e "s:-I\(/usr/include/ncursesw\):-I${EPREFIX}\1:" configure || die
+       epatch "${FILESDIR}"/${PN}-2.3.1-ncurses-pkg-config.patch
+       eautoreconf
 }
 
 src_configure() {
@@ -63,14 +63,6 @@ src_install() {
 
        dodir /usr/bin
        dosym /bin/nano /usr/bin/nano
-
-       insinto /usr/share/nano
-       local f
-       for f in "${FILESDIR}"/*.nanorc ; do
-               [[ -e ${ED}/usr/share/nano/${f##*/} ]] && continue
-               doins "${f}" || die
-               echo "# include \"${EPREFIX}/usr/share/nano/${f##*/}\"" >> "${ED}"/etc/nanorc
-       done
 }
 
 pkg_postinst() {