gentoo resync : 30.12.2017

4 files changed, 4 insertions, 66 deletions

diff --git a/app-admin/cronolog/Manifest b/app-admin/cronolog/Manifest
index 89dafd11a403..f295cfda33bc 100644
--- a/app-admin/cronolog/Manifest
+++ b/app-admin/cronolog/Manifest
@@ -8,7 +8,5 @@ AUX 1.6.2-patches/cronolog-sigusr1.patch 1154 BLAKE2B a5506f1252a18eeb805c8703ba
 AUX 1.6.2-patches/cronolog-strftime.patch 435 BLAKE2B a4f817a743df2a1193609bb16e9d82ab932875bfe7e34c90af3289be8b01783ce7da9a8c8c9ee55d2db413e20efd264707de11b6669f5fd32445f8508a18aeda SHA512 8c226b70c7b026ce5e7400798d0e2016ed984df04bd66b6a2358ce445323be930b5f7951b879545c8f075761cc2b5062f9ccc4b759f2e586a4c8943efa4ee914
 AUX cronolog-1.6.2-umask.patch 2366 BLAKE2B 84134bf197929689edcb95605c89732175004771b8cbe0b7de84b7608444e1b37b447d3f37c5db3645c22d74a6e62d150a85cdb4d6487f92d32632d6646ef2ce SHA512 da3f7d84ce365edce396bc43ec9b469973301c6a28f3eb56b7f019dcb65fb7ceec981f92c1382542d01e4b6e49e32ff4fe283aed9dbc7bb30c6780775acf39b3
 DIST cronolog-1.6.2.tar.gz 133591 BLAKE2B 5a78d0136a834849c6f9fc9f41341808295fe38919ac795d5329c46f353b5fadebc5819031a07c2c2a780d54957d16edb9e8935e15a2ed77eb13a2d6c7d2832d SHA512 786135aaa1359605840effb9a755c500970098ca32c1c4976c62f9d7481d24cecefe223ce8dcc34a139427259a6f3ba1c435c700a72ee07ed68ffc7f2d36e4ea
-EBUILD cronolog-1.6.2-r3.ebuild 551 BLAKE2B 3a53e3eb62e1c8b4612e62ee9545e9c7b5016829c3e88ae9ea3250e34a2e54deb88334c6a74b422900428baff3bbf4d3c787e56ab5ea5230d4b43526357f6a3c SHA512 7d59570fa6a7346bc97acd36f9f30d4433929541bae8afe97ef7c2db2fa04bd2c11d63c750a41793edcbdf6d59456db890c48d07151d897cc5d160f7d5fa11d0
-EBUILD cronolog-1.6.2-r4.ebuild 636 BLAKE2B c8f1b0278cf994a3eaedfc7a833524da2fc2339513b34bc16d307dbb5edff56e1879976e521c7fb092237e74da323403d4438610d8ebb438c1e14fbe7d7fb135 SHA512 0b15fad256c0b3c2687aac00da048f3fb03ad35ecb307afa53c4f4d455f9c3930fc29a07f016151ea5296b6a1e0b74fb9e48de72d2f94f87e2a13d5e9cabb119
-EBUILD cronolog-1.6.2-r5.ebuild 610 BLAKE2B f4dd15b6046f4fcc95cbd5a164d934ca2ee3361975d84ecbc00f979302cff30ce9e9a50353d6a927ad90b9c4fea7692c95c67fd012345322d6ff98bed819a1f6 SHA512 c24343e2e09355cfe3b335583d13504a679a9f9cc2ffde0bb1fb2e30b86061b5d976bb5a275a48be2988f5b7a5667471f86a43a95bc457a1c86dadb716cdbd03
+EBUILD cronolog-1.6.2-r5.ebuild 539 BLAKE2B d1ce1f7f0e51a85ff4b36fcfbbe270a473d4a6b896e8cffc98e4ff5caf41e42dc3f621303cbab8d5859c2b7f20bc0de0ed83e07304dff2dcdc6c05138da54e3a SHA512 3fbac862e8f8410d5dc69c4efc134838f3070a8b255f655b681a303506ff1ea5d65b532ea12ef543dae1e1edc907e32d32c502c28000f2d29466997b05fc7618
 MISC metadata.xml 719 BLAKE2B aeabc972c2347a9a39d7073165aeebb1b307f81c52db0e294405e10cf903b4058a0d2fbab64cc4f81b1013c6b39fe1ceead0725b32ee9bfee1fa9e307499deee SHA512 d5b5452b8105d8273328ee8ab1c95674686a00862a578f8171c4799791ceb131ac0204693a3d65ce6136d9cbea114f7f899a85669bde9b76b8c8e800a4c4c75f
diff --git a/app-admin/cronolog/cronolog-1.6.2-r3.ebuild b/app-admin/cronolog/cronolog-1.6.2-r3.ebuild
deleted file mode 100644
index d3dd66369235..000000000000
--- a/app-admin/cronolog/cronolog-1.6.2-r3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils autotools
-
-DESCRIPTION="Cronolog apache logfile rotator"
-HOMEPAGE="http://cronolog.org/"
-SRC_URI="http://cronolog.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2+ Apache-1.0"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PV}-patches/*.patch
-
-	eautoreconf
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
-}
diff --git a/app-admin/cronolog/cronolog-1.6.2-r4.ebuild b/app-admin/cronolog/cronolog-1.6.2-r4.ebuild
deleted file mode 100644
index 3c603c959591..000000000000
--- a/app-admin/cronolog/cronolog-1.6.2-r4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils autotools
-
-DESCRIPTION="Cronolog apache logfile rotator"
-HOMEPAGE="http://cronolog.org/"
-SRC_URI="http://cronolog.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2+ Apache-1.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
-IUSE=""
-
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PV}-patches/*.patch
-	# patch written for infra usage
-	epatch "${FILESDIR}"/${PN}-1.6.2-umask.patch
-
-	eautoreconf
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
-}
diff --git a/app-admin/cronolog/cronolog-1.6.2-r5.ebuild b/app-admin/cronolog/cronolog-1.6.2-r5.ebuild
index ca4ce0c7003d..f8b32bd5968e 100644
--- a/app-admin/cronolog/cronolog-1.6.2-r5.ebuild
+++ b/app-admin/cronolog/cronolog-1.6.2-r5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit eutils autotools
+inherit autotools
 
 DESCRIPTION="Log rotation software"
 HOMEPAGE="https://github.com/fordmason/cronolog"
@@ -11,7 +11,7 @@ SRC_URI="http://cronolog.org/download/${P}.tar.gz"
 
 LICENSE="GPL-2+ Apache-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ppc x86"
 
 PATCHES=(
 	"${FILESDIR}"/${PV}-patches
@@ -19,10 +19,8 @@ PATCHES=(
 	"${FILESDIR}"/${P}-umask.patch
 )
 
-DOCS=( AUTHORS ChangeLog INSTALL NEWS README TODO )
-
 src_prepare() {
 	default
-	mv configure.in configure.ac || die
+	mv configure.{in,ac} || die
 	eautoreconf
 }