version bump, live ebuild update, switched to git-2

(Portage version: 2.2.0_alpha46/cvs/Linux x86_64)

4 files changed, 181 insertions, 29 deletions

diff --git a/www-client/uzbl/ChangeLog b/www-client/uzbl/ChangeLog
index e94682a2f48f..8e9fc7348bde 100644
--- a/www-client/uzbl/ChangeLog
+++ b/www-client/uzbl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/uzbl
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/ChangeLog,v 1.40 2011/04/14 21:29:09 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/ChangeLog,v 1.41 2011/07/25 10:05:58 wired Exp $
+
+*uzbl-2011.07.17 (25 Jul 2011)
+
+  25 Jul 2011; Alex Alexander <wired@gentoo.org> +uzbl-2011.07.17.ebuild,
+  uzbl-9999.ebuild, metadata.xml:
+  version bump, live ebuild update, switched to git-2
 
 *uzbl-2011.04.12 (14 Apr 2011)
 
diff --git a/www-client/uzbl/metadata.xml b/www-client/uzbl/metadata.xml
index 4eed35e218e4..979a0eba9944 100644
--- a/www-client/uzbl/metadata.xml
+++ b/www-client/uzbl/metadata.xml
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-<email>wired@gentoo.org</email>
-<name>Alex Alexander</name>
-</maintainer>
-<use>
-	<flag name="browser">Install the uzbl-browser script</flag>
-	<flag name="experimental">Enable experimental branch</flag>
-	<flag name="helpers">Optional tools used by uzbl scripts</flag>
-	<flag name="tabbed">Install the uzbl-tabbed script</flag>
-</use>
+	<herd>no-herd</herd>
+	<maintainer>
+		<email>wired@gentoo.org</email>
+		<name>Alex Alexander</name>
+	</maintainer>
+	<use>
+		<flag name="browser">Install the uzbl-browser script</flag>
+		<flag name="experimental">Enable experimental branch</flag>
+		<flag name="helpers">Optional tools used by uzbl scripts</flag>
+		<flag name="gtk3">Use x11-libs/gtk+:3 instead of x11-libs/gtk+:2</flag>
+		<flag name="tabbed">Install the uzbl-tabbed script</flag>
+	</use>
 </pkgmetadata>
 
diff --git a/www-client/uzbl/uzbl-2011.07.17.ebuild b/www-client/uzbl/uzbl-2011.07.17.ebuild
new file mode 100644
index 000000000000..c95d03699c1f
--- /dev/null
+++ b/www-client/uzbl/uzbl-2011.07.17.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-2011.07.17.ebuild,v 1.1 2011/07/25 10:05:58 wired Exp $
+
+EAPI="4"
+
+IUSE="gtk3"
+if [[ ${PV} == *9999* ]]; then
+	inherit git-2
+	EGIT_REPO_URI=${EGIT_REPO_URI:-"git://github.com/Dieterbe/uzbl.git"}
+	KEYWORDS=""
+	SRC_URI=""
+	IUSE+=" experimental"
+	use experimental &&
+		EGIT_BRANCH="experimental" &&
+		EGIT_COMMIT="experimental"
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="http://github.com/Dieterbe/${PN}/tarball/${PV} -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="Web interface tools which adhere to the unix philosophy."
+HOMEPAGE="http://www.uzbl.org"
+
+LICENSE="LGPL-2.1 MPL-1.1"
+SLOT="0"
+IUSE+=" +browser helpers +tabbed vim-syntax"
+
+REQUIRED_USE="tabbed? ( browser )"
+
+COMMON_DEPEND="
+	dev-libs/glib:2
+	>=dev-libs/icu-4.0.1
+	>=net-libs/libsoup-2.24:2.4
+	!gtk3? (
+		>=net-libs/webkit-gtk-1.1.15:2
+		>=x11-libs/gtk+-2.14:2
+	)
+	gtk3? (
+		net-libs/webkit-gtk:3
+		x11-libs/gtk+:3
+	)
+
+"
+
+DEPEND="
+	>=dev-util/pkgconfig-0.19
+	${COMMON_DEPEND}
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	x11-misc/xdg-utils
+	browser? (
+		x11-misc/xclip
+	)
+	helpers? (
+		dev-python/pygtk
+		dev-python/pygobject
+		gnome-extra/zenity
+		net-misc/socat
+		x11-libs/pango
+		x11-misc/dmenu
+		x11-misc/xclip
+	)
+	tabbed? (
+		dev-python/pygtk
+	)
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+"
+# TODO document what requires the above helpers
+
+pkg_setup() {
+	if ! use helpers; then
+		elog "uzbl's extra scripts use various optional applications:"
+		elog
+		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
+	echo
+	ewarn "There's a window sizing bug in this release. Upstream is deciding on"
+	ewarn "a solution, until then you can work around it by adding"
+	ewarn "  set scrollbars_visible = 1"
+	ewarn "to the bottom of your config file."
+}
+
+src_unpack() {
+	if [[ ${PV} == *9999* ]]; then
+		git-2_src_unpack
+	else
+		unpack ${A}
+		mv Dieterbe-uzbl-* "${S}"
+	fi
+}
+
+src_prepare() {
+	# remove -ggdb
+	sed -i "s/-ggdb //g" Makefile ||
+		die "-ggdb removal sed failed"
+
+	# make gtk3 configurable
+	sed -r "s:^(USE_GTK3) = (.*):\1?=\2:" -i Makefile ||
+		die "Makefile sed for gtk3 failed"
+}
+
+src_compile() {
+	emake USE_GTK3=$(use gtk3 && echo 1 || echo 0)
+}
+
+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" DOCDIR="${D}/usr/share/doc/${PF}" ${targets}
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins "${S}"/extras/vim/ftdetect/uzbl.vim
+
+		insinto /usr/share/vim/vimfiles/syntax
+		doins "${S}"/extras/vim/syntax/uzbl.vim
+	fi
+
+}
diff --git a/www-client/uzbl/uzbl-9999.ebuild b/www-client/uzbl/uzbl-9999.ebuild
index d0ab63339e02..9969176e1ce1 100644
--- a/www-client/uzbl/uzbl-9999.ebuild
+++ b/www-client/uzbl/uzbl-9999.ebuild
@@ -1,18 +1,16 @@
 # Copyright 1999-2011 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.21 2011/03/25 13:36:58 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-9999.ebuild,v 1.22 2011/07/25 10:05:58 wired Exp $
 
 EAPI="4"
 
-inherit base
-
-IUSE=""
+IUSE="gtk3"
 if [[ ${PV} == *9999* ]]; then
-	inherit git
+	inherit git-2
 	EGIT_REPO_URI=${EGIT_REPO_URI:-"git://github.com/Dieterbe/uzbl.git"}
 	KEYWORDS=""
 	SRC_URI=""
-	IUSE="experimental"
+	IUSE+=" experimental"
 	use experimental &&
 		EGIT_BRANCH="experimental" &&
 		EGIT_COMMIT="experimental"
@@ -34,8 +32,15 @@ COMMON_DEPEND="
 	dev-libs/glib:2
 	>=dev-libs/icu-4.0.1
 	>=net-libs/libsoup-2.24:2.4
-	>=net-libs/webkit-gtk-1.1.15:2
-	>=x11-libs/gtk+-2.14:2
+	!gtk3? (
+		>=net-libs/webkit-gtk-1.1.15:2
+		>=x11-libs/gtk+-2.14:2
+	)
+	gtk3? (
+		net-libs/webkit-gtk:3
+		x11-libs/gtk+:3
+	)
+
 "
 
 DEPEND="
@@ -88,7 +93,7 @@ pkg_setup() {
 
 src_unpack() {
 	if [[ ${PV} == *9999* ]]; then
-		git_src_unpack
+		git-2_src_unpack
 	else
 		unpack ${A}
 		mv Dieterbe-uzbl-* "${S}"
@@ -96,13 +101,17 @@ src_unpack() {
 }
 
 src_prepare() {
-	if [[ ${PV} == *9999* ]]; then
-		git_src_prepare
-	fi
-
 	# remove -ggdb
 	sed -i "s/-ggdb //g" Makefile ||
 		die "-ggdb removal sed failed"
+
+	# make gtk3 configurable
+	sed -r "s:^(USE_GTK3) = (.*):\1?=\2:" -i Makefile ||
+		die "Makefile sed for gtk3 failed"
+}
+
+src_compile() {
+	emake USE_GTK3=$(use gtk3 && echo 1 || echo 0)
 }
 
 src_install() {
@@ -110,15 +119,14 @@ src_install() {
 	use browser && targets="${targets} install-uzbl-browser"
 	use browser && use tabbed && targets="${targets} install-uzbl-tabbed"
 
-	emake DESTDIR="${D}" PREFIX="/usr" DOCDIR="${D}/usr/share/doc/${PF}" ${targets} ||
-		die "Installation failed"
+	emake DESTDIR="${D}" PREFIX="/usr" DOCDIR="${D}/usr/share/doc/${PF}" ${targets}
 
 	if use vim-syntax; then
 		insinto /usr/share/vim/vimfiles/ftdetect
-		doins "${S}"/extras/vim/ftdetect/uzbl.vim || die "vim-syntax doins failed"
+		doins "${S}"/extras/vim/ftdetect/uzbl.vim
 
 		insinto /usr/share/vim/vimfiles/syntax
-		doins "${S}"/extras/vim/syntax/uzbl.vim || die "vim-syntax doins failed"
+		doins "${S}"/extras/vim/syntax/uzbl.vim
 	fi
 
 }