gentoo resync : 12.03.2021

4 files changed, 56 insertions, 41 deletions

diff --git a/net-wireless/neard/Manifest b/net-wireless/neard/Manifest
index 3280f0d0990a..f7260938cdfc 100644
--- a/net-wireless/neard/Manifest
+++ b/net-wireless/neard/Manifest
@@ -1,5 +1,5 @@
 AUX neard.confd 274 BLAKE2B f61cc6b061a146899aabd430e3e5c082da57a8e413600a748ae23959dd4ff5668d39b17222c7c22f0cf6f990e289e8dd21287142e9d4bf21e7bdd4d15beb05ec SHA512 d696911f7e5f33f6b2a0f6508c73676998a3bfaebbda02386dc08d9149d525bf211bfcf9836276d070f31288ef84540ef1bce3d68119d4439089297c079392ef
 AUX neard.rc 417 BLAKE2B cdbd53502cebf7ac732830d5266fca64e7bfb8ec06caf660e026ec8bd9413375495e630b27e0e0b97997aab5313c5a215059c1624fd350e8b25e59bd5563c578 SHA512 68459f7dfc9bdcc6b450770d76c0ffa4b0adb248476c801317f8a8cc7c2dc9e41dea4fcf9425b9d667821037d923fb8368acb72540cc63478dd45e21ba9215d5
-DIST neard-0.15.tar.xz 368196 BLAKE2B e23d144229ad7550927b45af715050d158ceb1ee163ef49f1d0269d92bfbd5afcd63c1b698b7f55b471caf2cc1a351a78fef4dd6d7748e26422ae43dbd8b3899 SHA512 daaa001a305f0d200bb03bf614c938256fa5c07d480bf820d5e83da80d930e060b5bb6a09234f1c3f7ecbd3cb0af378a1de675dd4dcd99b728677430e0cd111d
-EBUILD neard-0.15-r1.ebuild 839 BLAKE2B d3d0df32d5686a869fee824ee07af4fbef389597008cc5fe6ce074ca7c757c80bf5c5899198845e50fd41871dd1bcb436a07b1665545dc48ce56d2cf8caa7a9e SHA512 263173b906ed0734f089c23c3fe3d5d446a1582daf7e05106c5e602e9130cbdd7ada55e0d3a42bc16e953a18f31bd1345e12eba4604fbc7afdfa0dac20469eb0
-MISC metadata.xml 247 BLAKE2B 3af5a6a98b5737f4b55191850c41fad5c3ea1aabb85140efa70c728008d84b855803f2b0648e5c4d8f7494ccf407eee85a7a095971796c12b2d98833cd4855e8 SHA512 863541182875c927594f5ff837151d030db4786803ddc8f59fa5564687692b9985df1f15e8494ff947d555c541bc3a877edf1c2407a38f037a65a2076ac2eddd
+DIST neard-0.16.tar.xz 379436 BLAKE2B 8432200eafa2d7517d768ef160e2d2f8db698119ea047d505d7212b1c2d46087223b71749a4c855bf7e7ff43f73d4aa6d67fab272909dbb3236b312ee3b911be SHA512 d0fd5dcfd19db64e65e4149c76979bc7a438240aa6840b35059fde41a8a84a2424274577de964a925e76cd013d21796f69f5361012b6ac79c546d0abdcfed2a6
+EBUILD neard-0.16.ebuild 1037 BLAKE2B b2300e0b6c1f44ddb212c2a7f1717a695de4af053ee24668c2e343fa9ca5789028caacb89356417910836f4203a610be18f3f886fa2a1440b5a43b52a5b8450f SHA512 9dc87058f01364b7b236f9691c56151207f001effcc7efe0cc0e15a8a90d3d29dd24dba222521e69c2b5a4b917dd498f3879450ebede7135fa90eca52528101d
+MISC metadata.xml 264 BLAKE2B e0a334cbf423516e5797fc80d89e221b6ae768e987374c14211903eb404ac2dfe8bd7854eb4d56181cf63b82e72cf3a862fed8a2cd0e26b30a164c5b70e2efb2 SHA512 30462002733c5b204781aaec52b38d78edbb567f02916f5c1d2e417d9d4758b8e69b174b2c73bf145d458b6a6ca529bc3d38955f479be69557ed57ebe0b913d3
diff --git a/net-wireless/neard/metadata.xml b/net-wireless/neard/metadata.xml
index 896eadb2b4df..2d25d4a14ba4 100644
--- a/net-wireless/neard/metadata.xml
+++ b/net-wireless/neard/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<use>
- <flag name="tools">build and install extra helper utilities</flag>
-</use>
+	<!-- maintainer-needed -->
+	<use>
+		<flag name="tools">Build and install 'nfctool' for further NFC debugging</flag>
+	</use>
 </pkgmetadata>
diff --git a/net-wireless/neard/neard-0.15-r1.ebuild b/net-wireless/neard/neard-0.15-r1.ebuild
deleted file mode 100644
index 1316fa9d39c2..000000000000
--- a/net-wireless/neard/neard-0.15-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-DESCRIPTION="Near Field Communication (NFC) management daemon"
-HOMEPAGE="https://01.org/linux-nfc/"
-SRC_URI="https://www.kernel.org/pub/linux/network/nfc/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="tools systemd"
-
-RDEPEND=">=dev-libs/glib-2.28:2
-	dev-libs/libnl
-	systemd? ( sys-apps/systemd:0 )
-	>=sys-apps/dbus-1.2.24"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	econf $(use_enable systemd) $(use_enable tools)
-}
-
-src_install() {
-	default
-
-	# Patch for this has been sent upstream.  Do it manually
-	# to avoid having to rebuild autotools. #580876
-	mv "${ED}"/usr/include/version.h "${ED}"/usr/include/near/ || die
-
-	newinitd "${FILESDIR}"/${PN}.rc ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/net-wireless/neard/neard-0.16.ebuild b/net-wireless/neard/neard-0.16.ebuild
new file mode 100644
index 000000000000..7ec240979082
--- /dev/null
+++ b/net-wireless/neard/neard-0.16.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+DESCRIPTION="Near Field Communication (NFC) management daemon"
+HOMEPAGE="https://01.org/linux-nfc/"
+SRC_URI="https://www.kernel.org/pub/linux/network/nfc/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="tools systemd"
+
+RDEPEND="
+	 dev-libs/libnl:3=
+	 sys-apps/dbus
+	 sys-libs/glibc
+	 systemd? ( sys-apps/systemd:0 )
+"
+
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	 # Workaround for >= GCC-10
+	 append-cflags -fcommon
+
+	 local myeconfargs=(
+		  --disable-optimization
+		  --enable-ese
+		  --enable-pie
+		  $(use_enable systemd)
+		  $(use_enable tools)
+	 )
+	 econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	 default
+
+	 # Patch for this has been sent upstream.  Do it manually
+	 # to avoid having to rebuild autotools. #580876
+	 mv "${ED}"/usr/include/version.h "${ED}"/usr/include/near/ || die
+
+	 newinitd "${FILESDIR}"/neard.rc neard
+	 newconfd "${FILESDIR}"/neard.confd neard
+}