gentoo resync : 28.04.2021

4 files changed, 8 insertions, 59 deletions

diff --git a/app-admin/authbind/Manifest b/app-admin/authbind/Manifest
index da21460f2976..63056d50bc0e 100644
--- a/app-admin/authbind/Manifest
+++ b/app-admin/authbind/Manifest
@@ -1,6 +1,4 @@
-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
+AUX authbind-2.1.2-respect-flags.patch 812 BLAKE2B 44a82a62bee8bbc8d3ebb67cf7d618850690293c76ff9a0c0f70f0067fe646673adfc6932dd8972c41d81f51bfe7833593348971fb069652d920ec92f1039dfd SHA512 ec6fa58a06180f70d30abed32f0cfe94ec582dc9b286580ece222db99b1c7f936665567b918648efdc79e3e0c8b69a60043ed72c5f77479a2be2c5dd55c7b8e1
 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
+EBUILD authbind-2.1.2.ebuild 1237 BLAKE2B 9bd6ef57eb70c2fde8de896efbffb31f275f442e5fd68643484b1db5a6d8c96098c40c95238cb9b8b8799e955191e45da12205c26a7aac8c8b4ec42c8ebf99dd SHA512 8b11853f0eca7d1e7ef6fd6bde5b19f12205dc274fc44ada20b105edc93a6a2cfc598ed249f5880e0c3f0c994b0f0eb7549fa9c64b913c7e8c902202a1318829
 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
deleted file mode 100644
index 0d4fef683b83..000000000000
--- a/app-admin/authbind/authbind-2.1.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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}/${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)|" \
-		-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/authbind-2.1.2.ebuild b/app-admin/authbind/authbind-2.1.2.ebuild
index 5c54176d277c..d9479c70b7b0 100644
--- a/app-admin/authbind/authbind-2.1.2.ebuild
+++ b/app-admin/authbind/authbind-2.1.2.ebuild
@@ -8,6 +8,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"
+S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -16,7 +17,7 @@ KEYWORDS="~amd64"
 BDEPEND="virtual/awk"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-2.1.1-respect-flags.patch"
+	"${FILESDIR}/${PN}-2.1.2-respect-flags.patch"
 )
 
 src_configure() {
diff --git a/app-admin/authbind/files/authbind-2.1.1-respect-flags.patch b/app-admin/authbind/files/authbind-2.1.2-respect-flags.patch
index 7e7a83e283e4..877c50bd1e9f 100644
--- a/app-admin/authbind/files/authbind-2.1.1-respect-flags.patch
+++ b/app-admin/authbind/files/authbind-2.1.2-respect-flags.patch
@@ -1,3 +1,5 @@
+diff --git a/Makefile b/Makefile
+index 37a8673..89f83f4 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -34,10 +34,9 @@ INSTALL_PROGRAM ?= install -o root -g root -m 755 -s
@@ -9,7 +11,7 @@
  LIBS=		-ldl -lc
 -CFLAGS=		-g $(OPTIMISE) \
 +SHARED_LDFLAGS=
-+CFLAGS+=	\
++CFLAGSS+=	\
  		-Wall -Wwrite-strings -Wpointer-arith -Wimplicit \
  		-Wnested-externs -Wmissing-prototypes -Wstrict-prototypes
  CPPFLAGS=	-DMAJOR_VER='"$(MAJOR)"' -DMINOR_VER='"$(MINOR)"' \
@@ -17,7 +19,7 @@
  helper.o authbind.o:	authbind.h
  
  $(LIBTARGET):		libauthbind.o
--		ld -shared -soname $(LIBCANON) -o $@ $< $(LIBS)
+-		$(LD) -shared -soname $(LIBCANON) -o $@ $< $(LIBS)
 +		$(LD) $(SHARED_LDFLAGS) -shared -soname $(LIBCANON) -o $@ $< $(LIBS)
  
  clean distclean: