gentoo auto-resync : 10:06:2023 - 21:52:51

4 files changed, 75 insertions, 93 deletions

diff --git a/dev-libs/qtkeychain/Manifest b/dev-libs/qtkeychain/Manifest
index ef1d4f364349..e66e4af02b1e 100644
--- a/dev-libs/qtkeychain/Manifest
+++ b/dev-libs/qtkeychain/Manifest
@@ -1,7 +1,5 @@
 DIST qtkeychain-0.13.2.tar.gz 43494 BLAKE2B d90799df83e8bed7f4ee9cdf6c7f56c86b1aee7123735963c4e2f858a69bbf28bcd062c6a302f8687626b1884acde61d7f7882b985517b24a1358b57ea13cdcc SHA512 10f8b1c959a126ba14614b797ea5640404a0b95c71e452225c74856eae90e966aac581ca393508a2106033c3d5ad70427ea6f7ef3f2997eddf6d09a7b4fa26eb
-DIST qtkeychain-0.14.0.tar.gz 50655 BLAKE2B e79370b6bf2a6e880d281cd4b12106a88a5297e74e56b09a5d2a0cbef17166798a467d045b50beddb61de2a6ffeb75f1bc3f895236bebb01fc1f425ea3dbe309 SHA512 65118198d82f284c1bb914964657e62fccb81050359071b44530574c73c673913d22b5de17cc30e9099feca06ece556bb9329350f017ce331e845ba074d1f078
 DIST qtkeychain-0.14.1.tar.gz 50743 BLAKE2B 76300eeefc98a40da762a65cdf0a5a406b55cb92e290bb91e643353c3d2efdee1387168805326def60a42196d5cfde4f0d6c36cb2e0c946fc331361891af08f7 SHA512 bf84b19090e667a2946297e63d9813574193d80e4eecbde2fdfca317a66da3f029b3abef326f4ffb32de032a48004f9cf1bc818468af612723d762652dc25eb6
 EBUILD qtkeychain-0.13.2.ebuild 873 BLAKE2B 80303d605c6cd61ca8dbe55941540755d891e7b47acfda65b99478aaa502e679c4bbacbdbaa766eead0655ae1ab79d221c199972fc1b7455f950b582e4b3c8a0 SHA512 60bfec3a8e4d5a405824ef9e13f5c70bb8a086b672f00dd2ebd0e153734bcb2c221aa2dc600bd490971d16ff36eaa3c8269750c358485a3ab6aba0e8a77d50ea
-EBUILD qtkeychain-0.14.0.ebuild 883 BLAKE2B f08cb0f72a2fa9f5a61f98943c4a0cd23129deb3b6886ee21b22dc8dcc9fb0ed4b698c2be443898ac88930d13ac1dc21159643ae777c9e9eca827d2216d293b9 SHA512 e21670c0d2f32df70fb4e3a8c268619a52a364d9dd252673696ffc1d0b9b74c8dcfa12738e7c2fcfab9be4dd615b91f1f8e9c377eaf67ddc38829a536f209135
-EBUILD qtkeychain-0.14.1.ebuild 892 BLAKE2B 88d131cd648582a41cef735ae2ccae256efd269202843f2f3b726edc32b64f48941db72ec318ad2bf624cf09a2bfe4969f39e428b1c5a56f109da9e33a95c01a SHA512 d38cefaf564c4803c80e6e5413e9d54e389b8bf23df809742ad3697311898b190562b50a736fdbfa89b43e094de86c1b7a1a40a14d09e86c599546b52390a04a
+EBUILD qtkeychain-0.14.1-r1.ebuild 1539 BLAKE2B 67c89aaab0081183f685629868335b8334e2b9b51903bc3c60687207efb21c3b67e03b8bf1832265e0e0b5adede789139078c7c28fbc0ff5c47c769368e1e2f2 SHA512 5b65e2c6a28fa48d2401d02b3a111b827380c4baa254c516f5139c63390eb4541c0651e4a563640995115c7a611517cb2f2077de779d6148c850942908c93f13
 MISC metadata.xml 340 BLAKE2B 4ae9796b7c395cbb0dc0c4a06d203db9a270ec00dba635bdeb0f46b350fffd3784f98a700f645238824cf6b474215c1cbed4c1ede1df16f47185598c81de5610 SHA512 3bf8c371c3268190a04f67f2213b89efe9f1dad96cbf2ee5ad3d112d5ea6b164ccbfefabaed55a6e0cdfa3e4bb06d6e7959b88513567a1d619aa1138957c5027
diff --git a/dev-libs/qtkeychain/qtkeychain-0.14.0.ebuild b/dev-libs/qtkeychain/qtkeychain-0.14.0.ebuild
deleted file mode 100644
index 6c5fbc414b04..000000000000
--- a/dev-libs/qtkeychain/qtkeychain-0.14.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-HOMEPAGE="https://github.com/frankosterfeld/qtkeychain"
-DESCRIPTION="Qt API for storing passwords securely"
-
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="https://github.com/frankosterfeld/qtkeychain/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
-else
-	inherit git-r3
-	EGIT_REPO_URI="${HOMEPAGE}.git"
-fi
-
-LICENSE="BSD-2"
-SLOT="0/1"
-IUSE="keyring"
-
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	keyring? (
-		app-crypt/libsecret
-		dev-libs/glib:2
-	)
-"
-RDEPEND="${DEPEND}"
-BDEPEND="dev-qt/linguist-tools:5"
-
-DOCS=( ChangeLog ReadMe.md )
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_WITH_QT6=OFF
-		-DBUILD_TEST_APPLICATION=OFF
-		-DBUILD_TRANSLATIONS=ON
-		-DLIBSECRET_SUPPORT=$(usex keyring)
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/qtkeychain/qtkeychain-0.14.1-r1.ebuild b/dev-libs/qtkeychain/qtkeychain-0.14.1-r1.ebuild
new file mode 100644
index 000000000000..f6bdc28e5b0d
--- /dev/null
+++ b/dev-libs/qtkeychain/qtkeychain-0.14.1-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake multibuild
+
+HOMEPAGE="https://github.com/frankosterfeld/qtkeychain"
+DESCRIPTION="Qt API for storing passwords securely"
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="https://github.com/frankosterfeld/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/frankosterfeld/${PN}.git"
+fi
+
+LICENSE="BSD-2"
+SLOT="0/1"
+IUSE="keyring +qt5 qt6"
+REQUIRED_USE="|| ( qt5 qt6 )"
+
+DEPEND="
+	keyring? (
+		app-crypt/libsecret
+		dev-libs/glib:2
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+	)
+	qt6? ( dev-qt/qtbase:6[dbus] )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	qt5? ( dev-qt/linguist-tools:5 )
+	qt6? ( dev-qt/qttools:6[linguist] )
+"
+
+DOCS=( ChangeLog ReadMe.md )
+
+pkg_setup() {
+	MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) )
+}
+
+src_configure() {
+	my_src_configure() {
+		local mycmakeargs=(
+			-DECM_MKSPECS_INSTALL_DIR="${EPREFIX}"/usr/$(get_libdir)/${MULTIBUILD_VARIANT}/mkspecs
+			-DBUILD_TEST_APPLICATION=OFF
+			-DBUILD_TRANSLATIONS=ON
+			-DLIBSECRET_SUPPORT=$(usex keyring)
+		)
+
+		if [[ ${MULTIBUILD_VARIANT} == qt6 ]]; then
+			mycmakeargs+=( -DBUILD_WITH_QT6=ON )
+		else
+			mycmakeargs+=( -DBUILD_WITH_QT6=OFF )
+		fi
+
+		cmake_src_configure
+	}
+
+	multibuild_foreach_variant my_src_configure
+}
+
+src_compile() {
+	multibuild_foreach_variant cmake_src_compile
+}
+
+src_install() {
+	multibuild_foreach_variant cmake_src_install
+}
diff --git a/dev-libs/qtkeychain/qtkeychain-0.14.1.ebuild b/dev-libs/qtkeychain/qtkeychain-0.14.1.ebuild
deleted file mode 100644
index b0c73e9cc490..000000000000
--- a/dev-libs/qtkeychain/qtkeychain-0.14.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-HOMEPAGE="https://github.com/frankosterfeld/qtkeychain"
-DESCRIPTION="Qt API for storing passwords securely"
-
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="https://github.com/frankosterfeld/qtkeychain/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
-else
-	inherit git-r3
-	EGIT_REPO_URI="${HOMEPAGE}.git"
-fi
-
-LICENSE="BSD-2"
-SLOT="0/1"
-IUSE="keyring"
-
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	keyring? (
-		app-crypt/libsecret
-		dev-libs/glib:2
-	)
-"
-RDEPEND="${DEPEND}"
-BDEPEND="dev-qt/linguist-tools:5"
-
-DOCS=( ChangeLog ReadMe.md )
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_WITH_QT6=OFF
-		-DBUILD_TEST_APPLICATION=OFF
-		-DBUILD_TRANSLATIONS=ON
-		-DLIBSECRET_SUPPORT=$(usex keyring)
-	)
-
-	cmake_src_configure
-}