gentoo auto-resync : 07:08:2024 - 12:37:20

3 files changed, 29 insertions, 1 deletions

diff --git a/app-admin/drush/Manifest b/app-admin/drush/Manifest
index fab0e17421de..0c669fdcbeb9 100644
--- a/app-admin/drush/Manifest
+++ b/app-admin/drush/Manifest
@@ -4,8 +4,9 @@ AUX drush-6.7.0-batch-signature-fix.patch 1545 BLAKE2B a23c3f57fc3dfeec789019734
 AUX drush-6.7.0-dont-pass-null-to-strtoupper.patch 1076 BLAKE2B 3f2335b9d84e95705f38830d692902db9e460686e5b619840dc83116774a0fe5a7389bfe11cc213e2fcad398000a3b13d4c7cfba3c194d0df95d334fffad2b5f SHA512 5f506583a025f989d027519d5b64014274ddd69065890cc1ae3db1f89959b021dae849a25b9a35885f92b4e6ceb137990d13e0d1c0f7b0eb1b60bfac281ab008
 AUX drush-6.7.0-gzip-mime.patch 775 BLAKE2B 6ed1f540ecff96f798c6dedb97da136b8f43e46bc5696f8aeedaab2419641880d161562ea04b44cc565bb76a693bf1ac9183d1efefbe1d744977381b45be8a3d SHA512 67002c5653301823b9b8efee4c0c00ef0dda9ca05f516eb13d5a9b82dc5837c28c59fea038f881c90e0313bbcd30ff434d58a1736b00c6be73b8da3c46a9291d
 AUX drush-6.7.0-php8.0.patch 3341 BLAKE2B 681c7bef6f7007e52767c4429015791a8ceb1bbc3ca80c7a8a924e880b811433e67485e5211368dbf89f2f03400f960e06395d64fb67d6fbcb8d85a1c0ce08d1 SHA512 73d74911945a1e74c2ef361e0f1cf89656356062fdcb4c1f36ac9a07d7f62bd29488283fcbffbb2f41700a9a89f6273d8203052fbcadada48bb2002a098a64d4
+AUX drush-6.7.0-sql-dollar-sign.patch 803 BLAKE2B 0197b3bb424444643da53b013199bbe583545fcce79354c7dd608a5f66c823d92966bd34ac0cf8f428ae015dadbf156081918813072c1e3c75d05c3eb7b11af3 SHA512 b28268c2db7ff977106c8f6995149fddb69964c9033f960ea19e5498549cf72b0cc139272ac7de60a244545bcbd669610bbddb7e6933ddb47e02e714dcb3be23
 AUX update-bash-completion-script-for-2.1.patch 1332 BLAKE2B a54fa2cab268542a37f1020012cf7744106966419d2ba8415a2e2ead882feb3f3dc9bd9b1ab17f8592e5d021855f5361b05304efcc810362224935069ef1b897 SHA512 2e19a6be652684c1b1a2a9d6605c1404272391950408cd6ae964b2bdd9f95b1e59deec5111c1eaa563a92837ea394fcb2315a3032b2ab02996509b98eb7d1cf0
 DIST drush-6.7.0.tar.gz 511581 BLAKE2B d3a589e3de35afe120d790f96ffa7e88b530da1e1d04815b1dea2f05cd081ad7dc6f4b39fa6f19b5620b9913b952ab289ec538f1b7c0c0f298d3cd0129eb7026 SHA512 203870190dd8987ad3da71f7625476c1f94bc75513447a740fd8c16268fb9705bcbc3b2bffc49a44045998e3fa49fd5ee9d4c0634a1fb39605ba8e10b7373fa5
 EBUILD drush-6.7.0-r6.ebuild 1814 BLAKE2B 6b3383e74124feb3615a3c3d9f9d51511cd26fd92862ee5038d8ec99eb853ef4715ce2dd89b43c5b888d24a81b88101920dd772681c5530f1c4f30f79902fa9f SHA512 6cdbef34ec70a2676c9829110232cb5dd3089b08bc336598b916c443beaa79e3a4f9bf2a63eef5247924ab5e003840ed1803b1336a28538ac0ca6ab25229980b
-EBUILD drush-6.7.0-r7.ebuild 1819 BLAKE2B 7390947c19f19b1452b98ffc4e56fab27d2cb010902a3144ac2e0523c71467895c49bc94a10c6594bb0a3aecedd4b4fd6713ffb3538e2c5edce20ef7ed33e8de SHA512 06e4374039d4882bcf41a07534cc39c55a93a14e58cb2606d5adef2cc262fa358881d14a3110a36a72ce87bed28647ec99c3c6d044014671ef9e1040a6a75edf
+EBUILD drush-6.7.0-r8.ebuild 1861 BLAKE2B 609d07b611ec48ead43af4fb20ae2441c4cf4e400b9d105604bffa35ae8a8b3c23bd4455a3f63052a86323fa7c66dc67286411e2905822bb45d1cf644432d1e0 SHA512 0d323b95fa6de12bc8f27670517844f0f2afed93d00bf825d8573fce5e293b25c2bbbec6a3295e3da9343984de92fe51375ea5da9eb11d170338f9cf5ec6cfb9
 MISC metadata.xml 532 BLAKE2B c6ca539149d500608519aa982f4a3ef7f8e15b472d5140b8569371df6585c9f80ea57d7802fee00267bfe76290f2b9836be20250472bd261500fd5de84b974f7 SHA512 ec95e30855e93d1d04eac73b3dcf538c2ab38fbeb44acb7f3f7f3c3c04af9a5adba7dc96181cc02f136ffd901e22aab362dadef70aa9f84b0dde78a70bd36716
diff --git a/app-admin/drush/drush-6.7.0-r7.ebuild b/app-admin/drush/drush-6.7.0-r8.ebuild
index 1329345e4dc0..2768a8302b65 100644
--- a/app-admin/drush/drush-6.7.0-r7.ebuild
+++ b/app-admin/drush/drush-6.7.0-r8.ebuild
@@ -23,6 +23,7 @@ PATCHES=(
 	"${FILESDIR}/${P}-gzip-mime.patch"
 	"${FILESDIR}/${P}-dont-pass-null-to-strtoupper.patch"
 	"${FILESDIR}/${P}-batch-signature-fix-r1.patch"
+	"${FILESDIR}/${P}-sql-dollar-sign.patch"
 )
 
 src_prepare() {
diff --git a/app-admin/drush/files/drush-6.7.0-sql-dollar-sign.patch b/app-admin/drush/files/drush-6.7.0-sql-dollar-sign.patch
new file mode 100644
index 000000000000..9d6b37274a75
--- /dev/null
+++ b/app-admin/drush/files/drush-6.7.0-sql-dollar-sign.patch
@@ -0,0 +1,26 @@
+From ed5365ba0e6021d2dfbfe9b31bfd641d718eb978 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Sat, 27 Jul 2024 07:52:15 -0400
+Subject: [PATCH 1/1] commands/sql/sql.drush.inc: ${var} -> {$var}
+
+This fixes a deprecation warning with newer PHPs.
+---
+ commands/sql/sql.drush.inc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/commands/sql/sql.drush.inc b/commands/sql/sql.drush.inc
+index 6d7a4aa..fcf2654 100644
+--- a/commands/sql/sql.drush.inc
++++ b/commands/sql/sql.drush.inc
+@@ -1414,7 +1414,7 @@ function drush_sql_format_oracle($query) {
+   $sqlp_settings = implode("\n", $settings)."\n";
+ 
+   // important for sqlplus to exit correctly
+-  return "${sqlp_settings}${query};\nexit;\n";
++  return "{$sqlp_settings}{$query};\nexit;\n";
+ }
+ 
+ 
+-- 
+2.44.2
+