commit:     6755bd99fdbd856900136accfb1664afe50506d7
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  8 15:06:58 2023 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sat Apr  8 15:07:46 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6755bd99

mail-filter/maildrop: bump to 3.1.4 and remove old 3.1*

Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 mail-filter/maildrop/Manifest                      |   4 +-
 mail-filter/maildrop/maildrop-3.1.0-r1.ebuild      | 138 ---------------------
 mail-filter/maildrop/maildrop-3.1.1.ebuild         | 138 ---------------------
 ...maildrop-3.1.2.ebuild => maildrop-3.1.4.ebuild} |   0
 4 files changed, 1 insertion(+), 279 deletions(-)

diff --git a/mail-filter/maildrop/Manifest b/mail-filter/maildrop/Manifest
index d53212539f05..31415703bc04 100644
--- a/mail-filter/maildrop/Manifest
+++ b/mail-filter/maildrop/Manifest
@@ -1,4 +1,2 @@
 DIST maildrop-3.0.2.tar.bz2 2129406 BLAKE2B 
10572c9c0fcb7a31f10fdfb005562afd425d157fe515f31d7fc6721247b0a5d5d381b51da39f0161de0c8722af89da225273728928510fd9d79c18c18b5759e5
 SHA512 
a2e6ad9c6982e468b4f778fe6956312aa1da54c93269311922f247a89ede49349a6cbce869b08ced22354d18259ebc043e4f4adf1e0b364d8e110797b24efbc8
-DIST maildrop-3.1.0.tar.bz2 2154698 BLAKE2B 
8eaec33ccb3f117e0cd069eac2af736f5cc3485314ea14ac594f8e716e68d3f1e20143ba47533c08a835707dda1e8ba0fad2eea5d3bf5845668f8ad375e56387
 SHA512 
4d4ab1acd9f81beb54af9af86d0f8c3145f962f1ff2fd5e9209e31b63054cc41b3e4a1300965a8855a39dbcfa1cdbdef2ad194af1f12e079c1361b12b293ed56
-DIST maildrop-3.1.1.tar.bz2 2156071 BLAKE2B 
fb5656cd44b55d1d4dbcbb9f13c787024fd1a4055499b273637463e135e54d1ecfa106afd7a8e98709aedb51494dc1ff35131a3d52ed8440ae1641111b5dde3c
 SHA512 
61e5a06d85778519add2250ef395c5a9eb6b96be715ce202405087df8eb67f007007ec9d324c28e3ab21de7e66baa916ec42ba17462cd8a544f634960388cfee
-DIST maildrop-3.1.2.tar.bz2 2155497 BLAKE2B 
131718c0b1e299c9268404b4da5c7a26e6e761db219e45456b6bd9c331bd8235215875a78e36fe7fd7b1981527fc1be0d774886282e80c021defb2e591526b59
 SHA512 
0dd680bbbc81fdeb652dc2917d5e2d61fef1da5204540f449f3f9593709a71217d20d8238a1eaf5201aef9ff3c0a5bb4b4e91efff20f6f2107c3197361376ef9
+DIST maildrop-3.1.4.tar.bz2 2156148 BLAKE2B 
e7de4e30ee23d8d2f88de7b0398a41c84af6d34207e9f26fd7b22e7ac1b5171c309c6304b312a75e621bc860e5a2d3f59613e47ff5a73ae6412761179f787f53
 SHA512 
b8f373e142c61ba9cdf32fd939aa7fc5c24ec873f734be048e94561e35977b6fb663ff4a1c35fc22dc7dc2075e04e4c4a09e37c0e7c7c0dd96555fcda9c7fd26

diff --git a/mail-filter/maildrop/maildrop-3.1.0-r1.ebuild 
b/mail-filter/maildrop/maildrop-3.1.0-r1.ebuild
deleted file mode 100644
index 68fa7df9873d..000000000000
--- a/mail-filter/maildrop/maildrop-3.1.0-r1.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit flag-o-matic autotools
-
-DESCRIPTION="Mail delivery agent/filter"
-[[ -z ${PV/?.?/}   ]] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-[[ -z ${PV/?.?.?/} ]] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-[[ -z ${SRC_URI}   ]] && 
SRC_URI="https://www.courier-mta.org/beta/${PN}/${P%%_pre}.tar.bz2";
-HOMEPAGE="https://www.courier-mta.org/maildrop/";
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="berkdb debug dovecot gdbm ldap mysql postgres static-libs authlib +tools 
trashquota"
-
-CDEPEND="!mail-mta/courier
-       net-mail/mailbase
-       dev-libs/libpcre2
-       net-dns/libidn2:=
-       >=net-libs/courier-unicode-2.0:=
-       gdbm?     ( >=sys-libs/gdbm-1.8.0:= )
-       mysql?    ( net-libs/courier-authlib )
-       postgres? ( net-libs/courier-authlib )
-       ldap?     ( net-libs/courier-authlib )
-       authlib?  ( net-libs/courier-authlib )
-       !gdbm? (
-               berkdb? ( >=sys-libs/db-3:= )
-       )
-       gdbm? ( net-mail/courier-imap[gdbm?,berkdb?] )
-       berkdb? ( net-mail/courier-imap[gdbm?,berkdb?] )
-       tools? (
-               !mail-mta/netqmail
-               !net-mail/courier-imap
-       )"
-DEPEND="${CDEPEND}"
-RDEPEND="${CDEPEND}
-       dev-lang/perl
-       dovecot? ( net-mail/dovecot )"
-BDEPEND="virtual/pkgconfig"
-
-REQUIRED_USE="
-       mysql? ( authlib )
-       postgres? ( authlib )
-       ldap? ( authlib )"
-
-S=${WORKDIR}/${P%%_pre}
-
-PATCHES=(
-       "${FILESDIR}"/${PN}-3.0.0-testsuite.patch
-       "${FILESDIR}"/${PN}-3.0.2-makedat.patch
-)
-
-src_prepare() {
-       # Prefer gdbm over berkdb
-       if use gdbm ; then
-               use berkdb && elog "Both gdbm and berkdb selected. Using gdbm."
-       fi
-
-       # no need to error out if no default - it will be given to econf anyway
-       sed -i -e \
-               's~AC_MSG_ERROR(Cannot determine default 
mailbox)~SPOOLDIR="./.maildir"~' \
-               "${S}"/libs/maildrop/configure.ac || die "sed failed"
-
-       default
-       eautoreconf
-}
-
-src_configure() {
-       local myeconfargs=(
-               --with-devel
-               --disable-tempdir
-               --enable-syslog=1
-               --enable-use-flock=1
-               --enable-use-dotlock=1
-               --enable-restrict-trusted=1
-               --enable-maildrop-uid=root
-               --enable-maildrop-gid=mail
-               --enable-sendmail=/usr/sbin/sendmail
-               --cache-file="${S}"/configuring.cache
-               $(use_enable static-libs static)
-               $(use_enable dovecot dovecotauth)
-               $(use_with trashquota)
-       )
-
-       local mytrustedusers="apache dspam root mail fetchmail"
-       mytrustedusers+=" daemon postmaster qmaild mmdf vmail alias"
-       myeconfargs+=( --enable-trusted-users="${mytrustedusers}" )
-
-       # These flags make maildrop cry
-       replace-flags -Os -O2
-       filter-flags -fomit-frame-pointer
-
-       if use gdbm ; then
-               myeconfargs+=( --with-db=gdbm )
-       elif use berkdb ; then
-               myeconfargs+=( --with-db=db )
-       else
-               myeconfargs+=( --without-db )
-       fi
-
-       if ! use mysql && ! use postgres && ! use ldap && ! use authlib ; then
-               myeconfargs+=( --disable-authlib )
-       fi
-
-       # default mailbox is $HOME/.maildir for Gentoo
-       maildrop_cv_SYS_INSTALL_MBOXDIR="./.maildir" econf "${myeconfargs[@]}"
-}
-
-src_install() {
-       default
-
-       if use authlib ; then
-               fperms 4755 /usr/bin/maildrop
-       fi
-
-       dodoc AUTHORS ChangeLog INSTALL NEWS README \
-               README.postfix README.dovecotauth UPGRADE \
-               maildroptips.txt
-       docinto maildir
-       dodoc libs/maildir/AUTHORS libs/maildir/INSTALL \
-               libs/maildir/README*.txt libs/maildir/*.html
-
-       # bugs 61116, 374009, and 639124
-       if ! use tools ; then
-               for tool in "maildirmake" "deliverquota"; do
-                       rm "${D}/usr/bin/${tool}" || die
-                       rm "${D}/usr/share/man/man"[0-9]"/${tool}."[0-9] || die
-               done
-               rm "${D}/usr/share/man/man5/maildir.5" || die
-       fi
-
-       insinto /etc
-       doins "${FILESDIR}"/maildroprc
-
-       use static-libs || find "${D}"/usr/lib* -name '*.la' -delete
-}

diff --git a/mail-filter/maildrop/maildrop-3.1.1.ebuild 
b/mail-filter/maildrop/maildrop-3.1.1.ebuild
deleted file mode 100644
index 4607e76db795..000000000000
--- a/mail-filter/maildrop/maildrop-3.1.1.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit flag-o-matic autotools
-
-DESCRIPTION="Mail delivery agent/filter"
-[[ -z ${PV/?.?/}   ]] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-[[ -z ${PV/?.?.?/} ]] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-[[ -z ${SRC_URI}   ]] && 
SRC_URI="https://www.courier-mta.org/beta/${PN}/${P%%_pre}.tar.bz2";
-HOMEPAGE="https://www.courier-mta.org/maildrop/";
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="berkdb debug dovecot gdbm ldap mysql postgres static-libs authlib +tools 
trashquota"
-
-CDEPEND="!mail-mta/courier
-       net-mail/mailbase
-       dev-libs/libpcre2
-       net-dns/libidn2:=
-       >=net-libs/courier-unicode-2.0:=
-       gdbm?     ( >=sys-libs/gdbm-1.8.0:= )
-       mysql?    ( net-libs/courier-authlib )
-       postgres? ( net-libs/courier-authlib )
-       ldap?     ( net-libs/courier-authlib )
-       authlib?  ( net-libs/courier-authlib )
-       !gdbm? (
-               berkdb? ( >=sys-libs/db-3:= )
-       )
-       gdbm? ( net-mail/courier-imap[gdbm?,berkdb?] )
-       berkdb? ( net-mail/courier-imap[gdbm?,berkdb?] )
-       tools? (
-               !mail-mta/netqmail
-               !net-mail/courier-imap
-       )"
-DEPEND="${CDEPEND}"
-RDEPEND="${CDEPEND}
-       dev-lang/perl
-       dovecot? ( net-mail/dovecot )"
-BDEPEND="virtual/pkgconfig"
-
-REQUIRED_USE="
-       mysql? ( authlib )
-       postgres? ( authlib )
-       ldap? ( authlib )"
-
-S=${WORKDIR}/${P%%_pre}
-
-PATCHES=(
-       "${FILESDIR}"/${P}-testsuite.patch
-       "${FILESDIR}"/${PN}-3.0.2-makedat.patch
-)
-
-src_prepare() {
-       # Prefer gdbm over berkdb
-       if use gdbm ; then
-               use berkdb && elog "Both gdbm and berkdb selected. Using gdbm."
-       fi
-
-       # no need to error out if no default - it will be given to econf anyway
-       sed -i -e \
-               's~AC_MSG_ERROR(Cannot determine default 
mailbox)~SPOOLDIR="./.maildir"~' \
-               "${S}"/libs/maildrop/configure.ac || die "sed failed"
-
-       default
-       eautoreconf
-}
-
-src_configure() {
-       local myeconfargs=(
-               --with-devel
-               --disable-tempdir
-               --enable-syslog=1
-               --enable-use-flock=1
-               --enable-use-dotlock=1
-               --enable-restrict-trusted=1
-               --enable-maildrop-uid=root
-               --enable-maildrop-gid=mail
-               --enable-sendmail=/usr/sbin/sendmail
-               --cache-file="${S}"/configuring.cache
-               $(use_enable static-libs static)
-               $(use_enable dovecot dovecotauth)
-               $(use_with trashquota)
-       )
-
-       local mytrustedusers="apache dspam root mail fetchmail"
-       mytrustedusers+=" daemon postmaster qmaild mmdf vmail alias"
-       myeconfargs+=( --enable-trusted-users="${mytrustedusers}" )
-
-       # These flags make maildrop cry
-       replace-flags -Os -O2
-       filter-flags -fomit-frame-pointer
-
-       if use gdbm ; then
-               myeconfargs+=( --with-db=gdbm )
-       elif use berkdb ; then
-               myeconfargs+=( --with-db=db )
-       else
-               myeconfargs+=( --without-db )
-       fi
-
-       if ! use mysql && ! use postgres && ! use ldap && ! use authlib ; then
-               myeconfargs+=( --disable-authlib )
-       fi
-
-       # default mailbox is $HOME/.maildir for Gentoo
-       maildrop_cv_SYS_INSTALL_MBOXDIR="./.maildir" econf "${myeconfargs[@]}"
-}
-
-src_install() {
-       default
-
-       if use authlib ; then
-               fperms 4755 /usr/bin/maildrop
-       fi
-
-       dodoc AUTHORS ChangeLog INSTALL NEWS README \
-               README.postfix README.dovecotauth UPGRADE \
-               maildroptips.txt
-       docinto maildir
-       dodoc libs/maildir/AUTHORS libs/maildir/INSTALL \
-               libs/maildir/README*.txt libs/maildir/*.html
-
-       # bugs 61116, 374009, and 639124
-       if ! use tools ; then
-               for tool in "maildirmake" "deliverquota"; do
-                       rm "${D}/usr/bin/${tool}" || die
-                       rm "${D}/usr/share/man/man"[0-9]"/${tool}."[0-9] || die
-               done
-               rm "${D}/usr/share/man/man5/maildir.5" || die
-       fi
-
-       insinto /etc
-       doins "${FILESDIR}"/maildroprc
-
-       use static-libs || find "${D}"/usr/lib* -name '*.la' -delete
-}

diff --git a/mail-filter/maildrop/maildrop-3.1.2.ebuild 
b/mail-filter/maildrop/maildrop-3.1.4.ebuild
similarity index 100%
rename from mail-filter/maildrop/maildrop-3.1.2.ebuild
rename to mail-filter/maildrop/maildrop-3.1.4.ebuild

Reply via email to