updated makefile patches to fix -j2+ install issue

Package-Manager: portage-2.2_rc55/cvs/Linux x86_64

4 files changed, 57 insertions, 27 deletions

diff --git a/www-client/uzbl/ChangeLog b/www-client/uzbl/ChangeLog
index 37aeba4b6ad4..6f543a69b099 100644
--- a/www-client/uzbl/ChangeLog
+++ b/www-client/uzbl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/uzbl
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/ChangeLog,v 1.4 2009/12/04 11:38:32 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/ChangeLog,v 1.5 2009/12/04 14:04:04 wired Exp $
+
+  04 Dec 2009; Alex Alexander <wired@gentoo.org>
+  files/uzbl-9999-makefile-cleanup.patch, files/uzbl-makefile-cleanup.patch:
+  updated makefile patches to fix -j2+ install issue
 
   04 Dec 2009; Alex Alexander <wired@gentoo.org> uzbl-0_pre20091107.ebuild,
   uzbl-0_pre20091130.ebuild, uzbl-9999.ebuild:
diff --git a/www-client/uzbl/Manifest b/www-client/uzbl/Manifest
index 3382594eaae1..b28dc6055641 100644
--- a/www-client/uzbl/Manifest
+++ b/www-client/uzbl/Manifest
@@ -1,9 +1,9 @@
-AUX uzbl-9999-makefile-cleanup.patch 2065 RMD160 78087a04cb1392772ccbac7482542af8fb798b84 SHA1 417cdc7d296c3b3ca430b32eb410333717585271 SHA256 3fbc87fc5703d3fe9b429f8fdc045506136899afe0b19a69d44c1e18dff04ad4
-AUX uzbl-makefile-cleanup.patch 2033 RMD160 b1e9fe31d544373529774c71e726c9b0adf8536b SHA1 bff9a2a1acf51a4128e77b0ae25e19f6a918012e SHA256 a9606d5c61919b4d26cb2146e2b857aeb41dfcea328ca3e1f465da8343ef786f
+AUX uzbl-9999-makefile-cleanup.patch 2983 RMD160 1016eeb8bc8e4f9bd270d48c60504a80cb4d1dcb SHA1 1036ad6c9db97c3d40bda37acb8675751488af57 SHA256 6792c5661409de1dbb81771b51dae1ace0731ca2bf866c7bd2731d95832c413b
+AUX uzbl-makefile-cleanup.patch 2875 RMD160 e43443d2186020ba20373f240a4a1b0f3a7e0236 SHA1 510578dc221834652fea61a9c68b37650f05a369 SHA256 b60cc33d7e4d2790a7067cd3a21c69731eb16174297cc94c526389cdbf5f56f5
 DIST uzbl-0_pre20091107.tar.gz 129395 RMD160 d9fcf4f5a36dd027533ac42d97762547ddb44299 SHA1 2f0a6451b09d09f3ce89bf51afca6daf7636bd0b SHA256 a5e11e0689cd0bd2845b53673dac4d69159e36c1265a71e7b764e7dba67b6ee7
 DIST uzbl-0_pre20091130.tar.gz 131275 RMD160 f5e38a1be15e25c3fe9e12acb5f0c2c45428daa6 SHA1 8b693deec92c9ead53dce2d4f86282a49214008c SHA256 0b09bb22903da53dd04abe0344696d31b3908540249d5d0fa592c36bac79f3f2
 EBUILD uzbl-0_pre20091107.ebuild 1441 RMD160 31afcc4c801ab1379ef7eb6f8338862865cbae1c SHA1 0b0c6cb25223dad9e87b621b896d995316000c0f SHA256 52a968e88304da8102a53a325fe9bd7ca8dc9ee2dedca22e7578c146e003da98
 EBUILD uzbl-0_pre20091130.ebuild 1441 RMD160 7ead02bb2ea5840249f30e942884db89061bbf8b SHA1 f8de04469964f01fc70a223c08261fa44b335efd SHA256 259d990e966acf2525aaec5c6a244793cc2bea22664548ce15f2979fb18e79db
 EBUILD uzbl-9999.ebuild 1306 RMD160 5a1bcde4b5463f6d755f7f1fa7b85076a3de21e7 SHA1 e5dbb8f754d7225cae37d37b34c4116d3e51fe53 SHA256 a1fe6ead54b508433d1a2692965d64876b75e11e4a7cb78a0ccd987ad94f94f8
-MISC ChangeLog 813 RMD160 cbbe564907517168735c0415f384f3db7508de81 SHA1 b4a23c6fced73e9b98680f5150505e6d24cd3cb6 SHA256 aaf85376cf1161ac3cc12f562731a6776c45ef33efa1b87801bc2ad4b768e1a8
+MISC ChangeLog 993 RMD160 05a16fcd272307239f968dde7e3eaa0d1f025eea SHA1 46f9b8a2ec6c77dd5f912827aaf0fddf4292ec9d SHA256 08e9040468dd7d95788bae9e52760d30114466fd36d4bce70c66aa5aaf6369c6
 MISC metadata.xml 326 RMD160 5d1339f3972ffe7f7f079c2c1d2ed5a79c8bcd93 SHA1 ec7495900f1f7d5b1f3276ad3478150e48b249cb SHA256 bb1709bb15b6144c36ce533afc6a50a7eb41201174b77a0907ebd0ac1fa8ce4b
diff --git a/www-client/uzbl/files/uzbl-9999-makefile-cleanup.patch b/www-client/uzbl/files/uzbl-9999-makefile-cleanup.patch
index 214912be4868..b9cb61d716f7 100644
--- a/www-client/uzbl/files/uzbl-9999-makefile-cleanup.patch
+++ b/www-client/uzbl/files/uzbl-9999-makefile-cleanup.patch
@@ -1,18 +1,16 @@
---- Makefile.old	2009-11-24 15:20:22.086005098 +0200
-+++ Makefile	2009-11-24 15:44:30.944138916 +0200
-@@ -1,10 +1,8 @@
+--- Makefile.old	2009-12-04 15:52:06.100130674 +0200
++++ Makefile	2009-12-04 15:54:32.143205265 +0200
+@@ -1,7 +1,7 @@
  # first entries are for gnu make, 2nd for BSD make.  see http://lists.uzbl.org/pipermail/uzbl-dev-uzbl.org/2009-July/000177.html
  
 -CFLAGS:=-std=c99 $(shell pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -ggdb -Wall -W -DARCH="\"$(shell uname -m)\"" -lgthread-2.0 -DCOMMIT="\"$(shell git log | head -n1 | sed "s/.* //")\"" $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic -ggdb3
 -CFLAGS!=echo -std=c99 `pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0` -ggdb -Wall -W -DARCH='"\""'`uname -m`'"\""' -lgthread-2.0 -DCOMMIT='"\""'`git log | head -n1 | sed "s/.* //"`'"\""' $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic -ggdb3
-+CFLAGS:=-std=c99 $(shell pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -Wall -W -DARCH="\"$(shell uname -m)\"" -lgthread-2.0 -DCOMMIT="\"$(shell git log | head -n1 | sed "s/.* //")\"" $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic 
++CFLAGS:=-std=c99 $(shell pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -Wall -W -DARCH="\"$(shell uname -m)\"" -lgthread-2.0 -DCOMMIT="\"$(shell uname -m)\"" -lgthread-2.0 -DCOMMIT="\"$(shell git log | head -n1 | sed "s/.* //")\"" $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic 
++CFLAGS!=echo -std=c99 `pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0` -ggdb -Wall -W -DARCH='"\""'`uname -m`'"\""' -lgthread-2.0 -DCOMMIT='"\""'`git log | head -n1 | sed "s/.* //"`'"\""' $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic
  
  LDFLAGS:=$(shell pkg-config --libs gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -pthread $(LDFLAGS)
--LDFLAGS!=echo `pkg-config --libs gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0` -pthread $(LDFLAGS)
- 
- SRC = uzbl-core.c events.c callbacks.c inspector.c
- OBJ = ${SRC:.c=.o}
-@@ -32,10 +30,6 @@
+ LDFLAGS!=echo `pkg-config --libs gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0` -pthread $(LDFLAGS)
+@@ -32,10 +32,6 @@
  	@echo LINKING object files
  	@${CC} -o $@ ${OBJ} ${LDFLAGS}
  	@echo ... done.
@@ -23,9 +21,12 @@
  
  uzbl-browser: uzbl-core
  
-@@ -86,14 +80,10 @@
+@@ -86,18 +82,14 @@
+ 
+ install: install-uzbl-core install-uzbl-browser install-uzbl-tabbed
  
- install-uzbl-core: all
+-install-uzbl-core: all
++install-uzbl-core:
  	install -d $(INSTALLDIR)/bin
 -	install -d $(INSTALLDIR)/share/uzbl/docs
  	install -d $(INSTALLDIR)/share/uzbl/examples
@@ -37,5 +38,17 @@
 -	install -m644 AUTHORS      $(INSTALLDIR)/share/uzbl/docs
 -	install -m644 README       $(INSTALLDIR)/share/uzbl/docs
  
- install-uzbl-browser: all
+-install-uzbl-browser: all
++install-uzbl-browser: install-uzbl-core
  	install -d $(INSTALLDIR)/bin
+ 	install -m755 uzbl-browser $(INSTALLDIR)/bin/uzbl-browser
+ 	install -m755 examples/data/uzbl/scripts/uzbl-cookie-daemon $(INSTALLDIR)/bin/uzbl-cookie-daemon
+@@ -106,7 +98,7 @@
+ 	sed -i "s#^PREFIX = .*#PREFIX = '$(PREFIX)'#" $(INSTALLDIR)/bin/uzbl-event-manager
+ 	sed -i 's#^set prefix.*=.*#set prefix     = $(PREFIX)#' $(INSTALLDIR)/share/uzbl/examples/config/uzbl/config
+ 
+-install-uzbl-tabbed: all
++install-uzbl-tabbed: install-uzbl-browser
+ 	install -d $(INSTALLDIR)/bin
+ 	install -m755 examples/data/uzbl/scripts/uzbl-tabbed $(INSTALLDIR)/bin/uzbl-tabbed
+ 
diff --git a/www-client/uzbl/files/uzbl-makefile-cleanup.patch b/www-client/uzbl/files/uzbl-makefile-cleanup.patch
index 47e34277526c..f46cdb0649e0 100644
--- a/www-client/uzbl/files/uzbl-makefile-cleanup.patch
+++ b/www-client/uzbl/files/uzbl-makefile-cleanup.patch
@@ -1,18 +1,16 @@
---- Makefile.old	2009-11-24 15:20:22.086005098 +0200
-+++ Makefile	2009-11-24 15:44:30.944138916 +0200
-@@ -1,10 +1,8 @@
+--- Makefile.old	2009-12-04 15:52:06.100130674 +0200
++++ Makefile	2009-12-04 15:54:32.143205265 +0200
+@@ -1,7 +1,7 @@
  # first entries are for gnu make, 2nd for BSD make.  see http://lists.uzbl.org/pipermail/uzbl-dev-uzbl.org/2009-July/000177.html
  
 -CFLAGS:=-std=c99 $(shell pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -ggdb -Wall -W -DARCH="\"$(shell uname -m)\"" -lgthread-2.0 -DCOMMIT="\"$(shell git log | head -n1 | sed "s/.* //")\"" $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic -ggdb3
 -CFLAGS!=echo -std=c99 `pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0` -ggdb -Wall -W -DARCH='"\""'`uname -m`'"\""' -lgthread-2.0 -DCOMMIT='"\""'`git log | head -n1 | sed "s/.* //"`'"\""' $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic -ggdb3
 +CFLAGS:=-std=c99 $(shell pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -Wall -W -DARCH="\"$(shell uname -m)\"" -lgthread-2.0 -DCOMMIT="\"uzbl-commit\"" $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic 
++CFLAGS!=echo -std=c99 `pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0` -ggdb -Wall -W -DARCH='"\""'`uname -m`'"\""' -lgthread-2.0 -DCOMMIT='"\"uzbl-commit\""' $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic
  
  LDFLAGS:=$(shell pkg-config --libs gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -pthread $(LDFLAGS)
--LDFLAGS!=echo `pkg-config --libs gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0` -pthread $(LDFLAGS)
- 
- SRC = uzbl-core.c events.c callbacks.c inspector.c
- OBJ = ${SRC:.c=.o}
-@@ -32,10 +30,6 @@
+ LDFLAGS!=echo `pkg-config --libs gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0` -pthread $(LDFLAGS)
+@@ -32,10 +32,6 @@
  	@echo LINKING object files
  	@${CC} -o $@ ${OBJ} ${LDFLAGS}
  	@echo ... done.
@@ -23,9 +21,12 @@
  
  uzbl-browser: uzbl-core
  
-@@ -86,14 +80,10 @@
+@@ -86,18 +82,14 @@
+ 
+ install: install-uzbl-core install-uzbl-browser install-uzbl-tabbed
  
- install-uzbl-core: all
+-install-uzbl-core: all
++install-uzbl-core:
  	install -d $(INSTALLDIR)/bin
 -	install -d $(INSTALLDIR)/share/uzbl/docs
  	install -d $(INSTALLDIR)/share/uzbl/examples
@@ -37,5 +38,17 @@
 -	install -m644 AUTHORS      $(INSTALLDIR)/share/uzbl/docs
 -	install -m644 README       $(INSTALLDIR)/share/uzbl/docs
  
- install-uzbl-browser: all
+-install-uzbl-browser: all
++install-uzbl-browser: install-uzbl-core
  	install -d $(INSTALLDIR)/bin
+ 	install -m755 uzbl-browser $(INSTALLDIR)/bin/uzbl-browser
+ 	install -m755 examples/data/uzbl/scripts/uzbl-cookie-daemon $(INSTALLDIR)/bin/uzbl-cookie-daemon
+@@ -106,7 +98,7 @@
+ 	sed -i "s#^PREFIX = .*#PREFIX = '$(PREFIX)'#" $(INSTALLDIR)/bin/uzbl-event-manager
+ 	sed -i 's#^set prefix.*=.*#set prefix     = $(PREFIX)#' $(INSTALLDIR)/share/uzbl/examples/config/uzbl/config
+ 
+-install-uzbl-tabbed: all
++install-uzbl-tabbed: install-uzbl-browser
+ 	install -d $(INSTALLDIR)/bin
+ 	install -m755 examples/data/uzbl/scripts/uzbl-tabbed $(INSTALLDIR)/bin/uzbl-tabbed
+