summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEray Aslan <eras@gentoo.org>2021-11-30 10:44:43 +0300
committerEray Aslan <eras@gentoo.org>2021-11-30 10:44:43 +0300
commitd6f986a62dd23b12bab7ff9c4b14207e5223d2bb (patch)
tree434d8bdb2d083ab1860e7f09294c1fa306649161 /mail-mta
parentsys-devel/dwz: update EAPI 7 -> 8, add missing test dep (diff)
downloadgentoo-d6f986a62dd23b12bab7ff9c4b14207e5223d2bb.tar.gz
gentoo-d6f986a62dd23b12bab7ff9c4b14207e5223d2bb.tar.bz2
gentoo-d6f986a62dd23b12bab7ff9c4b14207e5223d2bb.zip
mail-mta/postfix: bump to 3.7_pre20211127
Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Eray Aslan <eras@gentoo.org>
Diffstat (limited to 'mail-mta')
-rw-r--r--mail-mta/postfix/Manifest2
-rw-r--r--mail-mta/postfix/postfix-3.7_pre20211127.ebuild (renamed from mail-mta/postfix/postfix-3.7_pre20211113.ebuild)14
2 files changed, 12 insertions, 4 deletions
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 239c7f3b2068..ab83b5a7b867 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -1,2 +1,2 @@
DIST postfix-3.6.3.tar.gz 4750833 BLAKE2B 2a68e0f18227e09c0ce855901503fa83a58805f036f57eff9003102f5933a241e624e5f3f7a7af4f3d89784d95bc0be6ac1d17f30712f61491808ed6a90ce2d3 SHA512 7179aaeeaf27838b867d9a07f9a889d7cd6b7f5053e123caef4dff2820d4df6d5be167effedde6c857b4468966b8449c631e56405e1ac2d589716fb4e3f15e3b
-DIST postfix-3.7-20211113.tar.gz 4771419 BLAKE2B d7efcff0f4b58612918a282f25b5c9fd8df356cef4fb2b3d4bb850d0a9c5387187473b1735bf797a28ad2d5564dbc7112b2c6d921846629ff21b7405a152fb90 SHA512 031551a594ea08cbb4a0d472fd074b02d7599091640966d327c1667aed22f1d58690fe9ed6c11c2f5e6f63d74dac5eff3f9eb3d19b0d38ad27adef32cc7deeed
+DIST postfix-3.7-20211127.tar.gz 4782454 BLAKE2B cd0d0e5e481c4b71bfb83d94313d0f11fa16f7fdb2072804d15bd898a139cfbcc5a7d545407f2c5591d84a0b325856b257d701ca7d14642fe36389c6893591fc SHA512 b7f37008c2718061327a7341a3c0fa928e0843ba022ea3c6e7b5baf185a4afa3df1cd3539e02bd1b5f903995960dd15467c7b2072d418fc5b888ffbf04437158
diff --git a/mail-mta/postfix/postfix-3.7_pre20211113.ebuild b/mail-mta/postfix/postfix-3.7_pre20211127.ebuild
index f5274f856140..2b1551ca7028 100644
--- a/mail-mta/postfix/postfix-3.7_pre20211113.ebuild
+++ b/mail-mta/postfix/postfix-3.7_pre20211127.ebuild
@@ -22,7 +22,7 @@ DEPEND="
acct-group/postfix
acct-group/postdrop
acct-user/postfix
- >=dev-libs/libpcre-3.4
+ || ( dev-libs/libpcre2:0 dev-libs/libpcre )
dev-lang/perl
berkdb? ( >=sys-libs/db-3.2:* )
cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) )
@@ -72,8 +72,16 @@ src_configure() {
done
# Make sure LDFLAGS get passed down to the executables.
- local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -ldl"
- AUXLIBS_PCRE="$(pcre-config --libs)"
+ 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
use pam && mylibs="${mylibs} -lpam"