6 files changed, 16 insertions, 126 deletions
diff --git a/mail-filter/sbd-proxy/ChangeLog b/mail-filter/sbd-proxy/ChangeLog
deleted file mode 100644
index 21f0e6a..0000000
--- a/mail-filter/sbd-proxy/ChangeLog
+++ /dev/null
@@ -1,14 +0,0 @@
-# ChangeLog for mail-filter/sbd-proxy
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  25 Jan 2010; Wolfram Schlich <wschlich@gentoo.org> +sbd-proxy-1.2.ebuild:
-  version bump
-
-  04 Nov 2009; Wolfram Schlich <wschlich@gentoo.org> +sbd-proxy-1.1.ebuild:
-  version bump
-
-  28 Oct 2009; Wolfram Schlich <wschlich@gentoo.org> +files/sbd-proxy.confd,
-  +files/sbd-proxy.initd, +sbd-proxy-1.0.ebuild:
-  initial import
-
diff --git a/mail-filter/sbd-proxy/Manifest b/mail-filter/sbd-proxy/Manifest
index 30c91fc..8c820f9 100644
--- a/mail-filter/sbd-proxy/Manifest
+++ b/mail-filter/sbd-proxy/Manifest
@@ -1,9 +1 @@
-AUX sbd-proxy.confd 187 RMD160 05ea13942b87b34efc7fbd7da5ee9e7b090aaf31 SHA1 c800e8303a08a41a3cd09535d5ddd87a459e711e SHA256 4c884c252cf1d65635daa59a0687f33509a56c1d4a403dcf4fcb87d0ba09f955
-AUX sbd-proxy.initd 798 RMD160 deacda480e48c30fc8d4230a28ce956dc2aac6b9 SHA1 259ee4d091b255203a3ad2c84eecd9b5f567fe33 SHA256 0b9dd9e3e765e5d14a5cb1ed33678db7e2f4ef07fc0947552788c78a9a4e3c8a
-DIST sbd-proxy-1.0.tar.bz2 6425 RMD160 585017e239dc14835443805cf0ab75690b529f39 SHA1 c45815e3935b944dde86daeb5634dab3c0b60dc3 SHA256 c8d838e46cb0f3d39792f6c56ac5cc6b74b302c6987e3b3453f1f2733ab5dad3
-DIST sbd-proxy-1.1.tar.bz2 6488 RMD160 d4e5725f92cd6fc26735220a32e237858a89cfb5 SHA1 6cc38b9d64d347854929459ab8f358e7aae0ed57 SHA256 4723b7d23e3556c91accd407baaba4de88286d025c23520e60eabecc6fae65be
-DIST sbd-proxy-1.2.tar.bz2 7797 RMD160 bdea663404e8749c7b0254ad25ed5c30ec7bc6a2 SHA1 9ed4a31785be0ffb04bf1aac468537298bf2688b SHA256 7de022956e47149c5140447aec8c6ba7a7e278c71281dafaef512c5dc3f1440e
-EBUILD sbd-proxy-1.0.ebuild 1062 RMD160 cf0ad92b5d062c46b3d34f1d5f7b141ee544295c SHA1 b448b8111e4bf8c7f9f667a4f491002e4c87d4a9 SHA256 2eed5616946c59025e1a4243a7b89d7f81d11a16de0095324234823b36da83ad
-EBUILD sbd-proxy-1.1.ebuild 1062 RMD160 cf0ad92b5d062c46b3d34f1d5f7b141ee544295c SHA1 b448b8111e4bf8c7f9f667a4f491002e4c87d4a9 SHA256 2eed5616946c59025e1a4243a7b89d7f81d11a16de0095324234823b36da83ad
-EBUILD sbd-proxy-1.2.ebuild 1062 RMD160 1720d4d93d63c48f2c628f4495d0b0c9bf07cd57 SHA1 45ae27158a147fbc1d83d05a7d94d23215616287 SHA256 b21dadd020484fab4b111bc46124a0297fe55113da9685bda57a18c80e61d9e2
-MISC ChangeLog 450 RMD160 d8827ba8ea0186d046439ae7e7e16eb316238848 SHA1 5a5bf79f22a8d3bb3e2c68c4c76c10658dfedf14 SHA256 10499a7fa83348cfab7515c8c1bba578e1b552a178c9ab9f7e8ba0f65ff9d80a
+DIST sbd-proxy-1.2.tar.bz2 7797 SHA256 7de022956e47149c5140447aec8c6ba7a7e278c71281dafaef512c5dc3f1440e SHA512 dbe62fe3e8f7970979c004387f1b5c62fc8dc36755989cdfe0e5b3791d69ef84166b66f1c05a8dec01596adb4f7023928f1ce89e48e1038292497503b79c9fe7 WHIRLPOOL 8420e9cbce06bfce68619061d4a960ee64231da7baa5554209f56d5872b7ee45e7dec1f32d26e01c293a0927e28d5dd5bb8ba891e61251c6f69d66b3af0716ab
diff --git a/mail-filter/sbd-proxy/metadata.xml b/mail-filter/sbd-proxy/metadata.xml
new file mode 100644
index 0000000..74350c0
--- /dev/null
+++ b/mail-filter/sbd-proxy/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>wschlich@gentoo.org</email>
+		<name>Wolfram Schlich</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/mail-filter/sbd-proxy/sbd-proxy-1.1.ebuild b/mail-filter/sbd-proxy/sbd-proxy-1.1.ebuild
deleted file mode 100644
index 002ddd3..0000000
--- a/mail-filter/sbd-proxy/sbd-proxy-1.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils
-
-DESCRIPTION="An SMTP proxy for solicited bounce detection"
-HOMEPAGE="http://dev.gentoo.org/~wschlich/"
-SRC_URI="http://dev.gentoo.org/~wschlich/src/${CATEGORY}/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND="
-	virtual/perl-Getopt-Long
-	virtual/perl-Sys-Syslog
-	dev-perl/Config-IniFiles
-	dev-perl/DBI
-	dev-perl/Exception-Class
-	dev-perl/Exception-Class-TryCatch
-	dev-perl/Exception-Class-DBI
-"
-RDEPEND="${DEPEND}
-	virtual/mysql
-"
-
-pkg_setup() {
-	enewgroup sbd
-	enewuser sbd -1 -1 -1 sbd
-}
-
-src_install(){
-	newinitd ${FILESDIR}/${PN}.initd ${PN} || die
-	newconfd ${FILESDIR}/${PN}.confd ${PN} || die
-	dobin ${PN}.pl || die
-	insopts -o sbd -g sbd -m 0640
-	insinto /etc
-	doins ${PN}.ini || die
-	dodoc sbd-proxy-setup-mysql.sql
-}
-
-pkg_postinst() {
-	einfo
-	einfo "See the bundled sbd-proxy-setup-mysql.sql example on"
-	einfo "how to create the needed MySQL database, user and table."
-	einfo
-}
diff --git a/mail-filter/sbd-proxy/sbd-proxy-1.0.ebuild b/mail-filter/sbd-proxy/sbd-proxy-1.2-r1.ebuild
index 002ddd3..0145da2 100644
--- a/mail-filter/sbd-proxy/sbd-proxy-1.0.ebuild
+++ b/mail-filter/sbd-proxy/sbd-proxy-1.2-r1.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
-inherit eutils
+EAPI=5
+
+inherit eutils user
 
 DESCRIPTION="An SMTP proxy for solicited bounce detection"
 HOMEPAGE="http://dev.gentoo.org/~wschlich/"
@@ -32,8 +34,8 @@ pkg_setup() {
 }
 
 src_install(){
-	newinitd ${FILESDIR}/${PN}.initd ${PN} || die
-	newconfd ${FILESDIR}/${PN}.confd ${PN} || die
+	newinitd "${FILESDIR}"/${PN}.initd ${PN} || die
+	newconfd "${FILESDIR}"/${PN}.confd ${PN} || die
 	dobin ${PN}.pl || die
 	insopts -o sbd -g sbd -m 0640
 	insinto /etc
diff --git a/mail-filter/sbd-proxy/sbd-proxy-1.2.ebuild b/mail-filter/sbd-proxy/sbd-proxy-1.2.ebuild
deleted file mode 100644
index b2d3bac..0000000
--- a/mail-filter/sbd-proxy/sbd-proxy-1.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils
-
-DESCRIPTION="An SMTP proxy for solicited bounce detection"
-HOMEPAGE="http://dev.gentoo.org/~wschlich/"
-SRC_URI="http://dev.gentoo.org/~wschlich/src/${CATEGORY}/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND="
-	virtual/perl-Getopt-Long
-	virtual/perl-Sys-Syslog
-	dev-perl/Config-IniFiles
-	dev-perl/DBI
-	dev-perl/Exception-Class
-	dev-perl/Exception-Class-TryCatch
-	dev-perl/Exception-Class-DBI
-"
-RDEPEND="${DEPEND}
-	virtual/mysql
-"
-
-pkg_setup() {
-	enewgroup sbd
-	enewuser sbd -1 -1 -1 sbd
-}
-
-src_install(){
-	newinitd ${FILESDIR}/${PN}.initd ${PN} || die
-	newconfd ${FILESDIR}/${PN}.confd ${PN} || die
-	dobin ${PN}.pl || die
-	insopts -o sbd -g sbd -m 0640
-	insinto /etc
-	doins ${PN}.ini || die
-	dodoc sbd-proxy-setup-mysql.sql
-}
-
-pkg_postinst() {
-	einfo
-	einfo "See the bundled sbd-proxy-setup-mysql.sql example on"
-	einfo "how to create the needed MySQL database, user and table."
-	einfo
-}