version bump

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

3 files changed, 141 insertions, 2 deletions

diff --git a/www-client/uzbl/ChangeLog b/www-client/uzbl/ChangeLog
index 8e9fc7348bde..002b7b9e06b0 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.41 2011/07/25 10:05:58 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/ChangeLog,v 1.42 2011/07/26 08:38:20 wired Exp $
+
+*uzbl-2011.07.25 (26 Jul 2011)
+
+  26 Jul 2011; Alex Alexander <wired@gentoo.org> +uzbl-2011.07.25.ebuild:
+  version bump
 
 *uzbl-2011.07.17 (25 Jul 2011)
 
diff --git a/www-client/uzbl/Manifest b/www-client/uzbl/Manifest
index af9b20d71dc1..3b0d68f0ebcd 100644
--- a/www-client/uzbl/Manifest
+++ b/www-client/uzbl/Manifest
@@ -5,12 +5,14 @@ DIST uzbl-2011.02.15.tar.gz 152648 RMD160 bc337e2c3cf9fd9c9259b9e69803abce0ec28b
 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
 DIST uzbl-2011.07.17.tar.gz 147128 RMD160 277ad0910595dc743b989494c880040564228c09 SHA1 ed51f7d954f04c82396af4753a47dbc5f026f4f7 SHA256 c4d92b4c42b705fcc68f24c8de8496e93464f661ffd51b15a8026d7fa1f047a5
+DIST uzbl-2011.07.25.tar.gz 146851 RMD160 dfb7f5191e65f027e8273c4fb0af8de4cbc9acb9 SHA1 aaabdf9d875bede42ff621fc26ebd6a8e8f41695 SHA256 2e61fa6c62e48d3f13e95a4ea7e7aead65345f6c88a688844ef921685dffe565
 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-2011.07.17.ebuild 3181 RMD160 c1c4d68b7b08f1d0e5d5b7873ab0c3c61bc1b14f SHA1 4358e7746105470a87b1095e6eabcb512026fa08 SHA256 fb201d57f70c61d3cc1a315ba55e50d96824fe415ba1bba71c1425fd8b87a740
+EBUILD uzbl-2011.07.25.ebuild 2950 RMD160 9dc928f8b21b89dbfa17aa98351fd92118e1995f SHA1 b9600a9522bd6f16c1413c1e9729951f31c8eaa7 SHA256 1a21370e26aae68e9eae9d06c9915c58ddeb35ae88ffb8268b5e11eebf9f3b1b
 EBUILD uzbl-9999.ebuild 2945 RMD160 8a3ea37364e97d2dbc7503655bdc9a4ccf6fa18e SHA1 d330fb54227f4cfe50aa654d97f0e15daa1e0905 SHA256 9f3d3079c456b2a857190cfd50367a706a7f23fa4a78fe80c0dc160e492af6f6
-MISC ChangeLog 7340 RMD160 f01951d5eee0a14fbe9b1d82bd79f71e53792231 SHA1 1a822a8eacad438d60f22899ce0c6e8a9a4b78b5 SHA256 34ed154b16ccf3699995bcf18ff200a63ede3ad389f2ef50f3d65129c1d156c1
+MISC ChangeLog 7462 RMD160 167bcd0fd4510599769f223915751290adafc50e SHA1 8a1a47569424828f1777f4b43a49c6b719427762 SHA256 a2e4eaa002e90fc6df76554844f3ed86577e100df90ed9040e554d2d91f32546
 MISC metadata.xml 594 RMD160 f2893a626f5a16e8b07e97d22ef72c83b6065650 SHA1 3d5b2a9470f6c061ff570918352959fbfe0c9b10 SHA256 b98ab82986d2f4552514d9917431c671ed047f0785ee44e1219c7ab55eea763f
diff --git a/www-client/uzbl/uzbl-2011.07.25.ebuild b/www-client/uzbl/uzbl-2011.07.25.ebuild
new file mode 100644
index 000000000000..37e709c7ac34
--- /dev/null
+++ b/www-client/uzbl/uzbl-2011.07.25.ebuild
@@ -0,0 +1,132 @@
+# 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.07.25.ebuild,v 1.1 2011/07/26 08:38:20 wired 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
+	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
+	!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="
+	>=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-2_src_unpack
+	else
+		unpack ${A}
+		mv Dieterbe-uzbl-* "${S}"
+	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="/usr" DOCDIR="${D}/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
+
+}