gentoo auto-resync : 23:08:2022 - 08:44:14

7 files changed, 37 insertions, 111 deletions

diff --git a/net-im/bitlbee/Manifest b/net-im/bitlbee/Manifest
index 6e2b53648d93..d4c4ed33ec57 100644
--- a/net-im/bitlbee/Manifest
+++ b/net-im/bitlbee/Manifest
@@ -3,12 +3,11 @@ AUX bitlbee-3.5-libevent.patch 1942 BLAKE2B a6233d97f17d2695efe13a6bd395ba77e72e
 AUX bitlbee-3.5-systemd-user.patch 188 BLAKE2B 9cdb3713aaf213b741a8dbef0a790a35458b955515bb720987471c519848ec6b9a232fe136ca554a3fe1eb0c184d96b8774cee4a41c0cd3d822a33598ac50e79 SHA512 1775b5dce7bdd4fbe52a46e361d8a9b0127be2dc32a3e8b438fca8fce9139903feb91c968847f002e099553eb8d4a110914cfb19121ae79a3f6c9eb100846edd
 AUX bitlbee-3.6-disabled-plugins-use.patch 1695 BLAKE2B 5c5ab3f330921a471da5fcc39c2156322eb040683ad0ee6894a4c9d189868e9af126c6530ff46879d48878771007c76c1e77b266ea3bcfdba5fc2fe7121ac7ac SHA512 9e7f2a25c70a0d2eca9b6731f568fc3b639b057bebf8131aa9f4089f0ce28761cd03035320cd88ba58c622ec342d08946f31fdec20e45d3b25fb316ac4fe0dfc
 AUX bitlbee-3.6-strict-aliasing.patch 1081 BLAKE2B 69dfd5114e763a40da4a4032fa10b94db69e9a3440f93462396de56078be1980e07bcc3e1c89e3422d8be568c5732c45df9c971c5db0b629f5c396618a660f29 SHA512 f1aa18124a8d6a3bbad2bf6b9c5f6572dd765a33a9a678719f5b980b04a235adfe6c06ff31fe31200260380ec4131202c5f58fd41296525fc6f73974d7ab43f4
-AUX bitlbee-3.6-system-json-parser.patch 2416 BLAKE2B f3b3e2f38fd92893120ddcf2b3825c81df5ae08a1fbf838f5421c0e085956f0a913783bddd2d8218e77bb6d1db0e0591e469d18099e42355a0cc411ad8a8c410 SHA512 f017205c67e0a57d74fc6480eb7a77a942626b83cd09a47201f4dd5f4e8f21f66643f3f448299d58aba5ef8254ca57d527e65d8d624453fef3a738d09d054206
-AUX bitlbee-9999-system-json-parser.patch 2448 BLAKE2B 70d0591724bd40ceb7a4e3da1dd1364b9b08238c6bf6ce0790b13657854a37a20f297d54597501c0bc628b8ab08b6ef2edc9e3de1710307f69b55307a4689799 SHA512 433e243e37df230ea8a3ef7a1ceeadbad3d5f556b25a67122522bdd6b5e51d03639e7a785e1bba667256687690f036d90bbc2297646498d3d48aee3c90748464
+AUX bitlbee-3.6-system-json-parser.patch 3188 BLAKE2B b11668741a29669e985ca805ca7884782a69c657a03c71b75efdc5de22af358c8c679a06651375cefeb91cb772509e6ec734c1c90c41df98f409a760323e9405 SHA512 a80fe4bb4f1e5edb3d67b839805135b1c5766ae3da1fc632c873e1daed3b2ad190c19e32da784f16fbe88f6305f27da42965c96129238be6da64ac6494b083c3
 AUX bitlbee.confd-r2 303 BLAKE2B 01ac57be4d6d50be227d6528425909a98231d3e5e2d7718ee71195890123145169a4be1568514b41b9509b992e747c4169022d31fb33c62e00a00f757307d8d8 SHA512 4ba7b8a81d5b77bd8ccd94431b065d4850c97bb153ca715f5f4ea6a1f9a6c90ab2c99fb9d6342311ae948bd34904a9cc2b3696f1b8f09e2475b79d254f744ae4
 AUX bitlbee.initd-r2 244 BLAKE2B 1f4900c9bcad2469ad97e4a4c34e58124e4e3634bbcb8d3c6d30b16ab343995870cfa27a33cfaff04df59fc52f888368d173966a2d5306b2adae98c72c28a305 SHA512 c965f8bbd2b3d13a6c66455a3cc503a94ea0c8000a0e41e283ce1828ee59105d162552979343e8ebb6513fd15bf44a4274b0558928ae0e89b424773cdb8b7b97
 DIST bitlbee-3.6.tar.gz 534961 BLAKE2B 007681a384fcb2c0736b901dfdc213ba0829ca006ad3204aca1bc4520a3874760867df6165a9218a9deeabb13bc06f118c9e2f804a97e671a348734f6cb7e963 SHA512 ccbf0f23e228de2de147241f36f59744b2256cba958e2fabfba0cfa60935e55bbb7d7e20fffa54da9a345e55ffa9ca82cb62e9b99dc738ba35c6e268c6561a8d
-EBUILD bitlbee-3.6-r2.ebuild 3429 BLAKE2B 6fe3a53244299cd65de9bef03574e80d682057b16927aaf311574b4bea67e7df4704eddab070f99e7d5f2c5882bdaa0eb18cb9b22168ccf52c6fa20ba553941a SHA512 d5dbd63b8ba6253b90c485a2587d951a4803f2fad76b838e73549929bed25e78ff378d59b16043896b3ec89040af40e497f2088d50b09f103c67e0e543da4394
-EBUILD bitlbee-3.6-r3.ebuild 3456 BLAKE2B ca4c8c900f0f2a4162cf81b01823c9e433b36ff5cba7ff2d639ff5a239143d0bbe0334d8a4bdd90685911605d427d3d4a2b3b06ed444f496ad72f9761a095a61 SHA512 2d6eac5608a402cdc889bd512b078a6e92ccf247ff2182a4720559264ae46ff6598886f29ab840e4e776584af5eae40a97f07a87ed72ad98ad9c591040b47643
-EBUILD bitlbee-9999.ebuild 3353 BLAKE2B 77f1d077fd562d6c995dedc72e7fbbb5449138ce25b5246b0a908f3fe4ef803a25bb0a44e1298b26d70fc3ffa3b7fadca1650d5f692acfb900d72d55cbe2c014 SHA512 603a0df44a93590b9a3d642e95da80c5305be5b62cb282686a7a934b7f3f690a78ff1401360bc4bb113b3cdfa89876cd9e8a8308376b74c6808f3026dfe9dc72
-MISC metadata.xml 1249 BLAKE2B c632b9333f1ece9f3ff98937466943f3e3cd00040402d77a3036e916f26a31cd6db4fd0448f84236830875b2e4bb8611d9cd3925166aff6840ab6d0511ac0d1f SHA512 6ebc32ca990a8904828f5b120e489669e5544e2d0dbba17aa627dde28d511d3cb7f9de86363134a0b5d629ad84e659a8834dac70dcdde0816e7ce1961dcd45eb
+EBUILD bitlbee-3.6-r2.ebuild 3390 BLAKE2B 8d99e3e33e37b880ca93138a8bfc576c930f7c1c11ed2c30eb3d8011185a8f788520a24ea60c300643fc0c0a0c57176bd02f249a9512e1bfaa9be85c38c5c423 SHA512 359e7d2ac0937ac96d3cfec2f33343ce84db022e3b5fe7d8a47950084429346f9688f6641b2e8544b5b43756aaf6b327bc970cd3bf8b5896d3c2e1a164f037f2
+EBUILD bitlbee-3.6-r3.ebuild 3417 BLAKE2B 425016fe04274398024ebdc53b7b7d15515862c0083615cd1f38f3df9b4d7bf55995d55590ee0238121d54770c398875b7caab68823439077f0ceb7d65ff775e SHA512 5b09002f798cdf3df4c60b0806ce7ab5c75287f61cd4c81d868d7c4dc6e279ebd9166b300012449cecc8d61cb7b679248085410e571021bf227c1a5745f0574d
+EBUILD bitlbee-9999.ebuild 3271 BLAKE2B fa7cb958175c9566c1d302a08217558a19bbe3c73b7625c5b45add30093f461ec6c0e315f575ab842ebdc4a26deda2631d476f9bc7535af45fe4ea36fd38f373 SHA512 9f75e517432005176eb00cea2ca8824482bd0ee59b6d0b6e4ea211440f6fe10c02c592465bc4ef172c037af996cc6339459b07f2654ce1c8f7d2b2da73157144
+MISC metadata.xml 1086 BLAKE2B 80323823cf9e17452240a2fabac2ea13afbb08f1e6d83e6a66fe9ab997052987aa0534952e682a37280e27b6ebbfd8119e75bd4b2974b25177e40eed4cf12cb3 SHA512 e10e08d69371c5b320a0cc1b8f6fc2fac2b237e96b660453df3e0ede55b7c99d2c5813b7d3a0177215e47b2a04e759c178641483fc460a283e5b351bdc2f1f83
diff --git a/net-im/bitlbee/bitlbee-3.6-r2.ebuild b/net-im/bitlbee/bitlbee-3.6-r2.ebuild
index 127f0a88198d..26f201ce42fd 100644
--- a/net-im/bitlbee/bitlbee-3.6-r2.ebuild
+++ b/net-im/bitlbee/bitlbee-3.6-r2.ebuild
@@ -20,16 +20,15 @@ HOMEPAGE="https://www.bitlbee.org/"
 
 LICENSE="GPL-2 BSD-2"
 SLOT="0"
-IUSE_PROTOCOLS="msn oscar purple twitter +xmpp"
+IUSE_PROTOCOLS="purple twitter +xmpp"
 IUSE="debug +gnutls ipv6 libevent nss otr +plugins selinux test xinetd
 	${IUSE_PROTOCOLS}"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
-	|| ( purple xmpp msn oscar )
+	|| ( purple xmpp )
 	purple? ( plugins )
-	test? ( plugins )
-	xmpp? ( !nss )
+	test? ( xmpp )
 "
 
 COMMON_DEPEND="
diff --git a/net-im/bitlbee/bitlbee-3.6-r3.ebuild b/net-im/bitlbee/bitlbee-3.6-r3.ebuild
index 72d2a7207ba2..01b8a33d3618 100644
--- a/net-im/bitlbee/bitlbee-3.6-r3.ebuild
+++ b/net-im/bitlbee/bitlbee-3.6-r3.ebuild
@@ -20,16 +20,15 @@ HOMEPAGE="https://www.bitlbee.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE_PROTOCOLS="msn oscar purple twitter +xmpp"
+IUSE_PROTOCOLS="purple twitter +xmpp"
 IUSE="debug +gnutls ipv6 libevent nss otr +plugins selinux test xinetd
 	${IUSE_PROTOCOLS}"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
-	|| ( purple xmpp msn oscar )
+	|| ( purple xmpp )
 	purple? ( plugins )
-	test? ( plugins )
-	xmpp? ( !nss )
+	test? ( xmpp )
 "
 
 COMMON_DEPEND="
diff --git a/net-im/bitlbee/bitlbee-9999.ebuild b/net-im/bitlbee/bitlbee-9999.ebuild
index 0a8cc973ae18..079feaea767b 100644
--- a/net-im/bitlbee/bitlbee-9999.ebuild
+++ b/net-im/bitlbee/bitlbee-9999.ebuild
@@ -20,16 +20,15 @@ HOMEPAGE="https://www.bitlbee.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE_PROTOCOLS="msn oscar purple twitter +xmpp"
+IUSE_PROTOCOLS="purple twitter +xmpp"
 IUSE="debug +gnutls ipv6 libevent nss otr +plugins selinux test xinetd
 	${IUSE_PROTOCOLS}"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
-	|| ( purple xmpp msn oscar )
+	|| ( purple xmpp )
 	purple? ( plugins )
-	test? ( plugins )
-	xmpp? ( !nss )
+	test? ( xmpp )
 "
 
 COMMON_DEPEND="
@@ -63,7 +62,6 @@ BDEPEND="${PYTHON_DEPS}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-3.5-systemd-user.patch"
-	"${FILESDIR}/${P}-system-json-parser.patch"
 )
 
 src_configure() {
@@ -116,7 +114,7 @@ src_configure() {
 		--libdir=/usr/$(get_libdir) \
 		--pcdir=/usr/$(get_libdir)/pkgconfig \
 		--plugindir=/usr/$(get_libdir)/bitlbee \
-		--externaljsonparser=1 \
+		--external_json_parser=1 \
 		--systemdsystemunitdir=$(systemd_get_systemunitdir) \
 		--doc=1 \
 		--strip=0 \
diff --git a/net-im/bitlbee/files/bitlbee-3.6-system-json-parser.patch b/net-im/bitlbee/files/bitlbee-3.6-system-json-parser.patch
index 02d57e02d6d2..0a9c197d763d 100644
--- a/net-im/bitlbee/files/bitlbee-3.6-system-json-parser.patch
+++ b/net-im/bitlbee/files/bitlbee-3.6-system-json-parser.patch
@@ -1,13 +1,16 @@
 This is adapted patch from upstream PR 151. Original PR defines
 --external-json-parser which breaks configuration, see [1]. It was changed to
 --externaljsonparser and $external_json_parser to $externaljsonparser.
+Additionally, LDFLAGS_CHECK variable was introduced in order to make
+tests working, see [2] and #865667.
 
 [1] https://github.com/bitlbee/bitlbee/pull/151#issuecomment-1201181905
+[2] https://github.com/bitlbee/bitlbee/pull/151#issuecomment-1219254239
 
 Upstream-PR: https://github.com/bitlbee/bitlbee/pull/151
 
 diff --git a/configure b/configure
-index 4640c806..77b1213b 100755
+index fd8d363a..39495515 100755
 --- a/configure
 +++ b/configure
 @@ -47,6 +47,7 @@ plugins=1
@@ -26,7 +29,7 @@ index 4640c806..77b1213b 100755
  
  
  --target=...	Cross compilation target 		same as host
-@@ -398,6 +400,20 @@ else
+@@ -398,6 +400,21 @@ else
  fi
  echo 'EVENT_HANDLER=events_'$events'.o' >> Makefile.settings
  
@@ -41,13 +44,14 @@ index 4640c806..77b1213b 100755
 +if [ "$externaljsonparser" = "1" ]; then
 +    echo "CFLAGS+=$(pkg-config --cflags json-parser)" >> Makefile.settings
 +    echo "LDFLAGS_BITLBEE+=$(pkg-config --libs json-parser)" >> Makefile.settings
++    echo "LDFLAGS_CHECK+=$(pkg-config --libs json-parser)" >> Makefile.settings
 +fi
 +
 +
  detect_gnutls()
  {
  	if $PKG_CONFIG --exists gnutls; then
-@@ -979,6 +995,12 @@ else
+@@ -979,6 +996,12 @@ else
  	echo '  systemd disabled.'
  fi
  
@@ -77,6 +81,19 @@ index fc46aedc..ad95d9cb 100644
  
  LFLAGS += -r
  
+diff --git a/tests/Makefile b/tests/Makefile
+index 76122a2f..2235bf1d 100644
+--- a/tests/Makefile
++++ b/tests/Makefile
+@@ -20,7 +20,7 @@ test_objs = check.o check_util.o check_nick.o check_md5.o check_arc.o check_irc.
+ 
+ check: $(test_objs) $(addprefix ../, $(main_objs)) ../protocols/protocols.o ../lib/lib.o
+ 	@echo '*' Linking $@
+-	$(VERBOSE) $(CC) $(CFLAGS) -o $@ $^ $(LFLAGS) $(EFLAGS)
++	$(VERBOSE) $(CC) $(CFLAGS) -o $@ $^ $(LFLAGS) $(LDFLAGS_CHECK) $(EFLAGS)
+ 
+ %.o: $(_SRCDIR_)%.c
+ 	@echo '*' Compiling $<
 -- 
 2.35.1
 
diff --git a/net-im/bitlbee/files/bitlbee-9999-system-json-parser.patch b/net-im/bitlbee/files/bitlbee-9999-system-json-parser.patch
deleted file mode 100644
index 07f2878525ec..000000000000
--- a/net-im/bitlbee/files/bitlbee-9999-system-json-parser.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-This is adapted patch from upstream PR 151. Original PR defines
---external-json-parser which breaks configuration, see [1]. It was changed to
---externaljsonparser and $external_json_parser to $externaljsonparser.
-
-[1] https://github.com/bitlbee/bitlbee/pull/151#issuecomment-1201181905
-
-Upstream-PR: https://github.com/bitlbee/bitlbee/pull/151
-
-diff --git a/configure b/configure
-index 4640c806..77b1213b 100755
---- a/configure
-+++ b/configure
-@@ -47,6 +47,7 @@ plugins=1
- otr=0
- 
- events=glib
-+externaljsonparser=auto
- ssl=auto
- 
- pam=0
-@@ -148,6 +149,7 @@ Option		Description				Default
- --events=...	Event handler (glib, libevent)		$events
- --ssl=...	SSL library to use (gnutls, nss, openssl, auto)
- 							$ssl
-+--externaljsonparser=0/1/auto	Use External JSON parser $externaljsonparser
- 
- 
- --target=...	Cross compilation target 		same as host
-@@ -398,6 +400,20 @@ else
- fi
- echo 'EVENT_HANDLER=events_'$events'.o' >> Makefile.settings
- 
-+if [ "$externaljsonparser" = "auto" ]; then
-+	if pkg-config --exists json-parser; then
-+		externaljsonparser=1
-+	else
-+		externaljsonparser=0
-+	fi
-+fi
-+echo "EXTERNAL_JSON_PARSER=$externaljsonparser" >> Makefile.settings
-+if [ "$externaljsonparser" = "1" ]; then
-+    echo "CFLAGS+=$(pkg-config --cflags json-parser)" >> Makefile.settings
-+    echo "LDFLAGS_BITLBEE+=$(pkg-config --libs json-parser)" >> Makefile.settings
-+fi
-+
-+
- detect_gnutls()
- {
- 	if $PKG_CONFIG --exists gnutls; then
-@@ -979,6 +995,12 @@ else
- 	echo '  systemd disabled.'
- fi
- 
-+if [ "$externaljsonparser" = "1" ]; then
-+    echo '  Using system JSON parser.'
-+else
-+    echo '  Using bundled JSON parser.'
-+fi
-+
- echo '  Using python: '$PYTHON
- echo '  Using event handler: '$events
- echo '  Using SSL library: '$ssl
- #echo '  Building with these storage backends: '$STORAGES
-diff --git a/lib/Makefile b/lib/Makefile
-index fc46aedc..ad95d9cb 100644
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -12,7 +12,11 @@ _SRCDIR_ := $(_SRCDIR_)lib/
- endif
- 
- # [SH] Program variables
--objects = arc.o base64.o canohost.o $(EVENT_HANDLER) ftutil.o http_client.o ini.o json.o json_util.o md5.o misc.o oauth.o oauth2.o proxy.o sha1.o $(SSL_CLIENT) url.o xmltree.o ns_parse.o
-+objects = arc.o base64.o canohost.o $(EVENT_HANDLER) ftutil.o http_client.o ini.o json_util.o md5.o misc.o oauth.o oauth2.o proxy.o sha1.o $(SSL_CLIENT) url.o xmltree.o ns_parse.o
-+
-+ifneq ($(EXTERNAL_JSON_PARSER),1)
-+objects += json.o
-+endif
- 
- LFLAGS += -r
- 
--- 
-2.35.1
-
diff --git a/net-im/bitlbee/metadata.xml b/net-im/bitlbee/metadata.xml
index a3e4b3e074d2..0541d2f03527 100644
--- a/net-im/bitlbee/metadata.xml
+++ b/net-im/bitlbee/metadata.xml
@@ -11,9 +11,7 @@
 	</maintainer>
 	<use>
 		<flag name="libevent">Use libevent for event handling</flag>
-		<flag name="msn">Enable MSN Messenger IM protocol support.</flag>
-		<flag name="nss">Use NSS for SSL support in MSN and Jabber</flag>
-		<flag name="oscar">Enable Oscar (AIM/ICQ) IM protocol support</flag>
+		<flag name="nss">Prefer <pkg>dev-libs/nss</pkg> as SSL/TLS provider</flag>
 		<flag name="otr">Enable support for encrypted conversations</flag>
 		<flag name="plugins">Enable support for plugins</flag>
 		<flag name="purple">Use libpurple instead of the built-in IM protocol support</flag>
@@ -21,8 +19,7 @@
 	</use>
 	<longdescription>
 		Bitlbee as an IRC to IM gateway. It provides an irc server that allows
-		you to log on and then connect to various instant messaging protocols
-		(AIM, MSN, Yahoo, Jabber, etc).
+		you to log on and then connect to various instant messaging protocols.
 	</longdescription>
 	<upstream>
 		<remote-id type="github">bitlbee/bitlbee</remote-id>