gentoo auto-resync : 23:04:2024 - 23:59:26

4 files changed, 2 insertions, 80 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 86d973fce6a5..f958ee97e35f 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libetpan/Manifest b/net-libs/libetpan/Manifest
index 06dbd2dee2bf..ddfcb6dff388 100644
--- a/net-libs/libetpan/Manifest
+++ b/net-libs/libetpan/Manifest
@@ -4,6 +4,5 @@ AUX libetpan-1.9.4-CVE-2022-4121.patch 1007 BLAKE2B d35b5fc459aa6f64ffa335928fd7
 AUX libetpan-1.9.4-berkdb_lookup.patch 1036 BLAKE2B 594741b66faa63de15acab4ce1f344fb22d2fa7c5c6cf75d2bd6c890d4117bda5978738d98a3ee3adf69f9ddb41922e36cd261ee71e9d8f012423cd99acc19a9 SHA512 561e0b82e080a31e668cc354be36e54101742b8d32f1067f53536afdd9e0cde2eecbd5516b93e8c304f60a1b083c6e68b4442afcca88235471f0038144202194
 AUX libetpan-1.9.4-pkgconfig_file_no_ldflags.patch 809 BLAKE2B 0b615bb488f28f468f6224362788fcdb11def5b6907c10d0bf0eee5d9d9bd6af32e9b011d4af43d3a7d8cd78086875faa4d229c96fca1895cad9576756442b45 SHA512 b830b2d2a04173bbbdb7b62f9f855eab25bbe3d970fbd69c37213ece957b4d682f36002b9694b4dcf89232ace2d809902561003b5f6fb76ec5ae0db9e6e462e0
 DIST libetpan-1.9.4.tar.gz 5000025 BLAKE2B dd98169134b7448d3dd129814d8011a3fa915b16f4763344230a89d02626b64ddea57495b4c21fd8f651164c36c95ad98ee9db073273b230e6af403b845aa681 SHA512 7b7047d084fb4ce0c91821c2ad78e921d6d009106851afb7f5b068713c84ebe6926f6bf7a7423f263eeebef617511e44f6b65448d892bbc058c447235fd55c0f
-EBUILD libetpan-1.9.4-r1.ebuild 2182 BLAKE2B ea16f4956c00faee65677e9ed1af52adb2efca6ca471010912840f311e8d7c685389665c8cbc5d488cd824a42685fa8621fadf721c4b125f5a50b16c0b123185 SHA512 2d2561afb7f2b36ad3013574b078fbe55a044df09be8f6d5e25ea12371187b19a07267d89b1c2c62bbe3bc40445dcd83f6fee6c32a1f3fe3e0dc3365987ae6ab
-EBUILD libetpan-1.9.4-r2.ebuild 2237 BLAKE2B 40b3d4817cada90244c08b7df107b79b1e612c75c851dcde3df158f0b72cdbe444e16ffce26ba65d1c826b7bb1bf826b73d0522448ab9ef50b18defe092e4bda SHA512 7c5e13eace209b56c4f5a1839ac5f6392425b77231ce08e735407051433c0b09e62f8148b24de14652e122f64afa780ff26387aa88d11a34709f8e28b477f771
+EBUILD libetpan-1.9.4-r2.ebuild 2230 BLAKE2B 4ffe9f164e24e43de93fc0350d0c9d7f6b7d29576654ccf759a4ceff99754d343eb584ef057dd24ab4abba3410d0553bcad4ce22877c0e74604cf3debff1817d SHA512 bb72e2ada200378f8df2a642dc8a145999dd93f88646acb9e1d0c8c4e063202d317a4e30ad0f1852c8af19f955604442732ceba104706c34b17982cf3d567418
 MISC metadata.xml 830 BLAKE2B ecbe9abd08e475cee86443cd2dda3ac13dd2d35000d1dbd9540c70ecfd9d17caf5e62d4054c89ec7377d06739d9744eb84869c656e5cb46689a7d8616373fcae SHA512 de9612383d1734ed824323cc4b5c72ea55f2f0bf38f6fc25c8830851fe7d06100fbdb5175ba70a333d611d95590ef69da5bae4d44d310cce48118668131f6267
diff --git a/net-libs/libetpan/libetpan-1.9.4-r1.ebuild b/net-libs/libetpan/libetpan-1.9.4-r1.ebuild
deleted file mode 100644
index 554b43f6158a..000000000000
--- a/net-libs/libetpan/libetpan-1.9.4-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-DESCRIPTION="A portable, efficient middleware for different kinds of mail access"
-HOMEPAGE="https://libetpan.sourceforge.net/"
-SRC_URI="https://github.com/dinhviethoa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="berkdb gnutls ipv6 liblockfile lmdb sasl ssl static-libs"
-
-# BerkDB is only supported up to version 6.0
-DEPEND="sys-libs/zlib
-	!lmdb? ( berkdb? ( sys-libs/db:= ) )
-	lmdb? ( dev-db/lmdb )
-	ssl? (
-		gnutls? ( net-libs/gnutls:= )
-		!gnutls? (
-			dev-libs/openssl:0=
-		)
-	)
-	sasl? ( dev-libs/cyrus-sasl:2 )
-	liblockfile? ( net-libs/liblockfile )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0-nonnull.patch
-	"${FILESDIR}"/${PN}-1.9.4-berkdb_lookup.patch #519846
-	"${FILESDIR}"/${PN}-1.9.4-pkgconfig_file_no_ldflags.patch
-	"${FILESDIR}"/${P}-CVE-2020-15953.patch #734130
-)
-
-pkg_pretend() {
-	if use gnutls && ! use ssl ; then
-		ewarn "You have \"gnutls\" USE flag enabled but \"ssl\" USE flag disabled!"
-		ewarn "No ssl support will be available in ${PN}."
-	fi
-
-	if use berkdb && use lmdb ; then
-		ewarn "You have \"berkdb\" _and_ \"lmdb\" USE flags enabled."
-		ewarn "Using lmdb as cache DB!"
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# in Prefix emake uses SHELL=${BASH}, export CONFIG_SHELL to the same so
-	# libtool recognises it as valid shell (bug #300211)
-	use prefix && export CONFIG_SHELL=${BASH}
-	local myeconfargs=(
-		# --enable-debug simply injects "-O2 -g" into CFLAGS
-		--disable-debug
-		$(use_enable ipv6)
-		$(use_enable liblockfile lockfile)
-		$(use_enable static-libs static)
-		$(use_with sasl)
-		$(usex lmdb '--enable-lmdb --disable-db' "$(use_enable berkdb db) --disable-lmdb")
-		$(usex ssl "$(use_with gnutls) $(use_with !gnutls openssl)" '--without-gnutls --without-openssl')
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${ED}" -name "*.la" -delete || die
-	if ! use static-libs ; then
-		find "${ED}" -name "*.a" -delete || die
-	fi
-}
diff --git a/net-libs/libetpan/libetpan-1.9.4-r2.ebuild b/net-libs/libetpan/libetpan-1.9.4-r2.ebuild
index 149c51e7ac5f..57d291f1fa06 100644
--- a/net-libs/libetpan/libetpan-1.9.4-r2.ebuild
+++ b/net-libs/libetpan/libetpan-1.9.4-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/dinhviethoa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="berkdb gnutls ipv6 liblockfile lmdb sasl ssl static-libs"
 
 # BerkDB is only supported up to version 6.0