Add USE=-savedconfig dependencies (bug #522954 by Harley Amundsen).

(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key A792A613)

4 files changed, 88 insertions, 8 deletions

diff --git a/www-client/surf/ChangeLog b/www-client/surf/ChangeLog
index 7611901a3d0b..e1549e3a55b1 100644
--- a/www-client/surf/ChangeLog
+++ b/www-client/surf/ChangeLog
@@ -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 <jer@gentoo.org> +surf-0.6-r2.ebuild,
+  surf-9999.ebuild, metadata.xml:
+  Add USE=-savedconfig dependencies (bug #522954 by Harley Amundsen).
 
   01 Nov 2013; Jeroen Roovers <jer@gentoo.org> -surf-0.6.ebuild:
   Old.
diff --git a/www-client/surf/metadata.xml b/www-client/surf/metadata.xml
index 52363bff0cba..a30445e0d016 100644
--- a/www-client/surf/metadata.xml
+++ b/www-client/surf/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>jer@gentoo.org</email>
-		<name>Jeroen Roovers</name>
-	</maintainer>
+<maintainer>
+<email>jer@gentoo.org</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>
diff --git a/www-client/surf/surf-0.6-r2.ebuild b/www-client/surf/surf-0.6-r2.ebuild
new file mode 100644
index 000000000000..38edde79adc3
--- /dev/null
+++ b/www-client/surf/surf-0.6-r2.ebuild
@@ -0,0 +1,68 @@
+# 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
+}
diff --git a/www-client/surf/surf-9999.ebuild b/www-client/surf/surf-9999.ebuild
index 7bc41252b0fc..a40d0c3a5421 100644
--- a/www-client/surf/surf-9999.ebuild
+++ b/www-client/surf/surf-9999.ebuild
@@ -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 @@ RDEPEND="
 	${COMMON_DEPEND}
 	x11-apps/xprop
 	x11-misc/dmenu
+	!savedconfig? (
+		net-misc/curl
+		x11-terms/st
+	)
 "
 
 pkg_setup() {