Port to distutils-r1, drop old

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0x895192F9

4 files changed, 40 insertions, 71 deletions

diff --git a/sys-cluster/pbs-python/ChangeLog b/sys-cluster/pbs-python/ChangeLog
index 5ab4321c4d8a..508c117a3efc 100644
--- a/sys-cluster/pbs-python/ChangeLog
+++ b/sys-cluster/pbs-python/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/pbs-python
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pbs-python/ChangeLog,v 1.6 2012/11/08 15:43:51 jlec Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pbs-python/ChangeLog,v 1.7 2013/02/02 14:12:05 xarthisius Exp $
+
+*pbs-python-4.3.3-r1 (02 Feb 2013)
+
+  02 Feb 2013; Kacper Kowalik <xarthisius@gentoo.org>
+  +pbs-python-4.3.3-r1.ebuild, -pbs-python-4.1.0.ebuild,
+  -pbs-python-4.3.3.ebuild:
+  Port to distutils-r1, drop old
 
 *pbs-python-4.3.3 (08 Nov 2012)
 
@@ -34,4 +41,3 @@
   24 Mar 2008; Donnie Berkholz <dberkholz@gentoo.org>; +metadata.xml,
   +pbs-python-2.9.4.ebuild:
   Python bindings to the PBS C API.
-
diff --git a/sys-cluster/pbs-python/Manifest b/sys-cluster/pbs-python/Manifest
index 7bf27b6d3044..8e1109cff8d0 100644
--- a/sys-cluster/pbs-python/Manifest
+++ b/sys-cluster/pbs-python/Manifest
@@ -1,16 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST pbs_python-4.1.0.tar.gz 150403 SHA256 ccc31531e0c1f113892e2e5d7e8abb7a0f07402a297f5d82d07235631838acc2
 DIST pbs_python-4.3.3.tar.gz 185442 SHA256 d149803973f8db52ca62a49e69e9e34b4d8726d8b7fa480f909d345dca9dd2b8 SHA512 2a8c49d0be887cd7c5f9c17bd7ce679c7c04481c70e6949fd430007b7678c15636e8416fd30ac16d06cc387680bd4f9d3df8cad8be7b512b6fa2785891338044 WHIRLPOOL 15db1b5bae67b3eca4924a596d7040305f13b37c030314c268734b3d5c1145aa8f99196dd405ee802062daa41fd24cacc02f60ccd738c84e83601ef2309aef02
-EBUILD pbs-python-4.1.0.ebuild 807 SHA256 93242407beaad16cbc28a3305cb9fde8fb91451920763707b57276f952c92b19 SHA512 042d7eb33b91e650b5a7bf415fa384fd44fccc0da158283d6234779a8911ce164116b69ee7cc58ec0cbf93d3591a1065a95d9f8385c5cffb5353b470efa2f2ef WHIRLPOOL 36409f73e868fb7b9f212585fd34527d3487480bf06f06bcd2b9e9a32e2c10d16ba17a7890941b047d674425afc0792ff44c6c48a26f12247ec2ca0929f90e18
-EBUILD pbs-python-4.3.3.ebuild 978 SHA256 da2369e35103c6da601d3eb71c74bc2c3ca3f434abe726c05ea660822507ca3b SHA512 8d807358ca2e31bbe7979800b4c920d7d33a3195d78a3fea18da9e0fc992211c21de625ff0b728fe1a1f0e390b273fbcc719264e5d72d06c00723dfe0ee4b89d WHIRLPOOL edbb05f2696e703043519a3eb6160968eaf4491722648ad1339942671642e6a0a359ae283ece5eadada66fbc7843d356909a966b9b55545efc482f3b67d3455b
-MISC ChangeLog 1087 SHA256 01820eedf319d65d39cc4a658ad4f9b08e0534831311f59129d45405e50baa56 SHA512 80d46c745eb6b35863dbb2108da8d5c00208c99872eb1cd10b2e8cbcb14c9b8d3dff4eface31944e5898d2146c16d2c5f3d8ce2a3860880eaec0bc2229fca1ac WHIRLPOOL bc2bd632d92af113ada053956fc8d9ec35aca3a476584945d989143325c5d66bc9a82d068c623674d756837317f885efffac0a252fb1632ba118bda7ded95bc5
+EBUILD pbs-python-4.3.3-r1.ebuild 898 SHA256 e533230d5e29d0ad7bc6a8ea1f1fa17af7143380c9c425d910da333d0b6affc3 SHA512 efdfdda3800dbc8450b959f9ccae2f695990d0bbfc9959ec3df9976fe894c1a67aa2b022ffc70247c9bfd712f899b92745c6af58e0e4d17355be07529bf3d172 WHIRLPOOL 65bd20863be57244b5d0724b680ec63b9716b29861a30ba20e51e96655ba1cc6da091f2aeab06562ff264b0c27d46977deeb24b7ea4aa8c834e2f54b1815ac92
+MISC ChangeLog 1301 SHA256 aecd4f9119fcf3aa1691c9726bbe441ff5b15656d6640db87d2ed6099bc89055 SHA512 2482a7f11ef591a4e0d599ea4d9c84fa05c6d122f0400ef53c3137e15cec620389c74c1cf05d7522835441063bdb927014949a7a4f178ef62a6ba221a8d77436 WHIRLPOOL 5b3f274d0c8cec48f5dd1bb21104ce1b5792de5c20cdb48b8390bdddd481e7cb985fe839c9d3403812626888e90b60f4dec2215b70bbc0ce369b90709073ff86
 MISC metadata.xml 161 SHA256 fb0c2b5d458c0b9e6cae1b1cf1c80137c4b23c54e657343370b7d293fb29ecce SHA512 f3e07a100754c87015a67a1dd5e71686adbaf25281054a74ec21cb342a2440c010b30eb7d3d813a2504ea2b6d0330ac32511f11b583df1c519d579ad2b6f0c6a WHIRLPOOL c13246d1d1357f83c01bfb11b06c0bfe565c741b971d846363d44579f974fc1cb7b29470627460f6fc4d62eff22056b98cae11bfd497e5a20dfb566abd46c6d3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCb0zgACgkQgAnW8HDreRaxjQCdFPkQfcvTDGgXEtWccWhCexuV
-/UIAn38IcN041q4Xxkik3XfauanzqwF1
-=2k9q
+iQIcBAEBCAAGBQJRDR67AAoJEF0huFKJUZL5N3sP/1DSUjbcADKcXoKPeQOQzPo7
+Dp4SDJgXbT3xWMNOSyEze/TvZzzZRMHjQGnBFABwFddOgDiuCkbvAnL0E48J3Gy6
+/lvVW2FGpK/A5TMiQUkN68d+7ciw4rGSKk+gHKg2ComP33vXtCTiqcsNDvho69Ep
+dJWO3It6oSyoynwwAbos9mxy0Ui725B9qZtjze3OPElm4B7RT3Wr/hqoi50W7WGK
+QoQN8cUgIl2mjZd6uq/R39SsJhfDQHgXV/eZTrOSXbv3DuBuTomd3/a6CO46DdHU
+IxDMLiS0YpuUQ7eUutWviV49ZcXilaVuoRGEjxW4JmwN9zTGpKH0vRE0fDJEpFAV
+jRzGbymbOpR/3RCsZy/NQCM9BNF80D3d909G5p6RBZU2I0EBPgCVOKz9GYCzmGOi
+OnqpMSKoP67OEftjKotOSobgxpiLcimytZQTY6UAyc/X4LOCJzky21yerrebBkrO
+9a1L1I5EoXF+1YMH/ZWompX1H4MrkHkU3EoGQay04joSEy7NprBjBs5grnyMLJbs
+5uK2t0nmZjXe1AwqPRWQ0N48fqXtERpoyldnAKrZyuVjeKuIeqlB12f6VJQr7Ole
+k4rlIqnooQ7+9WL11pZAwqRUGpbwSgzpsj3sMe81OLUl8jbsMJU4PQ9TRRfDzXpn
+rxXzmajYhUh3lGXJoQ3N
+=m+0l
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/pbs-python/pbs-python-4.1.0.ebuild b/sys-cluster/pbs-python/pbs-python-4.1.0.ebuild
deleted file mode 100644
index 65cfab7bf380..000000000000
--- a/sys-cluster/pbs-python/pbs-python-4.1.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pbs-python/pbs-python-4.1.0.ebuild,v 1.2 2010/06/09 14:32:13 arfrever Exp $
-
-EAPI=3
-PYTHON_DEPEND="2"
-PYTHON_MODNAME="pbs"
-
-inherit distutils
-
-MY_P=${P/-/_}
-
-DESCRIPTION="Python bindings to the Torque C API"
-HOMEPAGE="https://subtrac.sara.nl/oss/pbs_python/"
-SRC_URI="ftp://ftp.sara.nl/pub/outgoing/${MY_P}.tar.gz"
-
-LICENSE="openpbs"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="examples"
-
-RDEPEND="sys-cluster/torque"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_install() {
-	distutils_src_install
-	if use examples; then
-		insinto /usr/share/doc/${P}	|| die
-		doins "${S}"/examples/*		|| die
-	fi
-}
diff --git a/sys-cluster/pbs-python/pbs-python-4.3.3.ebuild b/sys-cluster/pbs-python/pbs-python-4.3.3-r1.ebuild
index 15786e6539eb..cde8f538f7bd 100644
--- a/sys-cluster/pbs-python/pbs-python-4.3.3.ebuild
+++ b/sys-cluster/pbs-python/pbs-python-4.3.3-r1.ebuild
@@ -1,16 +1,11 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pbs-python/pbs-python-4.3.3.ebuild,v 1.1 2012/11/08 15:43:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pbs-python/pbs-python-4.3.3-r1.ebuild,v 1.1 2013/02/02 14:12:05 xarthisius Exp $
 
 EAPI=5
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
 
-PYTHON_DEPEND="2"
-PYTHON_MODNAME="pbs"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES=1
-
-inherit distutils
+inherit distutils-r1
 
 MY_P=${P/-/_}
 
@@ -18,30 +13,28 @@ DESCRIPTION="Python bindings to the Torque C API"
 HOMEPAGE="https://subtrac.sara.nl/oss/pbs_python/"
 SRC_URI="ftp://ftp.sara.nl/pub/outgoing/${MY_P}.tar.gz"
 
-SLOT="0"
 LICENSE="openpbs"
+SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="examples"
 
-RDEPEND="sys-cluster/torque"
-DEPEND="${RDEPEND}"
+DEPEND="sys-cluster/torque"
+RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${MY_P}
 
-#pkg_setup() {
-#	python_set_active_version 2
-#	python_pkg_setup
-#}
+python_prepare_all() {
+	sed -i -e "s/4.1.3/${PV}/" setup.py.in || die
+	distutils-r1_python_prepare_all
+}
 
-src_configure() {
-	configure() {
-		econf
-	}
-	python_execute_function -s configure
+python_configure_all() {
+	econf
 }
 
-src_install() {
-	distutils_src_install
+python_install_all() {
+	distutils-r1_python_install_all
+
 	if use examples; then
 		insinto /usr/share/doc/${P}
 		doins "${S}"/examples/*