Change to new syntax of eselect-emacs and update/add dependency.

svn path=/xemacs-overlay/; revision=1090

8 files changed, 175 insertions, 167 deletions

diff --git a/app-editors/sxemacs/ChangeLog b/app-editors/sxemacs/ChangeLog
index f4171ed..84737b3 100644
--- a/app-editors/sxemacs/ChangeLog
+++ b/app-editors/sxemacs/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  14 Jun 2008; Ulrich Mueller <ulm@gentoo.org> sxemacs-22.1.9.ebuild:
+  Change to new syntax of eselect-emacs and add missing dependency.
+
   08 Jun 2008; Hans de Graaff <graaff@gentoo.org> ChangeLog:
   Initial import of sxemacs ebuild. I'm proxying this for Horst Günther
   Burkhardt III, from the sxemacs dev team.
diff --git a/app-editors/sxemacs/Manifest b/app-editors/sxemacs/Manifest
index 51609a3..b19883a 100644
--- a/app-editors/sxemacs/Manifest
+++ b/app-editors/sxemacs/Manifest
@@ -1,5 +1,5 @@
 DIST NeXT_XEmacs.tar.gz 39571 RMD160 3c2cedf75e4ece412031b20a15614a78367393f4 SHA1 619912734b1a1fae5115941b904d41beb4765b47 SHA256 35a0d988fd4ee801572639a99798571aa9fad140ddbed1455565ae9d5e0086c7
 DIST sxemacs-22.1.9.tar.gz 9438059 RMD160 051d4aa8d179fe27118f51679a94825d0962ee25 SHA1 ec23f81bf27a60497f407b59da7c0cab126ae641 SHA256 02f86617cc409aef44f6561837ea1da3aa91fc0f7f06e02d04bd3530f4d82e11
-EBUILD sxemacs-22.1.9.ebuild 10901 RMD160 3dc75218be7e05015cf92ee08e4143911fdd2179 SHA1 6be26a1b3363f26d2c1a95b325e1154fdd15bc3d SHA256 140ea166b442aec189b14a1ff690f7cce20e768ccdb2aada973dd10279244694
-MISC ChangeLog 299 RMD160 64f0a1f74d88c846f5bf1205bf355f3c0391bc11 SHA1 3c34dd6ee74a17ce5cb074030391abd9c8b1185e SHA256 62347a1826b666be7f54a3276185bac5596ce8e07870dc9171fc3de6dde908c8
+EBUILD sxemacs-22.1.9.ebuild 10530 RMD160 da1b392c59fbdadd09502b6016a25a441af47c0f SHA1 66450b7a120ee73e40963ea7f645e49669a562c9 SHA256 b9ac3295ac6c19219ace7975ce7010f88a526d4e5f67e836f23c6b08d158a891
+MISC ChangeLog 438 RMD160 579bfaea9aacb70722cc373e45c50a8c92228a1c SHA1 b530ce4feba78b8dafda4899025d76595ddbac16 SHA256 91e8647dc5ead451a7b08e30ab31dbd21679c7ef79c77dbfa75e94eae2823982
 MISC metadata.xml 365 RMD160 596ab334c06c2d7c1bc8b4ba6d24d29562c82d75 SHA1 f9bf09365f9739065d4b4f52b7af47638f16277d SHA256 da449e36c4d0339e88247a8fb361c3793188d2e6f817861f74d5d64b3a61353b
diff --git a/app-editors/sxemacs/sxemacs-22.1.9.ebuild b/app-editors/sxemacs/sxemacs-22.1.9.ebuild
index 6ab3e93..4a664d6 100644
--- a/app-editors/sxemacs/sxemacs-22.1.9.ebuild
+++ b/app-editors/sxemacs/sxemacs-22.1.9.ebuild
@@ -18,15 +18,16 @@ KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
 MAKEOPTS="-j1"
 
 IUSE="X alsa jack pulseaudio oss nas arts ao esd gif png jpeg xface tiff ffmpeg mad bdwgc
-      sndfile sox ssl tls ipv6 pop kerberos hesiod postgresql ffi gmp mpfr magic xpm
-      athena neXt Xaw3d motif xim canna freewnn gdbm berkdb tty gpm ncurses mule socks
-      omgoptimize warnfull"
+	  sndfile sox ssl tls ipv6 pop kerberos hesiod postgresql ffi gmp mpfr magic xpm
+	  athena neXt Xaw3d motif xim canna freewnn gdbm berkdb tty gpm ncurses mule socks
+	  omgoptimize warnfull"
 
 X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
 
 DEPEND="virtual/libc
 	=sys-libs/zlib-1.2*
 	app-arch/bzip2
+	>=app-admin/eselect-emacs-1.2
 	>=media-libs/audiofile-0.2.3
 	X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
 	alsa? ( media-sound/alsa-headers )
@@ -118,42 +119,42 @@ src_compile() {
 	#################
 	local myconf=""
 
-	    #######################
-	    # Configuration for X #
-	    #######################
-	    if use X ; then
+		#######################
+		# Configuration for X #
+		#######################
+		if use X ; then
 		myconf="${myconf} --with-widgets=athena"
 		myconf="${myconf} --with-dialogs=athena"
 		myconf="${myconf} --with-menubars=lucid"
 		myconf="${myconf} --with-scrollbars=lucid"
-	    if use motif ; then
+		if use motif ; then
 		myconf="--with-widgets=motif"
 		myconf="${myconf} --with-dialogs=motif"
 		myconf="${myconf} --with-scrollbars=motif"
 		myconf="${myconf} --with-menubars=lucid"
-	    fi
-	    if use athena ; then
+		fi
+		if use athena ; then
 		myconf="--with-scrollbars=athena"
-	    fi
-	    if use Xaw3d ; then
+		fi
+		if use Xaw3d ; then
 		myconf="${myconf} --with-athena=3d"
-	    elif use neXt ; then
+		elif use neXt ; then
 		myconf="${myconf} --with-athena=next"
-	    else
+		else
 		myconf="${myconf} --with-athena=xaw"
-	    fi
+		fi
 
-	    else
+		else
 		myconf="${myconf} --without-x"
-	    fi
-
-	    #########################
-	    # Configuration for TTY #
-	    #########################
-	    local ttyconf=""
-	    if use tty ; then
-	    ttyconf="${ttyconf} --with-tty"
-	    if use tty ; then
+		fi
+
+		#########################
+		# Configuration for TTY #
+		#########################
+		local ttyconf=""
+		if use tty ; then
+		ttyconf="${ttyconf} --with-tty"
+		if use tty ; then
 		if use ncurses ; then
 			ttyconf="${ttyconf} --with-ncurses"
 		else
@@ -164,139 +165,139 @@ src_compile() {
 		else
 			ttyconf="${ttyconf} --without-gpm"
 		fi
-	    fi
-	    else
+		fi
+		else
 		ttyconf="${ttyconf} --without-tty"
-	    fi
-	    myconf="${myconf} ${ttyconf}"
+		fi
+		myconf="${myconf} ${ttyconf}"
 
 
-	    ######################
-	    # MULE Configuration #
-	    ######################
-	    if use mule ; then
-	    myconf="${myconf} --with-mule"
-	    if use xim ; then
+		######################
+		# MULE Configuration #
+		######################
+		if use mule ; then
+		myconf="${myconf} --with-mule"
+		if use xim ; then
 		if use motif ; then
 			myconf="${myconf} --with-xim=motif"
 		else
 			myconf="${myconf} --with-xim=xlib"
 		fi
-	    else
+		else
 		myconf="${myconf} --with-xim=no"
-	    fi
+		fi
 		use canna && myconf="${myconf} --with-canna"
 		use freewnn && myconf="${myconf} --with-wnn"
-	    else
+		else
 		myconf="${myconf} --without-mule"
-	    fi
-
-	    #######################
-	    # Sound Configuration #
-	    #######################
-	    local soundconf="none"
-	    # Define what sound outputs we use
-	    use alsa && soundconf="${soundconf},alsa"
-	    use jack && soundconf="${soundconf},jack"
-	    use pulseaudio && soundconf="${soundconf},pulse"
-	    use oss && soundconf="${soundconf},oss"
-	    use nas && soundconf="${soundconf},nas"
-	    use arts && soundconf="${soundconf},arts"
-	    use ao && soundconf="${soundconf},ao"
-	    use esd && soundconf="${soundconf},esd"
-	    # And make them work
-	    myconf="${myconf} --with-sound=${soundconf}"
-
-	    ########################
-	    # Images Configuration #
-	    ########################
-	    local imageconf="none"
-	    # Define Image Types to support
-	    use gif && imageconf="${imageconf},gif"
-	    use png && imageconf="${imageconf},png"
-	    use jpeg && imageconf="${imageconf},jpeg"
-	    use xface && imageconf="${imageconf},xface"
-	    use tiff && imageconf="${imageconf},tiff"
-	    use xpm && imageconf="${imageconf},xpm"
-	    # And make them work
-	    myconf="${myconf} --with-image=${imageconf}"
-	    # Note - If FFI useflag is set, and ImageMagick is installed, SXEmacs
-	    # will make use of libWand and can thus display many more types of
-	    # image.
-
-	    ##########################
-	    # Database Configuration #
-	    ##########################
-	    local mydb="none"
-	    use gdbm && mydb="${mydb},gdbm"
-	    use berkdb && mydb="${mydb},berkdb"
-	    myconf="${myconf} --with-database=${mydb}"
-	    # and add support for postgre here
-	    use postgresql && myconf="${myconf} --with-postgresql" || myconf="${myconf} --without-postgresql"
-
-	    #######################
-	    # Media Configuration #
-	    #######################
-	    local mediaconf="none,internal"
-	    # Define Media Types to support
-	    use ffmpeg && mediaconf="${mediaconf},ffmpeg"
-	    use mad && mediaconf="${mediaconf},mad"
-	    use sndfile && mediaconf="${mediaconf},sndfile"
-	    use magic && mediaconf="${mediaconf},magic"
-	    use sox && mediaconf="${mediaconf},sox"
-	    # And make them work
-	    myconf="${myconf} --with-media=${mediaconf}"
-
-	    ########################
-	    # Cryptography Options #
-	    ########################
-	    local crypto=""
-	    use ssl && crypto="${crypto} --with-openssl"
-	    use tls && crypto="${crypto} --with-gnutls"
-	    myconf="${myconf} ${crypto}"
-
-	    ############################
-	    # Networking Configuration #
-	    ############################
-	    local netconf=""
-	    use pop && netconf="${netconf} --with-pop" || netconf="${netconf} --without-pop"
-	    use kerberos && netconf="${netconf} --with-kerberos" || netconf="${netconf} --without-kerberos"
-	    use hesiod && netconf="${netconf} --with-hesiod"
-	    use socks && netconf="${netconf} --with-socks"
-	    myconf="${myconf} ${netconf}"
-
-	    #######
-	    # FFI #
-	    #######
-	    use ffi && myconf="${myconf} --with-ffi"
-
-	    #########################################
-	    # Boehm-Demers-Weiser Garbage Collector #
-	    #########################################
-	    use bdwgc && myconf="${myconf} --with-experimental-features=all"
-
-	    ############################
-	    # Aggressive Optimisations #
-	    ############################
-	    use omgoptimize && myconf="${myconf} --with-ridiculously-aggressive-optimisations"
-
-	    ##########################
-	    # Maximum Warning Output #
-	    ##########################
-	    use warnfull && myconf="${myconf} --with-maximum-warning-output"
-
-	    ####################
-	    # Neat Math Tricks #
-	    ####################
-	    # I'm going to let SXEmacs do the deciding here.
-	    # The useflags will simply be for dependencies.
-	    myconf="${myconf} --with-ent=all --with-ase=all"
-
-	    ##################
-	    # Module Support #
-	    ##################
-	    myconf="${myconf} --with-module-support"
-	    myconf="${myconf} --with-modules=all"
+		fi
+
+		#######################
+		# Sound Configuration #
+		#######################
+		local soundconf="none"
+		# Define what sound outputs we use
+		use alsa && soundconf="${soundconf},alsa"
+		use jack && soundconf="${soundconf},jack"
+		use pulseaudio && soundconf="${soundconf},pulse"
+		use oss && soundconf="${soundconf},oss"
+		use nas && soundconf="${soundconf},nas"
+		use arts && soundconf="${soundconf},arts"
+		use ao && soundconf="${soundconf},ao"
+		use esd && soundconf="${soundconf},esd"
+		# And make them work
+		myconf="${myconf} --with-sound=${soundconf}"
+
+		########################
+		# Images Configuration #
+		########################
+		local imageconf="none"
+		# Define Image Types to support
+		use gif && imageconf="${imageconf},gif"
+		use png && imageconf="${imageconf},png"
+		use jpeg && imageconf="${imageconf},jpeg"
+		use xface && imageconf="${imageconf},xface"
+		use tiff && imageconf="${imageconf},tiff"
+		use xpm && imageconf="${imageconf},xpm"
+		# And make them work
+		myconf="${myconf} --with-image=${imageconf}"
+		# Note - If FFI useflag is set, and ImageMagick is installed, SXEmacs
+		# will make use of libWand and can thus display many more types of
+		# image.
+
+		##########################
+		# Database Configuration #
+		##########################
+		local mydb="none"
+		use gdbm && mydb="${mydb},gdbm"
+		use berkdb && mydb="${mydb},berkdb"
+		myconf="${myconf} --with-database=${mydb}"
+		# and add support for postgre here
+		use postgresql && myconf="${myconf} --with-postgresql" || myconf="${myconf} --without-postgresql"
+
+		#######################
+		# Media Configuration #
+		#######################
+		local mediaconf="none,internal"
+		# Define Media Types to support
+		use ffmpeg && mediaconf="${mediaconf},ffmpeg"
+		use mad && mediaconf="${mediaconf},mad"
+		use sndfile && mediaconf="${mediaconf},sndfile"
+		use magic && mediaconf="${mediaconf},magic"
+		use sox && mediaconf="${mediaconf},sox"
+		# And make them work
+		myconf="${myconf} --with-media=${mediaconf}"
+
+		########################
+		# Cryptography Options #
+		########################
+		local crypto=""
+		use ssl && crypto="${crypto} --with-openssl"
+		use tls && crypto="${crypto} --with-gnutls"
+		myconf="${myconf} ${crypto}"
+
+		############################
+		# Networking Configuration #
+		############################
+		local netconf=""
+		use pop && netconf="${netconf} --with-pop" || netconf="${netconf} --without-pop"
+		use kerberos && netconf="${netconf} --with-kerberos" || netconf="${netconf} --without-kerberos"
+		use hesiod && netconf="${netconf} --with-hesiod"
+		use socks && netconf="${netconf} --with-socks"
+		myconf="${myconf} ${netconf}"
+
+		#######
+		# FFI #
+		#######
+		use ffi && myconf="${myconf} --with-ffi"
+
+		#########################################
+		# Boehm-Demers-Weiser Garbage Collector #
+		#########################################
+		use bdwgc && myconf="${myconf} --with-experimental-features=all"
+
+		############################
+		# Aggressive Optimisations #
+		############################
+		use omgoptimize && myconf="${myconf} --with-ridiculously-aggressive-optimisations"
+
+		##########################
+		# Maximum Warning Output #
+		##########################
+		use warnfull && myconf="${myconf} --with-maximum-warning-output"
+
+		####################
+		# Neat Math Tricks #
+		####################
+		# I'm going to let SXEmacs do the deciding here.
+		# The useflags will simply be for dependencies.
+		myconf="${myconf} --with-ent=all --with-ase=all"
+
+		##################
+		# Module Support #
+		##################
+		myconf="${myconf} --with-module-support"
+		myconf="${myconf} --with-modules=all"
 
 	########################
 	# End of Configuration #
@@ -347,9 +348,9 @@ src_install() {
 
 
 pkg_postinst() {
-	eselect emacs update --if-unset
+	eselect emacs update if-unset
 }
 
 pkg_postrm() {
-	eselect emacs update --if-unset
-}
\ No newline at end of file
+	eselect emacs update if-unset
+}
diff --git a/app-editors/xemacs/ChangeLog b/app-editors/xemacs/ChangeLog
index 5970a21..725ecd6 100644
--- a/app-editors/xemacs/ChangeLog
+++ b/app-editors/xemacs/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  14 Jun 2008; Ulrich Mueller <ulm@gentoo.org> xemacs-21.5.28-r2.ebuild,
+  xemacs-21.5.28-r3.ebuild, xemacs-21.5.28-r4.ebuild:
+  Change to new syntax of eselect-emacs and update dependency.
+
   08 Jun 2008; Hans de Graaff <graaff@gentoo.org> ChangeLog:
   Cleanup of ebuild partly based on jmglov's now-removed 21.5.28 ebuild:
   - enable freewnn also on amd64
diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
index 22898c6..4c0bbbd 100644
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -6,7 +6,7 @@ AUX xemacs-21.5.28-vcdiff.patch 476 RMD160 1298334c8d309f9054d98ec98bdda6dba494b
 AUX xemacs.desktop 1080 RMD160 9ddca2747abcc4e7a8bb305740942f62daa73ba6 SHA1 6a3a88ea334b510951a15efb126c4fb71a3b8c38 SHA256 a97f2b5f1b85fde16eaf6b00cd3889a0c2777a0e2c1d7d3d2814f752a976b060
 DIST NeXT_XEmacs.tar.gz 39571 RMD160 3c2cedf75e4ece412031b20a15614a78367393f4 SHA1 619912734b1a1fae5115941b904d41beb4765b47 SHA256 35a0d988fd4ee801572639a99798571aa9fad140ddbed1455565ae9d5e0086c7
 DIST xemacs-21.5.28.tar.gz 15310202 RMD160 a225a2da39c22dccbc5d14399d40dadecead5e11 SHA1 6de5f4b4cecac0480dd9ff50170a72f23f36dbac SHA256 588a3970ee44426975cd86026a932ed0e2cf47f597ebcf76d376bbd18638eae2
-EBUILD xemacs-21.5.28-r2.ebuild 7386 RMD160 411544516e4755156719f5a4b2697268d09ac257 SHA1 c46aabcc30bd69a2ba83064ca606d302a8f2ff5b SHA256 88e6d50290ddd103ca9605070a3a491ff57756ff33d933a1af724188e0b72566
-EBUILD xemacs-21.5.28-r3.ebuild 7649 RMD160 0e1413da36c50ba20d1ee1d22b4f519753fd8264 SHA1 3d4dd3f925e539f005d4bef9845121accdfb3ecd SHA256 1651863b5b7e70c713b5edfe75109eaf47ee8c115c75ba2f2713eb4fe5f758b4
-EBUILD xemacs-21.5.28-r4.ebuild 7070 RMD160 62c065b5c903a89b21ec7f2cb0c8116a159c0dc8 SHA1 0b5a29f3470bb3e8afc103b24f92815b6309eba3 SHA256 28378ad056080db5924b7abd6fcb32191096976a93399ae19c735970cce4d704
-MISC ChangeLog 1143 RMD160 e604193ecb2c18bbd3ce98df86b006a5c18a7cae SHA1 24056ae41b0b3653c32c17a7edce387a13900550 SHA256 72fd08ae22d8ef5598802ed7deda19b818a7278d2d1673655f9c5f1f9ca37fb7
+EBUILD xemacs-21.5.28-r2.ebuild 7377 RMD160 78063d82b2499e96bfc5c9c50b414b1b8a0826f7 SHA1 cc0717d38549dd860598e5268ae7a6e7a63b9b32 SHA256 aeabe94d0d8c22ebc6363179e59fcf836ce2dca9ad481c61075d8ab78d57db77
+EBUILD xemacs-21.5.28-r3.ebuild 7640 RMD160 2c2b397085a0d37867b7cda6a9cff47233918c02 SHA1 6770a69836f28537c9dea463fb8b9f107790628a SHA256 0a0dc2f6d1100f8296221619d8b8a5ea750a7ec51ca1cae1adebe75ada63ae77
+EBUILD xemacs-21.5.28-r4.ebuild 7061 RMD160 bd8e16db769d15910665ca5a53df2670207dafc2 SHA1 91258a5f34e6214ae3924c98c8ea157d0e454405 SHA256 327051ed9fc6dd74459f3668b425f47ff8fb67eeec614bd28de187eca0c58833
+MISC ChangeLog 1334 RMD160 7e766de8e4921192c88e5123bfd7cf53ee956cbb SHA1 060bdc3aeccad476c449159ec1c2c0b234f3a09d SHA256 9e560b9a66d4e7b4edbd072b5c863ed93e8060d42e9718b2af720113c76c5b31
diff --git a/app-editors/xemacs/xemacs-21.5.28-r2.ebuild b/app-editors/xemacs/xemacs-21.5.28-r2.ebuild
index 4e449ef..c2a5938 100644
--- a/app-editors/xemacs/xemacs-21.5.28-r2.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.28-r2.ebuild
@@ -1,4 +1,4 @@
-# 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/xemacs/xemacs-21.4.20-r3.ebuild,v 1.4 2007/04/30 23:04:57 ulm Exp $
 
@@ -48,7 +48,7 @@ DEPEND="virtual/libc
 	canna? ( app-i18n/canna )
 	!amd64? ( freewnn? ( app-i18n/freewnn ) )
 	>=sys-libs/ncurses-5.2
-	>=app-admin/eselect-emacs-0.7-r1"
+	>=app-admin/eselect-emacs-1.2"
 
 PDEPEND="app-xemacs/xemacs-base
 	mule? ( app-xemacs/mule-base )"
@@ -249,7 +249,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	eselect emacs update --if-unset
+	eselect emacs update ifunset
 
 	einfo "If you are upgrading from XEmacs 21.4 you should note the following"
 	einfo "incompatibilities:"
@@ -259,5 +259,5 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	eselect emacs update --if-unset
+	eselect emacs update ifunset
 }
diff --git a/app-editors/xemacs/xemacs-21.5.28-r3.ebuild b/app-editors/xemacs/xemacs-21.5.28-r3.ebuild
index 5d43964..b1abc1d 100644
--- a/app-editors/xemacs/xemacs-21.5.28-r3.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.28-r3.ebuild
@@ -1,4 +1,4 @@
-# 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/xemacs/xemacs-21.4.20-r3.ebuild,v 1.4 2007/04/30 23:04:57 ulm Exp $
 
@@ -48,7 +48,7 @@ DEPEND="virtual/libc
 	canna? ( app-i18n/canna )
 	!amd64? ( freewnn? ( app-i18n/freewnn ) )
 	>=sys-libs/ncurses-5.2
-	>=app-admin/eselect-emacs-0.7-r1"
+	>=app-admin/eselect-emacs-1.2"
 
 PDEPEND="app-xemacs/xemacs-base
 	mule? ( app-xemacs/mule-base )"
@@ -255,7 +255,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	eselect emacs update --if-unset
+	eselect emacs update ifunset
 
 	einfo "If you are upgrading from XEmacs 21.4 you should note the following"
 	einfo "incompatibilities:"
@@ -265,5 +265,5 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	eselect emacs update --if-unset
+	eselect emacs update ifunset
 }
diff --git a/app-editors/xemacs/xemacs-21.5.28-r4.ebuild b/app-editors/xemacs/xemacs-21.5.28-r4.ebuild
index b35653e..450f87a 100644
--- a/app-editors/xemacs/xemacs-21.5.28-r4.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.28-r4.ebuild
@@ -1,4 +1,4 @@
-# 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/xemacs/xemacs-21.4.20-r3.ebuild,v 1.4 2007/04/30 23:04:57 ulm Exp $
 
@@ -48,7 +48,7 @@ DEPEND="virtual/libc
 	canna? ( app-i18n/canna )
 	freewnn? ( app-i18n/freewnn )
 	>=sys-libs/ncurses-5.2
-	>=app-admin/eselect-emacs-0.7-r1"
+	>=app-admin/eselect-emacs-1.2"
 
 PDEPEND="app-xemacs/xemacs-base
 	mule? ( app-xemacs/mule-base )"
@@ -241,7 +241,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	eselect emacs update --if-unset
+	eselect emacs update ifunset
 
 	einfo "If you are upgrading from XEmacs 21.4 you should note the following"
 	einfo "incompatibilities:"
@@ -251,5 +251,5 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	eselect emacs update --if-unset
+	eselect emacs update ifunset
 }