gentoo resync : 31.05.2021

4 files changed, 2 insertions, 86 deletions

diff --git a/gnome-extra/eiciel/Manifest b/gnome-extra/eiciel/Manifest
index c4827bf161bf..3718162140c6 100644
--- a/gnome-extra/eiciel/Manifest
+++ b/gnome-extra/eiciel/Manifest
@@ -1,7 +1,4 @@
-AUX eiciel-0.9.12.1-xattr-header.patch 1368 BLAKE2B 6f8e8b2194286f2cf5314dc86c429ab17336a5f95a757c76d4542069c7ebdc840c9866d97dacb3c418578d0c87d0c1127b2e57ea31e059ef9a2c9df8b69d8ea0 SHA512 22286ea3973845ae5b489855ca0df5813ab95b46eed53820d5b472c2baa44327c673d4aa1c4b1d792cfcd59dc2f492612cce7b2e7f648223d6314d44773cc7b5
 AUX eiciel_participant_target.hpp 1067 BLAKE2B 552ecec8247cd85d9124a7be1fa263e96ffd8f5ed3de1a06d4fa6c071a2f3b40f8c9e238c182c241976158bc4361393e5adc853160c0ce998e4de0116e296348 SHA512 af9d3872d884b73b562a6447d9bace430039cec83a6e1b7ba2df47cf91b9b67d9bb09a7bbc71fc0862fddf0b2e34d7e72bedb90886b767a338725a5fa2fd8fda
-DIST eiciel-0.9.12.1.tar.bz2 723727 BLAKE2B e32f3af9f4664610169fc718a9d274ae9d91c5d0d56a6be9872da1c105b349584300879742b753a02ad621cdc597591c52f47d705222ad52cb37b0750616a553 SHA512 f54fbb149eed7f8fd534b77ec5e2d0f579c68a39afd7417a2298d75c7e95c459b49fc8ccb66d0188956ffaadf3bcc8a3eb048425cb82fc875573eb131f4b0494
 DIST eiciel-0.9.13.tar.bz2 707838 BLAKE2B 30702b20482984885dfdb222e631f7572f3199b93509baa48762c0925b1fd78e1601a1279e7454543ddc32e813288cd01f0fdc2cb0c2eb0c5812cefcf8cac29f SHA512 7b5fde27e2d28c69f02092896bb0065372f93319d8ff8ad285b8b0e52acbe6d43b96f7dc215d7210602c6f766b48d2e2c66361dd28ea0f567ed6faf3bbcfdd14
-EBUILD eiciel-0.9.12.1-r1.ebuild 884 BLAKE2B 3864d3ca1e9c01f10a47c6123ac4874e8356147fc7cd410eea7affe45615a8ba117f98e1514164f0d254eaacf9149cd14a497d70a6aab69f270f08387811bd38 SHA512 0911a36880069cef99e69d5f98038d9c35393c58c5f6f148d3a68b5f967333cce56909e3f5ce4442cc05af35541be9c7609a4b34ce52261235cac17a67ef938f
-EBUILD eiciel-0.9.13.ebuild 882 BLAKE2B fadcba5ff420fd2d655c9975a9bfb762fce11a6bb700f2ad0522dd34b888861b7570d7a23ff2bc3ca3b71dae87fcbdaf00749408f04d984f819b56bf768a3c11 SHA512 0b2c45456f245793cc02b611cf11ce255e65cfde622c13b279bbe2732a878c5440cc112eca4aa6148e3184d50f4523eeb59a1eda48877b81d4fe517090c6a403
+EBUILD eiciel-0.9.13.ebuild 880 BLAKE2B 6ffce24f22b0b6b6c7dbe5063102fa24981bceae0beb77de24f35e2fa605dfcea7163ab30d0fb11a700198726842f1217496b417baab4c84cda7e5b837a2dcc9 SHA512 37b69856c4c2d4e782ada9bdc55468b5d259ec509ac1302a5f63ed581c5f364cbe9dda8e7e3faa41f6bc3c08925f5938e45f481781d4fc60b078fa58e1e6ee64
 MISC metadata.xml 328 BLAKE2B 73e7203ec24879a8db2ef2adb8b1b3c51634ef3a6b320a8070c24de0530d4ce755568fc2140e09d0f585043b1753c4c505c5adc6a8abdf9658ceceac7f44bfe9 SHA512 37fa2d1b3f4a4978cbf04345e97c0f02ce610b29f97e69c9384509ec5a96393fe1feeb2a31645361027ceac8d32fddf4b7902f076ed28c83488f59e43269d6f2
diff --git a/gnome-extra/eiciel/eiciel-0.9.12.1-r1.ebuild b/gnome-extra/eiciel/eiciel-0.9.12.1-r1.ebuild
deleted file mode 100644
index 1ffc189370d6..000000000000
--- a/gnome-extra/eiciel/eiciel-0.9.12.1-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_EAUTORECONF="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="ACL editor for GNOME, with Nautilus extension"
-HOMEPAGE="https://rofi.roger-ferrer.org/eiciel/"
-SRC_URI="https://rofi.roger-ferrer.org/eiciel/download/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nautilus xattr"
-
-RDEPEND="
-	>=sys-apps/acl-2.2.32
-	dev-cpp/gtkmm:3.0
-	nautilus? ( >=gnome-base/nautilus-3 )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.18.1
-"
-
-PATCHES=(
-	# attr/xattr.h is deprecated. Use sys/xattr.h instead (from 'master')
-	"${FILESDIR}"/${P}-xattr-header.patch
-)
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--with-gnome-version=3 \
-		$(use_enable nautilus nautilus-extension) \
-		$(use_enable xattr user-attributes)
-}
diff --git a/gnome-extra/eiciel/eiciel-0.9.13.ebuild b/gnome-extra/eiciel/eiciel-0.9.13.ebuild
index d122ad8b681c..0c18719fb3d3 100644
--- a/gnome-extra/eiciel/eiciel-0.9.13.ebuild
+++ b/gnome-extra/eiciel/eiciel-0.9.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://rofi.roger-ferrer.org/eiciel/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="nautilus xattr"
 
 DEPEND="
diff --git a/gnome-extra/eiciel/files/eiciel-0.9.12.1-xattr-header.patch b/gnome-extra/eiciel/files/eiciel-0.9.12.1-xattr-header.patch
deleted file mode 100644
index 1b866f4bb75f..000000000000
--- a/gnome-extra/eiciel/files/eiciel-0.9.12.1-xattr-header.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From cf7e97ece39994d9c219bf3d4f3f70815e1c0867 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Tue, 15 May 2018 13:40:37 +0200
-Subject: [PATCH] attr/xattr.h is deprecated. Use sys/xattr.h instead
-
-See also:
-http://git.savannah.nongnu.org/cgit/attr.git/commit/?id=7921157890d07858d092f4003ca4c6bae9fd2c38
----
- configure.ac          | 2 +-
- src/xattr_manager.hpp | 5 ++++-
- 2 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 040e88f..bc769f3 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -156,7 +156,7 @@ fi
- 
- if test x$enable_eua = xyes;
- then
--    AC_CHECK_HEADERS([attr/xattr.h], [], AC_MSG_ERROR([This header is mandatory for extended user attributes support]), [])
-+    AC_CHECK_HEADERS([sys/xattr.h], [], AC_MSG_ERROR([This header is mandatory for extended user attributes support]), [])
-     AC_DEFINE([ENABLE_USER_XATTR], [1], [Enables user extended attributes support])
- fi
- AM_CONDITIONAL(ENABLE_USER_XATTR, test x$enable_eua = xyes)
-diff --git a/src/xattr_manager.hpp b/src/xattr_manager.hpp
-index 5f59e17..3d41443 100644
---- a/src/xattr_manager.hpp
-+++ b/src/xattr_manager.hpp
-@@ -26,7 +26,10 @@
- #include <sys/stat.h>
- #include <unistd.h>
- 
--#include <attr/xattr.h>
-+#include <sys/xattr.h>
-+#ifndef ENOATTR
-+#define ENOATTR ENODATA
-+#endif
- 
- #include <string>
- #include <cstring>