gentoo auto-resync : 15:02:2024 - 23:36:26

5 files changed, 7 insertions, 185 deletions

diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index 0a4141766b32..ba58abccc1ed 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/notqmail/Manifest b/mail-mta/notqmail/Manifest
index c024b6421427..134cba91a0f9 100644
--- a/mail-mta/notqmail/Manifest
+++ b/mail-mta/notqmail/Manifest
@@ -2,12 +2,11 @@ DIST genqmail-20200817.tar.bz2 10071 BLAKE2B dfeb8aa094c0db1b672e5e7a39f3866e02c
 DIST notqmail-1.08-auth.patch 71183 BLAKE2B c980475ef7a2ad6e05d71f494293579e5082b63606fd0bbbd51fff5d067912b1548b4033f36de8030d60b195a684ff0845afe022d316ad835b1ad0b360cafbd6 SHA512 697b8b2a26a10c0029918193046dd2758bb3e84af97fb2e99f29bfb23efb0a9e0ee6ecca0431369e348d1414ef70bc5c446420b4f019ba427d16d0f07f23f6e3
 DIST notqmail-1.08-big-todo.patch 7179 BLAKE2B f7582d0193096f17316feb15e65c2b841545e274309351fc2921120ec3a4fb35b1998fbd8b8ca573c7dbd690ab7197f4b4f9105671f7d299687bf339b747deb2 SHA512 8444c8b4558410682d46e4954973721a1fb5e90585c9a3a4d7603448faf68cc0d07d2b5d51977ce72d35551b5c43b03014638251b542e48fe9cbef327cacc7c6
 DIST notqmail-1.08-spp.patch 14304 BLAKE2B 61cb1cf48e0af93d4928906fa115fe71df888d676d38bf4e2c23106900d7f66964a915f90cb0cc3b36130a9a9a2050f209471fdc9c03bb16a82cae2e35b94278 SHA512 b0671b6a370f4eda0721a655a140f24b0585ab752f46260f90aa3afbcf86d5ba2970985c7f88af95402c8e4e7c9e2fe54a75b9cf7a598f8fb1901dccc4960c8a
-DIST notqmail-1.08-tls-20200107.patch 50123 BLAKE2B 94bbab86bd089c6ac032bfabc300eb89b367c239ae7a60256c417a2abfa583984e6273eae6df22d44b98dcefce4904f6db9625ff2a57f4b30a8fff8c629d374b SHA512 bdccdf98024f811802504872b8e3f3ac3010c1f218a0ec79bb12e635c35bfa15471c2b7e499c14e6bec9b5d3e48f1e584e26ba2ca01f1ce73a347a338de2a304
 DIST notqmail-1.08-tls-spp.patch 64223 BLAKE2B d2337017dacd41d975a9ebd4650cce58425c3c6e1ebfaaaf29a222a532cfd246fec16f52997e85eb921ad376235eb69a8580ba8df493bf760f3d8237311411c0 SHA512 012cdc62c2361737fb984e750a28bd06f357aefd9fa8d909e2e380e65fc5ae3a2cbef3f592eb60455ad858385dbf8e8b50a2f6358a9ffa3f885aa76250a336a0
+DIST notqmail-1.08-tls_auth-20200107.patch 50123 BLAKE2B 94bbab86bd089c6ac032bfabc300eb89b367c239ae7a60256c417a2abfa583984e6273eae6df22d44b98dcefce4904f6db9625ff2a57f4b30a8fff8c629d374b SHA512 bdccdf98024f811802504872b8e3f3ac3010c1f218a0ec79bb12e635c35bfa15471c2b7e499c14e6bec9b5d3e48f1e584e26ba2ca01f1ce73a347a338de2a304
 DIST notqmail-1.08.tar.xz 179500 BLAKE2B 6c774037b257849aea65e7761a6f6c9918079faa490c0ed027d73a8b32de5d5907a54a59162b9b68479229c4b92a23fe28cd2f334123cfe674a94502b90a3635 SHA512 c18d09e28c2e580522eea144e5344e814811108b12f3272b4cf10ad58d9d3d8e666616dcfea2f369e226b68db4fe8cf67cbae994b242d36e9e07c289a0539394
 DIST notqmail-1.08.tar.xz.sig 195 BLAKE2B 0edf3758d24c22e69139a57804b5b39da6c5868c178af511ff5105cd45bf105f5bb903d94093d400c54126e359a259f32d8c8b25c2fb87233efd74fdb05593c1 SHA512 2d5e68d1f3d7330b8b58f54235ec22a94adc0811e23f4863fac806c7a3e0110e6388920c3089c68fa3bb438398d64ea6e37240d002225b1cab20460797487604
 DIST qmail-103.patch 2104 BLAKE2B 23721b3331c719f3b6deca8b2603bf824b66068d3901a84dda9edbe33b506d0c2b6e711364e2426d9e393453a54485f0286d4668f99cf6b9acabf10a5dc59b0a SHA512 b81062bb0b0023f474c0b6af40601926e1c04ad395de480d114809e48a8060c06d99bdbdeb6f44d9e24ae1acedabb094b979193d305371aed958f18fc6eee354
-EBUILD notqmail-1.08-r5.ebuild 4089 BLAKE2B 9d110d193d33e138db88d2443e9eb9a4fc368cd56d50625a6bf2075eb71aaa7554dc343498ff2e63972981a8647d6e32d367409252434a0e9b0e89e35f5fcae1 SHA512 500e5c91d4144c4535f0331630e76a778ac215f6a369eedf94a921fd9036693cbe3a9a93470b7d82d0a886ac7f4f60afc91f9bc33d47300e0f7f9611f929c51a
-EBUILD notqmail-1.08-r6.ebuild 4474 BLAKE2B 4f16b3f271c467713e507ba3a5fa80adc50662d6842250ccb7991bc02a3fc74d8f8a60081dc525539cd6e47be347fc919c2e15f5705178b9577b4363fe82ca90 SHA512 89d7327d7b7ff5501c046f50e66dfdabe869034bdd8002098cd7aad90f6bb8f98f19b427d08ca1688335ce293324428b5ceed3e9369244650c1179f243569183
-EBUILD notqmail-9999.ebuild 4347 BLAKE2B c6eeaa5ee7b04afa09bc69e1745db9540cfca39d1ad41fb69e479818a1a155e08cb524270e1f31b070bf14f2684bc7694a7a0a08379e7f36cfdeee25acb799e8 SHA512 86807f813020d1145230a3eea568afa957a645115923d4cbe915c18fe497e32c35807dda93da6d96e1c7cf83ef8bf00943ad7328414459c7b55617c634f03f66
+EBUILD notqmail-1.08-r6.ebuild 4479 BLAKE2B b5d839ae2c33e5cdd4e9fc9b97723fff043d9e86efa29f3a62552716df122efd7444ba56588ab2ee41efd40ae617105ba4e4841a836e7a65a1f80ef9ab5689be SHA512 29c1a7ea8645c3a9e7f0fef2dbaa36b4cd7bcee7b54c7b58ac35666d1e9ed997294f09b416cd9a2009c4f63c53e5e32b550c8731e24ca95d3e8fb52ddce4445b
+EBUILD notqmail-9999.ebuild 4352 BLAKE2B 546311e9e4bdba94fbc31a4d4453732e608ff87fe1df90d1bda1f860ce31dd779937553264250fe69056e7530db4b9dbaf0e5516578fdf9dde8ff3b6b3f6ab2e SHA512 276c4733101de7b5ec728c0d60d003656eae678fc2dff105b13377703665fa1909e5efc4f618023725ec780701583f8f70304ef8df7ba39518f3a25274b7f612
 MISC metadata.xml 753 BLAKE2B 86a0b2db6a95eb9035137a11dff5eca3280c427311af8ab9986392fb001707897723a582f4f0627a9a8e2add6c1ac6b3f842198c6e96abf49b15d340962779d6 SHA512 577360801e0a48aff8216a61c5351100369c4094aade0c1e21d6749965fcb9c8cfaf0c32ea6c8e28300cc5b78a75f2e58d4e1f5713e5c7c26d574830e0a486f9
diff --git a/mail-mta/notqmail/notqmail-1.08-r5.ebuild b/mail-mta/notqmail/notqmail-1.08-r5.ebuild
deleted file mode 100644
index e46c90306906..000000000000
--- a/mail-mta/notqmail/notqmail-1.08-r5.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-GENQMAIL_PV=20200817
-QMAIL_SPP_PV=0.42
-
-QMAIL_TLS_PV=20200107
-QMAIL_TLS_F=notqmail-1.08-tls-${QMAIL_TLS_PV}.patch
-
-QMAIL_BIGTODO_F=notqmail-1.08-big-todo.patch
-
-QMAIL_LARGE_DNS="qmail-103.patch"
-
-inherit qmail systemd
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/notqmail/notqmail.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-	SRC_URI="https://github.com/notqmail/notqmail/releases/download/${P}/${P}.tar.xz"
-fi
-
-DESCRIPTION="Collaborative open-source successor to qmail"
-HOMEPAGE="
-	https://notqmail.org
-	https://cr.yp.to/qmail.html
-	http://qmail.org
-"
-SRC_URI="${SRC_URI}
-	https://github.com/DerDakon/genqmail/releases/download/genqmail-${GENQMAIL_PV}/${GENQMAIL_F}
-	https://www.ckdhr.com/ckd/${QMAIL_LARGE_DNS}
-	!vanilla? (
-		highvolume? (
-			https://github.com/notqmail/notqmail/commit/3a22b45974ddd1230da0dfa21f886c3401bee020.patch -> ${QMAIL_BIGTODO_F}
-		)
-		qmail-spp? (
-			ssl? (
-				https://github.com/notqmail/notqmail/commit/c467ba6880aaecfe1d3f592a7738de88cb5ac79a.patch -> ${PN}-1.08-auth.patch
-				https://github.com/notqmail/notqmail/commit/d950cc34491afe90432cafcaeda61d1c1a9508e9.patch -> ${PN}-1.08-tls-spp.patch
-			)
-			!ssl? (
-				https://github.com/notqmail/notqmail/commit/b36d52a0dd7315a969f2a9a7455717466e45be23.patch -> ${PN}-1.08-spp.patch
-			)
-		)
-		ssl? (
-			https://github.com/notqmail/notqmail/commit/0dc6a3aa9cb3440fe589ca5384ea27d683f05625.patch -> ${QMAIL_TLS_F}
-		)
-		!ssl? (
-			https://github.com/notqmail/notqmail/commit/c467ba6880aaecfe1d3f592a7738de88cb5ac79a.patch -> ${PN}-1.08-auth.patch
-		)
-	)
-"
-
-LICENSE="public-domain"
-SLOT="0"
-IUSE=" gencertdaily highvolume pop3 qmail-spp ssl test vanilla"
-REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume !gencertdaily ) gencertdaily? ( ssl )"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	net-dns/libidn2
-	net-mail/queue-repair
-	sys-apps/gentoo-functions
-	ssl? ( >=dev-libs/openssl-1.1:0= )
-	test? ( dev-libs/check )
-"
-RDEPEND="${DEPEND}
-	acct-group/nofiles
-	acct-group/qmail
-	acct-user/alias
-	acct-user/qmaild
-	acct-user/qmaill
-	acct-user/qmailp
-	acct-user/qmailq
-	acct-user/qmailr
-	acct-user/qmails
-	sys-apps/ucspi-tcp
-	!mail-mta/courier
-	!mail-mta/esmtp
-	!mail-mta/exim
-	!mail-mta/msmtp[mta]
-	!mail-mta/nullmailer
-	!mail-mta/opensmtpd
-	!mail-mta/postfix
-	!mail-mta/qmail-ldap
-	!mail-mta/netqmail
-	!mail-mta/sendmail
-	!mail-mta/ssmtp[mta]
-"
-PDEPEND="
-	virtual/daemontools
-"
-
-src_unpack() {
-	genqmail_src_unpack
-
-	[[ ${PV} == "9999" ]] && git-r3_src_unpack
-	[[ ${PV} != "9999" ]] && default
-}
-
-PATCHES=(
-	"${DISTDIR}/${QMAIL_LARGE_DNS}"
-)
-
-src_prepare() {
-	if ! use vanilla; then
-		if use qmail-spp; then
-			PATCHES+=( "${DISTDIR}/${P}-auth.patch" )
-		elif use ssl; then
-			PATCHES+=( "${DISTDIR}/${QMAIL_TLS_F}" )
-		else
-			PATCHES+=( "${DISTDIR}/${P}-auth.patch" )
-		fi
-		use highvolume && PATCHES+=( "${DISTDIR}/${QMAIL_BIGTODO_F}" )
-
-		if use qmail-spp; then
-			if use ssl; then
-				PATCHES+=( "${DISTDIR}/${PN}-1.08-tls-spp.patch" )
-			else
-				PATCHES+=( "${DISTDIR}/${PN}-1.08-spp.patch" )
-			fi
-		fi
-	fi
-
-	default
-
-	qmail_src_postunpack
-
-	einfo "Enabled CRAM_MD5 support"
-
-	ht_fix_file Makefile*
-}
-
-src_compile() {
-	qmail_src_compile NROFF=true
-	emake qmail-send.service
-	use qmail-spp && qmail_spp_src_compile
-}
-
-src_install() {
-	qmail_src_install
-	systemd_dounit "${S}"/qmail-send.service
-}
-
-src_test() {
-	emake test
-}
-
-pkg_postinst() {
-	qmail_queue_setup
-	qmail_rootmail_fixup
-	qmail_tcprules_build
-
-	qmail_config_notice
-	qmail_supervise_config_notice
-	elog
-	elog "If you are looking for documentation, check those links:"
-	elog "https://wiki.gentoo.org/wiki/Virtual_mail_hosting_with_qmail"
-	elog "  -- qmail/vpopmail Virtual Mail Hosting System Guide"
-	elog "http://www.lifewithqmail.com/"
-	elog "  -- Life with qmail"
-	elog
-}
-
-pkg_config() {
-	# avoid some weird locale problems
-	export LC_ALL=C
-
-	qmail_config_fast
-	qmail_tcprules_config
-	qmail_tcprules_build
-
-	use ssl && qmail_ssl_generate
-}
diff --git a/mail-mta/notqmail/notqmail-1.08-r6.ebuild b/mail-mta/notqmail/notqmail-1.08-r6.ebuild
index 4ce54e1ba59c..f90b5bbd44e5 100644
--- a/mail-mta/notqmail/notqmail-1.08-r6.ebuild
+++ b/mail-mta/notqmail/notqmail-1.08-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,7 +7,7 @@ GENQMAIL_PV=20200817
 QMAIL_SPP_PV=0.42
 
 QMAIL_TLS_PV=20200107
-QMAIL_TLS_F=notqmail-1.08-tls-${QMAIL_TLS_PV}.patch
+QMAIL_TLS_F=notqmail-1.08-tls_auth-${QMAIL_TLS_PV}.patch
 
 QMAIL_BIGTODO_F=notqmail-1.08-big-todo.patch
 
diff --git a/mail-mta/notqmail/notqmail-9999.ebuild b/mail-mta/notqmail/notqmail-9999.ebuild
index 60f5e80274c0..937c90fd5439 100644
--- a/mail-mta/notqmail/notqmail-9999.ebuild
+++ b/mail-mta/notqmail/notqmail-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,7 +7,7 @@ GENQMAIL_PV=20200817
 QMAIL_SPP_PV=0.42
 
 QMAIL_TLS_PV=20200107
-QMAIL_TLS_F=notqmail-1.08-tls-${QMAIL_TLS_PV}.patch
+QMAIL_TLS_F=notqmail-1.08-tls_auth-${QMAIL_TLS_PV}.patch
 
 QMAIL_BIGTODO_F=notqmail-1.08-big-todo.patch