From 991b4fc847d76575f353ff0c9fb781f2e3c17320 Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Thu, 1 Sep 2016 23:46:11 +0200 Subject: [PATCH 01/15] app-backup/duplicati: updated to EAPI="6" Package-Manager: portage-2.2.28 --- app-backup/duplicati/ChangeLog | 4 ++++ app-backup/duplicati/Manifest | 6 +++--- app-backup/duplicati/duplicati-1.3.4.ebuild | 2 +- app-backup/duplicati/duplicati-2.0.1.11.20160408.ebuild | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/app-backup/duplicati/ChangeLog b/app-backup/duplicati/ChangeLog index 51a5086..9df6952 100644 --- a/app-backup/duplicati/ChangeLog +++ b/app-backup/duplicati/ChangeLog @@ -1,3 +1,7 @@ + 01 Sep 2016; Manuel Friedli duplicati-1.3.4.ebuild, + duplicati-2.0.1.11.20160408.ebuild: + app-backup/duplicati: updated to EAPI="6" + 12 Jul 2016; Manuel Friedli duplicati-2.0.1.11.20160408.ebuild: app-backup/duplicati: removed all keywords (~amd64) because 2.0 is an diff --git a/app-backup/duplicati/Manifest b/app-backup/duplicati/Manifest index c684af5..5bfd7f1 100644 --- a/app-backup/duplicati/Manifest +++ b/app-backup/duplicati/Manifest @@ -4,7 +4,7 @@ AUX duplicati-1.3.4-remove-unsigned-backends.patch 1899 SHA256 cc962d1b4243d7f8a AUX duplicati-2.0.1.11.20160408-fix-Makefile.patch 2878 SHA256 db4bf71fb7786a59bbcb6127b66661139bb31df7b84f687ac992b81417408570 SHA512 ccf534a46549786e79fd7f546f0857ecf8fffb6e8a8f47fb28ff4dff84b8a0db09bb6a03855af96f15b3dd1d1f0a8280a439d4b888a95b111de4a9c84085e8f2 WHIRLPOOL b1c3f21238c29bdc72c8eae741ef8fcc0b1a93ee7a1848cab997e76561bc6ae32c1cfc53791ebc4f36566fe87a8e46838fef7c409ab6f378d2e1b5eadba37743 DIST duplicati-1.3.4.tar.gz 11840281 SHA256 abae8876b536d4f1e63b07297ea0b26ad9a2026e46593be661d45f95d2348581 SHA512 e92c178715df0d6d5794720988ccb4342aaf9d6e92813316b7c9214364d7735eaeb178d2dc413a91acc3e7e7a1a4ba1821e8ef7989897a55add66f63adcbc7a5 WHIRLPOOL 3d1d70e44f662adb7e24324bc82bbfd1c9b8e6596136ffd69dec78cd60ecee908b604110e52ddc79104e071db97efc27bb30d45f78464043d11d1259b3672b6b DIST duplicati-2.0.1.11.20160408.tar.gz 17628969 SHA256 d5eb53ebee297ffee82a9b7fc921de10454a432ecb7910de19f271eb8750ba36 SHA512 0fdf1454f2b83eff551b801e4087d505de1247883c35e46a9d73f11371e6724ac0b3e42518bbfc8dcb64f24e13b6ace9d5b398e48f7c76e09d5467ca419b74cd WHIRLPOOL c2826eb67f4296d3d6326f6265076af00128d36841b092128872296a9bdcbcfc466d57b0ae5c8adf8a52c9ab7a3653e5016ace4868608c8672c38e7dbec0943d -EBUILD duplicati-1.3.4.ebuild 842 SHA256 0cbfd36674993d05c9b77009b4dc8d0ce70bc0e11ee822d41f303c18c6a5b839 SHA512 324bb5ee20ba2bee9708073945866fd411c1ee19299cb51b2bcbc27c3039aa2fe503a146a9708dc9d950cb7475d0858e3cd5084c08589663e1f4c6bdfa9678ca WHIRLPOOL 3e267834472843371a15004b19033e81639e68ee986a86aaaeb8dbf3eb92b622ceb6413dd8074097a4c154786eda97e626709c3a66ac39e67616e14323199fda -EBUILD duplicati-2.0.1.11.20160408.ebuild 911 SHA256 1222a9f981043da569b74b8b664a2a873e0cb982f1eab93e5517eeda222c46cb SHA512 4e2d375d6ef40290fe0ce00b0c72df23dd3054f6f398a3309f0b907e99f1072a68d639755e7c38138ee724c009b95237c86472ac778fff8d87960698f2781982 WHIRLPOOL cbd7d415ad86829ad2f29b8445c6eacd3a65d2ca7e12510e5ff1ab85bdfbd6bddfb9200c541b800746baa784d219b12468c1c8b7a63423fd8b04d530ce0f91be -MISC ChangeLog 556 SHA256 048a0591d674533eb5cdccbcff9e5aa7ae16a82674c56ceb4b11087bac321ec6 SHA512 1f8352757e8ce8d8333bdce1603b0d6de5008f502edd4b33d5d90d9a1aec4c8c78ad82aadea92f5b0b9a87fd893a670351bb7546c17dc0c7e6795fb1666a229c WHIRLPOOL 3b32e4f13950608eb739cba81583192b2bf390a78c9fc59eb1ee817f702c991cc45d6a8c47920f168c1c45c23324810865383de1a214d0ea4be406e1abba708a +EBUILD duplicati-1.3.4.ebuild 842 SHA256 4e9a545f81746ece8fc173019f7cc30e436f59baf60d0b6700e35c33b831903f SHA512 73826c640a19baaff3f6926c90e877e5e5edc8b6fe2111e2517378d75281f3ea3dd6d0642a3c08fd1f2e33da823f2454bbd9e10c76eea6104787b56a14c92ef6 WHIRLPOOL ce217710fba5d32586a1132bd8d433b308cb35051dc7884cc89e981ad25a7bf5084daa627fc5e97b965f11401b17b52472c50576686964ded5885f8d5e95c63d +EBUILD duplicati-2.0.1.11.20160408.ebuild 911 SHA256 fe05fe2bd5893379d4ad840e1d584867a2bc6f1f66ac3f367f2622c704ea5e71 SHA512 7f98f404b95d828275ff63fc120cd072857efb98d00a043f2354ad5191d670c4318d5a709a76a92ac1d82e2d7990ad758aa7dc42d673865cffda8bafcafa7621 WHIRLPOOL 96f37f6521198150102b659d24d5b47cf6d22b2eaa6e3b6e87ed7fd06a82b92963ea50bf4b5981be390cbe03cc511f9351d0187ab7500c26c4bbd13bd3b3c221 +MISC ChangeLog 715 SHA256 45e2de94bbf687381ff6046320c471f64276c2c3e58264efcee8bcc66e4c5b50 SHA512 b7832e90689e5481e66b73602ab5a5c00d7241c303f6cc514d1ee74eebb7c80eb38c36255026289659559ed3fc0e3fe7a37db7afbd1f12aef4b7c16c7a161d64 WHIRLPOOL 456e83a6094ebe51429c50acf9806b4e16b719127a8d3bc78f9048a8a1dbfb43e49fd76b45ae42d2bb0c5cca797c8358b55d4fb1660b484df1f897552915f473 MISC metadata.xml 248 SHA256 7b43be15755627edf5c12cf1b50c607d781558640bf8375d685d51d7ade99a32 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2 WHIRLPOOL 993013c9878ead35469db13d3072f694a341ee654182e0c31d0678f5dd6de4bdc8d59a0b7bb6d685dc41ea6b55dac518cd8034131baea8002170c680e50304d1 diff --git a/app-backup/duplicati/duplicati-1.3.4.ebuild b/app-backup/duplicati/duplicati-1.3.4.ebuild index 8ccb6c7..8386b2f 100644 --- a/app-backup/duplicati/duplicati-1.3.4.ebuild +++ b/app-backup/duplicati/duplicati-1.3.4.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" +EAPI="6" inherit eutils mono-env diff --git a/app-backup/duplicati/duplicati-2.0.1.11.20160408.ebuild b/app-backup/duplicati/duplicati-2.0.1.11.20160408.ebuild index 996f49b..327452c 100644 --- a/app-backup/duplicati/duplicati-2.0.1.11.20160408.ebuild +++ b/app-backup/duplicati/duplicati-2.0.1.11.20160408.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" +EAPI="6" inherit eutils mono-env From fb942b8389b39a433c2d3d7213f182bf69e12524 Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Thu, 1 Sep 2016 23:47:07 +0200 Subject: [PATCH 02/15] app-crypt/certbot-apache: updated to EAPI="6" Package-Manager: portage-2.2.28 --- app-crypt/certbot-apache/ChangeLog | 3 +++ app-crypt/certbot-apache/Manifest | 4 ++-- app-crypt/certbot-apache/certbot-apache-0.8.1.ebuild | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app-crypt/certbot-apache/ChangeLog b/app-crypt/certbot-apache/ChangeLog index 041b95d..675c543 100644 --- a/app-crypt/certbot-apache/ChangeLog +++ b/app-crypt/certbot-apache/ChangeLog @@ -1,3 +1,6 @@ + 01 Sep 2016; Manuel Friedli certbot-apache-0.8.1.ebuild: + app-crypt/certbot-apache: updated to EAPI="6" + *certbot-apache-0.8.1 (27 Jul 2016) 27 Jul 2016; Manuel Friedli +certbot-apache-0.8.1.ebuild, diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest index c2c926a..76d04ab 100644 --- a/app-crypt/certbot-apache/Manifest +++ b/app-crypt/certbot-apache/Manifest @@ -1,4 +1,4 @@ DIST certbot-apache-0.8.1.tar.gz 698305 SHA256 1fb4834eba306a656f26257f86ed298df354cdecb1b0bde316a9d23a1e19db01 SHA512 8b21d270b5ee847086369b956b3346fdddd50ab0e4490d988e7ca535f4d4101e2859e99bc5f77ac920afd3a6a9210e407b155c89c28d282dc0544735a27e3eaa WHIRLPOOL 909a3f6f63fac84bf6fe8fb35b9aba46c06912af01d5f702eee5b6aeab49d4f2a92fa05e4f060da11ac6cbc89047e92457f626d6c82aa0de0f1127ca79924fc7 -EBUILD certbot-apache-0.8.1.ebuild 1051 SHA256 ead789957c63cb1d0951bca583256109f5deb55c52b58a9b3772afceb5a0f64b SHA512 ca49a904ed44ec950bea4c3864cb7f8e8c61d5a3d74111fe5be5a3f478a5a9a4c4f9d2beb7d216dfb86dfd05020236bce7c4e0c9f81c52a68316b88e152b8bbf WHIRLPOOL 5f21a34c264de958564ee199a6b819211339a0280b22b1447005d72b5a8f1f538af729180b20dadf6c49ffa98e841e0b568f3cd85e26da66d5a7f4c27de98134 -MISC ChangeLog 293 SHA256 cca201ced8166ea196e6c310e023e761766598b37115d7a028767b8c8194aba9 SHA512 331873b058d7c06b0daf62426745da3c4cfd9c35680b9a74c2f46a358030e68d1adafd29d6ccfe3307e6fa64cbb52363236bc264c631e75a4e2dce1e88ca6f70 WHIRLPOOL 5f72209ce20589e582d5e6fcb846915c58d5a6589e92e34923549dafb2e09135b3afaac010d016fa10c6b8bdae1f4e5ba9a5a66b4759b0f949f1fb3b76d858cb +EBUILD certbot-apache-0.8.1.ebuild 1053 SHA256 d2c7775e21cd00f8fd54d98b2eaae7255129b789bf11d32d5e635f7946f937eb SHA512 b8139993cb87c29cc770f3ad805b774f8f55b857b8107368d3e61e5303a24a00860cb42121c944e23461b327b15bc73545218e6a11531e83b80b0ba3b55c33eb WHIRLPOOL 45e83df0a0218908a56dc6cd5ee39968e7b9294152ec8b0e978e76582b3c6fd3ea6c0b9ca20566ebf629f59466dc49621e0b751b466dc99089b8379533abb977 +MISC ChangeLog 423 SHA256 89d7085631bd6683ca7dce3e5f2720e750a90c5478d73751ed309b907be3c917 SHA512 f7dca2055667bdb30a5f3050a6aac5c9846d03ec07c50194bdd52cd403f1fafb28410e627856ea8d9aec76d13adc2c6ab8ef0d78a13504c8c5d5b759d88810dc WHIRLPOOL b91ee179ed46d140ded29095329499b7320ab70286bc7c1598c4ae54ff2b5240ebd7d08f7dff4ac98d3b300bb9795f2f92eab5e157066a875f23044777f82bc1 MISC metadata.xml 248 SHA256 7b43be15755627edf5c12cf1b50c607d781558640bf8375d685d51d7ade99a32 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2 WHIRLPOOL 993013c9878ead35469db13d3072f694a341ee654182e0c31d0678f5dd6de4bdc8d59a0b7bb6d685dc41ea6b55dac518cd8034131baea8002170c680e50304d1 diff --git a/app-crypt/certbot-apache/certbot-apache-0.8.1.ebuild b/app-crypt/certbot-apache/certbot-apache-0.8.1.ebuild index bbcf675..31026f0 100644 --- a/app-crypt/certbot-apache/certbot-apache-0.8.1.ebuild +++ b/app-crypt/certbot-apache/certbot-apache-0.8.1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI="6" PYTHON_COMPAT=(python2_7) MY_PN="certbot" From d1032198e9599be0f23ee78ef445f47ffee645d1 Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Thu, 1 Sep 2016 23:51:53 +0200 Subject: [PATCH 03/15] dev-java/nexus-oss-bin: updated to EAPI="6" and deleted old ebuilds Package-Manager: portage-2.2.28 --- dev-java/nexus-oss-bin/ChangeLog | 6 ++- dev-java/nexus-oss-bin/Manifest | 9 ++-- .../nexus-oss-bin/nexus-oss-bin-2.11.2.ebuild | 51 ------------------- .../nexus-oss-bin/nexus-oss-bin-2.11.4.ebuild | 4 +- .../nexus-oss-bin-3.0.0-r1.ebuild | 4 +- .../nexus-oss-bin/nexus-oss-bin-3.0.0.ebuild | 47 ----------------- 6 files changed, 12 insertions(+), 109 deletions(-) delete mode 100644 dev-java/nexus-oss-bin/nexus-oss-bin-2.11.2.ebuild delete mode 100644 dev-java/nexus-oss-bin/nexus-oss-bin-3.0.0.ebuild diff --git a/dev-java/nexus-oss-bin/ChangeLog b/dev-java/nexus-oss-bin/ChangeLog index dbf83c4..d9a3b85 100644 --- a/dev-java/nexus-oss-bin/ChangeLog +++ b/dev-java/nexus-oss-bin/ChangeLog @@ -1,3 +1,7 @@ + 01 Sep 2016; Manuel Friedli -nexus-oss-bin-2.11.2.ebuild, + -nexus-oss-bin-3.0.0.ebuild, nexus-oss-bin-2.11.4.ebuild, + nexus-oss-bin-3.0.0-r1.ebuild: + dev-java/nexus-oss-bin: updated to EAPI="6" and deleted old ebuilds + 07 Jun 2016; Manuel Friedli +ChangeLog: Added ChangeLog - diff --git a/dev-java/nexus-oss-bin/Manifest b/dev-java/nexus-oss-bin/Manifest index 3e0267e..3a0a51a 100644 --- a/dev-java/nexus-oss-bin/Manifest +++ b/dev-java/nexus-oss-bin/Manifest @@ -1,12 +1,9 @@ AUX init.sh 382 SHA256 fa0d82cbbe21b8e01195423a7cbd5e450504734df3a1cee7f1b58996682479b1 SHA512 b1bfc5c638b8827fecddf29ea07fb2252ce27ba3cd25a33e060a8c9104b1c61d1c786010f7647b3c2f941a7cc86e22c7e1456925cf011d1fd080299a3fc03e13 WHIRLPOOL 1bfb5712991f5a77d18f279e135e08de54a1545ee8749d47e9f7d1f2954c79efc313efeacd4273fdee91e42cd2c7fd2fe8de36e578cc7e092e32d5e6a94ed07f AUX nexus-wrapper-2.11.2.patch 1193 SHA256 f77229f2dddaae7205eec13188487ff73a663bbcd5d45b01201706044c1f18e0 SHA512 6f7230eeebe94e2cee426ffb3f1939c0a5e3b637002de7aef36608c4e95e399db1c9e28883f6e6a67cdff08804baa69efaae310871c3a9442508c72af556da6f WHIRLPOOL 2c3b48a30f4202177deb75d437a3aedc4ecf86870d4ab8e2ea79b5cb909a34630677f1fa006328554ea08807a88c1959fbf7e86ea49981dd1847687183d4ed70 AUX nexus-wrapper-2.11.4.patch 1193 SHA256 031a5caf1355ab11ec474a77ca2b972b441a61caabeca14ad409ab53f2743549 SHA512 c6f3f978a0b96bd696bb5e1a12f67eb81063e98e2552169597f3c944e0e6ea42c734f398712959936538ac5f9d5f5eb6c7f1fc3e43a489325e5f3a69a7543bd7 WHIRLPOOL eff81fa1037b105096e10a940d51b5288d559a2a66fa852987c2f3aa072957c7e81d60d173de26c6f9302efbe52c667c2bdcbd7e745fb590ceb208945dbde875 -DIST nexus-2.11.2-06-bundle.tar.gz 70793247 SHA256 e3fe7811d932ef449fafc4287a27fae62127154297d073f594ca5cba4721f59e SHA512 31b33afad7f31d33af78f9430c04c20ea6a9f4c7391c014493ecd0d02837f9eef99443012682ac0f463ae113b11fb2736078a36f25c1e69f510abc2c5c3a7f7d WHIRLPOOL c4ad2eb6bf1c78ae60de923e741e99bc85c61a68799f8329194648cc6669d0c6a411d0440620069637b480f7cd79ebbbba507a9ef846c678e218c81a084a37f1 DIST nexus-2.11.4-01-bundle.tar.gz 70938260 SHA256 2901d00c7a5c287d0ab51980b0ea8ad6a3db936e6a9bc7aea573ec4e2b516719 SHA512 6d44422cb87d9b229b21ed564a9275cc3cda38ecf32de1002909750b421787c196702a811eb9f6e15726662ea13614c9d2715a8f944c8a67d5e9162b1e4eae93 WHIRLPOOL a73c37b4126f72b6b83ff9d043da46b01bb41342c7bf28a53503dd44a4c22a2da6e8af33aeb7e7229ed5b01c873576b955d5a7b9c536ed79a050ce49b0c1aa3d DIST nexus-3.0.0-03-unix.tar.gz 79751162 SHA256 0666769effc200a520825cce22d59a5a296d03795f72f57d0a97fbe61836d0ca SHA512 e4f728097f0b7e1232538cca2077a20cbd3ed487d86d6360cfb947a9439c9eab82fb286acb1d167f909bb158ef5914d0752e9c26f02bcce60864b7a6cec0ebe7 WHIRLPOOL 2cddeb27ed44ffd844a2c724f2db33206a331eb7dd9ad3e3de42a23afc703bed0eb8c5b76e3363f7c71c4f5897ae49a07a9801aaf424ec44baeff5c2a1c1450c -EBUILD nexus-oss-bin-2.11.2.ebuild 1077 SHA256 a6764695b07366aaebb582698277df84897a958a5476222549da496e3997287b SHA512 5a312b18e201bd46cb26dd7de974b01c58d11cc15665d4c9e5192f915dbf41fcf7ebad5985198d9061825d1ea929c701586260493f708eeb996c2f255387dbdb WHIRLPOOL abd2162cd46c2e0ca09cdb048a5297eaa1600cdf77945405154e00fa517c26a70c89c7e67225c89b5c77bade9ed6ce5974fec9e2cff1eae3e1e058ee3cb9898c -EBUILD nexus-oss-bin-2.11.4.ebuild 1077 SHA256 960db2f4b017aeee080298e6bebc6bc599cfe5fa3fae1f4295392f422ad0fc70 SHA512 880a7762fdad21284c82b876cd862b61200b56ac8e0678c69dc7e2517166a5e29f8f2b280990f2c1e6600d8b08975643e9d363c7a4742067847e1e894957fcf4 WHIRLPOOL 35016da52fae3d885981475f592b444bda726c0e353ed2e506aa7deeb057a233d3eaabd8c1b78f54757dbfb4ed2c95060d664dc66e39d11978809c62d4fbf446 -EBUILD nexus-oss-bin-3.0.0-r1.ebuild 1064 SHA256 5e7efa5433c4ea05ee853236627401d860319db4bcfe173206c1aacf251a2480 SHA512 7901995f687f4e85d619694b9e46f4f8f823b8c0a0761541ab5d48dcecaee0aafceb2e420d918948b0dbf400a79934c18d4600940219edad27c27cc16a9b60ec WHIRLPOOL 1018b54df4bc340f80eaa0906953ee266aaf84830bc69363a196dd7cf1ee0ed802761ae33c3adcbd2f3516520e590921d0985b5d521b8425d6ca9b6b3357fa79 -EBUILD nexus-oss-bin-3.0.0.ebuild 918 SHA256 821a3da74ed4429b90058d1bf3f0a8071ad5fd3b2fcc7507fd0404b7e54a600f SHA512 ba2c052e08b4a7f22283ed527125e35c55af5d9811b3eac7af9090120951ebe9cf6b1c6d631c2b9c6eab6815cf2b893f67bb119b14a803fa2b3ba74cab148cba WHIRLPOOL 82320b9d5579aa6cb45f7077166227ce1496fe8d8d93ec410594fa96eba652275fcd5fa2a4cd5d07db9bcda5f7e9a5601535c674ad0fbd6ad6f94614bc2a2c7f -MISC ChangeLog 82 SHA256 12ed3543adc88564630b15553233b47b2bf04f4acc8f97eeb5c5befa2c16c75b SHA512 bf31a0cd9c7f4c2b560ef6cd2174e927933d1004c8fab2089e1d0d8c8d76f26f449f9babd33b72176038868259296cd4dda9db0b9cb175274e98fff888290703 WHIRLPOOL f7606de1e805cc293c25b9538e2fd7433ed4cd076bf7e047d7583e4e3886de1a365fe6b1e75bbcbd80f8d4da4a74ec3259d9914462a80ac75e9537dca5c9e52f +EBUILD nexus-oss-bin-2.11.4.ebuild 1077 SHA256 3a9ceb3bfd43e8d139772dfe4853df87dbe4f320ebd1054b74bf5e11ef08acd0 SHA512 0eeacbaac03324405600b535d7f8423df1cb97caf6e93208ef92100f96a5a3f64a643100afdf594b8393571ea38ca2701c7d8dca2aaf39a26659f31fbfb64aa5 WHIRLPOOL b77abf24921315c3352b34cb68f7c2bea85bfe19a58f96fafd6fb5cf1f1d849785d3cd22d71b43c0b6437135be8aeaa505f63b87805e3ffaf7bd4baf31217ba0 +EBUILD nexus-oss-bin-3.0.0-r1.ebuild 1064 SHA256 f758b9ed498e9cba66a9c1333747e2fd4c7023db7255a9e8c6354abc5b5b371b SHA512 df3db681ff7f674f0a8c12ee30276a45bb2ed916da61a4e239856f699d12ff877b15202285d75635e73c5e54940c02b46ef0e9e1b3673a0baa34d8a5789c7144 WHIRLPOOL 7ee43d30c66388dbd4f85fdad45a06e49a6979547c63dd0b6d7c6a63714b2563b23ca7432cd5d57c5c060f3ae970a4e4583012ecf17d5821fdca9f795956ec17 +MISC ChangeLog 327 SHA256 5736ef849559541410ff71744aa83d7c842fc2839cbb2712fce7b118ef42ca4b SHA512 986d2be534bbad96cce9e2a69456a1c227c23f92972ebdfbd539abeb7572cd086d9134073ea5b7abf9a2bb7bb996d6e3ade54c59a9b80c5710abf1087a693a32 WHIRLPOOL e9401bf48e474b1b283b0637a0bf33e4ab4a41d2a183192f150a3195eb68c8f28acb70f3ea2324321e9ef3619c13d68183c590baf3db01c07dda34e5b9674c4d MISC metadata.xml 234 SHA256 f35b97f99a26d73cc441e1d93bfe25aaa4e9f7f6d90c8d05a74f7b7bc5b68472 SHA512 59d8156b3ca3e99c40d5a2a32de7edf2eb53279b2424998862589d6bad77617d23fc852afec0a92f8ac5bb54a88ebc504cc0641029c1936412e90ab03dfdd447 WHIRLPOOL 935a1401910a42f888c991e443a49275ea8b87976c5aa977f670053d97d18754231749749bc92d37d4b5f45ecf65914480942a11b5827b6c08fb24313a428431 diff --git a/dev-java/nexus-oss-bin/nexus-oss-bin-2.11.2.ebuild b/dev-java/nexus-oss-bin/nexus-oss-bin-2.11.2.ebuild deleted file mode 100644 index 1d0792a..0000000 --- a/dev-java/nexus-oss-bin/nexus-oss-bin-2.11.2.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -inherit eutils user - -DESCRIPTION="Maven Repository Manager" -HOMEPAGE="http://nexus.sonatype.org/" -LICENSE="GPL-3" -SUB_VERSION="-06" -SRC_URI="http://download.sonatype.com/nexus/oss/nexus-${PV}${SUB_VERSION}-bundle.tar.gz" -RESTRICT="mirror" -KEYWORDS="~x86 ~amd64" -SLOT="0" -IUSE="" - -S="${WORKDIR}" - -RDEPEND=">=virtual/jdk-1.6" - -INSTALL_DIR="/opt/nexus" - -WEBAPP_DIR="${INSTALL_DIR}/nexus-oss-webapp" - -pkg_setup() { - enewgroup nexus - enewuser nexus -1 /bin/bash /opt/nexus "nexus" -} - -src_unpack() { - unpack ${A} - cd "${S}" -} - -src_prepare() { - epatch "${FILESDIR}/nexus-wrapper-${PV}.patch" -} - -src_install() { - insinto ${WEBAPP_DIR} - doins -r nexus-${PV}${SUB_VERSION}/* - - newinitd "${FILESDIR}/init.sh" nexus - - fowners -R nexus:nexus ${INSTALL_DIR} - fperms 755 "${INSTALL_DIR}/nexus-oss-webapp/bin/jsw/linux-x86-64/wrapper" - fperms 755 "${INSTALL_DIR}/nexus-oss-webapp/bin/jsw/linux-x86-32/wrapper" - fperms 755 "${INSTALL_DIR}/nexus-oss-webapp/bin/nexus" -} diff --git a/dev-java/nexus-oss-bin/nexus-oss-bin-2.11.4.ebuild b/dev-java/nexus-oss-bin/nexus-oss-bin-2.11.4.ebuild index ae4f99e..26852bc 100644 --- a/dev-java/nexus-oss-bin/nexus-oss-bin-2.11.4.ebuild +++ b/dev-java/nexus-oss-bin/nexus-oss-bin-2.11.4.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" +EAPI="6" inherit eutils user diff --git a/dev-java/nexus-oss-bin/nexus-oss-bin-3.0.0-r1.ebuild b/dev-java/nexus-oss-bin/nexus-oss-bin-3.0.0-r1.ebuild index 9c5b4d2..02f9e92 100644 --- a/dev-java/nexus-oss-bin/nexus-oss-bin-3.0.0-r1.ebuild +++ b/dev-java/nexus-oss-bin/nexus-oss-bin-3.0.0-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" +EAPI="6" inherit eutils user diff --git a/dev-java/nexus-oss-bin/nexus-oss-bin-3.0.0.ebuild b/dev-java/nexus-oss-bin/nexus-oss-bin-3.0.0.ebuild deleted file mode 100644 index 301f042..0000000 --- a/dev-java/nexus-oss-bin/nexus-oss-bin-3.0.0.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -inherit eutils user - -DESCRIPTION="Maven Repository Manager" -HOMEPAGE="http://nexus.sonatype.org/" -LICENSE="GPL-3" -MAJOR_VERSION="3" -SUB_VERSION="-03" -SRC_URI="http://download.sonatype.com/nexus/${MAJOR_VERSION}/nexus-${PV}${SUB_VERSION}-unix.tar.gz" -RESTRICT="mirror" -KEYWORDS="~x86 ~amd64" -SLOT="0" -IUSE="" - -S="${WORKDIR}" - -RDEPEND=">=virtual/jdk-1.8" - -INSTALL_DIR="/opt/nexus" - -WEBAPP_DIR="${INSTALL_DIR}/nexus-oss-webapp" - -pkg_setup() { - enewgroup nexus - enewuser nexus -1 /bin/bash /opt/nexus "nexus" -} - -src_unpack() { - unpack ${A} - cd "${S}" -} - -src_install() { - insinto ${WEBAPP_DIR} - doins -r nexus-${PV}${SUB_VERSION}/* - doins -r nexus-${PV}${SUB_VERSION}/.install4j - - newinitd "${FILESDIR}/init.sh" nexus - - fowners -R nexus:nexus ${INSTALL_DIR} - fperms 755 "${WEBAPP_DIR}/bin/nexus" -} From 3a79cd1c20def72da325e2abaaba358aefff66fe Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Fri, 2 Sep 2016 00:05:03 +0200 Subject: [PATCH 04/15] removed dev-php/pecl-geoip, as version 1.1.0-r1 in the official tree obsoletes it Package-Manager: portage-2.2.28 --- dev-php/pecl-geoip/ChangeLog | 5 - dev-php/pecl-geoip/Manifest | 7 - ...eoip-1.1.0.9999-patch-to-svn-r337409.patch | 526 ------- .../pecl-geoip-1.1.0.99999-php7-ipv6.patch | 1313 ----------------- dev-php/pecl-geoip/metadata.xml | 8 - .../pecl-geoip/pecl-geoip-1.1.0.9999.ebuild | 43 - .../pecl-geoip/pecl-geoip-1.1.0.99999.ebuild | 43 - 7 files changed, 1945 deletions(-) delete mode 100644 dev-php/pecl-geoip/ChangeLog delete mode 100644 dev-php/pecl-geoip/Manifest delete mode 100644 dev-php/pecl-geoip/files/pecl-geoip-1.1.0.9999-patch-to-svn-r337409.patch delete mode 100644 dev-php/pecl-geoip/files/pecl-geoip-1.1.0.99999-php7-ipv6.patch delete mode 100644 dev-php/pecl-geoip/metadata.xml delete mode 100644 dev-php/pecl-geoip/pecl-geoip-1.1.0.9999.ebuild delete mode 100644 dev-php/pecl-geoip/pecl-geoip-1.1.0.99999.ebuild diff --git a/dev-php/pecl-geoip/ChangeLog b/dev-php/pecl-geoip/ChangeLog deleted file mode 100644 index 26a83fc..0000000 --- a/dev-php/pecl-geoip/ChangeLog +++ /dev/null @@ -1,5 +0,0 @@ - 07 Jun 2016; - files/pecl-geoip-1.1.0.9999-patch-to-svn-r337409.patch, - pecl-geoip-1.1.0.9999.ebuild: - Added ebuild for pecl-geoip that sould be compatible with PHP 7 - diff --git a/dev-php/pecl-geoip/Manifest b/dev-php/pecl-geoip/Manifest deleted file mode 100644 index 1b1650a..0000000 --- a/dev-php/pecl-geoip/Manifest +++ /dev/null @@ -1,7 +0,0 @@ -AUX pecl-geoip-1.1.0.9999-patch-to-svn-r337409.patch 13475 SHA256 2a14d4bb09c1ded394ee588f37f8a1959262abcd2679cac84acf2d6638ff5924 SHA512 c37dd0b41df0fbf55a91575bbc6cbb1da92bef4d47e8e660c4e715fc0d424e53a7d2657c996878faedf03a5d92b4ff0b5d466097e22f525818c93483ac158c99 WHIRLPOOL 4f9f117f154ce73702ad92056b880189777494eee414455afe126d03135f8efbb3bc5aedadda5874536302896488e77642f9084930e4c9407426a8e82f27301f -AUX pecl-geoip-1.1.0.99999-php7-ipv6.patch 44038 SHA256 3f44b2906a4498956df255fa5e28182f2d51fd8a939055c80b09044ab3ae5acd SHA512 2bf81a40810b94f76e2d633c184bbdeda80ed92ce3ac119773d20f143b4c7b38db4f7c914edc2dca64534751b6e48d3a48fc4adc2c6c7d56ff9456d0a8805290 WHIRLPOOL 87c7f14a12839dc7a30f6ebbd2983d77959f4efdf3a4da885375f50d328e4308a341ba3f15577b1a8e19784f79bb3ad0ed2bdc23d581a7517cc3d33b0aef4350 -DIST geoip-1.1.0.tgz 12714 SHA256 82c6deb7264d2ff7c4d6c45a7d27cff7ab097be965795e317e04a9c5b7be98b9 SHA512 8a0fc698a234d3b2c01f2a0c05c28025d98a5d3dce509ba19ee462abae0fd0f5631d96d3e8bba4fce6c23b278ec3875da5e8535971c7d880e2e307a097dc30a1 WHIRLPOOL f8ccf90958bdc0eee41f24b6ad04907884fed2efe2bca483fa816aceb46d15311325175b07f27d85085afdb5651fd071fd20b046ba42e30da26eea56a14912d6 -EBUILD pecl-geoip-1.1.0.9999.ebuild 780 SHA256 2de773c29101b273afde935b70c1bb1e3a22c2409eca8646b2df2f7de0f66d61 SHA512 a579d0f7a36a84011dcc3d0d724776a3214c2309bb71c325ad39a5d6aa35246220cf0089e2e97c37eaee07e8166b3080386ecffc459c5e539e60d6abc9029af4 WHIRLPOOL a8c1882617a99917ce4dc789d23dc78ee854eaa93b8cb4843e8d25c52851e896ae6ea9689b199c83b27efbbe4ceef880015f1de67e1a1aa9e2edb3e410853137 -EBUILD pecl-geoip-1.1.0.99999.ebuild 769 SHA256 b3eb9f10dbc12d182b5fba52eb9fde1dc23faa6c120c0202f3518112518da68d SHA512 b526f49b5bb9cca3df9a3c79aa44ca298e0abda19e254fccada71ec10ed2a482d3de618f6b67a68bda2b40e8fdc618e8c98b1684aabcc736a4307e47dc2d954d WHIRLPOOL 388499eec48987aa37997e160f6a827151c218560f579594b69aa7b2d14c0594e5e9f1ff5bc02db3e2369ed815770aaea3e6f62a44baa228b3e2a28d898acce2 -MISC ChangeLog 194 SHA256 ef807fc2efd88937acdbe810cf875fa658dfe2d3771332f46c20f03ce5b9c491 SHA512 334862d9aee9d514a2d3885df39a047fc6fafb140bf02df5f80cb658a736543d8c2f1ac7845d373403d98d3ee4bf90202c7a8d88dc569ba365f291f08b4a3c38 WHIRLPOOL a82649d1024ce77054e4a7326948377aaf4769ff5c4fb3232e519447eca04809479902a2f94f4313f650bfe0b7301f434aa59bd44b36d70e0f1c7865671b9e1e -MISC metadata.xml 234 SHA256 f35b97f99a26d73cc441e1d93bfe25aaa4e9f7f6d90c8d05a74f7b7bc5b68472 SHA512 59d8156b3ca3e99c40d5a2a32de7edf2eb53279b2424998862589d6bad77617d23fc852afec0a92f8ac5bb54a88ebc504cc0641029c1936412e90ab03dfdd447 WHIRLPOOL 935a1401910a42f888c991e443a49275ea8b87976c5aa977f670053d97d18754231749749bc92d37d4b5f45ecf65914480942a11b5827b6c08fb24313a428431 diff --git a/dev-php/pecl-geoip/files/pecl-geoip-1.1.0.9999-patch-to-svn-r337409.patch b/dev-php/pecl-geoip/files/pecl-geoip-1.1.0.9999-patch-to-svn-r337409.patch deleted file mode 100644 index 420165a..0000000 --- a/dev-php/pecl-geoip/files/pecl-geoip-1.1.0.9999-patch-to-svn-r337409.patch +++ /dev/null @@ -1,526 +0,0 @@ -Index: trunk/geoip.def -=================================================================== ---- trunk/geoip.def (revision 333461) -+++ trunk/geoip.def (revision 337409) -@@ -21,7 +21,7 @@ - GEOIPDEF(geoip_country_code3_by_name, GeoIP_country_code3_by_name, GEOIP_COUNTRY_EDITION) - GEOIPDEF(geoip_country_name_by_name, GeoIP_country_name_by_name, GEOIP_COUNTRY_EDITION) - --#if LIBGEOIP_VERSION >= 1004005 && FALSE -+#if LIBGEOIP_VERSION >= 1004005 - GEOIPDEF(geoip_country_code_by_name_v6, GeoIP_country_code_by_name_v6, GEOIP_COUNTRY_EDITION_V6) - GEOIPDEF(geoip_country_code3_by_name_v6, GeoIP_country_code3_by_name_v6, GEOIP_COUNTRY_EDITION_V6) - GEOIPDEF(geoip_country_name_by_name_v6, GeoIP_country_name_by_name_v6, GEOIP_COUNTRY_EDITION_V6) -Index: trunk/php_geoip.h -=================================================================== ---- trunk/php_geoip.h (revision 333461) -+++ trunk/php_geoip.h (revision 337409) -@@ -24,8 +24,12 @@ - extern zend_module_entry geoip_module_entry; - #define phpext_geoip_ptr &geoip_module_entry - --#define PHP_GEOIP_VERSION "1.1.0" -+#define PHP_GEOIP_VERSION "1.1.1-dev" - -+#if PHP_MAJOR_VERSION < 7 -+typedef long zend_long; -+#endif -+ - #ifdef PHP_WIN32 - #define PHP_GEOIP_API __declspec(dllexport) - #else -Index: trunk/config.m4 -=================================================================== ---- trunk/config.m4 (revision 333461) -+++ trunk/config.m4 (revision 337409) -@@ -43,7 +43,7 @@ - - PHP_CHECK_LIBRARY($LIBNAME,$LIBSYMBOL, - [ -- PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $GEOIP_DIR/lib, GEOIP_SHARED_LIBADD) -+ PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $GEOIP_DIR/$PHP_LIBDIR, GEOIP_SHARED_LIBADD) - AC_DEFINE(HAVE_GEOIPLIB,1,[ ]) - ],[ - AC_MSG_ERROR([wrong geoip lib version or lib not found]) -@@ -95,8 +95,7 @@ - AC_CHECK_DECL(GEOIP_NETSPEED_EDITION_REV1, - [ - MIN_GEOIP_VERSION=1004008 -- ],[ -- ],[ -+ ],[],[ - #include - ]) - -@@ -104,8 +103,7 @@ - AC_CHECK_DECL(GEOIP_ACCURACYRADIUS_EDITION, - [ - MIN_GEOIP_VERSION=1005000 -- ],[ -- ],[ -+ ],[],[ - #include - ]) - -Index: trunk/geoip.c -=================================================================== ---- trunk/geoip.c (revision 333461) -+++ trunk/geoip.c (revision 337409) -@@ -117,7 +117,7 @@ - #endif - - GeoIP_setup_custom_directory(value); -- _GeoIP_setup_dbfilename(); -+ GeoIP_db_avail(GEOIP_COUNTRY_EDITION); - } - /* }}} */ - #endif -@@ -129,11 +129,19 @@ - { - if (stage == PHP_INI_STAGE_RUNTIME || stage == PHP_INI_STAGE_HTACCESS) { - GEOIP_G(set_runtime_custom_directory) = 1; -+#if PHP_MAJOR_VERSION >= 7 -+ geoip_change_custom_directory(new_value->val); -+#else - geoip_change_custom_directory(new_value); -+#endif - return SUCCESS; - } - -+#if PHP_MAJOR_VERSION >= 7 -+ return OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC); -+#else - return OnUpdateString(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC); -+#endif - } - /* }}} */ - #endif -@@ -168,7 +176,8 @@ - #ifdef HAVE_CUSTOM_DIRECTORY - GeoIP_setup_custom_directory(GEOIP_G(custom_directory)); - #endif -- _GeoIP_setup_dbfilename(); -+ /* This will initialize file structure */ -+ GeoIP_db_avail(GEOIP_COUNTRY_EDITION); - - /* For database type constants */ - REGISTER_LONG_CONSTANT("GEOIP_COUNTRY_EDITION", GEOIP_COUNTRY_EDITION, CONST_CS | CONST_PERSISTENT); -@@ -250,7 +259,7 @@ - /* {{{ proto boolean geoip_db_avail( [ int database ] ) */ - PHP_FUNCTION(geoip_db_avail) - { -- long edition; -+ zend_long edition; - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &edition) == FAILURE) { - return; -@@ -269,7 +278,7 @@ - /* {{{ proto string geoip_db_filename( [ int database ] ) */ - PHP_FUNCTION(geoip_db_filename) - { -- long edition; -+ zend_long edition; - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &edition) == FAILURE) { - return; -@@ -282,7 +291,11 @@ - } - - if (NULL != GeoIPDBFileName[edition]) -+#if PHP_MAJOR_VERSION >= 7 -+ RETURN_STRING(GeoIPDBFileName[edition]); -+#else - RETURN_STRING(GeoIPDBFileName[edition], 1); -+#endif - } - /* }}} */ - -@@ -297,16 +310,31 @@ - { - if (NULL != GeoIPDBDescription[i]) - { -+#if PHP_MAJOR_VERSION >= 7 -+ zval real_row; -+ zval *row = &real_row; -+ -+ array_init(row); -+#else - zval *row; - ALLOC_INIT_ZVAL(row); - array_init(row); -+#endif - - add_assoc_bool(row, "available", GeoIP_db_avail(i)); - if (GeoIPDBDescription[i]) { -+#if PHP_MAJOR_VERSION >= 7 -+ add_assoc_string(row, "description", (char *)GeoIPDBDescription[i]); -+#else - add_assoc_string(row, "description", (char *)GeoIPDBDescription[i], 1); -+#endif - } - if (GeoIPDBFileName[i]) { -+#if PHP_MAJOR_VERSION >= 7 -+ add_assoc_string(row, "filename", GeoIPDBFileName[i]); -+#else - add_assoc_string(row, "filename", GeoIPDBFileName[i], 1); -+#endif - } - - add_index_zval(return_value, i, row); -@@ -321,7 +349,7 @@ - { - GeoIP * gi; - char * db_info; -- long edition = GEOIP_COUNTRY_EDITION; -+ zend_long edition = GEOIP_COUNTRY_EDITION; - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &edition) == FAILURE) { - return; -@@ -346,12 +374,17 @@ - db_info = GeoIP_database_info(gi); - GeoIP_delete(gi); - -+#if PHP_MAJOR_VERSION >= 7 -+ RETVAL_STRING(db_info); -+#else - RETVAL_STRING(db_info, 1); -+#endif - free(db_info); - } - /* }}} */ - - /* {{{ */ -+#if PHP_MAJOR_VERSION >= 7 - #define GEOIPDEF(php_func, c_func, db_type) \ - PHP_FUNCTION(php_func) \ - { \ -@@ -358,6 +391,34 @@ - GeoIP * gi; \ - char * hostname = NULL; \ - const char * return_code; \ -+ size_t arglen; \ -+ \ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &hostname, &arglen) == FAILURE) { \ -+ return; \ -+ } \ -+ \ -+ if (GeoIP_db_avail(db_type)) { \ -+ gi = GeoIP_open_type(db_type, GEOIP_STANDARD); \ -+ } else { \ -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Required database not available at %s.", GeoIPDBFileName[db_type]); \ -+ return; \ -+ } \ -+ \ -+ return_code = c_func(gi, hostname); \ -+ GeoIP_delete(gi); \ -+ if (return_code == NULL) { \ -+ RETURN_FALSE; \ -+ } \ -+ RETURN_STRING((char*)return_code); \ -+ \ -+ } -+#else -+#define GEOIPDEF(php_func, c_func, db_type) \ -+ PHP_FUNCTION(php_func) \ -+ { \ -+ GeoIP * gi; \ -+ char * hostname = NULL; \ -+ const char * return_code; \ - int arglen; \ - \ - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &hostname, &arglen) == FAILURE) { \ -@@ -379,6 +440,7 @@ - RETURN_STRING((char*)return_code, 1); \ - \ - } -+#endif - #include "geoip.def" - #undef GEOIPDEF - /* }}} */ -@@ -390,7 +452,11 @@ - GeoIP * gi; - char * hostname = NULL; - int id; -+#if PHP_MAJOR_VERSION >= 7 -+ size_t arglen; -+#else - int arglen; -+#endif - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &hostname, &arglen) == FAILURE) { - return; -@@ -408,7 +474,11 @@ - if (id == 0) { - RETURN_FALSE; - } -+#if PHP_MAJOR_VERSION >= 7 -+ RETURN_STRING((char *)GeoIP_country_continent[id]); -+#else - RETURN_STRING((char *)GeoIP_country_continent[id], 1); -+#endif - } - /* }}} */ - -@@ -419,7 +489,11 @@ - GeoIP * gi; - char * hostname = NULL; - char * org; -+#if PHP_MAJOR_VERSION >= 7 -+ size_t arglen; -+#else - int arglen; -+#endif - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &hostname, &arglen) == FAILURE) { - return; -@@ -437,7 +511,11 @@ - if (org == NULL) { - RETURN_FALSE; - } -+#if PHP_MAJOR_VERSION >= 7 -+ RETVAL_STRING(org); -+#else - RETVAL_STRING(org, 1); -+#endif - free(org); - } - /* }}} */ -@@ -449,7 +527,11 @@ - GeoIP * gi; - char * hostname = NULL; - char * org; -+#if PHP_MAJOR_VERSION >= 7 -+ size_t arglen; -+#else - int arglen; -+#endif - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &hostname, &arglen) == FAILURE) { - return; -@@ -467,7 +549,11 @@ - if (org == NULL) { - RETURN_FALSE; - } -+#if PHP_MAJOR_VERSION >= 7 -+ RETVAL_STRING(org); -+#else - RETVAL_STRING(org, 1); -+#endif - free(org); - } - /* }}} */ -@@ -479,7 +565,11 @@ - GeoIP * gi; - char * hostname = NULL; - char * org; -+#if PHP_MAJOR_VERSION >= 7 -+ size_t arglen; -+#else - int arglen; -+#endif - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &hostname, &arglen) == FAILURE) { - return; -@@ -497,7 +587,11 @@ - if (org == NULL) { - RETURN_FALSE; - } -+#if PHP_MAJOR_VERSION >= 7 -+ RETVAL_STRING(org); -+#else - RETVAL_STRING(org, 1); -+#endif - free(org); - } - /* }}} */ -@@ -510,7 +604,11 @@ - GeoIP * gi; - char * hostname = NULL; - char * org; -+#if PHP_MAJOR_VERSION >= 7 -+ size_t arglen; -+#else - int arglen; -+#endif - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &hostname, &arglen) == FAILURE) { - return; -@@ -528,7 +626,11 @@ - if (org == NULL) { - RETURN_FALSE; - } -+#if PHP_MAJOR_VERSION >= 7 -+ RETVAL_STRING(org); -+#else - RETVAL_STRING(org, 1); -+#endif - free(org); - } - /* }}} */ -@@ -540,7 +642,11 @@ - { - GeoIP * gi; - char * hostname = NULL; -+#if PHP_MAJOR_VERSION >= 7 -+ size_t arglen; -+#else - int arglen; -+#endif - GeoIPRecord * gir; - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &hostname, &arglen) == FAILURE) { -@@ -566,9 +672,20 @@ - } - - array_init(return_value); --#if LIBGEOIP_VERSION >= 1004003 -+#if PHP_MAJOR_VERSION >= 7 -+# if LIBGEOIP_VERSION >= 1004003 -+ add_assoc_string(return_value, "continent_code", (gir->continent_code == NULL) ? "" : gir->continent_code); -+# endif -+ add_assoc_string(return_value, "country_code", (gir->country_code == NULL) ? "" : gir->country_code); -+ add_assoc_string(return_value, "country_code3", (gir->country_code3 == NULL) ? "" : gir->country_code3); -+ add_assoc_string(return_value, "country_name", (gir->country_name == NULL) ? "" : gir->country_name); -+ add_assoc_string(return_value, "region", (gir->region == NULL) ? "" : gir->region); -+ add_assoc_string(return_value, "city", (gir->city == NULL) ? "" : gir->city); -+ add_assoc_string(return_value, "postal_code", (gir->postal_code == NULL) ? "" : gir->postal_code); -+#else -+# if LIBGEOIP_VERSION >= 1004003 - add_assoc_string(return_value, "continent_code", (gir->continent_code == NULL) ? "" : gir->continent_code, 1); --#endif -+# endif - add_assoc_string(return_value, "country_code", (gir->country_code == NULL) ? "" : gir->country_code, 1); - add_assoc_string(return_value, "country_code3", (gir->country_code3 == NULL) ? "" : gir->country_code3, 1); - add_assoc_string(return_value, "country_name", (gir->country_name == NULL) ? "" : gir->country_name, 1); -@@ -575,6 +692,7 @@ - add_assoc_string(return_value, "region", (gir->region == NULL) ? "" : gir->region, 1); - add_assoc_string(return_value, "city", (gir->city == NULL) ? "" : gir->city, 1); - add_assoc_string(return_value, "postal_code", (gir->postal_code == NULL) ? "" : gir->postal_code, 1); -+#endif - add_assoc_double(return_value, "latitude", gir->latitude); - add_assoc_double(return_value, "longitude", gir->longitude); - #if LIBGEOIP_VERSION >= 1004005 -@@ -594,7 +712,11 @@ - { - GeoIP * gi; - char * hostname = NULL; -+#if PHP_MAJOR_VERSION >= 7 -+ size_t arglen; -+#else - int arglen; -+#endif - int netspeed; - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &hostname, &arglen) == FAILURE) { -@@ -620,7 +742,11 @@ - { - GeoIP * gi; - char * hostname = NULL; -+#if PHP_MAJOR_VERSION >= 7 -+ size_t arglen; -+#else - int arglen; -+#endif - GeoIPRegion * region; - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &hostname, &arglen) == FAILURE) { -@@ -646,9 +772,14 @@ - } - - array_init(return_value); -+#if PHP_MAJOR_VERSION >= 7 -+ add_assoc_string(return_value, "country_code", region->country_code); -+ add_assoc_string(return_value, "region", region->region); -+#else - add_assoc_string(return_value, "country_code", region->country_code, 1); - add_assoc_string(return_value, "region", region->region, 1); -- -+#endif -+ - GeoIPRegion_delete(region); - } - /* }}} */ -@@ -660,7 +791,11 @@ - GeoIP * gi; - char * hostname = NULL; - char * isp; -+#if PHP_MAJOR_VERSION >= 7 -+ size_t arglen; -+#else - int arglen; -+#endif - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &hostname, &arglen) == FAILURE) { - return; -@@ -678,7 +813,11 @@ - if (isp == NULL) { - RETURN_FALSE; - } -+#if PHP_MAJOR_VERSION >= 7 -+ RETVAL_STRING(isp); -+#else - RETVAL_STRING(isp, 1); -+#endif - free(isp); - } - -@@ -690,7 +829,11 @@ - char * country_code = NULL; - char * region_code = NULL; - const char * region_name; -+#if PHP_MAJOR_VERSION >= 7 -+ size_t countrylen, regionlen; -+#else - int countrylen, regionlen; -+#endif - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &country_code, &countrylen, ®ion_code, ®ionlen) == FAILURE) { - return; -@@ -705,7 +848,11 @@ - if (region_name == NULL) { - RETURN_FALSE; - } -+#if PHP_MAJOR_VERSION >= 7 -+ RETURN_STRING((char*)region_name); -+#else - RETURN_STRING((char*)region_name, 1); -+#endif - } - /* }}} */ - #endif -@@ -718,7 +865,11 @@ - char * country = NULL; - char * region = NULL; - const char * timezone; -+#if PHP_MAJOR_VERSION >= 7 -+ size_t countrylen, arg2len; -+#else - int countrylen, arg2len; -+#endif - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|s", &country, &countrylen, ®ion, &arg2len) == FAILURE) { - return; -@@ -733,7 +884,11 @@ - if (timezone == NULL) { - RETURN_FALSE; - } -+#if PHP_MAJOR_VERSION >= 7 -+ RETURN_STRING((char*)timezone); -+#else - RETURN_STRING((char*)timezone, 1); -+#endif - } - /* }}} */ - #endif -@@ -744,7 +899,11 @@ - PHP_FUNCTION(geoip_setup_custom_directory) - { - char * dir = NULL; -+#if PHP_MAJOR_VERSION >= 7 -+ size_t dirlen; -+#else - int dirlen; -+#endif - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &dir, &dirlen) == FAILURE) { - return; diff --git a/dev-php/pecl-geoip/files/pecl-geoip-1.1.0.99999-php7-ipv6.patch b/dev-php/pecl-geoip/files/pecl-geoip-1.1.0.99999-php7-ipv6.patch deleted file mode 100644 index 48ad9f1..0000000 --- a/dev-php/pecl-geoip/files/pecl-geoip-1.1.0.99999-php7-ipv6.patch +++ /dev/null @@ -1,1313 +0,0 @@ -diff --git config.m4 config.m4 -index 16ed467..fd75707 100644 ---- config.m4 -+++ config.m4 -@@ -43,7 +43,7 @@ if test "$PHP_GEOIP" != "no"; then - - PHP_CHECK_LIBRARY($LIBNAME,$LIBSYMBOL, - [ -- PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $GEOIP_DIR/lib, GEOIP_SHARED_LIBADD) -+ PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $GEOIP_DIR/$PHP_LIBDIR, GEOIP_SHARED_LIBADD) - AC_DEFINE(HAVE_GEOIPLIB,1,[ ]) - ],[ - AC_MSG_ERROR([wrong geoip lib version or lib not found]) -@@ -95,8 +95,7 @@ if test "$PHP_GEOIP" != "no"; then - AC_CHECK_DECL(GEOIP_NETSPEED_EDITION_REV1, - [ - MIN_GEOIP_VERSION=1004008 -- ],[ -- ],[ -+ ],[],[ - #include - ]) - -@@ -104,8 +103,7 @@ if test "$PHP_GEOIP" != "no"; then - AC_CHECK_DECL(GEOIP_ACCURACYRADIUS_EDITION, - [ - MIN_GEOIP_VERSION=1005000 -- ],[ -- ],[ -+ ],[],[ - #include - ]) - -diff --git geoip.c geoip.c -index d7f0165..0615b34 100644 ---- geoip.c -+++ geoip.c -@@ -12,13 +12,13 @@ - | obtain it through the world-wide-web, please send a note to | - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ -- | Author: Olivier Hill | -+ | Author: Olivier Hill | - | Matthew Fonda | -+ | Adam Saponara | - +----------------------------------------------------------------------+ - Please contact support@maxmind.com with any comments - */ - -- - #ifdef HAVE_CONFIG_H - #include "config.h" - #endif -@@ -34,39 +34,50 @@ - #include "ext/standard/info.h" - #include "php_geoip.h" - -- -- - ZEND_DECLARE_MODULE_GLOBALS(geoip) - - static int le_geoip; - - /* {{{ */ - zend_function_entry geoip_functions[] = { -- PHP_FE(geoip_database_info, NULL) --#define GEOIPDEF(php_func, c_func, db_type) \ -- PHP_FE(php_func, NULL) --#include "geoip.def" --#undef GEOIPDEF -- PHP_FE(geoip_continent_code_by_name, NULL) -- PHP_FE(geoip_org_by_name, NULL) -- PHP_FE(geoip_record_by_name, NULL) -- PHP_FE(geoip_id_by_name, NULL) -- PHP_FE(geoip_region_by_name, NULL) -- PHP_FE(geoip_isp_by_name, NULL) -- PHP_FE(geoip_db_avail, NULL) -- PHP_FE(geoip_db_get_all_info, NULL) -- PHP_FE(geoip_db_filename, NULL) -+ PHP_FE(geoip_country_code_by_name, NULL) -+ PHP_FE(geoip_country_code3_by_name, NULL) -+ PHP_FE(geoip_country_name_by_name, NULL) -+ PHP_FE(geoip_asnum_by_name, NULL) -+ PHP_FE(geoip_domain_by_name, NULL) -+ PHP_FE(geoip_isp_by_name, NULL) -+ PHP_FE(geoip_org_by_name, NULL) -+ PHP_FE(geoip_region_by_name, NULL) -+ PHP_FE(geoip_record_by_name, NULL) -+ PHP_FE(geoip_id_by_name, NULL) -+ PHP_FE(geoip_continent_code_by_name, NULL) -+#if LIBGEOIP_VERSION >= 1004005 -+ PHP_FE(geoip_country_code_by_name_v6, NULL) -+ PHP_FE(geoip_country_code3_by_name_v6, NULL) -+ PHP_FE(geoip_country_name_by_name_v6, NULL) -+ PHP_FE(geoip_asnum_by_name_v6, NULL) -+ PHP_FE(geoip_domain_by_name_v6, NULL) -+ PHP_FE(geoip_isp_by_name_v6, NULL) -+ PHP_FE(geoip_org_by_name_v6, NULL) -+ PHP_FE(geoip_region_by_name_v6, NULL) -+ PHP_FE(geoip_record_by_name_v6, NULL) -+ PHP_FE(geoip_id_by_name_v6, NULL) -+ PHP_FE(geoip_continent_code_by_name_v6, NULL) -+#endif -+ PHP_FE(geoip_db_avail, NULL) -+ PHP_FE(geoip_db_filename, NULL) -+ PHP_FE(geoip_db_get_all_info, NULL) -+ PHP_FE(geoip_database_info, NULL) - #if LIBGEOIP_VERSION >= 1004001 -- PHP_FE(geoip_region_name_by_code, NULL) -- PHP_FE(geoip_time_zone_by_country_and_region, NULL) -+ PHP_FE(geoip_region_name_by_code, NULL) -+ PHP_FE(geoip_time_zone_by_country_and_region, NULL) - #endif - #ifdef HAVE_CUSTOM_DIRECTORY -- PHP_FE(geoip_setup_custom_directory, NULL) -+ PHP_FE(geoip_setup_custom_directory, NULL) - #endif -- PHP_FE(geoip_asnum_by_name, NULL) -- PHP_FE(geoip_domain_by_name, NULL) - #if LIBGEOIP_VERSION >= 1004008 - PHP_FE(geoip_netspeedcell_by_name, NULL) -+ PHP_FE(geoip_netspeedcell_by_name_v6, NULL) - #endif - {NULL, NULL, NULL} - }; -@@ -81,9 +92,9 @@ zend_module_entry geoip_module_entry = { - "geoip", - geoip_functions, - PHP_MINIT(geoip), -- PHP_MSHUTDOWN(geoip), -- PHP_RINIT(geoip), -- PHP_RSHUTDOWN(geoip), -+ NULL, -+ NULL, -+ PHP_RSHUTDOWN(geoip), - PHP_MINFO(geoip), - #if ZEND_MODULE_API_NO >= 20010901 - PHP_GEOIP_VERSION, /* version number of the extension */ -@@ -96,11 +107,21 @@ zend_module_entry geoip_module_entry = { - ZEND_GET_MODULE(geoip) - #endif - -+#if PHP_MAJOR_VERSION >= 7 -+#define strlen_compat_t size_t -+#define add_assoc_string_compat(zval, key, val, dup) add_assoc_string(zval, key, val) -+#define RETURN_STRING_COMPAT(str, dup) RETURN_STRING(str) -+#define RETVAL_STRING_COMPAT(str, dup) RETVAL_STRING(str) -+#else -+#define strlen_compat_t int -+#define add_assoc_string_compat(zval, key, val, dup) add_assoc_string(zval, key, val, dup) -+#define RETURN_STRING_COMPAT(str, dup) RETURN_STRING(str, dup) -+#define RETVAL_STRING_COMPAT(str, dup) RETVAL_STRING(str, dup) -+#endif -+ - #ifdef HAVE_CUSTOM_DIRECTORY --/* {{{ geoip_change_custom_directory() helper function -- */ --static void geoip_change_custom_directory(char *value) --{ -+/* {{{ geoip_change_custom_directory() helper function */ -+static void geoip_change_custom_directory(char *value) { - #if LIBGEOIP_VERSION >= 1004007 - GeoIP_cleanup(); - #else -@@ -115,7 +136,6 @@ static void geoip_change_custom_directory(char *value) - GeoIPDBFileName = NULL; - } - #endif -- - GeoIP_setup_custom_directory(value); - _GeoIP_setup_dbfilename(); - } -@@ -123,23 +143,28 @@ static void geoip_change_custom_directory(char *value) - #endif - - #ifdef HAVE_CUSTOM_DIRECTORY --/* {{{ PHP_INI_MH --+ */ --static PHP_INI_MH(OnUpdateDirectory) --{ -+/* {{{ PHP_INI_MH */ -+static PHP_INI_MH(OnUpdateDirectory) { - if (stage == PHP_INI_STAGE_RUNTIME || stage == PHP_INI_STAGE_HTACCESS) { - GEOIP_G(set_runtime_custom_directory) = 1; -+#if PHP_MAJOR_VERSION >= 7 -+ geoip_change_custom_directory(new_value->val); -+#else - geoip_change_custom_directory(new_value); -+#endif - return SUCCESS; - } -- -+#if PHP_MAJOR_VERSION >= 7 -+ return OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC); -+#else - return OnUpdateString(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC); -+#endif -+ - } - /* }}} */ - #endif - --/* {{{ PHP_INI -- */ -+/* {{{ PHP_INI */ - PHP_INI_BEGIN() - #ifdef HAVE_CUSTOM_DIRECTORY - STD_PHP_INI_ENTRY("geoip.custom_directory", NULL, PHP_INI_ALL, OnUpdateDirectory, custom_directory, zend_geoip_globals, geoip_globals) -@@ -147,43 +172,51 @@ PHP_INI_BEGIN() - PHP_INI_END() - /* }}} */ - --/* {{{ php_geoip_init_globals -- */ --static void php_geoip_init_globals(zend_geoip_globals *geoip_globals) --{ -+/* {{{ php_geoip_init_globals */ -+static void php_geoip_init_globals(zend_geoip_globals *geoip_globals) { - geoip_globals->custom_directory = NULL; - geoip_globals->set_runtime_custom_directory = 0; - } - /* }}} */ - --/* {{{ PHP_MINIT_FUNCTION -- */ --PHP_MINIT_FUNCTION(geoip) --{ -+/* {{{ PHP_MINIT_FUNCTION */ -+PHP_MINIT_FUNCTION(geoip) { - ZEND_INIT_MODULE_GLOBALS(geoip, php_geoip_init_globals, NULL); -+ - REGISTER_INI_ENTRIES(); -- - /* @TODO: Do something for custom_directory before initialization here */ - - #ifdef HAVE_CUSTOM_DIRECTORY - GeoIP_setup_custom_directory(GEOIP_G(custom_directory)); - #endif -+ - _GeoIP_setup_dbfilename(); -- - /* For database type constants */ -- REGISTER_LONG_CONSTANT("GEOIP_COUNTRY_EDITION", GEOIP_COUNTRY_EDITION, CONST_CS | CONST_PERSISTENT); -- REGISTER_LONG_CONSTANT("GEOIP_REGION_EDITION_REV0", GEOIP_REGION_EDITION_REV0, CONST_CS | CONST_PERSISTENT); -- REGISTER_LONG_CONSTANT("GEOIP_CITY_EDITION_REV0", GEOIP_CITY_EDITION_REV0, CONST_CS | CONST_PERSISTENT); -- REGISTER_LONG_CONSTANT("GEOIP_ORG_EDITION", GEOIP_ORG_EDITION, CONST_CS | CONST_PERSISTENT); -- REGISTER_LONG_CONSTANT("GEOIP_ISP_EDITION", GEOIP_ISP_EDITION, CONST_CS | CONST_PERSISTENT); -- REGISTER_LONG_CONSTANT("GEOIP_CITY_EDITION_REV1", GEOIP_CITY_EDITION_REV1, CONST_CS | CONST_PERSISTENT); -- REGISTER_LONG_CONSTANT("GEOIP_REGION_EDITION_REV1", GEOIP_REGION_EDITION_REV1, CONST_CS | CONST_PERSISTENT); -- REGISTER_LONG_CONSTANT("GEOIP_PROXY_EDITION", GEOIP_PROXY_EDITION, CONST_CS | CONST_PERSISTENT); -- REGISTER_LONG_CONSTANT("GEOIP_ASNUM_EDITION", GEOIP_ASNUM_EDITION, CONST_CS | CONST_PERSISTENT); -- REGISTER_LONG_CONSTANT("GEOIP_NETSPEED_EDITION", GEOIP_NETSPEED_EDITION, CONST_CS | CONST_PERSISTENT); -- REGISTER_LONG_CONSTANT("GEOIP_DOMAIN_EDITION", GEOIP_DOMAIN_EDITION, CONST_CS | CONST_PERSISTENT); -+ REGISTER_LONG_CONSTANT("GEOIP_COUNTRY_EDITION", GEOIP_COUNTRY_EDITION, CONST_CS | CONST_PERSISTENT); -+ REGISTER_LONG_CONSTANT("GEOIP_REGION_EDITION_REV0", GEOIP_REGION_EDITION_REV0, CONST_CS | CONST_PERSISTENT); -+ REGISTER_LONG_CONSTANT("GEOIP_CITY_EDITION_REV0", GEOIP_CITY_EDITION_REV0, CONST_CS | CONST_PERSISTENT); -+ REGISTER_LONG_CONSTANT("GEOIP_ORG_EDITION", GEOIP_ORG_EDITION, CONST_CS | CONST_PERSISTENT); -+ REGISTER_LONG_CONSTANT("GEOIP_ISP_EDITION", GEOIP_ISP_EDITION, CONST_CS | CONST_PERSISTENT); -+ REGISTER_LONG_CONSTANT("GEOIP_CITY_EDITION_REV1", GEOIP_CITY_EDITION_REV1, CONST_CS | CONST_PERSISTENT); -+ REGISTER_LONG_CONSTANT("GEOIP_REGION_EDITION_REV1", GEOIP_REGION_EDITION_REV1, CONST_CS | CONST_PERSISTENT); -+ REGISTER_LONG_CONSTANT("GEOIP_PROXY_EDITION", GEOIP_PROXY_EDITION, CONST_CS | CONST_PERSISTENT); -+ REGISTER_LONG_CONSTANT("GEOIP_ASNUM_EDITION", GEOIP_ASNUM_EDITION, CONST_CS | CONST_PERSISTENT); -+ REGISTER_LONG_CONSTANT("GEOIP_NETSPEED_EDITION", GEOIP_NETSPEED_EDITION, CONST_CS | CONST_PERSISTENT); -+ REGISTER_LONG_CONSTANT("GEOIP_DOMAIN_EDITION", GEOIP_DOMAIN_EDITION, CONST_CS | CONST_PERSISTENT); -+ -+#if LIBGEOIP_VERSION >= 1004005 -+ REGISTER_LONG_CONSTANT("GEOIP_COUNTRY_EDITION_V6", GEOIP_COUNTRY_EDITION_V6, CONST_CS | CONST_PERSISTENT); -+ REGISTER_LONG_CONSTANT("GEOIP_CITY_EDITION_REV0_V6", GEOIP_CITY_EDITION_REV0_V6, CONST_CS | CONST_PERSISTENT); -+ REGISTER_LONG_CONSTANT("GEOIP_ORG_EDITION_V6", GEOIP_ORG_EDITION_V6, CONST_CS | CONST_PERSISTENT); -+ REGISTER_LONG_CONSTANT("GEOIP_ISP_EDITION_V6", GEOIP_ISP_EDITION_V6, CONST_CS | CONST_PERSISTENT); -+ REGISTER_LONG_CONSTANT("GEOIP_CITY_EDITION_REV1_V6", GEOIP_CITY_EDITION_REV1_V6, CONST_CS | CONST_PERSISTENT); -+ REGISTER_LONG_CONSTANT("GEOIP_ASNUM_EDITION_V6", GEOIP_ASNUM_EDITION_V6, CONST_CS | CONST_PERSISTENT); -+ REGISTER_LONG_CONSTANT("GEOIP_DOMAIN_EDITION_V6", GEOIP_DOMAIN_EDITION_V6, CONST_CS | CONST_PERSISTENT); -+#endif -+ - #if LIBGEOIP_VERSION >= 1004008 -- REGISTER_LONG_CONSTANT("GEOIP_NETSPEED_EDITION_REV1",GEOIP_NETSPEED_EDITION_REV1,CONST_CS | CONST_PERSISTENT); -+ REGISTER_LONG_CONSTANT("GEOIP_NETSPEED_EDITION_REV1", GEOIP_NETSPEED_EDITION_REV1, CONST_CS | CONST_PERSISTENT); -+ REGISTER_LONG_CONSTANT("GEOIP_NETSPEED_EDITION_REV1_V6", GEOIP_NETSPEED_EDITION_REV1_V6, CONST_CS | CONST_PERSISTENT); - #endif - - /* For netspeed constants */ -@@ -191,33 +224,13 @@ PHP_MINIT_FUNCTION(geoip) - REGISTER_LONG_CONSTANT("GEOIP_DIALUP_SPEED", GEOIP_DIALUP_SPEED, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("GEOIP_CABLEDSL_SPEED", GEOIP_CABLEDSL_SPEED, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("GEOIP_CORPORATE_SPEED", GEOIP_CORPORATE_SPEED, CONST_CS | CONST_PERSISTENT); -- -- return SUCCESS; --} --/* }}} */ - --/* {{{ PHP_MSHUTDOWN_FUNCTION -- */ --PHP_MSHUTDOWN_FUNCTION(geoip) --{ -- return SUCCESS; --} --/* }}} */ -- -- --/* {{{ PHP_RINIT_FUNCTION -- */ --PHP_RINIT_FUNCTION(geoip) --{ - return SUCCESS; - } - /* }}} */ - -- --/* {{{ PHP_RSHUTDOWN_FUNCTION -- */ --PHP_RSHUTDOWN_FUNCTION(geoip) --{ -+/* {{{ PHP_RSHUTDOWN_FUNCTION */ -+PHP_RSHUTDOWN_FUNCTION(geoip) { - #ifdef HAVE_CUSTOM_DIRECTORY - /* If we have a custom directory (and have support from */ - /* libgeoip, we reset the extension to default directory) */ -@@ -226,17 +239,13 @@ PHP_RSHUTDOWN_FUNCTION(geoip) - GEOIP_G(set_runtime_custom_directory) = 0; - } - #endif -- - return SUCCESS; - } - /* }}} */ - --/* {{{ PHP_MINFO_FUNCTION -- */ --PHP_MINFO_FUNCTION(geoip) --{ -+/* {{{ PHP_MINFO_FUNCTION */ -+PHP_MINFO_FUNCTION(geoip) { - char buf[32]; -- - php_info_print_table_start(); - php_info_print_table_header(2, "geoip support", "enabled"); - php_info_print_table_row(2, "geoip extension version", PHP_GEOIP_VERSION); -@@ -247,450 +256,404 @@ PHP_MINFO_FUNCTION(geoip) - } - /* }}} */ - --/* {{{ proto boolean geoip_db_avail( [ int database ] ) */ --PHP_FUNCTION(geoip_db_avail) --{ -- long edition; -- -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &edition) == FAILURE) { -- return; -- } -- -- if (edition < 0 || edition >= NUM_DB_TYPES) -- { -- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Database type given is out of bound."); -- return; -- } -- -- RETURN_BOOL(GeoIP_db_avail(edition)); --} --/* }}} */ -- --/* {{{ proto string geoip_db_filename( [ int database ] ) */ --PHP_FUNCTION(geoip_db_filename) --{ -- long edition; -- -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &edition) == FAILURE) { -- return; -- } -- -- if (edition < 0 || edition >= NUM_DB_TYPES) -- { -- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Database type given is out of bound."); -- return; -- } -- -- if (NULL != GeoIPDBFileName[edition]) -- RETURN_STRING(GeoIPDBFileName[edition], 1); --} --/* }}} */ -- --/* {{{ proto array geoip_db_get_all_info( ) */ --PHP_FUNCTION(geoip_db_get_all_info) --{ -- int i; -- -- array_init(return_value); -- -- for (i=0; i < NUM_DB_TYPES; i++) -- { -- if (NULL != GeoIPDBDescription[i]) -- { -- zval *row; -- ALLOC_INIT_ZVAL(row); -- array_init(row); -- -- add_assoc_bool(row, "available", GeoIP_db_avail(i)); -- if (GeoIPDBDescription[i]) { -- add_assoc_string(row, "description", (char *)GeoIPDBDescription[i], 1); -- } -- if (GeoIPDBFileName[i]) { -- add_assoc_string(row, "filename", GeoIPDBFileName[i], 1); -- } -- -- add_index_zval(return_value, i, row); -- } -- } --} --/* }}} */ -- --/* {{{ proto string geoip_database_info( [ int database ] ) -- Returns GeoIP Database information */ --PHP_FUNCTION(geoip_database_info) --{ -- GeoIP * gi; -- char * db_info; -- long edition = GEOIP_COUNTRY_EDITION; -- -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &edition) == FAILURE) { -- return; -- } -- -- if (edition < 0 || edition >= NUM_DB_TYPES) -- { -- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Database type given is out of bound."); -- return; -- } -- -- if (GeoIP_db_avail(edition)) { -- gi = GeoIP_open_type(edition, GEOIP_STANDARD); -+/* {{{ geoip_open_db helper */ -+static GeoIP* geoip_open_db(int db_type, int db_type_fallback, int use_fallback) { -+ GeoIP* gi; -+ gi = NULL; -+ if (db_type < 0 || db_type >= NUM_DB_TYPES -+ || (use_fallback && (db_type_fallback < 0 || db_type_fallback >= NUM_DB_TYPES)) -+ ) { -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Database type given is out of bound."); -+ } else if (GeoIP_db_avail(db_type)) { -+ gi = GeoIP_open_type(db_type, GEOIP_STANDARD); -+ } else if (use_fallback && GeoIP_db_avail(db_type_fallback)) { -+ gi = GeoIP_open_type(db_type_fallback, GEOIP_STANDARD); - } else { -- if (NULL != GeoIPDBFileName[edition]) -- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Required database not available at %s.", GeoIPDBFileName[GEOIP_COUNTRY_EDITION]); -- else -+ if (GeoIPDBFileName[db_type]) { -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Required database not available at %s.", GeoIPDBFileName[db_type]); -+ } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Required database not available."); -- return; -+ } - } -- -- db_info = GeoIP_database_info(gi); -- GeoIP_delete(gi); -- -- RETVAL_STRING(db_info, 1); -- free(db_info); -+ return gi; - } - /* }}} */ - --/* {{{ */ --#define GEOIPDEF(php_func, c_func, db_type) \ -- PHP_FUNCTION(php_func) \ -- { \ -- GeoIP * gi; \ -- char * hostname = NULL; \ -- const char * return_code; \ -- int arglen; \ -- \ -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &hostname, &arglen) == FAILURE) { \ -- return; \ -- } \ -- \ -- if (GeoIP_db_avail(db_type)) { \ -- gi = GeoIP_open_type(db_type, GEOIP_STANDARD); \ -- } else { \ -- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Required database not available at %s.", GeoIPDBFileName[db_type]); \ -- return; \ -- } \ -- \ -- return_code = c_func(gi, hostname); \ -- GeoIP_delete(gi); \ -- if (return_code == NULL) { \ -- RETURN_FALSE; \ -- } \ -- RETURN_STRING((char*)return_code, 1); \ -- \ -- } --#include "geoip.def" --#undef GEOIPDEF --/* }}} */ -- --/* {{{ proto string geoip_continent_code_by_name( string hostname ) -- Returns the Continent name found in the GeoIP Database */ --PHP_FUNCTION(geoip_continent_code_by_name) --{ -- GeoIP * gi; -- char * hostname = NULL; -- int id; -- int arglen; -+/* {{{ geoip_generic_string helper */ -+static void geoip_generic_string( -+ INTERNAL_FUNCTION_PARAMETERS, -+ char* (*geoip_func)(GeoIP* gi, const char* host), -+ int db_type, -+ int do_free -+) { -+ GeoIP* gi; -+ char* hostname; -+ char* retval; -+ strlen_compat_t arglen; - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &hostname, &arglen) == FAILURE) { - return; - } - -- if (GeoIP_db_avail(GEOIP_COUNTRY_EDITION)) { -- gi = GeoIP_open_type(GEOIP_COUNTRY_EDITION, GEOIP_STANDARD); -- } else { -- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Required database not available at %s.", GeoIPDBFileName[GEOIP_COUNTRY_EDITION]); -+ if (!(gi = geoip_open_db(db_type, 0, 0))) { - return; - } - -- id = GeoIP_id_by_name(gi, hostname); -+ retval = (char*)geoip_func(gi, hostname); - GeoIP_delete(gi); -- if (id == 0) { -+ if (!retval) { - RETURN_FALSE; - } -- RETURN_STRING((char *)GeoIP_country_continent[id], 1); -+ RETVAL_STRING_COMPAT(retval, 1); -+ if (do_free) free(retval); - } - /* }}} */ - --/* {{{ proto string geoip_org_by_name( string hostname ) -- Returns the Organization Name found in the GeoIP Database */ --PHP_FUNCTION(geoip_org_by_name) --{ -- GeoIP * gi; -- char * hostname = NULL; -- char * org; -- int arglen; -+/* {{{ geoip_generic_string helper */ -+static void geoip_generic_region( -+ INTERNAL_FUNCTION_PARAMETERS, -+ GeoIPRegion* (*geoip_func)(GeoIP* gi, const char* host), -+ int db_type_1, -+ int db_type_2 -+) { -+ GeoIP* gi; -+ char* hostname; -+ strlen_compat_t arglen; -+ GeoIPRegion* region; - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &hostname, &arglen) == FAILURE) { - return; - } -- -- if (GeoIP_db_avail(GEOIP_ORG_EDITION)) { -- gi = GeoIP_open_type(GEOIP_ORG_EDITION, GEOIP_STANDARD); -- } else { -- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Required database not available at %s.", GeoIPDBFileName[GEOIP_ORG_EDITION]); -- return; -+ -+ if (!(gi = geoip_open_db(db_type_1, db_type_2, 1))) { -+ return; - } - -- org = GeoIP_org_by_name(gi, hostname); -+ region = geoip_func(gi, hostname); - GeoIP_delete(gi); -- if (org == NULL) { -+ if (!region) { - RETURN_FALSE; - } -- RETVAL_STRING(org, 1); -- free(org); -+ array_init(return_value); -+ add_assoc_string_compat(return_value, "country_code", region->country_code, 1); -+ add_assoc_string_compat(return_value, "region", region->region, 1); -+ GeoIPRegion_delete(region); - } - /* }}} */ - --/* {{{ proto string geoip_asnum_by_name( string hostname ) -- Returns the Domain Name found in the GeoIP Database */ --PHP_FUNCTION(geoip_asnum_by_name) --{ -- GeoIP * gi; -- char * hostname = NULL; -- char * org; -- int arglen; -+/* {{{ geoip_generic_record helper */ -+static void geoip_generic_record( -+ INTERNAL_FUNCTION_PARAMETERS, -+ GeoIPRecord* (*geoip_func)(GeoIP* gi, const char* host), -+ int db_type1, -+ int db_type2 -+) { -+ GeoIP* gi; -+ char* hostname; -+ strlen_compat_t arglen; -+ GeoIPRecord* gir; - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &hostname, &arglen) == FAILURE) { - return; - } - -- if (GeoIP_db_avail(GEOIP_ASNUM_EDITION)) { -- gi = GeoIP_open_type(GEOIP_ASNUM_EDITION, GEOIP_STANDARD); -- } else { -- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Required database not available at %s.", GeoIPDBFileName[GEOIP_ASNUM_EDITION]); -+ if (!(gi = geoip_open_db(db_type1, db_type2, 1))) { - return; - } - -- org = GeoIP_name_by_name(gi, hostname); -+ gir = geoip_func(gi, hostname); - GeoIP_delete(gi); -- if (org == NULL) { -+ if (!gir) { - RETURN_FALSE; - } -- RETVAL_STRING(org, 1); -- free(org); -+ -+ array_init(return_value); -+#if LIBGEOIP_VERSION >= 1004003 -+ add_assoc_string_compat(return_value, "continent_code", (gir->continent_code == NULL) ? "" : gir->continent_code, 1); -+#endif -+ add_assoc_string_compat(return_value, "country_code", (gir->country_code == NULL) ? "" : gir->country_code, 1); -+ add_assoc_string_compat(return_value, "country_code3", (gir->country_code3 == NULL) ? "" : gir->country_code3, 1); -+ add_assoc_string_compat(return_value, "country_name", (gir->country_name == NULL) ? "" : gir->country_name, 1); -+ add_assoc_string_compat(return_value, "region", (gir->region == NULL) ? "" : gir->region, 1); -+ add_assoc_string_compat(return_value, "city", (gir->city == NULL) ? "" : gir->city, 1); -+ add_assoc_string_compat(return_value, "postal_code", (gir->postal_code == NULL) ? "" : gir->postal_code, 1); -+ add_assoc_double(return_value, "latitude", gir->latitude); -+ add_assoc_double(return_value, "longitude", gir->longitude); -+#if LIBGEOIP_VERSION >= 1004005 -+ add_assoc_long(return_value, "dma_code", gir->metro_code); -+#else -+ add_assoc_long(return_value, "dma_code", gir->dma_code); -+#endif -+ add_assoc_long(return_value, "area_code", gir->area_code); -+ -+ GeoIPRecord_delete(gir); - } - /* }}} */ - --/* {{{ proto string geoip_domain_by_name( string hostname ) -- Returns the Domain Name found in the GeoIP Database */ --PHP_FUNCTION(geoip_domain_by_name) --{ -- GeoIP * gi; -- char * hostname = NULL; -- char * org; -- int arglen; -+/* {{{ geoip_generic_id helper */ -+static int geoip_generic_id( -+ INTERNAL_FUNCTION_PARAMETERS, -+ int (*geoip_func)(GeoIP* gi, const char* host), -+ int db_type, -+ int* ret_id -+) { -+ GeoIP* gi; -+ char* hostname; -+ strlen_compat_t arglen; - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &hostname, &arglen) == FAILURE) { -- return; -+ return 0; - } - -- if (GeoIP_db_avail(GEOIP_DOMAIN_EDITION)) { -- gi = GeoIP_open_type(GEOIP_DOMAIN_EDITION, GEOIP_STANDARD); -- } else { -- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Required database not available at %s.", GeoIPDBFileName[GEOIP_DOMAIN_EDITION]); -- return; -+ if (!(gi = geoip_open_db(db_type, 0, 0))) { -+ return 0; - } - -- org = GeoIP_name_by_name(gi, hostname); -+ *ret_id = geoip_func(gi, hostname); - GeoIP_delete(gi); -- if (org == NULL) { -- RETURN_FALSE; -- } -- RETVAL_STRING(org, 1); -- free(org); -+ return 1; - } - /* }}} */ - --#if LIBGEOIP_VERSION >= 1004008 --/* {{{ proto string geoip_netspeedcell_by_name( string hostname ) -- Returns the Net Speed found in the GeoIP Database */ --PHP_FUNCTION(geoip_netspeedcell_by_name) --{ -- GeoIP * gi; -- char * hostname = NULL; -- char * org; -- int arglen; -+/* {{{ proto string geoip_db_avail( [ int database ] ) */ -+PHP_FUNCTION(geoip_country_code_by_name) { -+ geoip_generic_string(INTERNAL_FUNCTION_PARAM_PASSTHRU, (char* (*)(GeoIP*, const char*))GeoIP_country_code_by_name, GEOIP_COUNTRY_EDITION, 0); -+} - -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &hostname, &arglen) == FAILURE) { -- return; -- } -+PHP_FUNCTION(geoip_country_code3_by_name) { -+ geoip_generic_string(INTERNAL_FUNCTION_PARAM_PASSTHRU, (char* (*)(GeoIP*, const char*))GeoIP_country_code3_by_name, GEOIP_COUNTRY_EDITION, 0); -+} - -- if (GeoIP_db_avail(GEOIP_NETSPEED_EDITION_REV1)) { -- gi = GeoIP_open_type(GEOIP_NETSPEED_EDITION_REV1, GEOIP_STANDARD); -- } else { -- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Required database not available at %s.", GeoIPDBFileName[GEOIP_NETSPEED_EDITION_REV1]); -- return; -- } -+PHP_FUNCTION(geoip_country_name_by_name) { -+ geoip_generic_string(INTERNAL_FUNCTION_PARAM_PASSTHRU, (char* (*)(GeoIP*, const char*))GeoIP_country_name_by_name, GEOIP_COUNTRY_EDITION, 0); -+} - -- org = GeoIP_name_by_name(gi, hostname); -- GeoIP_delete(gi); -- if (org == NULL) { -- RETURN_FALSE; -- } -- RETVAL_STRING(org, 1); -- free(org); -+PHP_FUNCTION(geoip_asnum_by_name) { -+ geoip_generic_string(INTERNAL_FUNCTION_PARAM_PASSTHRU, GeoIP_name_by_name, GEOIP_ASNUM_EDITION, 1); -+} -+ -+PHP_FUNCTION(geoip_domain_by_name) { -+ geoip_generic_string(INTERNAL_FUNCTION_PARAM_PASSTHRU, GeoIP_name_by_name, GEOIP_DOMAIN_EDITION, 1); -+} -+ -+#if LIBGEOIP_VERSION >= 1004008 -+PHP_FUNCTION(geoip_netspeedcell_by_name) { -+ geoip_generic_string(INTERNAL_FUNCTION_PARAM_PASSTHRU, GeoIP_name_by_name, GEOIP_NETSPEED_EDITION_REV1, 1); - } --/* }}} */ - #endif - --/* {{{ proto array geoip_record_by_name( string hostname ) -- Returns the detailed City information found in the GeoIP Database */ --PHP_FUNCTION(geoip_record_by_name) --{ -- GeoIP * gi; -- char * hostname = NULL; -- int arglen; -- GeoIPRecord * gir; -+PHP_FUNCTION(geoip_isp_by_name) { -+ geoip_generic_string(INTERNAL_FUNCTION_PARAM_PASSTHRU, GeoIP_name_by_name, GEOIP_ISP_EDITION, 1); -+} - -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &hostname, &arglen) == FAILURE) { -- return; -+PHP_FUNCTION(geoip_org_by_name) { -+ geoip_generic_string(INTERNAL_FUNCTION_PARAM_PASSTHRU, GeoIP_org_by_name, GEOIP_ORG_EDITION, 1); -+} -+ -+PHP_FUNCTION(geoip_region_by_name) { -+ geoip_generic_region(INTERNAL_FUNCTION_PARAM_PASSTHRU, GeoIP_region_by_name, GEOIP_REGION_EDITION_REV1, GEOIP_REGION_EDITION_REV0); -+} -+ -+PHP_FUNCTION(geoip_record_by_name) { -+ geoip_generic_record(INTERNAL_FUNCTION_PARAM_PASSTHRU, GeoIP_record_by_name, GEOIP_CITY_EDITION_REV1, GEOIP_CITY_EDITION_REV0); -+} -+ -+PHP_FUNCTION(geoip_id_by_name) { -+ int netspeed; -+ if (geoip_generic_id(INTERNAL_FUNCTION_PARAM_PASSTHRU, GeoIP_id_by_name, GEOIP_NETSPEED_EDITION_REV1, &netspeed)) { -+ RETURN_LONG(netspeed); - } -+} - -- if (GeoIP_db_avail(GEOIP_CITY_EDITION_REV1) || GeoIP_db_avail(GEOIP_CITY_EDITION_REV0)) { -- if (GeoIP_db_avail(GEOIP_CITY_EDITION_REV1)) { -- gi = GeoIP_open_type(GEOIP_CITY_EDITION_REV1, GEOIP_STANDARD); -+PHP_FUNCTION(geoip_continent_code_by_name) { -+ int id; -+ if (geoip_generic_id(INTERNAL_FUNCTION_PARAM_PASSTHRU, GeoIP_id_by_name, GEOIP_COUNTRY_EDITION, &id)) { -+ if (id == 0) { -+ RETURN_FALSE; - } else { -- gi = GeoIP_open_type(GEOIP_CITY_EDITION_REV0, GEOIP_STANDARD); -+ RETURN_STRING_COMPAT((char*)GeoIP_country_continent[id], 1); - } -- } else { -- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Required database not available at %s.", GeoIPDBFileName[GEOIP_CITY_EDITION_REV0]); -- return; - } -- gir = GeoIP_record_by_name(gi, hostname); -+} - -- GeoIP_delete(gi); -- -- if (NULL == gir) { -- RETURN_FALSE; -- } -- -- array_init(return_value); --#if LIBGEOIP_VERSION >= 1004003 -- add_assoc_string(return_value, "continent_code", (gir->continent_code == NULL) ? "" : gir->continent_code, 1); --#endif -- add_assoc_string(return_value, "country_code", (gir->country_code == NULL) ? "" : gir->country_code, 1); -- add_assoc_string(return_value, "country_code3", (gir->country_code3 == NULL) ? "" : gir->country_code3, 1); -- add_assoc_string(return_value, "country_name", (gir->country_name == NULL) ? "" : gir->country_name, 1); -- add_assoc_string(return_value, "region", (gir->region == NULL) ? "" : gir->region, 1); -- add_assoc_string(return_value, "city", (gir->city == NULL) ? "" : gir->city, 1); -- add_assoc_string(return_value, "postal_code", (gir->postal_code == NULL) ? "" : gir->postal_code, 1); -- add_assoc_double(return_value, "latitude", gir->latitude); -- add_assoc_double(return_value, "longitude", gir->longitude); - #if LIBGEOIP_VERSION >= 1004005 -- add_assoc_long(return_value, "dma_code", gir->metro_code); --#else -- add_assoc_long(return_value, "dma_code", gir->dma_code); -+/* {{{ IPV6 functions */ -+PHP_FUNCTION(geoip_country_code_by_name_v6) { -+ geoip_generic_string(INTERNAL_FUNCTION_PARAM_PASSTHRU, (char* (*)(GeoIP*, const char*))GeoIP_country_code_by_name_v6, GEOIP_COUNTRY_EDITION_V6, 0); -+} -+ -+PHP_FUNCTION(geoip_country_code3_by_name_v6) { -+ geoip_generic_string(INTERNAL_FUNCTION_PARAM_PASSTHRU, (char* (*)(GeoIP*, const char*))GeoIP_country_code3_by_name_v6, GEOIP_COUNTRY_EDITION_V6, 0); -+} -+ -+PHP_FUNCTION(geoip_country_name_by_name_v6) { -+ geoip_generic_string(INTERNAL_FUNCTION_PARAM_PASSTHRU, (char* (*)(GeoIP*, const char*))GeoIP_country_name_by_name_v6, GEOIP_COUNTRY_EDITION_V6, 0); -+} -+ -+PHP_FUNCTION(geoip_asnum_by_name_v6) { -+ geoip_generic_string(INTERNAL_FUNCTION_PARAM_PASSTHRU, GeoIP_name_by_name_v6, GEOIP_ASNUM_EDITION_V6, 1); -+} -+ -+PHP_FUNCTION(geoip_domain_by_name_v6) { -+ geoip_generic_string(INTERNAL_FUNCTION_PARAM_PASSTHRU, GeoIP_name_by_name_v6, GEOIP_DOMAIN_EDITION_V6, 1); -+} -+ -+#if LIBGEOIP_VERSION >= 1004008 -+PHP_FUNCTION(geoip_netspeedcell_by_name_v6) { -+ geoip_generic_string(INTERNAL_FUNCTION_PARAM_PASSTHRU, GeoIP_name_by_name_v6, GEOIP_NETSPEED_EDITION_REV1_V6, 1); -+} - #endif -- add_assoc_long(return_value, "area_code", gir->area_code); - -- GeoIPRecord_delete(gir); -+PHP_FUNCTION(geoip_isp_by_name_v6) { -+ geoip_generic_string(INTERNAL_FUNCTION_PARAM_PASSTHRU, GeoIP_name_by_name_v6, GEOIP_ISP_EDITION_V6, 1); - } --/* }}} */ - --/* {{{ proto integer geoip_id_by_name( string hostname ) -- Returns the Net Speed found in the GeoIP Database */ --PHP_FUNCTION(geoip_id_by_name) --{ -- GeoIP * gi; -- char * hostname = NULL; -- int arglen; -+PHP_FUNCTION(geoip_org_by_name_v6) { -+ geoip_generic_string(INTERNAL_FUNCTION_PARAM_PASSTHRU, GeoIP_org_by_name_v6, GEOIP_ORG_EDITION_V6, 1); -+} -+ -+PHP_FUNCTION(geoip_region_by_name_v6) { -+ geoip_generic_region(INTERNAL_FUNCTION_PARAM_PASSTHRU, GeoIP_region_by_name_v6, GEOIP_REGION_EDITION_REV1, GEOIP_REGION_EDITION_REV0); -+} -+ -+PHP_FUNCTION(geoip_record_by_name_v6) { -+ geoip_generic_record(INTERNAL_FUNCTION_PARAM_PASSTHRU, GeoIP_record_by_name_v6, GEOIP_CITY_EDITION_REV1_V6, GEOIP_CITY_EDITION_REV0_V6); -+} -+ -+PHP_FUNCTION(geoip_id_by_name_v6) { - int netspeed; -+ if (geoip_generic_id(INTERNAL_FUNCTION_PARAM_PASSTHRU, GeoIP_id_by_name_v6, GEOIP_NETSPEED_EDITION_REV1_V6, &netspeed)) { -+ RETURN_LONG(netspeed); -+ } -+} - -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &hostname, &arglen) == FAILURE) { -+PHP_FUNCTION(geoip_continent_code_by_name_v6) { -+ int id; -+ if (geoip_generic_id(INTERNAL_FUNCTION_PARAM_PASSTHRU, GeoIP_id_by_name_v6, GEOIP_COUNTRY_EDITION_V6, &id)) { -+ if (id == 0) { -+ RETURN_FALSE; -+ } else { -+ RETURN_STRING_COMPAT((char*)GeoIP_country_continent[id], 1); -+ } -+ } -+} -+/* }}} */ -+#endif -+ -+/* {{{ proto boolean geoip_db_avail( [ int database ] ) */ -+PHP_FUNCTION(geoip_db_avail) { -+ long edition; -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &edition) == FAILURE) { - return; - } - -- if (GeoIP_db_avail(GEOIP_NETSPEED_EDITION)) { -- gi = GeoIP_open_type(GEOIP_NETSPEED_EDITION, GEOIP_STANDARD); -- } else { -- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Required database not available at %s.", GeoIPDBFileName[GEOIP_NETSPEED_EDITION]); -+ if (edition < 0 || edition >= NUM_DB_TYPES) -+ { -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Database type given is out of bound."); - return; - } - -- netspeed = GeoIP_id_by_name(gi, hostname); -- GeoIP_delete(gi); -- RETURN_LONG(netspeed); -+ RETURN_BOOL(GeoIP_db_avail(edition)); - } - /* }}} */ - --/* {{{ proto array geoip_region_by_name( string hostname ) -- Returns the Country Code and region found in the GeoIP Database */ --PHP_FUNCTION(geoip_region_by_name) --{ -- GeoIP * gi; -- char * hostname = NULL; -- int arglen; -- GeoIPRegion * region; -+/* {{{ proto string geoip_db_filename( [ int database ] ) */ -+PHP_FUNCTION(geoip_db_filename) { -+ long edition; - -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &hostname, &arglen) == FAILURE) { -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &edition) == FAILURE) { - return; - } - -- if (GeoIP_db_avail(GEOIP_REGION_EDITION_REV0) || GeoIP_db_avail(GEOIP_REGION_EDITION_REV1)) { -- if (GeoIP_db_avail(GEOIP_REGION_EDITION_REV1)) { -- gi = GeoIP_open_type(GEOIP_REGION_EDITION_REV1, GEOIP_STANDARD); -- } else { -- gi = GeoIP_open_type(GEOIP_REGION_EDITION_REV0, GEOIP_STANDARD); -- } -- } else { -- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Required database not available at %s.", GeoIPDBFileName[GEOIP_REGION_EDITION_REV0]); -+ if (edition < 0 || edition >= NUM_DB_TYPES) -+ { -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Database type given is out of bound."); - return; - } - -- region = GeoIP_region_by_name(gi, hostname); -- GeoIP_delete(gi); -+ if (NULL != GeoIPDBFileName[edition]) -+ RETURN_STRING_COMPAT(GeoIPDBFileName[edition], 1); -+} -+/* }}} */ - -- if (NULL == region) { -- RETURN_FALSE; -- } -+/* {{{ proto array geoip_db_get_all_info( ) */ -+PHP_FUNCTION(geoip_db_get_all_info) { -+ int i; - - array_init(return_value); -- add_assoc_string(return_value, "country_code", region->country_code, 1); -- add_assoc_string(return_value, "region", region->region, 1); -- -- GeoIPRegion_delete(region); -+ -+ for (i=0; i < NUM_DB_TYPES; i++) -+ { -+ if (NULL != GeoIPDBDescription[i]) -+ { -+ zval *row; -+#if PHP_MAJOR_VERSION >= 7 -+ zval rowval; -+ row = &rowval; -+#else -+ ALLOC_INIT_ZVAL(row); -+#endif -+ array_init(row); -+ -+ add_assoc_bool(row, "available", GeoIP_db_avail(i)); -+ if (GeoIPDBDescription[i]) { -+ add_assoc_string_compat(row, "description", (char *)GeoIPDBDescription[i], 1); -+ } -+ if (GeoIPDBFileName[i]) { -+ add_assoc_string_compat(row, "filename", GeoIPDBFileName[i], 1); -+ } -+ -+ add_index_zval(return_value, i, row); -+ } -+ } - } - /* }}} */ - --/* {{{ proto string geoip_isp_by_name( string hostname ) -- Returns the ISP Name found in the GeoIP Database */ --PHP_FUNCTION(geoip_isp_by_name) -+/* {{{ proto string geoip_database_info( [ int database ] ) -+ Returns GeoIP Database information */ -+PHP_FUNCTION(geoip_database_info) - { - GeoIP * gi; -- char * hostname = NULL; -- char * isp; -- int arglen; -+ char * db_info; -+ long edition = GEOIP_COUNTRY_EDITION; - -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &hostname, &arglen) == FAILURE) { -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &edition) == FAILURE) { - return; - } -- -- if (GeoIP_db_avail(GEOIP_ISP_EDITION)) { -- gi = GeoIP_open_type(GEOIP_ISP_EDITION, GEOIP_STANDARD); -- } else { -- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Required database not available at %s.", GeoIPDBFileName[GEOIP_ISP_EDITION]); -+ -+ if (edition < 0 || edition >= NUM_DB_TYPES) -+ { -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Database type given is out of bound."); - return; - } - -- isp = GeoIP_name_by_name(gi, hostname); -- GeoIP_delete(gi); -- if (isp == NULL) { -- RETURN_FALSE; -+ if (GeoIP_db_avail(edition)) { -+ gi = GeoIP_open_type(edition, GEOIP_STANDARD); -+ } else { -+ if (NULL != GeoIPDBFileName[edition]) -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Required database not available at %s.", GeoIPDBFileName[GEOIP_COUNTRY_EDITION]); -+ else -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Required database not available."); -+ return; - } -- RETVAL_STRING(isp, 1); -- free(isp); -+ -+ db_info = GeoIP_database_info(gi); -+ GeoIP_delete(gi); -+ -+ RETVAL_STRING_COMPAT(db_info, 1); -+ free(db_info); - } -+/* }}} */ - - #if LIBGEOIP_VERSION >= 1004001 - /* {{{ proto string geoip_region_name_by_code( string country_code, string region_code ) - Returns the region name for some country code and region code combo */ --PHP_FUNCTION(geoip_region_name_by_code) --{ -+PHP_FUNCTION(geoip_region_name_by_code) { - char * country_code = NULL; - char * region_code = NULL; - const char * region_name; -- int countrylen, regionlen; -+ strlen_compat_t countrylen, regionlen; - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &country_code, &countrylen, ®ion_code, ®ionlen) == FAILURE) { - return; -@@ -700,12 +663,12 @@ PHP_FUNCTION(geoip_region_name_by_code) - php_error_docref(NULL TSRMLS_CC, E_WARNING, "You need to specify the country and region codes."); - RETURN_FALSE; - } -- -+ - region_name = GeoIP_region_name_by_code(country_code, region_code); - if (region_name == NULL) { - RETURN_FALSE; - } -- RETURN_STRING((char*)region_name, 1); -+ RETURN_STRING_COMPAT((char*)region_name, 1); - } - /* }}} */ - #endif -@@ -713,12 +676,11 @@ PHP_FUNCTION(geoip_region_name_by_code) - #if LIBGEOIP_VERSION >= 1004001 - /* {{{ proto string geoip_time_zone_by_country_and_region( string country, string region ) - Returns the time zone for some country code and region code combo */ --PHP_FUNCTION(geoip_time_zone_by_country_and_region) --{ -+PHP_FUNCTION(geoip_time_zone_by_country_and_region) { - char * country = NULL; - char * region = NULL; - const char * timezone; -- int countrylen, arg2len; -+ strlen_compat_t countrylen, arg2len; - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|s", &country, &countrylen, ®ion, &arg2len) == FAILURE) { - return; -@@ -728,12 +690,12 @@ PHP_FUNCTION(geoip_time_zone_by_country_and_region) - php_error_docref(NULL TSRMLS_CC, E_WARNING, "You need to specify at least the country code."); - RETURN_FALSE; - } -- -+ - timezone = GeoIP_time_zone_by_country_and_region(country, region); - if (timezone == NULL) { - RETURN_FALSE; - } -- RETURN_STRING((char*)timezone, 1); -+ RETURN_STRING_COMPAT((char*)timezone, 1); - } - /* }}} */ - #endif -@@ -741,10 +703,9 @@ PHP_FUNCTION(geoip_time_zone_by_country_and_region) - #ifdef HAVE_CUSTOM_DIRECTORY - /* {{{ proto void geoip_setup_custom_directory( string directory ) - Sets the custom directory for GeoIP databases */ --PHP_FUNCTION(geoip_setup_custom_directory) --{ -+PHP_FUNCTION(geoip_setup_custom_directory) { - char * dir = NULL; -- int dirlen; -+ strlen_compat_t dirlen; - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &dir, &dirlen) == FAILURE) { - return; -diff --git geoip.def geoip.def -deleted file mode 100644 -index 95e05b3..0000000 ---- geoip.def -+++ /dev/null -@@ -1,28 +0,0 @@ --/* -- +----------------------------------------------------------------------+ -- | PHP Version 5 | -- +----------------------------------------------------------------------+ -- | Copyright (c) 2002-2009 The PHP Group | -- +----------------------------------------------------------------------+ -- | This source file is subject to version 3.01 of the PHP license, | -- | that is bundled with this package in the file LICENSE, and is | -- | available through the world-wide-web at the following url: | -- | http://www.php.net/license/3_01.txt. | -- | If you did not receive a copy of the PHP license and are unable to | -- | obtain it through the world-wide-web, please send a note to | -- | license@php.net so we can mail you a copy immediately. | -- +----------------------------------------------------------------------+ -- | Author: Olivier Hill | -- +----------------------------------------------------------------------+ --*/ -- --/* GEOIPDEF(php_func, c_func, db_type) */ --GEOIPDEF(geoip_country_code_by_name, GeoIP_country_code_by_name, GEOIP_COUNTRY_EDITION) --GEOIPDEF(geoip_country_code3_by_name, GeoIP_country_code3_by_name, GEOIP_COUNTRY_EDITION) --GEOIPDEF(geoip_country_name_by_name, GeoIP_country_name_by_name, GEOIP_COUNTRY_EDITION) -- --#if LIBGEOIP_VERSION >= 1004005 && FALSE --GEOIPDEF(geoip_country_code_by_name_v6, GeoIP_country_code_by_name_v6, GEOIP_COUNTRY_EDITION_V6) --GEOIPDEF(geoip_country_code3_by_name_v6, GeoIP_country_code3_by_name_v6, GEOIP_COUNTRY_EDITION_V6) --GEOIPDEF(geoip_country_name_by_name_v6, GeoIP_country_name_by_name_v6, GEOIP_COUNTRY_EDITION_V6) --#endif -\ No newline at end of file -diff --git php_geoip.h php_geoip.h -index 41147d5..2b5919d 100644 ---- php_geoip.h -+++ php_geoip.h -@@ -14,6 +14,7 @@ - +----------------------------------------------------------------------+ - | Author: Olivier Hill | - | Matthew Fonda | -+ | Adam Saponara | - +----------------------------------------------------------------------+ - Please contact support@maxmind.com with any comments - */ -@@ -24,7 +25,7 @@ - extern zend_module_entry geoip_module_entry; - #define phpext_geoip_ptr &geoip_module_entry - --#define PHP_GEOIP_VERSION "1.1.0" -+#define PHP_GEOIP_VERSION "1.2.0" - - #ifdef PHP_WIN32 - #define PHP_GEOIP_API __declspec(dllexport) -@@ -40,26 +41,37 @@ extern zend_module_entry geoip_module_entry; - #include - - PHP_MINIT_FUNCTION(geoip); --PHP_MSHUTDOWN_FUNCTION(geoip); --PHP_RINIT_FUNCTION(geoip); - PHP_RSHUTDOWN_FUNCTION(geoip); - PHP_MINFO_FUNCTION(geoip); - -- --PHP_FUNCTION(geoip_database_info); --#define GEOIPDEF(php_func, c_func, db_type) \ --PHP_FUNCTION(php_func); --#include "geoip.def" --#undef GEOIPDEF --PHP_FUNCTION(geoip_continent_code_by_name); -+PHP_FUNCTION(geoip_country_code_by_name); -+PHP_FUNCTION(geoip_country_code3_by_name); -+PHP_FUNCTION(geoip_country_name_by_name); -+PHP_FUNCTION(geoip_asnum_by_name); -+PHP_FUNCTION(geoip_domain_by_name); -+PHP_FUNCTION(geoip_isp_by_name); - PHP_FUNCTION(geoip_org_by_name); -+PHP_FUNCTION(geoip_region_by_name); - PHP_FUNCTION(geoip_record_by_name); - PHP_FUNCTION(geoip_id_by_name); --PHP_FUNCTION(geoip_region_by_name); --PHP_FUNCTION(geoip_isp_by_name); -+PHP_FUNCTION(geoip_continent_code_by_name); -+#if LIBGEOIP_VERSION >= 1004005 -+PHP_FUNCTION(geoip_country_code_by_name_v6); -+PHP_FUNCTION(geoip_country_code3_by_name_v6); -+PHP_FUNCTION(geoip_country_name_by_name_v6); -+PHP_FUNCTION(geoip_asnum_by_name_v6); -+PHP_FUNCTION(geoip_domain_by_name_v6); -+PHP_FUNCTION(geoip_isp_by_name_v6); -+PHP_FUNCTION(geoip_org_by_name_v6); -+PHP_FUNCTION(geoip_region_by_name_v6); -+PHP_FUNCTION(geoip_record_by_name_v6); -+PHP_FUNCTION(geoip_id_by_name_v6); -+PHP_FUNCTION(geoip_continent_code_by_name_v6); -+#endif - PHP_FUNCTION(geoip_db_avail); --PHP_FUNCTION(geoip_db_get_all_info); - PHP_FUNCTION(geoip_db_filename); -+PHP_FUNCTION(geoip_db_get_all_info); -+PHP_FUNCTION(geoip_database_info); - #if LIBGEOIP_VERSION >= 1004001 - PHP_FUNCTION(geoip_region_name_by_code); - PHP_FUNCTION(geoip_time_zone_by_country_and_region); -@@ -67,10 +79,9 @@ PHP_FUNCTION(geoip_time_zone_by_country_and_region); - #ifdef HAVE_CUSTOM_DIRECTORY - PHP_FUNCTION(geoip_setup_custom_directory); - #endif --PHP_FUNCTION(geoip_asnum_by_name); --PHP_FUNCTION(geoip_domain_by_name); - #if LIBGEOIP_VERSION >= 1004008 - PHP_FUNCTION(geoip_netspeedcell_by_name); -+PHP_FUNCTION(geoip_netspeedcell_by_name_v6); - #endif - - ZEND_BEGIN_MODULE_GLOBALS(geoip) -@@ -86,7 +97,6 @@ ZEND_END_MODULE_GLOBALS(geoip) - - #endif /* PHP_GEOIP_H */ - -- - /* - * Local variables: - * tab-width: 4 -diff --git tests/013.phpt tests/013.phpt -index 24b27cf..3e1fc09 100644 ---- tests/013.phpt -+++ tests/013.phpt -@@ -7,9 +7,9 @@ Checking timezone info - --FILE-- - - --EXPECT-- --string(16) "America/Montreal" -+string(16) "America/Edmonton" - string(10) "Asia/Tokyo" -diff --git tests/020.phpt tests/020.phpt -new file mode 100644 -index 0000000..551563c ---- /dev/null -+++ tests/020.phpt -@@ -0,0 +1,35 @@ -+--TEST-- -+Checking geoip_record_by_name_v6 -+--SKIPIF-- -+ -+--FILE-- -+ -+--EXPECTF-- -+array(11) { -+ ["continent_code"]=> -+ string(2) "NA" -+ ["country_code"]=> -+ string(2) "US" -+ ["country_code3"]=> -+ string(3) "USA" -+ ["country_name"]=> -+ string(13) "United States" -+ ["region"]=> -+ string(0) "%S" -+ ["city"]=> -+ string(0) "%S" -+ ["postal_code"]=> -+ string(0) "%S" -+ ["latitude"]=> -+ float(%f) -+ ["longitude"]=> -+ float(%f) -+ ["dma_code"]=> -+ int(%i) -+ ["area_code"]=> -+ int(%i) -+} diff --git a/dev-php/pecl-geoip/metadata.xml b/dev-php/pecl-geoip/metadata.xml deleted file mode 100644 index 1315b88..0000000 --- a/dev-php/pecl-geoip/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - manuel@fritteli.ch - Manuel Friedli - - diff --git a/dev-php/pecl-geoip/pecl-geoip-1.1.0.9999.ebuild b/dev-php/pecl-geoip/pecl-geoip-1.1.0.9999.ebuild deleted file mode 100644 index 2bf55f9..0000000 --- a/dev-php/pecl-geoip/pecl-geoip-1.1.0.9999.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -PHP_EXT_NAME="geoip" -PHP_EXT_INI="yes" -PHP_EXT_ZENDEXT="no" -DOCS="README ChangeLog" -MY_PV="1.1.0" - -USE_PHP="php7-0" - -inherit eutils php-ext-pecl-r2 - -KEYWORDS="~amd64 ~x86" - -DESCRIPTION="PHP extension to map IP address to geographic places" -LICENSE="PHP-3" -SLOT="0" -IUSE="" - -DEPEND=">=dev-libs/geoip-1.4.0" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${P}-patch-to-svn-r337409.patch" -) - -# apply patches in unpack phase, or else the php7.0 dir won't get patched -src_prepare() { - local slot - local p - for slot in $(php_get_slots) ; do - cd "${WORKDIR}/${slot}" - for p in "${PATCHES[@]}" ; do - epatch "${p}" - done - done - - php-ext-source-r2_src_prepare -} diff --git a/dev-php/pecl-geoip/pecl-geoip-1.1.0.99999.ebuild b/dev-php/pecl-geoip/pecl-geoip-1.1.0.99999.ebuild deleted file mode 100644 index 0d0de41..0000000 --- a/dev-php/pecl-geoip/pecl-geoip-1.1.0.99999.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -PHP_EXT_NAME="geoip" -PHP_EXT_INI="yes" -PHP_EXT_ZENDEXT="no" -DOCS="README ChangeLog" -MY_PV="1.1.0" - -USE_PHP="php7-0" - -inherit eutils php-ext-pecl-r2 - -KEYWORDS="~amd64 ~x86" - -DESCRIPTION="PHP extension to map IP address to geographic places" -LICENSE="PHP-3" -SLOT="0" -IUSE="" - -DEPEND=">=dev-libs/geoip-1.4.8" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${P}-php7-ipv6.patch" -) - -# apply patches in unpack phase, or else the php7.0 dir won't get patched -src_prepare() { - local slot - local p - for slot in $(php_get_slots) ; do - cd "${WORKDIR}/${slot}" - for p in "${PATCHES[@]}" ; do - epatch "${p}" - done - done - - php-ext-source-r2_src_prepare -} From 3b6ae162ed8dc4d2c6ef27a2943b3552aadf4d7b Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Fri, 2 Sep 2016 00:06:41 +0200 Subject: [PATCH 05/15] dev-vcs/gitlab-ci-multi-runner: updated to EAPI="6" Package-Manager: portage-2.2.28 --- dev-vcs/gitlab-ci-multi-runner/ChangeLog | 4 ++++ dev-vcs/gitlab-ci-multi-runner/Manifest | 6 +++--- .../gitlab-ci-multi-runner-1.4.1.ebuild | 2 +- .../gitlab-ci-multi-runner-1.5.0.ebuild | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dev-vcs/gitlab-ci-multi-runner/ChangeLog b/dev-vcs/gitlab-ci-multi-runner/ChangeLog index 90524cc..655674b 100644 --- a/dev-vcs/gitlab-ci-multi-runner/ChangeLog +++ b/dev-vcs/gitlab-ci-multi-runner/ChangeLog @@ -1,3 +1,7 @@ + 01 Sep 2016; Manuel Friedli + gitlab-ci-multi-runner-1.4.1.ebuild, gitlab-ci-multi-runner-1.5.0.ebuild: + dev-vcs/gitlab-ci-multi-runner: updated to EAPI="6" + 22 Aug 2016; Manuel Friedli -gitlab-ci-multi-runner-1.3.2.ebuild: dev-vcs/gitlab-ci-multi-runner: purged all ebuild versions Date: Fri, 2 Sep 2016 00:26:48 +0200 Subject: [PATCH 06/15] dev-vcs/gitlab-workhorse: updated to EAPI="6" Package-Manager: portage-2.2.28 --- dev-vcs/gitlab-workhorse/ChangeLog | 5 +++++ dev-vcs/gitlab-workhorse/Manifest | 8 ++++---- dev-vcs/gitlab-workhorse/gitlab-workhorse-0.7.10.ebuild | 2 +- dev-vcs/gitlab-workhorse/gitlab-workhorse-0.7.11.ebuild | 2 +- dev-vcs/gitlab-workhorse/gitlab-workhorse-0.7.8.ebuild | 2 +- 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dev-vcs/gitlab-workhorse/ChangeLog b/dev-vcs/gitlab-workhorse/ChangeLog index 1ce83dd..4b186a3 100644 --- a/dev-vcs/gitlab-workhorse/ChangeLog +++ b/dev-vcs/gitlab-workhorse/ChangeLog @@ -1,3 +1,8 @@ + 01 Sep 2016; Manuel Friedli + gitlab-workhorse-0.7.10.ebuild, gitlab-workhorse-0.7.11.ebuild, + gitlab-workhorse-0.7.8.ebuild: + dev-vcs/gitlab-workhorse: updated to EAPI="6" + *gitlab-workhorse-0.7.11 (29 Aug 2016) 29 Aug 2016; Manuel Friedli diff --git a/dev-vcs/gitlab-workhorse/Manifest b/dev-vcs/gitlab-workhorse/Manifest index bdacac8..14b3aab 100644 --- a/dev-vcs/gitlab-workhorse/Manifest +++ b/dev-vcs/gitlab-workhorse/Manifest @@ -6,8 +6,8 @@ AUX gitlab-workhorse.init 654 SHA256 c7118997a4da198c477120a544969bdcb36404da871 DIST gitlab-workhorse-0.7.10.tar.bz2 29153 SHA256 df2c81175abe11608df89e1965f4f823f3cd0cac1650cce3bc2c6927dbda0b28 SHA512 17028df034b0fc5063f1ef1067061d1f3e2f38b7848daf242d806cf0abc1e97ebc7fce269c472ef450ba7d33e720554edcc300e1902d71b7b518fb67ee4abb5f WHIRLPOOL a1f5d056509a624279da526bd3a7b134177aafdec66467d121f050f2355406b3bd81a4fa6b7e4f81cc273dee7010e59a61986e69810fe766bf6322f741ff9515 DIST gitlab-workhorse-0.7.11.tar.bz2 29401 SHA256 54515f030664e33ae3925d9a85c4fe166fb6316752d819f51cb592f553284b4c SHA512 3f8c8b46f60f13a8d747eb92d42db7d7dae133813df34b263ddc87aef04592888532c1f07c9eeed5eb708af8232a2a98a382e056ff184d61547be68ba55da4e9 WHIRLPOOL a4b17b2784e428ea092c76a3a3ba410565fb3c08c47ef542ddcc126785f3eda837b9462311944be1145076fcecc3da51029cef795c3db7b342e8d95606acfde9 DIST gitlab-workhorse-0.7.8.tar.bz2 28253 SHA256 0823495288304a4e2c6491fb011d509ccabea8af765bd35e47e6e5b1da52a599 SHA512 392d1a11da1f61fa5e319d8cf5fc2f158cbc90baaedbd98f33a992cc938f67efe5837e9731c8b4b8d1e8265620c5ae69ced3326eb376aa1cc691457eb6fbc002 WHIRLPOOL fa61930d4a8ecad35b3d27f46da731623f6e41898485d564403ee53badd793824afdf1376c0e0cf6e2e6e30cbf205091db3e416841f60bf6ff905504714ca1be -EBUILD gitlab-workhorse-0.7.10.ebuild 918 SHA256 62e03ff726da9c3b850d58b1b94d7006ccbe6a49318cb5c4934e02c4da7c1ea9 SHA512 93faa1ae71c6832bbaa296c4c3f1f5added09e15580715d8968fbda8e8a67418f66fd257185628d6abafdf3a66f5a93a4a7743c2a7d0966c08a21566045f04e7 WHIRLPOOL ef78add24d1455e41c61855dc6b1f386036505cb468400f8e8f5b0dde45909713fed363dcc82f5164966568a0e4287eb848ba8cdfa24d720714421b3cfad6883 -EBUILD gitlab-workhorse-0.7.11.ebuild 918 SHA256 501c08b40c03de53309266ab1904e7a4de58f13a42020dfba1cebfaf62dfd7aa SHA512 71ccca01b865f262c8df7e2e79f1878ea671ff5430802cc85d333186e24758c74972171e11d5cf0b61d11d067d4350f3dbcc0325ea78f06482c4af85158ad42f WHIRLPOOL 99ee5476e5f290b520a19666dc62c0d786a25844027dfb71c9f9297eb0d5d951e17ed89030be2a1bfb837887d9f7250c8f0b9aca55c7551fc1aa9c27ecc731af -EBUILD gitlab-workhorse-0.7.8.ebuild 918 SHA256 e3d95d2e627772b1bb034134890e1f9422ad419d2ac57e55337a16e68b847466 SHA512 ee391c4ec21da9a04f1abbca7067aa3dd70b405cb271fab417ea7d023cbe874b05f70d1dd5f08f6d75bb7a16d02d80e0634aad3848dc3cdf95a9c6da8448fc62 WHIRLPOOL 7e27afa5c674c931dd96e1df0b1f2e74741039025d9c2f8937589a52af62acdec46f41eff201404904d5c7b1f7748aeaea091196a68ec7b2f9758f4bad519e34 -MISC ChangeLog 1952 SHA256 3ea7d89202cc68caa1172ac382d0c9fdee468a4d34029cd101b0dc6819824007 SHA512 e46e881572c8f1052d6ce3a5e3e9f4d4457c339bedc4bb8354d8a3f93da9d1d44c95c5067ae362d37c2f3f8b25546deaeb23c206ce8c2ed99cd6fa4a0c28f419 WHIRLPOOL 2fdd3158363822813870942b3ca107b14711a366c0816b9e8e81a4ea4a6bb8a8b8193b308478b5c864715d97a0fee020edf1aef979ec86f24661cb684fad9f2c +EBUILD gitlab-workhorse-0.7.10.ebuild 918 SHA256 c2806880e26561389e7f5a4c0e2d4b7a3d861bbfb5bf9f9730a1ab237d9b3f9f SHA512 069c7c333e34c48ab5cd59db58d21a8f42910c45c03bacd8e0476e41da68c34a743d5a6f6b26b6c9504c425212577c23904270a59205234afc5f9bb0d543b40c WHIRLPOOL e92bc053a0fea97919e826bf6e5e98b09887cc9e6cba5ddda5839c4c5c99fee216980ace4d978cc7763c1a1982dfe0236230de48473e5990d6bc95b52860531f +EBUILD gitlab-workhorse-0.7.11.ebuild 918 SHA256 5e59b0da6aa0344f72a59360743f95860e09e5ab937b72061f9760a64f86f932 SHA512 1263b50260ebe620d57c0028dc64597062918a6ca17eac7417a2a5774537eba2de44ec64431fd9d22e063250637908ea05d8139c38b3ff81c2fdaad904f0c0e9 WHIRLPOOL 0c503731f0164d6f479a60fa6424d8be3368ec98d9e5f3de3c52fec3322c61de379eb7342dd9be892d53972a20065d7a37e26b827a9efe0c61a2a3a7fa7bb298 +EBUILD gitlab-workhorse-0.7.8.ebuild 918 SHA256 f43ddb02be14989156e31ca4089a2ddb3bee814e044137b7cbb13cfcc635131b SHA512 b3a9b1e5cd76e4d9170c18137ff391159630b7ab14577b2ba66a3a419cca66042c9851978f8c8cd442f51548c36e020b831512f03a3e9ce30a730f4afb256e83 WHIRLPOOL 4a7d48749a143447a20b6cfdd4dddb5fd32e4f503cb4ab0fea6723d8b8cdf1be8c3cfbc32142f234f5434683c01869d6e922ebcf1d1f6c0cc026110d5a07382e +MISC ChangeLog 2152 SHA256 0247334313016f5bfc64d26937e701429ac07901e0981205eea87cb46fae05b3 SHA512 bbbb970dd6bc51ee113f586726b75ab1ae94ca63c2d131c99c4433693c69ddaa57b9b627996b91fc618a46fb61d1fc63311d8f31e68df41ba75b884507548cbc WHIRLPOOL f34ed692a81212e77fa8e25f9f523e2b276881c0370452eeabbe77fbae4dfaccef3292bec4c3a9aa7b6cabecbca9bb869c52426b3e43069eb404a969da87a1b2 MISC metadata.xml 234 SHA256 f35b97f99a26d73cc441e1d93bfe25aaa4e9f7f6d90c8d05a74f7b7bc5b68472 SHA512 59d8156b3ca3e99c40d5a2a32de7edf2eb53279b2424998862589d6bad77617d23fc852afec0a92f8ac5bb54a88ebc504cc0641029c1936412e90ab03dfdd447 WHIRLPOOL 935a1401910a42f888c991e443a49275ea8b87976c5aa977f670053d97d18754231749749bc92d37d4b5f45ecf65914480942a11b5827b6c08fb24313a428431 diff --git a/dev-vcs/gitlab-workhorse/gitlab-workhorse-0.7.10.ebuild b/dev-vcs/gitlab-workhorse/gitlab-workhorse-0.7.10.ebuild index 0db5892..cedcfbc 100644 --- a/dev-vcs/gitlab-workhorse/gitlab-workhorse-0.7.10.ebuild +++ b/dev-vcs/gitlab-workhorse/gitlab-workhorse-0.7.10.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" +EAPI="6" inherit eutils user diff --git a/dev-vcs/gitlab-workhorse/gitlab-workhorse-0.7.11.ebuild b/dev-vcs/gitlab-workhorse/gitlab-workhorse-0.7.11.ebuild index 5d1579e..8af8bba 100644 --- a/dev-vcs/gitlab-workhorse/gitlab-workhorse-0.7.11.ebuild +++ b/dev-vcs/gitlab-workhorse/gitlab-workhorse-0.7.11.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" +EAPI="6" inherit eutils user diff --git a/dev-vcs/gitlab-workhorse/gitlab-workhorse-0.7.8.ebuild b/dev-vcs/gitlab-workhorse/gitlab-workhorse-0.7.8.ebuild index 36897d4..2a9fd84 100644 --- a/dev-vcs/gitlab-workhorse/gitlab-workhorse-0.7.8.ebuild +++ b/dev-vcs/gitlab-workhorse/gitlab-workhorse-0.7.8.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" +EAPI="6" inherit eutils user From d99b53cd60469bfe2f63fff7f4cedb71be196408 Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Fri, 2 Sep 2016 00:36:47 +0200 Subject: [PATCH 07/15] games-rpg/ankh: updated to EAPI="6" Package-Manager: portage-2.2.28 --- games-rpg/ankh/ChangeLog | 4 +++- games-rpg/ankh/Manifest | 4 ++-- games-rpg/ankh/ankh-1.0.ebuild | 13 ++++++------- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/games-rpg/ankh/ChangeLog b/games-rpg/ankh/ChangeLog index dbf83c4..835464a 100644 --- a/games-rpg/ankh/ChangeLog +++ b/games-rpg/ankh/ChangeLog @@ -1,3 +1,5 @@ + 01 Sep 2016; Manuel Friedli ankh-1.0.ebuild: + games-rpg/ankh: updated to EAPI="6" + 07 Jun 2016; Manuel Friedli +ChangeLog: Added ChangeLog - diff --git a/games-rpg/ankh/Manifest b/games-rpg/ankh/Manifest index 4162aa4..832ef56 100644 --- a/games-rpg/ankh/Manifest +++ b/games-rpg/ankh/Manifest @@ -1,3 +1,3 @@ -EBUILD ankh-1.0.ebuild 1966 SHA256 2fc1db10d0d931930b8dcee297e7e5967cb55f7ce510ef50f2764dff2998036e SHA512 92feab4cdc973eb594156bd682a095110af8b33b5312b366d55d8f6d4dd9220aa0110fc33735692bbb61400c25fe4458923ae163ca06cbb718fa098acf68bfd0 WHIRLPOOL 8765c5bd5ee1c87d0eaed9ab36990816515affa0c0d548447996f75f295d3334ef6fe83920413c2d5a8f87de3b890b4d417bea529c6b5ce751b4ff9894828caa -MISC ChangeLog 82 SHA256 12ed3543adc88564630b15553233b47b2bf04f4acc8f97eeb5c5befa2c16c75b SHA512 bf31a0cd9c7f4c2b560ef6cd2174e927933d1004c8fab2089e1d0d8c8d76f26f449f9babd33b72176038868259296cd4dda9db0b9cb175274e98fff888290703 WHIRLPOOL f7606de1e805cc293c25b9538e2fd7433ed4cd076bf7e047d7583e4e3886de1a365fe6b1e75bbcbd80f8d4da4a74ec3259d9914462a80ac75e9537dca5c9e52f +EBUILD ankh-1.0.ebuild 1934 SHA256 e4d1035959a08bf128b3543b80c64ba9e83f9a6c39aaa91a2351ba76bad08465 SHA512 2f8bdbe684cc0f07ede8229628d615fec41885c938f62c29bab84b82facb1bbfc24efe95110bebd27ccb45aaba780109a0bbf90419e54d2657a68477d75d5d30 WHIRLPOOL d9a9bf3c6eeb184ad5a347f2b892ad8bda50a4f05d2eb70da2df6c9d85958e1034c5e22b1bbbb925dd1baec8a52c1e58833d369fdd7883b21036cc2eb0132979 +MISC ChangeLog 189 SHA256 55e545c9256a3d6f477972e28fbeedd98fb9d21b62540241ed5a85c4758ecf2c SHA512 bfdf37b496e51ed0d0f3117dbac657c66f8a2ee70c8656b40f611c7dcfd8943b8065b21faf2c69875c72a81c6dbbb481f55215667bcb3c3bd8847681224b9c25 WHIRLPOOL e2d72bd006be6ca6a84bfad1eb59d35e10eb4542957b8e4660b43bc273be4ca6053c7a7f2c3266363b7fa2a31e622adaa5548132b58af4dbfba3434b2dd0cb0f MISC metadata.xml 234 SHA256 f35b97f99a26d73cc441e1d93bfe25aaa4e9f7f6d90c8d05a74f7b7bc5b68472 SHA512 59d8156b3ca3e99c40d5a2a32de7edf2eb53279b2424998862589d6bad77617d23fc852afec0a92f8ac5bb54a88ebc504cc0641029c1936412e90ab03dfdd447 WHIRLPOOL 935a1401910a42f888c991e443a49275ea8b87976c5aa977f670053d97d18754231749749bc92d37d4b5f45ecf65914480942a11b5827b6c08fb24313a428431 diff --git a/games-rpg/ankh/ankh-1.0.ebuild b/games-rpg/ankh/ankh-1.0.ebuild index 5784edf..cb75cf2 100644 --- a/games-rpg/ankh/ankh-1.0.ebuild +++ b/games-rpg/ankh/ankh-1.0.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" +EAPI="6" -inherit eutils cdrom games multilib +inherit eutils cdrom multilib DESCRIPTION="Ankh a Adventure like Monkey Island" HOMEPAGE="http://www.ankh-game.de/ankh.html" LICENSE="all-rights-reserved" @@ -51,8 +51,8 @@ RDEPEND="sys-libs/glibc S=${WORKDIR} GAMES_CHECK_LICENSE="no" -dir=${GAMES_PREFIX_OPT}/ankh -Ddir=${D}/${dir} +dir="/opt/ankh" +Ddir="${D}/${dir}" src_install() { cdrom_get_cds data/Ankh.tar.gz @@ -68,12 +68,11 @@ src_install() { tar xzf "${CDROM_ROOT}"/data/Ankh.tar.gz -C "$Ddir" find "${Ddir}" -exec touch '{}' \; - # Argh the Program saves the settings in his install dir :( + # Argh the Program saves the settings in its install dir :( # so we have to set some dir to be writeable by the group chmod g+w "${Ddir}"/media/ # the settings are saved here chmod g+w "${Ddir}"/bin/release # the log-files are saved here dosym "${dir}"/Ankh /usr/games/bin/ankh - prepgamesdirs make_desktop_entry ankh "Ankh" "${dir}"/Ankh.xpm } From 79016cfca9e4881361cc45f862ca363c229bebb9 Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Fri, 2 Sep 2016 00:38:14 +0200 Subject: [PATCH 08/15] media-fonts/andalus: updated to EAPI="6" Package-Manager: portage-2.2.28 --- media-fonts/andalus/ChangeLog | 4 +++- media-fonts/andalus/Manifest | 4 ++-- media-fonts/andalus/andalus-1-r1.ebuild | 8 ++------ 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/media-fonts/andalus/ChangeLog b/media-fonts/andalus/ChangeLog index dbf83c4..ddc99d9 100644 --- a/media-fonts/andalus/ChangeLog +++ b/media-fonts/andalus/ChangeLog @@ -1,3 +1,5 @@ + 01 Sep 2016; Manuel Friedli andalus-1-r1.ebuild: + media-fonts/andalus: updated to EAPI="6" + 07 Jun 2016; Manuel Friedli +ChangeLog: Added ChangeLog - diff --git a/media-fonts/andalus/Manifest b/media-fonts/andalus/Manifest index 399fa7d..39fefd3 100644 --- a/media-fonts/andalus/Manifest +++ b/media-fonts/andalus/Manifest @@ -1,4 +1,4 @@ DIST andlso.ttf 158956 SHA256 29eedc86c06288ac5c3786cff85b1de3fa320e172eba267df46c50dd70b30999 SHA512 085da209e4927c8ad5635a71e720e136b4e699cb8d9a0122bfc9911bf46c65f1404b842538395549fa9ce0ade15f9e425ccb80011799453f2a93f8f3469594c1 WHIRLPOOL c7599cc53c6b4e32b500a4c71d2b646b8ede872847e8a8f69c3a88964008dbd62bde12765e8978de24f7b722161e009665d060864eb25fa3eb3a2360ad66ff88 -EBUILD andalus-1-r1.ebuild 617 SHA256 20836c02a67f5f16c496a77b4fb4465bc636a52d5979f241ac382d07af158e27 SHA512 e51e231dfcc52113a0ef343d8c387eb1e0856b3b09e072fec763bc700851875ed9b97b95c63e1dd6c575a4b243d36a3a65dbfed28f2190656faa8c36ad86cc30 WHIRLPOOL 7d2c11553c2e63347d75cc4328705c5bd836780560225953770e1ee149038cb3308678712ba5b7fa8bdf64d781b12c3e811763b1e0bc96e2559dcb70419ea8d0 -MISC ChangeLog 82 SHA256 12ed3543adc88564630b15553233b47b2bf04f4acc8f97eeb5c5befa2c16c75b SHA512 bf31a0cd9c7f4c2b560ef6cd2174e927933d1004c8fab2089e1d0d8c8d76f26f449f9babd33b72176038868259296cd4dda9db0b9cb175274e98fff888290703 WHIRLPOOL f7606de1e805cc293c25b9538e2fd7433ed4cd076bf7e047d7583e4e3886de1a365fe6b1e75bbcbd80f8d4da4a74ec3259d9914462a80ac75e9537dca5c9e52f +EBUILD andalus-1-r1.ebuild 586 SHA256 1c45b3c535faf0370919f7b355e4b0ee02a790cb192b061a4a3e0caf52cd35bc SHA512 8f09f3e1bea9491d792521434e4666c06b3280539a89cba21dddc8bcd28cc3f2f2c3cbe989a5cad4655ddd2e7062fd7a426ff327bcf6ddd99b65d19c7afa01b8 WHIRLPOOL 354e7d0de0284b569ae460db639c4e156089600b55da7d947411bfc0179ede1db8471133f93f0669715218f092a8b4162ff87e958a99cfd71dfb3111eb1df1ee +MISC ChangeLog 198 SHA256 6da394f19c69e10d3bcfeb9531a9072fae760e9abe3ae7c4b7d1cb97e14a40c5 SHA512 f9d11183078aab1c85dbe53c4c433876f778e475e9564b0a4087ce68cde9bbc372b86475bfd631665cc6763353ed3235bb928bf4bb5938867675e86b93f85cb7 WHIRLPOOL c842af02b26874cabac2df571d69e28551ea15380ed18b84e03266ef1ef979e178d491d261803e7cf5c29c3790ec3d7ab76678397fa8ec21c7323a13dbc1bf13 MISC metadata.xml 234 SHA256 f35b97f99a26d73cc441e1d93bfe25aaa4e9f7f6d90c8d05a74f7b7bc5b68472 SHA512 59d8156b3ca3e99c40d5a2a32de7edf2eb53279b2424998862589d6bad77617d23fc852afec0a92f8ac5bb54a88ebc504cc0641029c1936412e90ab03dfdd447 WHIRLPOOL 935a1401910a42f888c991e443a49275ea8b87976c5aa977f670053d97d18754231749749bc92d37d4b5f45ecf65914480942a11b5827b6c08fb24313a428431 diff --git a/media-fonts/andalus/andalus-1-r1.ebuild b/media-fonts/andalus/andalus-1-r1.ebuild index a135034..4529fa8 100644 --- a/media-fonts/andalus/andalus-1-r1.ebuild +++ b/media-fonts/andalus/andalus-1-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" +EAPI="6" inherit font @@ -27,7 +27,3 @@ pkg_nofetch() { einfo "Please download ${MY_P} from here:" einfo "http://fontzone.net/font-download/andalus" } - -#src_unpack() { -# unzip $A -#} From 0c8f0a7217766725d646c4ee6c2f404d99f1f719 Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Fri, 2 Sep 2016 00:39:11 +0200 Subject: [PATCH 09/15] media-fonts/snowflake-letters: updated to EAPI="6" Package-Manager: portage-2.2.28 --- media-fonts/snowflake-letters/ChangeLog | 5 ++++- media-fonts/snowflake-letters/Manifest | 4 ++-- media-fonts/snowflake-letters/snowflake-letters-1-r1.ebuild | 4 +++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/media-fonts/snowflake-letters/ChangeLog b/media-fonts/snowflake-letters/ChangeLog index dbf83c4..ebfb98a 100644 --- a/media-fonts/snowflake-letters/ChangeLog +++ b/media-fonts/snowflake-letters/ChangeLog @@ -1,3 +1,6 @@ + 01 Sep 2016; Manuel Friedli + snowflake-letters-1-r1.ebuild: + media-fonts/snowflake-letters: updated to EAPI="6" + 07 Jun 2016; Manuel Friedli +ChangeLog: Added ChangeLog - diff --git a/media-fonts/snowflake-letters/Manifest b/media-fonts/snowflake-letters/Manifest index 032f3f4..933bf5c 100644 --- a/media-fonts/snowflake-letters/Manifest +++ b/media-fonts/snowflake-letters/Manifest @@ -1,4 +1,4 @@ DIST Snowflake-Letters.zip 142677 SHA256 dfbe1aaeae3b02c534bae555e988d2d872aca8868a30688329401530b2db92e2 -EBUILD snowflake-letters-1-r1.ebuild 664 SHA256 3cd3ef9d70d1b1fd3cd3ba7a39c6e9fcf46e540a633e4817e2daa919c991b25f SHA512 8de5acc092b4f866846c1a8b71dbfe2d13582039efff54cb176e6a806d871474676f5cf54ad3db751949e9b3776e0eaa4e2e73253b1e2c5c0ea68553f06c8650 WHIRLPOOL 7e6b1f0bd9c96cb2863cb6e93930411551d459142d43a4ac496f78361a1c14a6b5206b78f5f56c7dd10fb8f87555fb10db46662b730a659a686127b331685822 -MISC ChangeLog 82 SHA256 12ed3543adc88564630b15553233b47b2bf04f4acc8f97eeb5c5befa2c16c75b SHA512 bf31a0cd9c7f4c2b560ef6cd2174e927933d1004c8fab2089e1d0d8c8d76f26f449f9babd33b72176038868259296cd4dda9db0b9cb175274e98fff888290703 WHIRLPOOL f7606de1e805cc293c25b9538e2fd7433ed4cd076bf7e047d7583e4e3886de1a365fe6b1e75bbcbd80f8d4da4a74ec3259d9914462a80ac75e9537dca5c9e52f +EBUILD snowflake-letters-1-r1.ebuild 674 SHA256 1295671c2aabbdb7d63d9d9d9503de988651d0944b8631bef7a24c8ddb49576c SHA512 18ff111a56710c1d72d4b80c1e703aa7a02ae98a6987c4c5b24cf015afaa6dbeef901c34dbb851d5dbf89e1d6e156a2049efe54f3444c812f9c366e5e318c92e WHIRLPOOL a69f06cdbcb7fa101579d93bcf44e895ac78bc7ac40990f1119e194b40dfc707f50addf4b331ac19402f6a6712a69763bfeff283a68fc946cfd4ad1513228272 +MISC ChangeLog 220 SHA256 687510152761a884ee78d0fcf1308d05bac8936a21e79428f9323911384a84ac SHA512 d3b107f6f9ed5d7a8adf4be43efa86e3cb582ad4d63dc47463f133fdaed50a1e8df933d3fbe5e18f68316df5c4158624f223b8c18e3f14dc225c1ee9d033680f WHIRLPOOL a6a76609fb2a9c13d5c668df166d95871affdc2274054d33bd4032fcd0b191945b01a86c0774592fb5d75d5e264dd4f3c2082289997691af2856a824ac660e52 MISC metadata.xml 234 SHA256 f35b97f99a26d73cc441e1d93bfe25aaa4e9f7f6d90c8d05a74f7b7bc5b68472 SHA512 59d8156b3ca3e99c40d5a2a32de7edf2eb53279b2424998862589d6bad77617d23fc852afec0a92f8ac5bb54a88ebc504cc0641029c1936412e90ab03dfdd447 WHIRLPOOL 935a1401910a42f888c991e443a49275ea8b87976c5aa977f670053d97d18754231749749bc92d37d4b5f45ecf65914480942a11b5827b6c08fb24313a428431 diff --git a/media-fonts/snowflake-letters/snowflake-letters-1-r1.ebuild b/media-fonts/snowflake-letters/snowflake-letters-1-r1.ebuild index 0467732..916d5a4 100644 --- a/media-fonts/snowflake-letters/snowflake-letters-1-r1.ebuild +++ b/media-fonts/snowflake-letters/snowflake-letters-1-r1.ebuild @@ -1,7 +1,9 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ +EAPI="6" + inherit font MY_PN="Snowflake-Letters" From 99fc125808219185dbc74e6864d61e36a410c1a0 Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Fri, 2 Sep 2016 00:40:46 +0200 Subject: [PATCH 10/15] net-im/jabberd2: updated to EAPI="6" Package-Manager: portage-2.2.28 --- net-im/jabberd2/ChangeLog | 4 ++++ net-im/jabberd2/Manifest | 6 +++--- net-im/jabberd2/jabberd2-2.3.6.ebuild | 2 +- net-im/jabberd2/jabberd2-2.4.0.ebuild | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/net-im/jabberd2/ChangeLog b/net-im/jabberd2/ChangeLog index 145c893..60c8820 100644 --- a/net-im/jabberd2/ChangeLog +++ b/net-im/jabberd2/ChangeLog @@ -1,3 +1,7 @@ + 01 Sep 2016; Manuel Friedli jabberd2-2.3.6.ebuild, + jabberd2-2.4.0.ebuild: + net-im/jabberd2: updated to EAPI="6" + *jabberd2-2.4.0 (07 Aug 2016) 07 Aug 2016; Manuel Friedli +jabberd2-2.4.0.ebuild: diff --git a/net-im/jabberd2/Manifest b/net-im/jabberd2/Manifest index 421d017..d212754 100644 --- a/net-im/jabberd2/Manifest +++ b/net-im/jabberd2/Manifest @@ -5,7 +5,7 @@ AUX jabberd2-2.3.4-optimization.patch 627 SHA256 8a10c307846425d0ca8f987c8f46c15 AUX jabberd2-2.3.6-configure.patch 593 SHA256 39d3cdbcf57ff2247c4ca21cc130f56173a7f0db9f37f71048cae4cd9a043e15 SHA512 15e12903af39209e94b2ee42b802f93d5dc9f5d5f6dc646b65402d4445e046df02fe8150be675024a2b7f4d8f21f2cd2af1976a28c81d429be2e91c3845a327a WHIRLPOOL ef49fd6dd2158804bbd7bb93994089d2f301878ba7dcfa2d93ad77e6c4cbaa52c26e61f6191013b911ca8852f6e3d64faea2fea248dc5ddbcf5f0808cd759faf DIST jabberd-2.3.6.tar.xz 1503864 SHA256 33cbf58135f856f5e6e6a7769623fedfda21f0c5f88b3b687a22e04ad915c051 SHA512 c5efa443865028874e1c1f15937064edef4c1699afb14b55963e3cd86930a67dffed7830ab1ae77522cbf797ef9ab89d044ccb28ac65904ffa7e79dee155e8aa WHIRLPOOL 43f6c02d67c792fa1391cc87e7f4d60b6fe7089d8dc7796d54e0e25f1815ad29921eeb97aeb554b015261b7e5f83cd33d076abb61e60ff9fe9441971cb85bdcb DIST jabberd-2.4.0.tar.xz 1507452 SHA256 1101571f4a94d7ec5a82839e9e2abee51f3983e3b9c416f1b7f2f738ebebdee1 SHA512 eb621d2d76806361f54db49d1d3b2be0e0b5559f8ec64bc8ce8cd10f1455e8f4b98395cf790f969cb8ef63f2fa83f5974c5b70aaa82bbe670e1aa15a3d5a0a0b WHIRLPOOL f6e64febfc72e0d18f2063027cc764361601ab379e41bdb27a7d01f35d472a35632203f0905de8d61ef5f633f53dfa950310c20e9d7d8b69b922ed641793721c -EBUILD jabberd2-2.3.6.ebuild 5270 SHA256 59d85fa7b59a21011e080f475ccb69bfdb0aed4b86120e64e746c03e870674db SHA512 091ed958d3e0b0e663965ae7200054f8dc3fcf8665b9232edf04c34b42081f81f80d3a13f18965d74da9ed578a96439f69468518f298fd5c555de8b5522c5274 WHIRLPOOL ddc22f6f4019a5759f8182e3524fdd14bf36083a0537bc7b3bee576845c0ccf92c424e85a806cdc85a7e3f5b5a01d9abd2e5cd26c1744044e231bf44797a8513 -EBUILD jabberd2-2.4.0.ebuild 5228 SHA256 80927a0c19c7a97a3f81ba28141c90f5c0c110f661024da9c38b3244879ef865 SHA512 65ae3de033e178598a3401b585c7ba28b2e94ae55e86dc18d526f59f6800128c0ac608ff7723de85c66683a8db37a56ec74b0b2b9046038a96e6657e29462e86 WHIRLPOOL 004d08df2f8b3fdd28bc73628e1a17bbb914bdd8632285f97595b6cc6e2039e72fb8b303f1f88150e3300c6dc5b9cb9bd665706d9554c42c1ed79d764f93a5fa -MISC ChangeLog 561 SHA256 95bb8ede7a41f3fef819599d60791d20af556ffe359bddc402896a0559525151 SHA512 50503af9d2f237d1d0d8d7cbd9aaca46feb6437f8e9a578195753b417c70f75db09c62e9304cab3fe822aa641bb2fba8c8ac9c48ffc415de5b0a5bac177b9584 WHIRLPOOL 813520ed329a67e6f3829414ceb90960d24ecb6839215c41023e15401bcbc872da8a04c33653317bf5ea678993c3e813a42dca1d4fb76c5627ce8e46d3b0f60d +EBUILD jabberd2-2.3.6.ebuild 5272 SHA256 95e9b06e21c5d1547ffd28d918f3c7bea40b3497d22aa57b6b87e734e127c1a4 SHA512 aafa0f7ec522a7ac6a6405f1cfcb8671d12cef4b6eaed9f91d6f73e9ea99f0b89061bfc1dceb51ea8117fdec1826ed6a989fb71bb1728f7041d59c1cea1bf7e5 WHIRLPOOL d6eafd7a4c4ca362157ed6b61001b2cc08fe4806dd5cc50acbe67a3eb60f0364bb1b1ce601ce85b6545ec097760c473d4569def9af23f04dcd35202b16838ceb +EBUILD jabberd2-2.4.0.ebuild 5230 SHA256 b1e897cd2b1fcac533e6b9ecce27f20b466ea339d5d974fcc04dea926a017d47 SHA512 cc2be1725f3102e63f90c8060c9e84c5064c375ad06017af843a1d66646fbdf384ecfe2f9f77e245d61ebc0e6b0f3bf9d51c721e2286b0caaf601a448cb2a043 WHIRLPOOL 0146bf4eb8d8e49fbd54f2ae593e1714adf5dd4714270b7dfaaad2c4d8573064ee0ef6a46392e9bf481cdebf68ee97d0f7b6fdb24fb16815ec68843cc126e68e +MISC ChangeLog 701 SHA256 e2f1faba3ecbfbde3e6ad1492940cf320586715fd84073617f12e267d9088530 SHA512 ab5fdda08ed1514fe358dffe566038afe0d4682c10323ec73e42dece2b3bfae2efba242cc18adb727526dc6709568f2d5eceb9997472e77bd44ac5214087ce28 WHIRLPOOL f6bf99b57bd74a5709820ab66db5c049561bcd510ca1d17a3e2faf64bb88c119663cc57d5dd41a09bd27ba80c11ac1a688bb16a2db31aa48f5419a3ef3007c91 MISC metadata.xml 579 SHA256 70e01bf1f9b621d35d36cfd78ed7f99a214eadeca0dd5031adc86aff077b2023 SHA512 ebaf4fd332d1dede7f0e68e135e14c9e464b04ac22a11af32a43af91af2ec17836165d810e6fe4cab876ea33f120ef00fc9392da2c80b90813e7857c946abcda WHIRLPOOL 84043f101020e6bea68efe9be27c5d08fff6d0f06116c0643ce27b36a146068dadbb235aebe7a2d377dd9c269ece471ab4080fc1589263b315c04941c140dcf6 diff --git a/net-im/jabberd2/jabberd2-2.3.6.ebuild b/net-im/jabberd2/jabberd2-2.3.6.ebuild index 37f245f..41db49c 100644 --- a/net-im/jabberd2/jabberd2-2.3.6.ebuild +++ b/net-im/jabberd2/jabberd2-2.3.6.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI="6" inherit autotools db-use eutils flag-o-matic pam diff --git a/net-im/jabberd2/jabberd2-2.4.0.ebuild b/net-im/jabberd2/jabberd2-2.4.0.ebuild index be229ab..8842cd3 100644 --- a/net-im/jabberd2/jabberd2-2.4.0.ebuild +++ b/net-im/jabberd2/jabberd2-2.4.0.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI="6" inherit autotools db-use eutils flag-o-matic pam From 806a25479238d74db28f3844aa197946cee78b70 Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Fri, 2 Sep 2016 00:44:22 +0200 Subject: [PATCH 11/15] net-im/palaver: updated to EAPI="6" Package-Manager: portage-2.2.28 --- net-im/palaver/ChangeLog | 5 ++++- net-im/palaver/Manifest | 6 +++--- net-im/palaver/palaver-0.6.ebuild | 4 ++-- net-im/palaver/palaver-9999.ebuild | 7 ++++--- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/net-im/palaver/ChangeLog b/net-im/palaver/ChangeLog index dbf83c4..832e464 100644 --- a/net-im/palaver/ChangeLog +++ b/net-im/palaver/ChangeLog @@ -1,3 +1,6 @@ + 01 Sep 2016; Manuel Friedli palaver-0.6.ebuild, + palaver-9999.ebuild: + net-im/palaver: updated to EAPI="6" + 07 Jun 2016; Manuel Friedli +ChangeLog: Added ChangeLog - diff --git a/net-im/palaver/Manifest b/net-im/palaver/Manifest index 9414456..d3ed460 100644 --- a/net-im/palaver/Manifest +++ b/net-im/palaver/Manifest @@ -3,7 +3,7 @@ AUX palaver-initd 651 SHA256 6cee305fc9d97c7ef3929a6202201b237eaee7c8cf9d8306a88 AUX palaver.conf 116 SHA256 4c532034298f197a7810463d9f0a850e8118b96f50efd850f65097c017622d9f SHA512 f34536040a13bce8e419559b59058d930ae851917fedb150b3c9c4315f7946be9ca56af28841fa86ee1b3252b98eadcb01d3bb87a73e77917d59646fbb6871f2 WHIRLPOOL 26a61f877c6dbf6dc08f39dc0164c1672a4b050073ecb99b3b331ff7152fee4ff198ec4faf829018870a2022ebcf8e03eed9b1b8a02d47d032284741978d0c33 AUX palaver_plugin.py 1222 SHA256 f9e81c27fb210799739ed36964b203a3ebde15584f9499d965db20e63eeeddf0 SHA512 5957e52274f38d82f3c897b24b8588eeb6a93eb9a04c2a421e9f95eab1a451da4bf1b944f19914163c9e925eaf37fb9fe6b332866859c22df40216d447a505ce WHIRLPOOL 9cf4778eaf45c556456c79764bc630d268fd0e2dbcb189d4af88b5664aeae0b3e91ee0af98e9666c9b160e454456fc7781e0bacd33dd7dcc0f40ff4d6d1ad427 DIST palaver-0.6.tar.gz 118665 SHA256 0bcb8ff9834b8db905fa2c1a06f84a50bc9a459a326c6d67a10ac7a08f841e7a SHA512 adb1417802c845762ce4ed476cae0695fb21c22fc2454913ea103ee54f71c71da18186f92da3ce3cb05734c3f8ad58df0964b30f6c8984239cf365bfaeed84ec WHIRLPOOL b2848d97ee1861ecc07446ef2f83ae73063edf105706b8126575926b2820ca958e9901fd2d67c8c38577fdd489d1c3eec4fd711458357a911077341ab42c1e12 -EBUILD palaver-0.6.ebuild 1261 SHA256 0e86984b6cc9bf0bee3fd3acc9c86212ff78d7660469d4b76880bd47396e69d9 SHA512 bc5dee14584185fd6d53c51bc96ca89fbce5a73eb9efcb4c9a977de5e6517225acd589f5605c0c5d05043ee5aa53c64ef8574f7f8422f6a490f255f53c8d8062 WHIRLPOOL e48b2fe259b487001550bad86c427f381fc72a13622deaf8f1c6cd22cf02c18596d88c7ad8c4250a2edecf45f03e7cf748ddaa7d92a7b3ef0abe34a21cb64c2a -EBUILD palaver-9999.ebuild 1235 SHA256 e32f4dc21ee790030ac2780e851e50953a5fead963f20c61639f9728b7969f8d SHA512 e1ba23d1aeb244b09308bb2c851f50e625f9ea633b525598acccbc04d697406006a20ba88a037b3e485c753b05bde80b735b3bf5d2cff780e054ae980ca35159 WHIRLPOOL 3f8753e86e1247445b55683bce0d04943a1f7af87c5b5b8d94653d371b952638fa17ef401bf8eb77cffd11717a848eaba026eac99f346424b488f0f4b5a1118e -MISC ChangeLog 82 SHA256 12ed3543adc88564630b15553233b47b2bf04f4acc8f97eeb5c5befa2c16c75b SHA512 bf31a0cd9c7f4c2b560ef6cd2174e927933d1004c8fab2089e1d0d8c8d76f26f449f9babd33b72176038868259296cd4dda9db0b9cb175274e98fff888290703 WHIRLPOOL f7606de1e805cc293c25b9538e2fd7433ed4cd076bf7e047d7583e4e3886de1a365fe6b1e75bbcbd80f8d4da4a74ec3259d9914462a80ac75e9537dca5c9e52f +EBUILD palaver-0.6.ebuild 1263 SHA256 b605c261021a232269fa4f961a4b16383f76dd7fcfbb7500954499e1220d88ea SHA512 d7b84a28bcd24a73907789d86f153fe737aa4734d7916f51313f3d7579776853de3347432a7f9264bc8ae3e4130e7742b5a86e3c79c86d39781814162b4b78f2 WHIRLPOOL 7b920882044aaed749fb2cb528a5a575e43382c0c532a388e9a9cb1c7e8135184bd20185adbfb79674c72eaa021e937602b02c16f19918a78c417dd041877151 +EBUILD palaver-9999.ebuild 1239 SHA256 830e598850f2b52e20ec97b3f24f9da95cd3c9146b123137f2947c2d9029fa6d SHA512 d212e43200e60052e0d263b0b2e36b7a152f7e92789f3cbda5ee988a110740af2608ef85e332bd010dfecc8a27bd77af237bffa9267b99a1bae532f5644b182c WHIRLPOOL b5a3d00c2e9d64ae42d71ed40d76812ef5e7cb7302668b5816c878041788fda888966dd7ffba8e4b892f59b400dbc59ce59ea95adae4a01c093c216a876dd4e7 +MISC ChangeLog 215 SHA256 e6ce88d57a52177c4e281cfab556942422b2bb4f3c33dffcf1e17560b40f5946 SHA512 26ee46e7ddb80def12e64728d4810fb7f00eb957c7c1b14d1b766a91290dcf1df5e1b29d80b4c9a5723832b15918f60145607bb5927dff2fd87f29de98bb007a WHIRLPOOL 7c1b94b92e8a614fea5b114d2290ae689d99ef9efc5bc6c0e075bce372b693f8d5c5971cb5aaf32b37e8031048fdd53ccd14abee540aa091d0b99084e9762ca9 MISC metadata.xml 234 SHA256 f35b97f99a26d73cc441e1d93bfe25aaa4e9f7f6d90c8d05a74f7b7bc5b68472 SHA512 59d8156b3ca3e99c40d5a2a32de7edf2eb53279b2424998862589d6bad77617d23fc852afec0a92f8ac5bb54a88ebc504cc0641029c1936412e90ab03dfdd447 WHIRLPOOL 935a1401910a42f888c991e443a49275ea8b87976c5aa977f670053d97d18754231749749bc92d37d4b5f45ecf65914480942a11b5827b6c08fb24313a428431 diff --git a/net-im/palaver/palaver-0.6.ebuild b/net-im/palaver/palaver-0.6.ebuild index 0c56473..3426731 100644 --- a/net-im/palaver/palaver-0.6.ebuild +++ b/net-im/palaver/palaver-0.6.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI="6" PYTHON_COMPAT=( python2_7 ) inherit distutils-r1 eutils python-r1 diff --git a/net-im/palaver/palaver-9999.ebuild b/net-im/palaver/palaver-9999.ebuild index d77670f..cca68ab 100644 --- a/net-im/palaver/palaver-9999.ebuild +++ b/net-im/palaver/palaver-9999.ebuild @@ -1,11 +1,12 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI="6" PYTHON_COMPAT=( python2_7 ) -inherit distutils-r1 eutils python-r1 git-2 +inherit distutils-r1 eutils python-r1 git-r3 + DESCRIPTION="Multi-user chat component for jabber implemented in python" HOMEPAGE="https://github.com/fritteli/palaver" EGIT_REPO_URI="git://github.com/fritteli/palaver" From 53b07d057771fef12fd58db39ca0d860edccfb5d Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Fri, 2 Sep 2016 00:45:24 +0200 Subject: [PATCH 12/15] net-im/punjab: updated to EAPI="6" Package-Manager: portage-2.2.28 --- net-im/punjab/ChangeLog | 5 ++++- net-im/punjab/Manifest | 6 +++--- net-im/punjab/punjab-0.15.ebuild | 4 ++-- net-im/punjab/punjab-9999.ebuild | 6 +++--- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/net-im/punjab/ChangeLog b/net-im/punjab/ChangeLog index dbf83c4..66f2b3c 100644 --- a/net-im/punjab/ChangeLog +++ b/net-im/punjab/ChangeLog @@ -1,3 +1,6 @@ + 01 Sep 2016; Manuel Friedli punjab-0.15.ebuild, + punjab-9999.ebuild: + net-im/punjab: updated to EAPI="6" + 07 Jun 2016; Manuel Friedli +ChangeLog: Added ChangeLog - diff --git a/net-im/punjab/Manifest b/net-im/punjab/Manifest index d8abae2..70ed5a7 100644 --- a/net-im/punjab/Manifest +++ b/net-im/punjab/Manifest @@ -1,7 +1,7 @@ AUX punjab-confd 67 SHA256 2951827630ccbd793922d32f7f61416747c50ebb2cd542062f1dd82dc9ec94c7 SHA512 9784f2b70cc5830b44702ad74d5b18475fb081f5728ac346746b3f347a9a33771680752a29e42e13b9d2ce7eb983babe22486945b2be22dbfbff6078e8a837ba WHIRLPOOL cb64ecbcd7710d0a6f33ece9bb851a829a6e8c1a978235f7e96f882d69b63ab172a69e4c04c38adc07758fcf39fa0ebebf8f3a40821d7295746378d91d3f98dc AUX punjab-initd 622 SHA256 f6142a10931321d1627ced397e53251b7ce05a1f24e61c73d7a6ae2cdbe652fa SHA512 da206f1586373338049e176d72beb87d3ae4867f37f692a1ed6d2e2beefbe0526da668d3f0112c6097bbe0f97067011c90731ef020563e1d0d842d8f533c5d14 WHIRLPOOL 5633baaf101bb0524b913902acf7db9c89828dd2a04b773d521f214022828d4498467f718294d3be242d1ab543a3a7bbf8d7d75bfa8979ad03ec0343b9f3379e DIST punjab-0.15.tar.gz 44056 SHA256 96fd69d77477f967f25c0d6a0af5a628d522e6df11dbb6a16e84bf357db18e76 SHA512 7651cade4e8caea700dd8cccff6459b0b3593003466056c961e95261f33d533e767ff923d81685170b8c6ce1623147723b98c25210a427a016df8cb9fec09dfd WHIRLPOOL 1497a41540715c41e5407200c29c2067222526e1d0148bfd355930bc5f5f89f7080c2d67d8f63558542f770401d058f6b08062e4fc032a5bbe5e5dc5a4ea0121 -EBUILD punjab-0.15.ebuild 1292 SHA256 f3cd3e531653646de74af92118e59fa1843b5055472d235d892a7ede547483ca SHA512 be11fc45d928d397ba2eb623f72bd8321a33f192a54e40d2362aa67b3b084a2e0befb4c112685104508ed1f5490472b2ee720302a544933f3aa50539c8fc9ad8 WHIRLPOOL c400afc63e5439536679ca40c2172e856e959720c1cc64f9f053aa25fb4b0451f6106509653db67f3a92496df64580d342316c05cf4651e24edaf570acdd6b0c -EBUILD punjab-9999.ebuild 1265 SHA256 d96d221fcb3c7f99ea75e7045a25848867424dba100966bc1ae166c792a63248 SHA512 8afa97fce87caa5da14fe232c38615b2fcafa7f21dfa1521ee1d12e20e83e51768d3617c6efcc2449d4828ab19bea3333bd659d10d9e122553f70ab27a0022c8 WHIRLPOOL 9aaa63e728e014dabd47c09170bff131f6524446ed8a1329a1f3dda53f0489bcd9b2fef51c0099be56064f05d0815185932281c87a701155d1d22fe870843e44 -MISC ChangeLog 82 SHA256 12ed3543adc88564630b15553233b47b2bf04f4acc8f97eeb5c5befa2c16c75b SHA512 bf31a0cd9c7f4c2b560ef6cd2174e927933d1004c8fab2089e1d0d8c8d76f26f449f9babd33b72176038868259296cd4dda9db0b9cb175274e98fff888290703 WHIRLPOOL f7606de1e805cc293c25b9538e2fd7433ed4cd076bf7e047d7583e4e3886de1a365fe6b1e75bbcbd80f8d4da4a74ec3259d9914462a80ac75e9537dca5c9e52f +EBUILD punjab-0.15.ebuild 1294 SHA256 b92c82909cadbaa1683e57b8f32db251dc6158cbad80c07bc4565fc6caab3196 SHA512 e8e19121c9fe2105d8c5aad4f0b2fed14f09b9c947271f1420c48067f1924949b3fee34d360557040291d4d0e6ee641ea01451b7458a7ef7a9276cde9123fb4b WHIRLPOOL 4d6d923647a66c4ac667baa3280dd7b8c3b53b50811abb624a8f29e01539c77dbf904dd0214400722d034bb5337149538235aec2376b15579378df99d946063d +EBUILD punjab-9999.ebuild 1268 SHA256 34c28aabf3b4e17d1e77b5b293b15484adfb38f2da0cbf2b420afda98f1e1884 SHA512 e73c9ad4b9b4d4f199a606f2b78f2e8c8974e5f7bebdb51e3e99f05e58f5448c544d6b05878aae0c72bf9162e68dbe1bfe0644789b5a5fcab37bb78b2684d470 WHIRLPOOL 4d2d8d3dd250b8bc053f43dcc58a0c43447f8ac55371b37876f45630c3ec9e0776641778e424cc272e418df1b174f753a7adc7cf1bc7f9c082a30a7957b9b252 +MISC ChangeLog 213 SHA256 0124502f905a482eb5621b73fabb7c342b8d48ce90352bfb58eac189c92e5ce5 SHA512 25071be9a47975b6f15ea67fc06e60a42261febcbd3c5b24cadeeb544627bb1cc9d20b9ccf6b0c45f9017fe81ebae9ba1d1a0893c98886e1c29f202e969e9de9 WHIRLPOOL bd04500c24ea8f88754c7e009c118cb31248a0ce7d11132703f7daaf687f62594b6faf39e395834f4d9118adea257dcd69ac3ed7cf93f22362a1d5c5943ba3a3 MISC metadata.xml 307 SHA256 c5de1524b4a2f44a68113ee604c2e4917a13f6d3689fe4b3a5b54f0037a083de SHA512 22f5442878e7b227d7ba0cb7393865818474086e26ed8e835903f64af8b9c72c524640a8c4ced599a7181e4f3b4195ce84d026729ad22908832b5a9f31697e4e WHIRLPOOL c759749f423ad411f0f2d2f3fa82b395369c58a6da3aa8efc90831a9238758c4f70d2003cd81512fbbe797b02817cc26ebae76eb917610354ec6f197f139dd17 diff --git a/net-im/punjab/punjab-0.15.ebuild b/net-im/punjab/punjab-0.15.ebuild index 20d21e3..5b8a35e 100644 --- a/net-im/punjab/punjab-0.15.ebuild +++ b/net-im/punjab/punjab-0.15.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI="6" PYTHON_COMPAT=( python2_7 ) inherit distutils-r1 eutils python-r1 diff --git a/net-im/punjab/punjab-9999.ebuild b/net-im/punjab/punjab-9999.ebuild index 5b32ebc..9429174 100644 --- a/net-im/punjab/punjab-9999.ebuild +++ b/net-im/punjab/punjab-9999.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI="6" PYTHON_COMPAT=( python2_7 ) -inherit distutils-r1 eutils python-r1 git-2 +inherit distutils-r1 eutils python-r1 git-r3 DESCRIPTION="BOSH connection manager for jabber implemented in python" HOMEPAGE="https://github.com/twonds/punjab" EGIT_REPO_URI="git://github.com/twonds/punjab" From 73f24b50b28b8f570ef504e7ef7b18ea813d5ce6 Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Fri, 2 Sep 2016 00:47:49 +0200 Subject: [PATCH 13/15] net-news/feedreader: updated to EAPI="6" and deleted old ebuilds Package-Manager: portage-2.2.28 --- net-news/feedreader/ChangeLog | 4 + net-news/feedreader/Manifest | 10 +-- .../feedreader/feedreader-1.2.1-r1.ebuild | 79 ------------------- net-news/feedreader/feedreader-1.4.3.ebuild | 79 ------------------- net-news/feedreader/feedreader-1.6.2.ebuild | 2 +- net-news/feedreader/metadata.xml | 3 - 6 files changed, 8 insertions(+), 169 deletions(-) delete mode 100644 net-news/feedreader/feedreader-1.2.1-r1.ebuild delete mode 100644 net-news/feedreader/feedreader-1.4.3.ebuild diff --git a/net-news/feedreader/ChangeLog b/net-news/feedreader/ChangeLog index 059767c..c299b78 100644 --- a/net-news/feedreader/ChangeLog +++ b/net-news/feedreader/ChangeLog @@ -1,3 +1,7 @@ + 01 Sep 2016; Manuel Friedli -feedreader-1.2.1-r1.ebuild, + -feedreader-1.4.3.ebuild, feedreader-1.6.2.ebuild, metadata.xml: + net-news/feedreader: updated to EAPI="6" and deleted old ebuilds + *feedreader-1.6.2 (30 Aug 2016) 30 Aug 2016; Manuel Friedli +feedreader-1.6.2.ebuild, diff --git a/net-news/feedreader/Manifest b/net-news/feedreader/Manifest index 79fea1a..e2942d0 100644 --- a/net-news/feedreader/Manifest +++ b/net-news/feedreader/Manifest @@ -1,8 +1,4 @@ -DIST FeedReader-1.2.1.tar.gz 970118 SHA256 cb24d6dcef46080f2aa61fdc1b0187a8c52aedf913e6f63325ee46c631e5c87a SHA512 386c4c137bb4abba918e4f987666358ebe3926b0d4d3b466648d2679efd218376baf1ff58c987dfff953e9b6f084a47db34df8044a3a64ecb1f8e560f0f09e74 WHIRLPOOL 3e6f62c18ffb1dbe669f969b76de496463a49804c3da5d9e35e8726e4cef45552291c94b33cf3129805720cacc51953d60dfb4b54658344c261b412f29ab847f -DIST FeedReader-1.4.3.tar.gz 1097255 SHA256 e43ceb9eb866c2e8e16d460b6914e6450b2c97fe62f0730a2ec67a3c7d7f0a3c SHA512 bb4057608bbc7c5c5e92decc3222950f13cf6dc5fb1338f661b3f990a68b3ff28f7ecd3b68a90139fc4d4f90c0fa7b193a94a8819e10092a3d37f33a284640be WHIRLPOOL 316a8b6f599dd4c64800e040ebe11f7e9b702a1f2a762b32c0f35ca8098ef3fd35a1ca7ea77c362b0a0eb6450f42d39b1a8c112e8096d1b4af98b2e372b2d23f DIST v1.6.2.tar.gz 1102370 SHA256 c9ddb59d14a2cb04d00db07fcd90f3de07f9ae1f2fb0f21783db8e9a242991ed SHA512 ca24b96d270c3b880557baced1aa5a08f9ad11845cdab5e30b2c03381b3bfcad2b7e16310d5672efca75a7cbd1e47079f7c18083322cc56412a16a9968ea1033 WHIRLPOOL 9f8821d96433544b8aba19e813785febc18691ef7f821eb5193f4d6a37cfa2e1090e380389debb54ade4af85232b3b4b27c84e8770fb166e0a4bab160ff2f2de -EBUILD feedreader-1.2.1-r1.ebuild 1443 SHA256 eb134c2603b871ae9b84796985056189156eb519b1d6a4e56e19a1e22ccf40a7 SHA512 c2d46936133aee10000d5d076908334587d968ca75bdb92b7735564620407287c964201298e661f2e0be704d80e44ae68ecd46418ec4c3de16dd6b326a1e41a7 WHIRLPOOL ae9ae971caac69a136fc3ea5f0103c89c2e7d935dc0589a07a15e5dcc57d46dc0ccd1edca5f6699dadbf2c676db17db60b6da95fa8c143746e6cc2281ec49a39 -EBUILD feedreader-1.4.3.ebuild 1432 SHA256 66ea321c389c080f3eb448ee35adba864e93c73b476b9156e7f90b3907a4b47d SHA512 695a82048e272cf0fd6b768c8e0694646e11c31e33bc03377b16f139575eeb53f446c69b9896232c6e082609b0a79ab15e3b27d4339dad7f063221ea662a7e7c WHIRLPOOL 259ada7f1794a8f653d80325611dbf8abd73564718db45c04065591398f0666a72d8796cacabf5eb0e708fc82df058d49840ab54a2f90e2629832b896c3fce04 -EBUILD feedreader-1.6.2.ebuild 1483 SHA256 15902bbbaa3d2adafaf1cd8660c27ae4ab79adc01a956c856a48049221c0ad85 SHA512 9baa49e4d56f82af0afec82c354067f9de5319ff6379f948aac9cd1ee52657ad11e5fe6b19f73db3ccce9944f312933b157140bc047750a257d49175b44a11b5 WHIRLPOOL 39eed83844a4ad02e79b70c9c3c11bd4b088f5476c7c0d6d8675f9f10f0b98a816bdd638a49f25dccd28b485c00d722711f8c6c0004d1477aee0bd2deaddeecb -MISC ChangeLog 605 SHA256 d9cf02ee9212fd1acf6b1321416e74bc4f767ce1d140580efa21713f65e26c69 SHA512 c61a5563ddfd997ffdbda20d9618cec5fa3195295928ad044271572cb876cbbd28d247d22653145b9ef94a55dd9bcd6dcaedd8c78363427f96d74466987282b3 WHIRLPOOL f2523da04ef16fe8be1422a7d4591e124e037c7eb6d11d2e66e26c2c79755c05b0ed14673e204741d3cc60903af069b545dbecafaa4d17b0538be392ce9333a1 -MISC metadata.xml 338 SHA256 065c970f65dc2d874999563e23f1cd3b3eb7d81b3858c7c9fed5ede9c9230d03 SHA512 9f668348e070853e0b24d1bf8f18dcc33d80f40f8d70fe7363b6d008f3a1e841b14a3cadf94e40643b39b4fec18bb06df5ae0a3412b96cc5c43a8c5fe7aa1f19 WHIRLPOOL 51094d7ce385f827f140171e796cfa35a0acc4e69d6c5eea5e305af79be3c255d5d8d1b08fdb219a54e9771b6d8311a03845c1ef1ca4076cd93617d16cb35ed6 +EBUILD feedreader-1.6.2.ebuild 1483 SHA256 1475c9d87862efa0ba6fa1e1323891015de12d436ec0ca5edf47cd675f86fd5f SHA512 fc0f9f1b24d65e362614cf179f1474e7ca368ccaec1cbddd842ee501a58a5634b82e624399b9be943a4a4ad43f8765f6193edf65dc314a4bb46ecfa6b00efa25 WHIRLPOOL 0a7d06a9d651243919d90169c06d4390c1f8eed47135f01a5d9493dc04ede5a6b3afa93a068ff15c7c7a512458e1b3c5385b7a01ecc81b74b0b95dad8eeab8f3 +MISC ChangeLog 821 SHA256 905cc36286606714df3f73036ec0398049e586f758732b645d2ba1740d07600c SHA512 c44ee1fceff485030683cc1181df1af913217ab8904bc2eb0021fdf7c7b65f135389749001be45d125b718b4c410ab396a5a628a1ac89604ef3977cae2899f3f WHIRLPOOL b0ac347dab8df20e9c8d46b539ae8d662c3a2dabdc080dc63bd2737de145394e52705df8ce3106cba565f77e3c205f73c86a2d3d14d2955ece0c5cac42b813f5 +MISC metadata.xml 234 SHA256 f35b97f99a26d73cc441e1d93bfe25aaa4e9f7f6d90c8d05a74f7b7bc5b68472 SHA512 59d8156b3ca3e99c40d5a2a32de7edf2eb53279b2424998862589d6bad77617d23fc852afec0a92f8ac5bb54a88ebc504cc0641029c1936412e90ab03dfdd447 WHIRLPOOL 935a1401910a42f888c991e443a49275ea8b87976c5aa977f670053d97d18754231749749bc92d37d4b5f45ecf65914480942a11b5827b6c08fb24313a428431 diff --git a/net-news/feedreader/feedreader-1.2.1-r1.ebuild b/net-news/feedreader/feedreader-1.2.1-r1.ebuild deleted file mode 100644 index 34eee15..0000000 --- a/net-news/feedreader/feedreader-1.2.1-r1.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -inherit cmake-utils gnome2 vala - -CMAKE_MIN_VERSION="2.6" -VALA_MIN_API_VERSION="0.26" - -MY_P="FeedReader" - -DESCRIPTION="Simple News Feed Reader for feeds aggregated by Tiny Tiny RSS or feedly" -HOMEPAGE="http://jangernert.github.io/${PN}/" -SRC_URI="https://launchpad.net/${PN}/1.2/${PV}/+download/${MY_P}-${PV}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64" - -IUSE="+gnome webkit4" - -RDEPEND=">=x11-libs/gtk+-3.12:3 - app-text/html2text - $(vala_depend) - dev-libs/json-glib - dev-libs/libgee:0.8 - net-libs/libsoup:2.4 - dev-db/sqlite:3 - app-crypt/libsecret - x11-libs/libnotify - dev-libs/libxml2 - net-libs/rest:0.7 - !webkit4? ( net-libs/webkit-gtk:3 ) - webkit4? ( net-libs/webkit-gtk:4 ) - dev-libs/gobject-introspection - gnome? ( gnome-base/gnome-keyring )" - -DEPEND="${RDEPEND} - dev-util/intltool - virtual/pkgconfig" - -S="${WORKDIR}/${MY_P}-${PV}" - -src_prepare() { - vala_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DWITH_LIBUNITY=OFF - -DVALA_EXECUTABLE="${VALAC}" - -DCMAKE_INSTALL_PREFIX="${PREFIX}" - -DGSETTINGS_LOCALINSTALL=OFF - ) - $(cmake-utils_use_use webkit4 WEBKIT_4) - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile -} - -src_install() { - cmake-utils_src_install -} - -pkg_preinst() { - gnome2_pkg_preinst -} - -pkg_postinst() { - gnome2_pkg_postinst -} - -pkg_postrm() { - gnome2_pkg_postrm -} diff --git a/net-news/feedreader/feedreader-1.4.3.ebuild b/net-news/feedreader/feedreader-1.4.3.ebuild deleted file mode 100644 index c64a90c..0000000 --- a/net-news/feedreader/feedreader-1.4.3.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -inherit cmake-utils gnome2 vala - -CMAKE_MIN_VERSION="2.6" -VALA_MIN_API_VERSION="0.26" - -MY_P="FeedReader" - -DESCRIPTION="Simple News Feed Reader for feeds aggregated by Tiny Tiny RSS or feedly" -HOMEPAGE="https://github.com/jangernert/${MY_P}" -SRC_URI="https://launchpad.net/${PN}/1.4/${PV}/+download/${MY_P}-${PV}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64" - -IUSE="+gnome webkit4" - -RDEPEND=">=x11-libs/gtk+-3.12:3 - app-text/html2text - $(vala_depend) - dev-libs/json-glib - dev-libs/libgee:0.8 - net-libs/libsoup:2.4 - dev-db/sqlite:3 - app-crypt/libsecret - x11-libs/libnotify - dev-libs/libxml2 - net-libs/rest:0.7 - !webkit4? ( net-libs/webkit-gtk:3 ) - webkit4? ( net-libs/webkit-gtk:4 ) - dev-libs/gobject-introspection - gnome? ( gnome-base/gnome-keyring )" - -DEPEND="${RDEPEND} - dev-util/intltool - virtual/pkgconfig" - -S="${WORKDIR}" - -src_prepare() { - vala_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DWITH_LIBUNITY=OFF - -DVALA_EXECUTABLE="${VALAC}" - -DCMAKE_INSTALL_PREFIX="${PREFIX}" - -DGSETTINGS_LOCALINSTALL=OFF - ) - $(cmake-utils_use_use webkit4 WEBKIT_4) - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile -} - -src_install() { - cmake-utils_src_install -} - -pkg_preinst() { - gnome2_pkg_preinst -} - -pkg_postinst() { - gnome2_pkg_postinst -} - -pkg_postrm() { - gnome2_pkg_postrm -} diff --git a/net-news/feedreader/feedreader-1.6.2.ebuild b/net-news/feedreader/feedreader-1.6.2.ebuild index d82d933..2b705d9 100644 --- a/net-news/feedreader/feedreader-1.6.2.ebuild +++ b/net-news/feedreader/feedreader-1.6.2.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" +EAPI="6" inherit cmake-utils gnome2 vala diff --git a/net-news/feedreader/metadata.xml b/net-news/feedreader/metadata.xml index 728e1bf..1315b88 100644 --- a/net-news/feedreader/metadata.xml +++ b/net-news/feedreader/metadata.xml @@ -5,7 +5,4 @@ manuel@fritteli.ch Manuel Friedli - - Use net-libs/webkit-gtk:4 instead of net-libs/webkit-gtk:3 - From 5849d18a4d2aceb60fe5f79e4dfa9c1a088e7680 Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Fri, 2 Sep 2016 00:50:35 +0200 Subject: [PATCH 14/15] sci-geosciences/garminplugin: updated to EAPI="6" Package-Manager: portage-2.2.28 --- sci-geosciences/garminplugin/ChangeLog | 4 +++- sci-geosciences/garminplugin/Manifest | 4 ++-- sci-geosciences/garminplugin/garminplugin-0.3.27.ebuild | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/sci-geosciences/garminplugin/ChangeLog b/sci-geosciences/garminplugin/ChangeLog index dbf83c4..83d7cb2 100644 --- a/sci-geosciences/garminplugin/ChangeLog +++ b/sci-geosciences/garminplugin/ChangeLog @@ -1,3 +1,5 @@ + 01 Sep 2016; Manuel Friedli garminplugin-0.3.27.ebuild: + sci-geosciences/garminplugin: updated to EAPI="6" + 07 Jun 2016; Manuel Friedli +ChangeLog: Added ChangeLog - diff --git a/sci-geosciences/garminplugin/Manifest b/sci-geosciences/garminplugin/Manifest index 96ac350..2e55d71 100644 --- a/sci-geosciences/garminplugin/Manifest +++ b/sci-geosciences/garminplugin/Manifest @@ -1,4 +1,4 @@ DIST garminplugin-0.3.27.tar.gz 177120 SHA256 1400a30d16d96644e93e4968d4d6f5ca001e652ff7bef8b5adad17d97102d47f SHA512 94d65d88f11cf167e3c16dcb478ec6a2f5072969fd0a507b10fd2c82ebbbc800c6cb98d1efbfa38208cef75b2fefc26e7f15a713c46fb6057e8b9eba1a389066 WHIRLPOOL 07c3b7548c9a5d0de5331e683f7595ade2da43110aeec788bb6d35807d27d14dfd027e9dfe6a5cf39a1082e85149b546841ca40d4285198028370a77bfdcfe8d -EBUILD garminplugin-0.3.27.ebuild 845 SHA256 f6199dad318a33441de0b0962034af8ff2f40799e2b6c722c9bd1a849e0b493a SHA512 1c855a0bb63ba6109edfe25352282d246661e5b67dddeedd0700d5603c3a278e2b5fb89dc5904bc652f5ebb041eb0e7993f2dec4a7c7228129e41157810939ae WHIRLPOOL 4e7e3d19e4c045375ad56537a4f429530de9cfd2562509e8362346a5b49dd719c248633c20bb441b66b39b452774797e84d3ceb387648e5b9a4059934646a15a -MISC ChangeLog 82 SHA256 12ed3543adc88564630b15553233b47b2bf04f4acc8f97eeb5c5befa2c16c75b SHA512 bf31a0cd9c7f4c2b560ef6cd2174e927933d1004c8fab2089e1d0d8c8d76f26f449f9babd33b72176038868259296cd4dda9db0b9cb175274e98fff888290703 WHIRLPOOL f7606de1e805cc293c25b9538e2fd7433ed4cd076bf7e047d7583e4e3886de1a365fe6b1e75bbcbd80f8d4da4a74ec3259d9914462a80ac75e9537dca5c9e52f +EBUILD garminplugin-0.3.27.ebuild 845 SHA256 00a2881d896aacf7342ff08e1f45240e7751bdec38f41ebab95ed06e3b4b83f1 SHA512 fcbf2d312f4179d315fc70688ee026e0c3c875069b890d9eec71aa091c64f3968ef150882ffc98be928a55892084066f1ee2c0561c8c3dacbacd14bcdfe205e8 WHIRLPOOL 9798befc2bb95a29aa864109db7c9c1df22219f520ca88f99ab7066efc83739d27d850f3ae0c07aef017a83fab8491e174417773cf719d21d40dbd4fac9e198c +MISC ChangeLog 214 SHA256 6736bd93e399a39cce05dea64a7782507d0e288fad3640bda49ab2741a1d0ac7 SHA512 13a37073c47e0be7c0232fc31649e84fd23760e0da6ba7731baf5353069e7caf1c4b756e81f2a349877cac681cf167e3c5a256d4ee4e1e1e44d99f30efc7fe44 WHIRLPOOL e4bd812f2d8a88fdc2e8cc94962ff001f2c2bb4ffc01d7ee980211ee906132d8ded167ed8f14f44745b3c3f456e4c4dbb948fa148cc17955917b41a7eb38f272 MISC metadata.xml 234 SHA256 f35b97f99a26d73cc441e1d93bfe25aaa4e9f7f6d90c8d05a74f7b7bc5b68472 SHA512 59d8156b3ca3e99c40d5a2a32de7edf2eb53279b2424998862589d6bad77617d23fc852afec0a92f8ac5bb54a88ebc504cc0641029c1936412e90ab03dfdd447 WHIRLPOOL 935a1401910a42f888c991e443a49275ea8b87976c5aa977f670053d97d18754231749749bc92d37d4b5f45ecf65914480942a11b5827b6c08fb24313a428431 diff --git a/sci-geosciences/garminplugin/garminplugin-0.3.27.ebuild b/sci-geosciences/garminplugin/garminplugin-0.3.27.ebuild index b81f6c7..e8b2742 100644 --- a/sci-geosciences/garminplugin/garminplugin-0.3.27.ebuild +++ b/sci-geosciences/garminplugin/garminplugin-0.3.27.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" +EAPI="6" inherit eutils DESCRIPTION="A free replacement for the Garmin browser plugin" From 040e1979a874a609924c777627a71b26e0a61139 Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Fri, 2 Sep 2016 00:51:21 +0200 Subject: [PATCH 15/15] sci-geosciences/garmintools: updated to EAPI="6" Package-Manager: portage-2.2.28 --- sci-geosciences/garmintools/ChangeLog | 4 +++- sci-geosciences/garmintools/Manifest | 4 ++-- sci-geosciences/garmintools/garmintools-0.10.ebuild | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/sci-geosciences/garmintools/ChangeLog b/sci-geosciences/garmintools/ChangeLog index dbf83c4..d36356d 100644 --- a/sci-geosciences/garmintools/ChangeLog +++ b/sci-geosciences/garmintools/ChangeLog @@ -1,3 +1,5 @@ + 01 Sep 2016; Manuel Friedli garmintools-0.10.ebuild: + sci-geosciences/garmintools: updated to EAPI="6" + 07 Jun 2016; Manuel Friedli +ChangeLog: Added ChangeLog - diff --git a/sci-geosciences/garmintools/Manifest b/sci-geosciences/garmintools/Manifest index d49cb49..3f9ff0d 100644 --- a/sci-geosciences/garmintools/Manifest +++ b/sci-geosciences/garmintools/Manifest @@ -1,5 +1,5 @@ AUX garmintools-0.10-add-xml-root.patch 419 SHA256 58802fbddf121cc9c2236fac5220895248854e438bee2e43a35b2129ffa7f7a2 SHA512 b61dd12999686905869ad3e32324b3f246fda685d79f4e867b4f10c125a89cca105d295b62f6181099b9f014b3c1f97b2a4a5753fb6688842553d83c129b984d WHIRLPOOL 94a6cdfed71066f580925bce4eccd7615364bc9ee836d286f2f7299ea51f9325de9141cd102f6f26d2be65a459c0d480e692509881bb1496278c6ff8a1bd8d53 DIST garmintools-0.10.tar.gz 396659 SHA256 ffd50b7f963fa9b8ded3223c4786b07906c887ed900de64581a24ff201444cee SHA512 c0a01c0e73983635501b4d63d7f08f9c3e512c4c899beae96d3fbb69c1e1ff0f5a4f5c82b9cbd243d971986489f7b9fcaf5b6c8381d1212e39074c8973f7136b WHIRLPOOL 976d9470b79c1660d5202346b9e813f6c1737875560a82789038bbdb332e6a8b064f8489008f7d23cb4900c72d7f12aac17b37d13c3682dd4c169400c5420b77 -EBUILD garmintools-0.10.ebuild 890 SHA256 6b5c68f542e1d09f7811c2edcf63f8d656f5a83bd631113b7a4c1fdd2313d8e9 SHA512 603ac1e243d6c1683cdb0175c96ac939fb7cadefbd4f614f3eadcd8eac2c1312db0324114c3efa164fa55ff5beca96bf61dc1417de68b4492070cceab10d1bfa WHIRLPOOL 34f38e0079cc3457f2934eb7b0259303b8cadeab81c0236592fda682b9358eaa555249676d65a07dd6529a6dc2df0da6504fc0ef2d08706b6d3394dc98d99df7 -MISC ChangeLog 82 SHA256 12ed3543adc88564630b15553233b47b2bf04f4acc8f97eeb5c5befa2c16c75b SHA512 bf31a0cd9c7f4c2b560ef6cd2174e927933d1004c8fab2089e1d0d8c8d76f26f449f9babd33b72176038868259296cd4dda9db0b9cb175274e98fff888290703 WHIRLPOOL f7606de1e805cc293c25b9538e2fd7433ed4cd076bf7e047d7583e4e3886de1a365fe6b1e75bbcbd80f8d4da4a74ec3259d9914462a80ac75e9537dca5c9e52f +EBUILD garmintools-0.10.ebuild 890 SHA256 e945a882cf79b6d9c73a308ab50776948279b70625716490ac1924eaad59a550 SHA512 ea8ea941326b5d1d7644ad65aeee9d51af3d3befc7028ae8d26b698cdf1d0ba7af70707d0e28786785ecddf16d55e44e1714df9e8c6ecc09b2032fb0c88f7799 WHIRLPOOL ca5147e24a1fc6099f3f8219ff7733c115009f11538baa5d5454066e4522f1dc9561d4fd8fd993c1d4ff5b2b4c85295c229fa53b88615881f57692636064b65a +MISC ChangeLog 210 SHA256 009cf62049d8d7ebceb840fd89386c0ccf3720643e132576f7c4c1fbd83c6b5e SHA512 9cb12b1292cf1da2d2dae970c1b31e2cb015ad097e09780413eb43299dfcb2772159a15b13e8af8f515d45d0db0f8c3b5012d19048d81c88b9b60ba3f6f8faea WHIRLPOOL a1d02140b5c427f6043a0318d5027543e65021f309b6e358b546ceac19f3a56b98f1020d1c512f208bd0eda285eb7edbf1ab03982a20d2a4622b456024a48bd6 MISC metadata.xml 234 SHA256 f35b97f99a26d73cc441e1d93bfe25aaa4e9f7f6d90c8d05a74f7b7bc5b68472 SHA512 59d8156b3ca3e99c40d5a2a32de7edf2eb53279b2424998862589d6bad77617d23fc852afec0a92f8ac5bb54a88ebc504cc0641029c1936412e90ab03dfdd447 WHIRLPOOL 935a1401910a42f888c991e443a49275ea8b87976c5aa977f670053d97d18754231749749bc92d37d4b5f45ecf65914480942a11b5827b6c08fb24313a428431 diff --git a/sci-geosciences/garmintools/garmintools-0.10.ebuild b/sci-geosciences/garmintools/garmintools-0.10.ebuild index f1176c1..368859a 100644 --- a/sci-geosciences/garmintools/garmintools-0.10.ebuild +++ b/sci-geosciences/garmintools/garmintools-0.10.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" +EAPI="6" inherit eutils