gentoo auto-resync : 21:02:2023 - 02:22:31

5 files changed, 10 insertions, 62 deletions

diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index ff03a6bf7830..58936d2fa321 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/scrypt/Manifest b/dev-php/scrypt/Manifest
index 31db39e8ecb2..180107d4ccc0 100644
--- a/dev-php/scrypt/Manifest
+++ b/dev-php/scrypt/Manifest
@@ -1,5 +1,4 @@
-AUX scrypt-1.4.2-php8-0.patch 1277 BLAKE2B 1bccdc8deb053f13e7075f0d52a14a0f0767fa1f2d2f487ef6387f5b6dcba84879350051f85689e3e2518a53a5952836adc566d4c42e2b8fb08ee81280929637 SHA512 75ed1c9da84fd121941df5bca59b26cb90158817fd4efec375cfe923868c439efdd9f6f06e2c153eda9bfd4e4cc095f22e32b37056c8ea3ed0eeeb1f13e77e0b
-DIST scrypt-1.4.2.tgz 21585 BLAKE2B 6297b15aac8470eedc619c498badc4e453476a390cab0cfe7fabef00012131ff9e363834b9423a566dba603ea2a4351eee416419cc1e6c1245a9aba54d63a5ab SHA512 34a87e63250dcfb21b3d36f90a4e5f4bac9f0623917ceb0d613d49112ce0e13df9a93fb0730fb797be6337d023dc490fb881902b5492309fe8bf3e6fd5e685a0
-EBUILD scrypt-1.4.2.ebuild 395 BLAKE2B dbb271382adf2201d669bcf774ad18e766434b9adc391f76eb81a7e6c31e485a192b298d15daa01be4e3cc467d003b8eecc522e8c808a52315c10498bd55eb39 SHA512 991c793096493e35138ec3998e13ed78ca9c6899223e0b3cc0340980de965fa1fcb3c30a08f5997381f00632b1a7606aef35aa2697e78e94b15cdea79c3e8df7
-EBUILD scrypt-9999.ebuild 414 BLAKE2B 5262f81f837afb03250dd545892d45586df821b04661edb35ea1d826c51b7b2638fc707779fa34307cd3e5924f4182fd9bd959a8135e58845a52361db32a3a1f SHA512 7711fc2f3b8094c691823440f3dd87d3973b54a1e0139e6d2689ecabd5a24241388dc2f77ee52f46435914cfdc2de8768628897398383c09afa7957a22f829eb
+DIST scrypt-2.0.0.tgz 23229 BLAKE2B 71a40869004cbcb3fb6b303e1d59c0687b9817b89b38ebedc0001a732f4d4fba134ba124b09a6b4970da9892654631b41d0ce8e79d60eaccf788344972cb0760 SHA512 88b559f112f768eb1b61652ee5a6a75edbfd6133aca39c0d740dd083e3d2f718232a607a05a306cd40faeb4cab48f98de04f0799011d86543385583a99fb508f
+EBUILD scrypt-2.0.0.ebuild 356 BLAKE2B ba2696fc7c72b8a6be7e3607b4fb16daf2576004baad27cb5e7d8a5e9e2d8bdd32173ec2a100326c5a0a11b5aff9074042d21098b15916660e2f8c2ba09edadf SHA512 0dd51a87a7d1190e9b9f1f0890a526718e9122eb21b5e3d751fd578f533d4289e928a4f094851a61ddfe98de7d0b5a841cfdd6ca9a0ae84726c2db0c46fedbd5
+EBUILD scrypt-9999.ebuild 414 BLAKE2B 55fdaa9a3a2214ec81a6d662f3d3deb8d631d57c927e872d8192ab54e257bc64744f502c5a22049c1e57a0387c35e272af26fbd7cca10826be5e897c80a5989d SHA512 8b6d25876351f7b603acbe3496a3ccb33b0715a56d29d9ba02f90248fddb75cddef9f830910443a9de2c80bd7d5c90548704ecfc8c7b2dc2efeeb9ccce00a52a
 MISC metadata.xml 822 BLAKE2B 24967e03c8ab7834fd07cd06477f663df8f425097fe3adb0bd81636e142adbd180f318b4097e2920e016eaff95cf2b9654d2aae6c13c80f423eb58398b302b83 SHA512 e3a079ed9c395b9f613a0c03366a1a9be48be2cd45cb337a776ee83e0abf08b244977fb7c719ea878852200d18ffcb2afeaabdaf7a95aac28683a00430da7d1f
diff --git a/dev-php/scrypt/files/scrypt-1.4.2-php8-0.patch b/dev-php/scrypt/files/scrypt-1.4.2-php8-0.patch
deleted file mode 100644
index a5e1ea665897..000000000000
--- a/dev-php/scrypt/files/scrypt-1.4.2-php8-0.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 5010f9fa0743518d149d994728ca930503adde1e Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Tue, 22 Sep 2020 14:55:32 +0200
-Subject: [PATCH] trivial fix for PHP 8
-
----
- crypto/crypto_scrypt-sse.c | 1 +
- php_scrypt.h               | 5 +++++
- php_scrypt_utils.c         | 1 +
- 3 files changed, 7 insertions(+)
-
-diff --git a/crypto/crypto_scrypt-sse.c b/crypto/crypto_scrypt-sse.c
-index a52ce81..709a04f 100644
---- a/crypto/crypto_scrypt-sse.c
-+++ b/crypto/crypto_scrypt-sse.c
-@@ -44,6 +44,7 @@
- #include "sysendian.h"
- 
- #include "crypto_scrypt.h"
-+#include "php_scrypt.h"
- 
- static void blkcpy(void *, void *, size_t);
- static void blkxor(void *, void *, size_t);
-diff --git a/php_scrypt.h b/php_scrypt.h
-index a1117c8..6cc1c4c 100644
---- a/php_scrypt.h
-+++ b/php_scrypt.h
-@@ -35,4 +35,9 @@ PHP_FUNCTION(scrypt_pickparams);
- extern zend_module_entry scrypt_module_entry;
- #define phpext_scrypt_ptr &scrypt_module_entry
- 
-+#ifndef TSRMLS_CC
-+#define TSRMLS_CC
-+#define TSRMLS_FETCH()
-+#endif
-+
- #endif
-diff --git a/php_scrypt_utils.c b/php_scrypt_utils.c
-index 797e2c7..34fe347 100644
---- a/php_scrypt_utils.c
-+++ b/php_scrypt_utils.c
-@@ -25,6 +25,7 @@
-  */
- 
- #include "php_scrypt_utils.h"
-+#include "php_scrypt.h"
- 
- /*
-  * Casts a long into a uint64_t.
diff --git a/dev-php/scrypt/scrypt-1.4.2.ebuild b/dev-php/scrypt/scrypt-2.0.0.ebuild
index 026a54355943..3fc681c01f83 100644
--- a/dev-php/scrypt/scrypt-1.4.2.ebuild
+++ b/dev-php/scrypt/scrypt-2.0.0.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PHP_EXT_ECONF_ARGS="--enable-scrypt"
-USE_PHP="php7-3 php7-4 php8-0"
+USE_PHP="php7-4 php8-0 php8-1 php8-2"
 
 inherit php-ext-pecl-r3
 
-DESCRIPTION="A PHP wrapper fo the scrypt hashing algorithm"
+DESCRIPTION="A PHP wrapper for the scrypt hashing algorithm"
 
 LICENSE="BSD-2"
 SLOT="0"
@@ -16,5 +16,3 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="dev-util/re2c"
-
-PATCHES=( "${FILESDIR}"/"${P}"-php8-0.patch )
diff --git a/dev-php/scrypt/scrypt-9999.ebuild b/dev-php/scrypt/scrypt-9999.ebuild
index 900385d5cf23..16afe4e90e07 100644
--- a/dev-php/scrypt/scrypt-9999.ebuild
+++ b/dev-php/scrypt/scrypt-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PHP_EXT_ECONF_ARGS="--enable-scrypt"
-USE_PHP="php7-3 php7-4 php8-0"
+USE_PHP="php8-0 php8-1 php8-2"
 EGIT_REPO_URI="https://github.com/DomBlack/php-scrypt.git"
 
 inherit git-r3 php-ext-pecl-r3