gentoo auto-resync : 05:09:2023 - 16:23:54

3 files changed, 24 insertions, 29 deletions

diff --git a/mail-client/mailx/Manifest b/mail-client/mailx/Manifest
index 46da39214bfa..7b37c89af2f4 100644
--- a/mail-client/mailx/Manifest
+++ b/mail-client/mailx/Manifest
@@ -1,7 +1,7 @@
 AUX mailx-8.1.2-20180807-musl-CCEQ.patch 363 BLAKE2B 087ea642e053bb12a265d6fee14605804666674c10847ff1dcecb35eba9caffbf2d3a5c4c340e187b19362f5ccf9d9b11553f04c5074659a4c363e557e778011 SHA512 c285c25620bfe5ca07fc1d068c40dea1f1a980cce1c4dcd7dd4f6de0d492e9fe8f968ef818c630aa1d95beed269e9b9464a53a5ff1af54cdaf3e0bab92a76d3f
-AUX mailx-8.1.2.20050715-offsetof.patch 1566 BLAKE2B 0878d9f3b639e292e1cfc69676c3e8b3ef68627764828f89fb252c72ac8133162fc4bda234ed1a82487a39306efbead9406b2dc750548deea3fb4c767ddc26c1 SHA512 f6c865cfe32d75d2ce2cf3538822db3c22edc09038ba72f7e25001bfda9b4b2c320e03f91622b316a268cfbdc1f57780ffe199dd8da8c78fbcfe93daf9972aea
+AUX mailx-8.1.2.20050715-offsetof.patch 898 BLAKE2B fe19bb2777733f6f70b8336f5dfbdf30ed455f8431b7f84a314329d70d9f9d4560c8c52ee6725f8102a565128dcdd2619b857349fa323459a9110f4355711b87 SHA512 2220de89471ab724e58d5f8612b2c9c6644dbbaab1711e3881296f17fe05a4e3958bbb7628479fb2531e1724fa3d17eee9336db1b83d00fb6b4fdc6ee8c72d0b
 AUX mailx-8.1.2.20180807-fno-common.patch 7481 BLAKE2B e847c7865c2346bfaeae2a32539aae3e5a73452073253af52615f3791285e822bbb96174dfabc97daec576a36d7d9ec7a2e9fc94b7372aea8efa08c363095f5f SHA512 37a5ed4b1b31eecd05d8a05b59aec9f8cba78cda838bd2ce06ed3f6c7a4f1e586223207e9ebdbd2cf952bab1dcbf06466aa61c61bcf0527fd57bc0b018acfe85
 DIST bsd-mailx_8.1.2-0.20180807cvs-1.debian.tar.xz 47916 BLAKE2B 6776dc1705383438e4249269f38a0db963731580ce4df3a2f6fddb112495db3225608b97718cd3916e7bb40b71d0338e6d262416a42b60ba19a6f4a8e1c8627e SHA512 3c99c5be121ecb37f2495b885e2a00290173b16578da100bb7955f86c7e76b8a8cd6bf8f936c1f00b906611e8649c0a6a25089b647d7f5ebcea8c8df3f334e28
 DIST bsd-mailx_8.1.2-0.20180807cvs.orig.tar.xz 79684 BLAKE2B 2846cd752472a193f89f7672d6a61de9759beea5530484c75ae4703335afc22a833226a87141853e4fbb2c951f9818ff35c8b79349b8a7a9a77f7788c6569bab SHA512 7a33d35934b0a98660732259d3132235ed14cd6843e79edd5683b668c3a550b45f0664021af35c219043640c20ce5aa34eaaf6dc275dc7e83aaed44853d008c9
-EBUILD mailx-8.1.2.20180807.ebuild 1359 BLAKE2B 33445d83816a989563b725203c148ab7088a1b4e6b3b60d11410b747c482650b48f0e3142ced25469d8b053a4e65245a26079a0552ee93c53c20d9352de491ee SHA512 e82f99cd1fdb20466c34da5686d711ae68550a1fa0101bae64fcc50b32c2c8f21f0c47fc0e7e3a5c513bb5136daa96b91bcf597d90b96f34682387f46095c8d7
+EBUILD mailx-8.1.2.20180807-r1.ebuild 1321 BLAKE2B faa5c041c16e98b3a01a5f290775091ca05afbd56367ce78d34a10df04df1ddc38a1382d5b40d5fe7219e620f531bf5971cca5da17d9a71598d43ee0dae4d342 SHA512 4320cee9db20f963e47df63d5773bd0b5a0cdaf8c875870084ef39dab55821d0250e55a41d06df99c77d44f73db819f6a8d0fcbc02c11024494493327a854c84
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/mail-client/mailx/files/mailx-8.1.2.20050715-offsetof.patch b/mail-client/mailx/files/mailx-8.1.2.20050715-offsetof.patch
index 7af81285d33c..37c8bbedbe38 100644
--- a/mail-client/mailx/files/mailx-8.1.2.20050715-offsetof.patch
+++ b/mail-client/mailx/files/mailx-8.1.2.20050715-offsetof.patch
@@ -1,7 +1,6 @@
-diff -r -u mailx-8.1.2-0.20050715cvs.orig.orig/def.h mailx-8.1.2-0.20050715cvs.orig/def.h
---- mailx-8.1.2-0.20050715cvs.orig.orig/def.h	2003-10-14 21:50:20.000000000 +0900
-+++ mailx-8.1.2-0.20050715cvs.orig/def.h	2010-03-31 10:29:37.000000000 +0900
-@@ -97,7 +97,7 @@
+--- a/def.h
++++ b/def.h
+@@ -107,7 +107,7 @@
   * Given a file address, determine the block number it represents.
   */
  #define blockof(off)			((int) ((off) / 4096))
@@ -10,11 +9,10 @@ diff -r -u mailx-8.1.2-0.20050715cvs.orig.orig/def.h mailx-8.1.2-0.20050715cvs.o
  #define positionof(block, offset)	((off_t)(block) * 4096 + (offset))
  
  /*
-diff -r -u mailx-8.1.2-0.20050715cvs.orig.orig/edit.c mailx-8.1.2-0.20050715cvs.orig/edit.c
---- mailx-8.1.2-0.20050715cvs.orig.orig/edit.c	2004-05-25 01:34:32.000000000 +0900
-+++ mailx-8.1.2-0.20050715cvs.orig/edit.c	2010-03-31 10:41:28.000000000 +0900
-@@ -111,7 +111,7 @@
- 			(void)fseek(otf, 0L, 2);
+--- a/edit.c
++++ b/edit.c
+@@ -133,7 +133,7 @@
+ 			(void)fseek(otf, 0L, SEEK_END);
  			size = ftell(otf);
  			mp->m_block = blockof(size);
 -			mp->m_offset = offsetof(size);
@@ -22,9 +20,8 @@ diff -r -u mailx-8.1.2-0.20050715cvs.orig.orig/edit.c mailx-8.1.2-0.20050715cvs.
  			mp->m_size = fsize(fp);
  			mp->m_lines = 0;
  			mp->m_flag |= MODIFY;
-diff -r -u mailx-8.1.2-0.20050715cvs.orig.orig/fio.c mailx-8.1.2-0.20050715cvs.orig/fio.c
---- mailx-8.1.2-0.20050715cvs.orig.orig/fio.c	2004-05-25 01:34:32.000000000 +0900
-+++ mailx-8.1.2-0.20050715cvs.orig/fio.c	2010-03-31 10:29:28.000000000 +0900
+--- a/fio.c
++++ b/fio.c
 @@ -139,7 +139,7 @@
  			this.m_size = 0;
  			this.m_lines = 0;
diff --git a/mail-client/mailx/mailx-8.1.2.20180807.ebuild b/mail-client/mailx/mailx-8.1.2.20180807-r1.ebuild
index 8a181740f57c..3738256e2827 100644
--- a/mail-client/mailx/mailx-8.1.2.20180807.ebuild
+++ b/mail-client/mailx/mailx-8.1.2.20180807-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit toolchain-funcs
 
@@ -11,31 +11,29 @@ DPP="${DP}-1.debian.tar.xz"
 
 DESCRIPTION="The $ mail program, which is used to send mail via shell scripts"
 HOMEPAGE="https://www.debian.org/"
-SRC_URI="http://http.debian.net/debian/pool/main/b/bsd-${PN}/${DPT}
+SRC_URI="
+	http://http.debian.net/debian/pool/main/b/bsd-${PN}/${DPT}
 	http://http.debian.net/debian/pool/main/b/bsd-${PN}/${DPP}"
-
 S="${WORKDIR}/${DP/_/-}.orig"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
-DEPEND=">=net-libs/liblockfile-1.03
+DEPEND="
+	>=net-libs/liblockfile-1.03
 	dev-libs/libbsd
 	virtual/mta
-	mail-client/mailx-support"
-
+	|| ( mail-client/mailx-support mail-mta/opensmtpd )"
 RDEPEND="${DEPEND}
-	!mail-client/nail
 	!net-mail/mailutils"
 
-src_prepare() {
-	eapply "${WORKDIR}/debian/patches"
-	eapply "${FILESDIR}/${PN}-8.1.2.20050715-offsetof.patch"
-	eapply "${FILESDIR}/${PN}-8.1.2.20180807-fno-common.patch"
-	eapply "${FILESDIR}/${PN}-8.1.2-20180807-musl-CCEQ.patch"
-	eapply_user
-}
+PATCHES=(
+	"${WORKDIR}"/debian/patches
+	"${FILESDIR}"/${PN}-8.1.2.20050715-offsetof.patch
+	"${FILESDIR}"/${PN}-8.1.2.20180807-fno-common.patch
+	"${FILESDIR}"/${PN}-8.1.2-20180807-musl-CCEQ.patch
+)
 
 src_compile() {
 	emake CC="$(tc-getCC)" EXTRAFLAGS="${CFLAGS}"