| 1 |
commit: d5e3ea5ff60d15b1d87704cc0268f6a6438ac42b |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Oct 11 01:00:20 2015 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 11 01:00:20 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5e3ea5f |
| 7 |
|
| 8 |
mail-filter/spamdyke: rename USE=tls to ssl for consistency. |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.20.1 |
| 11 |
|
| 12 |
mail-filter/spamdyke/metadata.xml | 2 +- |
| 13 |
mail-filter/spamdyke/spamdyke-4.3.0-r1.ebuild | 9 +++++---- |
| 14 |
mail-filter/spamdyke/spamdyke-4.3.0.ebuild | 13 +++++++------ |
| 15 |
3 files changed, 13 insertions(+), 11 deletions(-) |
| 16 |
|
| 17 |
diff --git a/mail-filter/spamdyke/metadata.xml b/mail-filter/spamdyke/metadata.xml |
| 18 |
index 151d944..e8a572f 100644 |
| 19 |
--- a/mail-filter/spamdyke/metadata.xml |
| 20 |
+++ b/mail-filter/spamdyke/metadata.xml |
| 21 |
@@ -13,6 +13,6 @@ features to enhance qmail. |
| 22 |
Best of all, using spamdyke does not require patching or recompiling qmail! |
| 23 |
</longdescription> |
| 24 |
<use> |
| 25 |
- <flag name='tls'>Enables TLS protocol for spamdyke</flag> |
| 26 |
+ <flag name='ssl'>Enables TLS protocol for spamdyke</flag> |
| 27 |
</use> |
| 28 |
</pkgmetadata> |
| 29 |
|
| 30 |
diff --git a/mail-filter/spamdyke/spamdyke-4.3.0-r1.ebuild b/mail-filter/spamdyke/spamdyke-4.3.0-r1.ebuild |
| 31 |
index 28f4448..a37bc83 100644 |
| 32 |
--- a/mail-filter/spamdyke/spamdyke-4.3.0-r1.ebuild |
| 33 |
+++ b/mail-filter/spamdyke/spamdyke-4.3.0-r1.ebuild |
| 34 |
@@ -3,6 +3,7 @@ |
| 35 |
# $Id$ |
| 36 |
|
| 37 |
EAPI="5" |
| 38 |
+ |
| 39 |
inherit eutils autotools |
| 40 |
|
| 41 |
DESCRIPTION="A drop-in connection-time spam filter for qmail" |
| 42 |
@@ -12,10 +13,10 @@ SRC_URI="http://www.spamdyke.org/releases/${P}.tgz" |
| 43 |
LICENSE="GPL-2" |
| 44 |
SLOT="0" |
| 45 |
KEYWORDS="~amd64 ~x86" |
| 46 |
-IUSE="libressl +tls" |
| 47 |
+IUSE="libressl +ssl" |
| 48 |
|
| 49 |
DEPEND=" |
| 50 |
- tls? ( |
| 51 |
+ ssl? ( |
| 52 |
!libressl? ( dev-libs/openssl:0 ) |
| 53 |
libressl? ( dev-libs/libressl ) |
| 54 |
)" |
| 55 |
@@ -27,7 +28,7 @@ S=${WORKDIR}/${P}/${PN} |
| 56 |
src_prepare() { |
| 57 |
epatch "${FILESDIR}"/${P}-gcc46.patch |
| 58 |
echo "# Configuration option for ${PN}" > ${PN}.conf |
| 59 |
- if use tls; then |
| 60 |
+ if use ssl; then |
| 61 |
echo "tls-certificate-file=/var/qmail/control/clientcert.pem" \ |
| 62 |
>> ${PN}.conf |
| 63 |
fi |
| 64 |
@@ -45,7 +46,7 @@ src_prepare() { |
| 65 |
|
| 66 |
src_configure() { |
| 67 |
econf \ |
| 68 |
- $(use_enable tls) || die "econf failed" |
| 69 |
+ $(use_enable ssl tls) || die "econf failed" |
| 70 |
cd ../utils |
| 71 |
econf || die "econf failed in utils" |
| 72 |
} |
| 73 |
|
| 74 |
diff --git a/mail-filter/spamdyke/spamdyke-4.3.0.ebuild b/mail-filter/spamdyke/spamdyke-4.3.0.ebuild |
| 75 |
index e3491ca..18dbbc7 100644 |
| 76 |
--- a/mail-filter/spamdyke/spamdyke-4.3.0.ebuild |
| 77 |
+++ b/mail-filter/spamdyke/spamdyke-4.3.0.ebuild |
| 78 |
@@ -1,8 +1,9 @@ |
| 79 |
-# Copyright 1999-2012 Gentoo Foundation |
| 80 |
+# Copyright 1999-2015 Gentoo Foundation |
| 81 |
# Distributed under the terms of the GNU General Public License v2 |
| 82 |
# $Id$ |
| 83 |
|
| 84 |
-EAPI="2" |
| 85 |
+EAPI="5" |
| 86 |
+ |
| 87 |
inherit eutils autotools |
| 88 |
|
| 89 |
DESCRIPTION="A drop-in connection-time spam filter for qmail" |
| 90 |
@@ -12,9 +13,9 @@ SRC_URI="http://www.spamdyke.org/releases/${P}.tgz" |
| 91 |
LICENSE="GPL-2" |
| 92 |
SLOT="0" |
| 93 |
KEYWORDS="amd64 x86" |
| 94 |
-IUSE="+tls" |
| 95 |
+IUSE="+ssl" |
| 96 |
|
| 97 |
-DEPEND="tls? ( dev-libs/openssl )" |
| 98 |
+DEPEND="ssl? ( dev-libs/openssl )" |
| 99 |
RDEPEND="${DEPEND} |
| 100 |
virtual/qmail" |
| 101 |
|
| 102 |
@@ -23,7 +24,7 @@ S=${WORKDIR}/${P}/${PN} |
| 103 |
src_prepare() { |
| 104 |
epatch "${FILESDIR}"/${P}-gcc46.patch |
| 105 |
echo "# Configuration option for ${PN}" > ${PN}.conf |
| 106 |
- if use tls; then |
| 107 |
+ if use ssl; then |
| 108 |
echo "tls-certificate-file=/var/qmail/control/clientcert.pem" \ |
| 109 |
>> ${PN}.conf |
| 110 |
fi |
| 111 |
@@ -41,7 +42,7 @@ src_prepare() { |
| 112 |
|
| 113 |
src_configure() { |
| 114 |
econf \ |
| 115 |
- $(use_enable tls) || die "econf failed" |
| 116 |
+ $(use_enable ssl tls) || die "econf failed" |
| 117 |
cd ../utils |
| 118 |
econf || die "econf failed in utils" |
| 119 |
} |
Archives