From 9c83c07896d085fd20b320212ba2c3fae4904116 Mon Sep 17 00:00:00 2001 From: Akinori Hattori Date: Sat, 8 Jul 2017 18:48:28 +0900 Subject: app-editors/ee: update patch Package-Manager: Portage-2.3.6, Repoman-2.3.1 --- app-editors/ee/ee-1.5.2.ebuild | 2 +- app-editors/ee/files/ee-init-location.diff | 40 ----------------------------- app-editors/ee/files/ee-init-location.patch | 40 +++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 41 deletions(-) delete mode 100644 app-editors/ee/files/ee-init-location.diff create mode 100644 app-editors/ee/files/ee-init-location.patch (limited to 'app-editors/ee') diff --git a/app-editors/ee/ee-1.5.2.ebuild b/app-editors/ee/ee-1.5.2.ebuild index eb45a8bf0cbe..16ae483d127f 100644 --- a/app-editors/ee/ee-1.5.2.ebuild +++ b/app-editors/ee/ee-1.5.2.ebuild @@ -18,7 +18,7 @@ RDEPEND="!app-editors/ersatz-emacs" S="${WORKDIR}/easyedit-${PV}" src_prepare() { - epatch "${FILESDIR}"/${PN}-*.diff + epatch "${FILESDIR}"/${PN}-init-location.patch sed -i \ -e "s/make -/\$(MAKE) -/g" \ diff --git a/app-editors/ee/files/ee-init-location.diff b/app-editors/ee/files/ee-init-location.diff deleted file mode 100644 index 9d6179a03a59..000000000000 --- a/app-editors/ee/files/ee-init-location.diff +++ /dev/null @@ -1,40 +0,0 @@ ---- easyedit-1.5.2.orig/ee.1 -+++ easyedit-1.5.2/ee.1 -@@ -406,7 +406,7 @@ - .PP - Since different users have different preferences, \fIee\fR allows some - slight configurability. There are three possible locations for an --initialization file for ee: the file \fI/usr/local/lib/init.ee\fR, the -+initialization file for ee: the file \fI/usr/share/ee/init.ee\fR, the - file \fI.init.ee\fR in the user's home directory, or the file \fI.init.ee\fR - in the current directory (if different from the home - directory). This allows system administrators to set some preferences for -@@ -414,7 +414,7 @@ - and the user to customize settings for particular directories (like one - for correspondence, and a different directory for programming). - .PP --The file \fI\/usr/local/lib/init.ee\fR is read first, then -+The file \fI\/usr/share/ee/init.ee\fR is read first, then - \fI$HOME/.init.ee\fR, then \fI.init.ee\fR, with the settings specified by the - most recent file read taking precedence. - .PP -@@ -521,7 +521,7 @@ - may be too slow for slower systems. - .SH FILES - .PP --.I /usr/local/lib/init.ee -+.I /usr/share/ee/init.ee - .br - .I $HOME/.init.ee - .br ---- easyedit-1.5.2.orig/ee.c -+++ easyedit-1.5.2/ee.c -@@ -4124,7 +4124,7 @@ - } - - unsigned char *init_name[3] = { -- "/usr/local/lib/init.ee", -+ "/usr/share/ee/init.ee", - NULL, - ".init.ee" - }; diff --git a/app-editors/ee/files/ee-init-location.patch b/app-editors/ee/files/ee-init-location.patch new file mode 100644 index 000000000000..5ac1e47ae962 --- /dev/null +++ b/app-editors/ee/files/ee-init-location.patch @@ -0,0 +1,40 @@ +--- a/ee.1 ++++ b/ee.1 +@@ -406,7 +406,7 @@ + .PP + Since different users have different preferences, \fIee\fR allows some + slight configurability. There are three possible locations for an +-initialization file for ee: the file \fI/usr/local/lib/init.ee\fR, the ++initialization file for ee: the file \fI/usr/share/ee/init.ee\fR, the + file \fI.init.ee\fR in the user's home directory, or the file \fI.init.ee\fR + in the current directory (if different from the home + directory). This allows system administrators to set some preferences for +@@ -414,7 +414,7 @@ + and the user to customize settings for particular directories (like one + for correspondence, and a different directory for programming). + .PP +-The file \fI\/usr/local/lib/init.ee\fR is read first, then ++The file \fI\/usr/share/ee/init.ee\fR is read first, then + \fI$HOME/.init.ee\fR, then \fI.init.ee\fR, with the settings specified by the + most recent file read taking precedence. + .PP +@@ -521,7 +521,7 @@ + may be too slow for slower systems. + .SH FILES + .PP +-.I /usr/local/lib/init.ee ++.I /usr/share/ee/init.ee + .br + .I $HOME/.init.ee + .br +--- a/ee.c ++++ b/ee.c +@@ -4124,7 +4124,7 @@ + } + + unsigned char *init_name[3] = { +- "/usr/local/lib/init.ee", ++ "/usr/share/ee/init.ee", + NULL, + ".init.ee" + }; -- cgit v1.2.3-65-gdbad