commit:     fa931397545f0f3c8e8f81acab0e37ee66a170b0
Author:     Eray Aslan <eras <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  4 06:58:57 2022 +0000
Commit:     Eray Aslan <eras <AT> gentoo <DOT> org>
CommitDate: Mon Apr  4 06:59:33 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa931397

mail-mta/postfix: add 3.8_pre20220403, drop 3.8_pre20220325

and hardcode libpcre2 dependency. libpcre is EOL

Bug: https://bugs.gentoo.org/836672
Signed-off-by: Eray Aslan <eras <AT> gentoo.org>

 mail-mta/postfix/Manifest                                     |  2 +-
 ...-3.8_pre20220325.ebuild => postfix-3.8_pre20220403.ebuild} | 11 +++--------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 8b99dc2c034e..daf167e3daf6 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -1,3 +1,3 @@
 DIST postfix-3.6.5.tar.gz 4751485 BLAKE2B 
7d53ccf76d978db269fe0ab8641abcb3ba91a72c97fa739a2c8ea80c45bb3ecdaca51d08f7db03582887a0cdcdf96be423e3e35b4f2ab2fbb0fbe4e98dd60758
 SHA512 
510c7b387b38c8683bda33371468c1c1209285baca7d8f237fdb668b313fa4b4d6727f7e4eb79fc81c4155f0839b4e95995dff186e62621b26e5b8b31cff15d5
 DIST postfix-3.7.0.tar.gz 4823087 BLAKE2B 
7388ad49862c97e20179a2d3ed26069f21e8a578790fcb8adc9f5b648202269bd4c07905931237dab905d991002bcfd9f03d11e6a85b46fcf0e3b72412d852eb
 SHA512 
f2fb5c0399100c19e428b68728a8ce62b1fb74d365038373f22ed698c1d0fece506b3f1335c322b949875a4a9fa96fa0a7680b12641d596d09615e8fef061da4
-DIST postfix-3.8-20220325.tar.gz 4822339 BLAKE2B 
844239856ec5dc2eeb3c56134f69e20a43a9e1e1c70d66022bd4775d307cb865236f355e6039e30f28d6b35fba3d83d768a4c477c7af5338bd6fd50b12002afa
 SHA512 
c425563c329878b687f346f2291c990884d0ff21e8af1062b7977e1ca269086dfcc487ec75a5192c02575456895bb9f6a87562690f207657ffb3428a0eb999b9
+DIST postfix-3.8-20220403.tar.gz 4810556 BLAKE2B 
2859729ad7094136575ad866005340a7616814efcbf6724680ffb010f933c357eaf7f957f72efcdc4df2fc0a81ba5fc40f9fc6b5efc11d475d347f935cab0ed0
 SHA512 
b19a907526ae1ef60816a8ad623b91e923c8d00a2da70ad667b405a2d3eb71bb9ea936019176bbbdac88d6335f698b97c87fbf8688ca9eea9cc13f2c99dcef05

diff --git a/mail-mta/postfix/postfix-3.8_pre20220325.ebuild 
b/mail-mta/postfix/postfix-3.8_pre20220403.ebuild
similarity index 97%
rename from mail-mta/postfix/postfix-3.8_pre20220325.ebuild
rename to mail-mta/postfix/postfix-3.8_pre20220403.ebuild
index 8c42346cf6f5..d0b51c08b7fd 100644
--- a/mail-mta/postfix/postfix-3.8_pre20220325.ebuild
+++ b/mail-mta/postfix/postfix-3.8_pre20220403.ebuild
@@ -22,7 +22,7 @@ DEPEND="
        acct-group/postfix
        acct-group/postdrop
        acct-user/postfix
-       || ( dev-libs/libpcre2:0 dev-libs/libpcre )
+       dev-libs/libpcre2:0
        dev-lang/perl
        berkdb? ( >=sys-libs/db-3.2:* )
        cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) )
@@ -75,13 +75,8 @@ src_configure() {
        local mycc="" mylibs="${LDFLAGS} -ldl"
 
        # libpcre is EOL. prefer libpcre2
-       if has_version dev-libs/libpcre2; then
-               mycc="-DHAS_PCRE=2"
-               AUXLIBS_PCRE="$(pcre2-config --libs8)"
-       else
-               mycc="-DHAS_PCRE=1"
-               AUXLIBS_PCRE="$(pcre-config --libs)"
-       fi
+       mycc=" -DHAS_PCRE=2"
+       AUXLIBS_PCRE="$(pcre2-config --libs8)"
 
        use pam && mylibs="${mylibs} -lpam"
 

Reply via email to