gentoo resync : 30.12.2017

3 files changed, 15 insertions, 39 deletions

diff --git a/app-admin/xtail/Manifest b/app-admin/xtail/Manifest
index aef0a6c0c9f1..7012fc47fa8c 100644
--- a/app-admin/xtail/Manifest
+++ b/app-admin/xtail/Manifest
@@ -1,5 +1,4 @@
 DIST 20120219-patch-aalto.zip 4991 BLAKE2B 6b3e228508bb12c1e18f3d2982c1bf23c996e1be231b4b08b640a310f9c5e9642b9f6ea25d45c717902cdf1024509fca6d804f8e64d3bb764eac8bc3e9bd0846 SHA512 ae20448944e25aa04879bdab8d61bd910b1aa6f85c3d8287e712c6d37b1154af480edc6569467e31b3b404d7f90f771ec3e4c20c58132d9125303b40a6f102f2
 DIST xtail-2.1.tar.gz 26769 BLAKE2B 9a5c47810b2a8cd7aa4d8cc543ec9edce7a24ee446627f658063547276a43dfb72503f10c4d2d6a35f25415a32a2aa177dc5fde79e8ed834cf8ade5aaf9fb447 SHA512 a8519969ef960af97c4dcb75c679daa5687f553c909817ede1134dfa5d70ed71c5264f0e61c8c579cc253ccb7739a68c5213811169489a98e676ef8941d9446f
-EBUILD xtail-2.1-r1.ebuild 753 BLAKE2B 36cd2bd7302bc2866fce0ae4589d0b8b45c0beca1d7bacc035465d1b38c5ce195265b70ab6f53a46e17fb1dfbf206f89d2ce09166837cb496e532e5c55126637 SHA512 f238d06a5039d06dd361681eba12a420cba02886e0b78fedba469b4b9a680876fc1c647fc3fb7d4e77aa5e8b02628d7d486f21f556c02211e90250218d4382ef
-EBUILD xtail-2.1.ebuild 498 BLAKE2B 1757afd09ad71f48b4d55c587903e6303668e197ebbce6c7021e7beb4110f6faf6acd576648d2ab3351594af433ff76ecf1961ba9855701ce12c452c4ac7f039 SHA512 5e94c8561c2f633cf07d5f144029562c99084fa905f49ab1f3c0292bcf945506fb1f1c95ee63aa785ce9809583661743cd104ae2018e7e27c316fc353db2cfac
+EBUILD xtail-2.1-r1.ebuild 755 BLAKE2B 31ca3dd7ee5ebeb9fbcb28be16bf5d127b4ebe813b6988a1a0c4b5e752cadd2a3f8710640db0627d7d5cc33c82ace85191b1de32d8865fef0c737a92fe020e19 SHA512 190a8e7362c30ba5d1d53048859c64194db7e40d8a4fc1bab9e061ba8747524d9b1e9f0b07b80a63d0f6b0504e8666c89a28b53c07be884a0c67f76d88722c10
 MISC metadata.xml 437 BLAKE2B fb96dc20e1001cb139100ee255eb2fc628eb4e8b17d4f665bebce18c2ecac3aa7b965254dc8052fec2b783dee37296c6837f4e0f60a2e038b62e1e80840d381c SHA512 473485579b4adafbd9f25cfb9e301e08c6c92d145c8028f3860962ee37be59491686bd413c744674a5a91345d398afa7ada96e96ea5af9200e7cfde38b10f7e1
diff --git a/app-admin/xtail/xtail-2.1-r1.ebuild b/app-admin/xtail/xtail-2.1-r1.ebuild
index 9506b3e7e06c..9f010062d31f 100644
--- a/app-admin/xtail/xtail-2.1-r1.ebuild
+++ b/app-admin/xtail/xtail-2.1-r1.ebuild
@@ -1,30 +1,32 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=6
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Tail multiple logfiles at once, even if rotated"
 HOMEPAGE="http://www.unicom.com/sw/xtail/"
-SRC_URI="http://www.unicom.com/sw/xtail/${P}.tar.gz
+SRC_URI="
+	http://www.unicom.com/sw/xtail/${P}.tar.gz
 	http://www.unicom.com/files/20120219-patch-aalto.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
+KEYWORDS="amd64 ppc sparc x86"
 IUSE=""
+
 DEPEND="app-arch/unzip"
 
-src_prepare() {
-	epatch ../0001-Use-ISO8601-Fix-Gcc-header-Use-C-c.patch
-	epatch ../0001-xtail.1-remove-SIGQUIT.patch
-	epatch ../xtail_2.1-5-debian-local-changes.patch
-}
+PATCHES=(
+	"${WORKDIR}"/0001-Use-ISO8601-Fix-Gcc-header-Use-C-c.patch
+	"${WORKDIR}"/0001-xtail.1-remove-SIGQUIT.patch
+	"${WORKDIR}"/xtail_2.1-5-debian-local-changes.patch
+)
 
-src_compile() {
+src_configure() {
 	tc-export CC
-	emake
+	default
 }
 
 src_install() {
diff --git a/app-admin/xtail/xtail-2.1.ebuild b/app-admin/xtail/xtail-2.1.ebuild
deleted file mode 100644
index 656f0b7240e3..000000000000
--- a/app-admin/xtail/xtail-2.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit toolchain-funcs
-
-DESCRIPTION="Tail multiple logfiles at once, even if rotated"
-HOMEPAGE="http://www.unicom.com/sw/xtail/"
-SRC_URI="http://www.unicom.com/sw/xtail/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
-
-src_compile() {
-	tc-export CC
-	emake || die "emake failed"
-}
-
-src_install() {
-	dobin xtail || die
-	doman xtail.1 || die
-	dodoc README
-}