Sync 0.6-r1 changes. Clean up 0.6-r1 some more.

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

6 files changed, 169 insertions, 35 deletions

diff --git a/www-client/surf/ChangeLog b/www-client/surf/ChangeLog
index c037beb5e789..77bbe9eaacc0 100644
--- a/www-client/surf/ChangeLog
+++ b/www-client/surf/ChangeLog
@@ -1,6 +1,10 @@
 # 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.31 2013/10/04 14:35:29 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/surf/ChangeLog,v 1.32 2013/10/04 14:52:10 jer Exp $
+
+  04 Oct 2013; Jeroen Roovers <jer@gentoo.org> surf-0.6-r1.ebuild,
+  surf-9999.ebuild, files/surf-0.6-gentoo.patch, +files/surf-9999-gentoo.patch:
+  Sync 0.6-r1 changes. Clean up 0.6-r1 some more.
 
   04 Oct 2013; Jeroen Roovers <jer@gentoo.org> surf-0.6-r1.ebuild:
   Determine REPLACING_VERSIONS to conditionally call ewarn.
diff --git a/www-client/surf/Manifest b/www-client/surf/Manifest
index 924634077b46..e786ff81606f 100644
--- a/www-client/surf/Manifest
+++ b/www-client/surf/Manifest
@@ -1,17 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX surf-0.6-gentoo.patch 4044 SHA256 9e737140ca580ee957e8409b1801de0547caede71e8a14b8a62559ab9bf7518e SHA512 2e4a4c8eb8f685a5bbaf3f8dd5a4ebbab6384e935491242a0a2d7d5172725d4505b691a916d6ba96bd92070e7e85b04c7afadf8dec19401a719fd9c01c7bf9c1 WHIRLPOOL 817e5987f2a6a2feee68a788b72614bc5e929e5248d94afea321640c7eb157e3687e5547f4ef6e8b9c015a9499072ad994d18818b1b8c5d214feba64efeac3c5
+AUX surf-0.6-gentoo.patch 3910 SHA256 064a20bde58da9c5b7ac0d52ef16a40ec9ee1b06a5b4266a49f477098b129df3 SHA512 4a64127f4360afe4fcd4a00ebcf2d7ae8c6041d06215821abd61f99642ee4485c62f35cf39d72cfc8821286c3a3967773d734730c2e7751eef48b7a7a1936224 WHIRLPOOL 6f868c33a4ee455355fa556bedda9f20aa2698cfcfb775f5882004134af839ed39b64d2af29a989117c8746f15edf5d3e2a1d493b50b1651d16379839c7ae06a
+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 1549 SHA256 c212c92f67f3ae0e245ddd7530424033e3bad671a3739c7e01c07f31521a0ebd SHA512 e47e17b35bce09e14f6cee28911800f44f10a55912c2a1c460a60ea87a7f66dbdc0c7dbd7802981194d9e2de29249445cf093de3369ddb140784b9a8ef501d6d WHIRLPOOL af51d03481361d4951d66e15bff7d4531f967155e4e82368e172b05d86612c6fcac2f00b74f72ca4c48510aaf029d29daf20418c8719f95948aa748ef6c266b3
+EBUILD surf-0.6-r1.ebuild 1518 SHA256 110126f406d83b374cd544d2209318c21a5cb8ce2e6b7a700bea08eab08c014f SHA512 cca602d9290628c1de1420fb71dd33c289baf0c6bdb6f9d84fd51cda2c2507265ef74b2ef65a44cda7f3830678baaf95678c1266a5bc9d2e38326313714b44c1 WHIRLPOOL 8d41a42c5726af6d9c1085a6e87b4e9f1ed0367e733f5637885cc5ea6f041081e25111f8da6e8904530375a7b6fb3cccd69f5c2217781c8a2565948cef64b33a
 EBUILD surf-0.6.ebuild 1635 SHA256 6dbe4619e5f9cfebae90ef0dd7e9288b0f3191c4f7b8aeed9be8b08b03660325 SHA512 e4d5e3c9ae5c87d7de044505f89720a85aa1d675ec3ea47f86e39c628937d3b32e924356a1e3b36000bfd4986e8c34e63a9fda6606b681ee20cd6ae0e71d2455 WHIRLPOOL d2d5fb7415c100db67343471a57ad66ace64e8c64499354f0a30c0faf447bcabe715945cd0056179dc34ad6ea7ccccb937ea36ea2bc9707a91e8ba73c4932cd5
-EBUILD surf-9999.ebuild 1470 SHA256 b5e2864605479b390188d3bb65b1955e3a94390686ebd97fc0c6c97ff08e38a3 SHA512 50916cbda2ef94834054dde0e52fae27dd02859a279f0250d3e47a785346ed1ab529279dcc5adb830c1f53b6d25c96d2010421ac0d223763afe4c478adcbdc37 WHIRLPOOL 9361f2c912ef714c2bbd7ceb2a19b3945e9acfdf35f3fbe109b63b799413b21dc5dae5d50a8f65a57cca796fb3c94d7a58480a0020f85604f10c4b94a1246b11
-MISC ChangeLog 4258 SHA256 41cfbfae777de315d5c6a581b0db5395ef030b0a6b44ed974a1f6131a01fc2fa SHA512 b3619984e89c3c5a43f2284741c1f318cdce9d2550d6104e07ad1e22e1bdf27ce778b47d8b6f7607949c02c69432cfe5aef5f4b6843ebe0b3169b2ccad470636 WHIRLPOOL 5df9ab4ec59ce61a0e3f3bfea9939f6e567b166951a367989c8c97ef77dae96ae35f8bd9f010a7d74b1f4d59667cc3ad23742787b4222d51ab30862cb3daca1c
+EBUILD surf-9999.ebuild 1251 SHA256 604823db679b5f106ab7c6c1ba7cba22f0cf1cdd2e9c362aa93d2eb128bef0ea SHA512 03abd726c897a66725980d5d1524e2a69b8aa21c587ced77e632da5c8fb26f85e9e3d1082352ac75e096762f8451e7eb24a22435ad49191239f9fc11d3ecd819 WHIRLPOOL 2dadc932721c2ce7f410d59371760dbb3deb20f2dc8a92346109de2ff7d7b31ea14795ced67cedeb52e76862a292c5e09118f0d680eb17918f4a2c6195aa78e6
+MISC ChangeLog 4456 SHA256 0dce8c3a60f49fad870bf6058402dd9c5908359540807628e1c68faaad8d9cb3 SHA512 6c40894be52bd6bef81b740f34a7bffe3f492630135696014ca78041793f0ebd8bde00574d031209685725df29f4fd64e5f4e07095450015dcdfa952de5ac00b WHIRLPOOL ae25c14765cc9c825fed6b538b1e895d3b5d3a7e7b92aa885186cc22b1ce54733e7aaefda32b30c98146876a7ab27a46723237380b3be940daa5cf43a16320a5
 MISC metadata.xml 230 SHA256 529c3320b250d179bb9e9ae651a88ba3f2a1bca78cd1ab07d5aef28d571960ce SHA512 a7a1138a00026b873623549a80248ee704c039921fd65203098c1f81c9c4532f142de26a2743720e6a108273f4ac547a8707909f3e6001dd5844b0e7e275dba7 WHIRLPOOL dc42bdbbe8863903771b14c2511223d0a3c2c94d543cc2e211269312e522bc6cb352af4568a4a307ad1163c6feb8852d61652694ae00616f6abbdcecf840d5d7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlJO0jIACgkQVWmRsqeSphNGmgCfSfS3OqHEWpyCq+01yAbsjNrH
-G28An3QlPq04FvqGxhFoIWfWigpBASQF
-=it86
+iEYEAREIAAYFAlJO1hsACgkQVWmRsqeSphMPSACdHNuD8D4YIrQAYNp8zGgJC18P
+ocoAn3ODj9YW70v2NgvNL0Q0P/2jhYPx
+=we8O
 -----END PGP SIGNATURE-----
diff --git a/www-client/surf/files/surf-0.6-gentoo.patch b/www-client/surf/files/surf-0.6-gentoo.patch
index 7fc29489834d..cda644baa84e 100644
--- a/www-client/surf/files/surf-0.6-gentoo.patch
+++ b/www-client/surf/files/surf-0.6-gentoo.patch
@@ -1,5 +1,5 @@
---- a/config.mk	2013-02-10 19:40:14.000000000 +0100
-+++ b/config.mk	2013-10-04 16:11:28.773331797 +0200
+--- a/config.mk
++++ b/config.mk
 @@ -4,27 +4,27 @@
  # Customize below to fit your system
  
@@ -16,14 +16,14 @@
  
 -GTKINC = `pkg-config --cflags gtk+-2.0 webkit-1.0`
 -GTKLIB = `pkg-config --libs gtk+-2.0 webkit-1.0`
-+GTKINC = $(shell $(PKG_CONFIG) --cflags gtk+-2.0 webkit-1.0)
-+GTKLIB = $(shell $(PKG_CONFIG) --libs gtk+-2.0 webkit-1.0)
++GTKINC = $(shell $(PKG_CONFIG) --cflags gtk+-2.0 gthread-2.0 webkit-1.0)
++GTKLIB = $(shell $(PKG_CONFIG) --libs gtk+-2.0 gthread-2.0 webkit-1.0)
  
  # includes and libs
 -INCS = -I. -I/usr/include -I${X11INC} ${GTKINC}
 -LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${GTKLIB} -lgthread-2.0
 +INCS = -I. -I/usr/include $(X11INC) $(GTKINC)
-+LIBS = $(X11LIB) $(GTKLIB) -lgthread-2.0
++LIBS = $(X11LIB) $(GTKLIB)
  
  # flags
 -CPPFLAGS = -DVERSION=\"${VERSION}\" -D_BSD_SOURCE
@@ -42,8 +42,8 @@
  # compiler and linker
 -CC = cc
 +CC ?= gcc
---- a/Makefile	2013-02-10 19:40:14.000000000 +0100
-+++ b/Makefile	2013-10-04 16:05:02.230549420 +0200
+--- a/Makefile
++++ b/Makefile
 @@ -4,58 +4,58 @@
  include config.mk
  
diff --git a/www-client/surf/files/surf-9999-gentoo.patch b/www-client/surf/files/surf-9999-gentoo.patch
new file mode 100644
index 000000000000..cda644baa84e
--- /dev/null
+++ b/www-client/surf/files/surf-9999-gentoo.patch
@@ -0,0 +1,133 @@
+--- a/config.mk
++++ b/config.mk
+@@ -4,27 +4,27 @@
+ # Customize below to fit your system
+ 
+ # paths
+-PREFIX = /usr/local
+-MANPREFIX = ${PREFIX}/share/man
++PREFIX = /usr
++MANPREFIX = $(PREFIX)/share/man
+ 
+-X11INC = /usr/X11R6/include
+-X11LIB = /usr/X11R6/lib
++X11INC = $(shell $(PKG_CONFIG) --cflags x11)
++X11LIB = $(shell $(PKG_CONFIG) --libs x11)
+ 
+-GTKINC = `pkg-config --cflags gtk+-2.0 webkit-1.0`
+-GTKLIB = `pkg-config --libs gtk+-2.0 webkit-1.0`
++GTKINC = $(shell $(PKG_CONFIG) --cflags gtk+-2.0 gthread-2.0 webkit-1.0)
++GTKLIB = $(shell $(PKG_CONFIG) --libs gtk+-2.0 gthread-2.0 webkit-1.0)
+ 
+ # includes and libs
+-INCS = -I. -I/usr/include -I${X11INC} ${GTKINC}
+-LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${GTKLIB} -lgthread-2.0
++INCS = -I. -I/usr/include $(X11INC) $(GTKINC)
++LIBS = $(X11LIB) $(GTKLIB)
+ 
+ # flags
+-CPPFLAGS = -DVERSION=\"${VERSION}\" -D_BSD_SOURCE
+-CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
+-LDFLAGS = -g ${LIBS}
++CPPFLAGS = -DVERSION=\"$(VERSION)\" -D_BSD_SOURCE
++CFLAGS += -std=c99 -pedantic -Wall $(INCS) $(CPPFLAGS)
++LDFLAGS += $(LIBS)
+ 
+ # Solaris
+-#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
+-#LDFLAGS = ${LIBS}
++#CFLAGS = -fast $(INCS) -DVERSION=\"$(VERSION)\"
++#LDFLAGS = $(LIBS)
+ 
+ # compiler and linker
+-CC = cc
++CC ?= gcc
+--- a/Makefile
++++ b/Makefile
+@@ -4,58 +4,58 @@
+ include config.mk
+ 
+ SRC = surf.c
+-OBJ = ${SRC:.c=.o}
++OBJ = $(SRC:.c=.o)
+ 
+ all: options surf
+ 
+ options:
+ 	@echo surf build options:
+-	@echo "CFLAGS   = ${CFLAGS}"
+-	@echo "LDFLAGS  = ${LDFLAGS}"
+-	@echo "CC       = ${CC}"
++	@echo "CFLAGS   = $(CFLAGS)"
++	@echo "LDFLAGS  = $(LDFLAGS)"
++	@echo "CC       = $(CC)"
+ 
+ .c.o:
+ 	@echo CC $<
+-	@${CC} -c ${CFLAGS} $<
++	$(CC) -c $(CFLAGS) $<
+ 
+-${OBJ}: config.h config.mk
++$(OBJ): config.h config.mk
+ 
+ config.h:
+ 	@echo creating $@ from config.def.h
+-	@cp config.def.h $@
++	cp config.def.h $@
+ 
+-surf: ${OBJ}
++surf: $(OBJ)
+ 	@echo CC -o $@
+-	@${CC} -o $@ surf.o ${LDFLAGS}
++	$(CC) -o $@ surf.o $(LDFLAGS)
+ 
+ clean:
+ 	@echo cleaning
+-	@rm -f surf ${OBJ} surf-${VERSION}.tar.gz
++	rm -f surf $(OBJ) surf-$(VERSION).tar.gz
+ 
+ dist: clean
+ 	@echo creating dist tarball
+-	@mkdir -p surf-${VERSION}
+-	@cp -R LICENSE Makefile config.mk config.def.h README \
++	mkdir -p surf-$(VERSION)
++	cp -R LICENSE Makefile config.mk config.def.h README \
+ 		surf-open.sh arg.h TODO.md surf.png \
+-		surf.1 ${SRC} surf-${VERSION}
+-	@tar -cf surf-${VERSION}.tar surf-${VERSION}
+-	@gzip surf-${VERSION}.tar
+-	@rm -rf surf-${VERSION}
++		surf.1 $(SRC) surf-$(VERSION)
++	tar -cf surf-$(VERSION).tar surf-$(VERSION)
++	gzip surf-$(VERSION).tar
++	rm -rf surf-$(VERSION)
+ 
+ install: all
+-	@echo installing executable file to ${DESTDIR}${PREFIX}/bin
+-	@mkdir -p ${DESTDIR}${PREFIX}/bin
+-	@cp -f surf ${DESTDIR}${PREFIX}/bin
+-	@chmod 755 ${DESTDIR}${PREFIX}/bin/surf
+-	@echo installing manual page to ${DESTDIR}${MANPREFIX}/man1
+-	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
+-	@sed "s/VERSION/${VERSION}/g" < surf.1 > ${DESTDIR}${MANPREFIX}/man1/surf.1
+-	@chmod 644 ${DESTDIR}${MANPREFIX}/man1/surf.1
++	@echo installing executable file to $(DESTDIR)$(PREFIX)/bin
++	mkdir -p $(DESTDIR)$(PREFIX)/bin
++	cp -f surf $(DESTDIR)$(PREFIX)/bin
++	chmod 755 $(DESTDIR)$(PREFIX)/bin/surf
++	@echo installing manual page to $(DESTDIR)$(MANPREFIX)/man1
++	mkdir -p $(DESTDIR)$(MANPREFIX)/man1
++	sed "s/VERSION/$(VERSION)/g" < surf.1 > $(DESTDIR)$(MANPREFIX)/man1/surf.1
++	chmod 644 $(DESTDIR)$(MANPREFIX)/man1/surf.1
+ 
+ uninstall:
+-	@echo removing executable file from ${DESTDIR}${PREFIX}/bin
+-	@rm -f ${DESTDIR}${PREFIX}/bin/surf
+-	@echo removing manual page from ${DESTDIR}${MANPREFIX}/man1
+-	@rm -f ${DESTDIR}${MANPREFIX}/man1/surf.1
++	@echo removing executable file from $(DESTDIR)$(PREFIX)/bin
++	rm -f $(DESTDIR)$(PREFIX)/bin/surf
++	@echo removing manual page from $(DESTDIR)$(MANPREFIX)/man1
++	rm -f $(DESTDIR)$(MANPREFIX)/man1/surf.1
+ 
+ .PHONY: all options clean dist install uninstall
diff --git a/www-client/surf/surf-0.6-r1.ebuild b/www-client/surf/surf-0.6-r1.ebuild
index a5e35e67c50e..5df6b2e1392c 100644
--- a/www-client/surf/surf-0.6-r1.ebuild
+++ b/www-client/surf/surf-0.6-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.4 2013/10/04 14:35:29 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/surf/surf-0.6-r1.ebuild,v 1.5 2013/10/04 14:52:10 jer Exp $
 
 EAPI=5
 inherit eutils savedconfig toolchain-funcs
@@ -12,7 +12,6 @@ SRC_URI="http://dl.suckless.org/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 COMMON_DEPEND="
 	dev-libs/glib
@@ -26,8 +25,8 @@ DEPEND="
 	virtual/pkgconfig
 "
 RDEPEND="
-	${COMMON_DEPEND}
 	!sci-chemistry/surf
+	${COMMON_DEPEND}
 	x11-apps/xprop
 	x11-misc/dmenu
 "
@@ -40,20 +39,20 @@ pkg_setup() {
 		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."
+		elog "1) Installing these packages, or"
+		elog "2) Setting USE=savedconfig and changing config.h accordingly."
 	fi
 }
 
 src_prepare() {
-	epatch_user
 	epatch "${FILESDIR}"/${P}-gentoo.patch
+	epatch_user
 	restore_config config.h
 	tc-export CC PKG_CONFIG
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	default
 	save_config config.h
 }
 
diff --git a/www-client/surf/surf-9999.ebuild b/www-client/surf/surf-9999.ebuild
index 3dbb5b83269e..7bc41252b0fc 100644
--- a/www-client/surf/surf-9999.ebuild
+++ b/www-client/surf/surf-9999.ebuild
@@ -1,6 +1,6 @@
 # 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-9999.ebuild,v 1.1 2013/09/12 15:33:09 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/surf/surf-9999.ebuild,v 1.2 2013/10/04 14:52:10 jer Exp $
 
 EAPI=5
 inherit eutils git-2 savedconfig toolchain-funcs
@@ -13,18 +13,22 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
 
-DEPEND="
+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
-	${DEPEND}
 "
 
 pkg_setup() {
@@ -41,20 +45,13 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
 	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
+	tc-export CC PKG_CONFIG
 }
 
 src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" install
+	default
 	save_config config.h
 }