11 files changed, 7 insertions, 12 deletions
diff --git a/app-admin/cronolog/cronolog-1.6.2-r3.ebuild b/app-admin/cronolog/cronolog-1.6.2-r3.ebuild
index 92a71342abc7..c62702b0e301 100644
--- a/app-admin/cronolog/cronolog-1.6.2-r3.ebuild
+++ b/app-admin/cronolog/cronolog-1.6.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -18,7 +18,7 @@ RDEPEND=""
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${PV}-patches/*.txt
+	epatch "${FILESDIR}"/${PV}-patches/*.patch
 
 	eautoreconf
 }
diff --git a/app-admin/cronolog/cronolog-1.6.2-r4.ebuild b/app-admin/cronolog/cronolog-1.6.2-r4.ebuild
index a278eb2f8fad..be5ecb3fa8c5 100644
--- a/app-admin/cronolog/cronolog-1.6.2-r4.ebuild
+++ b/app-admin/cronolog/cronolog-1.6.2-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -18,7 +18,7 @@ RDEPEND=""
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${PV}-patches/*.txt
+	epatch "${FILESDIR}"/${PV}-patches/*.patch
 	# patch written for infra usage
 	epatch "${FILESDIR}"/${PN}-1.6.2-umask.patch
 
diff --git a/app-admin/cronolog/cronolog-1.6.2-r5.ebuild b/app-admin/cronolog/cronolog-1.6.2-r5.ebuild
index 690148fc1adf..fb89cc95fc7b 100644
--- a/app-admin/cronolog/cronolog-1.6.2-r5.ebuild
+++ b/app-admin/cronolog/cronolog-1.6.2-r5.ebuild
@@ -15,14 +15,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~x86"
 
 PATCHES=(
-	"${FILESDIR}"/${PV}-patches/${PN}-define-strptime.patch.txt
-	"${FILESDIR}"/${PV}-patches/${PN}-doc.patch.txt
-	"${FILESDIR}"/${PV}-patches/${PN}-getopt-long.patch.txt
-	"${FILESDIR}"/${PV}-patches/${PN}-large-file-patch.txt
-	"${FILESDIR}"/${PV}-patches/${PN}-missing-symlink-patch.txt
-	"${FILESDIR}"/${PV}-patches/${PN}-setugid-patch.txt
-	"${FILESDIR}"/${PV}-patches/${PN}-sigusr1-patch.txt
-	"${FILESDIR}"/${PV}-patches/${PN}-strftime-patch.txt
+	"${FILESDIR}"/${PV}-patches
+	# rename and move into ${PV}-patches after -r3 removal
 	"${FILESDIR}"/${P}-umask.patch
 )
 
@@ -30,5 +24,6 @@ DOCS=( AUTHORS ChangeLog INSTALL NEWS README TODO )
 
 src_prepare() {
 	default
+	mv configure.in configure.ac || die
 	eautoreconf
 }
diff --git a/app-admin/cronolog/files/1.6.2-patches/cronolog-define-strptime.patch.txt b/app-admin/cronolog/files/1.6.2-patches/cronolog-define-strptime.patch
index 26ac2a40319c..26ac2a40319c 100644
--- a/app-admin/cronolog/files/1.6.2-patches/cronolog-define-strptime.patch.txt
+++ b/app-admin/cronolog/files/1.6.2-patches/cronolog-define-strptime.patch
diff --git a/app-admin/cronolog/files/1.6.2-patches/cronolog-doc.patch.txt b/app-admin/cronolog/files/1.6.2-patches/cronolog-doc.patch
index b4b68d5690a9..b4b68d5690a9 100644
--- a/app-admin/cronolog/files/1.6.2-patches/cronolog-doc.patch.txt
+++ b/app-admin/cronolog/files/1.6.2-patches/cronolog-doc.patch
diff --git a/app-admin/cronolog/files/1.6.2-patches/cronolog-getopt-long.patch.txt b/app-admin/cronolog/files/1.6.2-patches/cronolog-getopt-long.patch
index b7eb5c1760c4..b7eb5c1760c4 100644
--- a/app-admin/cronolog/files/1.6.2-patches/cronolog-getopt-long.patch.txt
+++ b/app-admin/cronolog/files/1.6.2-patches/cronolog-getopt-long.patch
diff --git a/app-admin/cronolog/files/1.6.2-patches/cronolog-large-file-patch.txt b/app-admin/cronolog/files/1.6.2-patches/cronolog-large-file.patch
index 25e488f061c0..25e488f061c0 100644
--- a/app-admin/cronolog/files/1.6.2-patches/cronolog-large-file-patch.txt
+++ b/app-admin/cronolog/files/1.6.2-patches/cronolog-large-file.patch
diff --git a/app-admin/cronolog/files/1.6.2-patches/cronolog-missing-symlink-patch.txt b/app-admin/cronolog/files/1.6.2-patches/cronolog-missing-symlink.patch
index 974c69faa74a..974c69faa74a 100644
--- a/app-admin/cronolog/files/1.6.2-patches/cronolog-missing-symlink-patch.txt
+++ b/app-admin/cronolog/files/1.6.2-patches/cronolog-missing-symlink.patch
diff --git a/app-admin/cronolog/files/1.6.2-patches/cronolog-setugid-patch.txt b/app-admin/cronolog/files/1.6.2-patches/cronolog-setugid.patch
index 8fe4c0f12396..8fe4c0f12396 100644
--- a/app-admin/cronolog/files/1.6.2-patches/cronolog-setugid-patch.txt
+++ b/app-admin/cronolog/files/1.6.2-patches/cronolog-setugid.patch
diff --git a/app-admin/cronolog/files/1.6.2-patches/cronolog-sigusr1-patch.txt b/app-admin/cronolog/files/1.6.2-patches/cronolog-sigusr1.patch
index e7cc8be2c425..e7cc8be2c425 100644
--- a/app-admin/cronolog/files/1.6.2-patches/cronolog-sigusr1-patch.txt
+++ b/app-admin/cronolog/files/1.6.2-patches/cronolog-sigusr1.patch
diff --git a/app-admin/cronolog/files/1.6.2-patches/cronolog-strftime-patch.txt b/app-admin/cronolog/files/1.6.2-patches/cronolog-strftime.patch
index 12d561776f8c..12d561776f8c 100644
--- a/app-admin/cronolog/files/1.6.2-patches/cronolog-strftime-patch.txt
+++ b/app-admin/cronolog/files/1.6.2-patches/cronolog-strftime.patch