summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2011-12-08 18:23:16 +0000
committerUlrich Müller <ulm@gentoo.org>2011-12-08 18:23:16 +0000
commit09de327ebb23952aaad74892a685d0b2270c2199 (patch)
tree6d4d6a9cb962cab83c6c106b25e3fc9f21af3b08 /app-editors
parentUpdate live ebuild. Some stylistic changes and typo fixes. (diff)
downloademacs-09de327ebb23952aaad74892a685d0b2270c2199.tar.gz
emacs-09de327ebb23952aaad74892a685d0b2270c2199.tar.bz2
emacs-09de327ebb23952aaad74892a685d0b2270c2199.zip
Remove obsolete code in pkg_preinst().
svn path=/emacs-overlay/; revision=1767
Diffstat (limited to 'app-editors')
-rw-r--r--app-editors/emacs/ChangeLog3
-rw-r--r--app-editors/emacs/Manifest10
-rw-r--r--app-editors/emacs/emacs-23.3-r2.ebuild16
3 files changed, 10 insertions, 19 deletions
diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 4e767d6..ef2f1da 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 08 Dec 2011; Ulrich Mueller <ulm@gentoo.org> emacs-23.3-r2.ebuild:
+ Remove obsolete code in pkg_preinst().
+
06 Dec 2011; Ulrich Mueller <ulm@gentoo.org> emacs-23.3-r2.ebuild:
Get rid of all echo commands because they aren't logged.
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 8c734bb..2536653 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -3,13 +3,13 @@ Hash: SHA1
DIST emacs-23.3-patches-2.tar.bz2 1936 RMD160 c1cbe26f05e68efe0768445a3918892e995a59dd SHA1 3f55305dab83084b01f8958371d4e0fd4114b88b SHA256 403f88c0b814817734f275e6ee6ff4c8f27858a2429ea7d0a029c2d89ebaa5de
DIST emacs-23.3a.tar.bz2 38748283 RMD160 21f201714bca420c3a8fed8c92058cec786e724e SHA1 795bdfa372e42b9589a80f6dcb2ad8fed65b90e4 SHA256 9f4beee3bf4987914d57851c0aac017cb92a1410c2b31ba313265c64a38cc6ba
-EBUILD emacs-23.3-r2.ebuild 10719 RMD160 a22f69bfe21e7795212cdb3f3c6023d3feb5c32a SHA1 9b9baba8c8993f07be246c02464837811feec0ab SHA256 5648e08f12f9fdcee20ed4bc5bea374a76ad37a8132691dc26260297dbfa708e
-MISC ChangeLog 435 RMD160 ba076a6ce479725910ac94c6dad83fbd01f0207d SHA1 fe284fd4b1363c238a161b64b77ba02e19480c24 SHA256 fd6926b6a0d91ce7c94102e11c9d07b9e073beb6ccbc243e02194ad85774c15c
+EBUILD emacs-23.3-r2.ebuild 10319 RMD160 e9b58261b2ee1b671bcf719b6a3ba42b992133c5 SHA1 c773f5edba186441d61adbcc9fea88be4807d181 SHA256 cbeb9d6e6dcc6f0b7fdf0185d30e9e8f3594a492f3fcabaf9d539e43cb7f5cc0
+MISC ChangeLog 546 RMD160 069976776f58c1aae5617803cceddb77b8b112f7 SHA1 a529b044c0edd7ff7679e41c426878eb97900536 SHA256 7b11397c24d28dfd87b81a5453de12fb0b8cf9abaee30950a93793378474b94e
MISC metadata.xml 1657 RMD160 5d264611cedf5599197cf5fb9998678ec2569d79 SHA1 ff30d22526dcacaefdf078e4617d93be1bbc144a SHA256 fad2a290e4815f5cac10bfd3e6a9e547ddea2663cfdcc4889ea1b7e124389e0c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iEYEARECAAYFAk7eIesACgkQOeoy/oIi7uwWHQCffNCu+DDQPI8gC/4KHjs1ciOq
-h0EAnjH2v7kSJMGxTuvHIoxm1oFduyO7
-=uFZZ
+iEYEARECAAYFAk7hAc8ACgkQOeoy/oIi7uzCqgCfeOCwRNCyel6J+WiJvRAZkTSD
+NBMAoIi4QyHsueFmmdRrPHxEfCABkn4I
+=YuzQ
-----END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-23.3-r2.ebuild b/app-editors/emacs/emacs-23.3-r2.ebuild
index 18e9743..7c1387c 100644
--- a/app-editors/emacs/emacs-23.3-r2.ebuild
+++ b/app-editors/emacs/emacs-23.3-r2.ebuild
@@ -273,20 +273,8 @@ src_install () {
pkg_preinst() {
# move Info dir file to correct name
- local infodir=/usr/share/info/${EMACS_SUFFIX} f
- if [[ -f ${ED}${infodir}/dir.orig ]]; then
- mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
- else
- # this should not happen in EAPI 4
- ewarn "Regenerating Info directory index in ${infodir} ..."
- rm -f "${ED}"${infodir}/dir{,.*}
- for f in "${ED}"${infodir}/*; do
- if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
- install-info --info-dir="${ED}"${infodir} "${f}" \
- || die "install-info failed"
- fi
- done
- fi
+ mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} \
+ || die "moving info dir failed"
}
pkg_postinst() {