| 1 |
commit: 02cc97bbd9d8ea383fd9f362cae6cd60c5a18be3 |
| 2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Feb 23 20:49:59 2019 +0000 |
| 4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Feb 23 20:57:36 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02cc97bb |
| 7 |
|
| 8 |
app-editors/emacs-vcs: Move metainfo file to correct name. |
| 9 |
|
| 10 |
Drop test restriction in slot 26. |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.61, Repoman-2.3.12 |
| 13 |
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> |
| 14 |
|
| 15 |
app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild | 21 ++++++++------------- |
| 16 |
app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild | 20 ++++++++------------ |
| 17 |
2 files changed, 16 insertions(+), 25 deletions(-) |
| 18 |
|
| 19 |
diff --git a/app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild |
| 20 |
index 8c8c1e0e0c8..4ae3b77727a 100644 |
| 21 |
--- a/app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild |
| 22 |
+++ b/app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild |
| 23 |
@@ -1,4 +1,4 @@ |
| 24 |
-# Copyright 1999-2018 Gentoo Authors |
| 25 |
+# Copyright 1999-2019 Gentoo Authors |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
|
| 28 |
EAPI=7 |
| 29 |
@@ -30,7 +30,6 @@ LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" |
| 30 |
SLOT="26" |
| 31 |
IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gtk2 gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib" |
| 32 |
REQUIRED_USE="?? ( aqua X )" |
| 33 |
-RESTRICT="test" |
| 34 |
|
| 35 |
RDEPEND="sys-libs/ncurses:0= |
| 36 |
>=app-eselect/eselect-emacs-1.16 |
| 37 |
@@ -142,8 +141,7 @@ src_prepare() { |
| 38 |
eapply_user |
| 39 |
|
| 40 |
# Fix filename reference in redirected man page |
| 41 |
- sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \ |
| 42 |
- || die "unable to sed ctags.1" |
| 43 |
+ sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die |
| 44 |
|
| 45 |
AT_M4DIR=m4 eautoreconf |
| 46 |
} |
| 47 |
@@ -285,14 +283,12 @@ src_compile() { |
| 48 |
src_install () { |
| 49 |
emake DESTDIR="${D}" NO_BIN_LINK=t install |
| 50 |
|
| 51 |
- mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \ |
| 52 |
- || die "moving emacs executable failed" |
| 53 |
- mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \ |
| 54 |
- || die "moving emacs man page failed" |
| 55 |
+ mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die |
| 56 |
+ mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die |
| 57 |
+ mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.appdata.xml || die |
| 58 |
|
| 59 |
# move info dir to avoid collisions with the dir file generated by portage |
| 60 |
- mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \ |
| 61 |
- || die "moving info dir failed" |
| 62 |
+ mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die |
| 63 |
touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir |
| 64 |
docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig |
| 65 |
|
| 66 |
@@ -377,15 +373,14 @@ pkg_preinst() { |
| 67 |
# move Info dir file to correct name |
| 68 |
local infodir=/usr/share/info/${EMACS_SUFFIX} f |
| 69 |
if [[ -f ${ED}${infodir}/dir.orig ]]; then |
| 70 |
- mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed" |
| 71 |
+ mv "${ED}"${infodir}/dir{.orig,} || die |
| 72 |
elif [[ -d "${ED}"${infodir} ]]; then |
| 73 |
# this should not happen in EAPI 4 |
| 74 |
ewarn "Regenerating Info directory index in ${infodir} ..." |
| 75 |
rm -f "${ED}"${infodir}/dir{,.*} |
| 76 |
for f in "${ED}"${infodir}/*; do |
| 77 |
if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then |
| 78 |
- install-info --info-dir="${ED}"${infodir} "${f}" \ |
| 79 |
- || die "install-info failed" |
| 80 |
+ install-info --info-dir="${ED}"${infodir} "${f}" || die |
| 81 |
fi |
| 82 |
done |
| 83 |
fi |
| 84 |
|
| 85 |
diff --git a/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild |
| 86 |
index 5450edeeb08..735fbb98de7 100644 |
| 87 |
--- a/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild |
| 88 |
+++ b/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild |
| 89 |
@@ -1,4 +1,4 @@ |
| 90 |
-# Copyright 1999-2018 Gentoo Authors |
| 91 |
+# Copyright 1999-2019 Gentoo Authors |
| 92 |
# Distributed under the terms of the GNU General Public License v2 |
| 93 |
|
| 94 |
EAPI=7 |
| 95 |
@@ -143,8 +143,7 @@ src_prepare() { |
| 96 |
eapply_user |
| 97 |
|
| 98 |
# Fix filename reference in redirected man page |
| 99 |
- sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \ |
| 100 |
- || die "unable to sed ctags.1" |
| 101 |
+ sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die |
| 102 |
|
| 103 |
AT_M4DIR=m4 eautoreconf |
| 104 |
} |
| 105 |
@@ -288,14 +287,12 @@ src_compile() { |
| 106 |
src_install () { |
| 107 |
emake DESTDIR="${D}" NO_BIN_LINK=t install |
| 108 |
|
| 109 |
- mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \ |
| 110 |
- || die "moving emacs executable failed" |
| 111 |
- mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \ |
| 112 |
- || die "moving emacs man page failed" |
| 113 |
+ mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die |
| 114 |
+ mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die |
| 115 |
+ mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.appdata.xml || die |
| 116 |
|
| 117 |
# move info dir to avoid collisions with the dir file generated by portage |
| 118 |
- mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \ |
| 119 |
- || die "moving info dir failed" |
| 120 |
+ mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die |
| 121 |
touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir |
| 122 |
docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig |
| 123 |
|
| 124 |
@@ -380,15 +377,14 @@ pkg_preinst() { |
| 125 |
# move Info dir file to correct name |
| 126 |
local infodir=/usr/share/info/${EMACS_SUFFIX} f |
| 127 |
if [[ -f ${ED}${infodir}/dir.orig ]]; then |
| 128 |
- mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed" |
| 129 |
+ mv "${ED}"${infodir}/dir{.orig,} || die |
| 130 |
elif [[ -d "${ED}"${infodir} ]]; then |
| 131 |
# this should not happen in EAPI 4 |
| 132 |
ewarn "Regenerating Info directory index in ${infodir} ..." |
| 133 |
rm -f "${ED}"${infodir}/dir{,.*} |
| 134 |
for f in "${ED}"${infodir}/*; do |
| 135 |
if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then |
| 136 |
- install-info --info-dir="${ED}"${infodir} "${f}" \ |
| 137 |
- || die "install-info failed" |
| 138 |
+ install-info --info-dir="${ED}"${infodir} "${f}" || die |
| 139 |
fi |
| 140 |
done |
| 141 |
fi |
Archives