fixed live ebuild && patch - bug 302331

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

4 files changed, 26 insertions, 23 deletions

diff --git a/www-client/uzbl/ChangeLog b/www-client/uzbl/ChangeLog
index 550010001594..dc0b7237885f 100644
--- a/www-client/uzbl/ChangeLog
+++ b/www-client/uzbl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/uzbl
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/ChangeLog,v 1.17 2010/01/05 20:35:59 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/ChangeLog,v 1.18 2010/01/27 15:33:08 wired Exp $
+
+  27 Jan 2010; Alex Alexander <wired@gentoo.org> uzbl-9999.ebuild,
+  files/uzbl-9999-makefile-cleanup.patch:
+  fixed live ebuild && patch - bug 302331
 
 *uzbl-2010.01.05 (05 Jan 2010)
 
diff --git a/www-client/uzbl/Manifest b/www-client/uzbl/Manifest
index 1a6f4176ad7f..ca2cb71dddc6 100644
--- a/www-client/uzbl/Manifest
+++ b/www-client/uzbl/Manifest
@@ -1,7 +1,7 @@
-AUX uzbl-9999-makefile-cleanup.patch 2252 RMD160 b15afc7e602c8212e24d0f1ec791cbedf0314581 SHA1 cd3a2eb545e8747e63b6bb8d0f2bbea550ca52de SHA256 c1e7d25c8e2da937a746945c16f19b0bbc9078ea0426004b6ae1a113affba7b1
+AUX uzbl-9999-makefile-cleanup.patch 2229 RMD160 8652d25cefc2291eedb8eace90b5536f01fb8463 SHA1 25053751c14c53badfee0311c05555e59008d553 SHA256 891f90d6e8753c700cd6ad0340d8792fb6b983e8cb4f5c6a572b1910b2f23c76
 AUX uzbl-makefile-cleanup.patch 2252 RMD160 b15afc7e602c8212e24d0f1ec791cbedf0314581 SHA1 cd3a2eb545e8747e63b6bb8d0f2bbea550ca52de SHA256 c1e7d25c8e2da937a746945c16f19b0bbc9078ea0426004b6ae1a113affba7b1
 DIST uzbl-2010.01.05.tar.gz 133875 RMD160 3e65f19c852258fb5e1fad6bf67c430b6e1a9f35 SHA1 c10319ad023f1228ab7b4967637ba146fa1e928b SHA256 0aae5c9994d968b4f4ec7f8f2ce935c25e25d19cabbce27e3ded0672756132c8
 EBUILD uzbl-2010.01.05.ebuild 2601 RMD160 8623834b5bdb15b54b085e4d6f6ae2b3a1233004 SHA1 0156e332e1aa974e27d7a4e2e1810ece247201d4 SHA256 44dc0eaca00f0ae5f1b4364a747db5b4b9ba8a3cbc8404397ba3acbd6439f91e
-EBUILD uzbl-9999.ebuild 2632 RMD160 1d3077f20701d2698670cf2ab7d2bc580ee656f9 SHA1 ad0c05da6fd8acd7a5805b7b196cc9e85528cb41 SHA256 4a0977c5f784bfb8d9db6ba90acfbee5284a81706bc38213a75e7bffbc412e63
-MISC ChangeLog 3305 RMD160 81777d8cc75c447186c49a490d40a7bdd802c846 SHA1 db95db76c8450d0d48623c156bb2837b23e18828 SHA256 2d3a6e8a299f9a97f74903c64aca49250af4612bab3fa6ab44e8392b6f4cfeb5
+EBUILD uzbl-9999.ebuild 2627 RMD160 453b38652a3b6640e7138b5c4b819a496f1f55aa SHA1 06725f2caaabb5c82835ae10ecdc6ea778fb317e SHA256 badd0ccd6d0786d098911565cbb8370ae779087a4e0b9c1a26cf3f95e67d4503
+MISC ChangeLog 3457 RMD160 f357d6a9acd1f4c2b679648dd890234f16411313 SHA1 45aa31b43fc31c44599cb92ceb43e6ece2d65cca SHA256 10537ace84ecbbce6ca95cee328a1d60974a7460867197ded9391dce30aa32dc
 MISC metadata.xml 507 RMD160 60cd39f105f29bac497abebba3966a7db75c70fd SHA1 a67b72d72f0ef3d186c6622918ec680720db5888 SHA256 b532abb6d9c503c8890d76e371fd902de7de0693c442f01f85efaf10b476a535
diff --git a/www-client/uzbl/files/uzbl-9999-makefile-cleanup.patch b/www-client/uzbl/files/uzbl-9999-makefile-cleanup.patch
index 73561349986d..a0cf9506dad3 100644
--- a/www-client/uzbl/files/uzbl-9999-makefile-cleanup.patch
+++ b/www-client/uzbl/files/uzbl-9999-makefile-cleanup.patch
@@ -1,39 +1,38 @@
---- Makefile.old	2009-12-05 19:22:12.079131232 +0200
-+++ Makefile	2009-12-05 19:24:51.863115587 +0200
+--- Makefile.orig	2010-01-27 17:28:15.809737445 +0200
++++ Makefile	2010-01-27 17:28:12.985756931 +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 ./hash.sh)\"" $(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='"\""'`./hash.sh`'"\""' $(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 ./hash.sh)\"" $(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` -Wall -W -DARCH='"\""'`uname -m`'"\""' -lgthread-2.0 -DCOMMIT='"\""'`./hash.sh`'"\""' $(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) -ggdb -Wall -W -DARCH="\"$(shell uname -m)\"" -lgthread-2.0 -DCOMMIT="\"$(shell ./misc/hash.sh)\"" $(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='"\""'`./misc/hash.sh`'"\""' $(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 ./misc/hash.sh)\"" $(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` -Wall -W -DARCH='"\""'`uname -m`'"\""' -lgthread-2.0 -DCOMMIT='"\""'`./misc/hash.sh`'"\""' $(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)
-@@ -32,10 +32,6 @@
+@@ -34,9 +34,6 @@
  	@echo LINKING object files
  	@${CC} -o $@ ${OBJ} ${LDFLAGS}
  	@echo ... done.
 -	@echo Stripping binary
 -	@strip $@
 -	@echo ... done.
--
  
- uzbl-browser: uzbl-core
  
-@@ -88,14 +84,10 @@
+ uzbl-browser: uzbl-core
+@@ -96,14 +93,10 @@
  
  install-uzbl-core: all
  	install -d $(INSTALLDIR)/bin
 -	install -d $(INSTALLDIR)/share/uzbl/docs
  	install -d $(INSTALLDIR)/share/uzbl/examples
--	cp -rp docs     $(INSTALLDIR)/share/uzbl/
--	cp -rp config.h $(INSTALLDIR)/share/uzbl/docs/
-+	cp -rp config.h $(INSTALLDIR)/share/uzbl/
- 	cp -rp examples $(INSTALLDIR)/share/uzbl/
+-	cp -rp docs         $(INSTALLDIR)/share/uzbl/
+-	cp -rp src/config.h $(INSTALLDIR)/share/uzbl/docs/
++	cp -rp src/config.h $(INSTALLDIR)/share/uzbl/
+ 	cp -rp examples     $(INSTALLDIR)/share/uzbl/
  	install -m755 uzbl-core    $(INSTALLDIR)/bin/uzbl-core
 -	install -m644 AUTHORS      $(INSTALLDIR)/share/uzbl/docs
 -	install -m644 README       $(INSTALLDIR)/share/uzbl/docs
- 	sed -i 's#^set prefix.*=.*#set prefix     = $(RUN_PREFIX)#' $(INSTALLDIR)/share/uzbl/examples/config/uzbl/config
+ 	sed -i 's#^set prefix.*=.*#set prefix     = $(RUN_PREFIX)#' $(INSTALLDIR)/share/uzbl/examples/config/config
  
- install-uzbl-browser: all
+ install-uzbl-browser:
diff --git a/www-client/uzbl/uzbl-9999.ebuild b/www-client/uzbl/uzbl-9999.ebuild
index 2993d77de129..6e5ce03342bb 100644
--- a/www-client/uzbl/uzbl-9999.ebuild
+++ b/www-client/uzbl/uzbl-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-9999.ebuild,v 1.8 2009/12/12 10:06:32 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-9999.ebuild,v 1.9 2010/01/27 15:33:08 wired Exp $
 
 EAPI="2"
 
@@ -89,7 +89,7 @@ src_prepare() {
 
 	# adjust path in default config file to /usr/share
 	sed -i "s:/usr/local/share/uzbl:/usr/share/uzbl:g" \
-		examples/config/uzbl/config ||
+		examples/config/config ||
 		die "config path sed failed"
 }