gentoo auto-resync : 10:01:2025 - 06:41:30

4 files changed, 5 insertions, 61 deletions

diff --git a/net-mail/asmail/Manifest b/net-mail/asmail/Manifest
index 2a76e03ba3cb..dd18bc8ad97a 100644
--- a/net-mail/asmail/Manifest
+++ b/net-mail/asmail/Manifest
@@ -1,6 +1,5 @@
 AUX asmail-2.1-ldflags.patch 584 BLAKE2B 58b53fadf6209149a74c65333d742f99c549abab08b87e577e7363ff3a2601dd0e78a9d23181676510d6194e9533eb6293c45c089ccb4dcd85955e7aaf0a6c93 SHA512 d3714a3b250b434cd742c6a72afd73c673194375240c2d3ab3f61999be6c36f07dee9ed8cb86220b559613a10a00431757ad95121aba16196ecbc719eb347dc9
-AUX asmail-2.1-update-autotools.patch 1782 BLAKE2B 1f9c9fee8fc1f30a1f401a25fa9babbb7252831b2ceea9bf3967c40c476871832fdb707159458a4d2ffd4c7319dc5b38e058305d2d3aeff7af07f24e497972c9 SHA512 c1ac1b7ce741635347da88d2015bda11f5ff3c5f909702e08161d2c850c5b2d1db8f4bb09253b0e15331c57f073060a16d9bdfc318ba28e723e93b71553e84e9
+AUX asmail-2.1-update-autotools.patch 1783 BLAKE2B 319735293a89d9a02d6b9acf8d960b22329dc093fe276b2d8cf718daac4d8b36865432504e88381981a40d3365077ea84aa75cfb964c9da58913acbc08aefaa6 SHA512 ad24f47823387a6cb53deaa00b5232b97c151da7b0fc2af8462aee19a9d5513ee2f67f61286192974c7e79b987a96db1fb582c030c47201e32e458e42225fce9
 DIST asmail-2.1.tar.gz 271164 BLAKE2B 00972dcdfd74c717a665425cad17c59b01ec631725b79ccc3ed537232e61c5aef231ec4146491335caf2beb451e686359cb196d01f199c33ed16cd66c625e99f SHA512 1251c9f386c01c23673a6798eafd6a518a103da6d2ab78bb4e22c1107939423c44f555e331f79d1b5b509f271582de285481022ef32375b4267b1f3e398f67d8
-EBUILD asmail-2.1-r2.ebuild 993 BLAKE2B 4408be4ea04ae78097956ddcf83dd8b743253ee6a3bf816919e737737af1907b97e8446ecfadf82ff359f8681939a91aa9df7cc5375106f35cbca2a6e724b743 SHA512 1e00cc6716f4bc0878e63057e1e4ec017f5137535f7da434e7e3b3a3eadda88eb73f7ab0c12f83b3ea10ce86c575d6f7c8a64dd233bd0a4869b480858798343e
-EBUILD asmail-2.1-r3.ebuild 1085 BLAKE2B 9fe6b11855ada4d6087f1e5051e26e45b4fd3a458c3fffbb29ee23b39479536faf8bb4a89770844d42c98c24a4558d7ece24a0324805cbf12d40034e64b2480e SHA512 a5b8d7897ab8551eda2899da96f784cd1d0e48ba2a4e4cd68ff04caf2b5ca5f2326267ffb153ab4ce2989b3117460784e1c0774543ea97b101dbbf81ebf1cd44
+EBUILD asmail-2.1-r4.ebuild 1119 BLAKE2B 0478d0c054bbd5b119637cb572289ee0cf09c2a67fe3729c085bb7cd6862c396c6a9952147f93fc18f9ec531fd84dad72388697b82b7be841d6b68fa7d84dd72 SHA512 ef81a7145ad3454b840b74f37d2e90a1ee6a43dad3541dd3409ab6de323fb06506d131121f68799951e3cf096904622c39df756ccf672dd0479155a08b10fc80
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/net-mail/asmail/asmail-2.1-r2.ebuild b/net-mail/asmail/asmail-2.1-r2.ebuild
deleted file mode 100644
index 8a15dabe5212..000000000000
--- a/net-mail/asmail/asmail-2.1-r2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="A small mail monitor similar to xbiff"
-HOMEPAGE="https://tigr.net/afterstep/applets/"
-SRC_URI="https://tigr.net/afterstep/download/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="jpeg"
-
-RDEPEND="
-	dev-libs/openssl:0=
-	x11-libs/libXext
-	x11-libs/libX11
-	x11-libs/libXpm
-	x11-libs/libICE
-	x11-libs/libSM
-	jpeg? ( virtual/jpeg:= )"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1-ldflags.patch
-)
-
-src_prepare() {
-	default
-	sed -i -e "/LIB/s/-lssl/-lssl -lcrypto/g" \
-		configure
-}
-
-src_configure() {
-	tc-export CC
-	econf $(use_enable jpeg)
-}
-
-src_install() {
-	dobin ${PN}
-
-	newman ${PN}.man ${PN}.1
-	newman ${PN}rc.man ${PN}rc.5
-
-	insinto /usr/share/${PN}/pixmaps
-	doins pixmaps/cloud-e/*.xpm
-
-	insinto /usr/share/${PN}
-	doins -r sounds
-
-	dodoc ${PN}rc.s* CHANGES *.txt README* TODO
-}
diff --git a/net-mail/asmail/asmail-2.1-r3.ebuild b/net-mail/asmail/asmail-2.1-r4.ebuild
index 29c8a3a37716..4c24bda587f2 100644
--- a/net-mail/asmail/asmail-2.1-r3.ebuild
+++ b/net-mail/asmail/asmail-2.1-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -26,6 +26,7 @@ DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 
 PATCHES=(
+	"${FILESDIR}"/${P}-ldflags.patch
 	"${FILESDIR}"/${P}-update-autotools.patch
 )
 
diff --git a/net-mail/asmail/files/asmail-2.1-update-autotools.patch b/net-mail/asmail/files/asmail-2.1-update-autotools.patch
index 287b36480111..4899b0deddca 100644
--- a/net-mail/asmail/files/asmail-2.1-update-autotools.patch
+++ b/net-mail/asmail/files/asmail-2.1-update-autotools.patch
@@ -1,4 +1,4 @@
-I order to compile this package with clang we need to run autoreconf. Newer autotools complain about
+In order to compile this package with clang we need to run autoreconf. Newer autotools complain about
 the several declarations of the same header.
 
 MD5 calculation is split from libssl into libcrypto.