revbump; conversion -> distutils-r1, rm old

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

6 files changed, 30 insertions, 99 deletions

diff --git a/dev-python/pyproj/ChangeLog b/dev-python/pyproj/ChangeLog
index f41f1961a8bd..8247f496f23d 100644
--- a/dev-python/pyproj/ChangeLog
+++ b/dev-python/pyproj/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/pyproj
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyproj/ChangeLog,v 1.11 2013/02/04 03:29:16 patrick Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyproj/ChangeLog,v 1.12 2015/01/04 22:46:41 idella4 Exp $
+
+*pyproj-1.9.3-r1 (04 Jan 2015)
+
+  04 Jan 2015; Ian Delaney <idella4@gentoo.org> +pyproj-1.9.3-r1.ebuild,
+  -pyproj-1.8.9.ebuild, -pyproj-1.9.0.ebuild, -pyproj-1.9.2.ebuild,
+  -pyproj-1.9.3.ebuild:
+  revbump; conversion -> distutils-r1, rm old
 
 *pyproj-1.9.3 (04 Feb 2013)
 
diff --git a/dev-python/pyproj/Manifest b/dev-python/pyproj/Manifest
index 49357fa07735..7f99864fef52 100644
--- a/dev-python/pyproj/Manifest
+++ b/dev-python/pyproj/Manifest
@@ -1,10 +1,14 @@
-DIST pyproj-1.8.9.tar.gz 4288526 SHA256 02ed5f006079c0764b8424c466368d9a1371bf144c4aa63cf38be4c06700acee SHA512 af3eb8ac19d32f68e642b3baa21c91a113249c44d9e90e3f4ced9f00d002a54a3c10ade44fe0c3bd7723ac06589aab0d99bfe9393beb3c48c1b29ddf5e0dd934 WHIRLPOOL 7204efb29f0d6edfb412817a3098e11043eb47bb84f7d4d85212f116043800633993fa3cfbe7f9f1a83400672061f6cd6bba2d4a8a15101fc05a6f7328432827
-DIST pyproj-1.9.0.tar.gz 2655229 SHA256 ef0cec7724528afa7ad226f02b05388d05575c52ff7a385764e9f4a7f0eae7c5 SHA512 fd7c0b1ec6d652a04ccb95d54cf3374b9dbed8c9baddf221020395013140ab4bb240c0661759f7890c92884a717bc03eeaa0a7d68120651626433046b41364a7 WHIRLPOOL 97fb178303e9b59fe37422e0f555840ade772f79bbf2aacca46bb95a0e44981510d794af054f419be6d52cd4c8d219c76dbbf3e11e08edef298ead140391f55d
-DIST pyproj-1.9.2.tar.gz 2677152 SHA256 6ddbe24de3fc063f422cb2c3a80ab186f056c46dd9608ac5de430e13434feb0e SHA512 19df8eec3e4a6f74fa29e95761c24b41c1a96b7c7b65f49112ae2a9044a1015df3e8bb4d84ba38d2eea81c65a7b3c5dbf8fc9ddb8032b11c6420e789e51bd4ba WHIRLPOOL bbca25700529be31d0648d1ee86588d46268e89a2a87416197ef733469739a83ec52873b2691a45a3aa886f25086d9d761fce76bbb008bb85bc5d7e3d0be409a
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST pyproj-1.9.3.tar.gz 2687498 SHA256 912ed86c5e407f091d0f3d076594af4fb569e27c68199b7d71651edd522aaa0c SHA512 a365da012bf7b9adc8069896bdeabf88ff3d260b643e49b8a74edccc3b65aab10ec96116353fbb45c73ce1027c9b4e80aae566c6b28e149110b16cd8405cda30 WHIRLPOOL b6008b4879722e6e6ce82fbda22a5d8f57e6484f74d2607c19087130f833188ee76d1bc40ffd205babb25b9e7ea983c80bc1bd7555dd83f2473f2950421e7c62
-EBUILD pyproj-1.8.9.ebuild 625 SHA256 c004724e738929abfa385305fb884fb21439df791071b45433eee4155af639a0 SHA512 a864e3215d2c0e8f138de135cf8432297d66cc546d7a9445edc8fe3eb10675e7abf9901a7f5e7200afc31a0142f662d2e58e7fdfb563e561469a4c1226122b3a WHIRLPOOL cda916531ae5f2bd305eaf5cb5e0a56f95a7e4d14e46a005d06a392420cfbd2a85a5fe2eb24ec8e934396b3ee9d87e279080b4027d15642ea3d32a74a6cdc9fb
-EBUILD pyproj-1.9.0.ebuild 711 SHA256 2618985ef75879884407bd7d581b1fc139e7bf6c2fd6a53f7117e4821a4cfb73 SHA512 939a076a434a6e4afa60eae977972dd94e0fbc26a815ffc5f07b589138b437121d703050f08ddc4d7aaec1861c14a91f2f42ec879c3f0a4b317e8bee7c7235ff WHIRLPOOL d0d93e4f1f5e8753254956329182d0f4bf5f74e15fdd8867af6c705c9e92bd641c8189763f84753ea56ab86f2a75b6b92a70be4bbf4eda846c6525c877f67031
-EBUILD pyproj-1.9.2.ebuild 689 SHA256 41f56814ebb2cd72e8439eb9c7046010e1e234d01158cdcdc513554ede1e973f SHA512 07381e8543e7d219e5d3ef83b043e8868877b4917da1ec6d741fdcc0784b68b356d9de32d9331e7b50c5d3cc2485d8f2e5bfa69a792f68d825d71c0357309a9e WHIRLPOOL e606d8a13a38db54178bd73189f9182ba114667aaa39b82e183c5d57ebc666332b4bf04c4b18dc6610402ac8c8d9458b9e058bbcfc059f85e7b4d56b6e0cf444
-EBUILD pyproj-1.9.3.ebuild 689 SHA256 61abbebe87c5f9b86329d95350ac0d1d0ed107fe16cac9b04551a7eae6ff8d9c SHA512 40ee02befd064db8c5fd77784e8e35c12099db29bbe19d71dcc01485be9439552cdc0f912e354db2b4d01de28af9a148a67fd2709ef8986be6ba6697b9fb7e3c WHIRLPOOL 21a83824a6e69beda64cf42be00d092a75c88ea3e7e178217a8ebc9855c869b78fd77f79a89bf03f8e52998256519d1d94074bd8f67588ea885c84134a9b0c49
-MISC ChangeLog 1797 SHA256 6fd37b9f03d0d492a886dc208e29d122883ad8f6cea19bccbd6541ce6da8421d SHA512 19e4d1a99010207377d5e888f53be749978b7597bce0432ab93238788e2cb75acf97fc4c952abdf0340464f24e889cdc0b7587af244cb720316d0e88f69ebc59 WHIRLPOOL 8df8ef38ced3574d7099ef097a841a6ba71f5d554a2c6a1c6209485a0600609056d8576497bd6d4f98d65b92a548e5f7ce13d5bb9ed1ba84f3727076f52e7c42
+EBUILD pyproj-1.9.3-r1.ebuild 677 SHA256 0f0e4a262501568ceb3a52e0c583d0e01a4c4ec9cd1137543a1d68d085a087e2 SHA512 7ab97034667bda23bbb5608b0ee38a3b6bf738ec34603ba71b649cc619ca63f2f375953c10bc448cd452132f6f4ae3fa3c420b1f9161eb3ee2894f6fb4f74b93 WHIRLPOOL 327d8c749c51706637fb0e27d30593a73c8fe5637dc6327d8ebb2dc5850aeb4d30f219cb0cede628d5d31c0f153e851f630482b84ba424eae1d3d80d359936e7
+MISC ChangeLog 2041 SHA256 d314ff471b23af3de722cdd3e11322f39ac562efa58b45f87ebedc03650e9814 SHA512 f388000c73eb662bda182bfc950fe98a859b3e45d65a169fa184e76add9c3fe45a4b03b8a37fd037af9d2c2583a96467c755aff4b532a87407431d7b84983845 WHIRLPOOL d5e12d1a6a2ad94925bd135c83048524a8f897e4fcd714d6b22fa38c88d1752bd52ca5ef4046873c4a86bce3b4835e47adb56818c34689603fd18eb9706975ef
 MISC metadata.xml 236 SHA256 ed185fef20e33e4bf04e2a2877f1ad16274a251c5324314b5c1363f525d52f70 SHA512 9327d15494e3a4da88977a52011b306668959b593ca6e9c06bb6c228bf5bddd7ee8aa3a506bd528fb552e187b7fa407ec79ab3f22a8268e4063f6e0a5740fe87 WHIRLPOOL 9002f02d44f3b6249581954cf1fad593ff94e3c04c719959ab501f5bcd1c9f3e0db3d96c7a28503a1fab2cb394192b8f8d269351e0cd8fac6fe26f96016d2205
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iEYEAREIAAYFAlSpwuEACgkQso7CE7gHKw1UawCdFYpMu0bjhZabXWq71vSs7V8f
+bJQAn18XocRDJMitRbkjENGO4/TaGPpt
+=1n+l
+-----END PGP SIGNATURE-----
diff --git a/dev-python/pyproj/pyproj-1.8.9.ebuild b/dev-python/pyproj/pyproj-1.8.9.ebuild
deleted file mode 100644
index e8b950e85ce4..000000000000
--- a/dev-python/pyproj/pyproj-1.8.9.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyproj/pyproj-1.8.9.ebuild,v 1.2 2012/02/20 14:58:50 patrick Exp $
-
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython 2.7-pypy-*"
-
-inherit distutils
-
-DESCRIPTION="Python interface to PROJ.4 library"
-HOMEPAGE="http://code.google.com/p/pyproj/ http://pypi.python.org/pypi/pyproj"
-SRC_URI="http://pyproj.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
diff --git a/dev-python/pyproj/pyproj-1.9.0.ebuild b/dev-python/pyproj/pyproj-1.9.0.ebuild
deleted file mode 100644
index a7db0325d740..000000000000
--- a/dev-python/pyproj/pyproj-1.9.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyproj/pyproj-1.9.0.ebuild,v 1.3 2012/02/20 14:58:50 patrick Exp $
-
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython 2.7-pypy-*"
-
-inherit distutils
-
-DESCRIPTION="Python interface to PROJ.4 library"
-HOMEPAGE="http://code.google.com/p/pyproj/ http://pypi.python.org/pypi/pyproj"
-SRC_URI="http://pyproj.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND=""
-RDEPEND=""
-
-PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
-
-src_install(){
-	distutils_src_install
-
-	if use doc; then
-		dohtml -r docs/*
-	fi
-}
diff --git a/dev-python/pyproj/pyproj-1.9.2.ebuild b/dev-python/pyproj/pyproj-1.9.3-r1.ebuild
index 8b3414687867..a8869438c626 100644
--- a/dev-python/pyproj/pyproj-1.9.2.ebuild
+++ b/dev-python/pyproj/pyproj-1.9.3-r1.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyproj/pyproj-1.9.2.ebuild,v 1.2 2012/12/12 14:13:13 heroxbd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyproj/pyproj-1.9.3-r1.ebuild,v 1.1 2015/01/04 22:46:41 idella4 Exp $
 
-EAPI="4"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython 2.7-pypy-*"
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
 
-inherit distutils
+inherit distutils-r1
 
 DESCRIPTION="Python interface to PROJ.4 library"
 HOMEPAGE="http://code.google.com/p/pyproj/ http://pypi.python.org/pypi/pyproj"
@@ -17,9 +16,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux"
 IUSE="doc"
 
-PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
+CFLAGS="${CFLAGS} -fno-strict-aliasing"
 
-src_install(){
-	distutils_src_install
-	use doc && dohtml -r docs/*
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/. )
+	distutils-r1_python_install_all
 }
diff --git a/dev-python/pyproj/pyproj-1.9.3.ebuild b/dev-python/pyproj/pyproj-1.9.3.ebuild
deleted file mode 100644
index f2a7fef8f5a8..000000000000
--- a/dev-python/pyproj/pyproj-1.9.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyproj/pyproj-1.9.3.ebuild,v 1.1 2013/02/04 03:29:16 patrick Exp $
-
-EAPI="4"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython 2.7-pypy-*"
-
-inherit distutils
-
-DESCRIPTION="Python interface to PROJ.4 library"
-HOMEPAGE="http://code.google.com/p/pyproj/ http://pypi.python.org/pypi/pyproj"
-SRC_URI="http://pyproj.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="doc"
-
-PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
-
-src_install(){
-	distutils_src_install
-	use doc && dohtml -r docs/*
-}