uzbl-2010.02.02 version bump

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

4 files changed, 145 insertions, 2 deletions

diff --git a/www-client/uzbl/ChangeLog b/www-client/uzbl/ChangeLog
index dc0b7237885f..e32109aee824 100644
--- a/www-client/uzbl/ChangeLog
+++ b/www-client/uzbl/ChangeLog
@@ -1,6 +1,12 @@
 # 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.18 2010/01/27 15:33:08 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/ChangeLog,v 1.19 2010/02/03 09:35:13 wired Exp $
+
+*uzbl-2010.02.02 (03 Feb 2010)
+
+  03 Feb 2010; Alex Alexander <wired@gentoo.org> +uzbl-2010.02.02.ebuild,
+  +files/uzbl-2010.02.02-makefile-cleanup.patch:
+  uzbl-2010.02.02 version bump
 
   27 Jan 2010; Alex Alexander <wired@gentoo.org> uzbl-9999.ebuild,
   files/uzbl-9999-makefile-cleanup.patch:
diff --git a/www-client/uzbl/Manifest b/www-client/uzbl/Manifest
index ca2cb71dddc6..2a88440df400 100644
--- a/www-client/uzbl/Manifest
+++ b/www-client/uzbl/Manifest
@@ -1,7 +1,10 @@
+AUX uzbl-2010.02.02-makefile-cleanup.patch 2049 RMD160 4beb6ee06c5c0bc54f96ad88aa5a9b95cef8802a SHA1 8f5a98b50c3f838096b9b9444e63f39bc6da170b SHA256 121791b6cfb16a3358a9f09ae0dcafbc9a5df70eb3d1fed1894f4881e849a87e
 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
+DIST uzbl-2010.02.02.tar.gz 136063 RMD160 6175ad388d9946a2f02c22bec3d7dd05b7f3f87a SHA1 a24565f554cb15e49e990a381e6f3322eaf4c5c6 SHA256 23b1e7b7b0ce40605e838f2af70cabd7f430a4f4b55f0b7e73a89296c40f2a6a
 EBUILD uzbl-2010.01.05.ebuild 2601 RMD160 8623834b5bdb15b54b085e4d6f6ae2b3a1233004 SHA1 0156e332e1aa974e27d7a4e2e1810ece247201d4 SHA256 44dc0eaca00f0ae5f1b4364a747db5b4b9ba8a3cbc8404397ba3acbd6439f91e
+EBUILD uzbl-2010.02.02.ebuild 2595 RMD160 8b5621f765c84b1a52b80224dfb70083d0cdbbed SHA1 93fbd498bb28414718556dfab6206558b89c4af1 SHA256 94eea1ac4fd2ac4dff1177e39880b8fbb2f01baaa3d27174ec935af9fa95f61d
 EBUILD uzbl-9999.ebuild 2627 RMD160 453b38652a3b6640e7138b5c4b819a496f1f55aa SHA1 06725f2caaabb5c82835ae10ecdc6ea778fb317e SHA256 badd0ccd6d0786d098911565cbb8370ae779087a4e0b9c1a26cf3f95e67d4503
-MISC ChangeLog 3457 RMD160 f357d6a9acd1f4c2b679648dd890234f16411313 SHA1 45aa31b43fc31c44599cb92ceb43e6ece2d65cca SHA256 10537ace84ecbbce6ca95cee328a1d60974a7460867197ded9391dce30aa32dc
+MISC ChangeLog 3644 RMD160 a9a6e33bbc62a8220108b7018e16629c038b7b2b SHA1 3250991e31e78302f59243cb5b6f997e10694ae2 SHA256 a1ce427bf8737f30d8ea8934f48869f65e93f990cfe8efc964f26e61c283890e
 MISC metadata.xml 507 RMD160 60cd39f105f29bac497abebba3966a7db75c70fd SHA1 a67b72d72f0ef3d186c6622918ec680720db5888 SHA256 b532abb6d9c503c8890d76e371fd902de7de0693c442f01f85efaf10b476a535
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
new file mode 100644
index 000000000000..dc1f0a89f057
--- /dev/null
+++ b/www-client/uzbl/files/uzbl-2010.02.02-makefile-cleanup.patch
@@ -0,0 +1,28 @@
+--- 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/uzbl-2010.02.02.ebuild b/www-client/uzbl/uzbl-2010.02.02.ebuild
new file mode 100644
index 000000000000..fb4ce088ad96
--- /dev/null
+++ b/www-client/uzbl/uzbl-2010.02.02.ebuild
@@ -0,0 +1,106 @@
+# 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 $
+
+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}"/"${P}"-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/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"
+}