gentoo resync : 05.12.2021

3 files changed, 60 insertions, 2 deletions

diff --git a/dev-php/pecl-gnupg/Manifest b/dev-php/pecl-gnupg/Manifest
index 51dac310bf42..6ba8ed943bd3 100644
--- a/dev-php/pecl-gnupg/Manifest
+++ b/dev-php/pecl-gnupg/Manifest
@@ -1,3 +1,4 @@
+AUX php-8.1-support-1.5.0.patch 2427 BLAKE2B a33bbc7eadcc4555db41e37311978c7052af7a62f3b864fbf42d2099b26cb5837e0a33a6d5486131fd3e0d5d95f1dd0ce9b28db17d9f2372872714c018a68ef7 SHA512 991fd8c0d3e07097e3d73a1ddbba165e7afaa938d8dc25ba5c803a17a65d6022634a010388ac356a58efb6f41c2ef4eef50c4ec89efdb3ab9a87af32e23847fb
 DIST gnupg-1.5.0.tgz 37045 BLAKE2B 61031a493fc460b102c0a2e831e7523c4eeafc203d51a40d8aa902992740d96e3f1f46437a51a65dceefa283845d00d0b39db90163b7901a29cd133ddfc34d7c SHA512 1b4f9a39a2c585c5f8d749f8e2e2256d9765480ef8ef93c24c538b2f1284dacf8e9f71a42f96fa3150ace1a6ff37256a7a849f29a3e57332fe3b05656e4199cc
-EBUILD pecl-gnupg-1.5.0.ebuild 520 BLAKE2B 2cb55233be9dadb82cd4a391f45886aecd73663b0976dd29bfa4f865f51a5f364f1a50ff17aa25bdf35d3df136cc6d170c42b8ceb629ec8bab286664f02f1365 SHA512 e7353fed5f3ad02b2efe7f60b227690237fa459aaccbf2cbf71b5b904364ffe27dd03ddda617fb5dcbcb2cb7cd2a9de304bbdc5d35a4139bb3d6554485d3d512
+EBUILD pecl-gnupg-1.5.0.ebuild 582 BLAKE2B 6bf106749361f308941c26ab58dbd356a1fd6eef372b39f76debbb25f4777cbea86727d363b2b132fc4cc1c2887b38493c65b6a6ec00e9b624e67ad618b1fde2 SHA512 5dd45badea874360de67d29703236bd4fafab52f72ca04ae2c0013d3186bd859116805566efe496317919a363d74ca5b656c5859791c43748a72674a87b12344
 MISC metadata.xml 236 BLAKE2B 55612da78a71f8cee31c387a5862636996734210d765fac66d8c7706acc5151e6a9e7ff5123aeb097c911495c6220ba3b5d2f1355f46e8ab6bdb240e1697e26d SHA512 2782b20a65dca663ff7c64b7e67db05641abed478fd5996e5750b2e52ba870829f89125baa8967dd29fd20ef9b46ad233b0dd08801308b7756717ec2f292446c
diff --git a/dev-php/pecl-gnupg/files/php-8.1-support-1.5.0.patch b/dev-php/pecl-gnupg/files/php-8.1-support-1.5.0.patch
new file mode 100644
index 000000000000..c755ccd0c5b8
--- /dev/null
+++ b/dev-php/pecl-gnupg/files/php-8.1-support-1.5.0.patch
@@ -0,0 +1,55 @@
+diff --git a/phpc.h b/phpc.h
+index 4b55747..70fb317 100644
+--- a/phpc/phpc.h
++++ b/phpc/phpc.h
+@@ -51,6 +51,12 @@
+ 	memcpy(&PHPC_OBJ_GET_HANDLER_VAR_NAME(_name), \
+ 		zend_get_std_object_handlers(), sizeof(zend_object_handlers))
+ 
++/* for arginfo */
++#ifndef ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX
++#define ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(name, return_reference, required_num_args, type, allow_null) \
++        ZEND_BEGIN_ARG_INFO_EX(name, 0, return_reference, required_num_args)
++#endif
++
+ /* ZEND_ACC_CTOR and ZEND_ACC_DTOR is removed in 7.4 */
+ #ifndef ZEND_ACC_CTOR
+ #define ZEND_ACC_CTOR 0
+diff --git a/gnupg_keylistiterator.c b/gnupg_keylistiterator.c
+index 215aaa0..9b285ee 100644
+--- a/gnupg_keylistiterator.c
++++ b/gnupg_keylistiterator.c
+@@ -90,14 +90,28 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_gnupg_void_iterator_method, 0, 0, 0)
+ ZEND_END_ARG_INFO()
+ /* }}} */
+ 
++ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_gnupg_current, 0, 0, IS_MIXED, 0)
++ZEND_END_ARG_INFO()
++
++#define arginfo_gnupg_key arginfo_gnupg_current
++
++ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_gnupg_valid, 0, 0, _IS_BOOL, 0)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_gnupg_next, 0, 0, IS_VOID, 0)
++ZEND_END_ARG_INFO()
++
++#define arginfo_gnupg_rewind  arginfo_gnupg_next
++
++
+ /* {{{ method list gnupg_keylistiterator */
+ static zend_function_entry gnupg_keylistiterator_methods[] = {
+ 	PHP_ME(gnupg_keylistiterator, __construct, arginfo_gnupg_void_iterator_method, ZEND_ACC_PUBLIC)
+-	PHP_ME(gnupg_keylistiterator, current, arginfo_gnupg_void_iterator_method, ZEND_ACC_PUBLIC)
+-	PHP_ME(gnupg_keylistiterator, key, arginfo_gnupg_void_iterator_method, ZEND_ACC_PUBLIC)
+-	PHP_ME(gnupg_keylistiterator, next, arginfo_gnupg_void_iterator_method, ZEND_ACC_PUBLIC)
+-	PHP_ME(gnupg_keylistiterator, rewind, arginfo_gnupg_void_iterator_method, ZEND_ACC_PUBLIC)
+-	PHP_ME(gnupg_keylistiterator, valid, arginfo_gnupg_void_iterator_method, ZEND_ACC_PUBLIC)
++	PHP_ME(gnupg_keylistiterator, current, arginfo_gnupg_current, ZEND_ACC_PUBLIC)
++	PHP_ME(gnupg_keylistiterator, key, arginfo_gnupg_key, ZEND_ACC_PUBLIC)
++	PHP_ME(gnupg_keylistiterator, next, arginfo_gnupg_next, ZEND_ACC_PUBLIC)
++	PHP_ME(gnupg_keylistiterator, rewind, arginfo_gnupg_rewind, ZEND_ACC_PUBLIC)
++	PHP_ME(gnupg_keylistiterator, valid, arginfo_gnupg_valid, ZEND_ACC_PUBLIC)
+ 	PHPC_FE_END
+ };
+ /* }}} */
diff --git a/dev-php/pecl-gnupg/pecl-gnupg-1.5.0.ebuild b/dev-php/pecl-gnupg/pecl-gnupg-1.5.0.ebuild
index b489fe2f6453..8d3304139c7a 100644
--- a/dev-php/pecl-gnupg/pecl-gnupg-1.5.0.ebuild
+++ b/dev-php/pecl-gnupg/pecl-gnupg-1.5.0.ebuild
@@ -10,7 +10,7 @@ PHP_EXT_ZENDEXT="no"
 PHP_EXT_PECL_FILENAME="${MY_P}.tgz"
 PHP_EXT_S="${WORKDIR}/${MY_P}"
 
-USE_PHP="php7-3 php7-4 php8-0"
+USE_PHP="php7-3 php7-4 php8-0 php8-1"
 
 inherit php-ext-pecl-r3
 
@@ -24,3 +24,5 @@ IUSE=""
 
 DEPEND="app-crypt/gpgme app-crypt/gnupg"
 RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/php-8.1-support-1.5.0.patch" )