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

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

5 files changed, 133 insertions, 9 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/Manifest b/www-client/uzbl/Manifest
index 826c928b4d9c..5707bec2a407 100644
--- a/www-client/uzbl/Manifest
+++ b/www-client/uzbl/Manifest
@@ -1,7 +1,8 @@
 AUX uzbl-9999-makefile-cleanup.patch 2983 RMD160 1016eeb8bc8e4f9bd270d48c60504a80cb4d1dcb SHA1 1036ad6c9db97c3d40bda37acb8675751488af57 SHA256 6792c5661409de1dbb81771b51dae1ace0731ca2bf866c7bd2731d95832c413b
 AUX uzbl-makefile-cleanup.patch 2875 RMD160 e43443d2186020ba20373f240a4a1b0f3a7e0236 SHA1 510578dc221834652fea61a9c68b37650f05a369 SHA256 b60cc33d7e4d2790a7067cd3a21c69731eb16174297cc94c526389cdbf5f56f5
 DIST uzbl-0_pre20091130.tar.gz 131275 RMD160 f5e38a1be15e25c3fe9e12acb5f0c2c45428daa6 SHA1 8b693deec92c9ead53dce2d4f86282a49214008c SHA256 0b09bb22903da53dd04abe0344696d31b3908540249d5d0fa592c36bac79f3f2
+EBUILD uzbl-0_pre20091130-r1.ebuild 2246 RMD160 5bdf7564e147236703ce8391d04d46b2558a775b SHA1 a979485a0edf1376325f7e14082ee68e339b791b SHA256 a0456e2090d4b2313e7063895a7e2d70edd68a5b1a61d080b47b5b8ff430619f
 EBUILD uzbl-0_pre20091130.ebuild 1441 RMD160 7ead02bb2ea5840249f30e942884db89061bbf8b SHA1 f8de04469964f01fc70a223c08261fa44b335efd SHA256 259d990e966acf2525aaec5c6a244793cc2bea22664548ce15f2979fb18e79db
-EBUILD uzbl-9999.ebuild 1402 RMD160 b1f622e6fb9b09b5cfa8934493bb2e967b8f610d SHA1 56d4dc4b8b18660db3f1f3811735c5f56ffcc3f7 SHA256 583fb44cf06711b8c1f6e009215e58bfe7e885a023435665caac1afb0f082b4d
-MISC ChangeLog 1248 RMD160 71780bd8e6ca07d6840c37092923776dbdae0e87 SHA1 3bf36188b4c985dcb99e4c21a6023bfb22b19694 SHA256 4acbad2447619a481bcf265b6a1f54f270c4ee51b868ce25715697bebb724ca1
-MISC metadata.xml 387 RMD160 46473266de1d3f456cb0f97dd527940ac5e7d4c0 SHA1 6ff2bd91a8753503fa38927944c17a442116935d SHA256 9e6f1a092136b7c939fafd83d45eaf32ed7bd36ca14fe541951bf8bfedf93dc6
+EBUILD uzbl-9999.ebuild 2188 RMD160 e028d35c9a2db810f7c440c2a699b86137fc1efc SHA1 c8e663edf03a57dd8d51dd59400493826be850eb SHA256 1d6d0c2202076609f69fc97534847a0fcec4e0c859ea44f01a876eb2cd310cf9
+MISC ChangeLog 1474 RMD160 e3e393023a6a5b6361a22cc5f691f1435665e29d SHA1 0aefda25e7e338568db54b3589ccda892eb2a17f SHA256 5371295b59197924872bf8f8d743bcf42947f9e8661451e1cd819d3ad491607a
+MISC metadata.xml 507 RMD160 60cd39f105f29bac497abebba3966a7db75c70fd SHA1 a67b72d72f0ef3d186c6622918ec680720db5888 SHA256 b532abb6d9c503c8890d76e371fd902de7de0693c442f01f85efaf10b476a535
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/*