gentoo resync : 23.06.2018

4 files changed, 11 insertions, 230 deletions

diff --git a/sys-apps/acl/Manifest b/sys-apps/acl/Manifest
index df626d41dde9..97e307acdcf1 100644
--- a/sys-apps/acl/Manifest
+++ b/sys-apps/acl/Manifest
@@ -1,5 +1,5 @@
-AUX acl-2.2.52-xattr_header.patch 4777 BLAKE2B 8903fa3bcee96d43f9e142d70ee78fa59b9a6dc3618fb853352caff263afd05a83afa77f4ed70ecb010b32d113597a8c40ea711aeda14ac7bf387a0b407fb8ed SHA512 356eaedccba561d92f5a518dc1cba27c5e525bd9063ea852ed1f0597bb379996d7c56ae97c4a19e20e569dfe5cb2406b32453866f40466680e6fdc63e5a75906
 DIST acl-2.2.52.src.tar.gz 386604 BLAKE2B e8b7b555cec93f84579aac846ce64235e356d73770844e88898564d1742fcf3d7c314511f0321aefbad33bdd85800406102178e8ab6414bc9c883891442d3188 SHA512 59973199d371cd0b2368e95bc829a1b47f04e808a174fefba4c6854e766158bd19a71d9dbcc8d6fdc1573a1f971cdda39c453f7fa243bce02c1ab97c6e7c72e7
-EBUILD acl-2.2.52-r1.ebuild 1403 BLAKE2B 14b7b9e8d4aeb17c6dfad20b4c8369da6880bae09aafe811bbd22238d22c960e2ac04e25e258522cad7312586e657078c60837b7d44f395c0ef63d624cb8a7e9 SHA512 43e6f0ddceaf2da55a1bc5bb39b1a5ec3b9d6270c9d47a841b6341881fdef966d5e9659963e9bcbaf025cdbd4ac62efc8eb8016d9107d484cd5119930c1f4b98
-EBUILD acl-2.2.52-r2.ebuild 1523 BLAKE2B 993d5d0790231e9afb2777812000c916519c307a8d1b9490e7d0b2d96c7d44ccc55d7a5247690c58510554bc948483e9de86f96881c1bb3bf4da81f8bfdab6f4 SHA512 d4ae75c33c5f93ead215360d69d7458ff1f6ea85aedb444a1ecd513c433da6f7826ddfc4942d8dbc2dcaecc2055b080cf6c257e7a7979c6771ac775a883e3f3a
+DIST acl-2.2.53.tar.gz 524300 BLAKE2B a4c602b18ab1a7932dce38c8dacf3a3026a3100a8a7e61f0740886ec7154a7738ca641953dc1253b5574580815d7f547a99bdd0cc0ee87238a1995abe97eb9d8 SHA512 176b7957fe0e7618e0b7bf2ac5071f7fa29417df718cce977661a576fa184e4af9d303b591c9d556b6ba8923e799457343afa401f5a9f7ecd9022185a4e06716
+EBUILD acl-2.2.52-r1.ebuild 1377 BLAKE2B 8c134c96e96ea7970deb77a16edcc73d9171fcc71b6ddc417125062bb803c3e1064b23bcb31773d5536cfa2ba750765855fcb50531e91a6071c9fea9953b240c SHA512 d807c7634485af07d7255cce0ac3d876dc0df17e3b1e973e55d8ec3239d80851a622a3ec2c6c8e70caa648acb89c6fe0fd45c882289477346f11f48f282a1b99
+EBUILD acl-2.2.53.ebuild 1074 BLAKE2B 28a51d83257e314535b576b8c5b9d5c1764f7f4f3a6ce3a5f695df5625884d2a8252195425edaa1eb0a78946a82b51d627fef0123eaa6022636dd5521e963985 SHA512 64c946db86fd5d7eb9a9b5c50cef290407a535266dfdb31665e672b7b8af1c416d427fa304bfa68cdf60fa97ed75f79c1dabf814f88a9b530721799f0f3e2f6f
 MISC metadata.xml 293 BLAKE2B 2b8092a768f4f905c414e9bde92180e659085a60fd6ec13cecb29b6a88471941e7c8e2ad86f2864f44fa4f74589b20433ce64c3e89c3e210838b9d997deda136 SHA512 1e61b3f2d76e95eca037de073678326400b069526c8a308ca4169ce67d3e47c8cd199cca59f83fa245bb5fcbaa9efe7f31e34cf8588d69383ed0da78ab54cfaa
diff --git a/sys-apps/acl/acl-2.2.52-r1.ebuild b/sys-apps/acl/acl-2.2.52-r1.ebuild
index 762f4a985238..64fd600c0cc1 100644
--- a/sys-apps/acl/acl-2.2.52-r1.ebuild
+++ b/sys-apps/acl/acl-2.2.52-r1.ebuild
@@ -7,7 +7,7 @@ inherit eutils libtool toolchain-funcs multilib-minimal
 
 DESCRIPTION="access control list utilities, libraries and headers"
 HOMEPAGE="https://savannah.nongnu.org/projects/acl"
-SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.src.tar.gz"
+SRC_URI="mirror://nongnu/${PN}/${P}.src.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/sys-apps/acl/acl-2.2.52-r2.ebuild b/sys-apps/acl/acl-2.2.53.ebuild
index 4bc0d2945f1c..11b1ee043a3e 100644
--- a/sys-apps/acl/acl-2.2.52-r2.ebuild
+++ b/sys-apps/acl/acl-2.2.53.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI="6"
 
-inherit eutils libtool ltprune toolchain-funcs multilib-minimal
+inherit libtool ltprune toolchain-funcs multilib-minimal
 
 DESCRIPTION="access control list utilities, libraries and headers"
 HOMEPAGE="https://savannah.nongnu.org/projects/acl"
-SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.src.tar.gz"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
@@ -20,41 +20,23 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
-PATCHES=(
-	"${FILESDIR}/${P}-xattr_header.patch"
-)
-
 src_prepare() {
 	default
-
-	sed -i \
-		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
-		-e '/HAVE_ZIPPED_MANPAGES/s:=.*:=false:' \
-		include/builddefs.in \
-		|| die
-	strip-linguas po
 	elibtoolize #580792
-
-	# same as https://savannah.nongnu.org/bugs/index.php?39736
-	multilib_copy_sources
 }
 
 multilib_src_configure() {
-	unset PLATFORM #184564
-	export OPTIMIZER=${CFLAGS}
-	export DEBUG=-DNDEBUG
-
 	local myeconfargs=(
 		--bindir="${EPREFIX}"/bin
-		--enable-shared $(use_enable static-libs static)
+		$(use_enable static-libs static)
 		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
-		$(use_enable nls gettext)
+		$(use_enable nls)
 	)
-	econf "${myeconfargs[@]}"
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
 multilib_src_install() {
-	emake DIST_ROOT="${D}" install install-dev install-lib
+	default
 
 	# move shared libs to /
 	gen_usr_ldscript -a acl
diff --git a/sys-apps/acl/files/acl-2.2.52-xattr_header.patch b/sys-apps/acl/files/acl-2.2.52-xattr_header.patch
deleted file mode 100644
index 052941f92c82..000000000000
--- a/sys-apps/acl/files/acl-2.2.52-xattr_header.patch
+++ /dev/null
@@ -1,201 +0,0 @@
-Backported from:
-http://git.savannah.nongnu.org/cgit/acl.git/commit/?id=79f563779b9b9ba89cc2352d70e3cdf27acff513
-
---- acl-2.2.52/libacl/acl_delete_def_file.c
-+++ acl-2.2.52/libacl/acl_delete_def_file.c
-@@ -20,11 +20,11 @@
- */
- 
- #include <sys/types.h>
--#include <attr/xattr.h>
-+#include <sys/xattr.h>
- #include "byteorder.h"
- #include "acl_ea.h"
- #include "config.h"
--
-+#include "libacl.h"
- 
- /* 23.4.8 */
- int
---- acl-2.2.52/libacl/acl_extended_fd.c
-+++ acl-2.2.52/libacl/acl_extended_fd.c
-@@ -20,13 +20,12 @@
- */
- 
- #include <unistd.h>
--#include <attr/xattr.h>
-+#include <sys/xattr.h>
- #include "libacl.h"
- 
- #include "byteorder.h"
- #include "acl_ea.h"
- 
--
- int
- acl_extended_fd(int fd)
- {
---- acl-2.2.52/libacl/__acl_extended_file.c
-+++ acl-2.2.52/libacl/__acl_extended_file.c
-@@ -20,14 +20,13 @@
- */
- 
- #include <unistd.h>
--#include <attr/xattr.h>
-+#include <sys/xattr.h>
- #include "libacl.h"
- 
- #include "byteorder.h"
- #include "acl_ea.h"
- #include "__acl_extended_file.h"
- 
--
- int
- __acl_extended_file(const char *path_p,
- 		    ssize_t (*fun)(const char *, const char *,
---- acl-2.2.52/libacl/acl_extended_file.c
-+++ acl-2.2.52/libacl/acl_extended_file.c
-@@ -20,7 +20,7 @@
- */
- 
- #include <unistd.h>
--#include <attr/xattr.h>
-+#include <sys/xattr.h>
- #include "libacl.h"
- 
- #include "__acl_extended_file.h"
---- acl-2.2.52/libacl/acl_extended_file_nofollow.c
-+++ acl-2.2.52/libacl/acl_extended_file_nofollow.c
-@@ -20,7 +20,7 @@
- */
- 
- #include <unistd.h>
--#include <attr/xattr.h>
-+#include <sys/xattr.h>
- #include "libacl.h"
- 
- #include "__acl_extended_file.h"
---- acl-2.2.52/libacl/acl_get_fd.c
-+++ acl-2.2.52/libacl/acl_get_fd.c
-@@ -23,7 +23,7 @@
- #include <sys/stat.h>
- #include <unistd.h>
- #include <stdio.h>
--#include <attr/xattr.h>
-+#include <sys/xattr.h>
- #include <acl/libacl.h>
- #include "libacl.h"
- #include "__acl_from_xattr.h"
-@@ -31,7 +31,6 @@
- #include "byteorder.h"
- #include "acl_ea.h"
- 
--
- /* 23.4.15 */
- acl_t
- acl_get_fd(int fd)
---- acl-2.2.52/libacl/acl_get_file.c
-+++ acl-2.2.52/libacl/acl_get_file.c
-@@ -23,7 +23,7 @@
- #include <sys/stat.h>
- #include <unistd.h>
- #include <stdio.h>
--#include <attr/xattr.h>
-+#include <sys/xattr.h>
- #include <acl/libacl.h>
- #include "libacl.h"
- #include "__acl_from_xattr.h"
-@@ -31,7 +31,6 @@
- #include "byteorder.h"
- #include "acl_ea.h"
- 
--
- /* 23.4.16 */
- acl_t
- acl_get_file(const char *path_p, acl_type_t type)
---- acl-2.2.52/libacl/acl_set_fd.c
-+++ acl-2.2.52/libacl/acl_set_fd.c
-@@ -20,7 +20,7 @@
- */
- 
- #include <unistd.h>
--#include <attr/xattr.h>
-+#include <sys/xattr.h>
- #include "libacl.h"
- #include "__acl_to_xattr.h"
- 
---- acl-2.2.52/libacl/acl_set_file.c
-+++ acl-2.2.52/libacl/acl_set_file.c
-@@ -22,7 +22,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <unistd.h>
--#include <attr/xattr.h>
-+#include <sys/xattr.h>
- #include "libacl.h"
- #include "__acl_to_xattr.h"
- 
---- acl-2.2.52/libacl/libacl.h
-+++ acl-2.2.52/libacl/libacl.h
-@@ -17,8 +17,13 @@
- 
- #include <errno.h>
- #include <sys/acl.h>
-+#include <errno.h>
- #include "libobj.h"
- 
-+#ifndef ENOATTR
-+# define ENOATTR ENODATA
-+#endif
-+
- typedef unsigned int permset_t;
- 
- #define ACL_PERM_NONE		(0x0000)
---- acl-2.2.52/m4/package_attrdev.m4
-+++ acl-2.2.52/m4/package_attrdev.m4
-@@ -12,17 +12,6 @@
- dnl
- dnl You should have received a copy of the GNU General Public License
- dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
--AC_DEFUN([AC_PACKAGE_NEED_ATTR_XATTR_H],
--  [ AC_CHECK_HEADERS([attr/xattr.h])
--    if test "$ac_cv_header_attr_xattr_h" != "yes"; then
--        echo
--        echo 'FATAL ERROR: attr/xattr.h does not exist.'
--        echo 'Install the extended attributes (attr) development package.'
--        echo 'Alternatively, run "make install-dev" from the attr source.'
--        exit 1
--    fi
--  ])
--
- AC_DEFUN([AC_PACKAGE_NEED_ATTR_ERROR_H],
-   [ AC_CHECK_HEADERS([attr/error_context.h])
-     if test "$ac_cv_header_attr_error_context_h" != "yes"; then
---- acl-2.2.52/configure
-+++ acl-2.2.52/configure
-@@ -12416,26 +12416,6 @@
-     fi
- 
- 
-- for ac_header in attr/xattr.h
--do :
--  ac_fn_c_check_header_mongrel "$LINENO" "attr/xattr.h" "ac_cv_header_attr_xattr_h" "$ac_includes_default"
--if test "x$ac_cv_header_attr_xattr_h" = xyes; then :
--  cat >>confdefs.h <<_ACEOF
--#define HAVE_ATTR_XATTR_H 1
--_ACEOF
--
--fi
--
--done
--
--    if test "$ac_cv_header_attr_xattr_h" != "yes"; then
--        echo
--        echo 'FATAL ERROR: attr/xattr.h does not exist.'
--        echo 'Install the extended attributes (attr) development package.'
--        echo 'Alternatively, run "make install-dev" from the attr source.'
--        exit 1
--    fi
--
-  for ac_header in attr/error_context.h
- do :
-   ac_fn_c_check_header_mongrel "$LINENO" "attr/error_context.h" "ac_cv_header_attr_error_context_h" "$ac_includes_default"