jer 14/09/16 19:23:43 Modified: ChangeLog surf-9999.ebuild metadata.xml Added: surf-0.6-r2.ebuild Log: Add USE=-savedconfig dependencies (bug #522954 by Harley Amundsen). (Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Revision Changes Path 1.36 www-client/surf/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/surf/ChangeLog?rev=1.36&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/surf/ChangeLog?rev=1.36&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/surf/ChangeLog?r1=1.35&r2=1.36 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/www-client/surf/ChangeLog,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- ChangeLog 1 Nov 2013 14:53:54 -0000 1.35 +++ ChangeLog 16 Sep 2014 19:23:43 -0000 1.36 @@ -1,6 +1,12 @@ # ChangeLog for www-client/surf -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/surf/ChangeLog,v 1.35 2013/11/01 14:53:54 jer Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/www-client/surf/ChangeLog,v 1.36 2014/09/16 19:23:43 jer Exp $ + +*surf-0.6-r2 (16 Sep 2014) + + 16 Sep 2014; Jeroen Roovers <[email protected]> +surf-0.6-r2.ebuild, + surf-9999.ebuild, metadata.xml: + Add USE=-savedconfig dependencies (bug #522954 by Harley Amundsen). 01 Nov 2013; Jeroen Roovers <[email protected]> -surf-0.6.ebuild: Old. 1.3 www-client/surf/surf-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/surf/surf-9999.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/surf/surf-9999.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/surf/surf-9999.ebuild?r1=1.2&r2=1.3 Index: surf-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/www-client/surf/surf-9999.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- surf-9999.ebuild 4 Oct 2013 14:52:10 -0000 1.2 +++ surf-9999.ebuild 16 Sep 2014 19:23:43 -0000 1.3 @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/surf/surf-9999.ebuild,v 1.2 2013/10/04 14:52:10 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/surf/surf-9999.ebuild,v 1.3 2014/09/16 19:23:43 jer Exp $ EAPI=5 inherit eutils git-2 savedconfig toolchain-funcs @@ -29,6 +29,10 @@ ${COMMON_DEPEND} x11-apps/xprop x11-misc/dmenu + !savedconfig? ( + net-misc/curl + x11-terms/st + ) " pkg_setup() { 1.3 www-client/surf/metadata.xml file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/surf/metadata.xml?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/surf/metadata.xml?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/surf/metadata.xml?r1=1.2&r2=1.3 Index: metadata.xml =================================================================== RCS file: /var/cvsroot/gentoo-x86/www-client/surf/metadata.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- metadata.xml 24 Sep 2011 10:52:42 -0000 1.2 +++ metadata.xml 16 Sep 2014 19:23:43 -0000 1.3 @@ -1,8 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> - <maintainer> - <email>[email protected]</email> - <name>Jeroen Roovers</name> - </maintainer> +<maintainer> +<email>[email protected]</email> +</maintainer> +<use> +<flag name='savedconfig'>Without a saved config.h, this package depends on <pkg>net-misc/curl</pkg> and <pkg>x11-terms/st</pkg> for a default download mechanism</flag> +</use> </pkgmetadata> 1.1 www-client/surf/surf-0.6-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/surf/surf-0.6-r2.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/surf/surf-0.6-r2.ebuild?rev=1.1&content-type=text/plain Index: surf-0.6-r2.ebuild =================================================================== # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/www-client/surf/surf-0.6-r2.ebuild,v 1.1 2014/09/16 19:23:43 jer Exp $ EAPI=5 inherit eutils savedconfig toolchain-funcs DESCRIPTION="a simple web browser based on WebKit/GTK+" HOMEPAGE="http://surf.suckless.org/"; SRC_URI="http://dl.suckless.org/${PN}/${P}.tar.gz"; LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" COMMON_DEPEND=" dev-libs/glib net-libs/libsoup net-libs/webkit-gtk:2 x11-libs/gtk+:2 x11-libs/libX11 " DEPEND=" ${COMMON_DEPEND} virtual/pkgconfig " RDEPEND=" !sci-chemistry/surf ${COMMON_DEPEND} x11-apps/xprop x11-misc/dmenu !savedconfig? ( net-misc/curl x11-terms/st ) " pkg_setup() { if ! use savedconfig; then elog "The default config.h assumes you have" elog " net-misc/curl" elog " x11-terms/st" elog "installed to support the download function." elog "Without those, downloads will fail (gracefully)." elog "You can fix this by:" elog "1) Installing these packages, or" elog "2) Setting USE=savedconfig and changing config.h accordingly." fi } src_prepare() { epatch "${FILESDIR}"/${P}-gentoo.patch epatch_user restore_config config.h tc-export CC PKG_CONFIG } src_install() { default save_config config.h } pkg_postinst() { if [[ ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 0.4.1-r1 ]]; then ewarn "Please correct the permissions of your \$HOME/.surf/ directory" ewarn "and its contents to no longer be world readable (see bug #404983)" fi }
