reinit the tree, so we can have metadata

5 files changed, 105 insertions, 0 deletions

diff --git a/dev-php/pecl-geoip/Manifest b/dev-php/pecl-geoip/Manifest
new file mode 100644
index 000000000000..c8ffe47553ec
--- /dev/null
+++ b/dev-php/pecl-geoip/Manifest
@@ -0,0 +1,7 @@
+AUX fix-failing-tests-1.1.1.patch 1250 SHA256 340064772313d6a784746587f634ac2225f2100c57ec079c90e3a6acb226c866 SHA512 9e3c93b337c38feaec29001a5a5b243f376bc7a32caaafa848b51daa3f0efbdecf407de6c8f304801ad106aa0e4906513588c42aa19bc6d5b261ccd6cb00b652 WHIRLPOOL f4ba0bb7c8505de8119ab7ddfc2466709d3ed7cc9cf241ccf66039acc215496f6e6bd09ee2ff73b0a35ecd80aeed5345c89ee93fa455b1f0dd29203e2b0baecc
+DIST geoip-1.1.1.tgz 13004 SHA256 b2d05c03019d46135c249b5a7fa0dbd43ca5ee98aea8ed807bc7aa90ac8c0f06 SHA512 395715297726aa8e7ed71297d403bea9cb08417a03adfca29dc6ea68bbc738c176f71ea621f9026109e07cd5a2adc647e2af8e140e18a6af1c8f0fe4ed1a9c6b WHIRLPOOL 2792b1c03efa7963b1d113133e21979ebe95ca0fc179192101cd515c77914c6c040bef744a81cbb7f36583c30dfa7b45123c2fca9c214314d9ab88429496bb24
+EBUILD pecl-geoip-1.1.1-r2.ebuild 435 SHA256 f8b3db89ec6453dffb5b1cd1dee88210395383e4461a3a16defb3cb3dd317e13 SHA512 a52159f326db3500060304b7a1300e0e8eb29afb160e404037d01168fdf05b651ba68f8131750fea7e9b59a228cae98cdd2077b9eebe8bcbf07497c98ad41393 WHIRLPOOL 2d7710c98004ca5bb7e1d5bbf6d3a93a5c4640436a0f1e40ea4f0271e117e9ab63a04dc0fcf96719ea019168848087eb104377a8e5ea7af3698c02ef84153fb9
+EBUILD pecl-geoip-1.1.1-r3.ebuild 443 SHA256 2ca5a60cb8777c8cdee03c1db07332250ee0874d974a9eb59a5065649c09eea1 SHA512 a43618bd317d96131a27c08442111de17daea9b5472344bf13a3252803e4c5767ce91d415a2e5ffb16f68439a884f44e3dcd5fefa955dfba7fdea7eaace31b83 WHIRLPOOL 42bb70af4343b0e645d38a57b4359ba4ebd1b0da112af6ee2d43eddc502425e6b74c4f2babcde9d370337e74e862984c44bd13d8e2672fe8abd2b678e7390643
+MISC ChangeLog 4056 SHA256 b7b9c799383d9479becff022c8dd200565885e2decda7af71090758a767ad23c SHA512 3103559bec95a27301e291bf21714a36c11df51de36fb023568127b88305b7e6a2fbd54264f3390596834eae747e304af9e5069df3091585b8bf1aa23f340cf9 WHIRLPOOL 248a8283201192101f13cc23522b8bb808426a65a6f03c58f4523cf75dc94a90b28ab1eae0207a679198afe1aa8d04970d302ff5fa979336dff69fb0282f9189
+MISC ChangeLog-2015 3011 SHA256 76fc6fe398b79b4134bc9b3a25f250bb9f6035e470bf868174aee548ff6cca22 SHA512 f5f2f88cc9488447513f4703457231cc4757cbc27e7210ce148b364d6150ef37b3f2bd5f74eed202ba38d710fb3f854c6ad0f3302b76135d3e01ba79703384cb WHIRLPOOL 546c440204cb59d835fe21933d54b8e135e439acb731a0b3997902056c138a7539f126bcf02f47d1de3a1c04bfdedc942dd44624cc946af6edfb2888c37d570c
+MISC metadata.xml 239 SHA256 b54aca642ac424532264a97d14931720ed288cf387dbdef6a10b34ffed6689f1 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0 WHIRLPOOL 80ab9605bb31ce3310bf524de4705c67ca85cf8f2346b7e13274595598b9fe92c9b119beb865ef214ad33ef172b880e318d18ff8c8d2026cb7319f0524d8a7aa
diff --git a/dev-php/pecl-geoip/files/fix-failing-tests-1.1.1.patch b/dev-php/pecl-geoip/files/fix-failing-tests-1.1.1.patch
new file mode 100644
index 000000000000..a86994708e7b
--- /dev/null
+++ b/dev-php/pecl-geoip/files/fix-failing-tests-1.1.1.patch
@@ -0,0 +1,46 @@
+On Gentoo, we require users to download the GeoIP databases
+themselves. As a result, the databases may not be there when
+installing pecl-geoip. The first patch below skips a test if the
+database it uses is not present. The second patch disables 019.phpt
+completely, because I can't make it pass.
+
+PHP-Bug: 73416
+
+diff --git a/tests/001.phpt b/tests/001.phpt
+index a548d6e..c0e4972 100644
+--- a/tests/001.phpt
++++ b/tests/001.phpt
+@@ -1,7 +1,10 @@
+ --TEST--
+ Checking Country (Free) DB availability
+ --SKIPIF--
+-<?php if (!extension_loaded("geoip")) print "skip"; ?>
++<?php
++if (!extension_loaded("geoip")) print "skip";
++if (!file_exists(geoip_db_filename(GEOIP_COUNTRY_EDITION))) print "skip";
++?>
+ --POST--
+ --GET--
+ --FILE--
+diff --git a/tests/019.phpt b/tests/019.phpt
+deleted file mode 100644
+index 4630354..0000000
+--- a/tests/019.phpt
++++ /dev/null
+@@ -1,15 +0,0 @@
+---TEST--
+-Checking geoip_setup_custom_directory() (with trailing slash)
+---SKIPIF--
+-<?php if (!extension_loaded("geoip")) print "skip"; ?>
+---INI--
+-geoip.custom_directory="/test/"
+---FILE--
+-<?php
+-
+-var_dump( geoip_country_name_by_name_v6('0000:0000:0000:0000') );
+-
+-?>
+---EXPECT--
+-string(27) "/some/other/place/GeoIP.dat"
+-string(6) "/test/"
+\ No newline at end of file
diff --git a/dev-php/pecl-geoip/metadata.xml b/dev-php/pecl-geoip/metadata.xml
new file mode 100644
index 000000000000..b86acf66c756
--- /dev/null
+++ b/dev-php/pecl-geoip/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
+</pkgmetadata>
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
new file mode 100644
index 000000000000..6ad7b2456fd6
--- /dev/null
+++ b/dev-php/pecl-geoip/pecl-geoip-1.1.1-r2.ebuild
@@ -0,0 +1,22 @@
+# 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
new file mode 100644
index 000000000000..3d3943be9aa5
--- /dev/null
+++ b/dev-php/pecl-geoip/pecl-geoip-1.1.1-r3.ebuild
@@ -0,0 +1,22 @@
+# 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 php7-1"
+
+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" )