Drop old; fix python eclass usage

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

5 files changed, 98 insertions, 104 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/Manifest b/net-mail/automx/Manifest
index 94ffc463ca16..c8a3415bd60d 100644
--- a/net-mail/automx/Manifest
+++ b/net-mail/automx/Manifest
@@ -1,26 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST automx-0.10.2.tgz 410456 SHA256 9ae30696ae691c673399cc0901ab245d3aec76ffe3d74382e6802287e186e4df SHA512 88f844d70439985dd55cc694a58bc1fe313162ba47c7675fb15143c107d76974eee043faf5715d7ba9a5918686d491f5efabe9785e90cf399492871f08b2e38d WHIRLPOOL 4a090b7457d0230944a4855aba1a1811ea1cb8a687efc5ff8bc1abe0506a9dc32f5e77384cb9958a112104729c6e46521ad39ef52ba2dba00492a70e7a65cd3b
-DIST automx-0.8.tar.gz 75143 SHA256 7b90f75c3b9feef501d34de03e9f4dc9c3d94424f3a7f76f0e23e8769d2174ad SHA512 922bf35f9b554021d7dff680008dd96ddab9285f638ead113c58fd6295307e8318b19ca437ea0fb72619c80f51a93bff2203683ae41368c0214f2175571c6bde WHIRLPOOL 84f9b6f6122c6eb9a070a6eced9411d9c7cb36e447a627b88a5579635649cd03e44d215250c06d0bc296ba84b4196ce3069bfaf4ab3228be05bf9ac4bfedbcfb
+EBUILD automx-0.10.2-r1.ebuild 1535 SHA256 6e3c9589c71084461d80973c00dfffdecacf0cb3ad4c1c6bd28ea10c1b26302c SHA512 35d113284384de5b36902d9ecc440328a8d71ab10035a7b48184a7c586fe8eb13d2a9b828e35e53fa6ed054ab38b1d620c1ba244526acc0aa5aec5d3b324c1bb WHIRLPOOL 36a1dad7b40b56bc86704a4b6d08e9dd51b9b1d16ef9bb6a4cd521e50ff61d66feba1fb80b9c6a7c4ba2b17f7b2c3f17ba322de3090f69575864cd983065fc89
 EBUILD automx-0.10.2.ebuild 1492 SHA256 eb2dc2bc3c1adad759cb02774a37e9058b1d777360af33e9c80cb1a7f0f02334 SHA512 a19772380cebf1584325a2d9b6e68e568dfc93704291481e2ed54ea51d2ad03a7e274d9addece912b8973b6bd0540daa0acc5b70356571716b9a0f44795cac28 WHIRLPOOL 40588a250a752dee766f514e19b61ef36684bea8911a5739e0d7476c2e8c4fe595097194403505557ff451352526ed3866c4c287bd6bf6005aa31d23fa03da16
-EBUILD automx-0.8-r1.ebuild 1408 SHA256 a313636fb49bc857abd3c11e60cea84ef8e46f9fd85c3282eac4e0926cabc9a7 SHA512 73d871e07250eaf533690107de1012da73464f8eab947b937a9c004a1fbece82ad695c1bb926479659e6f65d7bd2447b9bee06ca94e79828a7ba6661c51e6a96 WHIRLPOOL 1afd95cfbffe370941aac492306f6b63cd46c89cddb7c59c677a8ff919b3baf8b5b570f061bc1c462be69739cbbdb0a6c4fd389855121f1aecac8b5744a7880f
-MISC ChangeLog 2716 SHA256 414a84c8ca66a4f81814f9ce6422c0453839cb7637497640cce6466ba0e60953 SHA512 e64e16ae4dc1aa926e8a5fa5e6b806ecb0f6a27e3e7244a4bb3d9b98748ff3028ad5a275d5a57e85b6b18f73c08ddbd164fe750a99e2c2a9c88815942c7ff5df WHIRLPOOL c8794e305efb398122d54463cb70bc7b27c86e1139759163014b53b0b04d8457ebb6acf6661641198b5ca3143192184f3416b27009e2c9935eb2b7cc6c6a30af
-MISC metadata.xml 430 SHA256 c4230b47da093af67c2a2b2b32d9bd62abcaab5bbf37605e4f50ffa675a9c802 SHA512 f285e73eb372cb504e57d648d506db0254cbfdca1ad0488e94defaff489ffdf9fa5618b2dd856944d2928d993870a6c0c8eb622185897fd2bd4592d53cf2d111 WHIRLPOOL efe246064245388ab1e81b7954631e771adaa30866ec98d997c5e8daacdf59111667578c8744eca727aaf4092c478bef8143ea3ddf160cda954eb91cbdd453c0
+MISC ChangeLog 2893 SHA256 e939559d8f26fa9413e86484d25831ac5e6033e4ccdc8efb57350e05741bf176 SHA512 88dff457e130789a6d07677599b0f7feb5bdd26ea14a22b3eb60de7e899c4018e6011bc28ad8705af3e7c835db930d4fc744847a7f5fe3f657f74a1c7c9f6ee6 WHIRLPOOL f9db74258d5bfa3f7c3adac642732ae835c557be7bab7160d04407541ef3c1d3881e032674f7c420d27aa7f7122f8056e7d8d25b6b62630180b4d58d72c87798
+MISC metadata.xml 444 SHA256 b00661f54c85541b1d721a218539d1927b9cf07bb52a2ba44d86ecfd795e7af1 SHA512 d689c25e28fbe8fe0f593bf291c7eccadcfa6c1dcb38806ecf6da377ac5e462ffc767c137d76d1b95623e2522a6f53e2a9b4a4475d9e9a741459a3d6b7ce7a4a WHIRLPOOL 3cdd26168df4ad5681ddd7fe547e8fa981a34a683afac8c75b33308f27f5f0a6b05213d8e518a02a338a36865e4fcb75c68470634176ab6803fac5c16cfe2845
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVCuizAAoJEIug43o+kWudSrsP/0qzkd48QwKeroiMFi9lDjax
-RY/HvwCXO5mXg0WHtPHeHvnxM174cjU8uThlaI5cFHPZFfz/9VCDiHpgA9iAIcEd
-6PENliUDOIoKPHSw4oG1hl5RCGSRFDXMlJR7nwH20hSd/ir61sii1KWjhVSjxz6d
-CQpa1Kzmk1e0Gjzsu4SXurSWKRuH8CqS2qN4IE5Qc7BTRhhQB23PgERjNRTB5oOd
-3Y/0JyOur5gJMDJwCZrCtd+0LdoWdEXo6SGEDFGW839dqEr3+1N6bgDllIyS1Ssw
-Mu2KV0n857BG44aKrRgkb3RZsi22PES/X1c+xEXxhcLkTS3iG3zx4Iy0BgsR01SG
-Dtl+OvA0fYwS/UsmqRxkyVrhYBlL57IlxHxUhVkIA+BVL9Ueqjkve6ftbaWserb/
-ieft9M5trA3/XoRoTQPkPsWilWu3B+T3Eep8pUWxJN7GVYUXayfKW5TKrN/yhGyV
-38ozF79J1xqudykz/lYVUkj4ois2J/S7OhXi74wVCvYKpTRbrL8GcjKSY3o3xQ1E
-SbLNhXrux0MRPWGKVVhjklqVULaG1eVbNjkn63/BRgJno7G/ligviWYSlt8IOsCk
-NT+sOo2xAPiU9+Jf2XmBG19R3kAuik5pNm98p3AySV1w5yAljh87gKY9JwFUS1C2
-1fpSA3CskcXlo3fVVPsf
-=zAX1
+iQJ8BAEBCgBmBQJVDca2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirbkEP/1f/KGY1WkzwrMaqahDtLolD
+uToXG1sGmQfqN0b6onUCGnEL1zPV+iUMkkDFGZEWYNoWwIn9aPhTk/8hr5BzzA/Y
+llJZ70Ts/dQLfOFTuPb9WTKrwjxBmvRzwCRqbgk47Kjii9zIG8uS6L3vJWlGc02Y
+rb4PsSMM+fMzNoaU4q92ty23dBG0u6OhoPpSiU+i90TitM9mxl5m9dGPszr5jRM1
+dGCvltSehZVecO+Kys3kWwkZCm9wbUt9e+MLCtXW/u2GAqZIa29/pinG+LhqKOir
+XSSLtfAn5ogNVNupDNy2KEXcD0PulzUtU3JSPhSzMvgj+sBpf+4VtAbLNTmM787t
+JDBlV2i+UByxLKTtbhAQ79rIite8gxiUgGee6d/tAZRuP9YLNq+xAJNIfn35y2Rt
+YFy6qPH+dO12eBhOHW42GTmCOuQ3C5h24+liBOo5l0vb9BqxEtiIic2Z0TVyqum5
+V1pg1Mfy4LXCuSLQcpx983hiJ8vwerQ6ycqJ8ejlyJwRlzUjpbvqNRdYpVFuusdH
+bNOLJ62d4UC6JRbbT3fAK2L3nlB1SAg5pJHlWERHqXaVR9aV708DcvGyshK8u8WE
++EngKTBLr5XAIVDCE4CwHKpiUcAioT4pWxgHCfYfeCKrtfU9Si+GdjqKQAAr0E1u
+2gbVrxfyGyuiPquQIUs6
+=/4JK
 -----END PGP SIGNATURE-----
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>