From 48b066fef98e77a4b2be24d274951b70790e5406 Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Tue, 7 Jun 2016 11:23:42 +0200 Subject: [PATCH] Added ebuild for pecl-geoip that sould be compatible with PHP 7 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 | 28 ------------------- .../pecl-geoip/pecl-geoip-1.1.0.9999.ebuild | 14 ++++++++-- 4 files changed, 19 insertions(+), 35 deletions(-) diff --git a/dev-php/pecl-geoip/ChangeLog b/dev-php/pecl-geoip/ChangeLog index e69de29..26a83fc 100644 --- a/dev-php/pecl-geoip/ChangeLog +++ b/dev-php/pecl-geoip/ChangeLog @@ -0,0 +1,5 @@ + 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 index de19715..ec07c1f 100644 --- a/dev-php/pecl-geoip/Manifest +++ b/dev-php/pecl-geoip/Manifest @@ -1,6 +1,5 @@ -AUX pecl-geoip-1.1.0.9999-patch-to-svn-r337409.patch 14488 SHA256 b9e1e157e4afb146c95843b13df31baa57ded2e2f84404b5d2e34f502092ada0 SHA512 1958be9b21fa467fd14ea868836a0da12f8f26acec6762b918e542d725fc7d571af8f4eb80796d19cb560975ed63b24aefc13b20bc8ab9ac99a22899560a019f WHIRLPOOL daead5d09a8122d38240172852934ea1545ecf802502d21b1ad2cabe70b6f28bb0022b2847ab9e68df1382e95e3230334562b0289c6d88ebb8bd034424d160e7 +AUX pecl-geoip-1.1.0.9999-patch-to-svn-r337409.patch 13475 SHA256 2a14d4bb09c1ded394ee588f37f8a1959262abcd2679cac84acf2d6638ff5924 SHA512 c37dd0b41df0fbf55a91575bbc6cbb1da92bef4d47e8e660c4e715fc0d424e53a7d2657c996878faedf03a5d92b4ff0b5d466097e22f525818c93483ac158c99 WHIRLPOOL 4f9f117f154ce73702ad92056b880189777494eee414455afe126d03135f8efbb3bc5aedadda5874536302896488e77642f9084930e4c9407426a8e82f27301f DIST geoip-1.1.0.tgz 12714 SHA256 82c6deb7264d2ff7c4d6c45a7d27cff7ab097be965795e317e04a9c5b7be98b9 SHA512 8a0fc698a234d3b2c01f2a0c05c28025d98a5d3dce509ba19ee462abae0fd0f5631d96d3e8bba4fce6c23b278ec3875da5e8535971c7d880e2e307a097dc30a1 WHIRLPOOL f8ccf90958bdc0eee41f24b6ad04907884fed2efe2bca483fa816aceb46d15311325175b07f27d85085afdb5651fd071fd20b046ba42e30da26eea56a14912d6 -EBUILD pecl-geoip-1.1.0.9999.ebuild 583 SHA256 214b34224cdcbde6090101c4350bc14883af407273dd451b6f0d23df21078f8c SHA512 74b3e841c5b652a1823770811daef0c74dbc804918559a7ec43109bbaeb551d622e8023fe0848dea9338ac661a67839f8f8d08042aab8a21c7ed3be438e2f445 WHIRLPOOL da01cb7f77eca193bc7ad2d9c01e02dddd9e01e9153c1262cafd7fbba8d263b6c9ebfe2a106a9b1454ec53aa9cdf79d75e0d2280ad2e18a12ffbe4f2fb2d0dd7 -MISC ChangeLog 0 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 SHA512 cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e WHIRLPOOL 19fa61d75522a4669b44e39c1d2e1726c530232130d407f89afee0964997f7a73e83be698b288febcf88e3e03c4f0757ea8964e59b63d93708b138cc42a66eb3 +EBUILD pecl-geoip-1.1.0.9999.ebuild 780 SHA256 2de773c29101b273afde935b70c1bb1e3a22c2409eca8646b2df2f7de0f66d61 SHA512 a579d0f7a36a84011dcc3d0d724776a3214c2309bb71c325ad39a5d6aa35246220cf0089e2e97c37eaee07e8166b3080386ecffc459c5e539e60d6abc9029af4 WHIRLPOOL a8c1882617a99917ce4dc789d23dc78ee854eaa93b8cb4843e8d25c52851e896ae6ea9689b199c83b27efbbe4ceef880015f1de67e1a1aa9e2edb3e410853137 +MISC ChangeLog 193 SHA256 233f3d15b90348119fc0a1f9950bd87c6a63f4aae1fb91ce1191d087e14ccba9 SHA512 5e94baa22d98096b3e2c7f8f4aa03023238d1d2646ff7917f440d962f6cc511fa8310a8c2dc7003570fc788531a876ffadfb6aa755b22c4d9c999471fbea6c1d WHIRLPOOL bd27a74bcec6a9f59f8440a38eada41b8094a2d03b740afbd30190174cc3b6bd7ecb97cdb85e1439e4acc77798660f6a22be3e4828f68c9df7c22c809eefc9e1 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 index b609a7c..420165a 100644 --- 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 @@ -1,31 +1,3 @@ -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) 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 index dd73a2a..2bf55f9 100644 --- a/dev-php/pecl-geoip/pecl-geoip-1.1.0.9999.ebuild +++ b/dev-php/pecl-geoip/pecl-geoip-1.1.0.9999.ebuild @@ -25,11 +25,19 @@ DEPEND=">=dev-libs/geoip-1.4.0" RDEPEND="${DEPEND}" PATCHES=( - "${FILESDIR}(${P}-patch-to-svn-r337409.patch" + "${FILESDIR}/${P}-patch-to-svn-r337409.patch" ) +# apply patches in unpack phase, or else the php7.0 dir won't get patched src_prepare() { - for p in "${PATCHES[@]}" ; do - epatch "${p}" + 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 }