fixed parallel make issue (bug 461014); added live ebuild as upstream has been fairly active since last release

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x2B6559ED

5 files changed, 230 insertions, 6 deletions

diff --git a/www-client/elinks/ChangeLog b/www-client/elinks/ChangeLog
index 804cd75feace..b946f4b0bb99 100644
--- a/www-client/elinks/ChangeLog
+++ b/www-client/elinks/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-client/elinks
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/ChangeLog,v 1.168 2014/03/09 01:58:04 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/ChangeLog,v 1.169 2014/05/31 04:14:40 axs Exp $
+
+*elinks-9999 (31 May 2014)
+
+  31 May 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org> +elinks-9999.ebuild,
+  +files/elinks-9999-parallel-make.patch, elinks-0.12_pre6.ebuild:
+  fixed parallel make issue (bug 461014); added live ebuild as upstream has been
+  fairly active since last release
 
   09 Mar 2014; Manuel Rüger <mrueg@gentoo.org> -elinks-0.11.7.ebuild,
   -elinks-0.12_pre5-r2.ebuild, -files/elinks-0.10.1-utf_8_io-default.patch,
diff --git a/www-client/elinks/Manifest b/www-client/elinks/Manifest
index 92054c82de6c..f1d43423a783 100644
--- a/www-client/elinks/Manifest
+++ b/www-client/elinks/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX elinks-0.10.4.conf-syscharset.diff 2580 SHA256 3269413843aabff245ee3dce522a475e5b3042adf4676b644a63d323bb77818c SHA512 3b17025054f9cf2ed9934ce5c19859eb50a216a295e6712659c4899c3539e3fc571e6f289809ad2d07be44330b96107a8dd65754c23f978bd54def28a24b88b3 WHIRLPOOL 230294ec39cec90ae84fd23644bcdadb97de8635eb794b4baf8e93d0b0fc2932f7b54ee25f6c4e49166aa4e296ab05f5588561fcab56867bb3caee0b9ab9db16
 AUX elinks-0.11.2-lua-5.1.patch 538 SHA256 d931af4db13b53be32def17417d86ee916511209ce9a54f25d017ee2d24473d4 SHA512 48aca9662b3d9b43ba027d2328acdafe6363f3e2a69e6f2a6d468718c28f12de6247c629273a11aef0b053010a7b7250c03db39fab1cb4cd6d237bd1c69fccef WHIRLPOOL 4f84c457ed14a2d7414edbe374623e5295aa9ee8aa71403d386a46b499143a97d1dc78ff5d8951d602f8d60cefc648f79ed02038267cb58ae79ba062e68d1e34
 AUX elinks-0.11.5-makefile.patch 1109 SHA256 5b37be9328b80b9a995de94cf0a053ad63d43a2e0550df6e0c5a4cdc94276e1f SHA512 f26ccefcc4ed3e9fe2e7e7de3d89479a25fe3bc823a489fc38df3fda0f5d784111500b69d42083e7f741466b4c33a549545c59ceec9311903c9d5e440e890103 WHIRLPOOL 9dfd3aea78b3aeafce69d6c0b2599ad46ca7cd2bd9bcb8d55f181b291411dc54f6f98a0eb71b4cfa2c92f33620bdfe15982536f350c7fdd724d7790e95c1e913
@@ -5,9 +8,18 @@ AUX elinks-0.12_pre5-compilation-fix.patch 464 SHA256 984c3e1127c18eb0925fbe1cca
 AUX elinks-0.12_pre5-ruby-1.9.patch 7131 SHA256 4274a6434c42b669fbee9e75a79bd02c33d50472bbb8e1c2ea441b3d2eae20de SHA512 41f8b34f9666740fbadffc4e47467670c7766f3b8612933a08cc6febe975f9453c21c393a43927c11ffe7ef6e0875ef09e125c80e84caa9f0917f864cb1d35e6 WHIRLPOOL 691d259ea49b1a859680b245a383fcf1da79626e848fb35489bdfa787c0fe0c99405610a10a03dbdde7847a838e8ac060c37136b8f71ce73751449afd7b293fa
 AUX elinks-0.12_pre5-sm185-jsval-fixes.patch 3921 SHA256 d59f9e97f5d495803e0ac35726bf42592a8f726c2367fbc08b8fe9de79de4a2f SHA512 62a96d53b529c409d81094899c75cd7943176628e2b7301a005c6ebf9f660e813fbf1f3df213c43148d425e933208f761090b23b6ae75da93a93b13a1e924a34 WHIRLPOOL 03ae46d5a9497ac81db5cca364aa6cda4bfb3dc5864482e11778dfef752ae4c76a374026fafa3e2507c9626c528b483bd68a3277647b4c200de95197507fefa5
 AUX elinks-0.12pre5-spidermonkey-callback.patch 513 SHA256 14b65ba92e8693105945d20de6e8f07ec946f17fbbf5248b4f8c431a92b88982 SHA512 81a2397b90531db291526fed738fd3661362c3d20c4bc330f909375cea3779f32f4286c8c43700bf7c19d6eb177e97acb3c32f15abba052651ee5b947f3bec43 WHIRLPOOL 224e95b0f09c61de04c1b6e9845a56ca94ee5c99fb90a7c9e57800c1cede50658091d7b1b3a7aec5a0bad9b7eff2e5ca4a1f7a107381bf8208b08e1624661f3d
+AUX elinks-9999-parallel-make.patch 1620 SHA256 f9eb07dedc6a08a4ffb3f592422313563e14a486a635a306016658168221bb2d SHA512 bdd612c1ce226115170e97d70519b5ec4816d8469e0cd31ec66000b603c92913645f2b57eca9f030b90af811e43db5647928d27f7bc3a8c06560be40a8063248 WHIRLPOOL 9a0e336bf1dc43632aae15d06921f83235acf53a3cb2ec617d8a14c504050c9a7985e0f9cd30db9ea77e18abde4f934ed0d1a698b8b267df946cddb8147a9751
 DIST elinks-0.10.4.conf.bz2 5370 SHA256 cb0fcd10cc592697de5d8d9358447a770d2b4613b17b629c0f0e05965baa6209 SHA512 defdc743d78f9620eac60f4cfc1c07ecc6d18d1d771899b6eec184bea818d612ef110219127284a5b7c53ca07746fc90fbeb97344b3aef7f1f894ed839443296 WHIRLPOOL c6dd65a281a0f48461ddac18e9981c029acd4906a294a02cfcf40429a18b443dee92a7c3317e704dc61fb519df3fa80da14c49a3f138640e223b64372669aa3a
 DIST elinks-0.12_pre5-js185-patches.tar.bz2 13820 SHA256 64f7c4a657128983d054bd0d2027e11facd42fcc86bd8dfdf5b27ffbacbd54c8 SHA512 1552aeacdecb0a2db357402e0474d6b4810c767609d1d399b3350a4bcdc21ba9c0bde5a5d0bffd1d7b27d41ac46e3e85ae2527d715a1645a2dd51ab14b8eab3c WHIRLPOOL e6f7746407cd6654c19d4bc71dc4d0fd63070a78f7bc7c43f11f6e388268de963748597b0a2fd03cd22632651800b990ec0819d54799be9bfc4589332e11dbdd
 DIST elinks-0.12pre6.tar.bz2 2854500 SHA256 383646375b8a325bef5a132c8300caab90eb0b842c5f8eff68febc00e29acada SHA512 bff70faafea7c4739695a7fad8f659109894b318588f5a035a5594a6053238789259ce6067c2f5cb97448f138db143adebb23f84bf689bea209ba37573484b7f WHIRLPOOL 2501e7ed557dfcc5ca4175bda3452d8c1dc42c2db2f18a0263373b6f28966619e3b3c75b0ed3d9cb4e04d177bd5d88ecdedda541531adfcd35b6ef4fe4920ed1
-EBUILD elinks-0.12_pre6.ebuild 6189 SHA256 8f2ce27aacc6dfbd94f4f8cfc650dfac4856e850609f50977d520e7f36ced031 SHA512 3a2d21c92772ceaa1bd4b4248c355c893fdb999615a489f3215ece21f3ddafdd1f605865428227259a489dabe509c6c1055495baedae61bbc088a0e5aebd681f WHIRLPOOL edcccb005dff8d7fd79738dafe09da6a996923df1d9e5f598a969a08f9d1e71dde204141177a6a15a4aff57f4f96faa6001e7c5e4e5fb28afbbf6875d16c1cac
-MISC ChangeLog 30920 SHA256 db267de8f9f6cc095be780c05884c86164ce1b3e5c76c1b55f81761bd7eba66d SHA512 58136ae14b074a1cc89d69541cf9ad2590e6a5ec217f52a8e01197480dc09e4b1ad9365190d4e40e9e002585cffc6e9c854d0dc32289e620d4fc94252f26963e WHIRLPOOL 77e0fd63145d7f358e25d50934f53c556bd7b3bbfe4c7ccca7b769cd1d942ce4f75b2b1da2bcba597f0766671a17ee4f5a0b2e113573261ff54b02c826f09b87
+EBUILD elinks-0.12_pre6.ebuild 6222 SHA256 379a9cebde48a221374a7d081fa37f6b1c4b81885f9362ae4c46c32b9a3e0b31 SHA512 6d68540f0df74e2f4b6167447a723f81bb8ab32c23239613393df55b369e1055520f88cbd83c4803d7734c8be1c0320d6b18c744e5e5c91a56afe5a3e6a08f68 WHIRLPOOL 9724be39fbb0895ab1161b815fbbbe28d3594d72f7c51068ccaa44b4eab0e35536d0580530b994c2c0c1fc89138594a5f44ac7073d4a85ae5aed8aec8493036c
+EBUILD elinks-9999.ebuild 4500 SHA256 23a52e67b18e7ce755d179182c0211534519b5b80259be0d30962f383b5cda51 SHA512 5f722e5928e72feaa6d5e8e2ec331419b497d3bee49e7a44ea9f6d88cc99c8633218ab27712f1a69ac2319e5943a52e3bd4d138724e5eaa3a62ff05e3061ca13 WHIRLPOOL 6045ec7bc5f6ff327668323760f85e75374e7bb021775ed1299e3a9399ae22006233d648827ee8679d9c7b6029d1d0e08d982f10764d2c2d5c50dd0313ecbe43
+MISC ChangeLog 31208 SHA256 8897e7ce49a2b026091f2b8efa5f4ec80e29e02035c51cbd7b54685a06045d3d SHA512 2c3571f311e8451c1688953d0baf0dad34fbd217d0ec3270c017b8a01068effdaab9e171030b7acf5eb550c2fca048215b873707b90650bdd2fd828a77edd5c3 WHIRLPOOL fa8220cf6df8681cd197ed74697602f548e061cd351ddcf32a209f5877c5d8a28a39862d99fc2a71bcf444dbd30d2ccb35fb37d562ee2b6cee099bd8dff3d5f7
 MISC metadata.xml 560 SHA256 c9444eeabf96024bf89154a702cec6d045b248a7b308024f95d03ed763254277 SHA512 d0b24df9ea2cf09a4ca008e598550d4667aa4ae979ff8e7a58757fbbb0b416452c5a1969360210f98a88a434f5e3b6579bbaaf38fe902a065264d47aff5e0245 WHIRLPOOL c6309741a6a3db47cacdaacde04c3ae0d90cdf3d63766274ffd52d84a06635dad58d1244e93f497a3c028fcdd6d6ef105890a3d603cf6f4c86fcd1c6efae43f9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iF4EAREIAAYFAlOJVzgACgkQ2ugaI38ACPC9bgD/UL/j5yOjKVxbTGaJcyL5utit
+AnAFwg+DmmwkjYFq/YcA/RSsjI9mqe6D0wvrdTg9gKkLDJoiPZ5OiuETs8H0zDDE
+=DuDc
+-----END PGP SIGNATURE-----
diff --git a/www-client/elinks/elinks-0.12_pre6.ebuild b/www-client/elinks/elinks-0.12_pre6.ebuild
index e39ecacc6363..e871b4c98307 100644
--- a/www-client/elinks/elinks-0.12_pre6.ebuild
+++ b/www-client/elinks/elinks-0.12_pre6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/elinks-0.12_pre6.ebuild,v 1.10 2014/01/30 12:04:21 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/elinks-0.12_pre6.ebuild,v 1.11 2014/05/31 04:14:40 axs Exp $
 
 EAPI=4
 inherit eutils autotools flag-o-matic
@@ -51,7 +51,7 @@ src_prepare() {
 		epatch "${FILESDIR}"/${PN}-0.11.2-lua-5.1.patch
 	fi
 
-	epatch "${FILESDIR}"/${PN}-0.11.5-makefile.patch
+	epatch "${FILESDIR}"/${PN}-9999-parallel-make.patch
 	epatch "${FILESDIR}"/${PN}-0.12_pre5-compilation-fix.patch
 
 	if use javascript ; then
@@ -141,8 +141,12 @@ src_configure() {
 		${myconf}
 }
 
+src_compile() {
+	emake V=1
+}
+
 src_install() {
-	emake DESTDIR="${D}" install
+	emake V=1 DESTDIR="${D}" install
 
 	insopts -m 644 ; insinto /etc/elinks
 	doins "${WORKDIR}"/elinks.conf
diff --git a/www-client/elinks/elinks-9999.ebuild b/www-client/elinks/elinks-9999.ebuild
new file mode 100644
index 000000000000..4c0f2c0890db
--- /dev/null
+++ b/www-client/elinks/elinks-9999.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/elinks-9999.ebuild,v 1.1 2014/05/31 04:14:40 axs Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_{6,7} )
+PYTHON_REQ_USE="threads"
+inherit autotools eutils git-r3 flag-o-matic python-any-r1
+
+EGIT_REPO_URI="git://repo.or.cz/elinks.git"
+
+MY_P="${P/_/}"
+DESCRIPTION="Advanced and well-established text-mode web browser"
+HOMEPAGE="http://elinks.or.cz/"
+SRC_URI="http://dev.gentoo.org/~spock/portage/distfiles/elinks-0.10.4.conf.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="bittorrent bzip2 debug finger ftp gopher gpm guile idn ipv6 \
+	  javascript lua +mouse nls nntp perl ruby samba ssl unicode X zlib"
+RESTRICT="test"
+
+DEPEND="dev-libs/boehm-gc
+	>=dev-libs/expat-1.95.4
+	bzip2? ( >=app-arch/bzip2-1.0.2 )
+	ssl? ( >=dev-libs/openssl-0.9.6g )
+	X? ( x11-libs/libX11 x11-libs/libXt )
+	zlib? ( >=sys-libs/zlib-1.1.4 )
+	lua? ( >=dev-lang/lua-5 )
+	gpm? ( >=sys-libs/ncurses-5.2 >=sys-libs/gpm-1.20.0-r5 )
+	guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated,discouraged] )
+	idn? ( net-dns/libidn )
+	perl? ( sys-devel/libperl )
+	ruby? ( dev-lang/ruby dev-ruby/rubygems )
+	samba? ( net-fs/samba )
+	javascript? ( >=dev-lang/spidermonkey-1.8.5:0= )"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	default
+	git-r3_src_unpack
+}
+
+src_prepare() {
+	mv "${WORKDIR}/${PN}-0.10.4.conf" "${WORKDIR}/${PN}.conf"
+	if ! use ftp ; then
+		sed -i -e 's/\(.*protocol.ftp.*\)/# \1/' "${WORKDIR}"/${PN}.conf
+	fi
+	sed -i -e 's/\(.*set protocol.ftp.use_epsv.*\)/# \1/' "${WORKDIR}"/${PN}.conf
+	epatch "${FILESDIR}"/${P}-parallel-make.patch
+
+	epatch_user
+
+	# Regenerate acinclude.m4 - based on autogen.sh.
+	cat > acinclude.m4 <<- _EOF
+		dnl Automatically generated from config/m4/ files.
+		dnl Do not modify!
+	_EOF
+	cat config/m4/*.m4 >> acinclude.m4
+	sed -i -e 's/-Werror//' configure*
+
+	eautoreconf
+}
+
+src_configure() {
+	# NOTE about GNUTSL SSL support (from the README -- 25/12/2002)
+	# As GNUTLS is not yet 100% stable and its support in ELinks is not so well
+	# tested yet, it's recommended for users to give a strong preference to OpenSSL whenever possible.
+	local myconf=""
+
+	if use debug ; then
+		myconf="--enable-debug"
+	else
+		myconf="--enable-fastmem"
+	fi
+
+	if use ssl ; then
+		myconf="${myconf} --with-openssl=${EPREFIX}/usr"
+	else
+		myconf="${myconf} --without-openssl --without-gnutls"
+	fi
+
+	econf \
+		--sysconfdir="${EPREFIX}"/etc/elinks \
+		--enable-leds \
+		--enable-88-colors \
+		--enable-256-colors \
+		--enable-true-color \
+		--enable-html-highlight \
+		$(use_with gpm) \
+		$(use_with zlib) \
+		$(use_with bzip2 bzlib) \
+		$(use_with X x) \
+		$(use_with lua) \
+		$(use_with guile) \
+		$(use_with perl) \
+		$(use_with ruby) \
+		$(use_with idn) \
+		$(use_with javascript spidermonkey) \
+		$(use_enable bittorrent) \
+		$(use_enable nls) \
+		$(use_enable ipv6) \
+		$(use_enable ftp) \
+		$(use_enable gopher) \
+		$(use_enable nntp) \
+		$(use_enable finger) \
+		$(use_enable samba smb) \
+		$(use_enable mouse) \
+		${myconf}
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_install() {
+	emake V=1 DESTDIR="${D}" install
+
+	insopts -m 644 ; insinto /etc/elinks
+	doins "${WORKDIR}"/elinks.conf
+	newins contrib/keybind-full.conf keybind-full.sample
+	newins contrib/keybind.conf keybind.conf.sample
+
+	dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README SITES THANKS TODO doc/*.*
+	docinto contrib ; dodoc contrib/{README,colws.diff,elinks[-.]vim*}
+	insinto /usr/share/doc/${PF}/contrib/lua ; doins contrib/lua/{*.lua,elinks-remote}
+	insinto /usr/share/doc/${PF}/contrib/conv ; doins contrib/conv/*.*
+	insinto /usr/share/doc/${PF}/contrib/guile ; doins contrib/guile/*.scm
+
+	# Remove some conflicting files on OSX.  The files provided by OSX 10.4
+	# are more or less the same.  -- Fabian Groffen (2005-06-30)
+	rm -f "${ED}"/usr/share/locale/locale.alias "${ED}"/usr/lib/charset.alias || die
+}
+
+pkg_postinst() {
+	einfo "This ebuild provides a default config for ELinks."
+	einfo "Please check /etc/elinks/elinks.conf"
+	einfo
+	einfo "You may want to convert your html.cfg and links.cfg of"
+	einfo "Links or older ELinks versions to the new ELinks elinks.conf"
+	einfo "using /usr/share/doc/${PF}/contrib/conv/conf-links2elinks.pl"
+	einfo
+	einfo "Please have a look at /etc/elinks/keybind-full.sample and"
+	einfo "/etc/elinks/keybind.conf.sample for some bindings examples."
+	einfo
+	einfo "You will have to set your TERM variable to 'xterm-256color'"
+	einfo "to be able to use 256 colors in elinks."
+	echo
+}
diff --git a/www-client/elinks/files/elinks-9999-parallel-make.patch b/www-client/elinks/files/elinks-9999-parallel-make.patch
new file mode 100644
index 000000000000..86aea5588a2f
--- /dev/null
+++ b/www-client/elinks/files/elinks-9999-parallel-make.patch
@@ -0,0 +1,51 @@
+--- a/Makefile.lib	2014-05-30 13:45:11.756422117 -0400
++++ b/Makefile.lib	2014-05-30 13:47:22.626423230 -0400
+@@ -117,7 +117,7 @@
+  $(sort $(filter-out $(LIB_O_NAME),$(OBJS))) \
+  $(foreach subdir,$(sort $(SUBDIRS)),$(wildcard $(subdir)/$(LIB_O_NAME)))
+ 
+-$(LIB_O_NAME): $(LIB_O_DEPS)
++$(LIB_O_NAME): all-recursive.built $(LIB_O_DEPS)
+ 	$(call cmd,ld_objs)
+ 
+ DEP_FILES_1 = $(foreach src,$(OBJS),.deps/$(src))
+@@ -260,21 +260,36 @@
+ # remaining subdirectories, but return an error at the end.
+ $(RULES_REC):
+ ifneq (,$(findstring k,$(MAKEFLAGS)))
+-	@suberr=0; \
++	@+suberr=0; \
+ 	$(foreach subdir,$(sort $(SUBDIRS)), \
+ 		$(call ncmd,recmake,$(subdir),$(subst -recursive,,$@)) || suberr=1;) \
+ 	exit $$suberr
+ else
+-	@$(foreach subdir,$(sort $(SUBDIRS)), \
++	@+$(foreach subdir,$(sort $(SUBDIRS)), \
+ 		$(call ncmd,recmake,$(subdir),$(subst -recursive,,$@)) || exit 1;)
+ endif
+ 
++all-recursive.built:
++ifneq (,$(findstring k,$(MAKEFLAGS)))
++	@+suberr=0; \
++	$(foreach subdir,$(sort $(SUBDIRS)), \
++		$(call ncmd,recmake,$(subdir),$(subst -recursive.built,,$@)) || suberr=1;) \
++	[ $$suberr == 0 ] && touch $@; \
++	exit $$suberr
++else
++	@+$(foreach subdir,$(sort $(SUBDIRS)), \
++		$(call ncmd,recmake,$(subdir),$(subst -recursive.built,,$@)) || exit 1;) \
++	touch $@
++endif
++
++CLEAN += all-recursive.built
++
+ # Dummy -local rules
+ $(RULES_LOCAL):
+ 
+ # Default deps
+ rule_deps = $(1)-recursive $(1)-default $(1)-local
+-all:	  $(call rule_deps,all)
++all:	  $(subst recursive,recursive.built,$(call rule_deps,all))
+ install:  $(call rule_deps,install)
+ clean:	  $(call rule_deps,clean)
+ cleanall: $(call rule_deps,cleanall)