8 files changed, 59 insertions, 216 deletions
diff --git a/www-client/uzbl/ChangeLog b/www-client/uzbl/ChangeLog
index 348f0b0fffaf..8f550afb1f0f 100644
--- a/www-client/uzbl/ChangeLog
+++ b/www-client/uzbl/ChangeLog
@@ -1,6 +1,16 @@
 # 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.20 2010/02/17 07:17:00 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/ChangeLog,v 1.21 2010/03/14 14:37:35 wired Exp $
+
+*uzbl-2010.02.02-r1 (14 Mar 2010)
+
+  14 Mar 2010; Alex Alexander <wired@gentoo.org> -uzbl-2010.01.05.ebuild,
+  -uzbl-2010.02.02.ebuild, +uzbl-2010.02.02-r1.ebuild,
+  -files/uzbl-2010.02.02-makefile-cleanup.patch, uzbl-9999.ebuild,
+  -files/uzbl-9999-makefile-cleanup.patch,
+  -files/uzbl-makefile-cleanup.patch, +files/uzbl-makefile-docdir.patch:
+  updated makefile patch and sent it upstream - fixes bug #309159. fixed bug
+  309163. removed old version
 
   17 Feb 2010; Alex Alexander <wired@gentoo.org>
   files/uzbl-9999-makefile-cleanup.patch:
diff --git a/www-client/uzbl/files/uzbl-2010.02.02-makefile-cleanup.patch b/www-client/uzbl/files/uzbl-2010.02.02-makefile-cleanup.patch
deleted file mode 100644
index dc1f0a89f057..000000000000
--- a/www-client/uzbl/files/uzbl-2010.02.02-makefile-cleanup.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- Makefile.orig	2010-02-03 11:20:21.616804753 +0200
-+++ Makefile	2010-02-03 11:21:17.385747630 +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 ./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)
-@@ -100,14 +100,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 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/config
- 
- install-uzbl-browser:
diff --git a/www-client/uzbl/files/uzbl-9999-makefile-cleanup.patch b/www-client/uzbl/files/uzbl-9999-makefile-cleanup.patch
deleted file mode 100644
index 129baddd2ead..000000000000
--- a/www-client/uzbl/files/uzbl-9999-makefile-cleanup.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- Makefile.old	2010-02-17 09:13:50.139343494 +0200
-+++ Makefile	2010-02-17 09:15:03.711341985 +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 ./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)
-@@ -100,14 +100,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 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/config
- 
- install-uzbl-browser:
diff --git a/www-client/uzbl/files/uzbl-makefile-cleanup.patch b/www-client/uzbl/files/uzbl-makefile-cleanup.patch
deleted file mode 100644
index 73561349986d..000000000000
--- a/www-client/uzbl/files/uzbl-makefile-cleanup.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- 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 ./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)
-@@ -32,10 +32,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 @@
- 
- 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/
- 	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
- 
- install-uzbl-browser: all
diff --git a/www-client/uzbl/files/uzbl-makefile-docdir.patch b/www-client/uzbl/files/uzbl-makefile-docdir.patch
new file mode 100644
index 000000000000..ae1c4c6e39b8
--- /dev/null
+++ b/www-client/uzbl/files/uzbl-makefile-docdir.patch
@@ -0,0 +1,30 @@
+--- Makefile.orig	2010-03-14 15:31:02.685612392 +0200
++++ Makefile	2010-03-14 15:34:02.224647749 +0200
+@@ -43,6 +43,7 @@
+ # RUN_PREFIX : what the prefix is when the software is run. usually the same as PREFIX
+ PREFIX?=/usr/local
+ INSTALLDIR?=$(DESTDIR)$(PREFIX)
++DOCDIR?=$(INSTALLDIR)/share/uzbl/docs
+ RUN_PREFIX?=$(PREFIX)
+ 
+ # the 'tests' target can never be up to date
+@@ -100,14 +101,14 @@
+ 
+ install-uzbl-core: all
+ 	install -d $(INSTALLDIR)/bin
+-	install -d $(INSTALLDIR)/share/uzbl/docs
++	install -d $(DOCDIR)
+ 	install -d $(INSTALLDIR)/share/uzbl/examples
+-	cp -rp docs         $(INSTALLDIR)/share/uzbl/
+-	cp -rp src/config.h $(INSTALLDIR)/share/uzbl/docs/
++	cp -rp docs/*       $(DOCDIR)/
++	cp -rp src/config.h $(DOCDIR)/
+ 	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
++	install -m644 AUTHORS      $(DOCDIR)
++	install -m644 README       $(DOCDIR)
+ 	sed -i 's#^set prefix.*=.*#set prefix     = $(RUN_PREFIX)#' $(INSTALLDIR)/share/uzbl/examples/config/config
+ 
+ install-uzbl-browser:
diff --git a/www-client/uzbl/uzbl-2010.01.05.ebuild b/www-client/uzbl/uzbl-2010.01.05.ebuild
deleted file mode 100644
index 0abdd5c0ccd1..000000000000
--- a/www-client/uzbl/uzbl-2010.01.05.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# 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-2010.01.05.ebuild,v 1.1 2010/01/05 20:35:59 wired Exp $
-
-EAPI="2"
-
-inherit base
-
-DESCRIPTION="A keyboard controlled (modal vim-like bindings, or with modifierkeys) browser based on Webkit."
-HOMEPAGE="http://www.uzbl.org"
-SRC_URI="http://github.com/Dieterbe/${PN}/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1 MPL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+browser helpers +tabbed"
-
-COMMON_DEPEND="
-	>=dev-libs/icu-4.0.1
-	>=net-libs/libsoup-2.24
-	>=net-libs/webkit-gtk-1.1.15
-	>=x11-libs/gtk+-2.14
-"
-
-DEPEND="
-	>=dev-util/pkgconfig-0.19
-	${COMMON_DEPEND}
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	x11-misc/xdg-utils
-	browser? (
-		x11-misc/xclip
-	)
-	helpers? (
-		dev-lang/perl
-		dev-perl/gtk2-perl
-		dev-python/pygtk
-		dev-python/pygobject
-		gnome-extra/zenity
-		net-misc/socat
-		x11-libs/pango
-		x11-misc/dmenu
-		x11-misc/xclip
-	)
-"
-
-pkg_setup() {
-	if ! use helpers; then
-		elog "uzbl's extra scripts use various optional applications:"
-		elog
-		elog "   dev-lang/perl"
-		elog "   dev-perl/gtk2-perl"
-		elog "   dev-python/pygtk"
-		elog "   dev-python/pygobject"
-		elog "   gnome-extra/zenity"
-		elog "   net-misc/socat"
-		elog "   x11-libs/pango"
-		elog "   x11-misc/dmenu"
-		elog "   x11-misc/xclip"
-		elog
-		elog "Make sure you emerge the ones you need manually."
-		elog "You may also activate the *helpers* USE flag to"
-		elog "install all of them automatically."
-	else
-		einfo "You have enabled the *helpers* USE flag that installs"
-		einfo "various optional applications used by uzbl's extra scripts."
-	fi
-
-	if use tabbed && ! use browser; then
-		ewarn
-		ewarn "You enabled the *tabbed* USE flag but not *browser*."
-		ewarn "*tabbed* depends on *browser*, so it will be disabled."
-		ewarn
-		ebeep 3
-	fi
-}
-
-src_prepare() {
-	cd "${WORKDIR}"/Dieterbe-uzbl-*
-	S=$(pwd)
-
-	# patch Makefile to make it more sane
-	epatch "${FILESDIR}"/"${PN}"-makefile-cleanup.patch
-
-	# adjust path in default config file to /usr/share
-	sed -i "s:/usr/local/share/uzbl:/usr/share/uzbl:g" \
-		examples/config/uzbl/config ||
-		die "config path sed failed"
-}
-
-src_compile() {
-	emake || die "compile failed"
-}
-
-src_install() {
-	local targets="install-uzbl-core"
-	use browser && targets="${targets} install-uzbl-browser"
-	use browser && use tabbed && targets="${targets} install-uzbl-tabbed"
-
-	emake DESTDIR="${D}" PREFIX="/usr" ${targets} || die "Installation failed"
-
-	# Install the docs in /usr/share/doc.
-	dodoc AUTHORS README docs/* || die "docs install failed"
-}
diff --git a/www-client/uzbl/uzbl-2010.02.02.ebuild b/www-client/uzbl/uzbl-2010.02.02-r1.ebuild
index fb4ce088ad96..7f8491d71f45 100644
--- a/www-client/uzbl/uzbl-2010.02.02.ebuild
+++ b/www-client/uzbl/uzbl-2010.02.02-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-2010.02.02.ebuild,v 1.1 2010/02/03 09:35:13 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-2010.02.02-r1.ebuild,v 1.1 2010/03/14 14:37:35 wired Exp $
 
 EAPI="2"
 
@@ -82,7 +82,11 @@ src_prepare() {
 	S=$(pwd)
 
 	# patch Makefile to make it more sane
-	epatch "${FILESDIR}"/"${P}"-makefile-cleanup.patch
+	epatch "${FILESDIR}"/"${PN}"-makefile-docdir.patch
+
+	# remove -ggdb
+	sed -i "s/-ggdb //g" Makefile ||
+		die "-ggdb removal sed failed"
 
 	# adjust path in default config file to /usr/share
 	sed -i "s:/usr/local/share/uzbl:/usr/share/uzbl:g" \
@@ -99,8 +103,6 @@ src_install() {
 	use browser && targets="${targets} install-uzbl-browser"
 	use browser && use tabbed && targets="${targets} install-uzbl-tabbed"
 
-	emake DESTDIR="${D}" PREFIX="/usr" ${targets} || die "Installation failed"
-
-	# Install the docs in /usr/share/doc.
-	dodoc AUTHORS README docs/* || die "docs install failed"
+	emake DESTDIR="${D}" PREFIX="/usr" DOCDIR="${D}/usr/share/doc/${PF}" ${targets} ||
+		die "Installation failed"
 }
diff --git a/www-client/uzbl/uzbl-9999.ebuild b/www-client/uzbl/uzbl-9999.ebuild
index 6e5ce03342bb..f9deec990bf9 100644
--- a/www-client/uzbl/uzbl-9999.ebuild
+++ b/www-client/uzbl/uzbl-9999.ebuild
@@ -1,6 +1,6 @@
 # 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.9 2010/01/27 15:33:08 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-9999.ebuild,v 1.10 2010/03/14 14:37:35 wired Exp $
 
 EAPI="2"
 
@@ -49,7 +49,7 @@ RDEPEND="
 "
 
 pkg_setup() {
-	use experimental && EGIT_BRANCH="experimental"
+	use experimental && EGIT_BRANCH="experimental" && EGIT_COMMIT="experimental"
 
 	if ! use helpers; then
 		elog "uzbl's extra scripts use various optional applications:"
@@ -84,8 +84,12 @@ pkg_setup() {
 src_prepare() {
 	git_src_prepare
 
-	# patch Makefile to make it more sane
-	epatch "${FILESDIR}"/"${P}"-makefile-cleanup.patch
+	# patch Makefile for DOCDIR
+	epatch "${FILESDIR}"/"${PN}"-makefile-docdir.patch
+
+	# remove -ggdb
+	sed -i "s/-ggdb //g" Makefile ||
+		die "-ggdb removal sed failed"
 
 	# adjust path in default config file to /usr/share
 	sed -i "s:/usr/local/share/uzbl:/usr/share/uzbl:g" \
@@ -102,8 +106,6 @@ src_install() {
 	use browser && targets="${targets} install-uzbl-browser"
 	use browser && use tabbed && targets="${targets} install-uzbl-tabbed"
 
-	emake DESTDIR="${D}" PREFIX="/usr" ${targets} || die "Installation failed"
-
-	# Install the docs in /usr/share/doc.
-	dodoc AUTHORS README docs/* || die "docs install failed"
+	emake DESTDIR="${D}" PREFIX="/usr" DOCDIR="${D}/usr/share/doc/${PF}" ${targets} ||
+		die "Installation failed"
 }