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

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

5 files changed, 96 insertions, 15 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/Manifest b/www-client/surf/Manifest
index 6fd14acf56b3..e75bee29d657 100644
--- a/www-client/surf/Manifest
+++ b/www-client/surf/Manifest
@@ -5,13 +5,14 @@ AUX surf-0.6-gentoo.patch 3910 SHA256 064a20bde58da9c5b7ac0d52ef16a40ec9ee1b06a5
 AUX surf-9999-gentoo.patch 3910 SHA256 064a20bde58da9c5b7ac0d52ef16a40ec9ee1b06a5b4266a49f477098b129df3 SHA512 4a64127f4360afe4fcd4a00ebcf2d7ae8c6041d06215821abd61f99642ee4485c62f35cf39d72cfc8821286c3a3967773d734730c2e7751eef48b7a7a1936224 WHIRLPOOL 6f868c33a4ee455355fa556bedda9f20aa2698cfcfb775f5882004134af839ed39b64d2af29a989117c8746f15edf5d3e2a1d493b50b1651d16379839c7ae06a
 DIST surf-0.6.tar.gz 14781 SHA256 fdc1ccfaee5c4f008eeb8fe5f9200d3ad71296e8d7af52bdd6a771f111866805 SHA512 f3550535351e37296280d33d229998e1f00aa605d0dab4a58944cf213721e823a1cfd9134b7bca2a4d61e265122a30d5dc917a290163ed8af2b24cd75d41a100 WHIRLPOOL 2a163d450b47b4964ce3686d76bf6e3a747984f0e86f84e2dccfa9d3e885bc26adf0100cdef48ae19d91f34a2d14d6c4950d2a7db7d333612e2b1fc48b077f99
 EBUILD surf-0.6-r1.ebuild 1516 SHA256 43f240d76454dad812255769e8a38757f6468e0d76bc8d7eb9b01b0346f07d12 SHA512 60a02337053e903d7d9de4321efff41e726378099dc4d5fc4f22821cff05ad9a6fa58a3b6c394f1d8512be9335eb2bbd8c7b703307578b6ba872f6e09668dd3f WHIRLPOOL 2feafda1a4acfa0d85719199d1f6daa652f4477b2aa0b6b4fd8e3bdad7791f98c93418a8af8c8a2581ef74ac5a02fe2c95a555660df71277ac3e9723a0bf16a6
-EBUILD surf-9999.ebuild 1251 SHA256 604823db679b5f106ab7c6c1ba7cba22f0cf1cdd2e9c362aa93d2eb128bef0ea SHA512 03abd726c897a66725980d5d1524e2a69b8aa21c587ced77e632da5c8fb26f85e9e3d1082352ac75e096762f8451e7eb24a22435ad49191239f9fc11d3ecd819 WHIRLPOOL 2dadc932721c2ce7f410d59371760dbb3deb20f2dc8a92346109de2ff7d7b31ea14795ced67cedeb52e76862a292c5e09118f0d680eb17918f4a2c6195aa78e6
-MISC ChangeLog 4737 SHA256 11824cba9d16fa851fcd4464d4a76dbfcec13d7cf6360c31efa4f74e3dca87e8 SHA512 33c5888a21e15f181e62ea7fff67a2f93a76704a847c75634b70b37404c757e1597d1fcb6b1ee3164efa142b8b6720c4c38bd066d9e89143c83e1127b93159eb WHIRLPOOL cdd48faeef6929848c9af269c8a9828ba4bea556164121d483d394a2df951399aeec2daaee1c3fb047219629a838b3ceb533213a0f7e6276cf58022e7cae719e
-MISC metadata.xml 230 SHA256 529c3320b250d179bb9e9ae651a88ba3f2a1bca78cd1ab07d5aef28d571960ce SHA512 a7a1138a00026b873623549a80248ee704c039921fd65203098c1f81c9c4532f142de26a2743720e6a108273f4ac547a8707909f3e6001dd5844b0e7e275dba7 WHIRLPOOL dc42bdbbe8863903771b14c2511223d0a3c2c94d543cc2e211269312e522bc6cb352af4568a4a307ad1163c6feb8852d61652694ae00616f6abbdcecf840d5d7
+EBUILD surf-0.6-r2.ebuild 1569 SHA256 85541a652c190d9de75c42824ef53ae6999524f44c1900d0dd961a7176ba1d46 SHA512 9beb9dba47139b4049f2f65ac2031657d280856b7349a461cc2f9dd53cab113892f3049782dddecd53644e284cb0c6fbadcbf20e711d43b5e4fd809fd4b5adda WHIRLPOOL 5b5be692c8216d7441dff50ef935d1db0582205589909540845638afbb6891a5dca53c525606ce8c4882c53f4f1461067415cabfea899c763ac671487de6ac7b
+EBUILD surf-9999.ebuild 1302 SHA256 aaa0f9fda83e620d3d53c828074e432e149d0b811fbbe6c146474253335e3fcf SHA512 65a98fa79e4689d2c6c7da78513ed72424a29cf27cb3432ab209d49de0ae16231437742f39d7461143a6b05bb4c8e391ce5ce0b020e21b0d3640148e9b30f70a WHIRLPOOL 36758e7120501f4bc3282261c6ca5dcbd9c458a587fd80c21de09cfc59476137f6cd8aab82a0d5a76f52ac3de960c5f2e9f3bbd424d8f12630820775ba797701
+MISC ChangeLog 4938 SHA256 384071291a64fed5982ab706211344fc573d5ef8c5fd29807cabe6b0098b4cd2 SHA512 6925bd996c3a4b75c9f381957159d2dab328e4db5ec991fd9c90b8a68a069f59874e3c48775ecbebedaebf17bc435354bf69ca252cc3118970b7cdd4de4cbf4e WHIRLPOOL 46555fea9c36241c28762172c7147e69358a2504b424d797bcb03d7f3ad9a27991dd9ca21cec3c79012814ae48604f9d3eac0a50e928d94e253c018071f2c6f3
+MISC metadata.xml 377 SHA256 21c731d5dd2bc15c95b8a479de3e46eefa0dcae249f215e914ed1af590649940 SHA512 32b8efb0840e8fe60cad0a97c3b59e9a46a26aa7e309fb74c452068ad275c962ea7aafb1841d02bbd10563732ffae6015d6e9a28bf6e95b6632da9d519cce0fb WHIRLPOOL f15d71fb037d2f9d28fabcc37f746d7b6e5e29f5f3ce570db52c9ffbcc5a91bfa7a7b01f3cbf59f1297f75cb7fc988785e168eeea99e3a6afe95e603fed7872b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlJzwIMACgkQVWmRsqeSphPU0gCfe4jrx9wQ2AEvEijaFyqzAyTz
-svYAn3eu/nkty/Cu8NM2G5BP9Wo8ERCN
-=szKG
+iEYEAREIAAYFAlQYjkEACgkQVWmRsqeSphM4zwCeJVCg0mecrGgQcpnJ1NaSrK18
+17QAnRL3J1QcVwD32KDq9wV8GtEWdaTb
+=N+Iv
 -----END PGP SIGNATURE-----
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() {