From cb446366b4662afc38d9bac49afcadfc7ca4789e Mon Sep 17 00:00:00 2001 From: Stefan Huber Date: Tue, 18 Aug 2026 10:26:57 +0200 Subject: [PATCH] virtual/mta: track upstream version instead of a frozen r902 r1/r902 were pinned artificially high to always outrank the main tree's virtual/mta, but that means any real upstream bump would stay permanently invisible. Replaced with mta-1-r2, matching the main tree's current version exactly plus our mail-mta/smailq[mta] addition. Version-matching alone doesn't actually make this override win here: with --getbinpkg on, an identically-versioned binhost binary for ::gentoo outranks building this ebuild regardless of repo priority. Needs virtual/mta::gentoo in package.mask to take effect; documented in the ebuild since it's not otherwise discoverable. Co-Authored-By: Claude Sonnet 5 --- virtual/mta/Manifest | 3 +-- virtual/mta/mta-1-r1.ebuild | 22 ---------------------- virtual/mta/mta-1-r2.ebuild | 28 ++++++++++++++++++++++++++++ virtual/mta/mta-1-r902.ebuild | 22 ---------------------- 4 files changed, 29 insertions(+), 46 deletions(-) delete mode 100644 virtual/mta/mta-1-r1.ebuild create mode 100644 virtual/mta/mta-1-r2.ebuild delete mode 100644 virtual/mta/mta-1-r902.ebuild diff --git a/virtual/mta/Manifest b/virtual/mta/Manifest index 3c00ada..cb9aed5 100644 --- a/virtual/mta/Manifest +++ b/virtual/mta/Manifest @@ -1,3 +1,2 @@ -EBUILD mta-1-r1.ebuild 584 BLAKE2B e396426633b133834495d589c09bb59f45e75d8f38aca2fb9207752b8bbd37ea2acf64b751821e2a0e0aa5d37ac0c2f9244dfe1d02db8d5d095836e82f3fddbe SHA512 f0de1c5f497dbf9cd8201a3da7775c01448605a8cf4ceb6557524ccda9db165029c36c059ef5a889888c3498067553def8de111f17450891bc6a410ad05a48f2 -EBUILD mta-1-r902.ebuild 586 BLAKE2B 9e57f26f832f4ccf319d21ecef7a1da8c4031982395dd53413a08b03eeabbf51af42f1d802a1be5e6aa1e6df8faf5d82aeaf4b7d816f3aa1b9e8caf226c6d465 SHA512 86af49d705180a667c82e23c72368f529d10bd1b336a5de7ebfeea7d65ad4e47186ce6287b493405ff3710b9d7b19774fec020c904a92f0905fcc942795cb372 +EBUILD mta-1-r2.ebuild 906 BLAKE2B 0b3909da527ed15a0e64d5d94d627d0316358e2132d878c937a47c0980a357c2ebf1ab713f2d94546994e15186b87bc4a36f36ac9dfcf7f57c711d6d9a631052 SHA512 e95f47bee448dfaa7db660627285b01a53f1b5ec2810816eccfdeb7f49ea6564a9ca72889677c7a6c0e6f418a94bd2cc2983707af9c6a84ee45075d53c4b17ec MISC metadata.xml 247 BLAKE2B 94608f4bda5b60a090b18717a5d81d90defbb5e482043059dcb7a41d39a21b9192e6f58a1ebdb83cc8cfaa9fe85ced13c40e6e43c110e0e21b2cb6a36f6dc852 SHA512 1196d40f8c6a3b2e5d0c0590c2f56b53ead40ec8d9eb2c125094eb961b092558c51baa89f237fda24cf1050e85c78dd7419e1d217c2feceb32c6296990ac54c3 diff --git a/virtual/mta/mta-1-r1.ebuild b/virtual/mta/mta-1-r1.ebuild deleted file mode 100644 index 9d313f0..0000000 --- a/virtual/mta/mta-1-r1.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="Virtual for Message Transfer Agents" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa m68k ~mips ppc ppc64 s390 sparc x86 ~x64-macos ~x64-solaris" - -# mail-mta/citadel is from sunrise -RDEPEND="|| ( mail-mta/nullmailer - mail-mta/msmtp[mta] - mail-mta/ssmtp[mta] - mail-mta/courier - mail-mta/esmtp - mail-mta/exim - mail-mta/netqmail - mail-mta/notqmail - mail-mta/postfix - mail-mta/sendmail - mail-mta/opensmtpd - mail-mta/smailq[mta] )" diff --git a/virtual/mta/mta-1-r2.ebuild b/virtual/mta/mta-1-r2.ebuild new file mode 100644 index 0000000..e6c3a79 --- /dev/null +++ b/virtual/mta/mta-1-r2.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# This override only wins on a --getbinpkg setup if the main tree's +# virtual/mta is masked by repo, e.g.: +# /etc/portage/package.mask/virtual-mta-shuber: +# virtual/mta::gentoo +# Otherwise an identically-versioned binhost binary for virtual/mta from +# ::gentoo outranks building this ebuild, even with a higher repo priority. + +DESCRIPTION="Virtual for Message Transfer Agents" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris" + +RDEPEND="|| ( mail-mta/nullmailer + mail-mta/msmtp[mta] + mail-mta/ssmtp[mta] + mail-mta/courier + mail-mta/esmtp + mail-mta/exim + mail-mta/netqmail + mail-mta/notqmail + mail-mta/postfix + mail-mta/sendmail + mail-mta/opensmtpd[mta] + mail-mta/smailq[mta] )" diff --git a/virtual/mta/mta-1-r902.ebuild b/virtual/mta/mta-1-r902.ebuild deleted file mode 100644 index 0357e67..0000000 --- a/virtual/mta/mta-1-r902.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="Virtual for Message Transfer Agents" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-macos ~x64-solaris" - -# mail-mta/citadel is from sunrise -RDEPEND="|| ( mail-mta/nullmailer - mail-mta/msmtp[mta] - mail-mta/ssmtp[mta] - mail-mta/courier - mail-mta/esmtp - mail-mta/exim - mail-mta/netqmail - mail-mta/notqmail - mail-mta/postfix - mail-mta/sendmail - mail-mta/opensmtpd - mail-mta/smailq[mta] )" -- 2.39.5