gentoo resync : 11.02.2018

3 files changed, 3 insertions, 26 deletions

diff --git a/dev-php/pecl-geoip/Manifest b/dev-php/pecl-geoip/Manifest
index 10f06ced24cf..49b7f92a8c5a 100644
--- a/dev-php/pecl-geoip/Manifest
+++ b/dev-php/pecl-geoip/Manifest
@@ -1,6 +1,5 @@
 AUX fix-failing-tests-1.1.1.patch 1250 BLAKE2B 587561ec400fe54b21333d09d2ad721b66c321de5a9c1823c0cb9706e63c41a24f81e53eb9fb92bc1f33bc867e141e8f29c26abc1452058dc387d29a53b0c7bc SHA512 9e3c93b337c38feaec29001a5a5b243f376bc7a32caaafa848b51daa3f0efbdecf407de6c8f304801ad106aa0e4906513588c42aa19bc6d5b261ccd6cb00b652
 DIST geoip-1.1.1.tgz 13004 BLAKE2B fe073b9459c434751ea0291ce6802041db47254f9d2d5b930db51751b3a66ce5cf925dc4bd07764920748b1735f26ba8bd136654e08ed9c24ac3b520e842f45d SHA512 395715297726aa8e7ed71297d403bea9cb08417a03adfca29dc6ea68bbc738c176f71ea621f9026109e07cd5a2adc647e2af8e140e18a6af1c8f0fe4ed1a9c6b
-EBUILD pecl-geoip-1.1.1-r2.ebuild 435 BLAKE2B cced9315a5c7677b01bd46c9d0c794dc7cc816b02c90052d886ccd297a137fed49e99c49b2a84a289871c223fd12974cc7942dee89bcfd673dbcf737ee7fca23 SHA512 a52159f326db3500060304b7a1300e0e8eb29afb160e404037d01168fdf05b651ba68f8131750fea7e9b59a228cae98cdd2077b9eebe8bcbf07497c98ad41393
-EBUILD pecl-geoip-1.1.1-r3.ebuild 443 BLAKE2B 0253e5a8add73c694932b708bdd364b07b90fdeba91345d4e5cd065b200d6a7cb21b707ec8c59e79d390175796f69e816e38a0391afe5862554b883d4447b35b SHA512 a43618bd317d96131a27c08442111de17daea9b5472344bf13a3252803e4c5767ce91d415a2e5ffb16f68439a884f44e3dcd5fefa955dfba7fdea7eaace31b83
+EBUILD pecl-geoip-1.1.1-r3.ebuild 442 BLAKE2B 1d4fa08a29d59bccf3f9ddd2fe68541a0499ee8fcc2c5ab20c1bd76a1deaeedd93941caeee1660d6ae56baf6af56a246f11b5b00b61464715833573b06b1272f SHA512 bc867d855dad8e5bdfd22b7ca4addd614ad1eeab50273759113be8d0ab81d081e1cf1834aec71ed73e7b1aba174902e80f117dd211a4d4695ec06a35f3c7c596
 EBUILD pecl-geoip-1.1.1-r4.ebuild 451 BLAKE2B 9af37a08d093f6569c2a8d1d2c3aa3c238215fc6122ac8ae6c6b88877c99c8a1090b04fa8a7e2e21857fb1879f776f739472ce9f27a54fff97b8757f1fe9fe2f SHA512 c359ae7ad851e763412420607c9bd853a4f7dbaff36e5f49f56f262fdab83d2f762850707360c54fdd976ef8acf69799bf5d225436459e3134f2ca6fb47e0f00
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-geoip/pecl-geoip-1.1.1-r2.ebuild b/dev-php/pecl-geoip/pecl-geoip-1.1.1-r2.ebuild
deleted file mode 100644
index 6ad7b2456fd6..000000000000
--- a/dev-php/pecl-geoip/pecl-geoip-1.1.1-r2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PHP_EXT_NAME="geoip"
-DOCS="README ChangeLog"
-USE_PHP="php5-6 php7-0"
-
-inherit php-ext-pecl-r3
-
-KEYWORDS="amd64 x86"
-
-DESCRIPTION="PHP extension to map IP address to geographic places"
-LICENSE="PHP-3"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-libs/geoip"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/fix-failing-tests-1.1.1.patch" )
diff --git a/dev-php/pecl-geoip/pecl-geoip-1.1.1-r3.ebuild b/dev-php/pecl-geoip/pecl-geoip-1.1.1-r3.ebuild
index 3d3943be9aa5..042049847be6 100644
--- a/dev-php/pecl-geoip/pecl-geoip-1.1.1-r3.ebuild
+++ b/dev-php/pecl-geoip/pecl-geoip-1.1.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ USE_PHP="php5-6 php7-0 php7-1"
 
 inherit php-ext-pecl-r3
 
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DESCRIPTION="PHP extension to map IP address to geographic places"
 LICENSE="PHP-3"