Add epatch_user, remove xterm dependency (bug #481700 by Ari Malinen).

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

3 files changed, 74 insertions, 6 deletions

diff --git a/www-client/surf/ChangeLog b/www-client/surf/ChangeLog
index b671bd78aa94..b71c1a90c1e7 100644
--- a/www-client/surf/ChangeLog
+++ b/www-client/surf/ChangeLog
@@ -1,6 +1,11 @@
 # 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.27 2013/04/08 11:57:06 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/surf/ChangeLog,v 1.28 2013/09/12 15:01:44 jer Exp $
+
+*surf-0.6-r1 (12 Sep 2013)
+
+  12 Sep 2013; Jeroen Roovers <jer@gentoo.org> +surf-0.6-r1.ebuild:
+  Add epatch_user, remove xterm dependency (bug #481700 by Ari Malinen).
 
   08 Apr 2013; Jeroen Roovers <jer@gentoo.org> -surf-0.5.ebuild:
   Old.
diff --git a/www-client/surf/Manifest b/www-client/surf/Manifest
index 5b659b84c8dc..eeab256d98ed 100644
--- a/www-client/surf/Manifest
+++ b/www-client/surf/Manifest
@@ -2,13 +2,14 @@
 Hash: SHA256
 
 DIST surf-0.6.tar.gz 14781 SHA256 fdc1ccfaee5c4f008eeb8fe5f9200d3ad71296e8d7af52bdd6a771f111866805 SHA512 f3550535351e37296280d33d229998e1f00aa605d0dab4a58944cf213721e823a1cfd9134b7bca2a4d61e265122a30d5dc917a290163ed8af2b24cd75d41a100 WHIRLPOOL 2a163d450b47b4964ce3686d76bf6e3a747984f0e86f84e2dccfa9d3e885bc26adf0100cdef48ae19d91f34a2d14d6c4950d2a7db7d333612e2b1fc48b077f99
+EBUILD surf-0.6-r1.ebuild 1608 SHA256 582fd97ef56b4fd2e43010a31d440e237feed63fa62b557e559b405b9283be96 SHA512 a9d628d5899278059b7946810a6804ceaf3a918b0302db98d30644fbc4718dd2b55d23fea201b7f564485a6450c6bb7f8d601ec016fc89cc1f8715db7fd891da WHIRLPOOL ccedb4f656d63d14361e18857c40f60da8542cec4494cb3856585bf6124d078db6e5256f40fd1e65603a0ef24fd82b473f769dbaf07c4d277c545fe9298fa49d
 EBUILD surf-0.6.ebuild 1635 SHA256 6dbe4619e5f9cfebae90ef0dd7e9288b0f3191c4f7b8aeed9be8b08b03660325 SHA512 e4d5e3c9ae5c87d7de044505f89720a85aa1d675ec3ea47f86e39c628937d3b32e924356a1e3b36000bfd4986e8c34e63a9fda6606b681ee20cd6ae0e71d2455 WHIRLPOOL d2d5fb7415c100db67343471a57ad66ace64e8c64499354f0a30c0faf447bcabe715945cd0056179dc34ad6ea7ccccb937ea36ea2bc9707a91e8ba73c4932cd5
-MISC ChangeLog 3538 SHA256 58b721445d8d4c39e943b8e8c1fc08e9eb22ed35fc956d41ffd131ff1621b0f2 SHA512 d79a633902e7ee0a9150c3c42202a8338e0cb3d39d0996ba4e26ee614860224e9b26850e6ac81a2c04544ca6d33c85ff839f3b430601906d548bd0339ec30dc2 WHIRLPOOL 188ab080bd31ad19ec0fb46939e6ed1918712294c52673cefdb5bea0a69955d5c2d2a54c4cd5346744994ed75afefe2d94e1b20d9a39cf82b522045ce58750a0
+MISC ChangeLog 3708 SHA256 1a9972d5c0777aed40a3f79593c4a207d9e9b3485b982766d991fab850fa2063 SHA512 230ba5d013043794d7bde86508c66b6fcbd23145c8ec6fd4204e69fadeec65f666b2c73deee9949879465817a734bb9fab56091d792d31fa3168d2e4652c3205 WHIRLPOOL 914f70d9e9ba685f932d0300595a92fe115bc270eb804d9e60419a3aa3dac464aed237bc09e8a0a61e37cf5a711b2abb7d2348f4c528206a9bfe5763c5a19d9c
 MISC metadata.xml 230 SHA256 529c3320b250d179bb9e9ae651a88ba3f2a1bca78cd1ab07d5aef28d571960ce SHA512 a7a1138a00026b873623549a80248ee704c039921fd65203098c1f81c9c4532f142de26a2743720e6a108273f4ac547a8707909f3e6001dd5844b0e7e275dba7 WHIRLPOOL dc42bdbbe8863903771b14c2511223d0a3c2c94d543cc2e211269312e522bc6cb352af4568a4a307ad1163c6feb8852d61652694ae00616f6abbdcecf840d5d7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlFisJMACgkQVWmRsqeSphO6XQCfYEZ9kwWz0EoOa3HbxBmPe+3J
-NuMAn2xEkB/cHuSl3bUzIpU7PsHLHhub
-=mG9L
+iEYEAREIAAYFAlIx11oACgkQVWmRsqeSphNFTwCePUqmITOoAnIp/0y6ijGawE15
+ScoAnA4edQMvllElwTZyIAjRpI2SijP0
+=QHfj
 -----END PGP SIGNATURE-----
diff --git a/www-client/surf/surf-0.6-r1.ebuild b/www-client/surf/surf-0.6-r1.ebuild
new file mode 100644
index 000000000000..4149f450904e
--- /dev/null
+++ b/www-client/surf/surf-0.6-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/surf/surf-0.6-r1.ebuild,v 1.1 2013/09/12 15:01:44 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"
+IUSE=""
+
+DEPEND="
+	dev-libs/glib
+	net-libs/libsoup
+	net-libs/webkit-gtk:2
+	x11-libs/gtk+:2
+	x11-libs/libX11
+"
+RDEPEND="
+	!sci-chemistry/surf
+	!savedconfig? ( net-misc/wget )
+	x11-apps/xprop
+	x11-misc/dmenu
+	${DEPEND}
+"
+
+pkg_setup() {
+	elog "net-misc/wget will be installed by default to"
+	elog "support the default download command, which can be changed through"
+	elog "the savedconfig mechanism. If you enable USE=savedconfig, you will"
+	elog "need to satisfy requirements for the alternative download command"
+	elog "yourself."
+}
+
+src_prepare() {
+	epatch_user
+	sed -i \
+		-e 's|{|(|g;s|}|)|g' \
+		-e 's|\t@|\t|g;s|echo|@&|g' \
+		-e 's|^LIBS.*|LIBS = $(GTKLIB) -lgthread-2.0|g' \
+		-e 's|^LDFLAGS.*|LDFLAGS += $(LIBS)|g' \
+		-e 's|^CC.*|CC ?= gcc|g' \
+		-e 's|^CFLAGS.*|CFLAGS += -std=c99 -pedantic -Wall $(INCS) $(CPPFLAGS)|g' \
+		config.mk Makefile || die
+	restore_config config.h
+	tc-export CC
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="/usr" install
+	save_config config.h
+}
+
+pkg_postinst() {
+	ewarn "Please correct the permissions of your \$HOME/.surf/ directory"
+	ewarn "and its contents to no longer be world readable (see bug #404983)"
+}