app-crypt/*: move pinentry[tqt] into pinentry-tqt

Signed-off-by: Alexander Golubev <fatzer2@gmail.com>
(cherry picked from commit 01638c7e3c6fab0c1679bd5153ecb4764b9830c7)

6 files changed, 0 insertions, 254 deletions

diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest
deleted file mode 100644
index b18692ca..00000000
--- a/app-crypt/pinentry/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST pinentry-1.2.1.tar.bz2 547698 BLAKE2B aa47612aa3a6f74c3676bf4018780356cb22ed4078792c1f466f9e0465199428c151c0e20dfbe6c784ef93c2b42b673daff0b6adc74c8c98fed9921e65ed42ea SHA512 a665315628f4dcf07e16a22db3f3be15d7e7e93b3deec0546c7275b71b0e3bd65535a08af5e12d6339fd6595132df86529401d9d12bd17c428a3466e8dfafab6
-DIST pinentry-1.2.1.tar.bz2.sig 238 BLAKE2B 01ba3dc296a8e76c546d21d0bb0cd13778476d5d5b3ef55a3401c6a0353a56d79250d11555afb31c77c5a77e63847ded0f8eaef395bb0dc2ee3ff1d6a4ed83bd SHA512 d0e8435dc169a58f111f057f1c9fbb6c70da32a850f1107d6abdf41357c1714832728109ae61507db313d7eaef9596e5faf92fd21bed78adcc46a8c8a590430b
diff --git a/app-crypt/pinentry/files/pinentry-1.0.0-AR.patch b/app-crypt/pinentry/files/pinentry-1.0.0-AR.patch
deleted file mode 100644
index 82af67f6..00000000
--- a/app-crypt/pinentry/files/pinentry-1.0.0-AR.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-https://bugs.gentoo.org/718028
---- a/configure.ac
-+++ b/configure.ac
-@@ -80,6 +80,7 @@ AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
- AC_PROG_CC
- AC_PROG_CPP
- AC_PROG_INSTALL
-+AM_PROG_AR
- AC_PROG_RANLIB
- # We need to check for cplusplus here because we may not do the test
- # for Qt and autoconf does does not allow that.
diff --git a/app-crypt/pinentry/files/pinentry-1.2.1-automagic-capslock.patch b/app-crypt/pinentry/files/pinentry-1.2.1-automagic-capslock.patch
deleted file mode 100644
index 081fad60..00000000
--- a/app-crypt/pinentry/files/pinentry-1.2.1-automagic-capslock.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-https://dev.gnupg.org/T6161
-https://bugs.gentoo.org/819939
-https://bugs.gentoo.org/837719
---- a/configure.ac
-+++ b/configure.ac
-@@ -508,8 +508,12 @@ fi
- dnl
- dnl Check for libX11 library
- dnl
-+AC_ARG_WITH(x,
-+        AS_HELP_STRING([--with-x],[use libX11]),
-+        [want_x11=$withval], [want_x11=maybe])
-+
- have_x11=no
--if test "$have_w32_system" != "yes"; then
-+AS_IF([test "$have_w32_system" != "yes" && test "$want_x11" != "no"], [
- 	PKG_CHECK_MODULES(
- 		LIBX11,
- 		[x11],
-@@ -519,18 +523,20 @@ if test "$have_w32_system" != "yes"; then
- 			have_x11=no
- 		]
- 	)
-+])
- 
--	if test "$have_x11" = "yes"; then
--		AC_DEFINE(HAVE_X11, 1,
--			[The pinentries can optionally use x11.])
--	fi
--fi
-+AS_IF([test "$have_x11" = "yes"], [AC_DEFINE(HAVE_X11, 1, [The pinentries can optionally use x11.])])
- 
- dnl
- dnl Check for KF5WaylandClient library
- dnl
-+
-+AC_ARG_ENABLE(kf5-wayland,
-+	AS_HELP_STRING([--enable-kf5-wayland],[use KF5WaylandClient for capslock indication on Wayland]),
-+	[want_kf5_wayland=$enableval], [want_kf5_wayland=maybe])
-+
- have_kf5waylandclient=no
--if test "$have_w32_system" != "yes"; then
-+AS_IF([test "$have_w32_system" != "yes" && test "$want_kf5_wayland" != "no"], [
- 	PKG_CHECK_MODULES(
- 		KF5WAYLANDCLIENT,
- 		[KF5WaylandClient >= 5.60],
-@@ -540,7 +546,7 @@ if test "$have_w32_system" != "yes"; then
- 			have_kf5waylandclient=no
- 		]
- 	)
--fi
-+])
- 
- dnl
- dnl Check for Qt5 pinentry program.
---- a/m4/qt.m4
-+++ b/m4/qt.m4
-@@ -33,6 +33,10 @@ AC_DEFUN([FIND_QT],
-                 enable_pinentry_qt5=$enableval,
-                 enable_pinentry_qt5="try")
- 
-+  AC_ARG_ENABLE(qtx11extras,
-+                AS_HELP_STRING([--enable-qtx11extras],[use Qt5X11Extras for capslock indication on X11]),
-+        [want_qtx11extras=$enableval], [want_qtx11extras=maybe])
-+
-   have_qt5_libs="no";
-   require_qt_cpp11="no";
- 
-@@ -63,20 +67,22 @@ AC_DEFUN([FIND_QT],
-       fi
-     fi
- 
--    if test "$have_x11" = "yes"; then
-+    have_qt5_x11extras=no
-+    AS_IF([test "$have_x11" = "yes" && test "$want_qtx11extras" != "no"], [
-       PKG_CHECK_MODULES(
-         PINENTRY_QT_X11_EXTRAS,
-         Qt5X11Extras >= 5.1.0,
-         [have_qt5_x11extras="yes"],
--        [
--          AC_MSG_WARN([pinentry-qt will be built without Caps Lock warning on X11])
--          have_qt5_x11extras="no"
--        ])
--      if test "$have_qt5_x11extras" = "yes"; then
-+        [have_qt5_x11extras="no"]
-+     )
-+    ])
-+
-+    AS_IF([test "$have_qt5_x11extras" = "yes"], [
-         PINENTRY_QT_CFLAGS="$LIBX11_CFLAGS $PINENTRY_QT_CFLAGS $PINENTRY_QT_X11_EXTRAS_CFLAGS"
-         PINENTRY_QT_LIBS="$LIBX11_LIBS $PINENTRY_QT_LIBS $PINENTRY_QT_X11_EXTRAS_LIBS"
--      fi
--    fi
-+    ], [
-+        AC_MSG_WARN([pinentry-qt will be built without Caps Lock warning on X11])
-+    ])
- 
-     AC_CHECK_TOOL(MOC, moc)
-     AC_MSG_CHECKING([moc version])
diff --git a/app-crypt/pinentry/files/pinentry-for-tqt-configure-1.2.1.patch b/app-crypt/pinentry/files/pinentry-for-tqt-configure-1.2.1.patch
deleted file mode 100644
index e6dafbeb..00000000
--- a/app-crypt/pinentry/files/pinentry-for-tqt-configure-1.2.1.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -urN pinentry-1.2.1.orig/configure.ac pinentry-1.2.1/configure.ac
---- pinentry-1.2.1.orig/configure.ac	2023-12-27 14:38:13.605366651 +0300
-+++ pinentry-1.2.1/configure.ac	2023-12-27 14:38:53.221364994 +0300
-@@ -642,15 +642,6 @@
- 
- if test "$pinentry_tqt" != "no"; then
- 
--  if test "$pinentry_qt" = "yes"; then
--    AC_MSG_ERROR([[
--    ***
--    *** Building both Qt and TQt pinentries is not supported.
--    *** Use --disable-pinentry-qt and --disable-pinentry-qt4
--    *** if you want the TQt pinentry.
--    ***]])
--  fi
--
-   PKG_CHECK_MODULES(PINENTRY_TQT, tqt,
-                     have_tqt_libs=yes,
-                     [PKG_CHECK_MODULES(PINENTRY_TQT, tqt-mt,
diff --git a/app-crypt/pinentry/metadata.xml b/app-crypt/pinentry/metadata.xml
deleted file mode 100644
index e5207734..00000000
--- a/app-crypt/pinentry/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<use>
-		<flag name="tqt">Enable support for Trinity's Qt3 fork</flag>
-	</use>
-</pkgmetadata>
diff --git a/app-crypt/pinentry/pinentry-1.2.1-r5.ebuild b/app-crypt/pinentry/pinentry-1.2.1-r5.ebuild
deleted file mode 100644
index 4458a4d5..00000000
--- a/app-crypt/pinentry/pinentry-1.2.1-r5.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gnupg.asc
-inherit autotools qmake-utils verify-sig
-
-DESCRIPTION="Simple passphrase entry dialogs which utilize the Assuan protocol"
-HOMEPAGE="https://gnupg.org/aegypten2"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="caps efl emacs gtk keyring ncurses qt5 tqt wayland X"
-
-DEPEND="
-	>=dev-libs/libassuan-2.1
-	>=dev-libs/libgcrypt-1.6.3
-	>=dev-libs/libgpg-error-1.17
-	efl? ( dev-libs/efl[X] )
-	keyring? ( app-crypt/libsecret )
-	ncurses? ( sys-libs/ncurses:= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		wayland? ( kde-plasma/kwayland:5 )
-		X? (
-			dev-qt/qtx11extras:5
-			x11-libs/libX11
-		)
-	)
-	tqt? ( dev-tqt/tqt )
-"
-RDEPEND="
-	${DEPEND}
-	gtk? ( app-crypt/gcr:0[gtk] )
-"
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig
-	verify-sig? ( sec-keys/openpgp-keys-gnupg )
-"
-IDEPEND=">=app-eselect/eselect-pinentry-0.7.2"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.0-AR.patch"
-	"${FILESDIR}/${PN}-1.2.1-automagic-capslock.patch" # bug #819939, bug #837719
-	"${FILESDIR}/${PN}-for-tqt-configure-1.2.1.patch"
-)
-
-src_prepare() {
-	default
-
-	sed "s/Q_EXPORT/TQ_EXPORT/g" -i "${S}/tqt/secqinternal_p.h" || die
-	sed "s/Q_EXPORT/TQ_EXPORT/g" -i "${S}/tqt/secqlineedit.h" || die
-	sed "s/Q_EXPORT/TQ_EXPORT/g" -i "${S}/tqt/secqstring.cpp" || die
-	sed "s/Q_EXPORT/TQ_EXPORT/g" -i "${S}/tqt/secqstring.h" || die
-
-	unset FLTK_CONFIG
-
-	eautoreconf
-}
-
-src_configure() {
-	export PATH="$(qt5_get_bindir):${PATH}"
-	export QTLIB="$(qt5_get_libdir)"
-
-	local myeconfargs=(
-		$(use_enable efl pinentry-efl)
-		$(use_enable emacs pinentry-emacs)
-		$(use_enable keyring libsecret)
-		$(use_enable gtk pinentry-gnome3)
-		$(use_enable ncurses fallback-curses)
-		$(use_enable ncurses pinentry-curses)
-		$(use_enable qt5 pinentry-qt)
-		$(use_enable tqt pinentry-tqt)
-		$(use_enable wayland kf5-wayland)
-		$(use_enable X qtx11extras)
-		$(use_with X x)
-
-		--enable-pinentry-tty
-		--disable-pinentry-fltk
-		--disable-pinentry-gtk2
-
-		MOC="$(qt5_get_bindir)"/moc
-		GPG_ERROR_CONFIG="${ESYSROOT}"/usr/bin/${CHOST}-gpg-error-config
-		LIBASSUAN_CONFIG="${ESYSROOT}"/usr/bin/libassuan-config
-
-		$("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	rm "${ED}"/usr/bin/pinentry || die
-
-	use qt5 && dosym pinentry-qt /usr/bin/pinentry-qt5
-}
-
-pkg_postinst() {
-	eselect pinentry update ifunset
-}
-
-pkg_postrm() {
-	eselect pinentry update ifunset
-}