version bump, removed old one

(Portage version: 2.2_rc60/cvs/Linux x86_64)

3 files changed, 17 insertions, 19 deletions

diff --git a/www-client/uzbl/ChangeLog b/www-client/uzbl/ChangeLog
index c1265787f915..527b79c274a5 100644
--- a/www-client/uzbl/ChangeLog
+++ b/www-client/uzbl/ChangeLog
@@ -1,6 +1,13 @@
 # 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.14 2009/12/20 18:26:30 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/ChangeLog,v 1.15 2009/12/23 08:08:28 wired Exp $
+
+*uzbl-0_pre20091222 (23 Dec 2009)
+
+  23 Dec 2009; Alex Alexander <wired@gentoo.org>
+  -uzbl-0_pre20091130-r1.ebuild, +uzbl-0_pre20091222.ebuild,
+  files/uzbl-makefile-cleanup.patch:
+  version bump, removed old one
 
   20 Dec 2009; Alex Alexander <wired@gentoo.org>
   files/uzbl-9999-makefile-cleanup.patch:
diff --git a/www-client/uzbl/files/uzbl-makefile-cleanup.patch b/www-client/uzbl/files/uzbl-makefile-cleanup.patch
index c1a79a1e814f..73561349986d 100644
--- a/www-client/uzbl/files/uzbl-makefile-cleanup.patch
+++ b/www-client/uzbl/files/uzbl-makefile-cleanup.patch
@@ -1,12 +1,12 @@
---- Makefile.old	2009-12-05 19:30:56.450131512 +0200
-+++ Makefile	2009-12-05 19:31:23.960133887 +0200
+--- Makefile.old	2009-12-05 19:22:12.079131232 +0200
++++ Makefile	2009-12-05 19:24:51.863115587 +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
+-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
  
  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)
@@ -21,7 +21,7 @@
  
  uzbl-browser: uzbl-core
  
-@@ -88,14 +84,11 @@
+@@ -88,14 +84,10 @@
  
  install-uzbl-core: all
  	install -d $(INSTALLDIR)/bin
@@ -34,15 +34,6 @@
  	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     = $(PREFIX)#' $(INSTALLDIR)/share/uzbl/examples/config/uzbl/config
+ 	sed -i 's#^set prefix.*=.*#set prefix     = $(RUN_PREFIX)#' $(INSTALLDIR)/share/uzbl/examples/config/uzbl/config
  
  install-uzbl-browser: all
- 	install -d $(INSTALLDIR)/bin
-@@ -104,7 +97,6 @@
- 	install -m755 examples/data/uzbl/scripts/uzbl-event-manager $(INSTALLDIR)/bin/uzbl-event-manager
- 	sed -i 's#^PREFIX=.*#PREFIX=$(PREFIX)#' $(INSTALLDIR)/bin/uzbl-browser
- 	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 -d $(INSTALLDIR)/bin
diff --git a/www-client/uzbl/uzbl-0_pre20091130-r1.ebuild b/www-client/uzbl/uzbl-0_pre20091222.ebuild
index 4501c567845c..884af084a9ff 100644
--- a/www-client/uzbl/uzbl-0_pre20091130-r1.ebuild
+++ b/www-client/uzbl/uzbl-0_pre20091222.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-0_pre20091130-r1.ebuild,v 1.4 2009/12/09 08:02:58 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-0_pre20091222.ebuild,v 1.1 2009/12/23 08:08:28 wired Exp $
 
 EAPI="2"