From deb7a34a95b21b25cf63c77db2a312bc04c80218 Mon Sep 17 00:00:00 2001 From: Alex Alexander Date: Mon, 26 Dec 2011 21:58:38 +0000 Subject: [PATCH] version bump, prefix changes in 9999 Package-Manager: portage-2.2.0_alpha83/cvs/Linux x86_64 --- www-client/uzbl/ChangeLog | 8 +- www-client/uzbl/Manifest | 22 ++++- www-client/uzbl/uzbl-2011.11.28.ebuild | 132 +++++++++++++++++++++++++ www-client/uzbl/uzbl-9999.ebuild | 6 +- 4 files changed, 159 insertions(+), 9 deletions(-) create mode 100644 www-client/uzbl/uzbl-2011.11.28.ebuild diff --git a/www-client/uzbl/ChangeLog b/www-client/uzbl/ChangeLog index d1aae4b4ed6f..cbaa5df39c30 100644 --- a/www-client/uzbl/ChangeLog +++ b/www-client/uzbl/ChangeLog @@ -1,6 +1,12 @@ # 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.47 2011/12/24 08:44:29 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/ChangeLog,v 1.48 2011/12/26 21:58:38 wired Exp $ + +*uzbl-2011.11.28 (26 Dec 2011) + + 26 Dec 2011; Alex Alexander +uzbl-2011.11.28.ebuild, + uzbl-9999.ebuild: + version bump, prefix changes in 9999 24 Dec 2011; Justin Lecher uzbl-2011.10.01.ebuild: Added prefix offset fixes and keyworded for ~-linux, tested by me diff --git a/www-client/uzbl/Manifest b/www-client/uzbl/Manifest index 525406446b64..3cd7cd8aa28f 100644 --- a/www-client/uzbl/Manifest +++ b/www-client/uzbl/Manifest @@ -10,6 +10,7 @@ DIST uzbl-2011.04.12.tar.gz 144532 RMD160 01b7c67e48e857c1c9f634fd7778d97366603d 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 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 @@ -18,13 +19,24 @@ EBUILD uzbl-2011.04.12.ebuild 2857 RMD160 42945ea42cb9aacd2c29a5d1bd3762a75e54cf 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 2988 RMD160 54e1cdea58306032673c585471834e0c1944fd71 SHA1 17f78ba51e371fb1195517267e292b6d38b28c72 SHA256 8ca47bad56c17dbaab2db14e641f8bf3e762069a8d2d36c80355f60e51760d76 -EBUILD uzbl-9999.ebuild 2953 RMD160 6a6bfd82bb2985469cfeb7862ae493689aef1281 SHA1 81d8575023b06d62e862b3cfaf7796280f76209d SHA256 cceb11d54426a4064be95acb5c64b4aa206292dc714c72a44a277cb89b289455 -MISC ChangeLog 8237 RMD160 34ce78c297cbc4faa3671178e796cbca82ad679b SHA1 98bbe81f081e85ff64f4d64530f6a700e3e478ce SHA256 7bb427bdba38f020060c413a2333076f34047005ecfe2f081e41b0df27862ef8 +EBUILD uzbl-2011.11.28.ebuild 2989 RMD160 176cb3e84aea00400a22ffa8801581f59144ba53 SHA1 75b1122b4695b39b72e67079527813a48abf2bca SHA256 e2206bd31f13459051342a793d231a8e09d51b5b78221b61a9b29971c6b86f3c +EBUILD uzbl-9999.ebuild 2984 RMD160 60f871d88da2d7ea41b1987a943d5c77f111ef57 SHA1 de43645d53f36e95b65ee491600f832a86cb5680 SHA256 ec61407f0fe023dadd34db38f98c348850134ad7735eb35dbf2390f66e5dc559 +MISC ChangeLog 8404 RMD160 133d21af19cff079fe41c2b685083d86f7e11501 SHA1 6154b6c863005c2d27ff66a684034afb191bec05 SHA256 5582c7f4d15378366b9bed9e6aefc7dbfa6cb081c161f540a1d317ef9632299c MISC metadata.xml 572 RMD160 06a4e98fa6b8f85086513986be822820b8991603 SHA1 c334ea84cfa5a1fe319cf5ac9745c5f15dca293a SHA256 9a43de4d92bafbf6aa80a678425f3c5c044ec0b7ddef9180e9a457e4bec58026 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iEYEAREKAAYFAk71kPgACgkQgAnW8HDreRbZAACfUVcOQqbBDxms2wjRPKkzhlcf -DPUAoNJlIzy9OQFp2YiuKEpz281uPbSC -=Rfcw +iQIcBAEBCgAGBQJO+O5RAAoJEDZF8K7rm0r6N7sQAJed6Efuiy08qbLGOaK1xVk/ +dS4ROAUUZCNr9vrQE3HJyfc0KvgAtATWkczVBBpL6UdYTJj8WMQ1iUoGu32V0ewx +yRnzSZA2tl1cKXNnAasZ8eXM4NbTUHo6Hu4MUv4C22d7o6KfcJzoR3zrR8ij9MlH +uBaAGe+KfEImfO305jhGAicByXnq5gW1HF7mAF5xTbruIC3P1wC7kZxT5pmPNVGW +EYxq2+AntrDsXrdrS54EtYkTehuf9VKu0g/N5EVPA+wlnDvzgBTeNlup/igPtHQD +9qtK5i4vWz0lqqsQntzQlFwOZ5VWDNUhUCb/GgqeLSWBJor4mp8piVHpWzElqqhH +SfxYVvNrQxYPF8mVw5XG0th84uOgdY5etd/NTYlmVKzn5glIemcvl811kV9eGalE +/6vVKwUVe3wHQHiQjYcmCQKswR3rScl/EPYnYK1etckyW1Q7ijoM2fXIwUtMp0ZS +S94h+BOYPEMl+sHlWEkoeLlOdH3ahryAsu0xVc3NlrA67K03MH/CkuqeUbQwDGao +JkwAxzehl5oDfrNUCnOL/NsYisDQni9STtW1sjeMszjJzrCaz2MjRZOY9wU4OTDb +THlrDjMxjnUzolIKSGz+gYUvLBcgwZtBVbssm5OPg9NhWFMYACAvtWuiA01LLB57 +fI3QL8F7RoafgiSZNQD/ +=5RnH -----END PGP SIGNATURE----- diff --git a/www-client/uzbl/uzbl-2011.11.28.ebuild b/www-client/uzbl/uzbl-2011.11.28.ebuild new file mode 100644 index 000000000000..d659391702a2 --- /dev/null +++ b/www-client/uzbl/uzbl-2011.11.28.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.11.28.ebuild,v 1.1 2011/12/26 21:58:38 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 ~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=" + >=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="${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 3ed5d42b16c6..0abf18d48efa 100644 --- a/www-client/uzbl/uzbl-9999.ebuild +++ b/www-client/uzbl/uzbl-9999.ebuild @@ -1,6 +1,6 @@ # 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.23 2011/10/24 06:43:25 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-9999.ebuild,v 1.24 2011/12/26 21:58:38 wired Exp $ EAPI="4" @@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then EGIT_BRANCH="experimental" && EGIT_COMMIT="experimental" else - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" SRC_URI="http://github.com/Dieterbe/${PN}/tarball/${PV} -> ${P}.tar.gz" fi @@ -119,7 +119,7 @@ src_install() { 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} + emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" DOCDIR="${ED}/usr/share/doc/${PF}" ${targets} if use vim-syntax; then insinto /usr/share/vim/vimfiles/ftdetect -- 2.26.2