Drop old; fix python eclass usage

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

4 files changed, 78 insertions, 85 deletions

diff --git a/net-mail/automx/ChangeLog b/net-mail/automx/ChangeLog
index 323892431b41..bd763967fcd6 100644
--- a/net-mail/automx/ChangeLog
+++ b/net-mail/automx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/automx
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/automx/ChangeLog,v 1.16 2015/03/19 15:20:18 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/automx/ChangeLog,v 1.17 2015/03/21 19:29:51 jlec Exp $
+
+*automx-0.10.2-r1 (21 Mar 2015)
+
+  21 Mar 2015; Justin Lecher <jlec@gentoo.org> +automx-0.10.2-r1.ebuild,
+  -automx-0.8-r1.ebuild, metadata.xml:
+  Drop old; fix python eclass usage
 
   19 Mar 2015; Andreas Schuerch <nativemad@gentoo.org> automx-0.10.2.ebuild:
   x86 stable, see bug 496250
diff --git a/net-mail/automx/automx-0.10.2-r1.ebuild b/net-mail/automx/automx-0.10.2-r1.ebuild
new file mode 100644
index 000000000000..4f81366d9e1b
--- /dev/null
+++ b/net-mail/automx/automx-0.10.2-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/automx/automx-0.10.2-r1.ebuild,v 1.1 2015/03/21 19:29:51 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
+
+DESCRIPTION="A mail user agent auto configuration service"
+HOMEPAGE="http://www.automx.org"
+SRC_URI="https://github.com/sys4/${PN}/archive/v${PV}.tar.gz -> automx-${PV}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ldap memcached sql +tools"
+
+DEPEND="
+	dev-python/ipaddr[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	|| ( www-apache/mod_wsgi[${PYTHON_USEDEP}] www-servers/uwsgi )
+	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}]  )
+	memcached? ( dev-python/python-memcached[${PYTHON_USEDEP}] )
+	sql? ( dev-python/sqlalchemy[${PYTHON_USEDEP}] )
+	tools? ( net-dns/bind-tools net-misc/wget )
+	"
+RDEPEND="${DEPEND}"
+
+python_prepare_all() {
+	sed -i '/py_modules=/d' setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	DOCS=( INSTALL CREDITS CHANGES BASIC_CONFIGURATION_README )
+	HTML_DOCS=( doc/html/. )
+
+	distutils-r1_python_install_all
+
+	docinto examples
+	dodoc src/conf/*example*
+
+	doman doc/man/man5/*
+
+	if use tools; then
+		dobin src/automx-test
+		doman doc/man/man1/automx-test.1
+	fi
+
+	exeinto /usr/lib/${PN}
+	doexe src/automx_wsgi.py
+}
+
+pkg_postinst() {
+	echo
+	einfo "See /usr/share/doc/${PF}/INSTALL.bz2 for setup instructions"
+	echo
+}
diff --git a/net-mail/automx/automx-0.8-r1.ebuild b/net-mail/automx/automx-0.8-r1.ebuild
deleted file mode 100644
index 8e78eccdff0d..000000000000
--- a/net-mail/automx/automx-0.8-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/automx/automx-0.8-r1.ebuild,v 1.2 2013/03/24 19:11:12 vincent Exp $
-
-EAPI=4
-PYTHON_DEPEND="2:2.6:2.7"
-SUPPORT_PYTHON_ABIS="1"
-inherit python
-
-DESCRIPTION="A mail user agent auto configuration service"
-HOMEPAGE="http://www.automx.org"
-SRC_URI="${HOMEPAGE}/download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc sql +tools"
-
-DEPEND=""
-RDEPEND="
-	dev-python/lxml
-	|| ( www-apache/mod_wsgi www-servers/uwsgi )
-	sql? ( dev-python/sqlalchemy )
-	tools? ( net-dns/bind-tools )
-	tools? ( net-misc/wget )
-	"
-
-RESTRICT_PYTHON_ABIS="2.[45] 3.*"
-
-#src_prepare() {
-#	python_copy_sources
-#	python_src_prepare
-#}
-
-src_install() {
-	dodoc INSTALL CREDITS
-
-	if use doc; then
-		dohtml -r doc/html/*
-
-		docinto examples
-		dodoc doc/examples/*
-	fi
-
-	doman doc/man/man5/*
-
-	if use tools; then
-		exeinto /usr/bin
-		doexe src/automx-test
-		doman doc/man/man1/automx-test.1
-	fi
-
-	exeinto /usr/lib/${PN}
-	doexe src/automx.wsgi
-
-	insinto /etc
-	doins src/automx.conf
-
-	installation() {
-		insinto $(python_get_sitedir)/${PN}
-		doins src/automx/*
-	}
-	python_execute_function installation
-}
-
-pkg_postinst() {
-	python_mod_optimize ${PN}
-	einfo
-	einfo "See /usr/share/doc/${PF}/INSTALL.bz2 for setup instructions"
-	einfo
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${PN}
-}
diff --git a/net-mail/automx/metadata.xml b/net-mail/automx/metadata.xml
index 6b795b8a60f1..0ee1a4a19235 100644
--- a/net-mail/automx/metadata.xml
+++ b/net-mail/automx/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>mschiff@gentoo.org</email>
-		<name>Marc Schiffbauer</name>
-	</maintainer>
-	<use>
-		<flag name="memcached">Enable memcached support</flag>
-		<flag name="sql">Enable support for SQL backends</flag>
-		<flag name="tools">Install additional automx-test tool</flag>
-	</use>
+  <maintainer>
+    <email>mschiff@gentoo.org</email>
+    <name>Marc Schiffbauer</name>
+  </maintainer>
+  <use>
+    <flag name="memcached">Enable memcached support</flag>
+    <flag name="sql">Enable support for SQL backends</flag>
+    <flag name="tools">Install additional automx-test tool</flag>
+  </use>
 </pkgmetadata>