added new browser and tabbed USE flags, some new optional dependencies

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

4 files changed, 129 insertions, 6 deletions

diff --git a/www-client/uzbl/ChangeLog b/www-client/uzbl/ChangeLog
index 769a5ce11038..ea20c8ef61ad 100644
--- a/www-client/uzbl/ChangeLog
+++ b/www-client/uzbl/ChangeLog
@@ -1,6 +1,12 @@
 # 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.7 2009/12/05 15:22:22 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/ChangeLog,v 1.8 2009/12/05 16:19:54 wired Exp $
+
+*uzbl-0_pre20091130-r1 (05 Dec 2009)
+
+  05 Dec 2009; Alex Alexander <wired@gentoo.org>
+  +uzbl-0_pre20091130-r1.ebuild, uzbl-9999.ebuild, metadata.xml:
+  added new browser and tabbed USE flags, some new optional dependencies
 
   05 Dec 2009; Alex Alexander <wired@gentoo.org> -uzbl-0_pre20091107.ebuild:
   removed old version
diff --git a/www-client/uzbl/metadata.xml b/www-client/uzbl/metadata.xml
index 82506da1449f..4eed35e218e4 100644
--- a/www-client/uzbl/metadata.xml
+++ b/www-client/uzbl/metadata.xml
@@ -7,8 +7,10 @@
 <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>
 </pkgmetadata>
 
diff --git a/www-client/uzbl/uzbl-0_pre20091130-r1.ebuild b/www-client/uzbl/uzbl-0_pre20091130-r1.ebuild
new file mode 100644
index 000000000000..d6bd84a165c8
--- /dev/null
+++ b/www-client/uzbl/uzbl-0_pre20091130-r1.ebuild
@@ -0,0 +1,91 @@
+# 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.1 2009/12/05 16:19:54 wired Exp $
+
+EAPI="2"
+
+inherit base
+
+MY_PV=${PV/*_pre}
+MY_PV=${MY_PV:0:4}.${MY_PV:4:2}.${MY_PV:6}
+
+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/${MY_PV} -> ${P}.tar.gz"
+
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+browser helpers +tabbed"
+
+COMMON_DEPEND="
+	>=net-libs/webkit-gtk-1.1.15
+	>=net-libs/libsoup-2.24
+	>=x11-libs/gtk+-2.14
+	>=dev-libs/icu-4.0.1
+"
+
+DEPEND="
+	>=dev-util/pkgconfig-0.19
+	${COMMON_DEPEND}
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	helpers? (
+		dev-lang/perl
+		dev-python/pygtk
+		dev-python/pygobject
+		gnome-extra/zenity
+		net-misc/socat
+		x11-libs/pango
+		x11-misc/dmenu
+		x11-misc/xclip
+	)
+"
+
+pkg_setup() {
+	ewarn "Since the helpers are growing into a fine list I've decided"
+	ewarn "to keep them under a single USE flag to avoid a USE hell".
+	ewarn "You can always install the ones you need manually if you don't"
+	ewarn "need them all."
+	ewarn
+
+	if use tabbed && ! use browser; then
+		ewarn "You enabled 'tabbed' but not 'browser' which is required by"
+		ewarn "'tabbed'. uzbl-browser will be installed anyway to fulfill the"
+		ewarn "dependency."
+		ewarn
+	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() {
+	if use tabbed; then
+		emake DESTDIR="${D}" PREFIX="/usr" install || die "Installation failed"
+	else if use browser; then
+			emake DESTDIR="${D}" PREFIX="/usr" install-uzbl-browser || die "Installation failed"
+		else
+			emake DESTDIR="${D}" PREFIX="/usr" install-uzbl-core || die "Installation failed"
+		fi
+	fi
+
+	# Move the docs to /usr/share/doc instead.
+	dodoc AUTHORS README docs/*
+}
diff --git a/www-client/uzbl/uzbl-9999.ebuild b/www-client/uzbl/uzbl-9999.ebuild
index 4bf974c93bc9..6bbeb154d382 100644
--- a/www-client/uzbl/uzbl-9999.ebuild
+++ b/www-client/uzbl/uzbl-9999.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-9999.ebuild,v 1.3 2009/12/04 14:29:05 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-9999.ebuild,v 1.4 2009/12/05 16:19:54 wired Exp $
 
 EAPI="2"
 
@@ -15,7 +15,7 @@ EGIT_REPO_URI="git://github.com/Dieterbe/uzbl.git"
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
 KEYWORDS=""
-IUSE="experimental helpers"
+IUSE="+browser experimental helpers +tabbed"
 
 COMMON_DEPEND="
 	>=net-libs/webkit-gtk-1.1.15
@@ -32,15 +32,32 @@ DEPEND="
 RDEPEND="
 	${COMMON_DEPEND}
 	helpers? (
-		x11-misc/dmenu
+		dev-lang/perl
+		dev-python/pygtk
+		dev-python/pygobject
+		gnome-extra/zenity
 		net-misc/socat
+		x11-libs/pango
+		x11-misc/dmenu
 		x11-misc/xclip
-		gnome-extra/zenity
 	)
 "
 
 pkg_setup() {
 	use experimental && EGIT_BRANCH="experimental"
+
+	ewarn "Since the helpers are growing into a fine list I've decided"
+	ewarn "to keep them under a single USE flag to avoid a USE hell".
+	ewarn "You can always install the ones you need manually if you don't"
+	ewarn "need them all."
+	ewarn
+
+	if use tabbed && ! use browser; then
+		ewarn "You enabled 'tabbed' but not 'browser' which is required by"
+		ewarn "'tabbed'. uzbl-browser will be installed anyway to fulfill the"
+		ewarn "dependency."
+		ewarn
+	fi
 }
 
 src_prepare() {
@@ -60,7 +77,14 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" install || die "Installation failed"
+	if use tabbed; then
+		emake DESTDIR="${D}" PREFIX="/usr" install || die "Installation failed"
+	else if use browser; then
+			emake DESTDIR="${D}" PREFIX="/usr" install-uzbl-browser || die "Installation failed"
+		else
+			emake DESTDIR="${D}" PREFIX="/usr" install-uzbl-core || die "Installation failed"
+		fi
+	fi
 
 	# Move the docs to /usr/share/doc instead.
 	dodoc AUTHORS README docs/*