6 files changed, 35 insertions, 37 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 24fac56fe671..34143dbcf183 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/taptap/Manifest b/net-misc/taptap/Manifest
index dda1cba63e8f..252aaaab28aa 100644
--- a/net-misc/taptap/Manifest
+++ b/net-misc/taptap/Manifest
@@ -1,3 +1,3 @@
-DIST taptap-1.0.tar.bz2 1640 BLAKE2B ae2bea178439991057dca6dfd2478f4927e0c762da96f8358eeb029a97cce051c894c4181801daf70681b4a3a1257ab3371a4f9ee039df2157cac226cced846b SHA512 ab9264823c470fd76530258fa3b8993799bd1170269b1e8e143ef072ac5749cc51716cd53ffec285b3a3266e4503be8d0d91094f82c30dd85607ef8cd368f53e
-EBUILD taptap-1.0.ebuild 584 BLAKE2B d081ea3bc08054e4f1bfa322ccf4c26026258473cac386c822f8e7115488c54000d036d37a113fdad11a99774d8ccd11799a203112e0783e8cf5c77b867be55f SHA512 188000791b4bf5cbbd85dcea490539ae4c00816d9b3bc5aadb3e0feaab8bf062d5df0b36a7602c8551b7070236116472030df3cb5b573887970155dfc59001be
+DIST taptap-1.0.c 2665 BLAKE2B 3c857770fd016c1837a3cdf6b8244965cd4128c9d260ab584ffa2e6e7e6deac4e35cb3800aec81f4950e0cd891bc7391be0a5a7b926681595ddde671d571d9bf SHA512 74ec6012cc34f5f4b5e2d16aff3840e842b7a7f297df5277b8ee7305fed900a16d25a853b8e9544b464037f9946ca1588959e5faafeff3afd14813ac419551e1
+EBUILD taptap-1.0-r1.ebuild 542 BLAKE2B f0a93313f04af6a39b6d0945ddbaab726431db7850caf3130a612f38a6db1a4ba0b19fb029d3c1f09ade51255e4c5966be0557ab918338d8e28dfb047881e3f4 SHA512 883a75b4249e073d509d5e017fccc0dc74c7b362dda39cae64cb4bc620a6c157fd5a4da4664f9e1e735dc608ca4fe03ca2a9581556b7551b0e9ccb4975a992ad
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/net-misc/taptap/taptap-1.0-r1.ebuild b/net-misc/taptap/taptap-1.0-r1.ebuild
new file mode 100644
index 000000000000..5ea681d0e963
--- /dev/null
+++ b/net-misc/taptap/taptap-1.0-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo toolchain-funcs
+
+DESCRIPTION="Program to link two /dev/net/tun to form virtual ethernet"
+HOMEPAGE="https://grumpf.hope-2000.org/"
+SRC_URI="https://grumpf.hope-2000.org/${PN}.c -> ${P}.c"
+S="${WORKDIR}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+
+src_unpack() {
+	cp "${DISTDIR}"/${P}.c ${P}.c || die
+}
+
+src_compile() {
+	edo $(tc-getCC) ${CFLAGS} ${LDFLAGS} -o ${PN} ${P}.c
+}
+
+src_install() {
+	dobin ${PN}
+}
diff --git a/net-misc/taptap/taptap-1.0.ebuild b/net-misc/taptap/taptap-1.0.ebuild
deleted file mode 100644
index f95f52794ab5..000000000000
--- a/net-misc/taptap/taptap-1.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="A program to link two /dev/net/tun to form virtual ethernet"
-HOMEPAGE="http://www.munted.org.uk/programming/taptap/"
-SRC_URI="http://www.munted.org.uk/programming/${PN}/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE=""
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	default
-	sed -i \
-		-e 's:= -Wall -s:+= -Wall:' \
-		-e 's:$(CFLAGS):$(LDFLAGS) &:' \
-		Makefile || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
diff --git a/net-misc/turbovnc/Manifest b/net-misc/turbovnc/Manifest
index f8666bdb85f0..a1c4029de4e4 100644
--- a/net-misc/turbovnc/Manifest
+++ b/net-misc/turbovnc/Manifest
@@ -3,8 +3,8 @@ AUX turbovnc-3.0.3-java-launcher-32-bit.patch 601 BLAKE2B 9142ac45a5113921872a10
 AUX turbovnc-3.0.90-fix-musl-compilation.patch 869 BLAKE2B e44b15693e9df497ff646162cca2d96a47e753e899e2a9a40074b567600bf44e6c4ef9d7770d114f164399ec30d6dccf687647508bc14831b5c5c2117b400d6b SHA512 2ce59ee4cf98376fd1c08c01918356b3cfa9e5cde3ff1a3179507086bc97749543423a9459e7b7518e95e0a0ebc3be4ab9f93cdb4a4460a9d8d5b36513c3c30a
 DIST turbovnc-3.0.3.tar.gz 8693682 BLAKE2B cdb10b3f16be542a214e16329914eaf97a5646f96b47da5a738f7c16355284b100af3755f046a6975233c31ce662a939db01aa5825ebcf944e64eacca2f57a2f SHA512 e9cece436f70f2b75683eb8f21ffc985797a36c76efb6829ba5fac75849d1c9f35d636431a0fb28066ed17717800d6d6029f2fda863e650f39d6d64eef1e30de
 DIST turbovnc-3.0.3.tar.gz.sig 543 BLAKE2B 14df4d080b587125f82151c457b69324b993b169550e95beec74344705ad77a2c9886deaed59d0c487c8995c34fca1e4004fb4f50b836c3aff373cecd911a6a9 SHA512 0ecc236823c78cb16876f2cc6ac07ec14a099974b0f1ac4d2f45fdc1c53c6adbede924553cc42431cc95a5c4185f1cc9991053d72bb41ddbe1fc8c3f85120489
-DIST turbovnc-3.0.91.tar.gz 9026159 BLAKE2B 9601979d81a69ee8a0e8b2039a09bfc2226f870162254b49592a0f5224eba24fc22ddbb1ec16c02217b8bf4a61eaa72a81f4a791559eb0d843f07310b7a1b211 SHA512 5abc3fb5f71cc957d1c9ee390f2e3bb9a41fccf5b20f06c0452a659aaea15bc6a01a74c57ecf04866ea427edc0f49355b70f3d83cb6827e5fc1de5437c8ab0fc
-DIST turbovnc-3.0.91.tar.gz.sig 543 BLAKE2B 3892123d5e8cfe6a3e33b1887dd9a853b735ea9e653787d19147f26975d22ef3e4af846e3be0fb376b846c3a98c5288fa8d63bf6457b80503de60121376b569a SHA512 0bc1e78d928a88d2e363aaf8b024092fa6356ab66336f218e8dbbec3985f51220d37007342cf2bf9923134c2e6b020fd6511d897be1d4392f97930edbc438fa3
+DIST turbovnc-3.1.tar.gz 9031021 BLAKE2B 08a349bec517b36a505145a572905da64055e39c8cdc40a0609aa5976604aa4cb43196584c4bf078ea68094c87818fd611589b3b12d2f81085ed40ea4db0d4bd SHA512 ebcfd2c542542fd266eedf23bd7ce246acc2257b195dd204d474ca658e9ef2dab8bb8731a7ae4d30bf3845b9015c318e19c3b68a1ad6b658287fddbcb4db509b
+DIST turbovnc-3.1.tar.gz.sig 543 BLAKE2B 6e6d13e611913abacaedb9251554263713f04f26aaff6a1526b796091f84260b10c156ee302156aac12ad519d9d9a55f059460b13df4fe02a237be37307acf7e SHA512 753a9f77ed851b999a49d22787ee992cae74340afb78a30db25d5cc36d95facce437df0474bf4ef92317ebcfa41e2cb145f3841df39fbb6b3b191ec57fcc0100
 EBUILD turbovnc-3.0.3.ebuild 3120 BLAKE2B 664da13e6ed134d0a31d02b838a6943aec2a289968ee25cd606d68e12cc7b4323f0d249a4de7ba56a9c53b4840b1b8a4b6096d0ba521df3fbdae7da37605c3dc SHA512 e56946766cb7a15e6ccdd02730929ae0d36c2e1c7a11e05ebcb4513a45ff90445a02b2d54a2cddb57b1337c45472686c8289bceaced9ca103c8aee69682f7d6c
-EBUILD turbovnc-3.0.91.ebuild 3048 BLAKE2B 580af2344dfebd20010025182c1e08366e901300ee621fe1d89de4e71a1fc58c0967d9ef8035cb22bb958ace3f230656d3f31cbcc675afe4bbcee91f7e54e0b1 SHA512 4e370d7f0e6ac6fe4bb48740d656b537dc8b1ef449dc5ce6319995e81cea629c3737b2f838c3a7271374e0f01e83fcc7b773643430ebbc45610ebe37d92d6c8d
+EBUILD turbovnc-3.1.ebuild 3029 BLAKE2B 815b202a2d6105a059d12cd4b00f4f7e9955a318df930d1ed09011214e4727b1ed99d682f0a06f5b010b0bcf11a8dab5f577b06a30f742fcaae725afc101a624 SHA512 3da09f79cc421852e2687db10ec41e4f7d5412e79fd8f7ecf10928afdc3cc848bebed27ca22b399eef239ff96c6a511e17bbb64ed1c3ace7f89467c6285ed82f
 MISC metadata.xml 820 BLAKE2B 331426a28ac5efa9f27d1e9b21e4b75e6965b5c1cf41ce7b8d98b03187fc56d81ffb58f555fc522188d1003e64713220b6f5591131fb8a26a8fe43e277f54526 SHA512 0aa50eef5eb122e0de38bf5e2f8d0627841419dd5e88ee58444493f4a9804626111d5edc5b36aa996635f38c7fd87c71706dd543305f9b495031971b1c52be3d
diff --git a/net-misc/turbovnc/turbovnc-3.0.91.ebuild b/net-misc/turbovnc/turbovnc-3.1.ebuild
index e87f86dd3a53..424b4426e084 100644
--- a/net-misc/turbovnc/turbovnc-3.0.91.ebuild
+++ b/net-misc/turbovnc/turbovnc-3.1.ebuild
@@ -6,17 +6,16 @@ EAPI=8
 JAVA_PKG_OPT_USE=viewer
 inherit cmake desktop java-pkg-opt-2 verify-sig
 
-MY_PV="3.0.91%20%283.1%20beta2%29"
-
 DESCRIPTION="A fast replacement for TigerVNC"
 HOMEPAGE="https://www.turbovnc.org/"
 SRC_URI="
-	https://sourceforge.net/projects/turbovnc/files/${MY_PV}/${P}.tar.gz/download -> ${P}.tar.gz
-	verify-sig? ( https://sourceforge.net/projects/turbovnc/files/${MY_PV}/${P}.tar.gz.sig/download -> ${P}.tar.gz.sig )
+	https://sourceforge.net/projects/turbovnc/files/${PV}/${P}.tar.gz/download -> ${P}.tar.gz
+	verify-sig? ( https://sourceforge.net/projects/turbovnc/files/${PV}/${P}.tar.gz.sig/download -> ${P}.tar.gz.sig )
 "
 
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="~amd64 ~x86"
 IUSE="+server +ssl +viewer"
 REQUIRED_USE="|| ( server viewer )"