version bump, added glib to deps

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

4 files changed, 157 insertions, 18 deletions

diff --git a/www-client/uzbl/ChangeLog b/www-client/uzbl/ChangeLog
index 6bccd8624254..2b94998880af 100644
--- a/www-client/uzbl/ChangeLog
+++ b/www-client/uzbl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/uzbl
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/ChangeLog,v 1.34 2010/11/19 07:54:38 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/ChangeLog,v 1.35 2010/12/05 22:26:37 wired Exp $
+
+*uzbl-2010.11.25 (05 Dec 2010)
+
+  05 Dec 2010; Alex Alexander <wired@gentoo.org> +uzbl-2010.11.25.ebuild,
+  uzbl-9999.ebuild:
+  version bump, added glib to deps
 
   19 Nov 2010; Alex Alexander <wired@gentoo.org> -uzbl-2010.02.02-r1.ebuild,
   -uzbl-2010.03.14.ebuild, -uzbl-2010.04.03.ebuild:
diff --git a/www-client/uzbl/Manifest b/www-client/uzbl/Manifest
index 0b3cd5669aad..d3cf4213a74b 100644
--- a/www-client/uzbl/Manifest
+++ b/www-client/uzbl/Manifest
@@ -3,24 +3,26 @@ 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
 EBUILD uzbl-2010.08.05.ebuild 3733 RMD160 da9f72460a8716df2cce61d444c3cdc2fafe7517 SHA1 efdc308c91373351a7d83d91e013106441bbcd59 SHA256 42da49fbe7742ec845f70fdbfef50dcf74169572f1ffc784e3eb2d7b104def93
-EBUILD uzbl-9999.ebuild 3097 RMD160 07268bff2a35b2845872090f8c6e2a9db9ccf699 SHA1 cb190b4ace3633696e553a80f48dcc0c9cd64565 SHA256 31a0bb31d6ab22b63fb2a877e6378786935231c2de776a9a5823a2a005cc8e96
-MISC ChangeLog 6133 RMD160 244d94b1e70bf5466737663acd31401a7ba8a4d9 SHA1 8736df5f8f2514e19c3b028887aea4c2cc712f64 SHA256 36060f44fcd5025f12d92318ef277b23f37e71fc27392383d4b6859a4fe5b8e8
+EBUILD uzbl-2010.11.25.ebuild 3119 RMD160 098278cb4fb1899386817fd57f2ef475b58c5ecd SHA1 e7be0ff56b140d18122409bf419f00cae2551a79 SHA256 20eeeae4f1b25415b0e0ebe55ac4819e77c8eea1d4be8eeeaf0764844bbd512d
+EBUILD uzbl-9999.ebuild 3114 RMD160 112102293417eab0aafb3ae8859e8eb625d3af51 SHA1 533821a870b299f5ffd50e5f4b0c3ddd7f84e25f SHA256 8f6536192af781f4c83b1949c6e668cd07d05bdd3221a0ee21eafa3c496854db
+MISC ChangeLog 6295 RMD160 8096a77861c96ba9d51b568184732b86be2a7865 SHA1 0003e65be1edf4f7d5e07655f1df9879128a550f SHA256 5ac4367559d01cbeb55f9b73185cf6573d03bf7c0f37b76865b7531d8f5889f3
 MISC metadata.xml 507 RMD160 60cd39f105f29bac497abebba3966a7db75c70fd SHA1 a67b72d72f0ef3d186c6622918ec680720db5888 SHA256 b532abb6d9c503c8890d76e371fd902de7de0693c442f01f85efaf10b476a535
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.12 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQIcBAEBCAAGBQJM5i1XAAoJEDZF8K7rm0r6Y8YQAKQWkYeuuvaXChlsHbJOa4kG
-QFIrMXwdZ4EHN/9X4KbDLkfJUCcwgD5Z5t501EuV8WamHDUhF+qWYmy2xKreYBig
-PIcdMOqn/6bx4vF3afnXdw+firI4tRuLygHajzZZ+v96SEjbO0SK4B0V0JmFtI8O
-65EAWTXknQ6ovC7MsPWGjQoOo49BZEclOrs/vjgaLDfHflzs9uxMk4mN+Gy/iKzd
-gigq0WmcS/CuKmKGLfv+GDciMzVAQs1K3l0NVWFpFPar1tuIYw2Q9muWHHEmylgv
-z1s4GYdShgSmSNC8SLhnJLY65oHEaVqRowO3Ji+fJCEbKY1kOMZu/EuDMaAixrkK
-Qcar+5L4RUbb/LanEH6i95XWDYvSg2xvArmK28EZxIHgrKkPGwZqzKIuGUzEiktA
-tAk7m8UpBiytYSMsR+F9mR87bCOXckhm5/ngTojWW49tXj6gbCk7EPTBTSqwBLxc
-dcMqJKn2nCV2tjod41LT6NHL7yn3uPECqlSYhWjx0xD1sg3z0xXBCAWRWV3H/XhU
-vcDJQ0fXlAzUv16InSStuV7Avj/kQxSvT/CCAfiLpdyC3N5hYqroR86GdVJq8VJQ
-DGoKeuuSktJO4FlvJXPC04MKa5EsAN98r8O1HifJxJYbFvDUOGvlbiubeSNRqx7J
-Oyt/qpTNddxghN7BlK4N
-=+cR0
+iQIcBAEBCAAGBQJM/BHwAAoJEDZF8K7rm0r66AcQAJt25kzns8rt2jjwf8sRDHjq
+XdmE290I5dn2o/6WkMFwqMLXPNZIRnjj1snukdwVeBi/CLUvUxLnpnqFCMMgvJa7
+UsXvV2+XAw15aWWZ5r3Pdw4hPrqY7mDAg2boVb4Cgvb+FkBqkUEfUpbVAj58Auop
+Yq+QHMc+tAp5h9MX72U9+ydKWsq/hjwGtcfmXKE1926nvRmc+9RtjRdWTvkHW3O7
+uyq3b9v03q0/DJoDB4z6FObb0KCxMadizgrUh8EOQWHnB6kGsd5QBtKDj3O+H3T+
+Z65LUNXZOIdYukCdJ8H+0nmw6gOJrsLw0P49NuK7mprO+nL73S/5ljaGpr+hD+VN
+AjJEFqa1P5apwONfsaipWSs9hXHiPndq4+B6Mr1gvIuS0e/snTwzhoYTyrwatus2
+TN3MEaNa/YXwhIewvdhrmKrPtyBfgDEvl6APp2vantrlbI+H7ZspCLQuaCPCZ9hD
+4g3trJcy2VgjGcSgTLVHgNwYM4xoqnA94qirBZjMVNKO6NEkVBkrXtHhhDrkOax0
+03O5Grnb4DS8siY79FDsWOguEypVvPD+MO5qE9+/mMRNLcfBvX1MLT9QHNhUf0OI
+MNgffIQhvxnVaVvZzjfNmcGQ+zO8d7cMzidWBsnT6m/D8eyGgl8wOPrW/Mq+IJBg
+qS+qFEyrWZjXsC56wTie
+=paep
 -----END PGP SIGNATURE-----
diff --git a/www-client/uzbl/uzbl-2010.11.25.ebuild b/www-client/uzbl/uzbl-2010.11.25.ebuild
new file mode 100644
index 000000000000..d46d9a101401
--- /dev/null
+++ b/www-client/uzbl/uzbl-2010.11.25.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2010 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.1 2010/12/05 22:26:37 wired Exp $
+
+EAPI="2"
+
+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"
+
+COMMON_DEPEND="
+	dev-libs/glib:2
+	>=dev-libs/icu-4.0.1
+	>=net-libs/libsoup-2.24
+	>=net-libs/webkit-gtk-1.1.15
+	>=x11-libs/gtk+-2.14
+"
+
+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
+	)
+	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
+
+	if use tabbed && ! use browser; then
+		ewarn
+		ewarn "You enabled the *tabbed* USE flag but not *browser*."
+		ewarn "*tabbed* depends on *browser*, so it will be disabled."
+		ewarn
+		ebeep 3
+	fi
+}
+
+src_prepare() {
+	if [[ ${PV} == *9999* ]]; then
+		git_src_prepare
+	else
+		cd "${WORKDIR}"/Dieterbe-uzbl-*
+		S=$(pwd)
+	fi
+
+	# remove -ggdb
+	sed -i "s/-ggdb //g" Makefile ||
+		die "-ggdb removal sed failed"
+
+	# adjust path in default config file to /usr/share
+	sed -i "s:/usr/local/share/uzbl:/usr/share/uzbl:g" \
+		examples/config/config ||
+		die "config path sed failed"
+}
+
+src_compile() {
+	emake || die "compile 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 21bbab75c948..f691b15bad2d 100644
--- a/www-client/uzbl/uzbl-9999.ebuild
+++ b/www-client/uzbl/uzbl-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.16 2010/04/04 15:36:16 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-9999.ebuild,v 1.17 2010/12/05 22:26:37 wired Exp $
 
 EAPI="2"
 
@@ -29,6 +29,7 @@ SLOT="0"
 IUSE+=" +browser helpers +tabbed vim-syntax"
 
 COMMON_DEPEND="
+	dev-libs/glib:2
 	>=dev-libs/icu-4.0.1
 	>=net-libs/libsoup-2.24
 	>=net-libs/webkit-gtk-1.1.15