gentoo resync : 04.05.2021

3 files changed, 2 insertions, 37 deletions

diff --git a/dev-db/sqlitestudio/Manifest b/dev-db/sqlitestudio/Manifest
index 1e5895cf34bb..1ac6dde88734 100644
--- a/dev-db/sqlitestudio/Manifest
+++ b/dev-db/sqlitestudio/Manifest
@@ -1,4 +1,3 @@
-AUX sqlitestudio-3.2.1-libressl.patch 1248 BLAKE2B 7500c5231d03a2c1e2006631b77076a0cb6af49609446544f7e3901b748e87a2be03b232ef8f93714220542fff56f48e92c2de39d8a54889d7472b142071c71f SHA512 6fafceed80e8d072d06060f15787d855bfcfb55a502a73655beca043a73c45101bf5d3168781a2579c9e6aee5d924318240c886fe982cb0c833779d57be97405
 DIST sqlitestudio-3.2.1.tar.gz 9405867 BLAKE2B 53cd8465a6140cf17c602094cceef2fdf74f513f33257b22e1a3d7adcb9c78d8eb2cdaff047920836a9d98429ba0025924ce608f2eab97319feabf063de4c9ee SHA512 9c07f0dc50bf35ad04d0cb06cfc1a306d3f0aa9446e7d737c8187c63cb7dd2c44fb4b960693f2c30a15ece3aac0878701874a9ce3cebfe0c6bf48df10814a574
-EBUILD sqlitestudio-3.2.1-r1.ebuild 3812 BLAKE2B 6f9ea8c4bfde3e9c323edb9cac312a1e03731b8e2d9d389e4fb99509107c156115d24023b58c0b62b30afbefd4c6918b8c3a871ecb831dc43ba6dc39bf38b1f1 SHA512 abedf192358de6e4dc06b1852431557a6082940127f0a9f0399573b9364766a5071ca0eeac0c9adf349c62d1df8c7237fca57f82b7c05a31c4a0582ee9a43aa8
+EBUILD sqlitestudio-3.2.1-r1.ebuild 3765 BLAKE2B cf5a0cd2d4a584afc821fd789719ef00fca4abeaa49438ca2278b68e0f73b80ba4066a841cf58fc52db9b4bf632d0201d083c1a8d0905f88f53b2c2a17eb13ad SHA512 9bbbbf39e7a576839bd4524bac04b494819cb6452a6c7aecad27b876b6cf1d0092a099374da64470e2aec96e6f246a2dd4f62ca1ef2e1ec47412caa8c2b3e5b9
 MISC metadata.xml 228 BLAKE2B 4786a830041a969023b1033df82f4ab08478929992d7980c6d43dbeab70734b1fea7aa62c9f66b90eb11839b1087cb85bcb7669045e2982941bc5b924d749791 SHA512 1a90f65c0d92e7fc380993d798f0773c21b35ece69a71743bfef6b4ffaa8695de8fd88e0ba7eaf2b43b3ce4eb1ebcbbeb3e86aa477db5c10fd14f37ea09a857c
diff --git a/dev-db/sqlitestudio/files/sqlitestudio-3.2.1-libressl.patch b/dev-db/sqlitestudio/files/sqlitestudio-3.2.1-libressl.patch
deleted file mode 100644
index 06552942e945..000000000000
--- a/dev-db/sqlitestudio/files/sqlitestudio-3.2.1-libressl.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 64542c8c5cb3ad9249fa353ff4472c405057d743 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <stefan.strogin@gmail.com>
-Date: Mon, 25 Mar 2019 18:07:13 +0200
-Subject: [PATCH] #3505 Fix compilation with LibreSSL >=2.7.0
-
-HMAC_CTX_{new,free} were provided by LibreSSL 2.7.0.
-Do not redefine them, otherwise it breaks compilation.
-
-Upstream-Status: Accepted
-[https://github.com/pawelsalawa/sqlitestudio/pull/3507]
-Signed-off-by: Stefan Strogin <stefan.strogin@gmail.com>
----
- Plugins/DbSqliteCipher/sqlcipher.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/Plugins/DbSqliteCipher/sqlcipher.c b/Plugins/DbSqliteCipher/sqlcipher.c
-index 4918cb6f..10c4e5a3 100644
---- a/Plugins/DbSqliteCipher/sqlcipher.c
-+++ b/Plugins/DbSqliteCipher/sqlcipher.c
-@@ -21638,7 +21638,8 @@ static unsigned int openssl_external_init = 0;
- static unsigned int openssl_init_count = 0;
- static sqlcipher_sqlite3_mutex* openssl_rand_mutex = NULL;
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
-+    (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
- static HMAC_CTX *HMAC_CTX_new(void)
- {
-   HMAC_CTX *ctx = OPENSSL_malloc(sizeof(*ctx));
--- 
-2.21.0
-
diff --git a/dev-db/sqlitestudio/sqlitestudio-3.2.1-r1.ebuild b/dev-db/sqlitestudio/sqlitestudio-3.2.1-r1.ebuild
index af6ff97a5db8..6b5bc1399b7f 100644
--- a/dev-db/sqlitestudio/sqlitestudio-3.2.1-r1.ebuild
+++ b/dev-db/sqlitestudio/sqlitestudio-3.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -40,8 +40,6 @@ BDEPEND="
 	dev-qt/linguist-tools:5
 "
 
-PATCHES=( "${FILESDIR}"/${P}-libressl.patch )
-
 S="${WORKDIR}"
 core_build_dir="${S}/output/build"
 plugins_build_dir="${core_build_dir}/Plugins"