From 580f05ea8f512d11e23e8da80177d27835cbdbbc Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 22 Jan 2020 18:41:30 +0000
Subject: gentoo resync : 22.02.2020

---
 app-text/xmlstarlet/Manifest                |  2 +-
 app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild | 26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'app-text/xmlstarlet')

diff --git a/app-text/xmlstarlet/Manifest b/app-text/xmlstarlet/Manifest
index bd403653d478..1de420434259 100644
--- a/app-text/xmlstarlet/Manifest
+++ b/app-text/xmlstarlet/Manifest
@@ -1,3 +1,3 @@
 DIST xmlstarlet-1.6.1.tar.gz 420923 BLAKE2B 56bf29f62549a7445e3cf15b6a3f60558dbcacf96645c3acc5a45b432d61f47614274a5d3e7234399f7dbdb854b503d73a6cfb8989710b7363d743dce4dff8f0 SHA512 4228df812caec7059d7a76986c4d9a4262bd861cc53dca05f341ae6c062be05f1c39fc637918ab00f60f40587c6c556e3c9bfaf8a18b149e3c321a92214dbe8b
-EBUILD xmlstarlet-1.6.1.ebuild 933 BLAKE2B bd579b52641fb927084d915a1272b1f57f198a16f5f810f780c6e36e3667e1a62f2c1ba2fe7cd62740425457b22382b3a05edd4997616489e6dcea2f7f813c17 SHA512 9907ecd56ddc3e689799ffd69078957c240bb39ad502317733d9d021605d0b26e22f67ae511b1a3ce194d58fa5ef6aa95df7536046168c18eb73d976aaeb3bf9
+EBUILD xmlstarlet-1.6.1.ebuild 944 BLAKE2B 43de29f725e2cff8b62be3b68aaa43e8473bf5e3f50e2017c823b5fea45e44b41ef8a1fbce8e8bb5c48cf0927bb24d6903f2d4ac566f71c1349fbed3603abcbd SHA512 68e906d0da8fbd93ce2423e5794545ba2a18929ab991e90588384d465719ba2ff29605c271e55d93b47a31834741d4d1a5c501bd62df9f037e42bb4a77de3a49
 MISC metadata.xml 293 BLAKE2B 1e39cff7005653b64f2f27c49262c0ae492da15d33d361e5e9b4148a3e975db2b30e26468fe5cf7f61155f53a3f76a16121b8a4c85ae5420d0ec74885d33bba9 SHA512 9fd9f809f74a272cc9abb789f3e08ab9b2ecdd1f6ca3931f43567b3b2e3423c0622bd3cc52f5dceac6989282351400fe9c1554ec2b69439986902b11f589796d
diff --git a/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild b/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
index 96f6d174f1ce..48e432677af1 100644
--- a/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
+++ b/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="A set of tools to transform, query, validate, and edit XML documents"
 HOMEPAGE="http://xmlstar.sourceforge.net/"
@@ -10,30 +12,28 @@ SRC_URI="mirror://sourceforge/xmlstar/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
 
-RDEPEND=">=dev-libs/libxml2-2.6.27
-	>=dev-libs/libxslt-1.1.9
-	dev-libs/libgcrypt:0
+RDEPEND="
+	dev-libs/libxml2
+	dev-libs/libxslt
+	dev-libs/libgcrypt:0=
 	virtual/libiconv"
-
-DEPEND="${RDEPEND}
-	sys-apps/sed"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_configure() {
+	append-cppflags $($(tc-getPKG_CONFIG) --cflags libxml-2.0)
+
 	# NOTE: Fully built documentation is already shipped with the tarball:
 	# - doc/xmlstarlet-ug.{pdf,ps,html}
 	# - doc/xmlstarlet.txt
 	# - doc/xmlstarlet.1
 	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		--disable-build-docs \
-		--disable-static-libs \
-		--disable-silent-rules
+		--disable-static-libs
 }
 
 src_install() {
 	default
-
 	dosym xml /usr/bin/xmlstarlet
 }
-- 
cgit v1.2.3