gentoo resync : 27.03.2021

4 files changed, 68 insertions, 15 deletions

diff --git a/app-admin/authbind/Manifest b/app-admin/authbind/Manifest
index 7f7e9cdbb6ee..da21460f2976 100644
--- a/app-admin/authbind/Manifest
+++ b/app-admin/authbind/Manifest
@@ -1,4 +1,6 @@
-AUX authbind-2.1.1-respect-flags.patch 808 BLAKE2B 3a74723e5bfe38b2ba31959850b7ea475afe76a73165b267936249809c46632883988f5ae8d56f89af41f682c9afcd3bc4eb3f9e3d5467ad1ce5c53cc5f809d9 SHA512 5c22805ee442cfa76e59e11a7614acaddfc6c38a316c290e147a159a221baf3ca44b44135bf4862031faacbc1c913c97a8a95f000ffcd33688021ece7df19750
+AUX authbind-2.1.1-respect-flags.patch 745 BLAKE2B 03180e906a086ef2befc01399a845719d8fe8458122cf40817cc0c05cea77582c3fda273a7a31a4d57dd0acbcda3f845107fd1f57da44f1213c5d9fa6bd15c36 SHA512 e83c91a30c5a73650c7e92528b1b21d51d2f5a6b6b23784dc5773b818b057a9fdee8920ae80b50a093bc89ee60c540b0d8e0a2f7e1746e01ff1146124acdc6bf
 DIST authbind_2.1.1.tar.gz 14407 BLAKE2B 624cb647b138006324611d00943ad78f9166e4c47821ef5b395c58eb75c1034591cb4a0549f6870fa4294f4f4ca628f03390b4539a4543a64111d33ac9cb3261 SHA512 f3a45fcf1d8d6e6762bc1cef7a1b89f211e4af56c68b4c6c5e508a2f7ee039499b8b2f11ce8aeb94822d20377d309035760fa7b58aabaa4e87417ca25811c812
-EBUILD authbind-2.1.1.ebuild 1179 BLAKE2B 3da9b5f5f1cd5bfbe95c1caae16b0d0106439dd5154fba54d3d10941f547b9b450f975f525e0a1674b9bcc13851c2e6e79cdeef33b384009f911fb2e33590f19 SHA512 777f23b0e2d3999a73f8262659d92a45c9f99d51e439650bdf50a124288afccdd153de74f97c4b1253cea9029a785f3342ba2c495f6d67a52ebe727504293fce
+DIST authbind_2.1.2.tar.gz 15279 BLAKE2B 5f9a31c9f51c307e9ad85bf14b436e1780d0c7dc5655ad3882e9596927862be0684d0a4a43c7d2e98a0d6a0d4c2552aaaf954ce32d3e9202bf5593ce501b5962 SHA512 85020af9703f8f39194a7719c50a51d75344db9ea99ecbc83c3c6bff0852ab1ea1cbd0b9bff6a2345e08a7bef9732e36890f33af08929e36dae8215dd070cc4d
+EBUILD authbind-2.1.1.ebuild 1209 BLAKE2B 306305ac2ae962abcec45dd010804e64597dbab1c614b32850a268979ae983562022576ae064c18a6084057c21fb51a37a69c8e89d0d7dc6146ee5bd690b4d8f SHA512 d1a54e078ae8205f46b4cd444dc7a2413c6fb7c50855c6e07292a78133fdab9eb4c9ca94d3dd2df66ae29d4f8e14e856398bc2d7df6d3fda85aed9e52d13c2a5
+EBUILD authbind-2.1.2.ebuild 1216 BLAKE2B 409787a60655a40077b8481016764058e0f1f937396409aabeb2de0e9c5a0318e5be0fd132d32824e4a31de799069713a96dcb2cb1b883f0782ad6d03026106e SHA512 fa3fe849bdf0558e31f283fa704f9ea23317e6c1ea5d195465a895cc101e560b35ebe389112dd13a4012d1ff003752e86d98d370301e02f43c2927a109e7f5bb
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-admin/authbind/authbind-2.1.1.ebuild b/app-admin/authbind/authbind-2.1.1.ebuild
index c7a9890aa7ce..0d4fef683b83 100644
--- a/app-admin/authbind/authbind-2.1.1.ebuild
+++ b/app-admin/authbind/authbind-2.1.1.ebuild
@@ -1,27 +1,27 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils multilib flag-o-matic
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Bind sockets to privileged ports without root"
-HOMEPAGE="http://www.chiark.greenend.org.uk/ucgi/~ian/git/authbind.git/"
+HOMEPAGE="https://www.chiark.greenend.org.uk/ucgi/~ian/git/authbind.git/"
 SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
 
-DEPEND=""
-RDEPEND=""
+BDEPEND="virtual/awk"
 
-src_prepare() {
-	epatch "${FILESDIR}/${P}-respect-flags.patch"
-}
+PATCHES=(
+	"${FILESDIR}/${P}-respect-flags.patch"
+)
 
 src_configure() {
+	tc-export CC LD
+
 	sed -i \
 		-e "s|^prefix=.*|prefix=/usr|" \
 		-e "s|^lib_dir=.*|lib_dir=\$(prefix)/$(get_libdir)|" \
@@ -38,7 +38,8 @@ src_install() {
 	dobin authbind
 	doman authbind.1 authbind-helper.8
 
-	ln -s libauthbind.so.* libauthbind.so.$(awk -F= '/MAJOR=/ { print $2 }' < Makefile)
+	local major=$(awk -F= '/MAJOR=/ { print $2 }' Makefile || die)
+	ln -s libauthbind.so.* libauthbind.so.${major} || die
 	dolib.so libauthbind.so*
 
 	exeinto /usr/libexec/authbind
diff --git a/app-admin/authbind/authbind-2.1.2.ebuild b/app-admin/authbind/authbind-2.1.2.ebuild
new file mode 100644
index 000000000000..5c54176d277c
--- /dev/null
+++ b/app-admin/authbind/authbind-2.1.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Bind sockets to privileged ports without root"
+HOMEPAGE="https://www.chiark.greenend.org.uk/ucgi/~ian/git/authbind.git/"
+SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="virtual/awk"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.1.1-respect-flags.patch"
+)
+
+src_configure() {
+	tc-export CC LD
+
+	sed -i \
+		-e "s|^prefix=.*|prefix=/usr|" \
+		-e "s|^lib_dir=.*|lib_dir=\$(prefix)/$(get_libdir)|" \
+		-e "s|^libexec_dir=.*|libexec_dir=\$(prefix)/libexec/authbind|" \
+		-e "s|^SHARED_LDFLAGS=.*|SHARED_LDFLAGS=$(raw-ldflags)|" \
+		Makefile || die "sed failed"
+
+	sed -i \
+		-e 's|/usr/lib|/usr/libexec|' \
+		authbind-helper.8 || die "sed failed"
+}
+
+src_install() {
+	dobin authbind
+	doman authbind.1 authbind-helper.8
+
+	local major=$(awk -F= '/MAJOR=/ { print $2 }' Makefile || die)
+	ln -s libauthbind.so.* libauthbind.so.${major} || die
+	dolib.so libauthbind.so*
+
+	exeinto /usr/libexec/authbind
+	exeopts -m4755
+	doexe helper
+
+	keepdir /etc/authbind/by{addr,port,uid}
+
+	dodoc debian/changelog
+}
diff --git a/app-admin/authbind/files/authbind-2.1.1-respect-flags.patch b/app-admin/authbind/files/authbind-2.1.1-respect-flags.patch
index 2a9eb5f6b84c..7e7a83e283e4 100644
--- a/app-admin/authbind/files/authbind-2.1.1-respect-flags.patch
+++ b/app-admin/authbind/files/authbind-2.1.1-respect-flags.patch
@@ -1,5 +1,3 @@
-diff --git a/Makefile b/Makefile
-index c1eed73..932ea60 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -34,10 +34,9 @@ INSTALL_PROGRAM ?= install -o root -g root -m 755 -s