Version bump. Use vcs-snapshot eclass to unpack release tarballs.

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

4 files changed, 171 insertions, 33 deletions

diff --git a/www-client/uzbl/ChangeLog b/www-client/uzbl/ChangeLog
index 49cf6a93d95a..1e3137e48da1 100644
--- a/www-client/uzbl/ChangeLog
+++ b/www-client/uzbl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/uzbl
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/ChangeLog,v 1.49 2012/05/03 06:01:03 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/ChangeLog,v 1.50 2012/08/20 17:12:46 radhermit Exp $
+
+*uzbl-2012.05.14 (20 Aug 2012)
+
+  20 Aug 2012; Tim Harder <radhermit@gentoo.org> +uzbl-2012.05.14.ebuild,
+  uzbl-9999.ebuild:
+  Version bump. Use vcs-snapshot eclass to unpack release tarballs.
 
   03 May 2012; Jeff Horelick <jdhore@gentoo.org> uzbl-2010.08.05.ebuild,
   uzbl-2010.11.25.ebuild, uzbl-2011.02.15.ebuild, uzbl-2011.03.17.ebuild,
diff --git a/www-client/uzbl/Manifest b/www-client/uzbl/Manifest
index c13e3b886425..289264f6a01f 100644
--- a/www-client/uzbl/Manifest
+++ b/www-client/uzbl/Manifest
@@ -1,22 +1,38 @@
-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
-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
-DIST uzbl-2011.10.01.tar.gz 148483 RMD160 ee87377b771b476fe8fc0fbc1460b503257c05a4 SHA1 3aae247dbb6bba0bdc1145920ff116038212799c SHA256 fd72ea7e3246e904b451cda8339a1aab2fcd259ec07ec82aa0c9affe6084c2fe
-DIST uzbl-2011.11.28.tar.gz 151693 RMD160 b10247c0557cc99f09a6d449453b2e11d70a5307 SHA1 88f3d66ba182672d7d49b19ccdbdc407134ab264 SHA256 c0f728d1a0f9d7472dbf57a155f2bfaa153aa621b0e784c9789c446e942e9c9c
-EBUILD uzbl-2010.08.05.ebuild 3766 RMD160 80b18a1405f5d6214f2f5cfffaadb7da02788456 SHA1 2681990e5ec5d0525b08f3ad50b0ec70e52b96b3 SHA256 00849ff12dda8dfd3e32a3774570af5ea322a897b5dd4882c3d26e4a0b972904
-EBUILD uzbl-2010.11.25.ebuild 3157 RMD160 99c566c2aed2d5d0f0b9dc6f5f3f2dbc298ee8c3 SHA1 b062416447426956c69951fd41fb1d9f25c4ad4f SHA256 b4ac322ba9852b4103c64f395bccceb9776a063bec111a98489963bd5c509670
-EBUILD uzbl-2011.02.15.ebuild 3006 RMD160 00a6faa93d5420d69ac8cfe1ccc6c7f5e3fb5dcc SHA1 1d39c381282b475345735a757c6356d7088aa685 SHA256 61e84083c69092d8038063ca81dc069a42151c3aea0d3ae1be18189bb816ac9c
-EBUILD uzbl-2011.03.17.ebuild 3006 RMD160 1ebdd87ee7dc01c867f1ff322e4f2c080b9cc3a9 SHA1 def06f3cb723a316c39b9687ce4cb1533d7afbe6 SHA256 78d626c5131057573c64ca81413ac74beb382f92edeba7829acfd512f37a5774
-EBUILD uzbl-2011.04.12.ebuild 2846 RMD160 8fe40e18cdd27ee213d9c7fd57406195e36c7600 SHA1 1abbdb8188a770ea7b1b8e09bbddc3754fdfc9b3 SHA256 eef10e32df8f438e7657c023f733b712b760b7ab7b30e1241bcfc3bb6b6af7bf
-EBUILD uzbl-2011.07.17.ebuild 3178 RMD160 74b73b47459e1cba68e90249390f6ae917f28512 SHA1 df782b5d201979a1a46fa99ab7a001db90d4d02a SHA256 a80c3b1e36affb58aa72ac7e1279778dce4f069458fe7eadf0f3b8dbc8f9ba67
-EBUILD uzbl-2011.07.25.ebuild 2947 RMD160 fa09786206eedab00d5393ec3c3268cee418f859 SHA1 c0751d1f0e89983f33321a8745c9602d27542c63 SHA256 cee33fe0c1dce6bc3317695bc849e55fb9e819751057d42cc80b9c3a6bdd4276
-EBUILD uzbl-2011.10.01.ebuild 2982 RMD160 24a80bb0025ad91634154da5e9ad0bcd5f77c324 SHA1 d2e4c30b99e26f8e3eae257bd79c967092df99c2 SHA256 fce44fe914a59e6602c8f97150cb4440489a3d257cb25547ec9b2a3c715d0720
-EBUILD uzbl-2011.11.28.ebuild 2982 RMD160 3097a9214d04b58aa21d9d59ee6dd858bfd94ce6 SHA1 88e514699baf08c8f127f1782876ada15bc9ed18 SHA256 dbd40905ce407c96f23a11be3ebe798b1647fc0630905ccf8d256aa0bc9743d0
-EBUILD uzbl-9999.ebuild 2977 RMD160 b826d558c1eaead9ddee104d30f5a1c557176cb7 SHA1 0272f274caf16bbf84cece8e69c73bbbfc493d15 SHA256 5d93ac9bcfbc0eae1c6319d0a44d04607006f66ab70062cefd0e43505fe5e207
-MISC ChangeLog 8737 RMD160 2c85daeeaac95120f62b29be1a30c2da7360e6e6 SHA1 3b46af2da656b38b4a71c55f3a8a83dbacdfb499 SHA256 2c3d8b19abfee9dff0b7a0df6228d7bc02ec325c2647f7c2af25aba85c11d64b
-MISC metadata.xml 572 RMD160 06a4e98fa6b8f85086513986be822820b8991603 SHA1 c334ea84cfa5a1fe319cf5ac9745c5f15dca293a SHA256 9a43de4d92bafbf6aa80a678425f3c5c044ec0b7ddef9180e9a457e4bec58026
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX uzbl-makefile-docdir.patch 1167 SHA256 dc0a1ebc7b08c17e63afe60d3db39cc846ca43a5ad01789c07f1d3198153d43a SHA512 68b0c211e01d9733813e2f8a4d7b868aa4bfeb6b88dcc839fa656e49bb902a5507d555987dc5f03284f5a86160b5ff5f26954fb7dcada2f6bc0f99428d2aadaa WHIRLPOOL 9ceab1d100aa3b4c6eebfd9863e2d9bf94cc6d5e40539b02ce90ae5c21645d4df8ca60375961ace3717149408b526c2405d0549f75ab576a0e5582fb56a34610
+DIST uzbl-2010.08.05.tar.gz 136797 SHA256 9a04e835990519b039a35a7652672f4235890af86699aafe73a71a3e1dc9971f
+DIST uzbl-2010.11.25.tar.gz 145473 SHA256 715163193b1c15377a1caaf2e993ef56584e356e6e62e74184b0acdb0c76bbd3
+DIST uzbl-2011.02.15.tar.gz 152648 SHA256 c406eca3dd20dd40b557435c7766ee469378bcb4316d5a83bfa5af366193cd1f
+DIST uzbl-2011.03.17.tar.gz 143726 SHA256 b7bfe86c10a232dd9858ab678643d86034ba6ed80c31ec42ac3671b6733232f4
+DIST uzbl-2011.04.12.tar.gz 144532 SHA256 6d2fb50bf89c94593f258a274f68f44a10d6e1f685dc3f11e1b56282f526d7b5
+DIST uzbl-2011.07.17.tar.gz 147128 SHA256 c4d92b4c42b705fcc68f24c8de8496e93464f661ffd51b15a8026d7fa1f047a5
+DIST uzbl-2011.07.25.tar.gz 146851 SHA256 2e61fa6c62e48d3f13e95a4ea7e7aead65345f6c88a688844ef921685dffe565
+DIST uzbl-2011.10.01.tar.gz 148483 SHA256 fd72ea7e3246e904b451cda8339a1aab2fcd259ec07ec82aa0c9affe6084c2fe
+DIST uzbl-2011.11.28.tar.gz 151693 SHA256 c0f728d1a0f9d7472dbf57a155f2bfaa153aa621b0e784c9789c446e942e9c9c
+DIST uzbl-2012.05.14.tar.gz 152376 SHA256 4b4b3baf2339250b81818b12918af51a33f353a580856fe27eb193f71a4294cf SHA512 d0025a50c852007d5203b05d1bb1e77855c1c1d7e3cad685fd981817e5729682ccf01786f7e06c36a82ebbc1079e5d83fdb1cca40cc768024088dcc840a5ef90 WHIRLPOOL 1e16856b7b5005ae3dcad00c48ad5548bbee0d09403cdde35eda350013944ce35d67fc53063abf69d28d3c3ca37fc305101f0a6d2d645d9f01af1560d25f04e7
+EBUILD uzbl-2010.08.05.ebuild 3766 SHA256 00849ff12dda8dfd3e32a3774570af5ea322a897b5dd4882c3d26e4a0b972904 SHA512 b6ddc232948fd3896ac1acc47d2021f58987761625965cdcb33b42f2c4d83c16872a3a5d11008ffbd7efb9060e2df9100e7a5c4f4cbb675d60f127d39afcfb01 WHIRLPOOL 2747f4b618d1f2385392d1f3f7f7c55f749d36c20331ccf8bc82dbeef3d3c9c0f3f0511d3af4ea63daadf604538e6a02c82e30ad6af76041aab8c743b76afaaa
+EBUILD uzbl-2010.11.25.ebuild 3157 SHA256 b4ac322ba9852b4103c64f395bccceb9776a063bec111a98489963bd5c509670 SHA512 b1c4e9af5d9918017f1d96fc29dd4937d807f30d05a3b2b2a757008f82fe1f349fb2eb761edd112fb9d17a20690b9d02181c1ffa35c87c40565942ccfefa42f9 WHIRLPOOL 53e2cfb3fb2d7a013edc56d3a50a81fc1d0dfc7ce1c8c38301ca14b3dad5986e42f68320029b751d47013d6f2f75b4eb0c423614aa6d1ab750df9c54b8a4036b
+EBUILD uzbl-2011.02.15.ebuild 3006 SHA256 61e84083c69092d8038063ca81dc069a42151c3aea0d3ae1be18189bb816ac9c SHA512 6e6f21ae2b656a70e735920d27e94021c127745a4a996bdd2bed2d5b1d38e49c190db399d14c73ab61668f227085ca6dd87e224e8dcf14df308ab6125a3a8f3c WHIRLPOOL 26c16aef37c3fc5f027a445878e1aa181267d158633fa0ffb0a44a680ca92fc065926fbc856be722c70888aa4db46ecefaeefa4d90ad6414f351a96e98608c4f
+EBUILD uzbl-2011.03.17.ebuild 3006 SHA256 78d626c5131057573c64ca81413ac74beb382f92edeba7829acfd512f37a5774 SHA512 b80038b205adff31a280a9401eb5c72fc3a0d21b66a9ccb2151d6d5089121ca890eb685252a77cc8ca3cf657fe97efe072a27b5378d048a8dc802fa7eadfcef8 WHIRLPOOL 7c37baf44fcb409fa94b3b5bc4df11c1e9a0526bb79f0616a45e4f586bf1d93f5065e81b9cc781bc48d41d4d6aed8f63fbe370a7e6039dee4866a0938f6905e5
+EBUILD uzbl-2011.04.12.ebuild 2846 SHA256 eef10e32df8f438e7657c023f733b712b760b7ab7b30e1241bcfc3bb6b6af7bf SHA512 ebacb8b3e00ba0646d04622d7220dcfff314f9c23c2a6a029227bb22b38b1582ddc568663230357da7d71e5bc51b2c4b42649c02a0943dfc82e7be6ffca06f27 WHIRLPOOL 97c97a2672f27c8596b4eb0be5c7022ddbd15c50c10953ae546a829c2fbe0a9e2c6cedf96b5c62fea940f461e2fc423ec9f4e06c385bfbead27cfafb9fcd5100
+EBUILD uzbl-2011.07.17.ebuild 3178 SHA256 a80c3b1e36affb58aa72ac7e1279778dce4f069458fe7eadf0f3b8dbc8f9ba67 SHA512 e1095be0d3f93ba95dc95ed4f4e72191247fc36774905be1773c36c2aa6bbf80078f8e6ea5f38f4261c552e4e40470838dc5a76ca1568c232b9ed1f9d42d1cb5 WHIRLPOOL e3154f463659204359d3db7538f9eb889f1ff02c848a1bb5f279d2c86c716c6cd28a9582182c9ee64299c12e8954d5e425ed3f34ff05e84a4498901b6caafc64
+EBUILD uzbl-2011.07.25.ebuild 2947 SHA256 cee33fe0c1dce6bc3317695bc849e55fb9e819751057d42cc80b9c3a6bdd4276 SHA512 4afe3fc752edda83b9f13f2659baed904a9afe349d1818b1c65925c91344dc328624832bbd55f967defc982c68f207fd238a444035fd007efebd600d3d3d2657 WHIRLPOOL ce0b203226b7d318de1b26a1c4c4e55faf9d83f5685438ccc81758bacf52efcaddecf501c8af18db2f69cd1076942b50cb71398f5126d132abf37fd34d54e1b0
+EBUILD uzbl-2011.10.01.ebuild 2982 SHA256 fce44fe914a59e6602c8f97150cb4440489a3d257cb25547ec9b2a3c715d0720 SHA512 877755663e48b8ecf7472be5063773ede82a69f101810422b3c731d85bc1cdf0ad458337bd78d881a24d852fbc97cda29486355f612d38f1cdf94909693794a5 WHIRLPOOL 7aeabefa51e5a08b9aece58d20a6ec7c1d3f6f5e4e1409b4700a30ada2b4b2751a7c90b476e429d811849758eb2e94bff13b82e176dca479f481f8af35258d7a
+EBUILD uzbl-2011.11.28.ebuild 2982 SHA256 dbd40905ce407c96f23a11be3ebe798b1647fc0630905ccf8d256aa0bc9743d0 SHA512 b6499b52bd104c123c861b9ca6680c95961fbb8163ee59e91590019ec5e16ab4b4094da32127ffdc536cff24bbba9275cea974cbc05c3a36eee9c673958296a8 WHIRLPOOL 1ba49484952afc62aa870fd58ce94e46522064928c17debcd1dbee1d62bbfa1445009f4440e97a4a98f1e616731ecc3d746bf0bce71591cfcd77d1b1f1227467
+EBUILD uzbl-2012.05.14.ebuild 2886 SHA256 9f25e1ad1a9057f014563bce563354b011b0393d10da9a100d77724ede21dc3e SHA512 6aaeacd67c0deaaffee0f61564c14ac0c6071daa99c02bd12c1acc121457e78ccb05691c8213313d11e94f9a060194ef5ad7d8604ab340659690b483a35dc20a WHIRLPOOL 55d7ae2c86fd3974238839fdc89f39e781e8cad1f2aff6245917d6b5e7f4c60cca0bf72702a9227820b086757749ee34a8443018494da756e6f004658aebfac3
+EBUILD uzbl-9999.ebuild 2881 SHA256 7d479ae359578822848aacefc5f67a3ead9bbb1270f118fb999bf618e8f47ebd SHA512 87ef55aa61bac469eae8595eeb9be38c999b37647e65c2ead738644ca48a5aa4ee3094b9888b17229ed56f90ca4e125d21cd0c2a4d7ae6ef577e5f1d650e3d37 WHIRLPOOL f81270d153a3d3bec8e885003484647af74e18a4a661561f7e547bcd3a99980895df5a8fc4751439ab8f5842b0b17aa6a8b9335a97d38fe9c5807e192f6aba46
+MISC ChangeLog 8935 SHA256 752837708df5cb8e0d1e9647839c63f8b3375e03ae841d9accda653698c2d06d SHA512 39a2c0bc00ed422d43ec475a6d2a9e60c2d72a148af6fc4779220a46e3a276e1c61ffdaf003f7c13a0bfc494e7dbed6b977453746a1f0965bc083e7b98f77cd9 WHIRLPOOL 5bd5dd4735f7d204339dcad1607977e5486262b80e1efeb7c08f3604d79e7c6f63f51f2a8489f96632c2857cfd686a91660289ce7ec7b4a7fe38637d9f01741c
+MISC metadata.xml 572 SHA256 9a43de4d92bafbf6aa80a678425f3c5c044ec0b7ddef9180e9a457e4bec58026 SHA512 ff6a6783de19377da43603863d67925e8932a625ea49b92227e4b0af2f6945bb1e0573c9ee4be35b7f1f795dbefc5bb38ee81b1fd39451e1144c1c1909b4fce8 WHIRLPOOL b4dc4cd8b6f19ee3972ad2f4e16705d7b7a13216d31efb8aae08437d6f75e24e57d2a9fe2ef756f2abe55746f40d0db901d7113fab6efa2222b0a46382019af7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQMnAUAAoJEEqz6FtPBkyjY8QIAJY8CaPGGmvAdfpfcPoLc/rG
+QbBSJgsIhu48XV2DOGT31+gWAsjZc69AdSI6CLSVuDdPcmuN6RFQ+AMG2A4NjqSP
+XFaNn8rY3NhrjRuJVrrBRD17CVwvDztg+dWAykLQ46+7EW2AN6NInWDIr2TLLbix
+ILDh38wuwCSB6naZdWLFbNXTrj8CP819WZj+emOmFV0utXzaYslyN5+fZ1HrYLMM
+kutw7z5+ZU6twlSti5FZFk/9+i1k9kB9CP/3rDGQK+Hfo9GUfj5xlDCTE8IYnyMQ
+D/BpvlS76W6DinUiqT5q/J4kZA3Qy+lYYNeRnCuvWiUTxu4RGDp8CLiu5TiGk0s=
+=OP6w
+-----END PGP SIGNATURE-----
diff --git a/www-client/uzbl/uzbl-2012.05.14.ebuild b/www-client/uzbl/uzbl-2012.05.14.ebuild
new file mode 100644
index 000000000000..4028d5f3265b
--- /dev/null
+++ b/www-client/uzbl/uzbl-2012.05.14.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-2012.05.14.ebuild,v 1.1 2012/08/20 17:12:46 radhermit 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
+	inherit vcs-snapshot
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	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="
+	virtual/pkgconfig
+	${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_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="${EPREFIX}/usr" DOCDIR="${ED}/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
+
+}
diff --git a/www-client/uzbl/uzbl-9999.ebuild b/www-client/uzbl/uzbl-9999.ebuild
index b0c7af61fc12..cf328c3e49d0 100644
--- a/www-client/uzbl/uzbl-9999.ebuild
+++ b/www-client/uzbl/uzbl-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.25 2012/05/03 06:01:03 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-9999.ebuild,v 1.26 2012/08/20 17:12:46 radhermit Exp $
 
 EAPI="4"
 
@@ -15,6 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 		EGIT_BRANCH="experimental" &&
 		EGIT_COMMIT="experimental"
 else
+	inherit vcs-snapshot
 	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 	SRC_URI="http://github.com/Dieterbe/${PN}/tarball/${PV} -> ${P}.tar.gz"
 fi
@@ -91,15 +92,6 @@ pkg_setup() {
 	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 ||