gentoo auto-resync : 05:11:2022 - 09:17:35

6 files changed, 112 insertions, 125 deletions

diff --git a/net-misc/vde/Manifest b/net-misc/vde/Manifest
index a84693e2fc58..0a0d0e677745 100644
--- a/net-misc/vde/Manifest
+++ b/net-misc/vde/Manifest
@@ -5,9 +5,10 @@ AUX vde-2.3.2-slibtool-support.patch 1583 BLAKE2B 6667d3a5d158a72b43576e81340562
 AUX vde.conf-r1 341 BLAKE2B b61648c4559e7fdc240ce7c82da6a0c0d53c4a94637ab0a4fd0d30e80306e6006c9242b9967f5fa6100c05efe2f4eb317ee55a05fbb3a4d79030fc14ea6ac61b SHA512 5aa5a52fb150f54672465b36dd215dc24e45f60015bf7afc4b376e046093089c656db642a4d8c4a98205cd0c453427e38ecc3c36cab79bf5f9d2936c61c914df
 AUX vde.init-r1 1021 BLAKE2B cf91532a53a59fb653b3c9c221ce68a4351a40503dedb28e89b5b28b582ec557f48f46aaa5ab5aad2d911ef19802fb3bec820dee79af533faf99aa9992c402f1 SHA512 a89251f3bccc7eb7332cb54d60a0590fd0d6eef556718d650b14da9ca80ef84c22fae0cdf0d89d83de2b616b0b5dac97bbe6551701d2a2df4093a00cb8e1d3fc
 DIST vde-2.3.2_p20191011.tar.gz 381468 BLAKE2B 6d25df2a4cf89a0159875eac1c2c3a27e6b6856f24494ee2e181ab8d8a2fa9c3350b9c7b9b9474cbcbd8afd50fc61fd167a5cc18398b771d05178c5c3a402f73 SHA512 0e9f9f28a8ef0acd765307908dfd9ab9462f67df21b06be5b48ed1795900be546e28e1869528ee8e5a6d7eb6e6fa91ded116b826a501e13ec7f1562f1b84f971
+DIST vde-2.3.3.tar.gz 234790 BLAKE2B e3ed7423edc03a6af09967484613c0e2a701f74a4323eeab720cabe9a899120023425527054662ee1dbd207327b7e6dd375bceb4999fd708666df13c08acf348 SHA512 d0495aa700984dcc82f85cf7c8125cc10505a8a077fceec45b7fd2bec9c389966381682842e886469fa49239badd9442403d091c2ae5282685085e8262396387
 DIST vde2-2.3.2.tar.bz2 600527 BLAKE2B 6c4900578b992eff914136f29395a822bc52945906d291eee78b3bf7cb806bbf4d8ebeec2080daa10923e98b648d071ce1f846214143e4dce749da9be8b48990 SHA512 51be75fde5a526b988060f25322a8b20289b1677db2e3aa6dbee55875c1d7af564f9d8d201a0a4a1a842471cce06f29fcd83e55a5ff7acfdc36a8349cb2f3cc6
 EBUILD vde-2.3.2-r6.ebuild 1407 BLAKE2B 639dd926dc7bcfde76216470b381cec847f7a7369e18b359d614f8edde3e3570cab2ab6416cc312f316a962d3cfd028a136209a607338b48a6cc318cb367b9c4 SHA512 852218c41c305ab7ae013c674c3b3194fbb03895377e37ef0b203611b8e1f1a68bfa5d6ea5bd5fef16afc82ac0706f431afaa3f98dc421d19dd7f8673585e2ac
-EBUILD vde-2.3.2_p20191011-r1.ebuild 2044 BLAKE2B 56b2f6f1c4573e3cf3d54b05e2b56d9559f1118f30ce583e5db181185c26bf12d58f0e1bf0a5540b53bb1060cbde18c3a7ab2c7fb3bffac49b98b81bb30ac752 SHA512 8759e5d336e62cfb318f37feda6f290cf1107289ddfe7046ce297048f808e16656b5bf2cc13ed8a42e4953fc08a303581e929d668c51395911dfa97c8c630c6c
-EBUILD vde-2.3.2_p20191011.ebuild 1967 BLAKE2B 2435594c7f62fb10476d0a9ded2352096f5bd4ff5b7bcd9953ce27926ea8b2c57a51ec7739162dced5abcedf589db795ffe583b280ac4cdd825bcbd4959ba770 SHA512 5f9cb5597d05fcd02636b5b318c6904fad10c06fb9ccfb568ca1bc8927bf05e2e4ea9137b3b2863dc58177ce99ce643754bd55f48f2d2f176aade1af87d85b1e
-EBUILD vde-9999.ebuild 1924 BLAKE2B 5a3ceff00f2c858d35696a6ee1ef80a7a3db12c0ffe44b07da5089424e0bb3768138dbb6fab7de64c1491844f90c178d1b117b4db3f6dc29140ffbef2023fcec SHA512 490dcf752cf332d7947515f7348acce13b1f53793732ce354d9684470901e37d2d07befd88dd6b552f773fe2e45e95a5037f1224167c9720c082c1c2745c9992
-MISC metadata.xml 505 BLAKE2B 73469b5806d6d8f478c8754ab665071e424f0abc6f29859b47a263bbf3f2d83183afdbe8945201a8914a3c0bcee62371c742ba37b7ea362bbee37eff1674a898 SHA512 f954316274ecbde477990fe93a49faebed3bee214a64fb45438394345bee883cf6b9b3898715500498ebe7346793e34fa8bf38e24b797e229277cbc7aeaba2a1
+EBUILD vde-2.3.2_p20191011-r1.ebuild 2041 BLAKE2B d08960b451fec859d2cdf4e7e2422113d9c818f153378aa22b90a4bdfb5adf56569df53137f98e5ef5d9057af15e8ec3593b6af980ac2e9b9dba29c9bb4e47f3 SHA512 3e8c99bab95734530edd29a42b4768305a12ea5e567db721cc927195e1300533fa76494e7b1fadf1a624374f2e16fb617cf614db0e33c6e295e5fb0bc9e7e31a
+EBUILD vde-2.3.3.ebuild 1704 BLAKE2B 90c04f4e50be6ab68055c51a2d597bed497faf27ed08adc115712afdd708e0f3d313edab68fc8610107d6ba3640696ceeb3852d47224648ee43020975f7e71f1 SHA512 28b14f637cffc78b76cb1746a6c418aae02df588a4b40f5e2aaaa11bc9af35bee78acda196c366bd08be409709af6eabe918cbab72ccb501e012927955d8a9f8
+EBUILD vde-9999.ebuild 1704 BLAKE2B 90c04f4e50be6ab68055c51a2d597bed497faf27ed08adc115712afdd708e0f3d313edab68fc8610107d6ba3640696ceeb3852d47224648ee43020975f7e71f1 SHA512 28b14f637cffc78b76cb1746a6c418aae02df588a4b40f5e2aaaa11bc9af35bee78acda196c366bd08be409709af6eabe918cbab72ccb501e012927955d8a9f8
+MISC metadata.xml 566 BLAKE2B 5f22e7e7ead240023dfa4049c23dab6b7c5a5a2ce264736deb3008d9ea66cf4d6fa022273ca8980e8091402c786e9c4e9d09252bababda1c3d0600cb783dda28 SHA512 d35a52d060009bfae1262fe1a1ada7d0987fb654d8a43322ee3af7e8002290323a600c5f900a2c0a1299349e214b8ee88f37b88f4637cc2d0fe86e1f45bb1403
diff --git a/net-misc/vde/metadata.xml b/net-misc/vde/metadata.xml
index bf886246ff69..8284456aa7c7 100644
--- a/net-misc/vde/metadata.xml
+++ b/net-misc/vde/metadata.xml
@@ -14,5 +14,6 @@
   </use>
   <upstream>
     <remote-id type="sourceforge">vde</remote-id>
+    <remote-id type="github">virtualsquare/vde-2</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/net-misc/vde/vde-2.3.2_p20191011-r1.ebuild b/net-misc/vde/vde-2.3.2_p20191011-r1.ebuild
index b8cab1c90092..7d2b3d4ca431 100644
--- a/net-misc/vde/vde-2.3.2_p20191011-r1.ebuild
+++ b/net-misc/vde/vde-2.3.2_p20191011-r1.ebuild
@@ -13,7 +13,7 @@ elif [[ ${PV} = *_p* ]]; then
 	MY_PN="vde-2"
 	COMMIT="c7b36a57831a9067c8619c3e17a03e595623b3eb"
 	SRC_URI="https://github.com/virtualsquare/${MY_PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm64 ~loong ~ppc ppc64 ~riscv ~x86"
 
 	S="${WORKDIR}/${MY_PN}-${COMMIT}"
 else
diff --git a/net-misc/vde/vde-2.3.2_p20191011.ebuild b/net-misc/vde/vde-2.3.2_p20191011.ebuild
deleted file mode 100644
index abd8c9c4d9f3..000000000000
--- a/net-misc/vde/vde-2.3.2_p20191011.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic
-
-if [[ ${PV} == 9999 ]]; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/virtualsqaure/MY_PN"
-elif [[ ${PV} = *_p* ]]; then
-	inherit autotools
-	MY_PN="vde-2"
-	COMMIT="c7b36a57831a9067c8619c3e17a03e595623b3eb"
-	SRC_URI="https://github.com/virtualsquare/${MY_PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
-
-	S="${WORKDIR}/${MY_PN}-${COMMIT}"
-else
-	MY_P="${PN}2-${PV}"
-	SRC_URI="mirror://sourceforge/vde/${MY_P}.tar.bz2"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="Virtual distributed ethernet emulator for emulators like qemu, bochs, and uml"
-HOMEPAGE="https://virtualsquare.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-# upstream switched to wolfssl
-IUSE="pcap selinux static-libs"
-
-COMMON_DEPS="pcap? ( net-libs/libpcap )"
-DEPEND="${COMMON_DEPS}"
-RDEPEND="${COMMON_DEPS}
-	acct-group/qemu
-	selinux? ( sec-policy/selinux-vde )"
-
-# upstream switched to wolfssl
-src_prepare() {
-	default
-	if [[ ${PV} == 9999 ]] || [[ ${PV} == *_p* ]]; then
-		eautoreconf
-	fi
-# upstream switched to wolfssl
-#	has_version ">=dev-libs/openssl-1.1.0" && \
-#		eapply "${FILESDIR}/${PN}-2.3.2-openssl-1.1.patch"
-}
-
-src_configure() {
-	filter-flags -O0 -Os
-# upstream switched to wolfssl
-#		$(use_enable ssl cryptcab) \
-	econf \
-		--disable-python \
-		--disable-cryptcab \
-		$(use_enable pcap) \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	# https://github.com/virtualsquare/vde-2/issues/6
-	emake -j1
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -type f -delete || die
-
-	newinitd "${FILESDIR}"/vde.init-r1 vde
-	newconfd "${FILESDIR}"/vde.conf-r1 vde
-}
-
-pkg_postinst() {
-	einfo "To start vde automatically add it to the default runlevel:"
-	einfo "# rc-update add vde default"
-	einfo "You need to setup tap0 in /etc/conf.d/net"
-	einfo "To use it as an user be sure to set a group in /etc/conf.d/vde"
-}
diff --git a/net-misc/vde/vde-2.3.3.ebuild b/net-misc/vde/vde-2.3.3.ebuild
new file mode 100644
index 000000000000..4cacbb0f887b
--- /dev/null
+++ b/net-misc/vde/vde-2.3.3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/virtualsquare/vde-2"
+	inherit git-r3
+elif [[ ${PV} == *_p* ]]; then
+	MY_COMMIT="c7b36a57831a9067c8619c3e17a03e595623b3eb"
+	SRC_URI="https://github.com/virtualsquare/vde-2/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/vde-2-${COMMIT}"
+else
+	MY_P="${PN}2-${PV}"
+	SRC_URI="https://github.com/virtualsquare/vde-2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/vde-2-${PV}"
+fi
+
+DESCRIPTION="Virtual distributed ethernet emulator for emulators like qemu, bochs, and uml"
+HOMEPAGE="https://virtualsquare.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+if [[ ${PV} != 9999 ]] ; then
+	KEYWORDS="~amd64 ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+fi
+IUSE="pcap selinux static-libs"
+
+DEPEND="pcap? ( net-libs/libpcap )"
+RDEPEND="
+	${DEPEND}
+	acct-group/qemu
+	selinux? ( sec-policy/selinux-vde )
+"
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	filter-flags -O0 -Os
+
+	local myeconfargs=(
+		# Upstream switched to wolfssl, so no SSL support for now
+		--disable-cryptcab
+		$(use_enable pcap)
+		$(use_enable static-libs static)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -type f -delete || die
+
+	newinitd "${FILESDIR}"/vde.init-r1 vde
+	newconfd "${FILESDIR}"/vde.conf-r1 vde
+}
+
+pkg_postinst() {
+	einfo "To start vde automatically, add it to the default runlevel:"
+	einfo "# rc-update add vde default"
+	einfo "You need to setup tap0 in ${EROOT}/etc/conf.d/net"
+	einfo "To use it as an user, be sure to set a group in ${EROOT}/etc/conf.d/vde"
+}
diff --git a/net-misc/vde/vde-9999.ebuild b/net-misc/vde/vde-9999.ebuild
index 32de524f78b9..4cacbb0f887b 100644
--- a/net-misc/vde/vde-9999.ebuild
+++ b/net-misc/vde/vde-9999.ebuild
@@ -1,78 +1,71 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit flag-o-matic
+inherit autotools flag-o-matic
 
 if [[ ${PV} == 9999 ]]; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/virtualsqaure/MY_PN"
-elif [[ ${PV} = *_p* ]]; then
-	inherit autotools
-	MY_PN="vde-2"
-	COMMIT="c7b36a57831a9067c8619c3e17a03e595623b3eb"
-	SRC_URI="https://github.com/virtualsquare/${MY_PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-	S="${WORKDIR}/${MY_PN}-${COMMIT}"
+	EGIT_REPO_URI="https://github.com/virtualsquare/vde-2"
+	inherit git-r3
+elif [[ ${PV} == *_p* ]]; then
+	MY_COMMIT="c7b36a57831a9067c8619c3e17a03e595623b3eb"
+	SRC_URI="https://github.com/virtualsquare/vde-2/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/vde-2-${COMMIT}"
 else
 	MY_P="${PN}2-${PV}"
-	SRC_URI="mirror://sourceforge/vde/${MY_P}.tar.bz2"
-	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/virtualsquare/vde-2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/vde-2-${PV}"
 fi
 
 DESCRIPTION="Virtual distributed ethernet emulator for emulators like qemu, bochs, and uml"
-HOMEPAGE="https://virtualsquare.org"
+HOMEPAGE="https://virtualsquare.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-# upstream switched to wolfssl
+if [[ ${PV} != 9999 ]] ; then
+	KEYWORDS="~amd64 ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+fi
 IUSE="pcap selinux static-libs"
 
-COMMON_DEPS="pcap? ( net-libs/libpcap )"
-DEPEND="${COMMON_DEPS}"
-RDEPEND="${COMMON_DEPS}
+DEPEND="pcap? ( net-libs/libpcap )"
+RDEPEND="
+	${DEPEND}
 	acct-group/qemu
-	selinux? ( sec-policy/selinux-vde )"
+	selinux? ( sec-policy/selinux-vde )
+"
 
-# upstream switched to wolfssl
 src_prepare() {
 	default
-	if [[ ${PV} == 9999 ]] || [[ ${PV} == *_p* ]]; then
-		eautoreconf
-	fi
-# upstream switched to wolfssl
-#	has_version ">=dev-libs/openssl-1.1.0" && \
-#		eapply "${FILESDIR}/${PN}-2.3.2-openssl-1.1.patch"
+
+	eautoreconf
 }
 
 src_configure() {
 	filter-flags -O0 -Os
-# upstream switched to wolfssl
-#		$(use_enable ssl cryptcab) \
-	econf \
-		--disable-python \
-		--disable-cryptcab \
-		$(use_enable pcap) \
+
+	local myeconfargs=(
+		# Upstream switched to wolfssl, so no SSL support for now
+		--disable-cryptcab
+		$(use_enable pcap)
 		$(use_enable static-libs static)
-}
+	)
 
-src_compile() {
-	# https://github.com/virtualsquare/vde-2/issues/6
-	emake -j1
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
 	default
-	find "${D}" -name '*.la' -type f -delete || die
+
+	find "${ED}" -name '*.la' -type f -delete || die
 
 	newinitd "${FILESDIR}"/vde.init-r1 vde
 	newconfd "${FILESDIR}"/vde.conf-r1 vde
 }
 
 pkg_postinst() {
-	einfo "To start vde automatically add it to the default runlevel:"
+	einfo "To start vde automatically, add it to the default runlevel:"
 	einfo "# rc-update add vde default"
-	einfo "You need to setup tap0 in /etc/conf.d/net"
-	einfo "To use it as an user be sure to set a group in /etc/conf.d/vde"
+	einfo "You need to setup tap0 in ${EROOT}/etc/conf.d/net"
+	einfo "To use it as an user, be sure to set a group in ${EROOT}/etc/conf.d/vde"
 }