version bump

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

3 files changed, 146 insertions, 15 deletions

diff --git a/www-client/uzbl/ChangeLog b/www-client/uzbl/ChangeLog
index 45864ae1bc55..e94682a2f48f 100644
--- a/www-client/uzbl/ChangeLog
+++ b/www-client/uzbl/ChangeLog
@@ -1,6 +1,11 @@
 # 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.39 2011/03/25 13:36:58 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/ChangeLog,v 1.40 2011/04/14 21:29:09 wired Exp $
+
+*uzbl-2011.04.12 (14 Apr 2011)
+
+  14 Apr 2011; Alex Alexander <wired@gentoo.org> +uzbl-2011.04.12.ebuild:
+  version bump
 
 *uzbl-2011.03.17 (25 Mar 2011)
 
diff --git a/www-client/uzbl/Manifest b/www-client/uzbl/Manifest
index 0368e79b9153..b1e8ba42802c 100644
--- a/www-client/uzbl/Manifest
+++ b/www-client/uzbl/Manifest
@@ -6,27 +6,29 @@ DIST uzbl-2010.08.05.tar.gz 136797 RMD160 b1b85855fb5662315ba93122f46ceb1e2ee0ca
 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
 DIST uzbl-2011.03.17.tar.gz 143726 RMD160 758af2fdb250e71340c2d8385f41346e20a43af1 SHA1 90a0d900a68eeccd6ae095951d05291276573a9c SHA256 b7bfe86c10a232dd9858ab678643d86034ba6ed80c31ec42ac3671b6733232f4
+DIST uzbl-2011.04.12.tar.gz 144532 RMD160 01b7c67e48e857c1c9f634fd7778d97366603d94 SHA1 eaadbf0a813dad0e5babfffa06b94bf47c4ff798 SHA256 6d2fb50bf89c94593f258a274f68f44a10d6e1f685dc3f11e1b56282f526d7b5
 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-2011.04.12.ebuild 2851 RMD160 bc6ec4d853bbdb96d45417e1c0c6c97675061432 SHA1 7445f3f9dce2867e0b7c06a4645bc072a66c295b SHA256 e70e127f03064bb7c1efdab4c0335f8080478efba353473eeb9ec692b43c1c08
 EBUILD uzbl-9999.ebuild 2846 RMD160 9ec005e9c9a4fb58c1cff7617ddd05f23310d5eb SHA1 fac7f0ec1c00f619f32be1889ce4175f23fa806f SHA256 d17a17c3dd8fb7a6d9cbbda28db72a26650eb4cb3f564a4942a3152184ec437d
-MISC ChangeLog 7023 RMD160 6fd2cff635ec159d3c6473e6ccf6b8b0583872be SHA1 86c6a83fc81dc2b0528356fd25da3b9741bad2e9 SHA256 e372c55d971aeb6750d172175c1a755707354f99806fd7cd5a04ceed1b1dc7a7
+MISC ChangeLog 7145 RMD160 d9acdb29cd716c205c451a009eef19030a00aea7 SHA1 8aeb906d58ffeeedec5647a37d74fcd70a06867e SHA256 34b37d3d7ca2035184e4ac12fbf78865730a61f8d5041dd9d678d9d4b9c0931e
 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
+iQIcBAEBCAAGBQJNp2eVAAoJEDZF8K7rm0r6iG4P/12Ia3Z2fVGrzSpd8UjpOMJm
+fXQN7ttz1K1ZjqmFCGu+Osk9Gi3ezWQJ3QskCDGqy0qaB0hD++xUP6N6RG4Iywbi
+MAHsSnWvK21TBksH5tSsB0ULziW/pdpup/hZ/aUQJ8ID+0ESE99qvsnWVKmMcUOF
+DX8jF4BQj2x0Lq82wx/SeiejVSTIKKgfCotofmSowv0vHPDxMZ3Y5KHf3ImmwPQ3
+bNWg5uTyDdlPXDZUd3nIRgeIYTyIib2YEmwoOqbolBf/Y/Y1ArZbvIwHuYOXQx9v
+kAKXMtf2W8eiejdbBrs8Y43Cbxrcs/TwWoG0CCffOpNMF24HWAqXQ8ZCP+A/4x6E
+Hn+dxyLuinoE5Eu2iYD1rTZYs1OQgmRjByajnbVqbalffbh8F9wbeO602EIkTBig
+XU5VV43MmeZ/dVsrvpQj1xH3ysSH0jxRMpqKYNtHhFFkMUR6a+GD8++7P4qvkkYM
+PR3IqWVH/6T8BVP64CNG76/9zRBxvdaoNh0hKlbv6jOStYYBdCBvNnTai+8DSfVu
+OsEuSmP+6EdvNVno+7yqgiGnZ8esmdEHTJZiWq1E5a86TicRm8gp3p7rguxGsG4Z
+JehpEtzjiBdnSKJw0lv/4Z+nCpa7Opnxep3FwlDy6WuNzm315FnZvZKyir+6b9Iv
+WCFb2dTrcfSuRgNljdCb
+=NBKS
 -----END PGP SIGNATURE-----
diff --git a/www-client/uzbl/uzbl-2011.04.12.ebuild b/www-client/uzbl/uzbl-2011.04.12.ebuild
new file mode 100644
index 000000000000..e64702b87360
--- /dev/null
+++ b/www-client/uzbl/uzbl-2011.04.12.ebuild
@@ -0,0 +1,124 @@
+# 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.04.12.ebuild,v 1.1 2011/04/14 21:29:09 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
+}
+
+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
+
+}