7 files changed, 58 insertions, 71 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 2bc3b4593663..7ceb2ba66eeb 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/dleyna/Manifest b/net-libs/dleyna/Manifest
index e57d64ed433b..c5fddf6c3d74 100644
--- a/net-libs/dleyna/Manifest
+++ b/net-libs/dleyna/Manifest
@@ -1,3 +1,5 @@
 DIST dLeyna-v0.8.1.tar.bz2 146410 BLAKE2B a26ebc01df4a8d5cefeb900001e06605d4dffe6beebd6df650e9425048b787edb7dd144399fd66916dee360bc6bb3cf1071e24464ec52d0cdce36e5440272e41 SHA512 9b93ddb0b1a7a29d99da875aba1ae0e3e9c61d003353e4705cbf4274449af6c4ca454e68fe4d618749b7ff7cd215ad3361b07575494dadd8be34c589b8e48641
+DIST dLeyna-v0.8.2.tar.bz2 149691 BLAKE2B c9837da15c18b25c0e9021776cabdcffe52acfaac0f2858ab004b554d9a212ca45cc08f2893383248c5bb5ce57df854d79c329f80511b9f098663326f1badecc SHA512 25a62ad6b623a8d67d90af608d0fa68e4dcef916c5b44f51eb927f6e276555b978414c95f59a680c5938c7b67abe0cc09afa4e58d068f115d73ce6cb40959144
 EBUILD dleyna-0.8.1.ebuild 1015 BLAKE2B 8d826080b76aa14b065258fc6ac9af7a6c06059f9ea0c695daf23780eb4b165f45eb515e6b1ae81587baae3efabff9fc64353f8f5a563cc217d3b6475dc56e08 SHA512 211bd09a4229011661249ee6921739c5686ff0ba4bc3821c4a0cc5a72590f28752f38c931205ba9754fbe588b736c7edc922405512249c5f56f25c14f7292727
+EBUILD dleyna-0.8.2.ebuild 1176 BLAKE2B 9df1ebfb7a9320e6ec025bcda8c12581356093c0f533a919fd755b52da076a2d82692b369e6256d7fa4f9e4964401363281740c602069c52b5f63aa84218a62d SHA512 18ea1dde032bdb6d38e28b432350bce50a5ed944cbd579ec53e88281cef91aa3df6148532b89e9b533badd081bd99f428b178402f2c1fa7389ec09d4ffa531bc
 MISC metadata.xml 347 BLAKE2B f530e4051daea6e7c842e14aab33cd08680f7414dd5bb06fb0c4e7aafc9c851daff77752e77e1f12b333e992854ae97217f78d30a2be2b601ea3465b4e0ff31e SHA512 e5d55300134824082f76ed5fd0a9e5753ef74e98796b17da4c47e7b5e0e5480e82b3e6db6d4880e2ca00b12e01c1514736a41ae0967226283d329f576ab497a3
diff --git a/net-libs/dleyna/dleyna-0.8.2.ebuild b/net-libs/dleyna/dleyna-0.8.2.ebuild
new file mode 100644
index 000000000000..7aa0b52432f2
--- /dev/null
+++ b/net-libs/dleyna/dleyna-0.8.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit meson python-single-r1
+
+DESCRIPTION="A set of services and D-Bus APIs to simplify access to UPnP/DLNA media devices"
+HOMEPAGE="https://gitlab.gnome.org/World/dLeyna"
+SRC_URI="https://gitlab.gnome.org/World/dLeyna/-/archive/v${PV}/dLeyna-v${PV}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="1.0/6" # soname of libdleyna-core-1.0.so
+KEYWORDS="~amd64"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	>=dev-libs/glib-2.28:2
+	>=net-libs/gssdp-1.6.0:1.6=
+	>=net-libs/gupnp-1.6.0:1.6=
+	>=net-libs/gupnp-av-0.12.9:0=
+	>=media-libs/gupnp-dlna-0.9.4:2.0=
+	>=net-libs/libsoup-3.0:3.0
+	dev-libs/libxml2
+
+	${PYTHON_DEPS}
+
+	!net-libs/dleyna-connector-dbus
+	!net-libs/dleyna-core
+	!net-libs/dleyna-renderer
+	!net-misc/dleyna-server
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-python/docutils
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}"/dLeyna-v${PV}
+
+src_configure() {
+	local emesonargs=(
+		-Ddbus_service_dir="${EPREFIX}/usr/share/dbus-1/services"
+		-Dman_pages=true
+		-Ddocs=false
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	python_optimize
+}
diff --git a/net-libs/libnet/Manifest b/net-libs/libnet/Manifest
index 94071ea5c139..84701b6b253e 100644
--- a/net-libs/libnet/Manifest
+++ b/net-libs/libnet/Manifest
@@ -5,9 +5,7 @@ AUX libnet-1.0.2a-gcc33-fix.patch 462 BLAKE2B 04fc43b82605a6200aac4edc5de509bf54
 AUX libnet-1.0.2a-slot.patch 6244 BLAKE2B 61f4131eca23d9dc20922058e0382c38ebba480df267472bbaa88481857511c3fa2ae5ad4e6203425475d7a2c3a1421873c3d03b00a5e5cc311bec7f64b8107e SHA512 6f800d91cb16077df967227feed58ee61b60ab1d248eda5fe788c21ba2cd7c404647213f3721f19bdbe80be0c45d571234dd82f010fe9fc70c4c270c97e138b5
 AUX libnet-1.0.2a-test.patch 1172 BLAKE2B 105a23a904da361216f370b005016d205ea971855a064d45b1282faabdb11878cbc2568ffe311074eb437677e03d604497727c58273711826af125a1cc3f11a6 SHA512 3ab6e667798362d605c2a1a5b8c172c80a99d2569d4418cb47b7bb8f69ea424e718b2947ea22b43d882c556f65470bec04451d9356070b8a4fe10f6505122bf7
 AUX libnet-1.2-int64_t.patch 569 BLAKE2B 8b07c6dee008102d4d1ab8863606c78219f8811a0153f341709f96347dc62c8cb207ef61f37aca5a3e440fac5def11b11a032f8e09944a86da9aff1a2e9f19cf SHA512 c3e42efd4b2621a4a068764ba9072e2dfb6506940c0dd48d6e66ec7392a60c0a53178d6e75e28d4e800b69e2342abc82b8102cc3add1edd339a5581a233be35d
-DIST libnet-1.0.2a.tar.gz 140191 BLAKE2B 4107cb714b7be901250759ce5288a86922bd7cc20081a9d2c93758150d74c55844db98c43874befdfb593ec25e128d6ae2389eff7c46da79dcbb9681f649e059 SHA512 2e9a73bd767e1f46eea92e18ddd83cc3179144c8cc5b1a22b4dba50fee16173c951be4dd647a247bd7067c33b9e33489a6efb313ce1ea0c61c4a06009c3c4d95
 DIST libnet-1.2.tar.gz 649191 BLAKE2B bc463c7869e0327ec2f7663c2e66a27302e368f9846235f6774f36aed66263655badaf980e7e7fb08cc2f9a7f2620129c193bbdd49bbee58401f229a69c50c2a SHA512 84430f24e000eb7728b1fbb5e620716d13d193e8b9e024cf56a08fbeeeaaf56c9122caaf7647f01e6b38b73212e592fa5cc4e8ff56b1d5f5a73aea462e84edd6
-EBUILD libnet-1.0.2a-r7.ebuild 1409 BLAKE2B f1906501d9d776e35207b85e259bcc66058b64dc7b025fdb0aa1f7b580ed8066e65c17a8686173c264dc0fe51086b73259ca1d7c6583bb9c0de53ce63cb7b6b9 SHA512 7b44ebfe6aee06809dd721aeed50dbf443a27a531a99ee24abd31f535acf3454374bafbd2d79af0c0b95f8b51400ed1e10dd93207e98b0cff215553419098e3b
 EBUILD libnet-1.2.9999.ebuild 682 BLAKE2B f4de78e01f11b24255ab6713c484ab9954ed6cd4be54d7da340c780ee5813291157ae2fe881141faeea2d0b2df67af71ab06a11949c57d8db4a5f3f28533cd30 SHA512 4d899c428e510ad9ed76eb0b573fcac4903f3d8782398890984c0eb85186bc0e84326c35c04ec04dfc78891f8f48d7a3b47c19d4715d695edb7facc573859d73
 EBUILD libnet-1.2.ebuild 904 BLAKE2B 18e30802c5cd41fe8c8e9a5414e69d6d1d4050e7239a3df68a935d9b48ddc8bebfe3b47976293ec591cb63aad30483539edfed7a5c1ca6ef44da88ba543a6140 SHA512 de9a422ac93465a16c75619c4af4ad87b78cb779a3d87af68fc3d3642f636cfa3a6a44c0921fe19861566bc7604ead2fbf037c75d04702a1b728c7267ff24a46
 MISC metadata.xml 1344 BLAKE2B a4798ed5db1e0a20c9a97794e6c7ba98a473e283799cb51ca39e072437508933e1b6656fe558f47600ef6da2a59966c7235e82a6d64cc89b261f3106d8df2399 SHA512 a846b017e37680462b7a4b66a883d77eccb72f7aaa2ef0bf854e507adaa30c94042effd22bacf5756bffe575932fc014cf7c5393e933f9b59de8da43f849060d
diff --git a/net-libs/libnet/libnet-1.0.2a-r7.ebuild b/net-libs/libnet/libnet-1.0.2a-r7.ebuild
deleted file mode 100644
index c07ef94b90a0..000000000000
--- a/net-libs/libnet/libnet-1.0.2a-r7.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="library providing an API for commonly used low-level network functions"
-HOMEPAGE="http://www.packetfactory.net/libnet/"
-SRC_URI="http://www.packetfactory.net/libnet/dist/deprecated/${P}.tar.gz"
-S="${WORKDIR}"/Libnet-${PV}
-
-LICENSE="BSD BSD-2 HPND"
-SLOT="1.0"
-KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 sparc x86"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.2a-gcc33-fix.patch
-	"${FILESDIR}"/${PN}-1.0.2a-slot.patch
-	"${FILESDIR}"/${PN}-1.0.2a-endian.patch
-	"${FILESDIR}"/${PN}-1.0.2a-_SOURCE.patch
-	"${FILESDIR}"/${PN}-1.0.2a-funroll.patch
-	"${FILESDIR}"/${PN}-1.0.2a-test.patch
-
-)
-
-src_prepare() {
-	default
-
-	cd "${S}" || die
-	mv libnet-config.in libnet-${SLOT}-config.in || die "moving libnet-config"
-
-	cd "${S}"/include || die
-	ln -s libnet.h libnet-${SLOT}.h || die
-
-	cd libnet || die
-	for f in *.h ; do
-		ln -s ${f} ${f/-/-${SLOT}-} || die
-	done
-
-	cd "${S}"/doc || die
-	ln -s libnet.3 libnet-${SLOT}.3 || die
-
-	cd "${S}" || die
-
-	eautoreconf
-	tc-export AR RANLIB
-}
-
-src_test() {
-	emake -C test
-}
-
-src_install() {
-	default
-	doman "${ED}"/usr/man/man3/libnet-1.0.3
-	rm -r "${ED}"/usr/man || die
-
-	dodoc VERSION doc/{README,TODO*,CHANGELOG*}
-	newdoc README README.1st
-
-	docinto example
-	dodoc example/libnet*
-
-	docinto Ancillary
-	dodoc doc/Ancillary/*
-}
diff --git a/net-libs/libupnp/Manifest b/net-libs/libupnp/Manifest
index 4e0b37fa94ef..3511d95af98d 100644
--- a/net-libs/libupnp/Manifest
+++ b/net-libs/libupnp/Manifest
@@ -2,5 +2,5 @@ AUX libupnp-1.14.12-disable-network-tests.patch 416 BLAKE2B d1fea0b8e0abba960cd5
 DIST libupnp-1.14.14.tar.gz 808851 BLAKE2B e1f69df386e2781cf17248733bf720c7e88c0d818ef8589648cdb4ec800c3a0cf381aa44fadcfdabcac31bf5d44091b8f421a1d53310046fb6a6c87e6035245f SHA512 bf134e87981ceb051e101b104f143672711de19a1b35cfc89a49e18f3a289fab443fbdef4a918e1f8a464de38a1eccbeee9c847c243e35f73a92373473b2465f
 DIST libupnp-1.14.15.tar.gz 809246 BLAKE2B 5918f41b64fe5e4a0209058f4706d724d0fcad74c8e3bfc2a54d6d5a1af253d4461ec43b0c896f1da14dcb3fb0925cbae3bc6eb015380e1cd23a3d88e6ed656f SHA512 dde2563eaacdd288066012f001b819ec25ab51bc36aef23db71d2eb67eef778b6b2b10b35a2f6b3041ecef20167e873e1c54e17fc4a26e8d1d9f408e2050279d
 EBUILD libupnp-1.14.14.ebuild 1107 BLAKE2B f95ac67d241bb4ffb929dd9cfaa68a0515b272344927dc0069932110ef7cf096002abb7188ec341967bb7778dbf6de09c20c617867ead99cba4aa7d8ac8565a1 SHA512 1655ddd2e8ea0cc62adf010d1780b7ff9ac014dd5a4e4d583da9342826619427d6675ec43fc040eae10e38ee91fac3a41c408750aecaedce9481f1457d1a3f49
-EBUILD libupnp-1.14.15.ebuild 1114 BLAKE2B b0bf8eabcb22e160fe606cdd987a98aaddba832f9826e2f4ade33df7b61ba5c4511b102145d4b8b7d15d51af89b08fa80ce5ecf088b1b698aca3afa15a57634d SHA512 aeb01cf00d5350a1c4b5f9fd40ae6ff474076c2cbc6639ec149c6e35e86ed7473ca121e9f01da8415f90b2c7da8c9df4f94ef82a9fc4d90b501c789d7ece3061
+EBUILD libupnp-1.14.15.ebuild 1107 BLAKE2B f95ac67d241bb4ffb929dd9cfaa68a0515b272344927dc0069932110ef7cf096002abb7188ec341967bb7778dbf6de09c20c617867ead99cba4aa7d8ac8565a1 SHA512 1655ddd2e8ea0cc62adf010d1780b7ff9ac014dd5a4e4d583da9342826619427d6675ec43fc040eae10e38ee91fac3a41c408750aecaedce9481f1457d1a3f49
 MISC metadata.xml 676 BLAKE2B a5aa120c6aef01b436d44e14c0d3d9014b4d3392c75322c5269bb56c6c143ad184d409def0adec6a02a4158b67c71e0cb009eb83d023a0346937337ce171dd6a SHA512 507660834175c3675b9ca6aeb4f5cdae1a017f54ba46e25d1a3235f05c897548b18ca294c328c167d35c8babb3aa71838880965bf34269559aac02a831addd17
diff --git a/net-libs/libupnp/libupnp-1.14.15.ebuild b/net-libs/libupnp/libupnp-1.14.15.ebuild
index bbac11e95b48..24f5f843803a 100644
--- a/net-libs/libupnp/libupnp-1.14.15.ebuild
+++ b/net-libs/libupnp/libupnp-1.14.15.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_PN}-release-${PV}"
 
 LICENSE="BSD"
 SLOT="0/17"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux"
 IUSE="blocking-tcp debug doc +reuseaddr samples +ssl static-libs"
 
 RDEPEND="ssl? ( dev-libs/openssl:0= )"