From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1440079-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 7E257158094
for <garchives@archives.gentoo.org>; Tue, 27 Sep 2022 09:55:28 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 91961E0BFD;
Tue, 27 Sep 2022 09:55:27 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 78421E0BFD
for <gentoo-commits@lists.gentoo.org>; Tue, 27 Sep 2022 09:55:27 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 89AD2340C77
for <gentoo-commits@lists.gentoo.org>; Tue, 27 Sep 2022 09:55:26 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id DADD55D4
for <gentoo-commits@lists.gentoo.org>; Tue, 27 Sep 2022 09:55:24 +0000 (UTC)
From: "David Seifert" <soap@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" <soap@gentoo.org>
Message-ID: <1664272512.48176e12fc9523e05f1f81c8a53e8baab05fd6d5.soap@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-vpn/vpnc/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-vpn/vpnc/vpnc-9999.ebuild
X-VCS-Directories: net-vpn/vpnc/
X-VCS-Committer: soap
X-VCS-Committer-Name: David Seifert
X-VCS-Revision: 48176e12fc9523e05f1f81c8a53e8baab05fd6d5
X-VCS-Branch: master
Date: Tue, 27 Sep 2022 09:55:24 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: fd4c52ac-7c67-4023-8772-b1172a98b489
X-Archives-Hash: e4c8a7e5648e903b3d0c037e3d745491
commit: 48176e12fc9523e05f1f81c8a53e8baab05fd6d5
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 27 09:55:12 2022 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Sep 27 09:55:12 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48176e12
net-vpn/vpnc: sync live ebuild
Signed-off-by: David Seifert <soap <AT> gentoo.org>
net-vpn/vpnc/vpnc-9999.ebuild | 29 ++++++++++++++++++++++++-----
1 file changed, 24 insertions(+), 5 deletions(-)
diff --git a/net-vpn/vpnc/vpnc-9999.ebuild b/net-vpn/vpnc/vpnc-9999.ebuild
index ba1e8a44e682..d62312b59c91 100644
--- a/net-vpn/vpnc/vpnc-9999.ebuild
+++ b/net-vpn/vpnc/vpnc-9999.ebuild
@@ -3,11 +3,21 @@
EAPI=8
-inherit git-r3 linux-info systemd tmpfiles toolchain-funcs
+inherit linux-info systemd tmpfiles toolchain-funcs
DESCRIPTION="Free client for Cisco VPN routing software"
HOMEPAGE="https://www.unix-ag.uni-kl.de/~massar/vpnc/"
-EGIT_REPO_URI="https://github.com/streambinder/vpnc.git"
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/streambinder/vpnc.git"
+else
+ inherit vcs-snapshot
+ SRC_URI="
+ https://api.github.com/repos/streambinder/vpnc/tarball/fdd0de7 -> ${P}.tar.gz
+ https://dev.gentoo.org/~soap/distfiles/${PN}-0.5.3-docs.tar.xz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
LICENSE="GPL-3"
SLOT="0"
@@ -29,13 +39,22 @@ BDEPEND="
CONFIG_CHECK="~TUN"
+src_unpack() {
+ if [[ ${PV} == *9999 ]]; then
+ git-r3_src_unpack
+ else
+ vcs-snapshot_src_unpack
+ mv vpnc-0.5.3-docs/src/doc/*.md "${S}"/src/doc/ || die
+ fi
+}
+
src_configure() {
tc-export CC PKG_CONFIG
export OPENSSL_GPL_VIOLATION=$(usex !gnutls)
}
src_install() {
- emake PREFIX="${EPREFIX}"/usr DESTDIR="${D}" install
+ emake PREFIX="${EPREFIX}"/usr DOCDIR='$(PREFIX)'/share/doc/${PF} DESTDIR="${D}" install
keepdir /etc/vpnc/scripts.d
newinitd "${FILESDIR}"/vpnc-3.init vpnc
@@ -44,8 +63,8 @@ src_install() {
dotmpfiles "${FILESDIR}"/vpnc-tmpfiles.conf
systemd_newunit "${FILESDIR}"/vpnc.service vpnc@.service
- # COPYING file resides here, should not be installed
- rm -r "${ED}"/usr/share/doc/vpnc/ || die
+ # LICENSE file resides here, should not be installed
+ rm -r "${ED}"/usr/share/licenses || die
}
pkg_postinst() {