gentoo auto-resync : 10:08:2022 - 08:17:33

3 files changed, 87 insertions, 9 deletions

diff --git a/net-libs/libnftnl/Manifest b/net-libs/libnftnl/Manifest
index a7d709699f7d..d8887d8afe91 100644
--- a/net-libs/libnftnl/Manifest
+++ b/net-libs/libnftnl/Manifest
@@ -4,7 +4,10 @@ DIST libnftnl-1.2.1.tar.bz2.sig 566 BLAKE2B dd37a52dc185ef2e8af8f0fe32037a03bf8f
 DIST libnftnl-1.2.2-clang-fortify-source.patch.xz 2704 BLAKE2B 107c90a2875e7477a5e8b7af8ff4c2139d2117e41a4ca9a7656b5f15c430668572c18a43e9b14a5af36c60818289e00bc082cad5d601b4c489335ca7161e5871 SHA512 c024607cb138748adcd28a511b858bbf51f2f09e13afa48d3090ba5ecd7bff1c1e87fcf38330eb24ae52c79d1a8bfce91f75be5dc81cfec6f0bc5334dd2f7456
 DIST libnftnl-1.2.2.tar.bz2 394955 BLAKE2B 69c3338e295dd158faad812ec05db8b8ab12c5626d0f33db14ee830a14d73dc5c3cd764a563cbb4fdeaa2657c99487a99fb0cc4f324a2832d5de21d922acd451 SHA512 657d48aa263043b80daa39eb8e2647c84c03b3e3a4a30b85bec1d8e4a0976075a71ad233bb384f4460d5f6662f285c12947feb8c1a6c9a534a2c9cf7ba04eee3
 DIST libnftnl-1.2.2.tar.bz2.sig 566 BLAKE2B ffdb35811e57f55ba30dfdd3e6656166b5f515348f99ee11c771b7460fd1b26b1e598146afdf76f4765e865ae76472d7071eabb30604cf78964e2fcbd6a39508 SHA512 dc4263e744a79f2b7e4ea619e740d66d6013e62aab655f040150552a6f069794ac59b8cc87a9f630dd42f087ef60523ecf08dc89cd1194637d988f85f67aaf43
+DIST libnftnl-1.2.3.tar.bz2 395208 BLAKE2B 893688a861bbb10609642bed912090b227d5d823cc1b94098b60ac85d137254ff3001971580e5059029a33c64e7226cc8473b0b9c1c79be77cbfb0c477254a1e SHA512 e2d16cbc062eb8900f0472abb8fe6b22910cc5a8efbb47445fe6ce6e2713a0637f74b46b2bf2031ba9ecb2e5eed932e3bbb49b015c7b7207591249de23d5149d
+DIST libnftnl-1.2.3.tar.bz2.sig 566 BLAKE2B 82b49ab1c7a9a588fea67b516d57afb455ceb5242bf774ff7ec92e240b5c2373fe7cc90dd60f302cb4e0615ec0036d995c1ddf25d9b26d6168eeaaa3c7027511 SHA512 73b8f75851dd30f5f54fe85d4c75d9ab18151c38e7c63961b52965e5e7478d240931a09a078fda1fe6b1a32a588e092c98e44b57fe1c9542874ac76bb04a29a1
 EBUILD libnftnl-1.2.1.ebuild 1596 BLAKE2B 4f0df58ffaba293aaee147690535e20e22a9f1e7bc6d115b0a5bac9039fd616b3d861786552c27661d3a7569f7ad8675bdabb818fd22a1bc57f5e00af1146e47 SHA512 bbf0ae2f34d3d3a9e102e11a3c466664989f37f145eb757587887bb3538c75b863073ebe8b61b9ad26dc8d8af071c66ae5680dea6ad98b4d82af13892f192cba
 EBUILD libnftnl-1.2.2-r1.ebuild 1963 BLAKE2B 329c5a51fb5bfaae4786f5026abf160619da328defe43faf08f9f4bb055595a1f227bbbef2d7ca3712ea234b280cab0b92766305916511449e55c615cdf1f893 SHA512 ce644a086b81d06859b252006352fed172d1ff2a2860c44cbae6cf1b3b71946e0d96eb7d5c26f98c1f2249c67712614cb79bc6864b9388dbb72f00ce8d2ddf65
-EBUILD libnftnl-9999.ebuild 1669 BLAKE2B 4844b4918c355fc65ad861eb1eb392605a707275a455ec302295899d53eca6516fd17cd12ede41e322947d879794832ac38d095baf861dbb87d045906d105dfa SHA512 9af24f8b7b40720caa9d4791ffba71b64de5886290d246ccedc3c9f84fa71ad2ada69cf93fa9e764e75baffe2dde4d8193bbd917550f50c8522001d426433922
+EBUILD libnftnl-1.2.3.ebuild 1616 BLAKE2B 33da1ea7acb7744a89396efd68da7b2bd4318d876e73fffbcf9734b810b3e37adb89b60e44b554d33a938f132a9264c0ea244c2b71798708da646817a8a59348 SHA512 ae5f73c91cf326c33900ed53a601b3550dcbbd07b0f65cf0823c5870eb55dddce4ed5e80d4edc822ffc20065f72c34613c0258fd8732361c39006482b4880ba4
+EBUILD libnftnl-9999.ebuild 1616 BLAKE2B 33da1ea7acb7744a89396efd68da7b2bd4318d876e73fffbcf9734b810b3e37adb89b60e44b554d33a938f132a9264c0ea244c2b71798708da646817a8a59348 SHA512 ae5f73c91cf326c33900ed53a601b3550dcbbd07b0f65cf0823c5870eb55dddce4ed5e80d4edc822ffc20065f72c34613c0258fd8732361c39006482b4880ba4
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/net-libs/libnftnl/libnftnl-1.2.3.ebuild b/net-libs/libnftnl/libnftnl-1.2.3.ebuild
new file mode 100644
index 000000000000..e2640d03be0d
--- /dev/null
+++ b/net-libs/libnftnl/libnftnl-1.2.3.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc
+inherit linux-info usr-ldscript verify-sig
+
+DESCRIPTION="Netlink API to the in-kernel nf_tables subsystem"
+HOMEPAGE="https://netfilter.org/projects/nftables/"
+
+if [[ ${PV} =~ ^[9]{4,}$ ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://git.netfilter.org/${PN}"
+else
+	SRC_URI="
+		https://netfilter.org/projects/${PN}/files/${P}.tar.bz2
+		verify-sig? ( https://netfilter.org/projects/${PN}/files/${P}.tar.bz2.sig )
+	"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+	BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
+fi
+
+LICENSE="GPL-2"
+SLOT="0/11" # libnftnl.so version
+IUSE="examples static-libs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=net-libs/libmnl-1.0.4:=
+"
+BDEPEND+="
+	virtual/pkgconfig
+"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	if kernel_is ge 3 13; then
+		CONFIG_CHECK="~NF_TABLES"
+		linux-info_pkg_setup
+	else
+		eerror "This package requires kernel version 3.13 or newer to work properly."
+	fi
+}
+
+src_prepare() {
+	default
+
+	[[ ${PV} =~ ^[9]{4,}$ ]] && eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	gen_usr_ldscript -a nftnl
+
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	if use examples; then
+		find examples/ -name 'Makefile*' -delete || die "Could not rm examples"
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/net-libs/libnftnl/libnftnl-9999.ebuild b/net-libs/libnftnl/libnftnl-9999.ebuild
index 49e48df43765..e2640d03be0d 100644
--- a/net-libs/libnftnl/libnftnl-9999.ebuild
+++ b/net-libs/libnftnl/libnftnl-9999.ebuild
@@ -13,8 +13,10 @@ if [[ ${PV} =~ ^[9]{4,}$ ]]; then
 	inherit autotools git-r3
 	EGIT_REPO_URI="https://git.netfilter.org/${PN}"
 else
-	SRC_URI="https://netfilter.org/projects/${PN}/files/${P}.tar.bz2
-		verify-sig? ( https://netfilter.org/projects/${PN}/files/${P}.tar.bz2.sig )"
+	SRC_URI="
+		https://netfilter.org/projects/${PN}/files/${P}.tar.bz2
+		verify-sig? ( https://netfilter.org/projects/${PN}/files/${P}.tar.bz2.sig )
+	"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 	BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
@@ -25,14 +27,14 @@ SLOT="0/11" # libnftnl.so version
 IUSE="examples static-libs test"
 RESTRICT="!test? ( test )"
 
-RDEPEND=">=net-libs/libmnl-1.0.4:="
-BDEPEND+=" virtual/pkgconfig"
+RDEPEND="
+	>=net-libs/libmnl-1.0.4:=
+"
+BDEPEND+="
+	virtual/pkgconfig
+"
 DEPEND="${RDEPEND}"
 
-PATCHES=(
-	"${FILESDIR}"/${P}-missing-export-set_elem.patch
-)
-
 pkg_setup() {
 	if kernel_is ge 3 13; then
 		CONFIG_CHECK="~NF_TABLES"