6 files changed, 26 insertions, 128 deletions
diff --git a/app-crypt/zulucrypt/Manifest b/app-crypt/zulucrypt/Manifest
index 72a0136f2625..c0223dd70eed 100644
--- a/app-crypt/zulucrypt/Manifest
+++ b/app-crypt/zulucrypt/Manifest
@@ -1,3 +1 @@
-DIST zulucrypt-5.1.0.tar.bz2 1610597 BLAKE2B 3b77676912f0cd8990ba307ff04309f308ec29cf76cad37ac28ebb317a7e42ee93ffe9deb1db12a80c4d5b235c2a83bc8e5ddeb6082e5f1be9d91425d06f4334 SHA512 b916d43f8c889f1593c506d95360b195f0639024463eb77b5b21b544468f99719b877d8c94725504305f307efe5cb18e203dc8f9b015bd55825dc1d4fffb42f0
-DIST zulucrypt-5.4.0.tar.bz2 1704452 BLAKE2B b0ef9e33b7261087b97186dd49672ea115c4792c04a64700cba5caa9c9e63d84818904c078a4d6663c6f420bbd19b0593af84210010821e2b8bae5f19947ffec SHA512 65361ef885b68a13f435704e0e1dbc9b7ae4df9525900ab60665c29e24574dcadb4afb27a7c595db33021c07086de92332f1a52189cfd674991b95e208040074
-DIST zulucrypt-5.4.0_pre20180223.tar.gz 2162535 BLAKE2B 7d098ec20b7f355be6ad863121f7016d6b1ccbcc133438b616cfbd805110b24ae91dc74b0c2daf3137511fcb72e0338663c3c743c6c3d2b761883c57c590c0e5 SHA512 38ea9442a48c02741e11e59759b745ce3d6d6ca5f37d8b685526be76308a8fa1f7db7fd38038e5ce50e2a8afd8740b0a683a3458cb1df6f0b70c41fbf8035c15
+DIST zulucrypt-5.5.0_pre20180223.tar.gz 2162535 BLAKE2B 7d098ec20b7f355be6ad863121f7016d6b1ccbcc133438b616cfbd805110b24ae91dc74b0c2daf3137511fcb72e0338663c3c743c6c3d2b761883c57c590c0e5 SHA512 38ea9442a48c02741e11e59759b745ce3d6d6ca5f37d8b685526be76308a8fa1f7db7fd38038e5ce50e2a8afd8740b0a683a3458cb1df6f0b70c41fbf8035c15
diff --git a/app-crypt/zulucrypt/files/zulucrypt-5.5.0_pre20180223-fno-common.patch b/app-crypt/zulucrypt/files/zulucrypt-5.5.0_pre20180223-fno-common.patch
new file mode 100644
index 000000000000..ea5bcd7a6d18
--- /dev/null
+++ b/app-crypt/zulucrypt/files/zulucrypt-5.5.0_pre20180223-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/zuluCrypt-cli/bin/security.h
++++ b/zuluCrypt-cli/bin/security.h
+@@ -35,7 +35,7 @@ extern "C" {
+  * set the function to be called when an attempt to evelate or downgrade privileges fail
+  * zuluCryptSecurityPrivilegeElevationError global variable is defined in security.c
+  */
+-void ( *zuluCryptSecurityPrivilegeElevationError )( const char * ) ;
++extern void ( *zuluCryptSecurityPrivilegeElevationError )( const char * ) ;
+ 
+ void zuluCryptSecuritySetPrivilegeElevationErrorFunction( void ( * ) ( const char * ) ) ;
+ 
diff --git a/app-crypt/zulucrypt/metadata.xml b/app-crypt/zulucrypt/metadata.xml
index 61ba535ff6f5..61d20bbc00aa 100644
--- a/app-crypt/zulucrypt/metadata.xml
+++ b/app-crypt/zulucrypt/metadata.xml
@@ -1,14 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>johu@gentoo.org</email>
-		<name>Johannes Huber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
-		<flag name="gnome">
-			Enable support for the freedesktop.org Secret Service API via <pkg>app-crypt/libsecret</pkg>
-		</flag>
 		<flag name="kwallet">
 			Enable encrypted storage of passwords with <pkg>kde-frameworks/kwallet</pkg>
 		</flag>
diff --git a/app-crypt/zulucrypt/zulucrypt-5.1.0.ebuild b/app-crypt/zulucrypt/zulucrypt-5.1.0.ebuild
deleted file mode 100644
index 8f783bd0f8ee..000000000000
--- a/app-crypt/zulucrypt/zulucrypt-5.1.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils xdg
-
-DESCRIPTION="Front end to cryptsetup"
-HOMEPAGE="https://mhogomchungu.github.io/zuluCrypt/"
-SRC_URI="https://github.com/mhogomchungu/zuluCrypt/releases/download/${PV}/zuluCrypt-${PV}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnome kwallet +qt5 udev"
-
-REQUIRED_USE="kwallet? ( qt5 )"
-
-CDEPEND="
-	dev-libs/libgcrypt:0=
-	sys-fs/cryptsetup:=
-	gnome? ( app-crypt/libsecret )
-	qt5? (
-		dev-libs/libpwquality
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtwidgets:5
-		kwallet? ( kde-frameworks/kwallet:5 )
-	)
-"
-RDEPEND="${CDEPEND}
-	udev? ( virtual/udev )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/zuluCrypt-${PV}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIB_SUFFIX="$(get_libdir)"
-		-DNOGNOME=$(usex !gnome)
-		-DNOKDE=$(usex !kwallet)
-		-DNOGUI=$(usex !qt5)
-		-DUDEVSUPPORT=$(usex udev)
-	)
-	cmake-utils_src_configure
-}
diff --git a/app-crypt/zulucrypt/zulucrypt-5.4.0.ebuild b/app-crypt/zulucrypt/zulucrypt-5.4.0.ebuild
deleted file mode 100644
index 81296f712ec5..000000000000
--- a/app-crypt/zulucrypt/zulucrypt-5.4.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils xdg
-
-DESCRIPTION="Front end to cryptsetup"
-HOMEPAGE="https://mhogomchungu.github.io/zuluCrypt/"
-SRC_URI="https://github.com/mhogomchungu/zuluCrypt/releases/download/${PV}/zuluCrypt-${PV}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnome kwallet +qt5 udev"
-
-REQUIRED_USE="kwallet? ( qt5 )"
-
-CDEPEND="
-	dev-libs/libgcrypt:0=
-	sys-fs/cryptsetup:=
-	gnome? ( app-crypt/libsecret )
-	qt5? (
-		dev-libs/libpwquality
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtwidgets:5
-		kwallet? ( kde-frameworks/kwallet:5 )
-	)
-"
-RDEPEND="${CDEPEND}
-	udev? ( virtual/udev )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/zuluCrypt-${PV}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIB_SUFFIX="$(get_libdir)"
-		-DNOGNOME=$(usex !gnome)
-		-DNOKDE=$(usex !kwallet)
-		-DNOGUI=$(usex !qt5)
-		-DUDEVSUPPORT=$(usex udev)
-		-DINTERNAL_LXQT_WALLET=true
-		-DINTERNAL_ZULUPLAY=true
-	)
-	cmake-utils_src_configure
-}
diff --git a/app-crypt/zulucrypt/zulucrypt-5.4.0_pre20180223.ebuild b/app-crypt/zulucrypt/zulucrypt-5.5.0_pre20180223.ebuild
index ae369a3926e1..413d47c9f966 100644
--- a/app-crypt/zulucrypt/zulucrypt-5.4.0_pre20180223.ebuild
+++ b/app-crypt/zulucrypt/zulucrypt-5.5.0_pre20180223.ebuild
@@ -1,25 +1,26 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit cmake-utils xdg
+inherit cmake xdg
 
 DESCRIPTION="Front end to cryptsetup"
 HOMEPAGE="https://mhogomchungu.github.io/zuluCrypt/"
 EGIT_COMMIT="76637bb05af13744bf1734b56f67d6d5cc2343b1"
 SRC_URI="https://github.com/mhogomchungu/zuluCrypt/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/zuluCrypt-${EGIT_COMMIT}"
 
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="gnome kwallet +qt5 udev"
+IUSE="keyring kwallet +qt5 udev"
 REQUIRED_USE="kwallet? ( qt5 )"
 
-CDEPEND="
+DEPEND="
 	dev-libs/libgcrypt:0=
 	sys-fs/cryptsetup:=
-	gnome? ( app-crypt/libsecret )
+	keyring? ( app-crypt/libsecret )
 	qt5? (
 		dev-libs/libpwquality
 		dev-qt/qtcore:5
@@ -28,27 +29,21 @@ CDEPEND="
 		dev-qt/qtwidgets:5
 		kwallet? ( kde-frameworks/kwallet:5 )
 	)"
-
-RDEPEND="
-	${CDEPEND}
+RDEPEND="${DEPEND}
 	udev? ( virtual/udev )"
+BDEPEND="virtual/pkgconfig"
 
-DEPEND="
-	${CDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/zuluCrypt-${EGIT_COMMIT}"
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
 
 src_configure() {
 	local mycmakeargs=(
 		-DLIB_SUFFIX="$(get_libdir)"
-		-DNOGNOME=$(usex !gnome)
+		-DNOGNOME=$(usex !keyring)
 		-DNOKDE=$(usex !kwallet)
 		-DNOGUI=$(usex !qt5)
 		-DQT5=true
 		-DUDEVSUPPORT=$(usex udev)
-		-DINTERNAL_LXQT_WALLET=true
 		-DINTERNAL_ZULUPLAY=true
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }