replicate python scripts for each ABI; fix SLOT operators usage
authorJustin Lecher <jlec@gentoo.org>
Sat, 28 Feb 2015 15:53:05 +0000 (15:53 +0000)
committerJustin Lecher <jlec@gentoo.org>
Sat, 28 Feb 2015 15:53:05 +0000 (15:53 +0000)
Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

sci-libs/gdal/ChangeLog
sci-libs/gdal/Manifest
sci-libs/gdal/gdal-1.10.0-r1.ebuild
sci-libs/gdal/gdal-1.10.1.ebuild
sci-libs/gdal/gdal-1.11.1-r1.ebuild
sci-libs/gdal/gdal-1.11.1-r2.ebuild
sci-libs/gdal/gdal-1.11.1-r3.ebuild [new file with mode: 0644]
sci-libs/gdal/gdal-1.9.2.ebuild

index b93eff77d39cad5307c067cc50be7e251524d0d2..17fa82c16cb1efa8355bc7d64b68079d733d1dfe 100644 (file)
@@ -1,6 +1,13 @@
 # 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.160 2015/02/24 00:05:14 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.161 2015/02/28 15:52:54 jlec Exp $
+
+*gdal-1.11.1-r3 (28 Feb 2015)
+
+  28 Feb 2015; Justin Lecher <jlec@gentoo.org> +gdal-1.11.1-r3.ebuild,
+  gdal-1.10.0-r1.ebuild, gdal-1.10.1.ebuild, gdal-1.11.1-r1.ebuild,
+  gdal-1.11.1-r2.ebuild, gdal-1.9.2.ebuild:
+  replicate python scripts for each ABI; fix SLOT operators usage
 
 *gdal-1.11.1-r2 (24 Feb 2015)
 
index 8eaf09973f9a8a3e1e0cfb37a2e42b477e6b0489..ce6a99671bb9f3590162f7f8c92e98dfd44d8539 100644 (file)
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX gdal-1.10.0-ruby-makefile.patch 1468 SHA256 a07a8df543bc65dbb6871689287ef1bc831399a1090064a97c2e0f71c9f27a88 SHA512 ae2bd2c051f851533efd16efafd4fbf41906cdb64401e327220a09dd879e124e6483122ef618bec4fd6e9f9c8a5b0d7dd8362938d0a5ea788d77887e9a54de7b WHIRLPOOL 563004ce1a9920965c2b59aeca036fc04ba2df3e61685e7427879481591387eb6780d7a50d0a4c631df149beb4751d807462c0802a86a998cebc7116a3275875
 AUX gdal-1.11.1-poppler-0.31.0-support.patch 4994 SHA256 a27a1f9f024d890b35a771ba4150468d488c0e39757ebe48d9e3903f29700d79 SHA512 ad0c685d1fbf34543966d097ef235db5b84b827d4e56e6910b788baacf11f0af1550e6214c402ed08abc5bef9b7c34f188869c2a6ccf1eb7c298b8918db34e54 WHIRLPOOL 7cb9ae09dac6bf0acc7c98d0263c7f22799060aa77213f20103d58dacc29f3d516f61e22cac1d1a84933097c032065448c3fc9f76cf4ced338e40e574c5b5a80
@@ -12,19 +12,30 @@ DIST gdal-1.10.0.tar.gz 10232486 SHA256 1a9ca12bcc3a55f66bcd6654d5ff12eeddb3a26b
 DIST gdal-1.10.1.tar.gz 10241357 SHA256 9984f0314c0bd831eb59fb646c2bc5e13cf1378be4f51499045166cbe62be6ea SHA512 214cdb2ad8d01b615b53a53584afcf38be7180174a358963b32af2027201b1e7030cb36be416b271675499e76e42baf8bc09e3646f3d12b0d778b4d1f1a11820 WHIRLPOOL 96a451442dfeec44f12e44a621908afa783c1b0379233b877495c0c2f0f02f2e81a7fedd72e7273e3a7de76415b5c54b80c48ed82723178805b839f36561ad8d
 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 7459 SHA256 49b93cba43a37d0df1cbadbd13c40c0cad5f99f67a194ed8a41dea8d0bbd9b63 SHA512 d7306cbb19627ad8261ce7d2c85bdf4c51482f6da35490779ea7a6a28f10a157a72f1257cd66592b1b4cba710094ff0643fe5bba52e49228bed608e7a5de275b WHIRLPOOL d313bf4a5f280fdc926b67f451dda6de228396300fabeb5320d52ea841890c5867d176a11457bf65915588ba1870e7751ebd2f288da8615cf7564e790d98ca25
-EBUILD gdal-1.10.1.ebuild 8593 SHA256 64e24415357329ab046861bce437b5ff12d568e42c20caeb9bca3c3bf037f4d7 SHA512 640e9e73464311d8e77c896c468b25443ece3fb8f2c14851d9a6a6f8f8b1b4bef3a8d9a09d0cf7478806923375ec88a16b6a31a606391ecc4adbbd0c196b26d7 WHIRLPOOL 62318e511c695d9024dce2701f9e1ecc22e15f537eb63dd6dd3eec66e2804e8cbe166f9bbf350e77b46816872b3925f25431407e2afdb6dbd214f6cacfebccc0
-EBUILD gdal-1.11.1-r1.ebuild 8758 SHA256 2bb5159fff177d0fa17370cd91d4999c3b79f9c383476f6bc041fcd4ebc6c9dc SHA512 11ec4dcf4480951238526c308cb14d1d8cd809416573a34fc156d70031412a48c40ebfe04941b456258848132a807d62ae3ef3bb9facb20c17e89534b486ad64 WHIRLPOOL ce22e5bd274d400ca32f8663da165cded8c33a5ae334040195a947d07af1148eb6624f5a5e562acf2e8d763af7205503b3f18311961576466afeb1fe5cd99c34
-EBUILD gdal-1.11.1-r2.ebuild 8834 SHA256 02bb156112f495caf856c916234e86a68ad4bead5dfa64d4bec44fc8ea872d2e SHA512 2d98f405fc1dc0a5b3240c12a6eab72d7dc8a9347a50172f84df79b63c48d8369343cab53a6fa5038fa6a3ade5b08784f661bde3a0ae709ff6334865367c029b WHIRLPOOL 64827d4db87039a8893a2c8832f96b3fb04d314a936018e960c669fd51af6f3748f6b3b057d9ebf0ca51524ac2e4b07a5cf4ce5c18e8a8ae61e195490d2964d5
-EBUILD gdal-1.9.2.ebuild 7443 SHA256 37315ef6aa36506bebac766463910db62bfa3974d0fcb072a1db98bc2742c669 SHA512 9eb2a170a9651d42728d1162e73e18a40fafe57d8ed8e7d61a726cf80afecbeb361c80f99044803fff976f841f9c70baea1c7c943b70513133296a9b5efd4f37 WHIRLPOOL 32ee3435b15e3caa830e49eba52fe36bbd2c5ffded86cc1c22670242c0ae5780663ae867d37677ba0b44ba1d4bdb0c11b6a6ae7315483b046b6e7c6b371d1cf4
-MISC ChangeLog 29758 SHA256 7e28807e18a67d00acf06b7309d85a62516c36c8297c5ecce1f3c87b3b127fd8 SHA512 feba0ca3817d44ee09f9cb90eae4e9c4af8b5d4689ffdd738f7bd3189851a41ef3b465985ecc1252251d88b60bcb9774adc336edd33f4c78c576dfb63bd41a56 WHIRLPOOL dfce66d33b11a1e8ad42fc51c0932305573f5051f23c7e5318bf3ff8dfb54ee1112f5d30f2e30cbf547eb24b642d9db0cf0a64da21bb9c09a7d7423b9a2c4b8c
+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 8894 SHA256 ac84061fbab3de748e8e63e55a746aa4f437e57c74c4e01152de48fb42a9db84 SHA512 ecc761c701d8adc8bc9eb24feaa16bf8e35c3aae8ad73abc4a3d321f129eb8aee8a753a1d9373eb48bf57a2f2e87f084c1be01b72b86c293bda90b488b7cf60a WHIRLPOOL fffcef55f5dd1db5e3ecf39f5f16e15de9910c3ffcbbf6cac5328292277dd1ec84cb5889f9e4d0ea8340fe947fbb29e260619cd7b1c66464fdee38156c963b5c
+EBUILD gdal-1.9.2.ebuild 7451 SHA256 70cb598d751ab607bcb624614b328edb0c50f76ecc8edd13dd237a43939bf32a SHA512 dc3e4d87a3e7a0245bb0b3eb2215268f837395817f7469fa81222b449abc47a71bed239a6a8f4ec49853422e23dc8ee3bd9ccdc36de39ed78ec329b7412eb884 WHIRLPOOL d1ae57dfc6170314fa1820b1256279c6e82606e453411d58a54b01b2b6ec3569ecbd3f2a3d91ce177e78f556b1783433f2099c0ca9de5de440259a959362b94b
+MISC ChangeLog 30040 SHA256 4eddbcd11aca5c37e697543519f0b11716015e4cb1fd3fd4f6e706b235b6e420 SHA512 c082d3eb6b5d7d62717902a9c7b53d721a3a61f08420a9b818475bbff5d3c2660b96f0edfbca63a8ab6433c12c9b42348b2ea22864e5232195142fe19a20799e WHIRLPOOL 3e3aae1b4ac91821001c094ef642be129bb602c71940c6d2924f894981a4a8053306041404ccb4e5e5b54ca49600e30a57769d52f353432ceec53d4cc1fcce0c
 MISC metadata.xml 1358 SHA256 25a3063ee14c6c99706a045b00ca2c93ab49b2f595759be6d85c0eb5ee20bc53 SHA512 82f014319806fa20e404244780bedf0fdcb5bf8c070d3758095c23d62a1fbb0bb712222cbaaea1101940b06c8ea6b1a588dc3a9815f5f8e2d7342fa08243a9cc WHIRLPOOL 5e964a8c85ab7ce5820a35043d13e7c6535f5cd13d16c95d635fc7c735a9366994ce9b843f72db801777b689562e94183227c57504ddc33d0afc6e182e15ec96
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iL4EAREIAGYFAlTrwEVfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
-bnBncC5maWZ0aGhvcnNlbWFuLm5ldDY3QjA4MzdGODg1NUMxMjIzNUQ0MDgxNzky
-N0FERDBDNjJFRUYwOTAACgkQknrdDGLu8JB6wgEAlX7f337xxetw7mzdazsna/cQ
-qbDTgOTCRyGDewhB53YA/2mkUsHhFrQP2KbZHhGK6gtMu2mj7vIXRX3RhRI1P9G5
-=sfT1
+iQJ8BAEBCgBmBQJU8eRhXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirtHYP/RsZV9INMRFNlgMkF6yxJc8e
+ufgBtOYDMTrtVdcsaqx1uF74Ij7b/frs55GVRtHlgRpNTuEhv82qIpOZw5j15eHi
+mz+1ttphmfJhFlu3H73uVebOkb/eeQwEtK6cUmfeLahi8yrH6cfUGQg41hkqXwjE
+Ac450EWrn+7nMMZVYn6tThODTf24LOKWvOY3409/AUpeyLZuX+Hcgtggi35VfMVW
+BJm69/vKEAzb7geYQ4gUtstZIY/A16ttICu0rbNFd0ZvawuQxm7Vc7vitKUsfMiF
+jlzHfC5c6RW3uzrd9pzDhvBdymNUZzV0YYZPJrNFVz1C6HtHya1gUCUrssfoxGj6
+M1+DH9vgLTZACPbQ4Z2E9S5bkDWNYpJOE9Kizvfj8S+MilX9IOHaTNd7uXeQ05kr
+iY4WxEtQunQIBu/iJfA3Q+7z0XBx3DKAFKvvsdvoOxzvQXkgZ1ri0otkf4mfnpqR
+20FENGYGqedP9csoVh7xM4i55eb6r5rn5YR41I9zHnCg8eFwsS2Z6HOHzcYj3RbG
+zzh7sV0NCZuL/KtFAhDMpwDAff6WEd5/c6KUy9NrveloFz+2tTACwfGKeTVxlxa7
+iuKoYBFHblxqzPLXvtDXJ8G+kT2yTas/v04UoavyRqeCxNnDlrQFM5oyE9p+Z9Ju
+//kuycQDNLoVL4lSyXnh
+=Qay4
 -----END PGP SIGNATURE-----
index 78d93727f98d357bb4412c058f4cc6087e3a3fb6..6dae9970d3b75084d362e0a113a5fe4eeb3c59c4 100644 (file)
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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.0-r1.ebuild,v 1.7 2014/12/31 14:08:12 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.10.0-r1.ebuild,v 1.8 2015/02/28 15:52:54 jlec Exp $
 
 EAPI=5
 
@@ -21,7 +21,7 @@ IUSE="armadillo +aux_xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k
 
 RDEPEND="
        dev-libs/expat
-       media-libs/tiff
+       media-libs/tiff:0=
        sci-libs/libgeotiff
        || ( <sys-libs/zlib-1.2.5.1-r1 >=sys-libs/zlib-1.2.5.1-r2[minizip] )
        armadillo? ( sci-libs/armadillo[lapack] )
@@ -31,8 +31,8 @@ RDEPEND="
        gif? ( media-libs/giflib )
        gml? ( >=dev-libs/xerces-c-3 )
        hdf5? ( >=sci-libs/hdf5-1.6.4[szip] )
-       java? ( >=virtual/jre-1.6 )
-       jpeg? ( virtual/jpeg )
+       java? ( >=virtual/jre-1.6:* )
+       jpeg? ( virtual/jpeg:0= )
        jpeg2k? ( media-libs/jasper )
        mysql? ( virtual/mysql )
        netcdf? ( sci-libs/netcdf )
@@ -40,8 +40,8 @@ RDEPEND="
        opencl? ( virtual/opencl )
        pdf? ( app-text/poppler )
        perl? ( dev-lang/perl )
-       png? ( media-libs/libpng )
-       postgres? ( >=dev-db/postgresql-8.4 )
+       png? ( media-libs/libpng:0= )
+       postgres? ( >=dev-db/postgresql-8.4:= )
        python? ( dev-python/numpy )
        ruby? ( dev-lang/ruby:1.9 )
        sqlite? ( dev-db/sqlite:3 )
index 51af0f1bcecb8a0594d85fa2309c8efee2b3ca07..6cc7e468ecae8a367f9e0e2d98e44cfa5eb9fc35 100644 (file)
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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.13 2014/12/31 14:08:12 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.10.1.ebuild,v 1.14 2015/02/28 15:52:54 jlec Exp $
 
 EAPI=5
 
@@ -25,7 +25,7 @@ RDEPEND="
        dev-libs/expat
        dev-libs/libpcre
        dev-libs/libxml2
-       media-libs/tiff
+       media-libs/tiff:0=
        sci-libs/libgeotiff
        sys-libs/zlib[minizip(+)]
        armadillo? ( sci-libs/armadillo[lapack] )
@@ -35,8 +35,8 @@ RDEPEND="
        gif? ( media-libs/giflib )
        gml? ( >=dev-libs/xerces-c-3 )
        hdf5? ( >=sci-libs/hdf5-1.6.4[szip] )
-       java? ( >=virtual/jre-1.6 )
-       jpeg? ( virtual/jpeg )
+       java? ( >=virtual/jre-1.6:* )
+       jpeg? ( virtual/jpeg:0= )
        jpeg2k? ( media-libs/jasper )
        mysql? ( virtual/mysql )
        netcdf? ( sci-libs/netcdf )
@@ -45,8 +45,8 @@ RDEPEND="
        opencl? ( virtual/opencl )
        pdf? ( >=app-text/poppler-0.24.3:= )
        perl? ( dev-lang/perl:= )
-       png? ( media-libs/libpng )
-       postgres? ( >=dev-db/postgresql-8.4 )
+       png? ( media-libs/libpng:0= )
+       postgres? ( >=dev-db/postgresql-8.4:* )
        python? (
                ${PYTHON_DEPS}
                dev-python/setuptools[${PYTHON_USEDEP}]
index 9fff0a2bcfe18c3a23dd2467e79957428b820fb8..c99206065c749919ddfd13cc0b7c111d998002df 100644 (file)
@@ -1,6 +1,6 @@
 # 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.8 2015/01/12 23:49:19 grozin Exp $
+# $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 $
 
 EAPI=5
 
@@ -26,7 +26,7 @@ RDEPEND="
        dev-libs/json-c
        dev-libs/libpcre
        dev-libs/libxml2
-       media-libs/tiff
+       media-libs/tiff:0=
        sci-libs/libgeotiff
        sys-libs/zlib[minizip(+)]
        armadillo? ( sci-libs/armadillo[lapack] )
@@ -36,8 +36,8 @@ RDEPEND="
        gif? ( media-libs/giflib )
        gml? ( >=dev-libs/xerces-c-3 )
        hdf5? ( >=sci-libs/hdf5-1.6.4[szip] )
-       java? ( >=virtual/jre-1.6 )
-       jpeg? ( virtual/jpeg )
+       java? ( >=virtual/jre-1.6:* )
+       jpeg? ( virtual/jpeg:0= )
        jpeg2k? ( media-libs/jasper )
        mysql? ( virtual/mysql )
        netcdf? ( sci-libs/netcdf )
@@ -46,8 +46,8 @@ RDEPEND="
        opencl? ( virtual/opencl )
        pdf? ( >=app-text/poppler-0.24.3:= )
        perl? ( dev-lang/perl:= )
-       png? ( media-libs/libpng )
-       postgres? ( >=dev-db/postgresql-8.4 )
+       png? ( media-libs/libpng:0= )
+       postgres? ( >=dev-db/postgresql-8.4:* )
        python? (
                ${PYTHON_DEPS}
                dev-python/setuptools[${PYTHON_USEDEP}]
index bff6b7eaacc045d86aa6d4dc273bb1e6ce95e47b..467ca5ce95596e674cae0c23478d672761a29886 100644 (file)
@@ -1,6 +1,6 @@
 # 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.1 2015/02/24 00:05:14 xmw Exp $
+# $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 $
 
 EAPI=5
 
@@ -26,7 +26,7 @@ RDEPEND="
        dev-libs/json-c
        dev-libs/libpcre
        dev-libs/libxml2
-       media-libs/tiff
+       media-libs/tiff:0=
        sci-libs/libgeotiff
        sys-libs/zlib[minizip(+)]
        armadillo? ( sci-libs/armadillo[lapack] )
@@ -36,8 +36,8 @@ RDEPEND="
        gif? ( media-libs/giflib )
        gml? ( >=dev-libs/xerces-c-3 )
        hdf5? ( >=sci-libs/hdf5-1.6.4[szip] )
-       java? ( >=virtual/jre-1.6 )
-       jpeg? ( virtual/jpeg )
+       java? ( >=virtual/jre-1.6:* )
+       jpeg? ( virtual/jpeg:0= )
        jpeg2k? ( media-libs/jasper )
        mysql? ( virtual/mysql )
        netcdf? ( sci-libs/netcdf )
@@ -46,8 +46,8 @@ RDEPEND="
        opencl? ( virtual/opencl )
        pdf? ( >=app-text/poppler-0.24.3:= )
        perl? ( dev-lang/perl:= )
-       png? ( media-libs/libpng )
-       postgres? ( >=dev-db/postgresql-8.4 )
+       png? ( media-libs/libpng:0= )
+       postgres? ( >=dev-db/postgresql-8.4:= )
        python? (
                ${PYTHON_DEPS}
                dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/sci-libs/gdal/gdal-1.11.1-r3.ebuild b/sci-libs/gdal/gdal-1.11.1-r3.ebuild
new file mode 100644 (file)
index 0000000..4f2b435
--- /dev/null
@@ -0,0 +1,349 @@
+# 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.1 2015/02/28 15:52:54 jlec Exp $
+
+EAPI=5
+
+WANT_AUTOCONF="2.5"
+
+GENTOO_DEPEND_ON_PERL="no"
+PYTHON_COMPAT=( python2_{5..7} python3_{1..4} )
+DISTUTILS_OPTIONAL=1
+
+inherit autotools eutils libtool perl-module distutils-r1 python-r1 toolchain-funcs java-pkg-opt-2
+
+DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)"
+HOMEPAGE="http://www.gdal.org/"
+SRC_URI="http://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="armadillo +aux_xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k mdb mysql netcdf odbc ogdi opencl pdf perl png postgres python ruby spatialite sqlite threads xls"
+
+RDEPEND="
+       dev-libs/expat
+       dev-libs/json-c
+       dev-libs/libpcre
+       dev-libs/libxml2
+       media-libs/tiff:0=
+       sci-libs/libgeotiff
+       sys-libs/zlib[minizip(+)]
+       armadillo? ( sci-libs/armadillo[lapack] )
+       curl? ( net-misc/curl )
+       fits? ( sci-libs/cfitsio )
+       geos?   ( >=sci-libs/geos-2.2.1 )
+       gif? ( media-libs/giflib )
+       gml? ( >=dev-libs/xerces-c-3 )
+       hdf5? ( >=sci-libs/hdf5-1.6.4[szip] )
+       java? ( >=virtual/jre-1.6:* )
+       jpeg? ( virtual/jpeg:0= )
+       jpeg2k? ( media-libs/jasper )
+       mysql? ( virtual/mysql )
+       netcdf? ( sci-libs/netcdf )
+       odbc?   ( dev-db/unixODBC )
+       ogdi? ( sci-libs/ogdi )
+       opencl? ( virtual/opencl )
+       pdf? ( >=app-text/poppler-0.24.3:= )
+       perl? ( dev-lang/perl:= )
+       png? ( media-libs/libpng:0= )
+       postgres? ( >=dev-db/postgresql-8.4:= )
+       python? (
+               ${PYTHON_DEPS}
+               dev-python/setuptools[${PYTHON_USEDEP}]
+               dev-python/numpy[${PYTHON_USEDEP}]
+       )
+       ruby? ( dev-lang/ruby:1.9 )
+       sqlite? ( dev-db/sqlite:3 )
+       spatialite? ( dev-db/spatialite )
+       xls? ( dev-libs/freexl )
+"
+
+SWIG_DEP=">=dev-lang/swig-2.0.2"
+DEPEND="${RDEPEND}
+       doc? ( app-doc/doxygen )
+       java? ( >=virtual/jdk-1.6 )
+       perl? ( ${SWIG_DEP} )
+       python? ( ${SWIG_DEP} )
+       ruby? ( ${SWIG_DEP} )"
+
+AT_M4DIR="${S}/m4"
+MAKEOPTS+=" -j1"
+
+REQUIRED_USE="
+       spatialite? ( sqlite )
+       mdb? ( java )
+"
+
+pkg_setup() {
+       java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+       java-pkg-opt-2_src_prepare
+
+       # fix datadir and docdir placement
+       sed -i \
+               -e "s:@datadir@:@datadir@/gdal:" \
+               -e "s:@exec_prefix@/doc:@exec_prefix@/share/doc/${PF}/html:g" \
+               "${S}"/GDALmake.opt.in || die
+
+       # the second sed expression should fix bug 371075
+       sed -i \
+               -e "s:setup.py install:setup.py install --root=\$(DESTDIR):" \
+               -e "s:--prefix=\$(DESTDIR):--prefix=:" \
+               "${S}"/swig/python/GNUmakefile || die
+
+       epatch "${FILESDIR}"/${PN}-1.10.0-ruby-makefile.patch
+
+       # -soname is only accepted by GNU ld/ELF
+       [[ ${CHOST} == *-darwin* ]] \
+               && epatch "${FILESDIR}"/${PN}-1.5.0-install_name.patch \
+               || epatch "${FILESDIR}"/${PN}-1.5.0-soname.patch
+
+       # Fix spatialite/sqlite include issue
+       sed -i \
+               -e 's:spatialite/sqlite3.h:sqlite3.h:g' \
+               ogr/ogrsf_frmts/sqlite/ogr_sqlite.h || die
+
+       # Fix freexl configure check
+       sed -i \
+               -e 's:FREEXL_LIBS=missing):FREEXL_LIBS=missing,-lm):g' \
+               configure.in || die
+
+       sed \
+               -e "s: /usr/: \"${EPREFIX}\"/usr/:g" \
+               -i configure.in || die
+
+       sed \
+               -e 's:^ar:$(AR):g' \
+               -i ogr/ogrsf_frmts/sdts/install-libs.sh || die
+
+       # Fix swig-3.0.3 problem (bug #534168)
+       epatch "${FILESDIR}"/${PN}-1.11.1-swig-3.0.3.patch
+
+       # bug 540132
+       epatch "${FILESDIR}"/${PN}-1.11.1-poppler-0.31.0-support.patch
+
+       tc-export AR RANLIB
+
+       eautoreconf
+
+       prepare_python() {
+               mkdir -p "${BUILD_DIR}" || die
+               find "${S}" -type d -maxdepth 1 -exec ln -s {} "${BUILD_DIR}"/ \; ||die
+               find "${S}" -type f -maxdepth 1 -exec cp --target="${BUILD_DIR}"/ {} + ||die
+#              mkdir -p "${BUILD_DIR}"/swig/python || die
+#              mkdir -p "${BUILD_DIR}"/apps || die
+#              cp -dpR --target="${BUILD_DIR}"/swig/ \
+#                      "${S}"/swig/{python,SWIGmake.base,GNUmakefile} || die
+#              ln -s "${S}"/swig/include "${BUILD_DIR}"/swig/ || die
+#              ln -s "${S}"/apps/gdal-config "${BUILD_DIR}"/apps/ || die
+#              ln -s "${S}"/port "${BUILD_DIR}"/ || die
+       }
+       if use python; then
+               python_foreach_impl prepare_python
+       fi
+}
+
+gdal_src_configure() {
+       local myopts=""
+
+       if use ruby; then
+               RUBY_MOD_DIR="$(ruby19 -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')"
+               echo "Ruby module dir is: $RUBY_MOD_DIR"
+       fi
+
+       if use java; then
+               myopts+="
+                       --with-java=$(java-config --jdk-home 2>/dev/null)
+                       $(use_with mdb)"
+       else
+               myopts+=" --without-java --without-mdb"
+               use mdb && ewarn "mdb requires java use enabled. disabling"
+       fi
+
+       if use sqlite; then
+               myopts+=" LIBS=-lsqlite3"
+       fi
+
+       # pcidsk is internal, because there is no such library yet released
+       #     also that thing is developed by the gdal people
+       # kakadu, mrsid jp2mrsid - another jpeg2k stuff, ignore
+       # bsb - legal issues
+       # oracle - disabled, i dont have and can't test
+       # ingres - same story as oracle oci
+       # podofo - we use poppler instead they are exclusive for each other
+       # tiff is a hard dep
+       ECONF_SOURCE="${S}" econf \
+               --includedir="${EPREFIX}/usr/include/${PN}" \
+               --disable-static \
+               --enable-shared \
+               --with-expat \
+               --with-geotiff \
+               --with-grib \
+               --with-libtiff \
+               --with-libz="${EPREFIX}/usr/" \
+               --with-ogr \
+               --without-bsb \
+               --without-dods-root \
+               --without-dwgdirect \
+               --without-epsilon \
+               --without-fme \
+               --without-grass \
+               --without-hdf4 \
+               --without-idb \
+               --without-ingres \
+               --without-jp2mrsid \
+               --without-kakadu \
+               --without-libtool \
+               --without-mrsid \
+               --without-msg \
+               --without-oci \
+               --without-pcraster \
+               --without-podofo \
+               --without-sde \
+               $(use_enable debug) \
+               $(use_with armadillo) \
+               $(use_with aux_xml pam) \
+               $(use_with curl) \
+               --without-ecw \
+               $(use_with fits cfitsio) \
+               $(use_with geos) \
+               $(use_with gif) \
+               $(use_with gml xerces) \
+               $(use_with hdf5) \
+               $(use_with jpeg pcidsk) \
+               $(use_with jpeg) \
+               $(use_with jpeg2k jasper) \
+               $(use_with mysql mysql "${EPREFIX}"/usr/bin/mysql_config) \
+               $(use_with netcdf) \
+               $(use_with odbc) \
+               $(use_with ogdi ogdi "${EPREFIX}"/usr) \
+               $(use_with opencl) \
+               $(use_with pdf poppler) \
+               $(use_with perl) \
+               $(use_with png) \
+               $(use_with postgres pg) \
+               $(use_with python) \
+               $(use_with ruby) \
+               $(use_with spatialite) \
+               $(use_with sqlite sqlite3 "${EPREFIX}"/usr) \
+               $(use_with threads) \
+               $(use_with xls freexl) \
+               ${myopts}
+
+       # mysql-config puts this in (and boy is it a PITA to get it out)
+       if use mysql; then
+               sed -i \
+                       -e "s: -rdynamic : :" \
+                       GDALmake.opt || die "sed LIBS failed"
+       fi
+
+       if [[ -n $use_python ]]; then
+               # updated for newer swig (must specify the path to input files)
+               sed -i \
+                       -e "s: gdal_array.i: ../include/gdal_array.i:" \
+                       -e "s:\$(DESTDIR)\$(prefix):\$(DESTDIR)\$(INST_PREFIX):g" \
+                       swig/python/GNUmakefile || die "sed python makefile failed"
+               sed -i \
+                       -e "s:library_dirs = :library_dirs = /usr/$(get_libdir):g" \
+                       swig/python/setup.cfg || die "sed python setup.cfg failed"
+#                      -e "s:gdal_config=.*$:gdal_config=../../../apps/gdal-config:g" \
+       fi
+}
+
+src_configure() {
+       local use_python=""
+
+       gdal_src_configure
+
+       if use python; then
+               use_python="yes"
+               python_foreach_impl run_in_build_dir gdal_src_configure
+       fi
+}
+
+src_compile() {
+       local i
+       for i in perl ruby; do
+               if use $i; then
+                       rm "${S}"/swig/$i/*_wrap.cpp
+                       emake -C "${S}"/swig/$i generate
+               fi
+       done
+
+       default
+
+       if use perl ; then
+               pushd "${S}"/swig/perl > /dev/null
+               perl-module_src_configure
+               perl-module_src_compile
+               popd > /dev/null
+       fi
+
+       use doc && emake docs
+
+       compile_python() {
+               rm -f swig/python/*_wrap.cpp
+               emake -C swig/python generate
+               emake -C swig/python build
+       }
+       if use python; then
+               python_foreach_impl run_in_build_dir compile_python
+       fi
+}
+
+src_install() {
+       if use perl ; then
+               pushd "${S}"/swig/perl > /dev/null
+               perl-module_src_install
+               popd > /dev/null
+               sed -i \
+                       -e "s:BINDINGS        =       python ruby perl:BINDINGS        =       python ruby:g" \
+                       GDALmake.opt || die
+       fi
+
+       default
+
+       if use ruby ; then
+               # weird reinstall collision; needs manual intervention...
+               pushd "${S}"/swig/ruby > /dev/null
+               rm -rf "${D}"${RUBY_MOD_DIR}/gdal
+               exeinto ${RUBY_MOD_DIR}/gdal
+               doexe *.so || die "doins ruby modules failed"
+               popd > /dev/null
+       fi
+
+       use perl && perl_delete_localpod
+
+       dodoc Doxyfile HOWTO-RELEASE NEWS
+
+       if use doc ; then
+               dohtml html/*
+               docinto ogr
+               dohtml ogr/html/*
+       fi
+
+       install_python() {
+               emake -C swig/python DESTDIR="${D}" install
+       }
+       if use python; then
+               python_foreach_impl run_in_build_dir install_python
+               newdoc swig/python/README.txt README-python.txt
+               insinto /usr/share/${PN}/samples
+               doins swig/python/samples/*
+               python_replicate_script "${ED}"/usr/bin/*py
+       fi
+
+       pushd man/man1 > /dev/null
+       for i in * ; do
+               newman ${i} ${i}
+       done
+       popd > /dev/null
+}
+
+pkg_postinst() {
+       elog "Check available image and data formats after building with"
+       elog "gdalinfo and ogrinfo (using the --formats switch)."
+}
index 9bbb710531b435e13eeb4a0096096213e8594bce..fd96449d54427aa374e62cef9222a9c0f6e55cf3 100644 (file)
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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.9.2.ebuild,v 1.11 2014/12/31 14:08:12 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.9.2.ebuild,v 1.12 2015/02/28 15:52:54 jlec Exp $
 
 EAPI=5
 
@@ -21,7 +21,7 @@ IUSE="armadillo +aux_xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k
 
 RDEPEND="
        dev-libs/expat
-       media-libs/tiff
+       media-libs/tiff:0=
        sci-libs/libgeotiff
        || ( <sys-libs/zlib-1.2.5.1-r1 >=sys-libs/zlib-1.2.5.1-r2[minizip] )
        armadillo? ( sci-libs/armadillo[lapack] )
@@ -31,8 +31,8 @@ RDEPEND="
        gif? ( media-libs/giflib )
        gml? ( >=dev-libs/xerces-c-3 )
        hdf5? ( >=sci-libs/hdf5-1.6.4[szip] )
-       java? ( >=virtual/jre-1.6 )
-       jpeg? ( virtual/jpeg )
+       java? ( >=virtual/jre-1.6:* )
+       jpeg? ( virtual/jpeg:0= )
        jpeg2k? ( media-libs/jasper )
        mysql? ( virtual/mysql )
        netcdf? ( sci-libs/netcdf )
@@ -40,8 +40,8 @@ RDEPEND="
        opencl? ( virtual/opencl )
        pdf? ( app-text/poppler )
        perl? ( dev-lang/perl )
-       png? ( media-libs/libpng )
-       postgres? ( >=dev-db/postgresql-8.4 )
+       png? ( media-libs/libpng:0= )
+       postgres? ( >=dev-db/postgresql-8.4:= )
        python? ( dev-python/numpy )
        ruby? ( dev-lang/ruby:1.9 )
        sqlite? ( dev-db/sqlite:3 )