gentoo auto-resync : 07:08:2024 - 12:37:20

4 files changed, 89 insertions, 7 deletions

diff --git a/net-im/bitlbee-facebook/Manifest b/net-im/bitlbee-facebook/Manifest
index 8e59905a3d99..403b5df7b3f4 100644
--- a/net-im/bitlbee-facebook/Manifest
+++ b/net-im/bitlbee-facebook/Manifest
@@ -1,4 +1,6 @@
+AUX bitlbee-facebook-1.2.2-fix-make-deps.patch 1301 BLAKE2B ea6a7dd89cabca9c54dacc552a2f23ae3b27d35259c8a1b12481f19c1e1ed92ffb22a1b78c54f5fc302761ab8bfc4d6fd5bdda10720b5e848080b633b285b032 SHA512 484f6db201d6b94015927e73524bb995582b5848307b7253f55d946ad958a1d11439bbd9f2af93ba0550cf1cf5bc3c2282d571287c5d9c21fad6f33399b65483
 DIST bitlbee-facebook-1.2.2.tar.gz 71918 BLAKE2B 674cb8565f88faff695d5b14010036f6d3c65bcdab9a6fba84c5f0d775a59d02abfd863be5af4ddc7c3361a49c6345d0ef57bbd8b02202b7e24e62b31c2c6844 SHA512 534e7e704e7ddd296c810819171b9c4770747dde109a9bbdfb41fc05602b1d9ad9bfd2ec6c7a62ffb0c85ec61252b1597217cdee7ccffd191da897a7d40085cc
+EBUILD bitlbee-facebook-1.2.2-r1.ebuild 798 BLAKE2B 14a86600327963bb5091f17cd8959c1c8b0be89bc4a3fe34cd0ee8015393811bb0d2ae6c9cc546297c70a7b56755a7e528f3acd3b8b228478c2748bbceeab4fa SHA512 bc7f55efd0bf2a2ba63beb554cc900341beac4dba7c2c2152644b1568664eeee9e0fa62f42512a39570db51d9a6779e9426ab6733b87355e65379231ca36de92
 EBUILD bitlbee-facebook-1.2.2.ebuild 751 BLAKE2B 8807a4c4233572d7ac4ec79c6e0c6fbe5d39178a59aa5a603c3c81c896d076e4a1a1293cbfd5731ec4114ec9d7178ad53b451cf244a7603c1439808f20aefde8 SHA512 c4d15b3464192673f919ca9213ee9b7f02d09094296be7a75fe0ec7e51e94eaf476ee85bc87bfb95e166187d45432594f81c4190dc80f385c6d19476f99c9cf9
-EBUILD bitlbee-facebook-9999.ebuild 753 BLAKE2B 27a143ad5011f02145a6f15341da55b954272fea34a001c48bc2690255928bb81f636de9cb4310b9b54ea4c4d3637b3be818736e20cdc606deb17b94367e39fc SHA512 21302c339cbf958640919e11ea0e5417c581592bc5273e26fd7e2e3886234263f0e4e1942bcce913f478b5df153b6676846c03a730d128dcfd357c82042890ef
+EBUILD bitlbee-facebook-9999.ebuild 745 BLAKE2B 36171b8b2711f852493cbafb49a130a92313e458c4afd4c4cb19462855e8df875c172ab7fae5bcba6f7ac389c2bbf3c73ec63b44f9646ee56f18b1b596f99c7f SHA512 8a7e530dd11645a676fb507f177de7b409c07f5709a2b4b7a627f75af4911c8df94714d4fd3db99bc098c76b016dcb3c8c2b83950797a85a838e57135b0a1d28
 MISC metadata.xml 521 BLAKE2B 52ae86adf3021965ae9600db7da80b3ae713f92c5abbe8af4bcda3cc64d007e5ceaaa3c862eb2d69dd98e87a908b5bb27ccf32087c4ab33bb01818fddd1485a0 SHA512 b3b4f9a509e5b9f447a1d74b317352c3c8c25b67faa81b221dd3da9a2cc0f7918b09c332cb338fc49f5df9aad6f0e6b97684392b0b7e2c04c4b5c1a97c9f1803
diff --git a/net-im/bitlbee-facebook/bitlbee-facebook-1.2.2-r1.ebuild b/net-im/bitlbee-facebook/bitlbee-facebook-1.2.2-r1.ebuild
new file mode 100644
index 000000000000..b4093a7b8c5e
--- /dev/null
+++ b/net-im/bitlbee-facebook/bitlbee-facebook-1.2.2-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2017-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Facebook protocol plugin for BitlBee"
+HOMEPAGE="https://github.com/bitlbee/bitlbee-facebook"
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit	git-r3
+	EGIT_REPO_URI="https://github.com/bitlbee/bitlbee-facebook"
+else
+	SRC_URI="https://github.com/bitlbee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/json-glib
+	>=net-im/bitlbee-3[plugins]"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-make-deps.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-im/bitlbee-facebook/bitlbee-facebook-9999.ebuild b/net-im/bitlbee-facebook/bitlbee-facebook-9999.ebuild
index f7a43704ab51..7563f3db8c1c 100644
--- a/net-im/bitlbee-facebook/bitlbee-facebook-9999.ebuild
+++ b/net-im/bitlbee-facebook/bitlbee-facebook-9999.ebuild
@@ -1,17 +1,13 @@
-# Copyright 2017-2019 Gentoo Authors
+# Copyright 2017-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools
 
 DESCRIPTION="Facebook protocol plugin for BitlBee"
 HOMEPAGE="https://github.com/bitlbee/bitlbee-facebook"
 
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
 if [[ ${PV} == *9999 ]] ; then
 	inherit	git-r3
 	EGIT_REPO_URI="https://github.com/bitlbee/bitlbee-facebook"
@@ -20,6 +16,9 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
+LICENSE="GPL-2"
+SLOT="0"
+
 RDEPEND="
 	dev-libs/glib:2
 	dev-libs/json-glib
diff --git a/net-im/bitlbee-facebook/files/bitlbee-facebook-1.2.2-fix-make-deps.patch b/net-im/bitlbee-facebook/files/bitlbee-facebook-1.2.2-fix-make-deps.patch
new file mode 100644
index 000000000000..458302a06ab8
--- /dev/null
+++ b/net-im/bitlbee-facebook/files/bitlbee-facebook-1.2.2-fix-make-deps.patch
@@ -0,0 +1,38 @@
+From b63e0697ee6809e7460ebc4918c72fb99b256bba Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyich@gmail.com>
+Date: Sun, 27 Nov 2022 17:15:37 +0000
+Subject: [PATCH] facebook/Makefile.am: add generated files to BUILT_SOURCES
+
+Without the change there is no giarantee that facebook-marshal.h
+gets built before it's dependencies. On `make-4.4` `--shuffle` is
+able to catch missing dependency as:
+
+    $ make --shuffle
+      CC       facebook_la-facebook-mqtt.lo
+    facebook-mqtt.c:23:10: fatal error: facebook-marshal.h: No such file or directory
+       23 | #include "facebook-marshal.h"
+          |          ^~~~~~~~~~~~~~~~~~~~
+
+Automake's BUILT_SOURCES builds all sources before first object file.
+The change pulls it there.
+
+Before the change 1-2 builds triggered `make --shuffle` failure.
+After the change 20 sequential rebuilds succeeded without failures.
+
+Upstream-PR: https://github.com/bitlbee/bitlbee-facebook/pull/217
+
+diff --git a/facebook/Makefile.am b/facebook/Makefile.am
+index 779abbe..f28bf4e 100644
+--- a/facebook/Makefile.am
++++ b/facebook/Makefile.am
+@@ -38,6 +38,10 @@ facebook_la_LDFLAGS += -module -avoid-version
+ EXTRA_DIST = \
+ 	marshaller.list
+ 
++BUILT_SOURCES = \
++	facebook-marshal.c \
++	facebook-marshal.h
++
+ CLEANFILES = \
+ 	facebook-marshal.c \
+ 	facebook-marshal.h