gentoo resync : 17.06.2021

4 files changed, 69 insertions, 155 deletions

diff --git a/dev-db/sqlitebrowser/Manifest b/dev-db/sqlitebrowser/Manifest
index 8d8652879853..b7b5fcd406a8 100644
--- a/dev-db/sqlitebrowser/Manifest
+++ b/dev-db/sqlitebrowser/Manifest
@@ -1,7 +1,6 @@
-AUX sqlitebrowser-3.11.1-unbundle.patch 3194 BLAKE2B b2015e90e7f79409fb16d0490081634c47208956a53f4c24aeec3fa217dd165b1fec2bc51b818b82f39fae55a3ca7bb9a79dc58746781e1622707e0b051e845c SHA512 b0082e6373d54a2aee87b84f0194a91139f535da0c7d741e68458e05a6c7e6a46c1b027e8cf0dff455de0cf2c484d2be51bc829bdbedb2169c8fa44d553afd95
-DIST sqlitebrowser-3.11.1.tar.gz 2523481 BLAKE2B c9a92b93795050605aa938cf5c73493b7d887b386da77b4cee206becd70779f00ab39c7a105772cdbe925ebedcfe0277b6ebe7898383db87454e19b050001253 SHA512 31f5315fd66d14fde16b58fe6522da937068c42e21f60aa15c3c04a1318ecac09f68143df108b83204cdc70ec8bac617a8ae196df9b5524690f837d7e7728916
 DIST sqlitebrowser-3.12.1.tar.gz 3990525 BLAKE2B 9cccd48c83e1953091508f5760b3004c4690791cacc5784286e6ce5220a6e55e761d736d8fbbb135e419beba12def89f63a3d37d6c7e0281f50392f07bf25357 SHA512 f0a62958008693606d9ab04b0413fa10705c7b45fb970c218d8f1adfe8ca01895a6470f369ded6cb7a9338c27385838b8d57c89b5855b4050ce9bec0d69626d1
-EBUILD sqlitebrowser-3.11.1-r1.ebuild 1420 BLAKE2B 2c7d13d4d011bd56cbfac596bd30dcb6d8c8252958be8a481dcacf59e1d16d2b1fb92f6b721a52506d685f51af193a42ce164340314c600f24430199fbdbf444 SHA512 3c9a8d829c49fcdf4f18c0ff2d48f9c4ce281110671101ac306edf1d60586759a6ae40cd0e05e244bfbb3bef6a86f1db6e7c6673fd1951ef665f34ee8fd1865e
+DIST sqlitebrowser-3.12.2.tar.gz 3990817 BLAKE2B a0c1495814a814638428fa50e55d5afeb2d3f5c80c9aafbdea3cc444e8c681c48acd1f24126945a89d7284c3f0a23979f2b3541fae7c7a70803f7e7ad69be6f4 SHA512 a6afc0a4286f07adb7038f3a010c93e14204b477bde27b1599c9bfe3390422d3edfaa2a9381b1f13e63a7aaf90e931ee85358eb8b2c15b6ea55818d29c59395f
 EBUILD sqlitebrowser-3.12.1.ebuild 1303 BLAKE2B 9c1f5eaa7fc2fcf8a73a53aa3b452d266ee5171e8597f23f0265c94e4b05ca84cc6dfed45ad971f0bcb81ebf5a7c3faad765fcda3721c1ccc271d4ba8c9251e4 SHA512 0eed5940ea60d165662c6770dc3a22ca4f82ca3d89b98ddcd92d77ea7c9baa5faba0e7d6dd23b65fd39e330422147c65f1cac4518f12f12336c532089634653a
+EBUILD sqlitebrowser-3.12.2.ebuild 1303 BLAKE2B 9c1f5eaa7fc2fcf8a73a53aa3b452d266ee5171e8597f23f0265c94e4b05ca84cc6dfed45ad971f0bcb81ebf5a7c3faad765fcda3721c1ccc271d4ba8c9251e4 SHA512 0eed5940ea60d165662c6770dc3a22ca4f82ca3d89b98ddcd92d77ea7c9baa5faba0e7d6dd23b65fd39e330422147c65f1cac4518f12f12336c532089634653a
 EBUILD sqlitebrowser-9999.ebuild 1303 BLAKE2B 9c1f5eaa7fc2fcf8a73a53aa3b452d266ee5171e8597f23f0265c94e4b05ca84cc6dfed45ad971f0bcb81ebf5a7c3faad765fcda3721c1ccc271d4ba8c9251e4 SHA512 0eed5940ea60d165662c6770dc3a22ca4f82ca3d89b98ddcd92d77ea7c9baa5faba0e7d6dd23b65fd39e330422147c65f1cac4518f12f12336c532089634653a
 MISC metadata.xml 1506 BLAKE2B e52a311da6408b28b570e975745f05607d88a7b0fd2e6144ef008664ddaed062b67f355a141f61d926448829694907e2474d0d0b39088a7c7c8f8a509934d344 SHA512 a4ed70e46b0e86e266ce4a30f401517ab83dcef51fd048047e2dcd13b9c5cc7d9e985e69de5df73f670eaf969a86f835b65035e7093f9c195464dcb4ea09de7b
diff --git a/dev-db/sqlitebrowser/files/sqlitebrowser-3.11.1-unbundle.patch b/dev-db/sqlitebrowser/files/sqlitebrowser-3.11.1-unbundle.patch
deleted file mode 100644
index f86683323281..000000000000
--- a/dev-db/sqlitebrowser/files/sqlitebrowser-3.11.1-unbundle.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-diff -Naur sqlitebrowser-3.11.1-orig/cmake/FindQScintilla.cmake sqlitebrowser-3.11.1/cmake/FindQScintilla.cmake
---- sqlitebrowser-3.11.1-orig/cmake/FindQScintilla.cmake	2019-03-20 11:12:47.452357850 -0400
-+++ sqlitebrowser-3.11.1/cmake/FindQScintilla.cmake	2019-03-20 11:17:49.611365342 -0400
-@@ -42,10 +42,12 @@
- # either expressed or implied, of the FreeBSD Project.
- #=============================================================================
- 
-+SET (QT_MIN_VERSION "5.6.2")
-+FIND_PACKAGE( Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Network Widgets )
- 
- find_path ( QSCINTILLA_INCLUDE_DIR
-   NAMES qsciscintilla.h
--  HINTS ${QT_INCLUDE_DIR}
-+  HINTS ${Qt5Core_INCLUDE_DIRS}
-   PATH_SUFFIXES Qsci
- )
- 
-@@ -80,8 +82,8 @@
- 
- 
- find_library ( QSCINTILLA_LIBRARY
--  NAMES qscintilla qscintilla2 libqscintilla2
--  HINTS ${QT_LIBRARY_DIR}
-+  NAMES qscintilla2 libqscintilla2 qscintilla2_qt5 libqscintilla2_qt5
-+  HINTS ${Qt5Core_LIBRARIES}
- )
- 
- set ( QSCINTILLA_LIBRARIES ${QSCINTILLA_LIBRARY} )
-diff -Naur sqlitebrowser-3.11.1-orig/CMakeLists.txt sqlitebrowser-3.11.1/CMakeLists.txt
---- sqlitebrowser-3.11.1-orig/CMakeLists.txt	2019-03-20 11:12:47.452357850 -0400
-+++ sqlitebrowser-3.11.1/CMakeLists.txt	2019-03-20 11:19:07.740367280 -0400
-@@ -61,26 +61,12 @@
- endif()
- 
- if(NOT FORCE_INTERNAL_ANTLR)
--    find_package(Antlr2 QUIET)
-+  find_package(Antlr2 REQUIRED)
- endif()
- if(NOT FORCE_INTERNAL_QSCINTILLA)
--    find_package(QScintilla QUIET)
-+  find_package(QScintilla REQUIRED)
- endif()
- 
--set(QHEXEDIT_DIR libs/qhexedit)
--set(QCUSTOMPLOT_DIR libs/qcustomplot-source)
--
--if(NOT ANTLR2_FOUND)
--    set(ANTLR_DIR libs/antlr-2.7.7)
--    add_subdirectory(${ANTLR_DIR})
--endif()
--if(NOT QSCINTILLA_FOUND)
--    set(QSCINTILLA_DIR libs/qscintilla/Qt4Qt5)
--    add_subdirectory(${QSCINTILLA_DIR})
--endif()
--add_subdirectory(${QHEXEDIT_DIR})
--add_subdirectory(${QCUSTOMPLOT_DIR})
--
- find_package(Qt5 REQUIRED COMPONENTS Concurrent Gui LinguistTools Network PrintSupport Test Widgets Xml)
- 
- set(CMAKE_AUTOMOC ON)
-diff -Naur sqlitebrowser-3.11.1-orig/src/src.pro sqlitebrowser-3.11.1/src/src.pro
---- sqlitebrowser-3.11.1-orig/src/src.pro	2019-03-20 11:12:47.459357850 -0400
-+++ sqlitebrowser-3.11.1/src/src.pro	2019-03-20 11:22:02.891371623 -0400
-@@ -178,10 +178,6 @@
-     }
- }
- 
--LIBPATH_QHEXEDIT=$$OUT_PWD/../libs/qhexedit
--LIBPATH_ANTLR=$$OUT_PWD/../libs/antlr-2.7.7
--LIBPATH_QCUSTOMPLOT=$$OUT_PWD/../libs/qcustomplot-source
--LIBPATH_QSCINTILLA=$$OUT_PWD/../libs/qscintilla/Qt4Qt5
- unix {
-     LIBS += -ldl
- }
-@@ -222,9 +218,7 @@
- }
- 
- UI_DIR = .ui
--INCLUDEPATH += $$PWD/../libs/antlr-2.7.7 $$PWD/../libs/qhexedit $$PWD/../libs/qcustomplot-source $$PWD/../libs/qscintilla/Qt4Qt5 $$PWD/..
--LIBS += -L$$LIBPATH_QHEXEDIT -L$$LIBPATH_ANTLR -L$$LIBPATH_QCUSTOMPLOT -L$$LIBPATH_QSCINTILLA -lantlr -lqhexedit -lqcustomplot -lqscintilla2
--DEPENDPATH += $$PWD/../libs/antlr-2.7.7 $$PWD/../libs/qhexedit $$PWD/../libs/qcustomplot-source $$PWD/../libs/qscintilla/Qt4Qt5
-+LIBS += -L$$LIBPATH_QHEXEDIT -L$$LIBPATH_ANTLR -L$$LIBPATH_QCUSTOMPLOT -L$$LIBPATH_QSCINTILLA -lantlr -lqhexedit -lqcustomplot -lqscintilla2_qt5
- 
- unix {
-     # Below, the user can specify where all generated file can be placed
diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.11.1-r1.ebuild b/dev-db/sqlitebrowser/sqlitebrowser-3.11.1-r1.ebuild
deleted file mode 100644
index 9264df0706cd..000000000000
--- a/dev-db/sqlitebrowser/sqlitebrowser-3.11.1-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake desktop xdg
-
-DESCRIPTION="SQLite Database Browser"
-HOMEPAGE="https://sqlitebrowser.org"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3 MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	test? ( dev-qt/qttest:5 )
-"
-DEPEND="
-	app-editors/qhexedit2
-	dev-cpp/antlr-cpp:2
-	dev-db/sqlite:3
-	>=dev-libs/qcustomplot-2.0.0[qt5(+)]
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtwidgets:5
-	>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
-	dev-qt/qtprintsupport:5
-	dev-qt/qtxml:5
-
-"
-RDEPEND="${DEPEND}
-	dev-qt/qtsvg:5
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.11.1-unbundle.patch )
-
-src_prepare() {
-	cmake_src_prepare
-	rm -r libs || die
-	sed -i 's#"src/qhexedit.h"#<qhexedit.h>#' src/EditDialog.cpp || die
-	#find libs/{antlr-2.7.7,qcustomplot-source,qscintilla} -delete || die
-
-	sed -e "/^project/ s/\".*\"/sqlitebrowser/" -i CMakeLists.txt || die
-
-	if ! use test; then
-		sed -e "/find_package/ s/ Test//" -i CMakeLists.txt || die
-		sed -e "/set/ s/ Qt5::Test//" -i CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_TESTING=$(usex test)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	doicon images/sqlitebrowser.svg
-}
diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.12.2.ebuild b/dev-db/sqlitebrowser/sqlitebrowser-3.12.2.ebuild
new file mode 100644
index 000000000000..d094723adf0a
--- /dev/null
+++ b/dev-db/sqlitebrowser/sqlitebrowser-3.12.2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg
+
+DESCRIPTION="A light GUI editor for SQLite databases"
+HOMEPAGE="https://sqlitebrowser.org/"
+
+if [[ "${PV}" = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+ MPL-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	app-editors/qhexedit2
+	dev-db/sqlite:3
+	dev-libs/qcustomplot
+	>=dev-qt/qtconcurrent-5.5:5
+	>=dev-qt/qtcore-5.5:5
+	>=dev-qt/qtgui-5.5:5
+	>=dev-qt/qtnetwork-5.5:5[ssl]
+	>=dev-qt/qtprintsupport-5.5:5
+	>=dev-qt/qtwidgets-5.5:5
+	>=dev-qt/qtxml-5.5:5
+	>=x11-libs/qscintilla-2.8.10:=
+"
+
+BDEPEND="
+	>=dev-qt/linguist-tools-5.5:5
+	test? ( >=dev-qt/qttest-5.5:5 )
+"
+
+RDEPEND="
+	${DEPEND}
+	>=dev-qt/qtsvg-5.5:5
+"
+
+src_prepare() {
+	cmake_src_prepare
+
+	if ! use test; then
+		sed -i CMakeLists.txt \
+			-e "/find_package/ s/ Test//" \
+			-e "/set/ s/ Qt5::Test//" \
+			|| die "Cannot remove Qt Test from CMake dependencies"
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_TESTING=$(usex test)
+		-DFORCE_INTERNAL_QCUSTOMPLOT=OFF
+		-DFORCE_INTERNAL_QHEXEDIT=OFF
+	)
+
+	cmake_src_configure
+}