From 2a2e8afe1d94c326bdb6a4925f852b7ab06f3515 Mon Sep 17 00:00:00 2001 From: Alex Alexander Date: Mon, 15 Mar 2010 09:37:38 +0000 Subject: [PATCH] [www-client/uzbl] version bump. removed makefile patch from -9999 (applied upstream) Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- www-client/uzbl/ChangeLog | 8 +- www-client/uzbl/Manifest | 6 +- www-client/uzbl/uzbl-2010.03.14.ebuild | 108 +++++++++++++++++++++++++ www-client/uzbl/uzbl-9999.ebuild | 5 +- 4 files changed, 120 insertions(+), 7 deletions(-) create mode 100644 www-client/uzbl/uzbl-2010.03.14.ebuild diff --git a/www-client/uzbl/ChangeLog b/www-client/uzbl/ChangeLog index 2a2ac82489c4..10f9e93b29cf 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.22 2010/03/14 14:56:01 wired Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/ChangeLog,v 1.23 2010/03/15 09:37:38 wired Exp $ + +*uzbl-2010.03.14 (15 Mar 2010) + + 15 Mar 2010; Alex Alexander +uzbl-2010.03.14.ebuild, + uzbl-9999.ebuild: + version bump. removed makefile patch from -9999 (applied upstream) 14 Mar 2010; Alex Alexander uzbl-9999.ebuild: makefile patch applied upstream in experimental branch, don't try to patch diff --git a/www-client/uzbl/Manifest b/www-client/uzbl/Manifest index f6dd03967b9e..7726e5c39ce4 100644 --- a/www-client/uzbl/Manifest +++ b/www-client/uzbl/Manifest @@ -1,6 +1,8 @@ AUX uzbl-makefile-docdir.patch 1167 RMD160 c9e4c7c927e6cef4d35ced2af11c723f4998d7f5 SHA1 71dfd176b83d5459f5c9915cf8651c38dec2c459 SHA256 dc0a1ebc7b08c17e63afe60d3db39cc846ca43a5ad01789c07f1d3198153d43a DIST uzbl-2010.02.02.tar.gz 136063 RMD160 6175ad388d9946a2f02c22bec3d7dd05b7f3f87a SHA1 a24565f554cb15e49e990a381e6f3322eaf4c5c6 SHA256 23b1e7b7b0ce40605e838f2af70cabd7f430a4f4b55f0b7e73a89296c40f2a6a +DIST uzbl-2010.03.14.tar.gz 142818 RMD160 cf0b6d002111470351e7a065bd331e3f4dd06bc3 SHA1 b26faa5715160bd0aa2b6c82ac25b801ec7bd512 SHA256 6bd65bcb4aeef63f7b21bd910e2fd5ba683d727f4ff20a99d73541a033c61208 EBUILD uzbl-2010.02.02-r1.ebuild 2620 RMD160 8526f896df032a4b1199cdad41821d6a023b384c SHA1 f84fcdf88f6708cab71f608d13de7866ce749973 SHA256 171683741e6762efef6f8cc17fb92a82284d18eb3fb858caabfa58f4ec9149a9 -EBUILD uzbl-9999.ebuild 2731 RMD160 a16eca4afdeb50e7cf42d5a22f4684aedf9e05ec SHA1 b579e48a8f60bf2d96609ac94726a8324095b00b SHA256 162084f48b7b65760d8c4bdd987dec6c3eb01156ce7347e4ba2ea23472cea34f -MISC ChangeLog 4376 RMD160 8c799b6ff55d36e8d3f9a55617a0a91903c95779 SHA1 e6b89b44ce4165103cfe3507944cbbb54e412d62 SHA256 9137aeae6dd9c941019762717f5d6cf49875a094507bc5bebc4ed02ad03dce45 +EBUILD uzbl-2010.03.14.ebuild 2617 RMD160 a704bc432e8b5ba6a15cce6e5a5185aa6c0964c8 SHA1 c6ce3f3d3bc64197cc75b9e07b48235f154bd263 SHA256 3abefdc48863509a464c79e934f4c8590a0f095f38d3a749d518142b3d649267 +EBUILD uzbl-9999.ebuild 2588 RMD160 fb6a7b4c1585c8b861ba81889224a4b8652429e5 SHA1 2e28dd7b91e1ad8d69a8cc9095643d32607c91e1 SHA256 f63d07b55c8d627aca53c2e18af41806d643576fec4e63cbe88dafd51fec74db +MISC ChangeLog 4572 RMD160 dfce5d4991050415582e40bd544e8b0a6c2bcf64 SHA1 baafb28dc0ef88af76d190f09723be006ae15961 SHA256 1259ad07afea403a2c33104fe56f3948e5beb1dd3c3f1880ba1ec23c7f08ae89 MISC metadata.xml 507 RMD160 60cd39f105f29bac497abebba3966a7db75c70fd SHA1 a67b72d72f0ef3d186c6622918ec680720db5888 SHA256 b532abb6d9c503c8890d76e371fd902de7de0693c442f01f85efaf10b476a535 diff --git a/www-client/uzbl/uzbl-2010.03.14.ebuild b/www-client/uzbl/uzbl-2010.03.14.ebuild new file mode 100644 index 000000000000..eb70d8aeba12 --- /dev/null +++ b/www-client/uzbl/uzbl-2010.03.14.ebuild @@ -0,0 +1,108 @@ +# 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.03.14.ebuild,v 1.1 2010/03/15 09:37:38 wired Exp $ + +EAPI="2" + +inherit base + +DESCRIPTION="A keyboard controlled (modal vim-like bindings, or with modifierkeys) browser based on Webkit." +HOMEPAGE="http://www.uzbl.org" +SRC_URI="http://github.com/Dieterbe/${PN}/tarball/${PV} -> ${P}.tar.gz" + +LICENSE="LGPL-2.1 MPL-1.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+browser helpers +tabbed" + +COMMON_DEPEND=" + >=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-lang/perl + dev-perl/gtk2-perl + dev-python/pygtk + dev-python/pygobject + gnome-extra/zenity + net-misc/socat + x11-libs/pango + x11-misc/dmenu + x11-misc/xclip + ) +" + +pkg_setup() { + if ! use helpers; then + elog "uzbl's extra scripts use various optional applications:" + elog + elog " dev-lang/perl" + elog " dev-perl/gtk2-perl" + 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() { + cd "${WORKDIR}"/Dieterbe-uzbl-* + S=$(pwd) + + # patch Makefile to make it more sane + epatch "${FILESDIR}"/"${PN}"-makefile-docdir.patch + + # 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" +} diff --git a/www-client/uzbl/uzbl-9999.ebuild b/www-client/uzbl/uzbl-9999.ebuild index 868330340fad..9ed2feab53da 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.11 2010/03/14 14:56:01 wired Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-9999.ebuild,v 1.12 2010/03/15 09:37:38 wired Exp $ EAPI="2" @@ -84,9 +84,6 @@ pkg_setup() { src_prepare() { git_src_prepare - # patch Makefile for DOCDIR - already applied in experimental branch - use experimental || epatch "${FILESDIR}"/"${PN}"-makefile-docdir.patch - # remove -ggdb sed -i "s/-ggdb //g" Makefile || die "-ggdb removal sed failed" -- 2.26.2