gentoo auto-resync : 27:09:2022 - 15:10:20

4 files changed, 113 insertions, 6 deletions

diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 9e1e8ad31cec..8a076b879fb3 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/vpnc/Manifest b/net-vpn/vpnc/Manifest
index 00cfe18a61ee..d1653fd13677 100644
--- a/net-vpn/vpnc/Manifest
+++ b/net-vpn/vpnc/Manifest
@@ -3,7 +3,10 @@ AUX vpnc-3.init 2197 BLAKE2B 8f88a7f27207e1ab4f2e9b4f31ceb06668f26fcace00dd16923
 AUX vpnc-tmpfiles.conf 29 BLAKE2B cc5cf7d24be2117a95c339667771121df32d813680a32cbda995a1fd2e90cd6b93f6b9b749b28a4f34aea417001b330ca53ed5a3291de9d7b2d99965342f603f SHA512 21635c67b89ca04880eca6c53e47b2b4ed27f992415d466d27a634af3393b1aa7a75cf09b8ad1a6a80cd2f93c508eb8cc6876ae20bfe3a1c66b7cd09f1e7661d
 AUX vpnc.confd 123 BLAKE2B 313d5999586f56b3b88f8473d1f6f07e69994c620ddf3d8cfb9e263fc27c60500a3e6da59f1e905611aec39a62dfcc3c4b746a580a8a106fc6be9384d716955d SHA512 1254f687dcd9822becfcccabbb34d8343d715d70247dbf4b5e018835fff24b33f5272368f77199d697c8d11d913182b1f756d5e08a46b2057849779f09b19633
 AUX vpnc.service 517 BLAKE2B 3fa2eaeea6a28fdf8826d936e1fe93dccade383411df395d69971312c9e062299af8b9f7514875a79a7d4e916efa4b4cf83ab0fb29eedbf52da31af3bc0fff63 SHA512 d580ad4fadbe6ea733f42eda53516e1766ba028f610653c62ba211d4a9ee05a6bf1d8676405a7a3ffede3432d75f9c4dcc72d1fab2a9215150f41a74269850c5
+DIST vpnc-0.5.3-docs.tar.xz 4816 BLAKE2B fe972fb71e74dea481593ce42225a2969608dd4d29a2f34ca1f7b5b82a71a62bfbd94d5fcd2e8db830768be1e858682904e655b8629cb164961644bc5de291e1 SHA512 e3e9f3e3651906f41a4a6b0f4247b903fb555155cbda210823f36a5613d8390b6aad7615ff88fd627ece4037b0e0f04753ac924c9cd9c1335480ca8186d476b8
+DIST vpnc-0.5.3_p20220927.tar.gz 119773 BLAKE2B 0dabadac8b5a8116c07597140b6fa31e8f7daed9448e1bf653491809453ec114c0e96d38a8103d90a8b68dd2cefa0540ed676ced3fb9d57eaf16d8be5e3f0fa1 SHA512 e8c2254042c67283749331349467b2aed29ececc26de0bc3227c9c4a14f06d9d518599b28ca979df0cbe997c8997dda8afa508a0858c80ec270922096d8f906f
 DIST vpnc-0.5.3_p550-r2.tar.gz 133339 BLAKE2B d4f09a62edbe3b4014c4903d908eecf27ee09705017f715aadc869592fb80d7f4482f08e4681dd9e9c22ae16ae185404e09572800de8cb76419c20f5bf8e17d1 SHA512 3adaf4c73c14c328ca9702c1e3d3c333b0a589f99b52990febf7b22ac87f666f1fc0a1d62e9831ec645567ca01425ea476a7bb62fee214012c97651e0e99b732
+EBUILD vpnc-0.5.3_p20220927.ebuild 2503 BLAKE2B ff01f550e3e5fdd1d7f5fc391d900085c6634a3c29dd8477a753e0e73fc5a48650dee4dcafa14d75d206fb6a08baa2618330cfeba4560c55dec0d38eaf7f0091 SHA512 1795396518969b09181236f5d299f94e2bb85aa26547782f9108a156be0f6af2d2638df3eae54f78904bdd8475a7bc1a20ebb0a5b837b260a1a0e5cdcc7d0b03
 EBUILD vpnc-0.5.3_p550-r3.ebuild 2299 BLAKE2B f16d4c12cb5ae5373a2017ab2220bd9f52bac52e13d9ca43c54184d395f50b4d4bc9481606bcf4c1fd41a666c09362fdd68bdd69b35ec93faf603113aa149c07 SHA512 0d37011d53ed0acf1b9768ed544511d543c8299e01b5c565ae00897e12fec297b36b9cd135265aa0ff36040a0367659088642e58202fd1ceeba7f9f0ad2a8272
-EBUILD vpnc-9999.ebuild 2017 BLAKE2B 94372301fd6c8591be0d0f7a7c2eff811b578d4146aa7f007a3eb30120be15c49210eef7b89e4123710e253f0ba85fccadc73fcd682e653236cd6b3803b05600 SHA512 dfd20fc12a940b1f9f612cb7ae8eb7aa6d6863c582e3b1c0e41632f756e12e101a3ce42f8011f70ec379728925e242ad7a0c667bffe7d556d2ff1389da817b3c
+EBUILD vpnc-9999.ebuild 2503 BLAKE2B ff01f550e3e5fdd1d7f5fc391d900085c6634a3c29dd8477a753e0e73fc5a48650dee4dcafa14d75d206fb6a08baa2618330cfeba4560c55dec0d38eaf7f0091 SHA512 1795396518969b09181236f5d299f94e2bb85aa26547782f9108a156be0f6af2d2638df3eae54f78904bdd8475a7bc1a20ebb0a5b837b260a1a0e5cdcc7d0b03
 MISC metadata.xml 447 BLAKE2B c7241da58f64ef0eedf0a8f855ed7495c88ee31869b7d093ac1ec0c511dc236ce05a637464f714ee6485190461c74128cda4fb6d71b574722a4880f20a0a735a SHA512 6396504c91e1b823f66b227f2ee3f8cb5ccabf598a2ac12d1be00596d355c3d97d04036099f218e3436a9d8954468e4f953a54deefae9343b60960c0986a23a4
diff --git a/net-vpn/vpnc/vpnc-0.5.3_p20220927.ebuild b/net-vpn/vpnc/vpnc-0.5.3_p20220927.ebuild
new file mode 100644
index 000000000000..d62312b59c91
--- /dev/null
+++ b/net-vpn/vpnc/vpnc-0.5.3_p20220927.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/"
+
+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"
+IUSE="resolvconf +gnutls selinux"
+RESTRICT="!gnutls? ( bindist )"
+
+DEPEND="
+	dev-libs/libgcrypt:=
+	sys-apps/iproute2[-minimal]
+	gnutls? ( net-libs/gnutls:= )
+	!gnutls? ( dev-libs/openssl:= )"
+RDEPEND="${DEPEND}
+	>=net-vpn/vpnc-scripts-20210402-r1
+	resolvconf? ( virtual/resolvconf )
+	selinux? ( sec-policy/selinux-vpn )"
+BDEPEND="
+	dev-lang/perl
+	virtual/pkgconfig"
+
+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 DOCDIR='$(PREFIX)'/share/doc/${PF} DESTDIR="${D}" install
+
+	keepdir /etc/vpnc/scripts.d
+	newinitd "${FILESDIR}"/vpnc-3.init vpnc
+	newconfd "${FILESDIR}"/vpnc.confd vpnc
+
+	dotmpfiles "${FILESDIR}"/vpnc-tmpfiles.conf
+	systemd_newunit "${FILESDIR}"/vpnc.service vpnc@.service
+
+	# LICENSE file resides here, should not be installed
+	rm -r "${ED}"/usr/share/licenses || die
+}
+
+pkg_postinst() {
+	tmpfiles_process vpnc-tmpfiles.conf
+
+	elog "You can generate a configuration file from the original Cisco profiles of your"
+	elog "connection by using /usr/bin/pcf2vpnc to convert the .pcf file"
+	elog "A guide is available at https://wiki.gentoo.org/wiki/Vpnc"
+
+	if use gnutls; then
+		elog "Will build with GnuTLS (default) instead of OpenSSL so you may even redistribute binaries."
+		elog "See the Makefile itself and https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=440318"
+	else
+		ewarn "Building SSL support with OpenSSL instead of GnuTLS. This means that"
+		ewarn "you are not allowed to re-distibute the binaries due to conflicts between BSD license and GPL,"
+		ewarn "see the vpnc Makefile and https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=440318"
+	fi
+}
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() {