gentoo resync : 18.11.2018

4 files changed, 64 insertions, 11 deletions

diff --git a/x11-plugins/purple-hangouts/Manifest b/x11-plugins/purple-hangouts/Manifest
index 9a1c703f7362..5e43f9982ca2 100644
--- a/x11-plugins/purple-hangouts/Manifest
+++ b/x11-plugins/purple-hangouts/Manifest
@@ -1,7 +1,8 @@
-DIST purple-hangouts-0_p20170209.tar.gz 144521 BLAKE2B 09b7b733f83f69df172a4fe9893dc74666f9eeba0a7b73b5b46a8c20edeef75c84f9ceeddd17cd22590dfdd9f28a7880c4b7d8c97fb98d22484d6f8becfffce6 SHA512 aa5dda98e122cfdd7917b71c6f9e9322c9e8d4bf01b57569406004a7b0f0819b8170ef553088339a08a3932ff1e467a1779ec17acacc7f83af709e0596956d4c
 DIST purple-hangouts-0_p20170714.tar.gz 145914 BLAKE2B cb932c7c31bffe98c62b2ce77b39a2262689d59676f51d66b3c6cfe31a3319226d429ee241e37985c836389809089c633f7a04152659eb88195372259281465b SHA512 4b14eccd2140c98c88b5fb2bed6039306454484dc23c359b7860bc55997161bc8f5bbf1cb1939041bca40e98dd30afd224508903993031ee10dfb38b088d891e
 DIST purple-hangouts-0_p20180328.tar.gz 149992 BLAKE2B a9db51f236859806625ecaa70a18a39584278cd7865a3212355d4f88dd5a5d3da589ebc9a26ca24f5e3190ea37748251525b4f44e15124109f8902ed573bf127 SHA512 f20d3e7625d7d617c50a911a758af9131cee4d02f948db3f396e0241c0d556dd65070aff2f7f5f1db56e61a9e91975fed420d7d17e0c7c80f1714cab08e342c5
-EBUILD purple-hangouts-0_p20170209.ebuild 1015 BLAKE2B a3fcd6c45af0492d1233147da2409609897a1d85d37fa11eeb43370e0481bdb5e7376a8c1f6924448b34f0f5133bb0280a7379e9f170a4ba9e50970cf2938f06 SHA512 09f723c5e6a72596ee4e1a231928ad1a9edb0bc021cf09f3367449332240c28ed58a759bb244f3acbacfb2e969e0b50bab1c02570584297176a1bd763a20c640
+DIST purple-hangouts-0_p20181024.tar.gz 150600 BLAKE2B 4dc9b689642b73d242d89f780188d581aac2524665048ef2c35606b2d15a852e6ef111238d1f7a3c65895555d8169c96a7158767ec2a6fa5fb6645fc3f5260eb SHA512 e1200845e64f20aef1b75bd8d7a128fa6b1fe2b731c7d83db876900e2bac988007f04d59996c86c78190770186210401af5a51e0ed490c0027a0933445ce125b
 EBUILD purple-hangouts-0_p20170714.ebuild 1011 BLAKE2B b568a827ca99e1e42ec3f28fffb5da7d96828bb84cd3e3434f40571555d747a7b3c6adde943e79293e358da4fedf19ba515b133d47a7a273df4c633e73bb5ab5 SHA512 d1282849c7c6840194a0b54535a81682bcd130ca472681ec19afe8f8f29da37fd24078545ace929b47a67bdb8f20a2c75b5e8d63dad3d1dfa4228aade76bccd1
 EBUILD purple-hangouts-0_p20180328.ebuild 1011 BLAKE2B fcdfa1998875f84f706e096b0aeaf7417ae0e36be53de0f60228e8935e1f2a6235d4dc6c6d68370bbcb2c5e3fba2a3ffc3e6d47b75aa6acb3328d3eb5d83e5ef SHA512 9391ccf695bf4656f03ed64ca065069f90b0145fb2243cfd0e212b2d70ca80e5f6ba0fafe78f9ded0f66cd628de67f7a6d89f2a1ce1be332d986570f4409be14
-MISC metadata.xml 264 BLAKE2B 85dada98abdefab04b759e2d9b9283f0e7ce51004efd5b11459b53ceed2465a864668d9a6b4f458039c4c7be75105170993d6bcb5fd026386ef00dc20b08e917 SHA512 c34e7ca664e98ccc80b9980da675d09b6752b0497f3dbaa707a7ccf5d7033cd54194cda48767de3a1be912378d2117e2c7c20acc618aab3e9659372dea0643ce
+EBUILD purple-hangouts-0_p20181024.ebuild 1008 BLAKE2B 3af6f001904d98317e37f11d861225faae819134a5756f591feb2d77a5ccc0cd94be0243bf3bfb9f46322983f541992b475230474d659d42311dcc636594e82c SHA512 63bac60236a9c49da137b07f471d962ee46f1d0d74921d11c53809769b56f15639ab7b3b2b442e28a3636523df5faa758998d235f030d1dfdebfd2b817dd85b4
+EBUILD purple-hangouts-9999.ebuild 774 BLAKE2B 56b0a07005c10b7eaf5f3170e09029bb2808d485cc78a62ceeb19ddf326274ad4b8dbea2580f5fdfcd9271698bcadf72f561690d62f39f2a8c326ea3ffa30c76 SHA512 ab0625e350dbfd97ac1c0603ad8eb663657af7b6cdc2caa11c86429c6c2d820230cfcb9fe4c9aa4b3cb1e6ad1bd0dde8793e676fd03ba07271d5a6974957123f
+MISC metadata.xml 463 BLAKE2B 558c5baffa16e75ac65c79d77a024e9ad3efdd2ec18a5e1027b59e4bc64cd86ff41d459cf0a019d0e3f202b863566c5eb502fe49ff3438585976a4993f183b00 SHA512 8208ce706b102de7a1565b817805f010964831387cb685499ca6e78cd0a46eb2deb97ac69b51d7c71c9bb455de5d1feaec6f51a30f6bb68299533af538138482
diff --git a/x11-plugins/purple-hangouts/metadata.xml b/x11-plugins/purple-hangouts/metadata.xml
index 03d729b8c798..a6fcf93cf0b8 100644
--- a/x11-plugins/purple-hangouts/metadata.xml
+++ b/x11-plugins/purple-hangouts/metadata.xml
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="bitbucket">EionRobb/purple-hangouts</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>stefan.strogin@gmail.com</email>
+		<name>Stefan Strogin</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="bitbucket">EionRobb/purple-hangouts</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-plugins/purple-hangouts/purple-hangouts-0_p20170209.ebuild b/x11-plugins/purple-hangouts/purple-hangouts-0_p20181024.ebuild
index afcc47e83831..3954afa7a3b2 100644
--- a/x11-plugins/purple-hangouts/purple-hangouts-0_p20170209.ebuild
+++ b/x11-plugins/purple-hangouts/purple-hangouts-0_p20181024.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit mercurial
 	EHG_REPO_URI="https://bitbucket.org/EionRobb/purple-hangouts"
 else
-	COMMIT_ID="b7c56354ba8e"
+	COMMIT_ID="a044363c1883"
 	SRC_URI="https://bitbucket.org/EionRobb/purple-hangouts/get/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
 	S="${WORKDIR}/EionRobb-${PN}-${COMMIT_ID}"
@@ -32,7 +32,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 src_prepare() {
-	eapply_user
+	default
 
 	# Does not respect CFLAGS
 	sed -i Makefile -e 's/-g -ggdb//g' || die
diff --git a/x11-plugins/purple-hangouts/purple-hangouts-9999.ebuild b/x11-plugins/purple-hangouts/purple-hangouts-9999.ebuild
new file mode 100644
index 000000000000..2a8db6f38b1d
--- /dev/null
+++ b/x11-plugins/purple-hangouts/purple-hangouts-9999.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs mercurial
+
+DESCRIPTION="Hangouts Plugin for libpurple"
+HOMEPAGE="https://bitbucket.org/EionRobb/purple-hangouts"
+EHG_REPO_URI="https://bitbucket.org/EionRobb/purple-hangouts"
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/json-glib
+	dev-libs/protobuf-c:=
+	net-im/pidgin
+	sys-libs/zlib"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	# Does not respect CFLAGS
+	sed -i Makefile -e 's/-g -ggdb//g' || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)"
+}
+
+src_install() {
+	emake \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+		DESTDIR="${ED}" \
+		install
+
+	einstalldocs
+}