[uzbl] version bump

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

4 files changed, 146 insertions, 5 deletions

diff --git a/www-client/uzbl/ChangeLog b/www-client/uzbl/ChangeLog
index b198d11de034..f6a3b06f3221 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.24 2010/03/30 17:56:55 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/ChangeLog,v 1.25 2010/04/04 10:12:09 wired Exp $
+
+*uzbl-2010.04.03 (04 Apr 2010)
+
+  04 Apr 2010; Alex Alexander <wired@gentoo.org> +uzbl-2010.04.03.ebuild,
+  uzbl-9999.ebuild:
+  version bump, fix keywords
 
   30 Mar 2010; Alex Alexander <wired@gentoo.org> uzbl-2010.02.02-r1.ebuild,
   uzbl-2010.03.14.ebuild, uzbl-9999.ebuild:
diff --git a/www-client/uzbl/Manifest b/www-client/uzbl/Manifest
index 638234c1ba9b..e73caa400ce0 100644
--- a/www-client/uzbl/Manifest
+++ b/www-client/uzbl/Manifest
@@ -1,8 +1,10 @@
 AUX uzbl-makefile-docdir.patch 1167 RMD160 c9e4c7c927e6cef4d35ced2af11c723f4998d7f5 SHA1 71dfd176b83d5459f5c9915cf8651c38dec2c459 SHA256 dc0a1ebc7b08c17e63afe60d3db39cc846ca43a5ad01789c07f1d3198153d43a
 DIST uzbl-2010.02.02.tar.gz 136063 RMD160 6175ad388d9946a2f02c22bec3d7dd05b7f3f87a SHA1 a24565f554cb15e49e990a381e6f3322eaf4c5c6 SHA256 23b1e7b7b0ce40605e838f2af70cabd7f430a4f4b55f0b7e73a89296c40f2a6a
 DIST uzbl-2010.03.14.tar.gz 142818 RMD160 cf0b6d002111470351e7a065bd331e3f4dd06bc3 SHA1 b26faa5715160bd0aa2b6c82ac25b801ec7bd512 SHA256 6bd65bcb4aeef63f7b21bd910e2fd5ba683d727f4ff20a99d73541a033c61208
+DIST uzbl-2010.04.03.tar.gz 134854 RMD160 00ff7392c58c6092ab921fa489d67949bd0fa2e9 SHA1 17ab43dd9f0212fc74954897b33984bc10138712 SHA256 3aa1412dba013a8db0261b2c0773c94e121aeb98c9d03dce4ea049329f4abacb
 EBUILD uzbl-2010.02.02-r1.ebuild 2582 RMD160 d5032cd1a6b8d06b7687a381bce7830995b2f36e SHA1 438f080aff4e807e68329cf3d00b7db5db09c6c4 SHA256 01fbad87022856d3afd789525966a7517c280e8d50dde892079cd46d1efc4970
 EBUILD uzbl-2010.03.14.ebuild 2579 RMD160 03ec3d867efb50dcb07091eb871467e03d40065d SHA1 c19d72b2e89ec8af80bd83d0906a08c17bbdc01a SHA256 51117015012d41ef172aade5acfc189de68b80371c1490e3fbe04eda6d57cc82
-EBUILD uzbl-9999.ebuild 3193 RMD160 73f0b03c742b673ce734f2c4b0bb04e415408fe8 SHA1 dfd7d26157ad2082cdc6179de4a9dba0d1181f29 SHA256 a27e5751f06d3d0cd5fdeeac7ae89669bb3615c4357eba4c83a4639ee5e70644
-MISC ChangeLog 4846 RMD160 c4f8c9a1a939e0ec6533640751078ea490d31855 SHA1 ca09dbcff3da33436e2bdfaa3e0fba0390ad93a8 SHA256 e645d961ce446cb7b69cdcdb89cb50ead36a6366860804497a386dab2188935e
+EBUILD uzbl-2010.04.03.ebuild 3223 RMD160 0e27f0abf48b0d353ccfb1a4aa2d7e88ffe29c49 SHA1 31db5b9b3088467d57c207a1fa119aeb4c5c164b SHA256 00817e92c304d2f369bd10b10e4e962bfb42bfdd6bb5c0acf1c86ab5854a39eb
+EBUILD uzbl-9999.ebuild 3218 RMD160 01f6b888cce6a8bd8e8058e70da1099544df80e4 SHA1 f20742d535116db9797f8f6f009a697fe98a1440 SHA256 5079ecb25f42fcd1b7d7df061964413104910457143cb218c52c98f980aa437c
+MISC ChangeLog 5002 RMD160 ab4c58868843c4dc5956525697dbe4eae4310dbb SHA1 d03c5029a59a39cb62ac34df4ba96edb4a8f4ae0 SHA256 a0e28544d654cf02b9d27f3d3d50ee2fbad59d4f0d93b1a5b9ab98d620a4273c
 MISC metadata.xml 507 RMD160 60cd39f105f29bac497abebba3966a7db75c70fd SHA1 a67b72d72f0ef3d186c6622918ec680720db5888 SHA256 b532abb6d9c503c8890d76e371fd902de7de0693c442f01f85efaf10b476a535
diff --git a/www-client/uzbl/uzbl-2010.04.03.ebuild b/www-client/uzbl/uzbl-2010.04.03.ebuild
new file mode 100644
index 000000000000..a1bdcef5cf0f
--- /dev/null
+++ b/www-client/uzbl/uzbl-2010.04.03.ebuild
@@ -0,0 +1,132 @@
+# 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.04.03.ebuild,v 1.1 2010/04/04 10:12:09 wired Exp $
+
+EAPI="2"
+
+inherit base
+
+IUSE=""
+if [[ ${PV} == *9999* ]]; then
+	inherit git
+	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"
+
+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-python/pygtk
+		dev-python/pygobject
+		dev-python/simplejson
+		gnome-extra/zenity
+		net-misc/socat
+		x11-libs/pango
+		x11-misc/dmenu
+		x11-misc/xclip
+	)
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+"
+# TODO document what requires the above helpers
+# simplejson - save uzbl_tabbed.py sessions & presets in json.
+
+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 "   dev-python/simplejson"
+		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() {
+	if [[ ${PV} == *9999* ]]; then
+		git_src_prepare
+	else
+		cd "${WORKDIR}"/Dieterbe-uzbl-*
+		S=$(pwd)
+	fi
+
+	# 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" \
+		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" DOCDIR="${D}/usr/share/doc/${PF}" ${targets} ||
+		die "Installation failed"
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins "${S}"/extras/vim/ftdetect/uzbl.vim || die "vim-syntax doins failed"
+
+		insinto /usr/share/vim/vimfiles/syntax
+		doins "${S}"/extras/vim/syntax/uzbl.vim || die "vim-syntax doins failed"
+	fi
+
+}
diff --git a/www-client/uzbl/uzbl-9999.ebuild b/www-client/uzbl/uzbl-9999.ebuild
index b77b7e5d4186..d0ce001a2269 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.13 2010/03/30 17:56:55 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-9999.ebuild,v 1.14 2010/04/04 10:12:09 wired Exp $
 
 EAPI="2"
 
@@ -10,12 +10,14 @@ IUSE=""
 if [[ ${PV} == *9999* ]]; then
 	inherit git
 	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
 
@@ -24,7 +26,6 @@ HOMEPAGE="http://www.uzbl.org"
 
 LICENSE="LGPL-2.1 MPL-1.1"
 SLOT="0"
-KEYWORDS=""
 IUSE+=" +browser helpers +tabbed vim-syntax"
 
 COMMON_DEPEND="