commit:     ac2812f249477b4e7f12f5f97fa8b5fc5899d691
Author:     Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Wed Mar  8 19:15:34 2023 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Wed Mar  8 19:15:34 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ac2812f2

net-misc/gnome-ssh-askpass: add 9.2_p1, drop 9.1_p1

Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in>

 net-misc/gnome-ssh-askpass/Manifest                |  4 +-
 .../gnome-ssh-askpass-9.1_p1.ebuild                | 67 ----------------------
 .../gnome-ssh-askpass-9.2_p1.ebuild                | 54 +++++++++++++++++
 net-misc/gnome-ssh-askpass/metadata.xml            |  5 ++
 4 files changed, 61 insertions(+), 69 deletions(-)

diff --git a/net-misc/gnome-ssh-askpass/Manifest 
b/net-misc/gnome-ssh-askpass/Manifest
index ee2d79669..227bd1b0c 100644
--- a/net-misc/gnome-ssh-askpass/Manifest
+++ b/net-misc/gnome-ssh-askpass/Manifest
@@ -1,2 +1,2 @@
-DIST openssh-9.1p1.tar.gz 1838747 BLAKE2B 
287b6b1cc4858b27af88f4a4674670afff1fb5b99461892083393c53ef3747c5a0fcd90cba95d2c27465a919e00f7f42732c93af4f306665ba0393bbb7a534f5
 SHA512 
a1f02c407f6b621b1d0817d1a0c9a6839b67e416c84f3b76c63003b119035b24c19a1564b22691d1152e1d2d55f4dc7eb1af2d2318751e431a99c4efa77edc70
-DIST openssh-9.1p1.tar.gz.asc 833 BLAKE2B 
83efe3c705f6a02c25a9fc9bac2a4efd77470598d9e0fcb86dff2d265c58cffec1afecad3621769b2bd78ac25884f0ee20ae9b311e895db93e3bb552dffd6e74
 SHA512 
47dc7295f9694250bcbb86d7ca0830a47da4f3df7795bb05ebaf1590284ccce5317022c536bea1b09bd2fa4d8013295cc0de287ebe3f9dc605582077e9f11ddd
+DIST openssh-9.2p1.tar.gz 1852380 BLAKE2B 
8d0b5e43cb42cba105a1fe303c447a2b85151cb33ec7ed47747d75c5a61d0f07f0ee4b1020b79c13eb8de4b451c5a844a8afc7ebbbea7ffeceafc3bf59cb8d21
 SHA512 
c4b79ef3a05b96bfc477ffb31f734635bffd5be213ab58e043111c3232dbe999ff24665fa1069518237cffa5126ded0dda8984e1b8f098f4f09b8c1dae20e604
+DIST openssh-9.2p1.tar.gz.asc 833 BLAKE2B 
36210757aaa4ee8e6bdf4cfbb5590e6c54a617817d1657ebb446e54530d01a9e9f5559408b3d424d5efdb4ba06f0c02755637f5480dc81f9b4e32963de91087a
 SHA512 
2a56f8946ed00fcd5a92935e090523d40b5c3747e25661d575b799b1825bf5e47a95eed5e7ed968fe042349c2c7d94d6b0e6bf2d9145b5c6ff5df2ca538d56e5

diff --git a/net-misc/gnome-ssh-askpass/gnome-ssh-askpass-9.1_p1.ebuild 
b/net-misc/gnome-ssh-askpass/gnome-ssh-askpass-9.1_p1.ebuild
deleted file mode 100644
index 4de717ec4..000000000
--- a/net-misc/gnome-ssh-askpass/gnome-ssh-askpass-9.1_p1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs verify-sig
-
-PARCH=openssh-9.1p1
-
-DESCRIPTION="GTK-based passphrase dialog for use with OpenSSH"
-HOMEPAGE="https://www.openssh.com/";
-SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
-       verify-sig? ( mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz.asc )
-"
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openssh.org.asc
-S="${WORKDIR}/${PARCH}"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-IUSE="gtk2 +gtk3 verify-sig"
-REQUIRED_USE="|| ( gtk2 gtk3 )"
-
-RESTRICT="test"
-
-RDEPEND="
-       gtk2? ( x11-libs/gtk+:2 )
-       gtk3? ( x11-libs/gtk+:3 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-       virtual/pkgconfig
-       verify-sig? ( sec-keys/openpgp-keys-openssh )
-"
-
-src_unpack() {
-       default
-
-       # We don't have signatures for HPN, X509, so we have to write this 
ourselves
-       use verify-sig && verify-sig_verify_detached 
"${DISTDIR}"/${PARCH}.tar.gz{,.asc}
-}
-
-src_configure() {
-       true
-}
-
-src_compile() {
-       pushd contrib || die
-
-       use gtk2 && emake gnome-ssh-askpass2
-       use gtk3 && emake gnome-ssh-askpass3
-
-       popd || die
-}
-
-src_install() {
-       if use gtk2; then
-               dobin contrib/gnome-ssh-askpass2;
-       fi
-
-       if use gtk3; then
-               dobin contrib/gnome-ssh-askpass3;
-       fi
-
-       newenvd - 99gnome_ssh_askpass <<-EOF
-       export SSH_ASKPASS='${EPREFIX}/usr/bin/gnome-ssh-askpass$(usex gtk3 3 
2)'
-       EOF
-}

diff --git a/net-misc/gnome-ssh-askpass/gnome-ssh-askpass-9.2_p1.ebuild 
b/net-misc/gnome-ssh-askpass/gnome-ssh-askpass-9.2_p1.ebuild
new file mode 100644
index 000000000..eabd92855
--- /dev/null
+++ b/net-misc/gnome-ssh-askpass/gnome-ssh-askpass-9.2_p1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs verify-sig
+
+MY_P="openssh-${PV/_p/p}"
+DESCRIPTION="GTK-based passphrase dialog for use with OpenSSH"
+HOMEPAGE="https://www.openssh.com/";
+SRC_URI="mirror://openbsd/OpenSSH/portable/${MY_P}.tar.gz
+       verify-sig? ( mirror://openbsd/OpenSSH/portable/${MY_P}.tar.gz.asc )
+"
+S="${WORKDIR}/${MY_P}/contrib"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+RESTRICT="test"
+
+RDEPEND="
+       dev-libs/glib:2
+       x11-libs/gtk+:3
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+       virtual/pkgconfig
+       verify-sig? ( sec-keys/openpgp-keys-openssh )
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/openssh.org.asc"
+
+src_unpack() {
+       default
+
+       # We don't have signatures for HPN, X509, so we have to write this 
ourselves
+       use verify-sig && \
+               verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.asc}
+}
+
+src_configure() {
+       tc-export CC
+}
+
+src_compile() {
+       emake gnome-ssh-askpass3
+}
+
+src_install() {
+       dobin gnome-ssh-askpass3;
+
+       newenvd - 99gnome_ssh_askpass <<-EOF
+               export SSH_ASKPASS='${EPREFIX}/usr/bin/gnome-ssh-askpass3'
+       EOF
+}

diff --git a/net-misc/gnome-ssh-askpass/metadata.xml 
b/net-misc/gnome-ssh-askpass/metadata.xml
new file mode 100644
index 000000000..115e9d64a
--- /dev/null
+++ b/net-misc/gnome-ssh-askpass/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";>
+<pkgmetadata>
+       <!-- maintainer-needed -->
+</pkgmetadata>

Reply via email to