version bump, bug 388761

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

3 files changed, 141 insertions, 12 deletions

diff --git a/www-client/uzbl/ChangeLog b/www-client/uzbl/ChangeLog
index 2480a93e5cab..091754970482 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.45 2011/10/24 06:43:25 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/ChangeLog,v 1.46 2011/10/30 22:47:01 wired Exp $
+
+*uzbl-2011.10.01 (30 Oct 2011)
+
+  30 Oct 2011; Alex Alexander <wired@gentoo.org> +uzbl-2011.10.01.ebuild:
+  version bump, bug 388761
 
   24 Oct 2011; Alexandre Rostovtsev <tetromino@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 d5dd64652b3b..23b0a9e22f79 100644
--- a/www-client/uzbl/Manifest
+++ b/www-client/uzbl/Manifest
@@ -1,6 +1,3 @@
------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
@@ -9,6 +6,7 @@ DIST uzbl-2011.03.17.tar.gz 143726 RMD160 758af2fdb250e71340c2d8385f41346e20a43a
 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
+DIST uzbl-2011.10.01.tar.gz 148483 RMD160 ee87377b771b476fe8fc0fbc1460b503257c05a4 SHA1 3aae247dbb6bba0bdc1145920ff116038212799c SHA256 fd72ea7e3246e904b451cda8339a1aab2fcd259ec07ec82aa0c9affe6084c2fe
 EBUILD uzbl-2010.08.05.ebuild 3777 RMD160 80049783f907b52a7f4029381de3f37c7f9f0b27 SHA1 c723c02cb9080281c99ff9eda1568fa4e7843a31 SHA256 6913b9bc1c6a981c51ef0bfcd2671ca980e094b4f41c735604d20a62e6826cb0
 EBUILD uzbl-2010.11.25.ebuild 3168 RMD160 6e2e4073e5ebaa93d35b846b5d8624aa331f2bdb SHA1 e3135e06a6741e842c9c96793faee999b39c2fe1 SHA256 c2f91f24e7e8f9b0f9db9e42ba33a4c751e21bede25c19ef1baae25f5ecf6b0a
 EBUILD uzbl-2011.02.15.ebuild 3017 RMD160 09d7c7a4afc60b7e82f68a8054540c85c94516af SHA1 71aa0ca6d258ea5d25fa7e540dccd723373e3bde SHA256 08d32fbe9bc75ea80905cb9c6ef4a73dfddddcb31602157a65479349bed3fa75
@@ -16,13 +14,7 @@ EBUILD uzbl-2011.03.17.ebuild 3017 RMD160 43fa74112f0ddf006413873d9d51ac50884da3
 EBUILD uzbl-2011.04.12.ebuild 2857 RMD160 42945ea42cb9aacd2c29a5d1bd3762a75e54cf82 SHA1 2d1b435dfcf6bf367713b5c85dfa75f3cbe77320 SHA256 1fa9cbf2973732b476b27c53809f4e2c87a7e487b1fbe9e7a9ee01d8fe25646b
 EBUILD uzbl-2011.07.17.ebuild 3189 RMD160 d04cdc1a9e6f9420b225302779392f904496fcd0 SHA1 c7536a69f76becb15d97c913d554073df299f4ac SHA256 6cae9b00dfdc4f6d7103060fbfa84707988b4bebf8129b7b363355c24102492d
 EBUILD uzbl-2011.07.25.ebuild 2958 RMD160 8d017ab9a315633d62f265e6b7068356a5aab683 SHA1 80d2d1a7ab775da8c503a4d3f56e5cc86b127705 SHA256 3d87b00915c3814af861551fa18213e74c01840ef4483ba1ed61f5d9ce85f809
+EBUILD uzbl-2011.10.01.ebuild 2954 RMD160 5b7050aa1bd2e19b8fa00f801907bf697ca4a078 SHA1 461cc0b6fdb5f6c29fd65136d1c3e9cefac88f72 SHA256 2c0a787528ffee9ba6da1c8c166ec1433a3cdb33f0e8c71abbbb11010b4eda81
 EBUILD uzbl-9999.ebuild 2953 RMD160 6a6bfd82bb2985469cfeb7862ae493689aef1281 SHA1 81d8575023b06d62e862b3cfaf7796280f76209d SHA256 cceb11d54426a4064be95acb5c64b4aa206292dc714c72a44a277cb89b289455
-MISC ChangeLog 7968 RMD160 0203bd1aea2a2d788a727e6c859a4187c85e17c1 SHA1 444e58da30570ce65bd19857a07fa26753489d6f SHA256 08f3b7b860229aaa90f094fce768172441bb09272013485bb1f41a12007b86a5
+MISC ChangeLog 8098 RMD160 2852db8b549f2c6266ed9a7564c8f9a5d0a29cc5 SHA1 1fb39a072a8d6074fca1e2933d302ea0e3bcef62 SHA256 98fcf7f98d2e3f6d810416865dae78c343bff9411fed8a3e7d9b8c81c83b9e04
 MISC metadata.xml 572 RMD160 06a4e98fa6b8f85086513986be822820b8991603 SHA1 c334ea84cfa5a1fe319cf5ac9745c5f15dca293a SHA256 9a43de4d92bafbf6aa80a678425f3c5c044ec0b7ddef9180e9a457e4bec58026
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iF4EAREIAAYFAk6lCRMACgkQdjK8w9WeBnDnyAEArvms7zvHFc/M5T7DzQAO/Ek+
-ca/KWFllNHwPcmCau7MA/3zO0mdcBQSazbFGepC0r98VdwpqCaoiXqPRRBWr/D1V
-=kv07
------END PGP SIGNATURE-----
diff --git a/www-client/uzbl/uzbl-2011.10.01.ebuild b/www-client/uzbl/uzbl-2011.10.01.ebuild
new file mode 100644
index 000000000000..408abb0819c5
--- /dev/null
+++ b/www-client/uzbl/uzbl-2011.10.01.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.10.01.ebuild,v 1.1 2011/10/30 22:47:01 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: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_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
+
+}