Add a patch to fix building lynx in parallel. Closes bug #403905.

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

4 files changed, 167 insertions, 22 deletions

diff --git a/www-client/lynx/ChangeLog b/www-client/lynx/ChangeLog
index 5b7a1234ea19..dd8fa92b2a2a 100644
--- a/www-client/lynx/ChangeLog
+++ b/www-client/lynx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/lynx
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/lynx/ChangeLog,v 1.116 2012/04/27 05:12:03 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/lynx/ChangeLog,v 1.117 2012/04/30 22:19:54 flameeyes Exp $
+
+  30 Apr 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  +files/lynx-2.8.8_pre12-parallel.patch, lynx-2.8.8_pre12.ebuild:
+  Add a patch to fix building lynx in parallel. Closes bug #403905.
 
   27 Apr 2012; Diego E. Pettenò <flameeyes@gentoo.org> lynx-2.8.7_p1.ebuild:
   Use -j1 for the current stable as well.
diff --git a/www-client/lynx/Manifest b/www-client/lynx/Manifest
index ee1a7d51f634..d14b0a7567c5 100644
--- a/www-client/lynx/Manifest
+++ b/www-client/lynx/Manifest
@@ -4,6 +4,7 @@ Hash: SHA1
 AUX lynx-2.8.6-mint.patch 1001 RMD160 11c3a218d0c9b51fa5db9ba644d2da2aae1707bd SHA1 1c631792b0184de69ce8b6e5899b2c4e5224d4ce SHA256 e82ae63b656664563c312c107fff0fe1f1b6c8ae1ec054cad3a2f543f3e7ad96
 AUX lynx-2.8.7-configure-openssl.patch 1222 RMD160 39f979bfad18b63322c91b2dd2762ad9674efd83 SHA1 50a987b46ec1139cf3ee73151b56a41bda04e74c SHA256 1b7e679307a05e92646b9b6ee96f69ddbc5b60d72ad8bd7e3661c07d46abea15
 AUX lynx-2.8.7-include-locale.patch 381 RMD160 25566fffe5f4a0674b5130a44e33facc76252ba6 SHA1 18e9f8e71bbd248e597c7d8755509579c3842c1f SHA256 47bf397918356141dcee2556865032ac75f7ea72252e758246f881785b80992c
+AUX lynx-2.8.8_pre12-parallel.patch 3603 RMD160 5a637f09c74c6d6c9c1a8ebe608d912bcfe9b1f7 SHA1 f4d671d94902618233cddac02a01c9fb44c0cddf SHA256 ea2299193d4b8956d43444e0c95f82152bd42d4477f8a7df3a1fc513cd1cee2c
 DIST lynx2.8.7rel.1.tar.bz2 2432045 RMD160 0969f85b6776c5e426cea4b910271356f9193bf1 SHA1 f5e67a298322b22fe0edcfba326c02eaa5edcb72 SHA256 40ec9774deb4a7acf69e1bcfb5e272a3857ccc17e20d923255d64cb5dbe55dad
 DIST lynx2.8.7rel.2.tar.bz2 2436801 RMD160 553e232aebaa09f88a6a190a1dfe7debb89f0a41 SHA1 a34978f7f83cd46bd857cb957faa5a9120458afa SHA256 301bda96ad3cd5032805e8d5315a42061a11e472e3d3a7baee3a2879517ef627
 DIST lynx2.8.8dev.11.tar.bz2 2539778 RMD160 cb9ec1351c20eaf5f7dbf93fabe91e1795ba2d8e SHA1 bb401b92883248190a196cd697f54120dcd31853 SHA256 f79fa4fa4819cefc1edcb6c75dcd1cb5d76122517b721e0a9e5eca1e88efb503
@@ -11,17 +12,17 @@ DIST lynx2.8.8dev.12.tar.bz2 2539936 RMD160 84be91d54410973dd1a5f9951afcc7ccf00c
 EBUILD lynx-2.8.7_p1.ebuild 3311 RMD160 7f1773a627b6cbac569bcccd8f054cf3368f4a76 SHA1 98380da7ac6fff93d6828f029cc65b573cdae00e SHA256 c74f8e40a7d289b0503fb92d2518207335bf28349c989a9297590b83c4d33402
 EBUILD lynx-2.8.7_p2.ebuild 3097 RMD160 a9231f7380d5cb512c910c5e27e21421c06558a8 SHA1 8a9a1cbb70819848319ae642052db31336ff7fb3 SHA256 735afe1c4d1c2781fe8cfac9bbff08bcae1856e0aac15e41a1fcc9eaa4f0be14
 EBUILD lynx-2.8.8_pre11.ebuild 3355 RMD160 2ab70ef462d1d9500a8c8aefa7c0d3ebaaacb1d2 SHA1 1b45e6d5ea77ab50f2623e4c98df400aba327d2e SHA256 4546eb86fe55d2fe395be24542c771d2e582820f2ede9f66b34b06756a3bd238
-EBUILD lynx-2.8.8_pre12.ebuild 3401 RMD160 886ee5225df116b42a92147921f65334ed334f52 SHA1 54c1d2603a9fa89f4ae0c98c99b657eaa5f7bd1a SHA256 eb6a387dbdac7d952967516d2befc6f1e0ad5431b43dcafbe94bbe7c84278a7d
-MISC ChangeLog 21891 RMD160 6dc59c81e468d4e20f47e464ec8159592d7e163b SHA1 e39d16eb0111e9e60ff0845bd425da042b440d15 SHA256 9064d6a820332a3bfd569d53a85d11bb80e9d2a5e7954b7372b8ee7cd294acf4
+EBUILD lynx-2.8.8_pre12.ebuild 3185 RMD160 c656b4e220ab21dc4b6d232d57a25dcdd272ec0f SHA1 383773a8880996b0c8124ae95d793cc33f1dd102 SHA256 02207983d427a3011666c2a7d7f8cbddb7d9e2152cab608af9fc7e4eb27cb8f1
+MISC ChangeLog 22083 RMD160 9dad85b308ca1280dc9e7f6031c86cf5d40d2f6f SHA1 0577fcba402dedd1068999da9c077cb397a98bba SHA256 84cae675aaec6bc69ddc90b19a8dfa06df3da8c817f1343b5606c2ee3c0594c7
 MISC metadata.xml 476 RMD160 97c626b692123b4a395989fdd7f232e315b5cf57 SHA1 948d63c3fa8e89489c44c2f0758923c80b3870eb SHA256 e15cf3a3747f5e5aaa53bb9042e540370ebc3b09b6bf0b421f5a553dd35b3fa2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPmiqrAAoJEBqCrVe7WSRD0UYH/11B08oDBJVyzCV3OE4C6Hwq
-mSiwd3bOzkcRF4nwJqyY2L6BCdINdg2jWE94t7Bgy2H4oXT+ogjDkimKcutUGzAB
-2gZafG4mSPG8Li7CNROnD4hIPXmhjmhsJZdpxh5z0dquVP91mD+C/Qr1o79lKslD
-u9GlaSyi+vYhJ39oYLvhMUPWmEYoxPyzImxHfoI1zmUMpCQRfXYADgsMQcmJxGwu
-t9eVfTGnB3s8hOrKhNYaC7O/RPVxl0LmD4C5KnWPgdTurBsBP1msEWzxsfiXVhXg
-10QpyHG0UvNEAdwaRbfMEh69XEz+Ok3pIJjPEscxlo6wOAY2udLIcWQuopA8st0=
-=v0/t
+iQEcBAEBAgAGBQJPnxBYAAoJEBzRPIrUMBNCsrkH/Rcu3QUtfjAXarAG7RXz7zo2
+SCXQ4VTPAHW3i7uTdsu0LD04v+P94o34QDrN1/NRC16ZEXDoqfo/MW/N6A1yTZqW
+50wGpYZSrBp2fxUj6erITJNDjEBA5f7GKFvGUfscffceZwrYKun4J27OFTsdq99R
+He8Ts8NOrjWYp7LiBCiLP/YO5yj9myGVu2jeqlQi1HxkZ59DUTDpssjqH9Wgt/Qw
+kPqzPeqIPL78ka8KzSLmvW74IZECVHpM4CUgOotluqz2X7XQHcXvHp+MSLmYpeJg
+yfEU0q+zh4P82neUyqDG7FlQYpVKXxyX/zhqKjin700Oqobny4P38I8eAOA3iNQ=
+=kYWx
 -----END PGP SIGNATURE-----
diff --git a/www-client/lynx/files/lynx-2.8.8_pre12-parallel.patch b/www-client/lynx/files/lynx-2.8.8_pre12-parallel.patch
new file mode 100644
index 000000000000..5eb30b641ef8
--- /dev/null
+++ b/www-client/lynx/files/lynx-2.8.8_pre12-parallel.patch
@@ -0,0 +1,146 @@
+Index: lynx2-8-8/src/makefile.in
+===================================================================
+--- lynx2-8-8.orig/src/makefile.in
++++ lynx2-8-8/src/makefile.in
+@@ -100,7 +100,7 @@ all: lynx$x
+ 	@RULE_CC@
+ 	@ECHO_CC@$(CPP) -C $(CPP_OPTS) $< >$@
+ 
+-lynx$x:   message do_chartrans_stuff $(top_builddir)/LYHelp.h $(OBJS) $(WWWLIB)
++lynx$x:   message $(top_builddir)/LYHelp.h $(OBJS) $(WWWLIB)
+ 	@echo "Linking and creating Lynx executable"
+ 	$(CC) $(CC_OPTS) $(LDFLAGS) -o $@  $(OBJS) $(WWWLIB) $(LDFLAGS) $(LIBS) $(INTLLIB)
+ 	@echo "Copying Lynx executable into top-level directory"
+@@ -111,21 +111,12 @@ lynx$x:   message do_chartrans_stuff $(t
+ message:
+ 	@echo "Compiling Lynx sources"
+ 
+-do_chartrans_stuff:
+-	-cd chrtrans && $(MAKE) \
+-		SITE_DEFS="$(SITE_DEFS)" \
+-		BUILD_CFLAGS="$(BUILD_CFLAGS)" \
+-		BUILD_CPPFLAGS="$(BUILD_CPPFLAGS)" \
+-		BUILD_LDFLAGS="$(BUILD_LDFLAGS)" \
+-		BUILD_LIBS="$(BUILD_LIBS)" \
+-		BUILD_CC="$(BUILD_CC)" tables
+-
+ lint:
+ 	$(LINT) $(LINTOPTS) $(CPP_OPTS) $(C_SRC)  2>&1 |tee $(top_builddir)/lint.lynx
+ 
+ clean:
+ 	rm -f lynx$x core *.core *.leaks *.i *$o *.bak tags TAGS test_*
+-	cd chrtrans && $(MAKE) clean
++	$(MAKE) -C chrtrans clean
+ 
+ tags:
+ 	$(CTAGS) *.[ch]
+@@ -169,9 +160,11 @@ TABLES= \
+  $(CHRTR)cp775_uni.h \
+  $(CHRTR)cp850_uni.h \
+  $(CHRTR)cp852_uni.h \
++ $(CHRTR)cp857_uni.h \
+  $(CHRTR)cp862_uni.h \
+  $(CHRTR)cp864_uni.h \
+  $(CHRTR)cp866_uni.h \
++ $(CHRTR)cp866u_uni.h \
+  $(CHRTR)cp869_uni.h \
+  $(CHRTR)def7_uni.h \
+  $(CHRTR)dmcs_uni.h \
+@@ -186,27 +179,29 @@ TABLES= \
+  $(CHRTR)iso08_uni.h \
+  $(CHRTR)iso09_uni.h \
+  $(CHRTR)iso10_uni.h \
++ $(CHRTR)iso13_uni.h \
++ $(CHRTR)iso14_uni.h \
+  $(CHRTR)iso15_uni.h \
+  $(CHRTR)koi8r_uni.h \
++ $(CHRTR)koi8u_uni.h \
+  $(CHRTR)mac_uni.h \
+  $(CHRTR)mnem_suni.h \
+  $(CHRTR)mnem2_suni.h \
+  $(CHRTR)next_uni.h \
++ $(CHRTR)pt154_uni.h \
+  $(CHRTR)rfc_suni.h \
+  $(CHRTR)utf8_uni.h \
+  $(CHRTR)viscii_uni.h
+ 
+-$(TABLES):
+-	-cd chrtrans && $(MAKE) tables
++$(TABLES): chrtrans/makeuctb$(BUILD_EXEEXT)
++	$(MAKE) -C chrtrans `basename $@`
+ 
+ UCdomap$o :	UCdomap.c \
+ 		chrtrans/UCkd.h \
+-		chrtrans/makeuctb$(BUILD_EXEEXT) \
+-		chrtrans/makeuctb.c \
+-	UCdomap.h $(CMN)UCMap.h $(TABLES) $(top_srcdir)/userdefs.h
++		UCdomap.h $(CMN)UCMap.h $(TABLES) $(top_srcdir)/userdefs.h
+ 
+ chrtrans/makeuctb$(BUILD_EXEEXT):
+-	cd chrtrans; make makeuctb$(BUILD_EXEEXT)
++	$(MAKE) -C chrtrans makeuctb$(BUILD_EXEEXT)
+ 
+ UCAux$o : UCAux.c $(CMN)UCAux.h $(CMN)UCDefs.h
+ LYCookie$o : $(top_srcdir)/userdefs.h
+Index: lynx2-8-8/src/chrtrans/makefile.in
+===================================================================
+--- lynx2-8-8.orig/src/chrtrans/makefile.in
++++ lynx2-8-8/src/chrtrans/makefile.in
+@@ -67,57 +67,8 @@ FONTMAP_INC = iso01_uni.h# default, if n
+ 
+ MAKEUCTB = makeuctb$(BUILD_EXEEXT)
+ 
+-TABLES= \
+- cp1250_uni.h \
+- cp1251_uni.h \
+- cp1252_uni.h \
+- cp1253_uni.h \
+- cp1255_uni.h \
+- cp1256_uni.h \
+- cp1257_uni.h \
+- cp437_uni.h \
+- cp737_uni.h \
+- cp775_uni.h \
+- cp850_uni.h \
+- cp852_uni.h \
+- cp857_uni.h \
+- cp862_uni.h \
+- cp864_uni.h \
+- cp866_uni.h \
+- cp866u_uni.h \
+- cp869_uni.h \
+- def7_uni.h \
+- dmcs_uni.h \
+- hp_uni.h \
+- iso01_uni.h \
+- iso02_uni.h \
+- iso03_uni.h \
+- iso04_uni.h \
+- iso05_uni.h \
+- iso06_uni.h \
+- iso07_uni.h \
+- iso08_uni.h \
+- iso09_uni.h \
+- iso10_uni.h \
+- iso13_uni.h \
+- iso14_uni.h \
+- iso15_uni.h \
+- koi8r_uni.h \
+- koi8u_uni.h \
+- mac_uni.h \
+- mnem2_suni.h \
+- mnem_suni.h \
+- next_uni.h \
+- next_uni.h \
+- pt154_uni.h \
+- rfc_suni.h \
+- utf8_uni.h \
+- viscii_uni.h
+-
+ default: $(FONTMAP_INC)
+ 
+-tables: $(TABLES)
+-
+ OBJS		= makeuctb$o
+ C_SRC		= $(OBJS:$o=.c)
+ 
diff --git a/www-client/lynx/lynx-2.8.8_pre12.ebuild b/www-client/lynx/lynx-2.8.8_pre12.ebuild
index b5d931d80cd1..f7def3049f8f 100644
--- a/www-client/lynx/lynx-2.8.8_pre12.ebuild
+++ b/www-client/lynx/lynx-2.8.8_pre12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/lynx/lynx-2.8.8_pre12.ebuild,v 1.2 2012/04/26 04:49:55 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/lynx/lynx-2.8.8_pre12.ebuild,v 1.3 2012/04/30 22:19:54 flameeyes Exp $
 
 EAPI=4
 
@@ -48,16 +48,10 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# fix up toplevel makefile to enable parallel make (bug #262972)
-	#
-	# add '+' prefix to lines using $(MAKE_RECUR),
-	# making sure '+' comes after leading whitespace
-	sed -i -e '/$(MAKE_RECUR)/ s/\([[:blank:]]\)/\1+/' makefile.in || \
-		die "failed to update makefile.in"
-
 	# fix configure for openssl compiled with kerberos (bug #267749)
 	epatch "${FILESDIR}/lynx-2.8.7-configure-openssl.patch"
 	epatch "${FILESDIR}"/${PN}-2.8.6-mint.patch
+	epatch "${FILESDIR}"/lynx-2.8.8_pre12-parallel.patch
 }
 
 src_configure() {
@@ -98,10 +92,10 @@ src_configure() {
 		$myargs
 }
 
-src_compile() {
-	# see bug #403905
-	emake -j1
-}
+#src_compile() {
+#	# see bug #403905
+#	emake -j1
+#}
 
 src_install() {
 	emake install DESTDIR="${D}"