gentoo resync : 16.02.1018

4 files changed, 3 insertions, 114 deletions

diff --git a/sys-apps/miller/Manifest b/sys-apps/miller/Manifest
index 0de104e2917d..05a79a3330f9 100644
--- a/sys-apps/miller/Manifest
+++ b/sys-apps/miller/Manifest
@@ -1,7 +1,3 @@
-DIST miller-4.2.0.tar.gz 3373505 BLAKE2B 5051f310a70ad151aa8fd80dd4b885e78561dfb1fd14fa3a49ffb9928ce55acb59220b2b122b798256a0d258fbe4216470cdf8aec37be2fd26ac5ecb1f80e982 SHA512 f176dc2ce4e733ac1e4e331f17554d4ed089344a5f571bcc9d4b3b227f6c950fa0355f1a5b934e4f9467d9a22448e2842c586a4e6c424a98ec89170cd70b1714
-DIST miller-5.2.2.tar.gz 5024653 BLAKE2B c13b6fb03404ae93f436997510aaaced2e11616b42fe132b9a267b1e71c2b7ada5bd310a20bd0bbd50ca6edaac915ebd68885ef4de1558aea63d9753b9f69125 SHA512 64ab35db6382cd9bf819249a57b88a142fccf7d6facdc6b9fdf3005b82bb2567f57b64d52a29b5f9d44c941974803339eb4a34c6648fdde2c82cc7c2f98e727c
 DIST miller-5.3.0.tar.gz 4940072 BLAKE2B 2e34ae010d409877040a60b08dd615f32e6945ca3bf97c078c89b9d2811067fa4bca2403f8ad239f8245e050acb10305d351b1db4177541a4fa9ed9a4bc1396c SHA512 4c557d97eb1cda2e52093fa097677602491895dea3093776a03af56114022b8c0917df9fbf26071d4d1a3c1360f520c82e33b32635c7b4207fa62869ab564712
-EBUILD miller-4.2.0.ebuild 1244 BLAKE2B 9912b82b168fafc00541b7715895060c62bf1279d551006784b07c4231d61e2a287f6b2705ed6c2e72edb975105f1be9a3bf4979d07a1cff885420af5debf3fa SHA512 16f983250db1ecd7a417ce37a95a623f3113ec155c896d0b95604a1414872d7b575ae913de1209b592bf2bcf74d0274a7c29d560891a9f6f84665c4baa8c684e
-EBUILD miller-5.2.2.ebuild 1022 BLAKE2B b3b03253ad56d663729fa7bda4d832f367586f7655b02bb78fe36b932cb18972109d55f49ae67fafb16b2a5a69a5d580fbdfe745e251675538a3205c5741437c SHA512 d04cbecb30b102a9ea39dfbd56f9992926d183ab8935a6c4efd89e20597afb378e5c2ece2a0a9ebd1f337525a57e434bda1c7383ed8559dd4fe8c53f3e47a08f
-EBUILD miller-5.3.0.ebuild 1022 BLAKE2B b3b03253ad56d663729fa7bda4d832f367586f7655b02bb78fe36b932cb18972109d55f49ae67fafb16b2a5a69a5d580fbdfe745e251675538a3205c5741437c SHA512 d04cbecb30b102a9ea39dfbd56f9992926d183ab8935a6c4efd89e20597afb378e5c2ece2a0a9ebd1f337525a57e434bda1c7383ed8559dd4fe8c53f3e47a08f
+EBUILD miller-5.3.0.ebuild 1016 BLAKE2B fbbfdfc552c7f119da4681db84efceaaefe13f56a4976e496e5667329da23ff9bb3ccd57af8a64446293dc522d270832978ee821c95bd36c88b05cc2dd227792 SHA512 34eba5b23e58d594551bb3c3f88875be5ab925ac5c19f6f5e72085d461bfcb40d5c13a4a76ab27cc4cde4b28a85904405da3ecd8ed08f983a369dc69b6ce1657
 MISC metadata.xml 245 BLAKE2B 183034a40812aee01ddfd5d59eac1d2d1d42d281575fd5a3c900bd96af21cad81f9262b41f81c39f34dc60078ffa3db70149f8d50ecb09cb6003ed8602ab3ecd SHA512 b7b2cb8f6f35a36afa6a90e1d66747c2bc3e26a202483ec1d5c32346e75a738ee59be158af291a18c55140486d519c159492d12e3d25134ec20cc03fd7627cad
diff --git a/sys-apps/miller/miller-4.2.0.ebuild b/sys-apps/miller/miller-4.2.0.ebuild
deleted file mode 100644
index f0f66106e3db..000000000000
--- a/sys-apps/miller/miller-4.2.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="A tool like sed, awk, cut, join, and sort for name-indexed data (CSV, JSON, ..)"
-HOMEPAGE="https://johnkerl.org/miller/doc/index.html"
-LICENSE="BSD-2"
-
-SLOT="0"
-SRC_URI="https://github.com/johnkerl/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="amd64 arm x86"
-IUSE="doc test"
-
-DEPEND="sys-devel/flex"
-
-my_for_each_test_dir() {
-	local test_dirs=( c/{reg,unit}_test )
-	if use test ; then
-		for d in "${test_dirs[@]}" ; do
-			pushd "${d}" >/dev/null || die
-			"${@}" || die
-			popd >/dev/null || die
-		done
-	fi
-}
-
-src_prepare() {
-	default
-
-	local sed_args=(
-		# respect FLAGS
-		-e '/.*FLAGS[^=]*=/ s:(-g|-pg|-O[0-9]) ::g'
-	)
-	find -type f -name "Makefile.am" | xargs sed -r "${sed_args[@]}" -i --
-	assert
-
-	# disable docs rebuilding as they're shipped prebuilt
-	sed -e '/SUBDIRS[^=]*=/ s:doc::g' -i -- Makefile.am || die
-
-	# disable building tests automagically
-	use test || sed -e '/SUBDIRS[^=]*=/ s:[^ ]*_test::g' -i -- c/Makefile.am || die
-
-	eautoreconf
-}
-
-src_test() {
-	my_for_each_test_dir emake check
-}
-
-src_install() {
-	local HTML_DOCS=( $(usev doc) )
-
-	default
-
-	doman 'doc/mlr.1'
-}
diff --git a/sys-apps/miller/miller-5.2.2.ebuild b/sys-apps/miller/miller-5.2.2.ebuild
deleted file mode 100644
index fc4af1f10878..000000000000
--- a/sys-apps/miller/miller-5.2.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="A tool like sed, awk, cut, join, and sort for name-indexed data (CSV, JSON, ..)"
-HOMEPAGE="https://johnkerl.org/miller/doc/index.html"
-SRC_URI="https://github.com/johnkerl/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc test"
-
-DEPEND="sys-devel/flex"
-
-src_prepare() {
-	default
-
-	# respect flags
-	find -type f -name "Makefile.am" -exec sed -i -r -e '/.*FLAGS[^=]*=/ s:(-g|-pg|-O[0-9]) ::g' -- {} \; || die
-
-	# disable docs rebuilding as they're shipped prebuilt
-	sed -e '/SUBDIRS[^=]*=/ s:doc::g' -i -- Makefile.am || die
-
-	# disable building tests automagically
-	if ! use test; then
-		sed -e '/SUBDIRS[^=]*=/ s:[^ ]*_test::g' -i -- c/Makefile.am || die
-	fi
-
-	eautoreconf
-}
-
-src_test() {
-	emake -C c/reg_test
-	emake -C c/unit_test
-}
-
-src_install() {
-	local HTML_DOCS=( $(usev doc) )
-
-	default
-
-	doman 'doc/mlr.1'
-}
diff --git a/sys-apps/miller/miller-5.3.0.ebuild b/sys-apps/miller/miller-5.3.0.ebuild
index fc4af1f10878..863789ce5ce6 100644
--- a/sys-apps/miller/miller-5.3.0.ebuild
+++ b/sys-apps/miller/miller-5.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/johnkerl/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 arm x86"
 IUSE="doc test"
 
 DEPEND="sys-devel/flex"