From 68f375c77ece56bab9a0964b5891a04edc5acfdb Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ulrich=20M=C3=BCller?= Date: Sat, 25 Feb 2017 11:01:56 +0100 Subject: [PATCH] app-admin/cronolog: Move patch files to sane names. Renaming to *.patch so we can call eapply with the directory. Package-Manager: Portage-2.3.3, Repoman-2.3.1 --- app-admin/cronolog/cronolog-1.6.2-r3.ebuild | 4 ++-- app-admin/cronolog/cronolog-1.6.2-r4.ebuild | 4 ++-- app-admin/cronolog/cronolog-1.6.2-r5.ebuild | 11 +++-------- ...ptime.patch.txt => cronolog-define-strptime.patch} | 0 .../{cronolog-doc.patch.txt => cronolog-doc.patch} | 0 ...topt-long.patch.txt => cronolog-getopt-long.patch} | 0 ...large-file-patch.txt => cronolog-large-file.patch} | 0 ...mlink-patch.txt => cronolog-missing-symlink.patch} | 0 ...nolog-setugid-patch.txt => cronolog-setugid.patch} | 0 ...nolog-sigusr1-patch.txt => cronolog-sigusr1.patch} | 0 ...log-strftime-patch.txt => cronolog-strftime.patch} | 0 11 files changed, 7 insertions(+), 12 deletions(-) rename app-admin/cronolog/files/1.6.2-patches/{cronolog-define-strptime.patch.txt => cronolog-define-strptime.patch} (100%) rename app-admin/cronolog/files/1.6.2-patches/{cronolog-doc.patch.txt => cronolog-doc.patch} (100%) rename app-admin/cronolog/files/1.6.2-patches/{cronolog-getopt-long.patch.txt => cronolog-getopt-long.patch} (100%) rename app-admin/cronolog/files/1.6.2-patches/{cronolog-large-file-patch.txt => cronolog-large-file.patch} (100%) rename app-admin/cronolog/files/1.6.2-patches/{cronolog-missing-symlink-patch.txt => cronolog-missing-symlink.patch} (100%) rename app-admin/cronolog/files/1.6.2-patches/{cronolog-setugid-patch.txt => cronolog-setugid.patch} (100%) rename app-admin/cronolog/files/1.6.2-patches/{cronolog-sigusr1-patch.txt => cronolog-sigusr1.patch} (100%) rename app-admin/cronolog/files/1.6.2-patches/{cronolog-strftime-patch.txt => cronolog-strftime.patch} (100%) 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 similarity index 100% rename from app-admin/cronolog/files/1.6.2-patches/cronolog-define-strptime.patch.txt rename to 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 similarity index 100% rename from app-admin/cronolog/files/1.6.2-patches/cronolog-doc.patch.txt rename to 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 similarity index 100% rename from app-admin/cronolog/files/1.6.2-patches/cronolog-getopt-long.patch.txt rename to 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 similarity index 100% rename from app-admin/cronolog/files/1.6.2-patches/cronolog-large-file-patch.txt rename to 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 similarity index 100% rename from app-admin/cronolog/files/1.6.2-patches/cronolog-missing-symlink-patch.txt rename to 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 similarity index 100% rename from app-admin/cronolog/files/1.6.2-patches/cronolog-setugid-patch.txt rename to 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 similarity index 100% rename from app-admin/cronolog/files/1.6.2-patches/cronolog-sigusr1-patch.txt rename to 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 similarity index 100% rename from app-admin/cronolog/files/1.6.2-patches/cronolog-strftime-patch.txt rename to app-admin/cronolog/files/1.6.2-patches/cronolog-strftime.patch -- 2.26.2