version bump, bug #355093

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

4 files changed, 159 insertions, 39 deletions

diff --git a/www-client/uzbl/ChangeLog b/www-client/uzbl/ChangeLog
index 2b94998880af..d497392ac159 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.35 2010/12/05 22:26:37 wired Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/ChangeLog,v 1.36 2011/02/15 21:20:19 wired Exp $
+
+*uzbl-2011.02.15 (15 Feb 2011)
+
+  15 Feb 2011; Alex Alexander <wired@gentoo.org> +uzbl-2011.02.15.ebuild,
+  uzbl-9999.ebuild:
+  version bump, bug #355093
 
 *uzbl-2010.11.25 (05 Dec 2010)
 
diff --git a/www-client/uzbl/Manifest b/www-client/uzbl/Manifest
index d3cf4213a74b..538cf356b659 100644
--- a/www-client/uzbl/Manifest
+++ b/www-client/uzbl/Manifest
@@ -4,25 +4,27 @@ 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
+DIST uzbl-2011.02.15.tar.gz 152648 RMD160 bc337e2c3cf9fd9c9259b9e69803abce0ec28ba8 SHA1 32398680186faccef70cf8b45a6c63a850387705 SHA256 c406eca3dd20dd40b557435c7766ee469378bcb4316d5a83bfa5af366193cd1f
 EBUILD uzbl-2010.08.05.ebuild 3733 RMD160 da9f72460a8716df2cce61d444c3cdc2fafe7517 SHA1 efdc308c91373351a7d83d91e013106441bbcd59 SHA256 42da49fbe7742ec845f70fdbfef50dcf74169572f1ffc784e3eb2d7b104def93
 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
+EBUILD uzbl-2011.02.15.ebuild 2812 RMD160 e7d986f6401cfb9ed5ae121c57b23b988170a101 SHA1 619bc161e23c313455ea1c9e7b54d60510be6f0b SHA256 aeec4e610e149823970850c220a0fd8ea24f3fd4dbe6b8092311562ae211697a
+EBUILD uzbl-9999.ebuild 2807 RMD160 be213bce16f0558bbc6de6b40f9adc87ffc90af1 SHA1 f7e58203f65eced638e6b4d38afee0766256549a SHA256 6d7d7d724693a7f0dfd134e9d31398df287f8345eb5ab8e0539b2f780cc5e242
+MISC ChangeLog 6450 RMD160 fbc8c8a9c6213c18f52489baddc104e30d14a15a SHA1 f7abef3cf4d0f4a4e4eee7c018f22a16abccdae3 SHA256 042c65a0d8822dd4099636e3bdd4af4bb712005bb995be4de03c33aadc3d12be
 MISC metadata.xml 507 RMD160 60cd39f105f29bac497abebba3966a7db75c70fd SHA1 a67b72d72f0ef3d186c6622918ec680720db5888 SHA256 b532abb6d9c503c8890d76e371fd902de7de0693c442f01f85efaf10b476a535
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-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
+iQIcBAEBCAAGBQJNWu4mAAoJEDZF8K7rm0r6iLYP+QHm3OFsghQDVXjSIa/3V+/V
+ekX16S57PV6PALGtcX3g+1C5zBYQjB3//wtSxFJyXIAS/ZU23nMLO9qAmyLGCPhV
+dy59Ve79zFcLcSBBwdkwBjNn/pKuogXvmCu6v9XKrldWI74UCteLp3bbSCRqiX4v
+Kwpj1z5Dtj0nr+urEbS7VITn9CLV0CEDrAJA4dpMP9QGnHw99QUWNdmIQLgzWfSw
+egSbqp1cqbnGLnwhk57ebnMVJLZaHQiuBsVEvLCJ24as/b2zMinaBuOwRv/ON11y
+JL4szyMbpj80o5CcqZOdx2jvKVxPrkhpxK9wNSb/1jDRorkz1KMJvi9Xbn9Zexne
+BaQIQv5a+/lOy1YHY9uree4EVe5ntJ8rAl/BNLEPYNMU20FlrIHQVvfSEmda/vla
+wzwi+3A2yG3r+P8R5A0wNvP91QwLvhvkUDYiR9bO0BDdL/kInHRjhY8SBi3ZhBDu
+ivWl49jPLzmfcy65RrZNNnqBAFIK6ZD92K7ID4OjMctu+VZDJr/5ykT8EmxnwohQ
+x25qn2NCE1Ul9KFny0GHB1QZdQFP6cdCgfUXITpaQv+3IPP/9A617hMKb/U8B8ZW
+jEzx7huhd15L7hz2FAyvKF5XRLlkoEnlMsUVj82QifkqHVRd+wQV6KZJ+SxayIjt
+PghzLpglj98T1dJsUrSq
+=aB6S
 -----END PGP SIGNATURE-----
diff --git a/www-client/uzbl/uzbl-2011.02.15.ebuild b/www-client/uzbl/uzbl-2011.02.15.ebuild
new file mode 100644
index 000000000000..5bafecd74339
--- /dev/null
+++ b/www-client/uzbl/uzbl-2011.02.15.ebuild
@@ -0,0 +1,121 @@
+# 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.02.15.ebuild,v 1.1 2011/02/15 21:20:19 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
+	>=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
+}
+
+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
+
+}
diff --git a/www-client/uzbl/uzbl-9999.ebuild b/www-client/uzbl/uzbl-9999.ebuild
index f691b15bad2d..f0773023904c 100644
--- a/www-client/uzbl/uzbl-9999.ebuild
+++ b/www-client/uzbl/uzbl-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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-9999.ebuild,v 1.17 2010/12/05 22:26:37 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-9999.ebuild,v 1.18 2011/02/15 21:20:19 wired Exp $
 
-EAPI="2"
+EAPI="4"
 
 inherit base
 
@@ -28,6 +28,8 @@ 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
@@ -79,36 +81,25 @@ pkg_setup() {
 		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
+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
-	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() {