cleanup and fix building wrt bug 459654

Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

3 files changed, 34 insertions, 24 deletions

diff --git a/app-editors/elvis/ChangeLog b/app-editors/elvis/ChangeLog
index 18fd1a4f4a0e..791ad10fc0ac 100644
--- a/app-editors/elvis/ChangeLog
+++ b/app-editors/elvis/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/elvis
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/elvis/ChangeLog,v 1.49 2012/09/09 17:10:12 armin76 Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/elvis/ChangeLog,v 1.50 2013/03/01 07:42:26 ssuominen Exp $
+
+  01 Mar 2013; Samuli Suominen <ssuominen@gentoo.org> elvis-2.2.0-r4.ebuild:
+  Move ./configure from src_compile() to src_configure(). Fix building with
+  sys-libs/ncurses[tinfo] wrt #459654 by Diego Elio Pettenò
 
   09 Sep 2012; Raúl Porcel <armin76@gentoo.org> elvis-2.2.0-r3.ebuild,
   elvis-2.2.0-r4.ebuild:
diff --git a/app-editors/elvis/Manifest b/app-editors/elvis/Manifest
index 99d9e3c02f6d..5198b25e769d 100644
--- a/app-editors/elvis/Manifest
+++ b/app-editors/elvis/Manifest
@@ -6,13 +6,17 @@ AUX elvis-2.2.0-interix.patch 297 SHA256 36e401aa2375266813133dd195469837c60daf7
 AUX ft2.3-symbol-collision-fix.patch 2396 SHA256 59960b0498863f0793b5c33a824efc62c6255d26455d3ec6c87f62cb1969f008 SHA512 14a2880f9984615f9876973e5eaea54846547d2871b8c2f1417c968e5e92c01612c954d39026671cb29656c4d6fd93d65f1bd6fc6325471346e1f56e3e1b97a3 WHIRLPOOL d21ca4e78f5288688e539c85ea3300e252ea0d56adb6a101eed531cc2a4e2a7ab8a0cf49c80640aab5bdcd18ee71e57d352d5280befe0a40a710b2e7809347d1
 DIST elvis-2.2_0.tar.gz 1439293 SHA256 9a8466b2293798441056bc279736af3a616baaba2f11940396cc60ff71924ea0 SHA512 847cc9ac0af170798abd4725f7dc2ec74d4931fb761b58836d4016d36da5657176bd8cdcdae02bc08438b18e8ce2433eb3340ec2503630fd2992e83ba06adf42 WHIRLPOOL be087bc38507900852dbe1f9b59a14c3e135d14bc695f2ec23c6c70284c6f9b7d35b7d25a0dd2b36f32392537421aeb6804df477cfc98a206f101ffee5f2be8f
 EBUILD elvis-2.2.0-r3.ebuild 2366 SHA256 ab62b282a22d11b551f4500d09a62c1a364789205b0f254957b9464d987b7523 SHA512 043c23afef1efd62638ab393181774afa988afbadb202286e781de68875bc443fe3e1231685627028fb4c2f3f90e424f3d1d2d9be0463cf8b0baf4b508b97505 WHIRLPOOL 8b031e7e2feabaad596ed93323680c990af84d3eb18e85ad528ebcb094b1320ab500a1e56e8b00470af8a9f65138b713764615f37fdc806bdbd85a3f3b680047
-EBUILD elvis-2.2.0-r4.ebuild 2505 SHA256 5afb4dff3e666a66be6148b0db8163dc4b342f46af5674934757c18046b5d549 SHA512 d2d7a005a96c6375b07f6ce1d14fd72bdf65eca35ee5ce66f4059b6f5af0c3049f2df3fd992c1d4aee910e83a2402af4d542c3bee1569debf3edbd58e773b012 WHIRLPOOL d82768f8b5d8f6876a2b4ccebc364d5d0ee37245620884ba3edf2ac7f61b2449ccd908eea3d8fd186cff0b2fe697cf18b01981394255f50e8b14f442da9883ca
-MISC ChangeLog 5956 SHA256 26a331b534f420cd9299bee534d5e2d4167e88c544a0a7763f8eb2481473facc SHA512 79cdb89357bba9b2352fd64358d4baa14dd4442841b285b7cbfc9114d5a9b74d6e67bc130a30de8d95a10ae232966103344c74d046b4454ff5d40f537091bf82 WHIRLPOOL cb3966bc2145bcb28679c46e7ecdb2319c27b4d5dc69037182aa26d182fc97e5aa581a336afeef08acf702f9770e2c8572dab2e44233a0be5a6069863ed44fb6
+EBUILD elvis-2.2.0-r4.ebuild 2518 SHA256 b6a0c1c20b8b9bd8b453f9a1acb8ba1108d4e5ceba9418462d48c99b9b5648f8 SHA512 a834ed320389f29396103b04a2461c1c449f1b91b46c03d175e9008fe70edf615e1fcd76c30bca528cd25e2a151eaa70fb5ee58f2f7fca274805af265821a154 WHIRLPOOL 04a1af3257830d2a0dcad08dfcb8581a470a7f56761073953f379d7028ee208e823e1f7ccef316ffd37d096c44e90557fa1eb8e3457f411da654cb6274a5bf2e
+MISC ChangeLog 6173 SHA256 838824d10949dace1e3fecaac430d06cb6c65302f59e6d1534b9561e22639be3 SHA512 d8197bbb3528b02b9e8e34094d07b8135c4eb13655f34d694fb7929cf363e3901c9894a0bd24571bc5e6fbedbc60a76b413c5e70e52a7ab8daedd75844d69851 WHIRLPOOL 63818760e7189a14f0bfc484641c8230058b86254e85e528ce2019bbf3549c6ffc4aa8affb4c75cc9e33314ea1f28a0aa5379f4eda607d70ca9ae05e9f87d62d
 MISC metadata.xml 156 SHA256 64d20c782589b423a6e75ba6fff7edead1ec8fbae742d27dd57f5299e8328500 SHA512 7dc1d902106e794e1a12bde5dcacb8b7143584cba9c61e72ac5728dd952663144c1b0efc949fbbc9fcec03b396b5e060e8263eaad7d70cd82d6d5b350c62f0c1 WHIRLPOOL 4381a5d144e783e5979d394720b32f7d95818a8571f748e72c5ece965c4e0375b1aec0c34f6f506a9f9fc255f1b69a220fdb74d1dbb8aabc92ec48afa44ab883
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBMzXkACgkQuQc30/atMkCQLwCgqzs3q/CGph83NuR9x0VCCLWX
-AzcAnj4vswk0UvwKnu66nZaFZwx6Jk9D
-=7caG
+iQEcBAEBCAAGBQJRMFuUAAoJEEdUh39IaPFN+gwH/37lrFZm4smRUmy260dx7A0c
+yxu074NBvLV5TUGrNDOR8hai1DRcIaws0jHFOmCEJlqNysccIGP4KZj2iguB6B/Q
+Vrcu8VJvWi5Hf18yDiHo4Taw4xB3TGS9qnumPmN1ZYg49Ys+GmoM5yxdOvub9z/u
+vuFnKxyaiq4b2k841xcoU1SxTA/mzfykd0+nibL0YktToEegCHLm0bm+l4zoEHJc
+GUzGSj4VJoDp2XUZtbncs3jCVbucI2rySIL12e5t3suvHFosKBAs/9BVExcnlvV5
+GCKhgsvK2joRwEBO2hq385nxvMFiHNmROaSv+KJswkvvVy66fhARDElW3Jbbcq4=
+=OKMw
 -----END PGP SIGNATURE-----
diff --git a/app-editors/elvis/elvis-2.2.0-r4.ebuild b/app-editors/elvis/elvis-2.2.0-r4.ebuild
index 186102f9c160..e5ce8e0efa46 100644
--- a/app-editors/elvis/elvis-2.2.0-r4.ebuild
+++ b/app-editors/elvis/elvis-2.2.0-r4.ebuild
@@ -1,10 +1,9 @@
-# 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-editors/elvis/elvis-2.2.0-r4.ebuild,v 1.6 2012/09/09 17:10:12 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/elvis/elvis-2.2.0-r4.ebuild,v 1.7 2013/03/01 07:42:26 ssuominen Exp $
 
-EAPI="3"
-
-inherit eutils versionator
+EAPI=5
+inherit eutils versionator toolchain-funcs
 
 MY_PV=$(replace_version_separator 2 '_')
 
@@ -17,31 +16,34 @@ SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86 ~x86-interix ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris"
 IUSE="X"
 
-DEPEND=">=sys-libs/ncurses-5.2
+RDEPEND=">=sys-libs/ncurses-5.7-r7
 	X? ( >=x11-proto/xproto-7.0.4
 		>=x11-libs/libX11-1.0.0
 		>=x11-libs/libXt-1.0.0
 		>=x11-libs/libXpm-3.5.4.2
 		>=x11-libs/libXft-2.1.8.2 )
 	app-admin/eselect-vi"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
 
 S=${WORKDIR}/${PN}-${MY_PV}
 
 src_prepare() {
-	epatch "${FILESDIR}"/ft2.3-symbol-collision-fix.patch \
-		"${FILESDIR}"/${P}-glibc-2.10.patch
-	epatch "${FILESDIR}"/${P}-interix.patch
+	epatch \
+		"${FILESDIR}"/ft2.3-symbol-collision-fix.patch \
+		"${FILESDIR}"/${P}-glibc-2.10.patch \
+		"${FILESDIR}"/${P}-interix.patch
 }
 
-src_compile() {
+src_configure() {
 	./configure \
-		--libs="-lncurses" \
+		--libs="$($(tc-getPKG_CONFIG) --libs ncurses)" \
 		--prefix="${EPREFIX}"/usr \
 		--bindir="${EPREFIX}"/usr/bin \
 		--datadir="${EPREFIX}"/usr/share/elvis \
-		--docdir="${EPREFIX}"/usr/share/doc/"${PF}" \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
 		$(use_with X x) \
-		|| die "configure failed"
+		|| die
 
 	# Some Makefile fixups (must happen after configure)
 	# Use our CFLAGS
@@ -62,19 +64,19 @@ src_install() {
 	dodir /usr/bin
 	dodir /usr/share/man/man1
 	dodir /usr/share/elvis
-	dodir /usr/share/doc/"${PF}"
+	dodir /usr/share/doc/${PF}
 	dodir /etc
-	make install \
+	emake install \
 		PREFIX="${ED}"/usr \
 		BINDIR="${ED}"/usr/bin \
 		DATADIR="${ED}"/usr/share/elvis \
-		DOCDIR="${ED}"/usr/share/doc/"${PF}" || die 'make install failed'
+		DOCDIR="${ED}"/usr/share/doc/${PF}
 
 	# Install the man-pages
 	mv doc/elvis.man doc/elvis.1
 	mv doc/elvtags.man doc/elvtags.1
 	mv doc/ref.man doc/ref.1
-	doman doc/*.1 || die 'doman failed'
+	doman doc/*.1
 
 	# Fixup some READMEs
 	sed -i -e "s,${ED},,g" "${ED}"/etc/elvis/README \