net-misc/vde: add 2.3.3

Closes: https://bugs.gentoo.org/776982
Signed-off-by: Sam James <sam@gentoo.org>

3 files changed, 106 insertions, 41 deletions

diff --git a/net-misc/vde/Manifest b/net-misc/vde/Manifest
index 8c5ef64fd5de..471d0f18b7d1 100644
--- a/net-misc/vde/Manifest
+++ b/net-misc/vde/Manifest
@@ -1,2 +1,3 @@
 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
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"
 }