Drop old Python implementations. Define PYTHON_COMPAT sanely and script-friendly

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

6 files changed, 36 insertions, 19 deletions

diff --git a/sci-libs/gdal/ChangeLog b/sci-libs/gdal/ChangeLog
index 44c4fe7ddb0d..8ecc54d753dc 100644
--- a/sci-libs/gdal/ChangeLog
+++ b/sci-libs/gdal/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/gdal
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.162 2015/04/04 20:33:29 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.163 2015/04/08 18:32:59 mgorny Exp $
+
+  08 Apr 2015; Michał Górny <mgorny@gentoo.org> gdal-1.10.1.ebuild,
+  gdal-1.11.1-r1.ebuild, gdal-1.11.1-r2.ebuild, gdal-1.11.1-r3.ebuild:
+  Drop old Python implementations. Define PYTHON_COMPAT sanely and script-
+  friendly
 
   04 Apr 2015; Mikle Kolyada <zlogene@gentoo.org> gdal-1.11.1-r3.ebuild:
   amd64 stable wrt bug #540132
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 3d35a22bfd6c..859dd7eecc43 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -13,19 +13,31 @@ DIST gdal-1.10.1.tar.gz 10241357 SHA256 9984f0314c0bd831eb59fb646c2bc5e13cf1378b
 DIST gdal-1.11.1.tar.gz 10731242 SHA256 f46b5944a8cabc8516673f231f466131cdfd2cdc6677dbee5d96ec7fc58a3340 SHA512 17214ae17a5199d73477d17cf8680396aee8a28d4333cf55818bdd869548dc6a4d7535d7e05949696db31a7be4a511c5ca73199af3dda48d9a40d5640618e9c3 WHIRLPOOL 1f07ee4acccf58552ddef6b5a306b9dbe832014f6890d353f195ab0d47dfc4e81164b7c8b9cefc9915035d113d2f28818f05e89918728eadb0e80e43e7220b5b
 DIST gdal-1.9.2.tar.gz 9495381 SHA256 9f3b9ae968eaa8d06ee5448e5b65e7bfa940e2e345282a29d95275421f36c688 SHA512 d93cd5fb16a3728a1f545bc6ceeb61bf41e011619b9290ed51eb5fc2d99e3c0f5733bfc6b3444ad2991e462c87c1088247e3fbb92d880701d48790125647b423 WHIRLPOOL 87f31c12ac5c4e18b4a7b9c416144b32c6d862ddba7688d5317582c797f8a637e37192cbb74406b6a71a672a4c53d3c71505ba024405911008e7b863881c9b8c
 EBUILD gdal-1.10.0-r1.ebuild 7467 SHA256 dd4b9569597b485b64dfd498454f600c3623003895c87c1ab6c9f9e940deb81d SHA512 faaed69e870c4b64fe5b0778e430c86bf74dfc202bbffb56b52bb27121dd8d8a7e7a2ac376db53d166c136a129a1c376fd3e604b1d558335b1cbbbd90f34eccd WHIRLPOOL 469bec9b5f566aeda04f9e2487abbfa3e4d71d3bfec7b06ec494026ec5c326bb190af5310452841a6be149d492c4abd4ab013644ac4a83200c19074894eceae1
-EBUILD gdal-1.10.1.ebuild 8601 SHA256 560fc6d310fa94b6383450e7bfe0ae65540df1f33c19899f301886d5b63f1974 SHA512 2237d6608c38f76b54a7e4aacce7ec714c436ae8664a97d3945287b8de74044556878c52a14a976a3de7075f38dea1f8bf1d6eec057ae30336e9e8c93a3c59e7 WHIRLPOOL ecfdaadcb49caee3ec3bc768823870038f769d638f19714003b51230d97a48fb25610c98370fa3bed62892f8c73878b78e6947dccf669e6cac949ba43914aada
-EBUILD gdal-1.11.1-r1.ebuild 8769 SHA256 c5fafb6aee7c8f44d23479d035c5384da965392958709b86c97a7b02333d4840 SHA512 df113a4edea30369bcd9e2e72e261136ebf7c7613aab4c16c9a70adbb28658f193b5ab09d29de3ace7f74c18caedc2125891801c719192fc4ffb4da5a303f7cb WHIRLPOOL 22ee45b756b08958ba41441edc033b04e8e2e837bca3f8702563434e86a7c2333dd54451c2b0a9e33427f80517422c09aa5efbca9f471db8e8e5621b9044bf8e
-EBUILD gdal-1.11.1-r2.ebuild 8848 SHA256 2e1f2f8d863a178c0784015d51c701dc6d0943180fed492a4471f9604e76dce1 SHA512 11975adda1b5424a51018ccc9531857933b0f32dc4e21925de5e0183d9cb936128e48fdcfabf77813c63fca5c75621b3e79db857f3fd3d3af8610c51f66aacf7 WHIRLPOOL 0d78d0b580d835720ea196fe1dd371dd187263635d291885bbf234a7c1b8b9ad7db58bbe8db5b698f9298c95d47b17d8e5cc9a7326301088800cb235de340286
-EBUILD gdal-1.11.1-r3.ebuild 8896 SHA256 f925542e71df308908cd95add65581f70466181e44a5849e3ff0e3a0d2755513 SHA512 9022e0280fc99160d2fad247e79ef5c70817391209b24ebbd1d71ddd58f002004c8fb70f43e71737fbcb39c995bfdc30ccc4b0a5a3b0a526790a6d550d8af1b3 WHIRLPOOL a75fb256da78919aac5f1479d528056b5c1afb0f9fed6f1129750bd095b7220527920d54bca2ab62bce4e0127e9906fbbe57e44a9119eab81afdaa143880f9b6
+EBUILD gdal-1.10.1.ebuild 8593 SHA256 f5ffe4362ebd76a528f1e8054bc34e7218f513b81abfef36ae0025cd6414e55d SHA512 207906acf000cb735ca67ba7b8543b97863f895d2335efa6cc50d269d8613c583e979e814a5d869034bd5223dc8ea5044d1a52a491053853c2c16eda5b49985a WHIRLPOOL e7d385eb06d5c0706d1cdaf4e0e21bd5e440b1ca8bbe419788a36b9654ad70f51c8fe5e5228425bedfeb74b8a0854a898aa97016c3f9cb7f5a74341133dc2903
+EBUILD gdal-1.11.1-r1.ebuild 8766 SHA256 40347a4e0bf5ce9cc044d176c49358a57b6cbb7dc7ca0736d8742d1c40428919 SHA512 181bd5f50d327f9f863d3cab9351a5f6707fa7f938e2e7ef71a2cdf23be0f6ddaf9ce8eba70c23e6ef6bff45a5c2833716fe048b1748cccdb646b99dca3fc5b1 WHIRLPOOL b5b3017082723bee7ec890df1075a707ca318753822aabc5dcd6dcc7a290179778bd0fef5fa01a3a6f9811185e6a13cf3d1ebbede0ae5d7357727d35e39de74a
+EBUILD gdal-1.11.1-r2.ebuild 8844 SHA256 25bc7664bca05cc4c094be83f5d8a509218d6be0d1d22b5d6f3646dc31129755 SHA512 ca6a883b766ac2f5d8150af9dc41da04ff20928617dff17947ba49758ec855f09c30f73a6749b606460b01749ece7d8580fa05479d271af79274fbb53a79f84a WHIRLPOOL f718bbc17ed2dda4cd479faad4f4077b460785fe1943ff4a33cfb92e1ab7950d38c6bc20dc0d857930f16fd72ff7226cdff5cc8acc4aedc2804cc40a02a23866
+EBUILD gdal-1.11.1-r3.ebuild 8889 SHA256 fb5a4b7da938a698304640b88f2cae9c71cc27c16d57d3d5e1842ee15b6684af SHA512 ceb880059217b2a22c9faa783b0d422a53563f71a0e37351f11bf0cce458b2ec6d933cc047e953b8f9c282c3cb1559cbc7ce3c1cffeae432caa1797f650bda4a WHIRLPOOL ace0a403405f15702f8363c066efb80bbaa9528f95e8e3db50599db9005448346709cfe9e725ed1d2c3ed881fbd19a52455051a068067f443aee592f2e0fd5c3
 EBUILD gdal-1.9.2.ebuild 7451 SHA256 70cb598d751ab607bcb624614b328edb0c50f76ecc8edd13dd237a43939bf32a SHA512 dc3e4d87a3e7a0245bb0b3eb2215268f837395817f7469fa81222b449abc47a71bed239a6a8f4ec49853422e23dc8ee3bd9ccdc36de39ed78ec329b7412eb884 WHIRLPOOL d1ae57dfc6170314fa1820b1256279c6e82606e453411d58a54b01b2b6ec3569ecbd3f2a3d91ce177e78f556b1783433f2099c0ca9de5de440259a959362b94b
-MISC ChangeLog 30148 SHA256 c34d853ca29f942dc9429251195dabb6b8d955233e6838662a75d5574d97269a SHA512 9013cfde97fda6f9a1c2cd4bfa75758ac862989315d325081d347ba32f8ce183eaf1ebe6f621071241ab3c0a16b00a842730325b7a14d628c75fb783e19ffc29 WHIRLPOOL 992c980ebe6bbceabb1635f0c1b848e60e1c66ea89a4ebd04e9f5c0725ab8fed441898066cbf355c9f08385703cfad957e35211d7d332655264e020de120d946
+MISC ChangeLog 30375 SHA256 8939a1002fbb110097cdd41d5ef52e135b6d6b879e4cc40c0105a0595430655f SHA512 bf67466f9e43be9696d2b7abf9ffb9602160036b12f9364655cb5b6444a939235a1b398df27abd8f0f88e926ddfdeab69f12b4807f117ddf76e8bd5550a1dc9d WHIRLPOOL 4cbe6a1a08bf812de641eb1c682791fa8db9a282658ae2a5e4671f45f47225ac0e018f54617171e345c9811c9b2edadd2e4f0dba3c9b6b7fa20a0eb60a8dc424
+MISC gdal-1.11.1-r2.ebuild.orig 8844 SHA256 63877c065cade9905ad3602941e821691762347be3f02e315770e9b97827f64d SHA512 79bf0c83074d65211c14070246b33dbab6f52ed01bdd96f965e6d6a95c344c740c92efa6ee20696ddb56739f136ee81ccb9ca585e9c03b92f30418b4a678010a WHIRLPOOL 3d732bb88fb5e7dcc3d9f2e2744547ec5822dc075fcec0e17ef5b962627badd1a46c3bf5493856d8c7e58f22907846b52128c5277f5858368fbccc83add0ba14
+MISC gdal-1.11.1-r2.ebuild.rej 244 SHA256 01fa37204923f46dfde5e82c6f62a7b750c34c27056fcb1b6ab908cd16679459 SHA512 a860ac030da21526ae021bb38fa5fc214d6ace9785df08a93523144fc6fc0c01e9e03814cfbea81dc19a1e8679d0eb10baa2309bddd52739ca505f4740e09a83 WHIRLPOOL 2e026ee4d0429f9dee5b9ab81562d969f180c1c75f855aa14839fda853d1158063e0e342caaf61b920de412416739542713dc565e07317a89fff66602f26c3c8
 MISC metadata.xml 1358 SHA256 25a3063ee14c6c99706a045b00ca2c93ab49b2f595759be6d85c0eb5ee20bc53 SHA512 82f014319806fa20e404244780bedf0fdcb5bf8c070d3758095c23d62a1fbb0bb712222cbaaea1101940b06c8ea6b1a588dc3a9815f5f8e2d7342fa08243a9cc WHIRLPOOL 5e964a8c85ab7ce5820a35043d13e7c6535f5cd13d16c95d635fc7c735a9366994ce9b843f72db801777b689562e94183227c57504ddc33d0afc6e182e15ec96
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iJwEAQEIAAYFAlUgSioACgkQG9wOWsQutdbScAP+OEOiDNRoGp0eAXk/GHtTZVr8
-8CuRj4kGINqxHqymgrjwQCTOvBHl5u8Y0YLvinaG9+fqXLO98TBF+9uzPGROUuZU
-uXeMA7cX6hB3SAqL4kROZYSYDYgn/3iSwnuOJMivtQHxSlAd/4mZ3QaFRoOzucVI
-VvogExWRVa1/d0SeEG8=
-=6ie4
+iQJ8BAEBCABmBQJVJXReXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO0yQQAIXRwg8a7ib9UDvHiPjDLv9P
+OiM3UnRbMpAZ3cOVtGECTwYllYAsux6dkUjdgfq5VMxrqRcZYjCj+kylDmRXg4nP
+ZSmSlrIYceulFKyt0YTNWHgNi7S4pLQGykKUbBILRO3CTGfKupvbdYFT+GKALh6i
+tyJTpfzz31bgwXnZu/AjY1kWz+nHygGlmtb76E1okaa/YczGKNmr9McQVrmPH5Gc
+6FWrVZPYIQqAUlY+9lGNJIL6Ywn+/ndQJtBbJ0w3xaEy7rsN30k7zc+IgRA54edL
+zsA7x0Wp2Ymv1XLRyyk09+vlau7HtvzOltTe+WEyl7G75v/CLc7YZcpDM8pV6H3Q
+VsE9zpYiyXCt4WzTk+0ydgj8TfT0O8f4PnUkPYC+k80MuaQ98dbHkN8oC0MTY21u
+lrIvJMnXypylbHUczif711IgkhG8K63r/KitS9a1FJyLlyp4a1EHE4uMNodyLxz2
+NqOvXglOa2VfIxG8eVazGtBKOiCI0PQ8MQHXfqww7zICXbga+Unhw88Nw3aUZF6d
+c1C8r1T/jfx4RUkxRh4CGF/PomXEH5Pr8pGId5Aljo7G3bz1c95nhBEKZAN7vAiD
+UEY9bFD8Kq401Zgg/WbyIuSTZsHK8UjkWrFSccpkJI1U+htOZUoXr3eY8dURphTx
+T3LAQa+1Sz/du/xbVHHD
+=cg8U
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/gdal/gdal-1.10.1.ebuild b/sci-libs/gdal/gdal-1.10.1.ebuild
index 6cc7e468ecae..1bad01d8635e 100644
--- a/sci-libs/gdal/gdal-1.10.1.ebuild
+++ b/sci-libs/gdal/gdal-1.10.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.10.1.ebuild,v 1.14 2015/02/28 15:52:54 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.10.1.ebuild,v 1.15 2015/04/08 18:32:59 mgorny Exp $
 
 EAPI=5
 
 WANT_AUTOCONF="2.5"
 
 GENTOO_DEPEND_ON_PERL="no"
-PYTHON_COMPAT=( python2_{5..7} python3_{1..3} )
+PYTHON_COMPAT=( python2_7 python3_3 )
 DISTUTILS_OPTIONAL=1
 
 inherit autotools eutils libtool perl-module distutils-r1 python-r1 toolchain-funcs java-pkg-opt-2
diff --git a/sci-libs/gdal/gdal-1.11.1-r1.ebuild b/sci-libs/gdal/gdal-1.11.1-r1.ebuild
index c99206065c74..bffde2629fe3 100644
--- a/sci-libs/gdal/gdal-1.11.1-r1.ebuild
+++ b/sci-libs/gdal/gdal-1.11.1-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.11.1-r1.ebuild,v 1.9 2015/02/28 15:52:54 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.11.1-r1.ebuild,v 1.10 2015/04/08 18:32:59 mgorny Exp $
 
 EAPI=5
 
 WANT_AUTOCONF="2.5"
 
 GENTOO_DEPEND_ON_PERL="no"
-PYTHON_COMPAT=( python2_{5..7} python3_{1..4} )
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
 DISTUTILS_OPTIONAL=1
 
 inherit autotools eutils libtool perl-module distutils-r1 python-r1 toolchain-funcs java-pkg-opt-2
diff --git a/sci-libs/gdal/gdal-1.11.1-r2.ebuild b/sci-libs/gdal/gdal-1.11.1-r2.ebuild
index 467ca5ce9559..7f9effaf5566 100644
--- a/sci-libs/gdal/gdal-1.11.1-r2.ebuild
+++ b/sci-libs/gdal/gdal-1.11.1-r2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.11.1-r2.ebuild,v 1.2 2015/02/28 15:52:54 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.11.1-r2.ebuild,v 1.3 2015/04/08 18:32:59 mgorny Exp $
 
 EAPI=5
 
 WANT_AUTOCONF="2.5"
 
 GENTOO_DEPEND_ON_PERL="no"
-PYTHON_COMPAT=( python2_{5..7} python3_{1..4} )
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
 DISTUTILS_OPTIONAL=1
 
 inherit autotools eutils libtool perl-module distutils-r1 python-r1 toolchain-funcs java-pkg-opt-2
diff --git a/sci-libs/gdal/gdal-1.11.1-r3.ebuild b/sci-libs/gdal/gdal-1.11.1-r3.ebuild
index 9bce4ebb7e3e..3cf8f19e4821 100644
--- a/sci-libs/gdal/gdal-1.11.1-r3.ebuild
+++ b/sci-libs/gdal/gdal-1.11.1-r3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.11.1-r3.ebuild,v 1.2 2015/04/04 20:33:29 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.11.1-r3.ebuild,v 1.3 2015/04/08 18:32:59 mgorny Exp $
 
 EAPI=5
 
 WANT_AUTOCONF="2.5"
 
 GENTOO_DEPEND_ON_PERL="no"
-PYTHON_COMPAT=( python2_{5..7} python3_{1..4} )
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
 DISTUTILS_OPTIONAL=1
 
 inherit autotools eutils libtool perl-module distutils-r1 python-r1 toolchain-funcs java-pkg-opt-2