Fix HOMEPAGE/SRC_URI. Remove parallel make workaround. Fix building against sys-libs/ncurses[tinfo] (bug #459548).

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

5 files changed, 47 insertions, 32 deletions

diff --git a/app-editors/ne/ChangeLog b/app-editors/ne/ChangeLog
index 33c501ac7eb5..1e72a0997b2c 100644
--- a/app-editors/ne/ChangeLog
+++ b/app-editors/ne/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/ne
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/ne/ChangeLog,v 1.50 2014/03/11 19:51:09 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/ne/ChangeLog,v 1.51 2014/10/28 22:43:09 jer Exp $
+
+  28 Oct 2014; Jeroen Roovers <jer@gentoo.org> ne-2.3.ebuild, ne-2.5.ebuild,
+  metadata.xml:
+  Fix HOMEPAGE/SRC_URI. Remove parallel make workaround. Fix building against
+  sys-libs/ncurses[tinfo] (bug #459548).
 
   11 Mar 2014; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Cleanup due #53266
diff --git a/app-editors/ne/Manifest b/app-editors/ne/Manifest
index 4de89130818a..0a903570f13b 100644
--- a/app-editors/ne/Manifest
+++ b/app-editors/ne/Manifest
@@ -4,14 +4,14 @@ Hash: SHA256
 AUX ne-2.1-asneeded.patch 331 SHA256 88fc33b84d2a02d52e010937f08ab7d745bd2a2ff5a2f86a8b9b2574db0e8ef5 SHA512 4948515859115b396114fdb327528a5b7a6ea46361ad241f91907779d4c32779972cc2f18d52426b23696c414df425f9d1928bfda561b895160840b2af0941bd WHIRLPOOL 1da68bc4bbf03766e3b1fa5c9d29751cdf09612bc1bde4aeb762430b81251bd1c6281a4cc1d7d42e08a448c7280d37532eee0491991bbe27810a24fcb327e6ee
 DIST ne-2.3.tar.gz 1043855 SHA256 d7cf7e85a67a43e48d07fd6de713942a730209e1c5730d2e5b4bce7479aaa31e SHA512 2a02aa2d800ae01df8a707d59f3f5638422e699d09e1e384274be4a4a90b7019c40b5005e3892684f0ca7e3521ca1449af94bb89f0933c17c64aefc8e2c36240 WHIRLPOOL df428f9307186fc497897efc81d889b7d8f52f144ca514adbe97528ce90982ac07562cf0bff839333c6eae9cebff48e195900520bf62321d25e0939faeb517a1
 DIST ne-2.5.tar.gz 1106020 SHA256 e11581d84ff855c3fab5c2bddc3a4633a3b28bb2ce89508e4568d3c3fc929f58 SHA512 e93b5da33565c8ef0b3263083bacec46f1867f78950e0bed940b2f18d14eb42bfa6323130eabe0f793f427a5bea5e04df6ef8e4a0276a883822b0842cbd8b5ed WHIRLPOOL 8bf3f9bd0d735bfef656713e9485a74f901c212396a691ee7faf01f4afa2918f03ec053d289e7311a7bae8b3a7d44c928cb109fefa6b1df581ae8da9c6a3d453
-EBUILD ne-2.3.ebuild 1194 SHA256 4b250323858db2851982a5713e30e4ffbc7b6f881511deadac165d1be552f7d2 SHA512 f04ebe138ce4a95118f6b91384b8b1663d89c81f2128b3ff5d624e561897f0b6fcf39ac63c469e517fa381ba8370c86a010e14b541a56f501a6689fd5d5badbf WHIRLPOOL e3f97b57590cbb604af814784585bf7a487af3f48c85976b25afc33c118928e16c159749d8a80d6e1d24ff32f39b2d980f711c0682bba132f35543adadb2b905
-EBUILD ne-2.5.ebuild 1047 SHA256 b9786b34752a370f6b9e2a5d5f6ae06e37197ef8d710c16c3d4fd23e63502d73 SHA512 27ff29c147db721ef0385a6f8b4b09d35a50b642f4c10b86a5d53c05df19e1cc1e19a03c0f0ec3bc28ed647f9ec1d5418ce24a350a4f400626bad3e832426a49 WHIRLPOOL 2d14a01902b62acc32c7264d833f15d2fff37679f41d81981418a8bf5cf5f4dc6a54ef12af0ca450c8cf3a57bdc2865d8b8c5d69e7ee77f73f9a1b5422c93bc6
-MISC ChangeLog 5687 SHA256 657f471f5264823fd8f6a3ff9d56b8c02a9ecfa6fe06eb25c75930b7f203c1c4 SHA512 56ba4472f0efcda3b8fc4c5ceaa6d733e9a134a0bacd575e7445d125e6861144343f435b8f7adf305b58d3ae938fefe7b58226c36e5adde77036d402a2e1603a WHIRLPOOL 2c5034c5d74bf2e427ff590b2d84d86b4a1352d8847a64df816acf9948cf7d709353c5dd83bdcdea877d28fd277fb8b697f127ec8973028116cd100afb3607b6
-MISC metadata.xml 213 SHA256 e32377b4003bbaf839ddaf27c4ecf23297be6196fbba4a68e3adbfa3e79be164 SHA512 acaee2768564d8584b96b96f48e5009ab7279ae73e447bb363b1344d055c8ea05881f49ba611f69d6c275bdcc88e7d889c50f7b905acbb17f54b7e3893fecb5b WHIRLPOOL 542641939359d644d884c1f5c1e411ec4ed98472b80934fe0ef94c8b94b9f74f3b945ba8054c1db17b6afc4ce9ebd062bb3e0b150a7a11ba8380965118f0b014
+EBUILD ne-2.3.ebuild 1192 SHA256 363d307bbfb597376495dd1653462965ede4af8c7b15f293fb7be715d131651d SHA512 1b084cf4cc5c0241908b8e4607506dfd87ad1f9e3adef63bde46a4793ed0a3c5cc2b1ef0472bb5c4a23558ee99d566e902243ec448ef6ca4335038fc62951019 WHIRLPOOL fbe44697ae0e7682ca7ec151ad64f66b0d626335518ad5e86dd233fc01c7d7f3e95df0211b9fefe594e3ab5ea962c4145e09d9993de469d7fc7d460cc2b37115
+EBUILD ne-2.5.ebuild 1170 SHA256 3d72c5e4275142f681ccdac4ada8ddb942633d7c21290a459208a6c2256cd746 SHA512 2f7cbc552f3f8850d1b96d55d11da43e13765c6ca5374aff2cfa03bf226a8527a9d233da9bbcd44fde381f0804205645d7162c8f8fae6103dc36054ef4a28c52 WHIRLPOOL 7211ee0e9ff8bb9979761ef80b6121dceb93b94a2dbfe38071288e64b0158e3ed1f5a87c3482430f08478bbc8b392881603c06c0fcc39994ed04db00d17cb091
+MISC ChangeLog 5898 SHA256 17f982a457f57999f807b6c0aa1933f641d8dffe88fcbfd56384d7afaad0ead1 SHA512 e6092d8ff6a3726ef44de09e5791e0fb91ee2e4cec8be4e50a22f2b3634ccadb40a5c3b58caa8343d86a782959f00781729daa6febf87ad5f2047697062a6da9 WHIRLPOOL e5ea3dd5240dc357515605f78c14fe77be391dea6c8b488a3c25c542b650427e0cdcb37941cb5bd6cc26499c4b9ae4e02f6b4cbdfa33113577be5372db477881
+MISC metadata.xml 293 SHA256 c483be5f0624c5c4021d3ba75790cded8036a8ed1c59833b71a0d520f69403a0 SHA512 08f4f6bb9401b5320df5149c8e865b27d3cbbd6fe88d0325561b167291fae7262032a366125fdd48011f82dc0b20daf5852320e26f5205a884bb52293ff90dac WHIRLPOOL f35e33f6f0a90067da2eb979b757ee8cad98aff135188836461145fb01986ee5c748be19868c7a0a6dd24792f87d6af87206438fa8462b77589d7f0c309baa67
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlMfaS4ACgkQCaWpQKGI+9RQEACePAWkoDMeu7VPL7f4PhWX8DFI
-ISQAnRzk+3H2gFI+5r4r6liIaAld5cAr
-=6Wde
+iEYEAREIAAYFAlRQG/4ACgkQVWmRsqeSphMjNwCfeQgX5RazMocluS+5snYnH4TL
+2t4An3WapPaHil/goLysdZQjKZM4b2sd
+=Ajo6
 -----END PGP SIGNATURE-----
diff --git a/app-editors/ne/metadata.xml b/app-editors/ne/metadata.xml
index aba833ed90e0..f3e7ae06bec6 100644
--- a/app-editors/ne/metadata.xml
+++ b/app-editors/ne/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
+<maintainer>
+<email>maintainer-needed@gentoo.org</email>
+</maintainer>
+<use>
+<flag name='tinfo'>Link against libtinfo from sys-libs/ncurses</flag>
+</use>
 </pkgmetadata>
diff --git a/app-editors/ne/ne-2.3.ebuild b/app-editors/ne/ne-2.3.ebuild
index 87f5df6df47e..b71835dd3615 100644
--- a/app-editors/ne/ne-2.3.ebuild
+++ b/app-editors/ne/ne-2.3.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/ne/ne-2.3.ebuild,v 1.5 2012/08/21 06:00:49 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/ne/ne-2.3.ebuild,v 1.6 2014/10/28 22:43:09 jer Exp $
 
 EAPI="2"
 
 inherit eutils toolchain-funcs
 
 DESCRIPTION="the nice editor, easy to use for the beginner and powerful for the wizard"
-HOMEPAGE="http://ne.dsi.unimi.it/"
-SRC_URI="http://ne.dsi.unimi.it/${P}.tar.gz"
+HOMEPAGE="http://ne.di.unimi.it/"
+SRC_URI="http://ne.di.unimi.it/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-editors/ne/ne-2.5.ebuild b/app-editors/ne/ne-2.5.ebuild
index fe6011e02b30..502635bf26db 100644
--- a/app-editors/ne/ne-2.5.ebuild
+++ b/app-editors/ne/ne-2.5.ebuild
@@ -1,37 +1,44 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/ne/ne-2.5.ebuild,v 1.1 2014/01/07 08:37:33 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/ne/ne-2.5.ebuild,v 1.2 2014/10/28 22:43:09 jer Exp $
 
 EAPI=5
-
 inherit eutils toolchain-funcs
 
 DESCRIPTION="the nice editor, easy to use for the beginner and powerful for the wizard"
-HOMEPAGE="http://ne.dsi.unimi.it/"
-SRC_URI="http://ne.dsi.unimi.it/${P}.tar.gz"
+HOMEPAGE="http://ne.di.unimi.it/"
+SRC_URI="${HOMEPAGE}/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
+IUSE=tinfo
 
-RDEPEND=">=sys-libs/ncurses-5.2"
-DEPEND="${RDEPEND}
-	dev-lang/perl"
+RDEPEND="
+	>=sys-libs/ncurses-5.2[tinfo?]
+"
+DEPEND="
+	${RDEPEND}
+	dev-lang/perl
+"
 
 src_prepare() {
 	sed -i -e 's/-O3//' src/makefile || die
 }
 
+src_configure() {
+	if use tinfo; then
+		sed -i -e 's|-lcurses|-ltinfo|g' src/makefile || die
+	else
+		sed -i -e 's|-lcurses|-lncurses|g' src/makefile || die
+	fi
+}
+
 src_compile() {
-	emake \
-		-j1 \
-		-C src \
-		ne \
-		OPTS="${CFLAGS}" \
-		CC="$(tc-getCC)" \
+	emake -C src CC="$(tc-getCC)" \
 		NE_GLOBAL_DIR="/usr/share/ne" \
-		|| die "emake failed"
+		OPTS="${CFLAGS}" \
+		ne || die
 }
 
 src_install() {