reinit the tree, so we can have metadata

7 files changed, 273 insertions, 0 deletions

diff --git a/dev-php/pecl-oauth/Manifest b/dev-php/pecl-oauth/Manifest
new file mode 100644
index 000000000000..6f9f33fafb00
--- /dev/null
+++ b/dev-php/pecl-oauth/Manifest
@@ -0,0 +1,10 @@
+AUX 1.2.3-prce.h-check.patch 757 SHA256 c732f1453c2d2fb19f211d617298d00422c5eee5d78a4ee093168ed294764a1f SHA512 e3f3ba2f60ec65e6dd80bb0e6980f2597b746ae6bad302fca4a295eb3fb7da9448d756ff1106fe0543151b90c50d4f4dd01ccccd1ee61455544046b2ca15b79b WHIRLPOOL 2920e5b8b69984c12dcff19c69ed16eadb46ef78ecab28417cbb680befacd9bfc8935756ac49b7c2348733ed998dd3382a59af1149461c085c0d504bb9b41b9a
+AUX 1.2.3-withcurl.patch 2099 SHA256 2f72b253186b87384a6c82d57b18419f10509d4dc64d4b544f9db9571192d27c SHA512 f40d0d48a35f54b09d6eb2c44af1c191416840e922cb030b27b95501558e356252793a43f02ade85eecc498968aff85c7498fef546e7d24e94c583a88b14c2e5 WHIRLPOOL ece89e518bac30fb3afb848b6608621c67d0d1493f9e21e852d90db20427a1bba606da513b950a93caa984ac89435062dcbef66d3094437cbb2b3688ccbfdb94
+AUX 2.0.2-compare_segfault.patch 1664 SHA256 86e0a594a82d5190e2b8632f71458e1be2873322e8bab40811ec568eecd0f795 SHA512 1d8da5be1648738b4a03f5e8b47b016418096a38571d6aa518c486ff799e09152af1a33c39ad9d0c8d81ee2d5500d58aa78dcc4f46e1e746a4a9bc688dcd08e1 WHIRLPOOL f8b29508ea5e6b12d17019374c9e3962d34c46797a906eec4b230a35e9f860ff1cfb4a0e5cfc4f0061fdcf3cce38a3e23a83636b69d1c43d773b4a26c7c53734
+DIST oauth-1.2.3.tgz 45531 SHA256 86bb5ee37afe672d4532ad784c7f711855c79f0dabf0acacafd5344ab6cf0195 SHA512 ca61dbec8fa51679accb31eab90b8699c7780f2d60a83566ce05667148ee44b7dc70fd8235414d6a3a996b252ad4a236b3e8a549685fd7e890e0874029c455e1 WHIRLPOOL 20969ea78c25152ac8e32d0c726bd112bdc5cb2b8d2fc59401d2c43f3d8990ed51702235afb07f0b8af604a5cf7264661caff1a8fc6bc7db25e71d682583a69c
+DIST oauth-2.0.2.tgz 49115 SHA256 87ce1a5d585f439f0ead2683f2f7dca76d538df9143da681978356b5e1c6e8e8 SHA512 b7aa9459542ec390a5420127d75607702ae6df6254f4e39acb62d35c6a39b8b7990499c279df07ce681081e455b55219c51df42fd516321f317465badf6d459d WHIRLPOOL 5cec99d60d0b6f0f2b0f5d219a27fd144372451b38093d5722943fca5293c4c4d5edc82976a7125f4a473d1c8c796756a173988fddc24a6bec481c8038151c0c
+EBUILD pecl-oauth-1.2.3-r5.ebuild 1147 SHA256 142d4e67121ac12f2953b753225994f356a5c847bc2f825a2430bc0aee334dcb SHA512 2b30cde4d028f636becc2f1d61e0c56a55c021910567fa78bb387ba0c83949d3d104026d917fbe63836850b374e8a1c1bc1f91bbaf102029a1ffb60e469a9e3d WHIRLPOOL cee9fd6f3ef6b60809d2fc2cae0a6eb91921aeb394a7b11f7b974389054b92c0a978b6bcaa8dfb4af662b88bb884eb7bfa6478726af120cec6293dda2de571d5
+EBUILD pecl-oauth-2.0.2-r1.ebuild 1221 SHA256 b5ba1079bb37adf2935ab0a572f56bbf6430728e6467c21864f47748bc351972 SHA512 c6db693818ed1aafdaed549fac541679b19732fdb64e5d5c0214a3e29fb2763cc5dfed2c02b0260550f5df2925b2ce1fbde467c50f756583b1a31ab975e14cbd WHIRLPOOL e5af7cb7478badeb0d1fc22f399e99e288801452a4abee8e25278d4d13ae15e740ccb7967b9b049f8191f3b7b0a771052910ce67437326e8f4dcaefccdd66aca
+MISC ChangeLog 3743 SHA256 d82a9f35c682c4250e67fe2ec42886cd5fdbb8b9eba13c7a025206187d059482 SHA512 1e7db4bd07054b75248c7adf35e2772853a9931f2af30e4eddb43a356f8da093ca500a745402e47483e0c3971ebb185b953e6d5bd5eea01652f87da8c8dc7610 WHIRLPOOL 0ece5c53561afad63bdf9deff2a6fb93df9a5d5cd69f320df3f993a706353dcb8456e303e77214451ff9ca9d0735bc8c4d4a905249b4b924d196b556ec936285
+MISC ChangeLog-2015 1458 SHA256 144cf507be8500888d94980022b419672c3746d1c6236fa59667c943b142d2c7 SHA512 ded23ed0b5fa6254b30c507c5da7007686dc4dc85a33e95d90e1fb4658cc02c97151b72c6c693a0e3a7b26c4cecd0e3cc07b569646f97429950f4cf2e4622b5e WHIRLPOOL 49049ee707ac0e9db00b16f8bcf2e0b885794be286488ca31783db6fbd54515f6ee78eabb1d76c0ef3bdae4b11afce4ec361973506c4ffc60344e8f7000a7995
+MISC metadata.xml 239 SHA256 b54aca642ac424532264a97d14931720ed288cf387dbdef6a10b34ffed6689f1 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0 WHIRLPOOL 80ab9605bb31ce3310bf524de4705c67ca85cf8f2346b7e13274595598b9fe92c9b119beb865ef214ad33ef172b880e318d18ff8c8d2026cb7319f0524d8a7aa
diff --git a/dev-php/pecl-oauth/files/1.2.3-prce.h-check.patch b/dev-php/pecl-oauth/files/1.2.3-prce.h-check.patch
new file mode 100644
index 000000000000..995ef51f28ca
--- /dev/null
+++ b/dev-php/pecl-oauth/files/1.2.3-prce.h-check.patch
@@ -0,0 +1,26 @@
+From f12e2bd72b238da2dbf3bd0f882d977073cca282 Mon Sep 17 00:00:00 2001
+From: John Jawed <jawed@php.net>
+Date: Thu, 24 Jul 2014 15:19:18 +0000
+Subject: [PATCH] Bug #67658 (configure does not detect missing pcre.h)
+
+git-svn-id: https://svn.php.net/repository/pecl/oauth/trunk@334377 c90b9560-bf6c-de11-be94-00142212c4b1
+---
+ config.m4 | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/config.m4 b/config.m4
+index 48e2608..53a5ea8 100644
+--- a/config.m4
++++ b/config.m4
+@@ -14,6 +14,8 @@ if test "$PHP_OAUTH" != "no"; then
+   PHP_NEW_EXTENSION(oauth, oauth.c provider.c, $ext_shared)
+   CFLAGS="$CFLAGS -Wall -g"
+ 
++  AC_CHECK_HEADERS(pcre.h)
++
+   AS_IF([test "x$with_curl" != "xno"],
+       [
+         AC_MSG_CHECKING(for cURL in default path)
+-- 
+2.1.4
+
diff --git a/dev-php/pecl-oauth/files/1.2.3-withcurl.patch b/dev-php/pecl-oauth/files/1.2.3-withcurl.patch
new file mode 100644
index 000000000000..5069ae92b146
--- /dev/null
+++ b/dev-php/pecl-oauth/files/1.2.3-withcurl.patch
@@ -0,0 +1,71 @@
+From 1b68ce035883f1ae186d82682fbbc5ea7d1834b3 Mon Sep 17 00:00:00 2001
+From: John Jawed <jawed@php.net>
+Date: Fri, 18 Jan 2013 20:28:05 +0000
+Subject: [PATCH] Bug 64025 (patch via mattsch at gmail dot com)
+
+git-svn-id: https://svn.php.net/repository/pecl/oauth/trunk@329234 c90b9560-bf6c-de11-be94-00142212c4b1
+---
+ config.m4 | 40 ++++++++++++++++++++++++++--------------
+ 1 file changed, 26 insertions(+), 14 deletions(-)
+
+diff --git a/config.m4 b/config.m4
+index 832c577..48e2608 100644
+--- a/config.m4
++++ b/config.m4
+@@ -5,27 +5,39 @@ dnl
+ PHP_ARG_ENABLE(oauth, for oauth support,
+ [  --enable-oauth          Include oauth support])
+ 
++AC_ARG_WITH([curl],
++    AS_HELP_STRING([--without-curl], [Ignore presence of cURL and disable it]))
++
+ if test "$PHP_OAUTH" != "no"; then
+   PHP_SUBST(OAUTH_SHARED_LIBADD)
+ 
+   PHP_NEW_EXTENSION(oauth, oauth.c provider.c, $ext_shared)
+   CFLAGS="$CFLAGS -Wall -g"
+ 
+-  AC_MSG_CHECKING(for cURL in default path)
+-  for i in /usr/local /usr; do
+-    if test -r $i/include/curl/easy.h; then
+-      CURL_DIR=$i
+-      AC_MSG_RESULT(found in $i)
+-      break
+-    fi
+-  done
++  AS_IF([test "x$with_curl" != "xno"],
++      [
++        AC_MSG_CHECKING(for cURL in default path)
++        have_curl=no
++        for i in /usr/local /usr; do
++          if test -r $i/include/curl/easy.h; then
++            have_curl=yes
++            CURL_DIR=$i
++            AC_MSG_RESULT(found in $i)
++            break
++          fi
++        done
++      ],
++      [have_curl=no])
+ 
+-  if test -z "$CURL_DIR"; then
+-    AC_MSG_RESULT(cURL not found, cURL support disabled)
+-  else
+-    PHP_ADD_LIBRARY(curl,,OAUTH_SHARED_LIBADD)
+-    AC_DEFINE(OAUTH_USE_CURL, 1, [Whether cURL is present and should be used])
+-  fi
++  AS_IF([test "x$have_curl" = "xyes"],
++      [
++        PHP_ADD_LIBRARY(curl,,OAUTH_SHARED_LIBADD)
++        AC_DEFINE(OAUTH_USE_CURL, 1, [Whether cURL is present and should be used])
++      ],
++      [AS_IF([test "x$with_curl" = "xyes"],
++             [AC_MSG_ERROR([cURL requested but not found])
++      ])
++  ])
+ 
+   PHP_ADD_EXTENSION_DEP(oauth, hash)
+ fi
+-- 
+2.1.4
+
diff --git a/dev-php/pecl-oauth/files/2.0.2-compare_segfault.patch b/dev-php/pecl-oauth/files/2.0.2-compare_segfault.patch
new file mode 100644
index 000000000000..f0b8d7ae216f
--- /dev/null
+++ b/dev-php/pecl-oauth/files/2.0.2-compare_segfault.patch
@@ -0,0 +1,48 @@
+From f1a5b6dea1982dab03c810edd321ca57907d41fe Mon Sep 17 00:00:00 2001
+From: Adam Saponara <as@php.net>
+Date: Fri, 24 Feb 2017 17:20:51 -0500
+Subject: [PATCH] Fix bug #74163: Segfault in oauth_compare_value
+
+Credit to @russpos for finding this bug
+---
+ oauth.c              | 4 ++--
+ tests/oauth_sbs.phpt | 4 ++++
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/oauth.c b/oauth.c
+index 62522bd..198e2cb 100644
+--- a/oauth.c
++++ b/oauth.c
+@@ -374,8 +374,8 @@ static int oauth_strcmp(zval *first, zval *second)
+ static int oauth_compare_value(const void *a, const void *b)
+ {
+ 	Bucket *f, *s;
+-	f = *(Bucket **)a;
+-	s = *(Bucket **)b;
++	f = (Bucket *)a;
++	s = (Bucket *)b;
+ 
+ 	return oauth_strcmp(&f->val, &s->val);
+ }
+diff --git a/tests/oauth_sbs.phpt b/tests/oauth_sbs.phpt
+index a49d2b4..4e9269e 100644
+--- a/tests/oauth_sbs.phpt
++++ b/tests/oauth_sbs.phpt
+@@ -21,6 +21,8 @@ echo "-- putting oauth_signature inside by mistake --\n";
+ echo oauth_get_sbs('GET', 'http://127.0.0.1:12342/',array('oauth_signature'=>'hello world')),"\n";
+ echo "-- merging url query and extra params --\n";
+ echo oauth_get_sbs('GET', 'http://127.0.0.1:12342/script?arg1=1',array('arg2' => '2')),"\n";
++echo "-- with array value --\n";
++echo oauth_get_sbs('GET', 'http://127.0.0.1:12342/script',array('arg2' => [1, 2, 3])),"\n";
+ 
+ ?>
+ --EXPECTF--
+@@ -44,3 +46,5 @@ GET&http%3A%2F%2F127.0.0.1%3A12342%2F&test%3D
+ GET&http%3A%2F%2F127.0.0.1%3A12342%2F&
+ -- merging url query and extra params --
+ GET&http%3A%2F%2F127.0.0.1%3A12342%2Fscript&arg1%3D1%26arg2%3D2
++-- with array value --
++GET&http%3A%2F%2F127.0.0.1%3A12342%2Fscript&arg2%3D1%26arg2%3D2%26arg2%3D3
+-- 
+2.1.4
+
diff --git a/dev-php/pecl-oauth/metadata.xml b/dev-php/pecl-oauth/metadata.xml
new file mode 100644
index 000000000000..b86acf66c756
--- /dev/null
+++ b/dev-php/pecl-oauth/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-oauth/pecl-oauth-1.2.3-r5.ebuild b/dev-php/pecl-oauth/pecl-oauth-1.2.3-r5.ebuild
new file mode 100644
index 000000000000..460f2c39256c
--- /dev/null
+++ b/dev-php/pecl-oauth/pecl-oauth-1.2.3-r5.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PHP_EXT_NAME="oauth"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+USE_PHP="php5-6 php7-0 php7-1"
+
+inherit php-ext-pecl-r3
+
+# Really only build for 5.6
+USE_PHP="php5-6"
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="OAuth is an authorization protocol built on top of HTTP"
+LICENSE="BSD"
+SLOT="0"
+IUSE="+curl examples"
+
+DEPEND="php_targets_php5-6? ( dev-lang/php:5.6[hash]
+		dev-libs/libpcre:3= curl? ( net-misc/curl:0= ) )
+"
+RDEPEND="${DEPEND} php_targets_php7-0? ( ${CATEGORY}/${PN}:7[php_targets_php7-0(-)?] )
+	php_targets_php7-1? ( ${CATEGORY}/${PN}:7[php_targets_php7-1(-)?] )"
+
+src_prepare() {
+	if use php_targets_php5-6 ; then
+		local PATCHES=(
+			"${FILESDIR}/${PV}-withcurl.patch"
+			"${FILESDIR}/${PV}-prce.h-check.patch"
+		)
+		php-ext-source-r3_src_prepare
+	else
+		eapply_user
+	fi
+}
+
+src_configure() {
+	if use php_targets_php5-6 ; then
+		local PHP_EXT_ECONF_ARGS=(
+			--enable-oauth
+			$(use_with curl)
+		)
+
+		php-ext-source-r3_src_configure
+	fi
+}
+
+src_install() {
+	if use php_targets_php5-6 ; then
+		php-ext-pecl-r3_src_install
+	fi
+}
diff --git a/dev-php/pecl-oauth/pecl-oauth-2.0.2-r1.ebuild b/dev-php/pecl-oauth/pecl-oauth-2.0.2-r1.ebuild
new file mode 100644
index 000000000000..988ba351a82a
--- /dev/null
+++ b/dev-php/pecl-oauth/pecl-oauth-2.0.2-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PHP_EXT_NAME="oauth"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+USE_PHP="php5-6 php7-0 php7-1"
+
+inherit php-ext-pecl-r3
+
+# Really only build for 7.0
+USE_PHP="php7-0 php7-1"
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="OAuth is an authorization protocol built on top of HTTP"
+LICENSE="BSD"
+SLOT="7"
+IUSE="+curl examples"
+
+DEPEND="php_targets_php7-0? ( dev-lang/php:7.0[hash]
+		dev-libs/libpcre:3= curl? ( net-misc/curl:0= ) )
+	php_targets_php7-1? ( dev-lang/php:7.1[hash]
+		dev-libs/libpcre:3= curl? ( net-misc/curl:0= ) )
+"
+RDEPEND="${DEPEND} php_targets_php5-6? ( ${CATEGORY}/${PN}:0[php_targets_php5-6(-)?] )"
+
+src_prepare() {
+	if use php_targets_php7-0 || use php_targets_php7-1 ; then
+		local PATCHES=( "${FILESDIR}/${PV}-compare_segfault.patch" )
+		php-ext-source-r3_src_prepare
+	else
+		eapply_user
+	fi
+}
+
+src_configure() {
+	if use php_targets_php7-0 || use php_targets_php7-1 ; then
+		local PHP_EXT_ECONF_ARGS=(
+			--enable-oauth
+			$(use_with curl)
+		)
+
+		php-ext-source-r3_src_configure
+	fi
+}
+
+src_install() {
+	if use php_targets_php7-0 || use php_targets_php7-1 ; then
+		php-ext-pecl-r3_src_install
+	fi
+}