gentoo resync : 29.08.2018

6 files changed, 61 insertions, 77 deletions

diff --git a/app-crypt/ima-evm-utils/Manifest b/app-crypt/ima-evm-utils/Manifest
index 2dde70f59750..184e6c179375 100644
--- a/app-crypt/ima-evm-utils/Manifest
+++ b/app-crypt/ima-evm-utils/Manifest
@@ -1,8 +1,5 @@
-DIST ima-evm-utils-0.2.tar.gz 16329 BLAKE2B 6682d42d7e5801adf49a253fbcbbfbb9f66387e78e27fa8fa301a4cd6da904d0666b5f2011df7791dfc7c0e05cebe90fa20d7a103254141b6fbcd2c1a56aa334 SHA512 44d5ead01d0d1241d743a8545a619308a1988f2188384571d7d37dca567598f46d1d7d8b8a6ba3fdaf5b5e980f4c8a80f1c098ec4dadf082393a727f7a266229
-DIST ima-evm-utils-0.8.tar.gz 32025 BLAKE2B 4635c737257bba7b5aa7ca5b9b27e57a3cb16c7730bcd752602923c84e0f6e4c56e7de9099fcde6e6ae479fcfdb3b6c3251aeeb2872ecbc9430977f7f77fce7e SHA512 cfa90963426c9adfaa3b61e31c1b63d87407a1dfadd39d4c00f5c16b2b312d7535159c84c7f1854bb143147b5b097ef41dde22f8bba30555eecd8ed0255f3630
-DIST ima-evm-utils-1.0.tar.gz 35601 BLAKE2B 990e58e16923988d678cf1e1b588a2bc025b37cf94bda446e256640a9a1114f710b242dad9839767fb3570d593f8da7a31b39b92bf5acb6a5629e074513995e7 SHA512 f7edec4c2cd0f72291045c0096d198bff49bf892f5c5f7bf772f104613295e7522e96cccb89261c0ac035b0265c9574c14758359ab84c47180095630cf60802a
-EBUILD ima-evm-utils-0.2.ebuild 648 BLAKE2B 0adf4addc331065e8ee18e7e3f541d4377ebb8a49d5bec184211fac0a59f5ef1c69435ccc36c38b3bd40eba80d63aa68d016db8ee7c1b43cf1aec9321782dfa6 SHA512 c0b554baba358548e12cb82375c6b0bebfebfcfffce553e5d0efac779a2ec498d355e39377b3ff56cf9f2ac0896ad10db433dd9fe8e006741fe6d7d77a399eca
-EBUILD ima-evm-utils-0.8.ebuild 648 BLAKE2B 9a75d8548fbb18a0b7d830c1d8815024dd7c9791da50182ad926da8b8b57b69de883f3d8746566224f59f041d937e6f418619d856a81d9de58d472eb8ebc27f7 SHA512 041926b0b5f24446810ae458d8d3f63130fb2b1a87f35e00962191e4c4ae5d8b51608fd0f0980601f6b858ecdf5b97364b0846d9a722846e13115f50f0257539
-EBUILD ima-evm-utils-1.0.ebuild 701 BLAKE2B f54badac76413e9eb3c05f832d8907d88dbd933f866992362dd9a1501bf3385243638d90620014271ae0e3953d9f7d38e98931c3f2bd5fab1ae786961a8d738b SHA512 8770aad2f0d0a60058a91d28214264fc1256d2945c2dcec4894de2fa067d764b37bd7be2f6278a889681d9b2c4419e47074b5126888e2d30b32693365c191a31
-EBUILD ima-evm-utils-9999.ebuild 715 BLAKE2B c4801b96be72fc7852b5977c294ab8ac4583bfd20b36e49748d47d0ccfab47531b3a762b2a27c7ab3132ac8b863965a02bdd9a6ea4012d5090f57cb8809e5172 SHA512 312b5ad08de34c00f77d7db17d80eaa482c35a3079c09baa851a31423882734657556e908f3f9996770dcef4dd809eea5383370e91dc5419a6980001d7bcaea0
+AUX ima-evm-utils-1.1-configure-use-sys-xattr-bug-649790.patch 1332 BLAKE2B 1787a1f7154843123c1b4879f2e159ffef5ed8edb64a34ba84c5cbc71b1bdf34db63686e26f44554da67731ed857ca399219a1e7b36ca1630bac0705be56d2de SHA512 02642544797076d3c1568b11cc8edb303d844a2b9d9088af80f3bf7135da25635cbf7ce67387d9c51365466fc60942254773854fb9eff5562e2c7fff88d5a42f
+DIST ima-evm-utils-1.1.tar.gz 37825 BLAKE2B 469f5bbc194f3fcc8996f252d01745c0d8d4d4f63476174622ea4569c97978db478bd522ae4672819c5ef995f2bb524eb857e5bf5c303131959f2f5cb9c2ebcc SHA512 fc7efc890812233db888eef210dc4357bee838b56fd95efd9a9e141d684b0b354670a3c053dd93a94a1402dd826074d4a83a4637c8e6c1d90ead3132354a5776
+EBUILD ima-evm-utils-1.1.ebuild 836 BLAKE2B 94236b3ebb2ec2d6e55b80f75bf54fa7a791b029c6654e05b3dc35640674d970eab5c7787d5bb498530177e56f6fbaa35dc4db9b62b2f28c799addddf075e049 SHA512 ad8a26e72fe4c6fc397ee3759e3e871c3ebc205039eede0a35b30864bed13c40b18c0f757ea34ee21b39900de67c258e1b4449cbe3be0c41aa22b5d94bd69f89
+EBUILD ima-evm-utils-9999.ebuild 752 BLAKE2B 18d7254fcca0e871b94aaaacb81ac853dcf8057d1e8a7bb3bbdf93eab20778bc070ad63505db8c54eb86fb82c586498acd2c9c2e87402d39e1696196831e8f7a SHA512 a12c00b393809e0a0c9b76dbfe83c83a62f98743c67afe4a82fa3350f5df0b4d036982a1d503a81ee22660622945ec5070c01a1903e3f948e833266bb705704b
 MISC metadata.xml 519 BLAKE2B a421147d697524cfafe22995d14069d21eec1e0b134aee40ac014d9be716608800c6096c50d20ad9c77da00a10123b8900ae7eeb50997ab4cc9f136d4217d719 SHA512 d207f51e8723c1c36f4b6bdbf514977004da3af6e0ba1e1425b9cf3155562beaca233153549fb6e9007c6608bea180215a6918c484438ea31522a15aa00dd258
diff --git a/app-crypt/ima-evm-utils/files/ima-evm-utils-1.1-configure-use-sys-xattr-bug-649790.patch b/app-crypt/ima-evm-utils/files/ima-evm-utils-1.1-configure-use-sys-xattr-bug-649790.patch
new file mode 100644
index 000000000000..1a8a327ba87c
--- /dev/null
+++ b/app-crypt/ima-evm-utils/files/ima-evm-utils-1.1-configure-use-sys-xattr-bug-649790.patch
@@ -0,0 +1,41 @@
+From 18566f4cd3601109fe0e64d1230e9afa4813bc54 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Tue, 15 May 2018 13:23:55 +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/evmctl.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0497eb7..1f017e2 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -30,7 +30,7 @@ AC_SUBST(OPENSSL_LIBS)
+ AC_CHECK_HEADER(unistd.h)
+ AC_CHECK_HEADERS(openssl/conf.h)
+ 
+-AC_CHECK_HEADERS(attr/xattr.h, , [AC_MSG_ERROR([attr/xattr.h header not found. You need the libattr development package.])])
++AC_CHECK_HEADERS(sys/xattr.h, , [AC_MSG_ERROR([sys/xattr.h header not found.])])
+ AC_CHECK_HEADERS(keyutils.h, , [AC_MSG_ERROR([keyutils.h header not found. You need the libkeyutils development package.])])
+ 
+ #debug support - yes for a while
+diff --git a/src/evmctl.c b/src/evmctl.c
+index 2ffee78..3fbcd33 100644
+--- a/src/evmctl.c
++++ b/src/evmctl.c
+@@ -49,7 +49,7 @@
+ #include <stdint.h>
+ #include <string.h>
+ #include <dirent.h>
+-#include <attr/xattr.h>
++#include <sys/xattr.h>
+ #include <linux/xattr.h>
+ #include <getopt.h>
+ #include <keyutils.h>
+-- 
+2.17.0
+
diff --git a/app-crypt/ima-evm-utils/ima-evm-utils-0.2.ebuild b/app-crypt/ima-evm-utils/ima-evm-utils-0.2.ebuild
deleted file mode 100644
index 5f3ac2d1c0bb..000000000000
--- a/app-crypt/ima-evm-utils/ima-evm-utils-0.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils autotools
-
-DESCRIPTION="Supporting tools for IMA and EVM"
-HOMEPAGE="http://linux-ima.sourceforge.net"
-SRC_URI="mirror://sourceforge/linux-ima/${P}.tar.gz"
-
-DEPEND="sys-apps/keyutils"
-RDEPEND="${DEPEND}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_prepare() {
-	sed -i 's:pkglib_PROGRAMS:pkglibexec_PROGRAMS:g' tests/Makefile.am
-	sed -i 's:pkglib_SCRIPTS:pkglibexec_SCRIPTS:g' tests/Makefile.am
-	eautoreconf
-}
-
-src_configure() {
-	econf || die
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-}
diff --git a/app-crypt/ima-evm-utils/ima-evm-utils-0.8.ebuild b/app-crypt/ima-evm-utils/ima-evm-utils-0.8.ebuild
deleted file mode 100644
index 94811723d9db..000000000000
--- a/app-crypt/ima-evm-utils/ima-evm-utils-0.8.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils autotools
-
-DESCRIPTION="Supporting tools for IMA and EVM"
-HOMEPAGE="http://linux-ima.sourceforge.net"
-SRC_URI="mirror://sourceforge/linux-ima/${P}.tar.gz"
-
-DEPEND="sys-apps/keyutils"
-RDEPEND="${DEPEND}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_prepare() {
-	sed -i 's:pkglib_PROGRAMS:pkglibexec_PROGRAMS:g' tests/Makefile.am
-	sed -i 's:pkglib_SCRIPTS:pkglibexec_SCRIPTS:g' tests/Makefile.am
-	eautoreconf
-}
-
-src_configure() {
-	econf || die
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-}
diff --git a/app-crypt/ima-evm-utils/ima-evm-utils-1.0.ebuild b/app-crypt/ima-evm-utils/ima-evm-utils-1.1.ebuild
index 3a4552f1e3c9..35ae3638a988 100644
--- a/app-crypt/ima-evm-utils/ima-evm-utils-1.0.ebuild
+++ b/app-crypt/ima-evm-utils/ima-evm-utils-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,17 +9,25 @@ DESCRIPTION="Supporting tools for IMA and EVM"
 HOMEPAGE="http://linux-ima.sourceforge.net"
 SRC_URI="mirror://sourceforge/linux-ima/${P}.tar.gz"
 
-RDEPEND="sys-apps/keyutils"
+RDEPEND="
+	dev-libs/openssl:0=
+	sys-apps/keyutils"
 DEPEND="${RDEPEND}
-	app-text/docbook-xsl-stylesheets"
+	app-text/asciidoc
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1-configure-use-sys-xattr-bug-649790.patch"
+)
+
 src_prepare() {
-	eapply_user
+	default
 
 	sed -i '/^MANPAGE_DOCBOOK_XSL/s:/usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl:/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl:' Makefile.am || die
 
diff --git a/app-crypt/ima-evm-utils/ima-evm-utils-9999.ebuild b/app-crypt/ima-evm-utils/ima-evm-utils-9999.ebuild
index 6252285e3f18..4d21524b6744 100644
--- a/app-crypt/ima-evm-utils/ima-evm-utils-9999.ebuild
+++ b/app-crypt/ima-evm-utils/ima-evm-utils-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,9 @@ RDEPEND="
 	dev-libs/openssl:0=
 	sys-apps/keyutils"
 DEPEND="${RDEPEND}
-	app-text/docbook-xsl-stylesheets"
+	app-text/asciidoc
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt"
 
 LICENSE="GPL-2"
 SLOT="0"