| 1 |
commit: 68f375c77ece56bab9a0964b5891a04edc5acfdb |
| 2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Feb 25 10:01:56 2017 +0000 |
| 4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Feb 25 10:09:40 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68f375c7 |
| 7 |
|
| 8 |
app-admin/cronolog: Move patch files to sane names. |
| 9 |
|
| 10 |
Renaming to *.patch so we can call eapply with the directory. |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 13 |
|
| 14 |
app-admin/cronolog/cronolog-1.6.2-r3.ebuild | 4 ++-- |
| 15 |
app-admin/cronolog/cronolog-1.6.2-r4.ebuild | 4 ++-- |
| 16 |
app-admin/cronolog/cronolog-1.6.2-r5.ebuild | 11 +++-------- |
| 17 |
...fine-strptime.patch.txt => cronolog-define-strptime.patch} | 0 |
| 18 |
.../{cronolog-doc.patch.txt => cronolog-doc.patch} | 0 |
| 19 |
...nolog-getopt-long.patch.txt => cronolog-getopt-long.patch} | 0 |
| 20 |
...ronolog-large-file-patch.txt => cronolog-large-file.patch} | 0 |
| 21 |
...ssing-symlink-patch.txt => cronolog-missing-symlink.patch} | 0 |
| 22 |
.../{cronolog-setugid-patch.txt => cronolog-setugid.patch} | 0 |
| 23 |
.../{cronolog-sigusr1-patch.txt => cronolog-sigusr1.patch} | 0 |
| 24 |
.../{cronolog-strftime-patch.txt => cronolog-strftime.patch} | 0 |
| 25 |
11 files changed, 7 insertions(+), 12 deletions(-) |
| 26 |
|
| 27 |
diff --git a/app-admin/cronolog/cronolog-1.6.2-r3.ebuild b/app-admin/cronolog/cronolog-1.6.2-r3.ebuild |
| 28 |
index 92a71342ab..c62702b0e3 100644 |
| 29 |
--- a/app-admin/cronolog/cronolog-1.6.2-r3.ebuild |
| 30 |
+++ b/app-admin/cronolog/cronolog-1.6.2-r3.ebuild |
| 31 |
@@ -1,4 +1,4 @@ |
| 32 |
-# Copyright 1999-2009 Gentoo Foundation |
| 33 |
+# Copyright 1999-2017 Gentoo Foundation |
| 34 |
# Distributed under the terms of the GNU General Public License v2 |
| 35 |
# $Id$ |
| 36 |
|
| 37 |
@@ -18,7 +18,7 @@ RDEPEND="" |
| 38 |
src_unpack() { |
| 39 |
unpack ${A} |
| 40 |
cd "${S}" |
| 41 |
- epatch "${FILESDIR}"/${PV}-patches/*.txt |
| 42 |
+ epatch "${FILESDIR}"/${PV}-patches/*.patch |
| 43 |
|
| 44 |
eautoreconf |
| 45 |
} |
| 46 |
|
| 47 |
diff --git a/app-admin/cronolog/cronolog-1.6.2-r4.ebuild b/app-admin/cronolog/cronolog-1.6.2-r4.ebuild |
| 48 |
index a278eb2f8f..be5ecb3fa8 100644 |
| 49 |
--- a/app-admin/cronolog/cronolog-1.6.2-r4.ebuild |
| 50 |
+++ b/app-admin/cronolog/cronolog-1.6.2-r4.ebuild |
| 51 |
@@ -1,4 +1,4 @@ |
| 52 |
-# Copyright 1999-2012 Gentoo Foundation |
| 53 |
+# Copyright 1999-2017 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
# $Id$ |
| 56 |
|
| 57 |
@@ -18,7 +18,7 @@ RDEPEND="" |
| 58 |
src_unpack() { |
| 59 |
unpack ${A} |
| 60 |
cd "${S}" |
| 61 |
- epatch "${FILESDIR}"/${PV}-patches/*.txt |
| 62 |
+ epatch "${FILESDIR}"/${PV}-patches/*.patch |
| 63 |
# patch written for infra usage |
| 64 |
epatch "${FILESDIR}"/${PN}-1.6.2-umask.patch |
| 65 |
|
| 66 |
|
| 67 |
diff --git a/app-admin/cronolog/cronolog-1.6.2-r5.ebuild b/app-admin/cronolog/cronolog-1.6.2-r5.ebuild |
| 68 |
index 690148fc1a..fb89cc95fc 100644 |
| 69 |
--- a/app-admin/cronolog/cronolog-1.6.2-r5.ebuild |
| 70 |
+++ b/app-admin/cronolog/cronolog-1.6.2-r5.ebuild |
| 71 |
@@ -15,14 +15,8 @@ SLOT="0" |
| 72 |
KEYWORDS="~amd64 ~arm ~ppc ~x86" |
| 73 |
|
| 74 |
PATCHES=( |
| 75 |
- "${FILESDIR}"/${PV}-patches/${PN}-define-strptime.patch.txt |
| 76 |
- "${FILESDIR}"/${PV}-patches/${PN}-doc.patch.txt |
| 77 |
- "${FILESDIR}"/${PV}-patches/${PN}-getopt-long.patch.txt |
| 78 |
- "${FILESDIR}"/${PV}-patches/${PN}-large-file-patch.txt |
| 79 |
- "${FILESDIR}"/${PV}-patches/${PN}-missing-symlink-patch.txt |
| 80 |
- "${FILESDIR}"/${PV}-patches/${PN}-setugid-patch.txt |
| 81 |
- "${FILESDIR}"/${PV}-patches/${PN}-sigusr1-patch.txt |
| 82 |
- "${FILESDIR}"/${PV}-patches/${PN}-strftime-patch.txt |
| 83 |
+ "${FILESDIR}"/${PV}-patches |
| 84 |
+ # rename and move into ${PV}-patches after -r3 removal |
| 85 |
"${FILESDIR}"/${P}-umask.patch |
| 86 |
) |
| 87 |
|
| 88 |
@@ -30,5 +24,6 @@ DOCS=( AUTHORS ChangeLog INSTALL NEWS README TODO ) |
| 89 |
|
| 90 |
src_prepare() { |
| 91 |
default |
| 92 |
+ mv configure.in configure.ac || die |
| 93 |
eautoreconf |
| 94 |
} |
| 95 |
|
| 96 |
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 |
| 97 |
similarity index 100% |
| 98 |
rename from app-admin/cronolog/files/1.6.2-patches/cronolog-define-strptime.patch.txt |
| 99 |
rename to app-admin/cronolog/files/1.6.2-patches/cronolog-define-strptime.patch |
| 100 |
|
| 101 |
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 |
| 102 |
similarity index 100% |
| 103 |
rename from app-admin/cronolog/files/1.6.2-patches/cronolog-doc.patch.txt |
| 104 |
rename to app-admin/cronolog/files/1.6.2-patches/cronolog-doc.patch |
| 105 |
|
| 106 |
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 |
| 107 |
similarity index 100% |
| 108 |
rename from app-admin/cronolog/files/1.6.2-patches/cronolog-getopt-long.patch.txt |
| 109 |
rename to app-admin/cronolog/files/1.6.2-patches/cronolog-getopt-long.patch |
| 110 |
|
| 111 |
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 |
| 112 |
similarity index 100% |
| 113 |
rename from app-admin/cronolog/files/1.6.2-patches/cronolog-large-file-patch.txt |
| 114 |
rename to app-admin/cronolog/files/1.6.2-patches/cronolog-large-file.patch |
| 115 |
|
| 116 |
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 |
| 117 |
similarity index 100% |
| 118 |
rename from app-admin/cronolog/files/1.6.2-patches/cronolog-missing-symlink-patch.txt |
| 119 |
rename to app-admin/cronolog/files/1.6.2-patches/cronolog-missing-symlink.patch |
| 120 |
|
| 121 |
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 |
| 122 |
similarity index 100% |
| 123 |
rename from app-admin/cronolog/files/1.6.2-patches/cronolog-setugid-patch.txt |
| 124 |
rename to app-admin/cronolog/files/1.6.2-patches/cronolog-setugid.patch |
| 125 |
|
| 126 |
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 |
| 127 |
similarity index 100% |
| 128 |
rename from app-admin/cronolog/files/1.6.2-patches/cronolog-sigusr1-patch.txt |
| 129 |
rename to app-admin/cronolog/files/1.6.2-patches/cronolog-sigusr1.patch |
| 130 |
|
| 131 |
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 |
| 132 |
similarity index 100% |
| 133 |
rename from app-admin/cronolog/files/1.6.2-patches/cronolog-strftime-patch.txt |
| 134 |
rename to app-admin/cronolog/files/1.6.2-patches/cronolog-strftime.patch |
Archives