version bump. added missing runtime dep, bug #360149

Package-Manager: portage-2.2.0_alpha28/cvs/Linux x86_64

7 files changed, 179 insertions, 10 deletions

diff --git a/www-client/uzbl/ChangeLog b/www-client/uzbl/ChangeLog
index d9fcd3969943..45864ae1bc55 100644
--- a/www-client/uzbl/ChangeLog
+++ b/www-client/uzbl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-client/uzbl
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/ChangeLog,v 1.38 2011/03/21 23:27:16 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/ChangeLog,v 1.39 2011/03/25 13:36:58 wired Exp $
+
+*uzbl-2011.03.17 (25 Mar 2011)
+
+  25 Mar 2011; Alex Alexander <wired@gentoo.org> uzbl-2010.08.05.ebuild,
+  uzbl-2010.11.25.ebuild, uzbl-2011.02.15.ebuild, +uzbl-2011.03.17.ebuild,
+  uzbl-9999.ebuild:
+  version bump. added missing runtime dep, bug #360149
 
   21 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
   uzbl-2010.08.05.ebuild, uzbl-2010.11.25.ebuild, uzbl-2011.02.15.ebuild,
diff --git a/www-client/uzbl/Manifest b/www-client/uzbl/Manifest
index 04f0ceeb683a..0368e79b9153 100644
--- a/www-client/uzbl/Manifest
+++ b/www-client/uzbl/Manifest
@@ -1,10 +1,32 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX uzbl-makefile-docdir.patch 1167 RMD160 c9e4c7c927e6cef4d35ced2af11c723f4998d7f5 SHA1 71dfd176b83d5459f5c9915cf8651c38dec2c459 SHA256 dc0a1ebc7b08c17e63afe60d3db39cc846ca43a5ad01789c07f1d3198153d43a
 DIST uzbl-2010.08.05.tar.gz 136797 RMD160 b1b85855fb5662315ba93122f46ceb1e2ee0caa8 SHA1 c220463871f0eb86d8d83e97c83c6a4509b12598 SHA256 9a04e835990519b039a35a7652672f4235890af86699aafe73a71a3e1dc9971f
 DIST uzbl-2010.11.25.tar.gz 145473 RMD160 b3222fca6879ea348f053658493f2932158290ba SHA1 5ce2f880baa887eb747c85afa0cd425f23f5a563 SHA256 715163193b1c15377a1caaf2e993ef56584e356e6e62e74184b0acdb0c76bbd3
 DIST uzbl-2011.02.15.tar.gz 152648 RMD160 bc337e2c3cf9fd9c9259b9e69803abce0ec28ba8 SHA1 32398680186faccef70cf8b45a6c63a850387705 SHA256 c406eca3dd20dd40b557435c7766ee469378bcb4316d5a83bfa5af366193cd1f
-EBUILD uzbl-2010.08.05.ebuild 3739 RMD160 719fc7235077d10c25c71e19171786f04dbf87d8 SHA1 db0e8cacaed019cee80944f7b1e9c398186cb749 SHA256 71442716489d24a61096e6f97c074176fd84bff2d3f0dd02ec7bd71da76327e5
-EBUILD uzbl-2010.11.25.ebuild 3130 RMD160 3a3110c573c4c767423dce345cfdd5c597de379e SHA1 a5c322fb696135ff664f76b444e1d3c398992d45 SHA256 11e62a0742d391ff4adc67973baa0fef52556f0a3b57d9018df510216e7d081d
-EBUILD uzbl-2011.02.15.ebuild 2979 RMD160 b8666c2e7e4edf897b812dae65c790aa1af643a2 SHA1 6c31bc5897f8326c2a3b4b1dda4b3795868280cf SHA256 7992f53e0d05098d6d27a725e2bb22b42bb0df593d2621bfe77cc155d5392d18
-EBUILD uzbl-9999.ebuild 2816 RMD160 d24a635803879f5dbb5c39b69aa5940488d80ff1 SHA1 720d68e68cbf7dc16e75ea097b061303c671b787 SHA256 3455daf2fa039eeb68276cdf725838449323910f77abb9f01b2d79f50b46707c
-MISC ChangeLog 6770 RMD160 9d11fa85356df395f9724ba3ec4c66fa7c6a810e SHA1 8f2b484462d5493a2c5d80e2553b0cdab30784a9 SHA256 8058c1c95ba3caf98accb5c41c92852b1ba972a045c812a03a2e1cfff0325724
+DIST uzbl-2011.03.17.tar.gz 143726 RMD160 758af2fdb250e71340c2d8385f41346e20a43af1 SHA1 90a0d900a68eeccd6ae095951d05291276573a9c SHA256 b7bfe86c10a232dd9858ab678643d86034ba6ed80c31ec42ac3671b6733232f4
+EBUILD uzbl-2010.08.05.ebuild 3769 RMD160 a4f41559b31b4ae6936683ca8910732238c69a91 SHA1 5d2be0b3a4cd275658e6ed1954774fb8d412796b SHA256 9500c7f509e639bdbe7cd43de97afa43ab8575449e3021223554a07340d078b9
+EBUILD uzbl-2010.11.25.ebuild 3160 RMD160 a1bb14ee844ca5ea048ec5d288df759c5289fa68 SHA1 fcaa758a5e65fa58c19ca4b770874310c49f05f1 SHA256 d596fcc665a2ab4adc105aab4a63609d639e29252c29bbd19662b49dd0d41700
+EBUILD uzbl-2011.02.15.ebuild 3009 RMD160 7646dec1b302f724fc678f09ce39b6aedc001923 SHA1 127925ce1f7a1c2caefc49a4bbe770268b03d88b SHA256 7b43d392a4aec07262106594136acce0c821a9ed4aed33f4d935a263144c1796
+EBUILD uzbl-2011.03.17.ebuild 3009 RMD160 20c3218c61d8fbf6746ca9fb263d91e540b1a881 SHA1 36db388be19d30b23d59088372b468c20c30ef4e SHA256 e090910bf05d4dcf99c2ba938ee3c2141485ec9a85c763798a5b5c131fa967e6
+EBUILD uzbl-9999.ebuild 2846 RMD160 9ec005e9c9a4fb58c1cff7617ddd05f23310d5eb SHA1 fac7f0ec1c00f619f32be1889ce4175f23fa806f SHA256 d17a17c3dd8fb7a6d9cbbda28db72a26650eb4cb3f564a4942a3152184ec437d
+MISC ChangeLog 7023 RMD160 6fd2cff635ec159d3c6473e6ccf6b8b0583872be SHA1 86c6a83fc81dc2b0528356fd25da3b9741bad2e9 SHA256 e372c55d971aeb6750d172175c1a755707354f99806fd7cd5a04ceed1b1dc7a7
 MISC metadata.xml 507 RMD160 60cd39f105f29bac497abebba3966a7db75c70fd SHA1 a67b72d72f0ef3d186c6622918ec680720db5888 SHA256 b532abb6d9c503c8890d76e371fd902de7de0693c442f01f85efaf10b476a535
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCAAGBQJNjJr5AAoJEDZF8K7rm0r6VawP+gMGUWOu+IxjDEqH0IM0KnPQ
+R9qD6T2r6S+ZMJ0ptDW4gSP6G0sgK4/2swxSWUa6O3GY+zD7+5DGB4au+7AeRuL4
+xYvYxPy9Rg87ijpQaCTxBgxS1es+90ZwQj+MVsew7VPtCfSPXvRZA7lfaar2sEh6
+4CMTKcugueO2K6gjuBYfhr/FgFefhH1vjJdWS5fo2g0DNQpLPfg5cD8SkNENpG/N
+2YuLhqgskHANWRmk5m4p1bCsLBE/J0bVOs3dLDA9i0F+WkTKpLOmbl4xaRYc0YDh
+r/KPto8aBNpOpFtS8CMopU/CNzqvoFX3bLhnH6hRAUIlr9WdPOacpngyzmZ3Yuao
+7HojHC62NsYaUfy8UZtVVtj74QLSLRJYYR/dGbkevcSJIMJ58wQowR0JymTL0nw/
+wzxHgB8cGEKLg0fOkYCdVxDmWgbnIFxImd2T/jCXxmZ3kGfsX5gRWysOsn358jxq
+iQB+2ebZ3pvKr1NHsYBzZM961+ECle6fDZU+ojOP46ABYRWna87vpzqyibYoGrQ/
+vE75s8D7BWh/i3AkhHdMrJLH+tfyEL6We7OFgXEMsXO2ceo/E0qcD5uKBjoj54J7
+shcsnPI9fR8+7/OZVK4ZfDifhFKe1YUtG9vzcNsfHpyRxN4hn9GcICz5ux6W15X9
+k1z8yfNttAd7rI71bWyB
+=wJqd
+-----END PGP SIGNATURE-----
diff --git a/www-client/uzbl/uzbl-2010.08.05.ebuild b/www-client/uzbl/uzbl-2010.08.05.ebuild
index be6f539c6e17..a2d21d872ade 100644
--- a/www-client/uzbl/uzbl-2010.08.05.ebuild
+++ b/www-client/uzbl/uzbl-2010.08.05.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-2010.08.05.ebuild,v 1.4 2011/03/21 23:27:16 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-2010.08.05.ebuild,v 1.5 2011/03/25 13:36:58 wired Exp $
 
 EAPI="2"
 
@@ -55,6 +55,9 @@ RDEPEND="
 		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
diff --git a/www-client/uzbl/uzbl-2010.11.25.ebuild b/www-client/uzbl/uzbl-2010.11.25.ebuild
index 5e5a9e59970c..ee5163248c0b 100644
--- a/www-client/uzbl/uzbl-2010.11.25.ebuild
+++ b/www-client/uzbl/uzbl-2010.11.25.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-2010.11.25.ebuild,v 1.2 2011/03/21 23:27:16 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-2010.11.25.ebuild,v 1.3 2011/03/25 13:36:58 wired Exp $
 
 EAPI="2"
 
@@ -56,6 +56,9 @@ RDEPEND="
 		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
diff --git a/www-client/uzbl/uzbl-2011.02.15.ebuild b/www-client/uzbl/uzbl-2011.02.15.ebuild
index 554992ce417f..9543adcd59c4 100644
--- a/www-client/uzbl/uzbl-2011.02.15.ebuild
+++ b/www-client/uzbl/uzbl-2011.02.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-2011.02.15.ebuild,v 1.3 2011/03/21 23:27:16 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-2011.02.15.ebuild,v 1.4 2011/03/25 13:36:58 wired Exp $
 
 EAPI="4"
 
@@ -58,6 +58,9 @@ RDEPEND="
 		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
diff --git a/www-client/uzbl/uzbl-2011.03.17.ebuild b/www-client/uzbl/uzbl-2011.03.17.ebuild
new file mode 100644
index 000000000000..ec189d05580f
--- /dev/null
+++ b/www-client/uzbl/uzbl-2011.03.17.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-2011.03.17.ebuild,v 1.1 2011/03/25 13:36:58 wired Exp $
+
+EAPI="4"
+
+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"
+
+REQUIRED_USE="tabbed? ( browser )"
+
+COMMON_DEPEND="
+	dev-libs/glib:2
+	>=dev-libs/icu-4.0.1
+	>=net-libs/libsoup-2.24:2.4
+	>=net-libs/webkit-gtk-1.1.15:2
+	>=x11-libs/gtk+-2.14:2
+"
+
+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
+		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"
+		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
+	ewarn
+	ewarn "This version introduces some backwards-incompatible changes."
+	ewarn "Please read http://www.uzbl.org/news.php?id=33 for more details."
+	ewarn
+}
+
+src_unpack() {
+	if [[ ${PV} == *9999* ]]; then
+		git_src_unpack
+	else
+		unpack ${A}
+		mv Dieterbe-uzbl-* "${S}"
+	fi
+}
+
+src_prepare() {
+	if [[ ${PV} == *9999* ]]; then
+		git_src_prepare
+	fi
+
+	# remove -ggdb
+	sed -i "s/-ggdb //g" Makefile ||
+		die "-ggdb removal sed 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 1ecd6f4f0286..d0ab63339e02 100644
--- a/www-client/uzbl/uzbl-9999.ebuild
+++ b/www-client/uzbl/uzbl-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.20 2011/03/21 23:27:16 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-9999.ebuild,v 1.21 2011/03/25 13:36:58 wired Exp $
 
 EAPI="4"
 
@@ -58,6 +58,9 @@ RDEPEND="
 		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