gentoo resync : 03.03.2019

8 files changed, 84 insertions, 67 deletions

diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index 6544eb94166c..faeb57b7838f 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/pidgin-opensteamworks/Manifest b/x11-plugins/pidgin-opensteamworks/Manifest
index 31b4ee9aa4e4..3aaeb01ea19c 100644
--- a/x11-plugins/pidgin-opensteamworks/Manifest
+++ b/x11-plugins/pidgin-opensteamworks/Manifest
@@ -1,7 +1,4 @@
 AUX pidgin-opensteamworks-1.3-Makefile 760 BLAKE2B 9af0f207bf79d4596dd4b2d061b2b5bea64f7e3575ce7ab22b5670bb57fc3cde982784995cf9277ca099bea47d5a772d965c148584f292c4650fd7c075fa8b5a SHA512 fba48067f726ebb9bfd5dba8074b4314d5c15999cf6b4bfa57ddc2a64eb2fc0f5694d1164f7670b2e60de6492e403cb63915ccf3f6c91c380c1df570bbdd0901
 DIST pidgin-opensteamworks-1.6.1.tar.gz 750495 BLAKE2B 890e1765eda10c31e927be320a8bf8af0da4c9e01b8cea31810c0ff7a0c27d1a8f54b213b323132a6c1087dd853937a0b5cce93eeef308412a505cd1696eb5f4 SHA512 9f025538460dda01d769501326cf7ac597e069bdef3437eea89f392bede7e620e854a8c0b0659315a0834c8f2f60a38680f1f1bdccdb65d3b13f64f7981ee55b
-DIST pidgin-opensteamworks-icons.zip 3252 BLAKE2B 5973d60c3b38659e77bdb0d01af0da710a2456956c816e616e88e148b4336db5363ca9fc7c629513f2f8117a13f437e2cbc33400ce8a6080a038885d7957cae8 SHA512 823f400bb4df9c6ddb65d8a01ec182fbbadeb955bc3e9590e88773b092b0cf79e50fc6c20d9b72def7fe9f8d6e1ac7cc087fbdb3f6ed4b76c343a29f18e6ea06
-DIST steam-mobile-1.4.tar.bz2 23293 BLAKE2B 81234ac8457522c7b686741090e48175a5ce8262aaa3a35bcc822cf784f57a43d2360a0fe8369026bca0077be0bafb5fc31c3c5ec0570c4b58291ad16d900f80 SHA512 20ac50ea49c1c0724aeb839fe46ac8a9b5a52d903ebf9bb18ab665fd32cdc4d80a426a0c2714724495ee73d758da2dbb891ac618b0689239485841fe6e6c0953
-EBUILD pidgin-opensteamworks-1.4.ebuild 998 BLAKE2B 4586cdff01154cdf5b5d622990ea2cf5e88af2329ec864c411fca2c033b666ab19718c62f81b1ed6a1a05d925149ffe93aa79a9ae68a4471c4c22d83e0341741 SHA512 f555d4469bd62c85d7166c74a82f8cdec78fb3ea9caf514357520394809205fee01a768fecbe23d1e59acd9fa5a817adb99423737246aa6df5470c09e0349574
-EBUILD pidgin-opensteamworks-1.6.1.ebuild 1122 BLAKE2B 93cc88c88306aaf31c313167b433e3ae5faf0b58cbe09f39e451a255101dbcd0001537d81b759761bf6c22b75953c77cbacc3e9cd3164fe0a0462269b33ea0ad SHA512 54a2e5db393e3398404833f47fe4d90f90e0ad456b1160924bc4e225871a9b7756db2e093566d640bade35abe08a46e756abbf9576519e34fc1c7c281e5dce54
+EBUILD pidgin-opensteamworks-1.6.1.ebuild 1121 BLAKE2B 5cfcf799df0e39f9624c1344e442e832f7c15f9cd33399dae4148f7744c204a9bde0e08b1413d60013ce1fb3985fe67045ab696141e8894ab0d1dfdaaacc1a57 SHA512 d50918ab876ba934023cf02fbad71b0793f599419c094c4a72e3c69d1f929eba9a7f75e65539ff5b22f0f515c06d42c9c817a80ded4f7bc39225f6f09076f1d2
 MISC metadata.xml 453 BLAKE2B efbaec17f3323688a2a60f7ec27d279a6169d2e8bae3a544149e24344bcee36fd586f9065618d11602a2d9be30de965bb857731f94d33faad372bfb74a919811 SHA512 ebfb6e3364b44a8727015c856eb4ae213cc8ae88fe7b520e2968d0e7cbe6d0aae15ab0408c58158c469da5e77b70478d7c8da4f290792081fe4c7c4502a7e8f8
diff --git a/x11-plugins/pidgin-opensteamworks/pidgin-opensteamworks-1.4.ebuild b/x11-plugins/pidgin-opensteamworks/pidgin-opensteamworks-1.4.ebuild
deleted file mode 100644
index 98b76b3d4917..000000000000
--- a/x11-plugins/pidgin-opensteamworks/pidgin-opensteamworks-1.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs
-
-DESCRIPTION="Steam protocol plugin for pidgin"
-HOMEPAGE="https://github.com/eionrobb/pidgin-opensteamworks"
-SRC_URI="https://pidgin-opensteamworks.googlecode.com/files/steam-mobile-${PV}.tar.bz2
-	https://pidgin-opensteamworks.googlecode.com/files/icons.zip
-	-> ${PN}-icons.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-RDEPEND="dev-libs/glib:2
-	dev-libs/json-glib
-	dev-libs/nss
-	gnome-base/libgnome-keyring
-	net-im/pidgin"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	virtual/pkgconfig"
-
-S=${WORKDIR}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		tc-export CC PKG_CONFIG
-	fi
-}
-
-src_prepare() {
-	# see https://code.google.com/p/pidgin-opensteamworks/issues/detail?id=31
-	cp "${FILESDIR}"/${PN}-1.3-Makefile "${S}"/Makefile || die
-}
-
-src_install() {
-	default
-	insinto /usr/share/pixmaps/pidgin/protocols
-	doins -r "${WORKDIR}"/{16,48}
-}
diff --git a/x11-plugins/pidgin-opensteamworks/pidgin-opensteamworks-1.6.1.ebuild b/x11-plugins/pidgin-opensteamworks/pidgin-opensteamworks-1.6.1.ebuild
index 59067a62c0e8..4cbbdc43091c 100644
--- a/x11-plugins/pidgin-opensteamworks/pidgin-opensteamworks-1.6.1.ebuild
+++ b/x11-plugins/pidgin-opensteamworks/pidgin-opensteamworks-1.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/EionRobb/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 RDEPEND="dev-libs/glib:2
diff --git a/x11-plugins/purple-hangouts/Manifest b/x11-plugins/purple-hangouts/Manifest
index 8d84737db8cd..a172f8692e25 100644
--- a/x11-plugins/purple-hangouts/Manifest
+++ b/x11-plugins/purple-hangouts/Manifest
@@ -1,8 +1,9 @@
-DIST purple-hangouts-0_p20180328.tar.gz 149992 BLAKE2B a9db51f236859806625ecaa70a18a39584278cd7865a3212355d4f88dd5a5d3da589ebc9a26ca24f5e3190ea37748251525b4f44e15124109f8902ed573bf127 SHA512 f20d3e7625d7d617c50a911a758af9131cee4d02f948db3f396e0241c0d556dd65070aff2f7f5f1db56e61a9e91975fed420d7d17e0c7c80f1714cab08e342c5
+AUX purple-hangouts-0_p20181202-makefile.patch 3436 BLAKE2B 6b572ff61aa158ebd7531df35e14a94947b5d6a90e284094f4a260828aa02b6a5afdf1fe7c52b725331b73952f0c902110285f88f4b2a3deb243f0c6aa4de45b SHA512 439c25f456ee7415b92d9ed82fec25fa4500299c77eaad20e0f1b9f8dcce5d7f466971da9a2b9f6966d366ddfb75cb4e19433015e7519eb97d17ea11dd4767d7
 DIST purple-hangouts-0_p20181024.tar.gz 150600 BLAKE2B 4dc9b689642b73d242d89f780188d581aac2524665048ef2c35606b2d15a852e6ef111238d1f7a3c65895555d8169c96a7158767ec2a6fa5fb6645fc3f5260eb SHA512 e1200845e64f20aef1b75bd8d7a128fa6b1fe2b731c7d83db876900e2bac988007f04d59996c86c78190770186210401af5a51e0ed490c0027a0933445ce125b
 DIST purple-hangouts-0_p20181108.tar.gz 150585 BLAKE2B faf357ed7f6e58fab49d18dce65b181b5462cfb2c60f074d4a3a9bdfe7fcf0df179e842d7ec4053c323902b214e299b4be7c336bb1fa65257c95babecef1940f SHA512 eb7c522eb51fe82607a643d2b9f817ec5671e4b98a727de8ba73863cda213b8744dd601875febc9cd24eaf6b7213c22034d23d9f6093c542c29524a430ffe464
-EBUILD purple-hangouts-0_p20180328.ebuild 1011 BLAKE2B fcdfa1998875f84f706e096b0aeaf7417ae0e36be53de0f60228e8935e1f2a6235d4dc6c6d68370bbcb2c5e3fba2a3ffc3e6d47b75aa6acb3328d3eb5d83e5ef SHA512 9391ccf695bf4656f03ed64ca065069f90b0145fb2243cfd0e212b2d70ca80e5f6ba0fafe78f9ded0f66cd628de67f7a6d89f2a1ce1be332d986570f4409be14
+DIST purple-hangouts-0_p20181202.tar.gz 151968 BLAKE2B ae487b77e2322fb2e02ceeb5c1cd5eb9eed1aaa71ea47d9f6e032802e2d17da1bf3160a11f4aaa64bd5a95aa67936b867e5a31958efdbdcc80736a96335f3b24 SHA512 4b7ec1b26040f706d2d7badeb667967ac7da1bbabab259c630cec0460ed275ae20e1c4d8303205c757bade38cd23f57d6f7d6f61735a5d189f69f423ed972227
 EBUILD purple-hangouts-0_p20181024.ebuild 1008 BLAKE2B 3af6f001904d98317e37f11d861225faae819134a5756f591feb2d77a5ccc0cd94be0243bf3bfb9f46322983f541992b475230474d659d42311dcc636594e82c SHA512 63bac60236a9c49da137b07f471d962ee46f1d0d74921d11c53809769b56f15639ab7b3b2b442e28a3636523df5faa758998d235f030d1dfdebfd2b817dd85b4
 EBUILD purple-hangouts-0_p20181108.ebuild 1017 BLAKE2B 9ed371441c3f3fda88345e5edd03b8d6186797723b832cdce46ad7f82321adb6777bcdbc18e194d2fce90b967e95e813c4e324653f00d70613bd9a3a46d34aa1 SHA512 ad3307e6f952b04d7cd792bc29e7024f1f0789ba4eb85928feb3cf9ff65a5cf087a1b6fbb5862a60f8a403f57af8443d49cc76c613a49a7a23b1d45ee13d8614
-EBUILD purple-hangouts-9999.ebuild 783 BLAKE2B cfb5b7ee0f0cdbc3aef75c9d2b9f514043ba357e7b35e908b59a026004b19dad2e50dbe2d0f451b073b556b9ff9eea8d86b98bbe2d999740d1b32554db479417 SHA512 b82a0ba75492b21337dc42052e8a0ea335ca6dc0239fc2b5a2679d47b97073d2dbc8e1dbc7493b21e6fcd254fa650c958ea6c2f13d799fbdea55a20acafe8219
+EBUILD purple-hangouts-0_p20181202.ebuild 954 BLAKE2B bf961017bd39d5480d9788ed9091b4166b0d9797c23b0ca54e171976328a8b9a5553d70dc0e19d298ea88f25754551a39200845f727ea14146028306e9c241e6 SHA512 0537b1f5d438fb72bf28cec5f1ebb551852e7ed50c642cab0985f5b0fd9486aceb493f0aba67acdaf642b1c9c65e34c0d370c3eca066f9d25de03bd57c927c27
+EBUILD purple-hangouts-9999.ebuild 843 BLAKE2B de3d55cdecbbb1475b8383c5723aa7096bcda4df9c8dbc07a217951589d3f83e7b6f52ae19c37d0e1c52ab690c56b040d5b00d14afcb6e913ca5c1c1918e5501 SHA512 4f3b2ae2a0c102983e1d0535680833d1a6651830aaf749bce0a1386a5b1098d3b87f42a93b12455479b3e889ac75a1b8b83117328335af5059280773b17d7064
 MISC metadata.xml 463 BLAKE2B 558c5baffa16e75ac65c79d77a024e9ad3efdd2ec18a5e1027b59e4bc64cd86ff41d459cf0a019d0e3f202b863566c5eb502fe49ff3438585976a4993f183b00 SHA512 8208ce706b102de7a1565b817805f010964831387cb685499ca6e78cd0a46eb2deb97ac69b51d7c71c9bb455de5d1feaec6f51a30f6bb68299533af538138482
diff --git a/x11-plugins/purple-hangouts/files/purple-hangouts-0_p20181202-makefile.patch b/x11-plugins/purple-hangouts/files/purple-hangouts-0_p20181202-makefile.patch
new file mode 100644
index 000000000000..a575a449c2aa
--- /dev/null
+++ b/x11-plugins/purple-hangouts/files/purple-hangouts-0_p20181202-makefile.patch
@@ -0,0 +1,65 @@
+# HG changeset patch
+# User Stefan Strogin <stefan.strogin@gmail.com>
+# Date 1544083567 -7200
+#      Thu Dec 06 10:06:07 2018 +0200
+# Branch make
+# Node ID 938b9b0dc4fb7b22f8d110e9259899602fe7c1ba
+# Parent  cccf2f62d439fc3dd6248014d171efc811f89f2b
+Compile source files separately. Fixes issue #192
+
+diff -r cccf2f62d439 -r 938b9b0dc4fb Makefile
+--- a/Makefile	Sun Dec 02 22:34:01 2018 +1300
++++ b/Makefile	Thu Dec 06 10:06:07 2018 +0200
+@@ -57,11 +57,13 @@
+       HANGOUTS_DEST =

+ 	  HANGOUTS_ICONS_DEST =

+     else

++      CFLAGS := $(CFLAGS) -fPIC $(INCLUDES) -Ipurple2compat $(PROTOBUF_OPTS) `$(PKG_CONFIG) purple glib-2.0 json-glib-1.0 zlib --libs --cflags`

+       HANGOUTS_TARGET = libhangouts.so

+       HANGOUTS_DEST = $(DESTDIR)`$(PKG_CONFIG) --variable=plugindir purple`

+ 	  HANGOUTS_ICONS_DEST = $(DESTDIR)`$(PKG_CONFIG) --variable=datadir purple`/pixmaps/pidgin/protocols

+     endif

+   else

++    CFLAGS := $(CFLAGS) -fPIC $(INCLUDES) $(PROTOBUF_OPTS) `$(PKG_CONFIG) purple-3 glib-2.0 json-glib-1.0 zlib --libs --cflags`

+     HANGOUTS_TARGET = libhangouts3.so

+     HANGOUTS_DEST = $(DESTDIR)`$(PKG_CONFIG) --variable=plugindir purple-3`

+ 	HANGOUTS_ICONS_DEST = $(DESTDIR)`$(PKG_CONFIG) --variable=datadir purple-3`/pixmaps/pidgin/protocols

+@@ -75,12 +77,10 @@
+ WIN32_PIDGIN2_LDFLAGS = -L$(PIDGIN_TREE_TOP)/libpurple $(WIN32_LDFLAGS)

+ WIN32_PIDGIN3_LDFLAGS = -L$(PIDGIN3_TREE_TOP)/libpurple -L$(WIN32_DEV_TOP)/gplugin-dev/gplugin $(WIN32_LDFLAGS) -lgplugin

+ 

+-C_FILES := hangouts.pb-c.c hangout_media.pb-c.c gmail.pb-c.c hangouts_json.c hangouts_pblite.c hangouts_connection.c hangouts_auth.c hangouts_events.c hangouts_conversation.c hangouts_media.c

+-PURPLE_COMPAT_FILES := purple2compat/http.c purple2compat/purple-socket.c

+-PURPLE_C_FILES := libhangouts.c $(C_FILES)

+-TEST_C_FILES := hangouts_test.c $(C_FILES)

+-

+-

++OBJ := hangouts.pb-c.o hangout_media.pb-c.o gmail.pb-c.o hangouts_json.o hangouts_pblite.o hangouts_connection.o hangouts_auth.o hangouts_events.o hangouts_conversation.o hangouts_media.o

++PURPLE_COMPAT_FILES := purple2compat/http.o purple2compat/purple-socket.o

++PURPLE_C_FILES := libhangouts.c $(OBJ)

++TEST_C_FILES := hangouts_test.c $(OBJ)

+ 

+ .PHONY:	all install FAILNOPURPLE clean

+ 

+@@ -96,10 +96,10 @@
+ 	$(PROTOC_C) --c_out=. gmail.proto

+ 

+ libhangouts.so: $(PURPLE_C_FILES) $(PURPLE_COMPAT_FILES)

+-	$(CC) -fPIC $(CFLAGS) -shared -o $@ $^ $(LDFLAGS) $(PROTOBUF_OPTS) `$(PKG_CONFIG) purple glib-2.0 json-glib-1.0 zlib --libs --cflags` -ldl $(INCLUDES) -Ipurple2compat -g -ggdb

++	$(CC) $(CFLAGS) -shared -o $@ $^ $(LDFLAGS) -ggdb -ldl

+ 

+ libhangouts3.so: $(PURPLE_C_FILES)

+-	$(CC) -fPIC $(CFLAGS) -shared -o $@ $^ $(LDFLAGS) $(PROTOBUF_OPTS) `$(PKG_CONFIG) purple-3 glib-2.0 json-glib-1.0 zlib --libs --cflags` -ldl $(INCLUDES) -g -ggdb

++	$(CC) $(CFLAGS) -shared -o $@ $^ $(LDFLAGS) -ggdb -ldl

+ 

+ libhangouts.dll: $(PURPLE_C_FILES) $(PURPLE_COMPAT_FILES)

+ 	$(WIN32_CC) -shared -o $@ $^ $(WIN32_PIDGIN2_CFLAGS) $(WIN32_PIDGIN2_LDFLAGS) -Ipurple2compat

+@@ -126,7 +126,7 @@
+ 	echo "You need libpurple development headers installed to be able to compile this plugin"

+ 

+ clean:

+-	rm -f $(HANGOUTS_TARGET) hangouts.pb-c.h hangouts.pb-c.c hangout_media.pb-c.h hangout_media.pb-c.c

++	rm -f $(HANGOUTS_TARGET) $(OBJ) $(PURPLE_COMPAT_FILES) hangouts.pb-c.h hangouts.pb-c.c hangout_media.pb-c.h hangout_media.pb-c.c

+ 

+ 

+ installer: purple-hangouts.nsi libhangouts.dll

diff --git a/x11-plugins/purple-hangouts/purple-hangouts-0_p20180328.ebuild b/x11-plugins/purple-hangouts/purple-hangouts-0_p20181202.ebuild
index 2f251ace4492..9b57ae98908d 100644
--- a/x11-plugins/purple-hangouts/purple-hangouts-0_p20180328.ebuild
+++ b/x11-plugins/purple-hangouts/purple-hangouts-0_p20181202.ebuild
@@ -1,22 +1,17 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit toolchain-funcs
 
 DESCRIPTION="Hangouts Plugin for libpurple"
 HOMEPAGE="https://bitbucket.org/EionRobb/purple-hangouts"
 
-if [[ ${PV} == 9999 ]]; then
-	inherit mercurial
-	EHG_REPO_URI="https://bitbucket.org/EionRobb/purple-hangouts"
-else
-	COMMIT_ID="0e137e6bf9e9"
-	SRC_URI="https://bitbucket.org/EionRobb/purple-hangouts/get/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/EionRobb-${PN}-${COMMIT_ID}"
-fi
+COMMIT_ID="cccf2f62d439"
+SRC_URI="https://bitbucket.org/EionRobb/purple-hangouts/get/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+S="${WORKDIR}/EionRobb-${PN}-${COMMIT_ID}"
 
 LICENSE="GPL-3+"
 SLOT="0"
@@ -28,8 +23,10 @@ RDEPEND="
 	net-im/pidgin
 	sys-libs/zlib"
 
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${PN}-0_p20181202-makefile.patch" )
 
 src_prepare() {
 	default
diff --git a/x11-plugins/purple-hangouts/purple-hangouts-9999.ebuild b/x11-plugins/purple-hangouts/purple-hangouts-9999.ebuild
index fa9a49d18aeb..df8116adca8c 100644
--- a/x11-plugins/purple-hangouts/purple-hangouts-9999.ebuild
+++ b/x11-plugins/purple-hangouts/purple-hangouts-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,6 +22,8 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}/${PN}-0_p20181202-makefile.patch" )
+
 src_prepare() {
 	default