commit: dc2811fcb25f70dd145bdf539371f1b66d1810c7 Author: Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org> AuthorDate: Wed Mar 30 13:28:01 2016 +0000 Commit: Jason Donenfeld <zx2c4 <AT> gentoo <DOT> org> CommitDate: Wed Mar 30 13:30:55 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc2811fc
mail-filter/opensmtpd-extras: bump Package-Manager: portage-2.2.28 mail-filter/opensmtpd-extras/Manifest | 2 +- ... => opensmtpd-extras-5.7.1.201602042118.ebuild} | 25 +++--- .../opensmtpd-extras/opensmtpd-extras-5.7.1.ebuild | 91 ---------------------- 3 files changed, 15 insertions(+), 103 deletions(-) diff --git a/mail-filter/opensmtpd-extras/Manifest b/mail-filter/opensmtpd-extras/Manifest index 18c6ca4..d0fb03b 100644 --- a/mail-filter/opensmtpd-extras/Manifest +++ b/mail-filter/opensmtpd-extras/Manifest @@ -1,2 +1,2 @@ -DIST opensmtpd-extras-201506020835.tar.gz 159567 SHA256 47dfc47dd6ad56b15707dcfb592ebe04e39f107a44076e0ab969b6d940eec84e SHA512 b4eef315a7c44166ec36c821a0113cf0f448125fce4773b9d748b34507cde71b131195b81237e6efe5a209817d770a76050b5538c21349900ee2d13cfa1b5f5f WHIRLPOOL 2b35b4a8c2855bd9110ee639f5d6e269f4fd393483f58bce09ab65c188677ca81abba3cd55a65a16cefd0a15a15bcf59f5c53f5ff11f9773a542d18b0858d6cf +DIST opensmtpd-extras-201602042118.tar.gz 142226 SHA256 59480e4bc0c75ca554a0a833b51764e4b7de6acf9f1ebcd2e7f176c144da3b32 SHA512 71bdb8330999f41013ceabcf5506fccabe88cf12d3dadef03360d0b58570a94d4373526352689ffd8608fb586d4e3099963dfc07678761bb4a4dad288585613d WHIRLPOOL b1399e58afda666b8a5833a73b710cd1e223991384582a41cc67fdaac413a6b97e446b1511420559885f782eb73066eccce7e364c205f1e937ff5d5fd97e7fd9 DIST opensmtpd-extras-5.7.1.tar.gz 594170 SHA256 b56dc24427afe7d6156c85232427fe33a260aca8873eb118d0229dff3a248dce SHA512 b578c728fc95a9a7a5c6e201d9fd802529c9cce55d36ebff6d2fbe53e8bd66759ee4da19c7b1be283b72f2297c1e7f91bf4e1159898442e21ef1aca8abf85065 WHIRLPOOL c9cc17b3b890811de15aa4113e70765c4982ad57f71e7fa4fc3dca13b46852c8e0d5cd601752910624021c4eac882870b0f5040706ed19b4e3670f60353154cd diff --git a/mail-filter/opensmtpd-extras/opensmtpd-extras-5.4.5.201506020835.ebuild b/mail-filter/opensmtpd-extras/opensmtpd-extras-5.7.1.201602042118.ebuild similarity index 85% rename from mail-filter/opensmtpd-extras/opensmtpd-extras-5.4.5.201506020835.ebuild rename to mail-filter/opensmtpd-extras/opensmtpd-extras-5.7.1.201602042118.ebuild index ba9ec00..76ff527 100644 --- a/mail-filter/opensmtpd-extras/opensmtpd-extras-5.4.5.201506020835.ebuild +++ b/mail-filter/opensmtpd-extras/opensmtpd-extras-5.7.1.201602042118.ebuild @@ -4,7 +4,7 @@ EAPI=5 -inherit versionator eutils flag-o-matic autotools +inherit eutils flag-o-matic autotools versionator DESCRIPTION="Extra tables, filters, and various other addons for OpenSMTPD" HOMEPAGE="https://github.com/OpenSMTPD/OpenSMTPD-extras" @@ -33,21 +33,21 @@ MY_COMPONENTS=" queue-ram queue-stub + scheduler-python + scheduler-ram + scheduler-stub + table-ldap table-mysql + table-passwd table-postgres + table-python table-redis table-socketmap - table-passwd - table-python table-sqlite table-stub - - scheduler-ram - scheduler-stub - scheduler-python " -IUSE="${MY_COMPONENTS} luajit" +IUSE="${MY_COMPONENTS} libressl luajit" # Deps: # mysql needs -lmysqlclient @@ -61,14 +61,17 @@ IUSE="${MY_COMPONENTS} luajit" # python requires python, currently pegged at 2.7 # lua requires any lua version -DEPEND="mail-mta/opensmtpd dev-libs/libevent dev-libs/openssl +DEPEND="mail-mta/opensmtpd + dev-libs/libevent + !libressl? ( dev-libs/openssl:0 ) + libressl? ( dev-libs/libressl ) filter-python? ( dev-lang/python:2.7 ) filter-perl? ( dev-lang/perl ) - filter-lua? ( luajit? ( dev-lang/luajit ) !luajit? ( dev-lang/lua ) ) + filter-lua? ( luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:* ) ) filter-dnsbl? ( net-libs/libasr ) table-sqlite? ( dev-db/sqlite:3 ) table-mysql? ( virtual/mysql ) - table-postgres? ( dev-db/postgresql ) + table-postgres? ( dev-db/postgresql:* ) table-redis? ( dev-libs/hiredis ) table-python? ( dev-lang/python:2.7 ) scheduler-python? ( dev-lang/python:2.7 ) diff --git a/mail-filter/opensmtpd-extras/opensmtpd-extras-5.7.1.ebuild b/mail-filter/opensmtpd-extras/opensmtpd-extras-5.7.1.ebuild deleted file mode 100644 index 7dc86f8..0000000 --- a/mail-filter/opensmtpd-extras/opensmtpd-extras-5.7.1.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils flag-o-matic autotools - -DESCRIPTION="Extra tables, filters, and various other addons for OpenSMTPD" -HOMEPAGE="https://github.com/OpenSMTPD/OpenSMTPD-extras" -SRC_URI="https://www.opensmtpd.org/archives/${P}.tar.gz" - -LICENSE="ISC BSD BSD-1 BSD-2 BSD-4" -SLOT="0" -KEYWORDS="~amd64 ~x86" -MY_COMPONENTS=" - filter-clamav - filter-dkim-signer - filter-dnsbl - filter-lua - filter-monkey - filter-pause - filter-perl - filter-python - filter-regex - filter-spamassassin - filter-stub - filter-trace - filter-void - - queue-null - queue-python - queue-ram - queue-stub - - scheduler-python - scheduler-ram - scheduler-stub - - table-ldap - table-mysql - table-passwd - table-postgres - table-python - table-redis - table-socketmap - table-sqlite - table-stub -" -IUSE="${MY_COMPONENTS} luajit" - -# Deps: -# mysql needs -lmysqlclient -# sqlite needs -lsqlite3 -# redis needs -lhiredis -# postgres requires -lpq -# ldap uses internal library and requires no deps -# spamassassin uses internal library and requires no deps -# clamav uses internal library and requires no deps -# dnsbl needs -lasr -# python requires python, currently pegged at 2.7 -# lua requires any lua version - -DEPEND="mail-mta/opensmtpd - dev-libs/libevent - dev-libs/openssl:0 - filter-python? ( dev-lang/python:2.7 ) - filter-perl? ( dev-lang/perl ) - filter-lua? ( luajit? ( dev-lang/luajit ) !luajit? ( dev-lang/lua ) ) - filter-dnsbl? ( net-libs/libasr ) - table-sqlite? ( dev-db/sqlite:3 ) - table-mysql? ( virtual/mysql ) - table-postgres? ( dev-db/postgresql ) - table-redis? ( dev-libs/hiredis ) - table-python? ( dev-lang/python:2.7 ) - scheduler-python? ( dev-lang/python:2.7 ) - queue-python? ( dev-lang/python:2.7 ) -" -RDEPEND="${DEPEND}" - -src_prepare() { - eautoreconf -} -src_configure() { - econf \ - --with-privsep-user=smtpd \ - --with-privsep-path=/var/empty \ - --sysconfdir=/etc/opensmtpd \ - --with-lua-type=$(usex luajit luajit lua) \ - $(for use in $MY_COMPONENTS; do use_with $use; done) -}