Version bump. Use vcs-snapshot eclass to unpack release tarballs.

(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)

3 files changed, 133 insertions, 11 deletions

diff --git a/www-client/uzbl/ChangeLog b/www-client/uzbl/ChangeLog
index 49cf6a93d95a..1e3137e48da1 100644
--- a/www-client/uzbl/ChangeLog
+++ b/www-client/uzbl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/uzbl
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/ChangeLog,v 1.49 2012/05/03 06:01:03 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/ChangeLog,v 1.50 2012/08/20 17:12:46 radhermit Exp $
+
+*uzbl-2012.05.14 (20 Aug 2012)
+
+  20 Aug 2012; Tim Harder <radhermit@gentoo.org> +uzbl-2012.05.14.ebuild,
+  uzbl-9999.ebuild:
+  Version bump. Use vcs-snapshot eclass to unpack release tarballs.
 
   03 May 2012; Jeff Horelick <jdhore@gentoo.org> uzbl-2010.08.05.ebuild,
   uzbl-2010.11.25.ebuild, uzbl-2011.02.15.ebuild, uzbl-2011.03.17.ebuild,
diff --git a/www-client/uzbl/uzbl-2012.05.14.ebuild b/www-client/uzbl/uzbl-2012.05.14.ebuild
new file mode 100644
index 000000000000..4028d5f3265b
--- /dev/null
+++ b/www-client/uzbl/uzbl-2012.05.14.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-2012.05.14.ebuild,v 1.1 2012/08/20 17:12:46 radhermit Exp $
+
+EAPI="4"
+
+IUSE="gtk3"
+if [[ ${PV} == *9999* ]]; then
+	inherit git-2
+	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
+	inherit vcs-snapshot
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	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"
+
+REQUIRED_USE="tabbed? ( browser )"
+
+COMMON_DEPEND="
+	dev-libs/glib:2
+	>=dev-libs/icu-4.0.1
+	>=net-libs/libsoup-2.24:2.4
+	!gtk3? (
+		>=net-libs/webkit-gtk-1.1.15:2
+		>=x11-libs/gtk+-2.14:2
+	)
+	gtk3? (
+		net-libs/webkit-gtk:3
+		x11-libs/gtk+:3
+	)
+
+"
+
+DEPEND="
+	virtual/pkgconfig
+	${COMMON_DEPEND}
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	x11-misc/xdg-utils
+	browser? (
+		x11-misc/xclip
+	)
+	helpers? (
+		dev-python/pygtk
+		dev-python/pygobject:2
+		gnome-extra/zenity
+		net-misc/socat
+		x11-libs/pango
+		x11-misc/dmenu
+		x11-misc/xclip
+	)
+	tabbed? (
+		dev-python/pygtk
+	)
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+"
+# TODO document what requires the above helpers
+
+pkg_setup() {
+	if ! use helpers; then
+		elog "uzbl's extra scripts use various optional applications:"
+		elog
+		elog "   dev-python/pygtk"
+		elog "   dev-python/pygobject:2"
+		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
+}
+
+src_prepare() {
+	# remove -ggdb
+	sed -i "s/-ggdb //g" Makefile ||
+		die "-ggdb removal sed failed"
+
+	# make gtk3 configurable
+	sed -r "s:^(USE_GTK3) = (.*):\1?=\2:" -i Makefile ||
+		die "Makefile sed for gtk3 failed"
+}
+
+src_compile() {
+	emake USE_GTK3=$(use gtk3 && echo 1 || echo 0)
+}
+
+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="${EPREFIX}/usr" DOCDIR="${ED}/usr/share/doc/${PF}" ${targets}
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins "${S}"/extras/vim/ftdetect/uzbl.vim
+
+		insinto /usr/share/vim/vimfiles/syntax
+		doins "${S}"/extras/vim/syntax/uzbl.vim
+	fi
+
+}
diff --git a/www-client/uzbl/uzbl-9999.ebuild b/www-client/uzbl/uzbl-9999.ebuild
index b0c7af61fc12..cf328c3e49d0 100644
--- a/www-client/uzbl/uzbl-9999.ebuild
+++ b/www-client/uzbl/uzbl-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.25 2012/05/03 06:01:03 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-9999.ebuild,v 1.26 2012/08/20 17:12:46 radhermit Exp $
 
 EAPI="4"
 
@@ -15,6 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 		EGIT_BRANCH="experimental" &&
 		EGIT_COMMIT="experimental"
 else
+	inherit vcs-snapshot
 	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 	SRC_URI="http://github.com/Dieterbe/${PN}/tarball/${PV} -> ${P}.tar.gz"
 fi
@@ -91,15 +92,6 @@ pkg_setup() {
 	fi
 }
 
-src_unpack() {
-	if [[ ${PV} == *9999* ]]; then
-		git-2_src_unpack
-	else
-		unpack ${A}
-		mv Dieterbe-uzbl-* "${S}"
-	fi
-}
-
 src_prepare() {
 	# remove -ggdb
 	sed -i "s/-ggdb //g" Makefile ||