app-admin/blockhosts: Corrected for multiple PyABI installation, Version Bump

svn path=/sunrise/; revision=11923

diff --git a/app-admin/blockhosts/ChangeLog b/app-admin/blockhosts/ChangeLog
index 99c53f03c2d43bdb0fb0c808e5e28e3a94410aab..47b9495745f0181811e8d3fb04b6feed354b8d74 100644 (file)
--- a/app-admin/blockhosts/ChangeLog
+++ b/app-admin/blockhosts/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for app-admin/blockhosts
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  29 Apr 2011; Justin Lecher <jlec@gentoo.org> -blockhosts-2.4.0.ebuild,
+  +blockhosts-2.5.1.ebuild:
+  Corrected for multiple PyABI installation, Version Bump
+
   29 Jul 2010; Michael Weber (xmw) <gentoo@xmw.de> blockhosts-2.4.0.ebuild:
   removing test-suite from installed files
 

diff --git a/app-admin/blockhosts/Manifest b/app-admin/blockhosts/Manifest
index 6ba864418188c06ab4691045a5a7bfe12e746bad..37514e064f88e490bb16dd6a7f3313da9bf11c2d 100644 (file)
--- a/app-admin/blockhosts/Manifest
+++ b/app-admin/blockhosts/Manifest
@@ -1,4 +1,4 @@
-DIST BlockHosts-2.4.0.tar.gz 57467 RMD160 4d3c55e5d909dc045fdf40a775a256b1a0741978 SHA1 c1cb468fbd01887ddc22f41554a63b0f41f120ae SHA256 cf12d4d77edbb09ddb226699d54e86f56f8e3f5f7a53e39b3b7dfbd2e3277e57
-EBUILD blockhosts-2.4.0.ebuild 1725 RMD160 0ec9585f84637688a686e35e924bd29c8af40564 SHA1 ea38c058fd373366fa28e54f7b880888bed3ec77 SHA256 65dc2101b43dcfbf499876b66a56dec7d704135a96105ff701ced5c9ba670bad
-MISC ChangeLog 2398 RMD160 fae0e4d7e58bf6f74fc402d2329e020e71826e59 SHA1 51ec8615aa6986ae2a363623246a136f06b90b3b SHA256 f75ab68d5cd7bb764cb0dd55eec58982401995d345061815dbea90526bf8a047
+DIST BlockHosts-2.5.1.tar.gz 54048 RMD160 c6a92c55a42744b36a4fb55fceabbd7882b79f74 SHA1 2b685b5cac4f7f729d2b97b6e9565129c85591b6 SHA256 f97cbebfbd77fa7540d0a7a2099ad91026775a32c7e11bb17dc9b6f617781726
+EBUILD blockhosts-2.5.1.ebuild 1707 RMD160 ff93a95159c12e1ea2ec39ac8b608eddd95f631f SHA1 a2fc37dde17ec320d1d3ce175501ec32a7f97570 SHA256 b0f6fb6c9f114d4b127a1fc36304d6d6032c30d3c957f1dad8fa487b75e6d7a0
+MISC ChangeLog 2558 RMD160 97bc339182fbcf66c30a715c6e0633100626d642 SHA1 834c7b59670a1d21aaafe7ab46a59445a37f5d01 SHA256 f42ee5e95311d5c97ab228170264b7ee3c4a4c8496456c2ba81bf41d6b31c05a
 MISC metadata.xml 379 RMD160 7ed91964b8045b7ca6cc5c39acf488da92975a7d SHA1 4b9e3ae1ab6b4f4e3fec66cd19a6e2cafa8d8d53 SHA256 2a19ee5cafdfe60a03461ab8ea7bfa945081bd03f1a002d4732e81ec37282d94

diff --git a/app-admin/blockhosts/blockhosts-2.4.0.ebuild b/app-admin/blockhosts/blockhosts-2.5.1.ebuild
similarity index 84%
rename from app-admin/blockhosts/blockhosts-2.4.0.ebuild
rename to app-admin/blockhosts/blockhosts-2.5.1.ebuild
index 773149dbbb86411911e37bc925221b1b020f6ed1..b550de150e4e0aea711084e19a332b53f80ca449 100644 (file)
--- a/app-admin/blockhosts/blockhosts-2.4.0.ebuild
+++ b/app-admin/blockhosts/blockhosts-2.5.1.ebuild
@@ -1,16 +1,18 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=2
+EAPI="3"
 
 PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
 
 inherit python distutils
 
 MY_P="BlockHosts-${PV}"
 DESCRIPTION="Blocks abusive IP hosts which probe your services (such as sshd, proftpd)"
-HOMEPAGE="http://www.aczoom.com/cms/blockhosts/"
+HOMEPAGE="http://www.aczoom.com/blockhosts/"
 SRC_URI="http://www.aczoom.com/tools/${PN}/${MY_P}.tar.gz"
 
 LICENSE="public-domain"
@@ -22,7 +24,7 @@ DEPEND="dev-python/pyxml"
 RDEPEND="${DEPEND}
        logrotate? ( app-admin/logrotate )"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}"/${MY_P}
 
 pkg_setup() {
        python_pkg_setup
@@ -43,17 +45,15 @@ src_prepare() {
 }
 
 src_test() {
-       $(PYTHON) test_blockhosts.py || die
+       testing() {
+               $(PYTHON) test_blockhosts.py || die
+       }
+       python_execute_function testing
 }
 
 src_install() {
        distutils_src_install
 
-       exeinto $(python_get_sitedir)
-       doexe ${PN}.py || die
-
-       dosym $(python_get_sitedir)/${PN}.py /usr/bin/${PN}.py || die
-
        exeinto /usr/share/${PN}
        doexe bhrss.py || die