gentoo resync : 12.05.2022

3 files changed, 0 insertions, 119 deletions

diff --git a/x11-plugins/purple-hangouts/Manifest b/x11-plugins/purple-hangouts/Manifest
index ee9655960ebd..d23ff3d4f05f 100644
--- a/x11-plugins/purple-hangouts/Manifest
+++ b/x11-plugins/purple-hangouts/Manifest
@@ -1,6 +1,3 @@
-AUX purple-hangouts-0_p20181202-makefile.patch 3436 BLAKE2B 6b572ff61aa158ebd7531df35e14a94947b5d6a90e284094f4a260828aa02b6a5afdf1fe7c52b725331b73952f0c902110285f88f4b2a3deb243f0c6aa4de45b SHA512 439c25f456ee7415b92d9ed82fec25fa4500299c77eaad20e0f1b9f8dcce5d7f466971da9a2b9f6966d366ddfb75cb4e19433015e7519eb97d17ea11dd4767d7
-DIST purple-hangouts-0_p20181202.tar.gz 151968 BLAKE2B ae487b77e2322fb2e02ceeb5c1cd5eb9eed1aaa71ea47d9f6e032802e2d17da1bf3160a11f4aaa64bd5a95aa67936b867e5a31958efdbdcc80736a96335f3b24 SHA512 4b7ec1b26040f706d2d7badeb667967ac7da1bbabab259c630cec0460ed275ae20e1c4d8303205c757bade38cd23f57d6f7d6f61735a5d189f69f423ed972227
 DIST purple-hangouts-0_p20200710.tar.gz 153541 BLAKE2B 7a71cb5fdb7ca0636b4eb3d4245347e057e879a6b855451b9330f33cec6ba1a15da071e916a3e3d38094700cd61178947e5aa749e6182d3d0488e01c673568f5 SHA512 ce650c1ee1052803576e163905e906bb6202ce04ea380b52ae7524ec896ad785c1a89a5bc713242e3ad5df2d3ae677e0bd5323c7533daedaf6ac333d8e2f5b34
-EBUILD purple-hangouts-0_p20181202.ebuild 954 BLAKE2B bf961017bd39d5480d9788ed9091b4166b0d9797c23b0ca54e171976328a8b9a5553d70dc0e19d298ea88f25754551a39200845f727ea14146028306e9c241e6 SHA512 0537b1f5d438fb72bf28cec5f1ebb551852e7ed50c642cab0985f5b0fd9486aceb493f0aba67acdaf642b1c9c65e34c0d370c3eca066f9d25de03bd57c927c27
 EBUILD purple-hangouts-0_p20200710.ebuild 908 BLAKE2B 1f24fc2c710cc98e272b131e04c60c968cb2184e47f8ed5deb2d064e83ed0bf776c9b1768afa3dcc1b176877bfec654f9e8b5c7fb824b777ddb3148acc43da7a SHA512 c8de10160b87cda29d542990ad1f4c7186158fc7145adb174b595f17936ad45652d783184b7d44979ec7ba608e9b6281a28c1d984704edaba75107a93842b66c
 MISC metadata.xml 257 BLAKE2B 83a13a4bd728b69f9b80a22401842e6e5c3408d681e8818071e586b5335b4d7f927803a24d3768c560222fbf7b1fd48fdf6c76bf77f65149846d81844d09d83d SHA512 7be3477437879835856da292d7aeb70e477cb93c41d94ddfd8ec2028e34f4a482fc2e7e8479e09061277b063a3abacc90aa1958ec59acc711c67d61b2c90105f
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
deleted file mode 100644
index a575a449c2aa..000000000000
--- a/x11-plugins/purple-hangouts/files/purple-hangouts-0_p20181202-makefile.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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_p20181202.ebuild b/x11-plugins/purple-hangouts/purple-hangouts-0_p20181202.ebuild
deleted file mode 100644
index 9b57ae98908d..000000000000
--- a/x11-plugins/purple-hangouts/purple-hangouts-0_p20181202.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Hangouts Plugin for libpurple"
-HOMEPAGE="https://bitbucket.org/EionRobb/purple-hangouts"
-
-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"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/json-glib
-	dev-libs/protobuf-c:=
-	net-im/pidgin
-	sys-libs/zlib"
-
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/${PN}-0_p20181202-makefile.patch" )
-
-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
-}