gentoo resync : 10.02.2019

4 files changed, 11 insertions, 54 deletions

diff --git a/www-client/surf/Manifest b/www-client/surf/Manifest
index 246e41c54b66..31ca134238b4 100644
--- a/www-client/surf/Manifest
+++ b/www-client/surf/Manifest
@@ -1,6 +1,6 @@
 AUX surf-2.0-gentoo.patch 2393 BLAKE2B ba68e17f77bb631f42e477837e392008526e5786a2657370e0e9698f7e6e0862fab4780d292e5bab1a336dbffcbcde730db7474f1e11b08e98b0c54ae19ea15a SHA512 7c431dca5805eda29f68d52798f1b6bfc9df89ee342fb183241f6cf06a760ae7bb61dd6a976c2b21404edf25afae25b9696971d8a1ba0904045af2914d64a8db
-AUX surf-9999-gentoo.patch 1954 BLAKE2B c0113e09e8fd477d23e3d5c2993ab8e54dffed5f2b90a0f87d1d9b339de4249609a20d809274f67ea695af6818e4f90c632f2f18da81f5a113274e4988a62c84 SHA512 57d271279bf691f8035954ba6e2de1eac0b3e25a06b0f40ba180544fdaefb5ae96c8c2ca532bb151cf8ddc7d95f26cd296270a706941757dfe8a2198ad8e49b0
+AUX surf-9999-gentoo.patch 1116 BLAKE2B e7d129d1e1a9faea353cf0aac58a3f1d149dc6afd550dfb2031acf1aa35c1b47066953f3dbbf3d964b2eefdd450818a827e7d34d9f6fa57f5f145aaeb8b89de7 SHA512 9e3a2df6f7765c9db8c3a67904792cace82eae9a3255e389eb3cadd164fe3c6b21fddb55984b00a3559f787820b59e17dd4d0b17f29f21aa153fb1d1027ae317
 DIST surf-2.0.tar.gz 19056 BLAKE2B d9ef974ec14ce1ddf2437a43ccb0f424ada75d64ce926b19ac56f072d3589e6d251220842372f100f835ffbcccea2c402306a0c9f19f25462f5cb69fe4d7d175 SHA512 75798bb189fa2c2c93827672089a86cf155aa7b5c7c1a0887a34817ca41763907e44a02f52947535d37a043f827d2c0fe75d16a3d172079f9cab8da341e4c0c5
-EBUILD surf-2.0.ebuild 1472 BLAKE2B 8a85ff13f6ae02240349d6918d5a43cd6baf2391d0d5bf8863dd2e9b7d63c47eeec563a8b16dc16edbcd9e6d05c31bf1c03162794f74f4f31e74fc8f126f4ca6 SHA512 482ddab7ae4a5916a06c5c8d6a30be0947acd107413a8a175677d93664f2d8f389c2500067e511d8bb0eff2426cc14ea4ac1c3973355e99f66f43a7a17330f81
-EBUILD surf-9999.ebuild 1262 BLAKE2B 7b6edd37f53a2c490d3169134ad53fdfafeb5c93e35459692815466c6c61358c2041ca16bfc40c5011675d4becd9627f59725ba4b05032e4df61d49907b7e9b7 SHA512 bfa4c7cbf17e9abdf97e1e1c37d1c2693f135f3dcd5734f214383dac90e9921a5cd496a7c72e61cb80ff309518cf1da10a931c7896f946bac49b7096cb228e18
+EBUILD surf-2.0.ebuild 1216 BLAKE2B ac3980a08b6fd54ebb1c8424578ede2d0a1e4a911071cc62b8c506901f26453a031c4297c45d7fdae68ae391ad13c991c6df2590640cd5f77222030d9ea95b83 SHA512 a176f138ebb9779d94a94e5ff274390be1043b20cccf1130b14f8212d19c0a43063d6b34b6f7f2fc2daf9a2de4f3f52f3b80de55bb2af7ca075dc7c673ec44d1
+EBUILD surf-9999.ebuild 1241 BLAKE2B 6fdc7ed699a0049912a7e926792b9d419afe0ce9be3e07f6a6880742c1c5d97f563b02cccdd156f1119e6ad6ba6b610ef018b44cf4c85f9e8af6fa924f1b3d8a SHA512 750abaefc4b75e6e363f5d4a7b9ae48ed2e7e24d6ba9d1c8a79c8c6d6ae82f4e98339b191d04bd42d9c9a5abed7a2875b5f5eda12a2bcddd5039e77da809c1b9
 MISC metadata.xml 391 BLAKE2B 6717a4467323f201068033f9435a5dcba159ac8fa49f47495891de79b82193a3c1199ac6cb5c8ffcf5d28cee1d484cb0f53bee79d0a4649e6b283c1f5896c634 SHA512 cbfbe5cdabbe5c9a41b6a190fc675518fbbc682d47b2dce2c832e0afa8fbab0c5d0cce48d3666252d352ca2fd47788b928d69ca616a5258b4abf7873bf4c53f0
diff --git a/www-client/surf/files/surf-9999-gentoo.patch b/www-client/surf/files/surf-9999-gentoo.patch
index 79c5964ed6a0..7b783e8feb89 100644
--- a/www-client/surf/files/surf-9999-gentoo.patch
+++ b/www-client/surf/files/surf-9999-gentoo.patch
@@ -1,6 +1,8 @@
+diff --git a/config.mk b/config.mk
+index 5e68e38..fa45b55 100644
 --- a/config.mk
 +++ b/config.mk
-@@ -4,18 +4,18 @@
+@@ -4,18 +4,18 @@ VERSION = 2.0
  # Customize below to fit your system
  
  # paths
@@ -19,48 +21,11 @@
 -GTKLIB = `pkg-config --libs gtk+-3.0 gcr-3 webkit2gtk-4.0`
 -WEBEXTINC = `pkg-config --cflags webkit2gtk-4.0 webkit2gtk-web-extension-4.0`
 -WEBEXTLIBS = `pkg-config --libs webkit2gtk-4.0 webkit2gtk-web-extension-4.0`
-+GTKINC = $(shell $(PKG_CONFIG) --cflags gtk+-3.0 gcr-3 gthread-2.0)
-+GTKLIB = $(shell $(PKG_CONFIG) --libs gtk+-3.0 gcr-3 gthread-2.0)
++GTKINC = $(shell $(PKG_CONFIG) --cflags gtk+-3.0 gcr-3 webkit2gtk-4.0)
++GTKLIB = $(shell $(PKG_CONFIG) --libs gtk+-3.0 gcr-3 webkit2gtk-4.0)
 +WEBEXTINC = $(shell $(PKG_CONFIG) --cflags webkit2gtk-4.0 webkit2gtk-web-extension-4.0)
 +WEBEXTLIBS = $(shell $(PKG_CONFIG) --libs webkit2gtk-4.0 webkit2gtk-web-extension-4.0)
  
  # includes and libs
  INCS = $(X11INC) $(GTKINC)
-@@ -24,7 +24,7 @@
- # flags
- CPPFLAGS = -DVERSION=\"$(VERSION)\" -DWEBEXTDIR=\"$(LIBDIR)\" \
-            -D_DEFAULT_SOURCE -DGCR_API_SUBJECT_TO_CHANGE
--SURFCFLAGS = $(INCS) $(CPPFLAGS)
-+SURFCFLAGS = $(INCS) $(CPPFLAGS) $(CFLAGS)
- WEBEXTCFLAGS = -fPIC $(WEBEXTINC)
- 
- # compiler
---- a/Makefile
-+++ b/Makefile
-@@ -9,7 +9,7 @@
- WEBEXTSRC = libsurf-webext.c
- WEBEXTOBJ = $(WEBEXTSRC:.c=.o)
- 
--all: options libsurf-webext.so surf
-+all: libsurf-webext.so surf
- 
- options:
- 	@echo surf build options:
-@@ -19,7 +19,7 @@
- 	@echo "LDFLAGS       = $(LDFLAGS)"
- 
- .c.o:
--	$(CC) $(SURFCFLAGS) $(CFLAGS) -c $<
-+	$(CC) $(WEBEXTCFLAGS) $(SURFCFLAGS) $(CFLAGS) -c $<
- 
- config.h:
- 	cp config.def.h $@
-@@ -33,7 +33,7 @@
- 	$(CC) -shared -Wl,-soname,$@ $(LDFLAGS) -o $@ $< $(WEBEXTLIBS) -lc
- 
- surf: $(OBJ)
--	$(CC) $(SURFLDLAGS) $(LDFLAGS) -o $@ $(OBJ) $(LIBS)
-+	$(CC) $(WEBEXTLIBS) $(LDFLAGS) -o $@ $(OBJ) $(LIBS)
- 
- clean:
- 	rm -f surf $(OBJ)
+
diff --git a/www-client/surf/surf-2.0.ebuild b/www-client/surf/surf-2.0.ebuild
index 734ac2bd45d7..02e1b0915dd5 100644
--- a/www-client/surf/surf-2.0.ebuild
+++ b/www-client/surf/surf-2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -65,10 +65,3 @@ src_install() {
 
 	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 2156192b7477..d145e1256629 100644
--- a/www-client/surf/surf-9999.ebuild
+++ b/www-client/surf/surf-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,6 @@ KEYWORDS=""
 COMMON_DEPEND="
 	app-crypt/gcr[gtk]
 	dev-libs/glib:2
-	net-libs/libsoup
 	net-libs/webkit-gtk:4
 	x11-libs/gtk+:3
 	x11-libs/libX11