uzbl-9999: various improvements, bug #310375. new vim-syntax USE. all versions: changed description

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

5 files changed, 53 insertions, 24 deletions

diff --git a/www-client/uzbl/ChangeLog b/www-client/uzbl/ChangeLog
index 10f9e93b29cf..b198d11de034 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.23 2010/03/15 09:37:38 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/ChangeLog,v 1.24 2010/03/30 17:56:55 wired Exp $
+
+  30 Mar 2010; Alex Alexander <wired@gentoo.org> uzbl-2010.02.02-r1.ebuild,
+  uzbl-2010.03.14.ebuild, uzbl-9999.ebuild:
+  9999: integrated recommendations from bug #310375 together with other
+  ebuild improvements, added vim-syntax USE. all versions: changed
+  description
 
 *uzbl-2010.03.14 (15 Mar 2010)
 
diff --git a/www-client/uzbl/Manifest b/www-client/uzbl/Manifest
index 7726e5c39ce4..638234c1ba9b 100644
--- a/www-client/uzbl/Manifest
+++ b/www-client/uzbl/Manifest
@@ -1,8 +1,8 @@
 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
-EBUILD uzbl-2010.02.02-r1.ebuild 2620 RMD160 8526f896df032a4b1199cdad41821d6a023b384c SHA1 f84fcdf88f6708cab71f608d13de7866ce749973 SHA256 171683741e6762efef6f8cc17fb92a82284d18eb3fb858caabfa58f4ec9149a9
-EBUILD uzbl-2010.03.14.ebuild 2617 RMD160 a704bc432e8b5ba6a15cce6e5a5185aa6c0964c8 SHA1 c6ce3f3d3bc64197cc75b9e07b48235f154bd263 SHA256 3abefdc48863509a464c79e934f4c8590a0f095f38d3a749d518142b3d649267
-EBUILD uzbl-9999.ebuild 2588 RMD160 fb6a7b4c1585c8b861ba81889224a4b8652429e5 SHA1 2e28dd7b91e1ad8d69a8cc9095643d32607c91e1 SHA256 f63d07b55c8d627aca53c2e18af41806d643576fec4e63cbe88dafd51fec74db
-MISC ChangeLog 4572 RMD160 dfce5d4991050415582e40bd544e8b0a6c2bcf64 SHA1 baafb28dc0ef88af76d190f09723be006ae15961 SHA256 1259ad07afea403a2c33104fe56f3948e5beb1dd3c3f1880ba1ec23c7f08ae89
+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
 MISC metadata.xml 507 RMD160 60cd39f105f29bac497abebba3966a7db75c70fd SHA1 a67b72d72f0ef3d186c6622918ec680720db5888 SHA256 b532abb6d9c503c8890d76e371fd902de7de0693c442f01f85efaf10b476a535
diff --git a/www-client/uzbl/uzbl-2010.02.02-r1.ebuild b/www-client/uzbl/uzbl-2010.02.02-r1.ebuild
index 7f8491d71f45..de5796ee2938 100644
--- a/www-client/uzbl/uzbl-2010.02.02-r1.ebuild
+++ b/www-client/uzbl/uzbl-2010.02.02-r1.ebuild
@@ -1,12 +1,12 @@
 # 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-r1.ebuild,v 1.1 2010/03/14 14:37:35 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-2010.02.02-r1.ebuild,v 1.2 2010/03/30 17:56:55 wired Exp $
 
 EAPI="2"
 
 inherit base
 
-DESCRIPTION="A keyboard controlled (modal vim-like bindings, or with modifierkeys) browser based on Webkit."
+DESCRIPTION="Web interface tools which adhere to the unix philosophy."
 HOMEPAGE="http://www.uzbl.org"
 SRC_URI="http://github.com/Dieterbe/${PN}/tarball/${PV} -> ${P}.tar.gz"
 
diff --git a/www-client/uzbl/uzbl-2010.03.14.ebuild b/www-client/uzbl/uzbl-2010.03.14.ebuild
index eb70d8aeba12..1156b90393a0 100644
--- a/www-client/uzbl/uzbl-2010.03.14.ebuild
+++ b/www-client/uzbl/uzbl-2010.03.14.ebuild
@@ -1,12 +1,12 @@
 # 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.03.14.ebuild,v 1.1 2010/03/15 09:37:38 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-2010.03.14.ebuild,v 1.2 2010/03/30 17:56:55 wired Exp $
 
 EAPI="2"
 
 inherit base
 
-DESCRIPTION="A keyboard controlled (modal vim-like bindings, or with modifierkeys) browser based on Webkit."
+DESCRIPTION="Web interface tools which adhere to the unix philosophy."
 HOMEPAGE="http://www.uzbl.org"
 SRC_URI="http://github.com/Dieterbe/${PN}/tarball/${PV} -> ${P}.tar.gz"
 
diff --git a/www-client/uzbl/uzbl-9999.ebuild b/www-client/uzbl/uzbl-9999.ebuild
index 9ed2feab53da..b77b7e5d4186 100644
--- a/www-client/uzbl/uzbl-9999.ebuild
+++ b/www-client/uzbl/uzbl-9999.ebuild
@@ -1,21 +1,31 @@
 # 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.12 2010/03/15 09:37:38 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-9999.ebuild,v 1.13 2010/03/30 17:56:55 wired Exp $
 
 EAPI="2"
 
-inherit base git
-
-DESCRIPTION="A keyboard controlled (modal vim-like bindings, or with modifierkeys) browser based on Webkit."
+inherit base
+
+IUSE=""
+if [[ ${PV} == *9999* ]]; then
+	inherit git
+	EGIT_REPO_URI=${EGIT_REPO_URI:-"git://github.com/Dieterbe/uzbl.git"}
+	SRC_URI=""
+	IUSE="experimental"
+	use experimental &&
+		EGIT_BRANCH="experimental" &&
+		EGIT_COMMIT="experimental"
+else
+	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"
-SRC_URI=""
-
-EGIT_REPO_URI=${EGIT_REPO_URI:-"git://github.com/Dieterbe/uzbl.git"}
 
 LICENSE="LGPL-2.1 MPL-1.1"
 SLOT="0"
 KEYWORDS=""
-IUSE="+browser experimental helpers +tabbed"
+IUSE+=" +browser helpers +tabbed vim-syntax"
 
 COMMON_DEPEND="
 	>=dev-libs/icu-4.0.1
@@ -36,28 +46,27 @@ RDEPEND="
 		x11-misc/xclip
 	)
 	helpers? (
-		dev-lang/perl
-		dev-perl/gtk2-perl
 		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() {
-	use experimental && EGIT_BRANCH="experimental" && EGIT_COMMIT="experimental"
-
 	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 "   dev-python/simplejson"
 		elog "   gnome-extra/zenity"
 		elog "   net-misc/socat"
 		elog "   x11-libs/pango"
@@ -82,7 +91,12 @@ pkg_setup() {
 }
 
 src_prepare() {
-	git_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 ||
@@ -105,4 +119,13 @@ src_install() {
 
 	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
+
 }