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

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

4 files changed, 49 insertions, 20 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/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
+
 }