From d4d59a47e10e21ada1c70f488055674dfa9f08f1 Mon Sep 17 00:00:00 2001 From: Brian Evans Date: Mon, 30 Dec 2019 09:13:42 -0500 Subject: dev-php/pecl-oauth: Remove masked version Bug: https://bugs.gentoo.org/651784 Signed-off-by: Brian Evans --- dev-php/pecl-oauth/Manifest | 1 - dev-php/pecl-oauth/files/1.2.3-prce.h-check.patch | 26 --------- dev-php/pecl-oauth/files/1.2.3-withcurl.patch | 71 ----------------------- dev-php/pecl-oauth/pecl-oauth-1.2.3-r5.ebuild | 56 ------------------ 4 files changed, 154 deletions(-) delete mode 100644 dev-php/pecl-oauth/files/1.2.3-prce.h-check.patch delete mode 100644 dev-php/pecl-oauth/files/1.2.3-withcurl.patch delete mode 100644 dev-php/pecl-oauth/pecl-oauth-1.2.3-r5.ebuild (limited to 'dev-php') diff --git a/dev-php/pecl-oauth/Manifest b/dev-php/pecl-oauth/Manifest index 0a3deb2daf75..a674f719edc2 100644 --- a/dev-php/pecl-oauth/Manifest +++ b/dev-php/pecl-oauth/Manifest @@ -1,4 +1,3 @@ -DIST oauth-1.2.3.tgz 45531 BLAKE2B 10fb5a3d1a46ee17fef7b129b3c29d67d565d296579aff63d8309f4efc5b881450249fb8e6d25703a33ad53e336775abc73f3d8e489f78c00c8988219b02ae1b SHA512 ca61dbec8fa51679accb31eab90b8699c7780f2d60a83566ce05667148ee44b7dc70fd8235414d6a3a996b252ad4a236b3e8a549685fd7e890e0874029c455e1 DIST oauth-2.0.2.tgz 49115 BLAKE2B 292c8c2d7fa3728aa6a73cdb65ee1c603f341cd24596d64b910f495ef649adb1f90ba4dfdab5ce1802dee9e8a0e3a6af502da340ed467de6e8c5d83df18abc7d SHA512 b7aa9459542ec390a5420127d75607702ae6df6254f4e39acb62d35c6a39b8b7990499c279df07ce681081e455b55219c51df42fd516321f317465badf6d459d DIST oauth-2.0.3.tgz 49413 BLAKE2B 581ba50a3add230364ed5c161b76073b1dd7c301eaf4cd048ed97039deb45fea73da56f0d0b69186d8f6fb20a55724ba5892d80bd7aae343b15534d3c82b6346 SHA512 3e0ce5ce01533bfd304c0c34465cc184fbd0af1a25f5192860e6394c86dc948688cc8d4b419b48676481cef3a685ba70ac612a8c516da26d0dfe9efdef7e98d9 DIST oauth-2.0.4.tgz 49359 BLAKE2B d5fb23293fc03f40e2b3a5c5ad51bce1b06a6004e1f20d1563b3db7bb79a71f70bca467348d68b4f6d2393003b4ad23debbe5877192d9e189056e86f9fc00b3e SHA512 269b579f87a9f3f229433c74937f74b9b6df453a6e05f7751ca12fa5f24c9ad62d1ebe5cdb370d33d774a0f2e244c1c685a53226dcb35c0005b5532a00c137d4 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 deleted file mode 100644 index 995ef51f28ca..000000000000 --- a/dev-php/pecl-oauth/files/1.2.3-prce.h-check.patch +++ /dev/null @@ -1,26 +0,0 @@ -From f12e2bd72b238da2dbf3bd0f882d977073cca282 Mon Sep 17 00:00:00 2001 -From: John Jawed -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 deleted file mode 100644 index 5069ae92b146..000000000000 --- a/dev-php/pecl-oauth/files/1.2.3-withcurl.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 1b68ce035883f1ae186d82682fbbc5ea7d1834b3 Mon Sep 17 00:00:00 2001 -From: John Jawed -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/pecl-oauth-1.2.3-r5.ebuild b/dev-php/pecl-oauth/pecl-oauth-1.2.3-r5.ebuild deleted file mode 100644 index 460f2c39256c..000000000000 --- a/dev-php/pecl-oauth/pecl-oauth-1.2.3-r5.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# 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 -} -- cgit v1.2.3-18-g5258