Change to new syntax of eselect-emacs. Remove empty Info directory.

(Portage version: 2.1.4.1)

4 files changed, 21 insertions, 14 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index a91e34fb0ea8..9cb2b622c855 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/emacs
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.231 2008/01/30 20:36:59 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.232 2008/02/02 21:08:12 ulm Exp $
+
+  02 Feb 2008; Ulrich Mueller <ulm@gentoo.org> emacs-18.59-r4.ebuild,
+  emacs-21.4-r14.ebuild, emacs-22.1-r3.ebuild:
+  Change to new syntax of eselect-emacs and update dependency. Remove empty
+  Info directory after unmerge.
 
   30 Jan 2008; Ulrich Mueller <ulm@gentoo.org>
   -files/emacs-22.1-disable_alsa_detection.patch, emacs-21.4-r14.ebuild,
diff --git a/app-editors/emacs/emacs-18.59-r4.ebuild b/app-editors/emacs/emacs-18.59-r4.ebuild
index 0c156b71b314..0da2d898a635 100644
--- a/app-editors/emacs/emacs-18.59-r4.ebuild
+++ b/app-editors/emacs/emacs-18.59-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r4.ebuild,v 1.7 2007/12/02 20:00:52 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r4.ebuild,v 1.8 2008/02/02 21:08:12 ulm Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -16,7 +16,7 @@ KEYWORDS="x86"
 IUSE="X"
 
 RDEPEND="sys-libs/ncurses
-	>=app-admin/eselect-emacs-0.3
+	>=app-admin/eselect-emacs-1.2
 	X? ( x11-libs/libX11 )"
 DEPEND="${RDEPEND}"
 
@@ -85,9 +85,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	eselect emacs update --if-unset
+	eselect emacs update ifunset
 }
 
 pkg_postrm() {
-	eselect emacs update --if-unset
+	eselect emacs update ifunset
 }
diff --git a/app-editors/emacs/emacs-21.4-r14.ebuild b/app-editors/emacs/emacs-21.4-r14.ebuild
index 0619baa200cc..2c26d7bb4873 100644
--- a/app-editors/emacs/emacs-21.4-r14.ebuild
+++ b/app-editors/emacs/emacs-21.4-r14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r14.ebuild,v 1.13 2008/01/30 20:36:59 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r14.ebuild,v 1.14 2008/02/02 21:08:12 ulm Exp $
 
 WANT_AUTOCONF="2.1"
 
@@ -33,7 +33,7 @@ RDEPEND="sys-libs/ncurses
 		!Xaw3d? ( motif? ( virtual/motif ) )
 	)
 	sendmail? ( virtual/mta )
-	>=app-admin/eselect-emacs-0.7-r1"
+	>=app-admin/eselect-emacs-1.2"
 
 DEPEND="${RDEPEND}
 	X? ( x11-misc/xbitmaps )"
@@ -157,6 +157,7 @@ emacs-infodir-rebuild() {
 		[[ ${f##*/} == *[0-9].info* ]] \
 			|| install-info --info-dir="${ROOT}"${infodir} "${f}" &>/dev/null
 	done
+	rmdir "${ROOT}"${infodir} 2>/dev/null # remove dir if it is empty
 	echo
 }
 
@@ -170,7 +171,7 @@ pkg_postinst() {
 		# transition from pre-eselect revision
 		eselect emacs set emacs-${SLOT}
 	else
-		eselect emacs update --if-unset
+		eselect emacs update ifunset
 	fi
 
 	if ! use sendmail && ! has_version "virtual/mta"; then
@@ -188,5 +189,5 @@ pkg_postinst() {
 
 pkg_postrm() {
 	emacs-infodir-rebuild
-	eselect emacs update --if-unset
+	eselect emacs update ifunset
 }
diff --git a/app-editors/emacs/emacs-22.1-r3.ebuild b/app-editors/emacs/emacs-22.1-r3.ebuild
index 224b05a0a2c3..bfc4fd9c13ef 100644
--- a/app-editors/emacs/emacs-22.1-r3.ebuild
+++ b/app-editors/emacs/emacs-22.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.1-r3.ebuild,v 1.18 2008/01/30 20:49:44 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.1-r3.ebuild,v 1.19 2008/02/02 21:08:12 ulm Exp $
 
 WANT_AUTOCONF="2.5"
 WANT_AUTOMAKE="latest"
@@ -19,7 +19,7 @@ RESTRICT="strip"
 
 RDEPEND="!<app-editors/emacs-cvs-22.1
 	sys-libs/ncurses
-	>=app-admin/eselect-emacs-0.7-r1
+	>=app-admin/eselect-emacs-1.2
 	net-libs/liblockfile
 	hesiod? ( net-dns/hesiod )
 	spell? ( || ( app-text/ispell app-text/aspell ) )
@@ -215,6 +215,7 @@ emacs-infodir-rebuild() {
 		[[ ${f##*/} == *[0-9].info* ]] \
 			|| install-info --info-dir="${ROOT}"${infodir} "${f}" &>/dev/null
 	done
+	rmdir "${ROOT}"${infodir} 2>/dev/null # remove dir if it is empty
 	echo
 }
 
@@ -234,7 +235,7 @@ pkg_postinst() {
 		# transition from pre-eselect revision
 		eselect emacs set emacs-${SLOT}
 	else
-		eselect emacs update --if-unset
+		eselect emacs update ifunset
 	fi
 
 	if use X; then
@@ -255,5 +256,5 @@ pkg_postinst() {
 pkg_postrm() {
 	elisp-site-regen
 	emacs-infodir-rebuild
-	eselect emacs update --if-unset
+	eselect emacs update ifunset
 }