diff --git a/dev-php/pecl-geoip/Manifest b/dev-php/pecl-geoip/Manifest
index 7f20c64..de19715 100644
--- a/dev-php/pecl-geoip/Manifest
+++ b/dev-php/pecl-geoip/Manifest
@@ -1,4 +1,6 @@
+AUX pecl-geoip-1.1.0.9999-patch-to-svn-r337409.patch 14488 SHA256 b9e1e157e4afb146c95843b13df31baa57ded2e2f84404b5d2e34f502092ada0 SHA512 1958be9b21fa467fd14ea868836a0da12f8f26acec6762b918e542d725fc7d571af8f4eb80796d19cb560975ed63b24aefc13b20bc8ab9ac99a22899560a019f WHIRLPOOL daead5d09a8122d38240172852934ea1545ecf802502d21b1ad2cabe70b6f28bb0022b2847ab9e68df1382e95e3230334562b0289c6d88ebb8bd034424d160e7
DIST geoip-1.1.0.tgz 12714 SHA256 82c6deb7264d2ff7c4d6c45a7d27cff7ab097be965795e317e04a9c5b7be98b9 SHA512 8a0fc698a234d3b2c01f2a0c05c28025d98a5d3dce509ba19ee462abae0fd0f5631d96d3e8bba4fce6c23b278ec3875da5e8535971c7d880e2e307a097dc30a1 WHIRLPOOL f8ccf90958bdc0eee41f24b6ad04907884fed2efe2bca483fa816aceb46d15311325175b07f27d85085afdb5651fd071fd20b046ba42e30da26eea56a14912d6
-EBUILD pecl-geoip-1.1.0-r1.ebuild 430 SHA256 0d5bd3cae4b2eac2590caac4c722cba34f0ffb674b516ec5a97b3e921d4f225f SHA512 9f99fafe4efc874758dcf594346db0491468e25aa61e0db387c5d597a9690ca88fe87b9fc5486a9a90d1a1c0e015889ebbef4b4e049885d883be4ba939235b25 WHIRLPOOL cfe0c6b5a310aa17f3c32a22ab6044ed2d3243b93c626f1bf1013186b1fde7a63d662c17d2f6c8fce1f65052625b1cc29b967793ba06469df678f02e867d9735
+EBUILD pecl-geoip-1.1.0.9999.ebuild 583 SHA256 214b34224cdcbde6090101c4350bc14883af407273dd451b6f0d23df21078f8c SHA512 74b3e841c5b652a1823770811daef0c74dbc804918559a7ec43109bbaeb551d622e8023fe0848dea9338ac661a67839f8f8d08042aab8a21c7ed3be438e2f445 WHIRLPOOL da01cb7f77eca193bc7ad2d9c01e02dddd9e01e9153c1262cafd7fbba8d263b6c9ebfe2a106a9b1454ec53aa9cdf79d75e0d2280ad2e18a12ffbe4f2fb2d0dd7
MISC ChangeLog 0 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 SHA512 cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e WHIRLPOOL 19fa61d75522a4669b44e39c1d2e1726c530232130d407f89afee0964997f7a73e83be698b288febcf88e3e03c4f0757ea8964e59b63d93708b138cc42a66eb3
MISC metadata.xml 234 SHA256 f35b97f99a26d73cc441e1d93bfe25aaa4e9f7f6d90c8d05a74f7b7bc5b68472 SHA512 59d8156b3ca3e99c40d5a2a32de7edf2eb53279b2424998862589d6bad77617d23fc852afec0a92f8ac5bb54a88ebc504cc0641029c1936412e90ab03dfdd447 WHIRLPOOL 935a1401910a42f888c991e443a49275ea8b87976c5aa977f670053d97d18754231749749bc92d37d4b5f45ecf65914480942a11b5827b6c08fb24313a428431
+MISC patch.diff 468 SHA256 e8093b73d790832b36ffcef999bef82c001e94dc469e82e15dfcbb4b7b3a33a6 SHA512 6a1965c336a84a6165e238b7be7bdcbc488568eb8b9d5a949fed6760c03ba70fd6a07c2b06faa1ad02089a7d0edca7e93d6b76f60a19b06989e36fc20d4857f2 WHIRLPOOL 6e42750c859e17a061ecdf18c3e4f450463eee26a3595751965cc3009bda9fdc5746b6337021d49201ac58f055d6f01f569bbba7718c53673210ded3d8bc03dc
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
new file mode 100644
index 0000000..b609a7c
--- /dev/null
+++ b/dev-php/pecl-geoip/files/pecl-geoip-1.1.0.9999-patch-to-svn-r337409.patch
@@ -0,0 +1,554 @@
+Index: trunk/package.xml
+===================================================================
+--- trunk/package.xml (revision 333461)
++++ trunk/package.xml (revision 337409)
+@@ -18,7 +18,7 @@
+ 2014-05-01
+
+
+- 1.1.0
++ 1.1.1-dev
+ 1.0.3
+
+
+@@ -26,13 +26,7 @@
+ stable
+
+ PHP License
+- * Add geoip_setup_custom_directory() to setup custom directories per request.
+-* Remove E_NOTICES for IPs not found in database.
+-* Fix a segfault with geoip_db_get_all_info() on newer libs (bug #64692).
+-* Add support for geoip_netspeedcell_by_name(), geoip_asnum_by_name() and geoip_domain_by_name() (bug #67121).
+-* Fix memory leak with custom directories (bug #67138).
+-* Support changing custom directory via ini_set() (bug #61607).
+-
++ *
+
+
+
+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/pecl-geoip-1.1.0-r1.ebuild b/dev-php/pecl-geoip/pecl-geoip-1.1.0.9999.ebuild
similarity index 69%
rename from dev-php/pecl-geoip/pecl-geoip-1.1.0-r1.ebuild
rename to dev-php/pecl-geoip/pecl-geoip-1.1.0.9999.ebuild
index d0498ba..dd73a2a 100644
--- a/dev-php/pecl-geoip/pecl-geoip-1.1.0-r1.ebuild
+++ b/dev-php/pecl-geoip/pecl-geoip-1.1.0.9999.ebuild
@@ -8,10 +8,11 @@ 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 php-ext-pecl-r2
+inherit eutils php-ext-pecl-r2
KEYWORDS="~amd64 ~x86"
@@ -22,3 +23,13 @@ IUSE=""
DEPEND=">=dev-libs/geoip-1.4.0"
RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}(${P}-patch-to-svn-r337409.patch"
+)
+
+src_prepare() {
+ for p in "${PATCHES[@]}" ; do
+ epatch "${p}"
+ done
+}