summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2009-12-20 10:34:43 +0000
committerUlrich Müller <ulm@gentoo.org>2009-12-20 10:34:43 +0000
commitf365770325661f937228e2a3d8b4373f75dd568a (patch)
tree7d0b556d2ff12e58a6d14633f469392f6478defb /app-editors
parentMerged keywords from Prefix overlay (diff)
downloadgentoo-2-f365770325661f937228e2a3d8b4373f75dd568a.tar.gz
gentoo-2-f365770325661f937228e2a3d8b4373f75dd568a.tar.bz2
gentoo-2-f365770325661f937228e2a3d8b4373f75dd568a.zip
Remove old compatibility code.
(Portage version: 2.2_rc60/cvs/Linux i686)
Diffstat (limited to 'app-editors')
-rw-r--r--app-editors/emacs/ChangeLog6
-rw-r--r--app-editors/emacs/emacs-21.4-r19.ebuild10
-rw-r--r--app-editors/emacs/emacs-22.3-r3.ebuild10
3 files changed, 9 insertions, 17 deletions
diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index c5ec93a5e0a7..59a691bc4cfa 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-editors/emacs
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.353 2009/12/15 09:25:49 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.354 2009/12/20 10:34:43 ulm Exp $
+
+ 20 Dec 2009; Ulrich Mueller <ulm@gentoo.org> emacs-21.4-r19.ebuild,
+ emacs-22.3-r3.ebuild:
+ Remove old compatibility code.
15 Dec 2009; Ulrich Mueller <ulm@gentoo.org> emacs-21.4-r19.ebuild,
emacs-22.3-r2.ebuild, emacs-22.3-r3.ebuild, emacs-23.1.ebuild,
diff --git a/app-editors/emacs/emacs-21.4-r19.ebuild b/app-editors/emacs/emacs-21.4-r19.ebuild
index 1806577fa7de..45294dbc5712 100644
--- a/app-editors/emacs/emacs-21.4-r19.ebuild
+++ b/app-editors/emacs/emacs-21.4-r19.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r19.ebuild,v 1.10 2009/12/15 09:25:49 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r19.ebuild,v 1.11 2009/12/20 10:34:43 ulm Exp $
EAPI=2
@@ -167,13 +167,7 @@ emacs-infodir-rebuild() {
pkg_postinst() {
emacs-infodir-rebuild
-
- if [[ $(readlink "${ROOT}"/usr/bin/emacs) == emacs.emacs-${SLOT}* ]]; then
- # transition from pre-eselect revision
- eselect emacs set emacs-${SLOT}
- else
- eselect emacs update ifunset
- fi
+ eselect emacs update ifunset
if ! use sendmail && ! has_version "virtual/mta"; then
elog "You disabled sendmail support for Emacs. If you later install"
diff --git a/app-editors/emacs/emacs-22.3-r3.ebuild b/app-editors/emacs/emacs-22.3-r3.ebuild
index 5a22a14bea02..ee427aaf767d 100644
--- a/app-editors/emacs/emacs-22.3-r3.ebuild
+++ b/app-editors/emacs/emacs-22.3-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3-r3.ebuild,v 1.7 2009/12/15 09:25:49 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3-r3.ebuild,v 1.8 2009/12/20 10:34:43 ulm Exp $
EAPI=2
@@ -231,13 +231,7 @@ pkg_postinst() {
elisp-site-regen
emacs-infodir-rebuild
-
- if [[ $(readlink "${ROOT}"/usr/bin/emacs) == emacs.emacs-${SLOT}* ]]; then
- # transition from pre-eselect revision
- eselect emacs set emacs-${SLOT}
- else
- eselect emacs update ifunset
- fi
+ eselect emacs update ifunset
echo
elog "You can set the version to be started by /usr/bin/emacs through"