gentoo auto-resync : 20:02:2024 - 11:40:01

5 files changed, 6 insertions, 193 deletions

diff --git a/net-im/bitlbee/Manifest b/net-im/bitlbee/Manifest
index 5e029132c464..d84924ca0260 100644
--- a/net-im/bitlbee/Manifest
+++ b/net-im/bitlbee/Manifest
@@ -2,12 +2,10 @@ AUX bitlbee-3.5-libcheck.patch 17203 BLAKE2B 14cb1ba02178e89ed098518a8fb48b6f312
 AUX bitlbee-3.5-libevent.patch 1942 BLAKE2B a6233d97f17d2695efe13a6bd395ba77e72e7c5c3177ae8aaf3223ac3f0979b9650cefcbb000d5e4ccc9ecb8fdab97173ad59022453c5b13c8486fb095b4ff14 SHA512 b8937c542eda36aa5dcdd3213513f6dd5a928166f1017ef370a78765dbc511552072fe46d8322dea27ee716126fd859245e6c2fa713f6b255fb6e7a4ce2c1328
 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 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 3390 BLAKE2B 0a4c56a1756731cac7f333ff2c1cfeb7a33bb57569ef5566a481de8d0f2f38ea8bad24c4270666d22d184785e2dc8c425fd2a5dc12f7cb26b3fe3ae233649442 SHA512 66bc989ca184ab4cb99b71d5b50e8c8932f7d08f256e064ef017db37981ef635640dbce6c684499cd389dedc30e8e9d60916bcbef0ec65ac819169082b32cf87
-EBUILD bitlbee-3.6-r3.ebuild 3438 BLAKE2B b628c3199405b159f055fe78d10ccc3ae5f80d58abdb6e2b29baf81cb48c2d47e9408030179c7d0a28a52284b9f50ce767492f78bfaa017e6a42a0bcf9d4e74a SHA512 9426106c1341e30d92a338b58235f6b03a228efb896f3900426905711313eceece131c35ae397ef9b6686e19625161dcdd88f118f703d362d32b3b7d4d562860
-EBUILD bitlbee-9999.ebuild 3271 BLAKE2B 19d3a4bfa400ff08a014d2535b52a5dc9f73e5a4e0843b41dfba80fcad9ac552dbd8ca3e77eeeef83d8140e968bd88abed376372a881d4b26a7875eaf7e05a10 SHA512 32825d2cfd072627089e84fedbd852b7daa1f9544b664c7882e2c92a40a657aff6fa91c93eb72901c31d2e77803ac1a731e3615c2630db503faaad6f1cf97d72
+EBUILD bitlbee-3.6-r3.ebuild 3439 BLAKE2B 851f7e2319aa1b09e2e254429c1c88870f1be7df9eac3af4c62b16e627bb958fd4c59d2a9b67e5504df96d9918060841471c91e5af469f85e55ad5e67761654d SHA512 073a1517dfd5081b92c99b631e402a9d2664f6052d2361c4d83dbacce5af4ac8cb82427f846eda9fa4688b6f2c661b6f89790b8d802aaf94fbb28bc966a7ed91
+EBUILD bitlbee-9999.ebuild 3272 BLAKE2B c36a2c1f18314be5dcee5c648fb2815d42308551f94caca3119b66122c852e319fae3e9eb84a85805ec4b1f780f6ae1e139eb0b89563e4bb8c70867a845afa2c SHA512 00a8020c355f6914091600f7f18ea28d94ef43849d1e64c713ee8854e316bf0cf54b2901743e5f777951fb033fa1c3e9635a3b37f54b2f3c9c2e0e81de582613
 MISC metadata.xml 941 BLAKE2B b4e459d874b7090ca623257fa43d45aeadcec9af297c68ac6544874672d623f43ed1b76330ce025a14d327ed3c8aec99b07115b24e8f0d2cf7346c4a636f533a SHA512 d94824828bac3f7acc090a3e1ba97dc5c6c48c90570f1ccf9684da49c5131d5d9813f4fcd9d5683b04cc11a5cc0fa0f6ab33cc04e8445f46544fe99302667e91
diff --git a/net-im/bitlbee/bitlbee-3.6-r2.ebuild b/net-im/bitlbee/bitlbee-3.6-r2.ebuild
deleted file mode 100644
index 6b55ced61ee1..000000000000
--- a/net-im/bitlbee/bitlbee-3.6-r2.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit python-any-r1 systemd toolchain-funcs
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/bitlbee/bitlbee.git"
-	inherit git-r3
-else
-	SRC_URI="https://get.bitlbee.org/src/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 ppc ~ppc64 x86"
-fi
-
-DESCRIPTION="irc to IM gateway that support multiple IM protocols"
-HOMEPAGE="https://www.bitlbee.org/"
-
-LICENSE="GPL-2 BSD-2"
-SLOT="0"
-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 )
-	purple? ( plugins )
-	test? ( xmpp )
-"
-
-COMMON_DEPEND="
-	acct-group/bitlbee
-	acct-user/bitlbee
-	dev-libs/glib:2
-	purple? ( net-im/pidgin )
-	libevent? ( dev-libs/libevent:= )
-	otr? ( >=net-libs/libotr-4 )
-	gnutls? ( net-libs/gnutls:= )
-	!gnutls? (
-		nss? ( dev-libs/nss )
-		!nss? (
-			dev-libs/openssl:0=
-		)
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	selinux? ( sec-policy/selinux-bitlbee )
-	test? ( dev-libs/check )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	xinetd? ( sys-apps/xinetd )
-"
-
-BDEPEND="${PYTHON_DEPS}
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.5-systemd-user.patch
-	"${FILESDIR}"/${PN}-3.5-libcheck.patch
-	"${FILESDIR}"/${PN}-3.5-libevent.patch
-	"${FILESDIR}"/${P}-disabled-plugins-use.patch
-	"${FILESDIR}"/${P}-strict-aliasing.patch
-)
-
-src_configure() {
-	local myconf
-
-	# setup plugins, protocol, ipv6 and debug
-	myconf+=( --jabber=$(usex xmpp 1 0) )
-	for flag in debug ipv6 plugins ${IUSE_PROTOCOLS/+xmpp/} ; do
-		myconf+=( --${flag}=$(usex ${flag} 1 0) )
-	done
-
-	# set otr
-	if use otr && use plugins ; then
-		myconf+=( --otr=plugin )
-	else
-		if use otr ; then
-			ewarn "OTR support has been disabled automatically because it"
-			ewarn "requires the plugins USE flag."
-		fi
-		myconf+=( --otr=0 )
-	fi
-
-	# setup ssl use flags
-	if use gnutls ; then
-		myconf+=( --ssl=gnutls )
-		einfo "Using gnutls for SSL support"
-	else
-		ewarn "Only gnutls is officially supported by upstream."
-		if use nss ; then
-			myconf+=( --ssl=nss )
-			einfo "Using nss for SSL support"
-		else
-			myconf+=( --ssl=openssl )
-			einfo "Using openssl for SSL support"
-		fi
-	fi
-
-	# set event handler
-	if use libevent ; then
-		myconf+=( --events=libevent )
-	else
-		myconf+=( --events=glib )
-	fi
-
-	# not autotools-based
-	./configure \
-		--prefix=/usr \
-		--datadir=/usr/share/bitlbee \
-		--etcdir=/etc/bitlbee \
-		--libdir=/usr/$(get_libdir) \
-		--plugindir=/usr/$(get_libdir)/bitlbee \
-		--pcdir=/usr/$(get_libdir)/pkgconfig \
-		--systemdsystemunitdir=$(systemd_get_systemunitdir) \
-		--doc=1 \
-		--strip=0 \
-		--verbose=1 \
-		"${myconf[@]}" || die
-
-	sed -i \
-		-e "/^EFLAGS/s:=:&${LDFLAGS} :" \
-		Makefile.settings || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" LD="$(tc-getLD)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install install-etc install-doc install-dev install-systemd
-
-	keepdir /var/lib/bitlbee
-	fperms 700 /var/lib/bitlbee
-	fowners bitlbee:bitlbee /var/lib/bitlbee
-
-	dodoc doc/{AUTHORS,CHANGES,CREDITS,FAQ,README}
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins doc/bitlbee.xinetd bitlbee
-	fi
-
-	newinitd "${FILESDIR}"/bitlbee.initd-r2 bitlbee
-	newconfd "${FILESDIR}"/bitlbee.confd-r2 bitlbee
-
-	exeinto /usr/share/bitlbee
-	doexe utils/{convert_purple.py,bitlbee-ctl.pl}
-}
diff --git a/net-im/bitlbee/bitlbee-3.6-r3.ebuild b/net-im/bitlbee/bitlbee-3.6-r3.ebuild
index c59af899cace..5978987e6e22 100644
--- a/net-im/bitlbee/bitlbee-3.6-r3.ebuild
+++ b/net-im/bitlbee/bitlbee-3.6-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit python-any-r1 systemd toolchain-funcs
 
diff --git a/net-im/bitlbee/bitlbee-9999.ebuild b/net-im/bitlbee/bitlbee-9999.ebuild
index 8931b9d5feda..8fe3918c4465 100644
--- a/net-im/bitlbee/bitlbee-9999.ebuild
+++ b/net-im/bitlbee/bitlbee-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit python-any-r1 systemd toolchain-funcs
 
diff --git a/net-im/bitlbee/files/bitlbee-3.6-strict-aliasing.patch b/net-im/bitlbee/files/bitlbee-3.6-strict-aliasing.patch
deleted file mode 100644
index 30ecff9747ee..000000000000
--- a/net-im/bitlbee/files/bitlbee-3.6-strict-aliasing.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Based on upstream [1] commits:
-- 161dff8321df ("Fix error type-punned pointer warning")
-- d7b67db02aaa ("Fix error type-punned pointer warning")
-
-[1] https://github.com/json-parser/json-parser
-
-Upstream-PR: https://github.com/bitlbee/bitlbee/pull/162
-
-diff --git a/lib/json.c b/lib/json.c
-index 24288f94..2150cbaf 100644
---- a/lib/json.c
-+++ b/lib/json.c
-@@ -139,7 +139,7 @@ static int new_value
- 				return 0;
- 			}
- 
--			value->_reserved.object_mem = (*(char **) &value->u.object.values) + values_size;
-+			value->_reserved.object_mem = (void *) (((char *) value->u.object.values) + values_size);
- 
- 			value->u.object.length = 0;
- 			break;
-@@ -406,7 +406,8 @@ json_value * json_parse_ex(json_settings * settings,
- 					case json_object:
- 
- 						if (state.first_pass) {
--							(*(json_char **) &top->u.object.values) += string_length + 1;
-+							json_char **chars = (json_char **) &top->u.object.values;
-+							chars[0] += string_length + 1;
- 						} else {
- 							top->u.object.values [top->u.object.length].name
- 							        = (json_char *) top->_reserved.object_mem;