mail-filter/dkimproxy: version bump, fixes

mail-filter/dovecot-antispam: removed.

Package-Manager: portage-2.2.27

5 files changed, 18 insertions, 88 deletions

diff --git a/mail-filter/dkimproxy/ChangeLog b/mail-filter/dkimproxy/ChangeLog
deleted file mode 100644
index 2d20f94..0000000
--- a/mail-filter/dkimproxy/ChangeLog
+++ /dev/null
@@ -1,8 +0,0 @@
-# ChangeLog for mail-filter/dkimproxy
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  04 Mar 2009; Wolfram Schlich <wschlich@gentoo.org> +metadata.xml,
-  +dkimproxy-1.1.ebuild:
-  version bump, added metadata.xml
-
diff --git a/mail-filter/dkimproxy/Manifest b/mail-filter/dkimproxy/Manifest
index dc00bca..12c15e0 100644
--- a/mail-filter/dkimproxy/Manifest
+++ b/mail-filter/dkimproxy/Manifest
@@ -1,7 +1 @@
-AUX dkimproxy.init 908 RMD160 adfeca8ef1cc47aa04df395921025a15ce23a95f SHA1 f933dad12e612eca79e25bf76fd9f233c01bb974 SHA256 15e9b9b92ad90d63fb375bdca0be32f4e3ea4911f98747a20c3c171035640aeb
-DIST dkimproxy-1.0.1.tar.gz 77675 RMD160 e33ad826a9c9fba2a02154b95fb4f21da33541fb SHA1 73c7af9f37291725e39c5e3103c24c4d9ffd4bc8 SHA256 715ec44fd9a014804c9660e36afb3eaae9c8d860c3f2a4bf07c6cc1ddfacb6bd
-DIST dkimproxy-1.1.tar.gz 78775 RMD160 575fc23152209a72160944a8ffc2714079fa543a SHA1 d6ff204690974824d546919756a408a0770182b7 SHA256 f08bfcb2e166de4c52c96ccf5c3e6b54b589beaf0d442868bd04fbd23158aba5
-EBUILD dkimproxy-1.0.1.ebuild 1340 RMD160 954e999961aba31fc3747c71163f8b98eb690445 SHA1 42f64e83d1544a7787e507169988692813e76c36 SHA256 8fbd6c4da0319b7d995a961e4e753aa78a396778c4713e8d6205c238783dfd13
-EBUILD dkimproxy-1.1.ebuild 1340 RMD160 e35e3c6355ba0995752b4d76d7ea02c2f7a4bc05 SHA1 6901f62f1d24514df277723f960aa3df9a3bb8d9 SHA256 26b4c89a3f7b08fee7f0535a435f0dc48972352125f4761c16c3e0c624eedf31
-MISC ChangeLog 251 RMD160 e63da850e809ce84fab81500c526d019842816a5 SHA1 b40343a5f0afa34166a328b49927471002be5066 SHA256 52406c1e87846ea543fdb8e5ca9d476be031e184985029ceefa9cf5e7f9a4908
-MISC metadata.xml 300 RMD160 3b9c1cd628f9d7ac94b68543ec737d5c2381a47e SHA1 33c5efd31a8aa789118535b921e211ffb5023ac3 SHA256 bc07a9aecce5770d1ace9af0a6c6af8ff6c7b16eb5e7947a1b178d1970855e43
+DIST dkimproxy-1.4.1.tar.gz 109040 SHA256 e5345a1d3cefd32d1fb0face9fa73490118132767253b0ce643463f1e86185bd SHA512 ad5ac961ea25cdd7ccc763521d1fa5e143ef93056ca4bdace1d0d8f564ab85cb128b4c97ace310bcbf9e4d49430dd5baf1e9f836f5a44a4b3f1e7498ebc352b6 WHIRLPOOL 4121f198b4c8406c310ecede8bfb7fec7c0368c637a66c5484f66b873de03dabd34a6a415a01cb285ae131699da37a8cce36168c8a73d7fc32086e73c0690af1
diff --git a/mail-filter/dkimproxy/dkimproxy-1.1.ebuild b/mail-filter/dkimproxy/dkimproxy-1.1.ebuild
deleted file mode 100644
index f87ff5f..0000000
--- a/mail-filter/dkimproxy/dkimproxy-1.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils perl-module
-
-DESCRIPTION="An SMTP proxy that signs and/or verifies emails using the Mail::DKIM module"
-HOMEPAGE="http://dkimproxy.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND=">=dev-perl/Mail-DKIM-0.32
-		dev-perl/Error
-		>=dev-perl/net-server-0.91"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup dkim
-	enewuser dkim -1 -1 -1 dkim
-}
-
-src_compile(){
-	perlinfo
-	export perllibdir=${VENDOR_LIB}
-	econf || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install(){
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dosed '1s:^\(#!/usr/bin/perl\).*$:\1:' /usr/bin/dkimproxy.{in,out}
-	for i in in out; do
-		newinitd ${FILESDIR}/dkimproxy.init dkimproxy_${i}
-	done
-	dodoc README NEWS TODO
-	diropts -odkim -gdkim -m0750
-	dodir /etc/dkimproxy
-}
-
-pkg_postinst() {
-	einfo
-	einfo "If you want to sign outgoing mail using DKIM, you might want"
-	einfo "to generate an RSA keypair now:"
-	einfo
-	einfo "umask 0027"
-	einfo "openssl genrsa -out /etc/dkimproxy/privkey.pem 1024"
-	einfo "openssl rsa -in /etc/dkimproxy/privkey.pem -pubout -out /etc/dkimproxy/pubkey.pem"
-	einfo "chgrp dkim /etc/dkimproxy/*.pem"
-	einfo
-}
diff --git a/mail-filter/dkimproxy/dkimproxy-1.0.1.ebuild b/mail-filter/dkimproxy/dkimproxy-1.4.1.ebuild
index 952ada8..68b20a5 100644
--- a/mail-filter/dkimproxy/dkimproxy-1.0.1.ebuild
+++ b/mail-filter/dkimproxy/dkimproxy-1.4.1.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
-inherit eutils perl-module
+EAPI=5
+
+inherit eutils perl-functions user
 
 DESCRIPTION="An SMTP proxy that signs and/or verifies emails using the Mail::DKIM module"
 HOMEPAGE="http://dkimproxy.sourceforge.net/"
@@ -13,7 +15,7 @@ SLOT="0"
 KEYWORDS="~x86 ~amd64"
 IUSE=""
 
-DEPEND=">=dev-perl/Mail-DKIM-0.30
+DEPEND=">=dev-perl/Mail-DKIM-0.34
 		dev-perl/Error
 		>=dev-perl/net-server-0.91"
 RDEPEND="${DEPEND}"
@@ -23,20 +25,18 @@ pkg_setup() {
 	enewuser dkim -1 -1 -1 dkim
 }
 
-src_compile(){
-	perlinfo
+src_configure() {
+	perl_set_version
 	export perllibdir=${VENDOR_LIB}
-	econf || die "econf failed"
-	emake || die "emake failed"
+	default_src_configure
 }
 
-src_install(){
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dosed '1s:^\(#!/usr/bin/perl\).*$:\1:' /usr/bin/dkimproxy.{in,out}
+src_install() {
+	default_src_install
+	sed -i -e '1s:^\(#!/usr/bin/perl\).*$:\1:' "${D}"/usr/bin/dkimproxy.{in,out}
 	for i in in out; do
-		newinitd ${FILESDIR}/dkimproxy.init dkimproxy_${i}
+		newinitd "${FILESDIR}"/dkimproxy.init dkimproxy_${i}
 	done
-	dodoc README NEWS TODO
 	diropts -odkim -gdkim -m0750
 	dodir /etc/dkimproxy
 }
diff --git a/mail-filter/dkimproxy/metadata.xml b/mail-filter/dkimproxy/metadata.xml
index a7162e9..74350c0 100644
--- a/mail-filter/dkimproxy/metadata.xml
+++ b/mail-filter/dkimproxy/metadata.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-	<email>wschlich@gentoo.org</email>
-	<name>Wolfram Schlich</name>
-	<description>Primary maintainer</description>
-</maintainer>
+	<maintainer type="person">
+		<email>wschlich@gentoo.org</email>
+		<name>Wolfram Schlich</name>
+	</maintainer>
 </pkgmetadata>