Depend on <emacs-23 and check for Emacs version in pkg_setup. Drop package to unstable because the released version doesn't support Emacs 23.

(Portage version: 2.1.9.24/cvs/Linux x86_64)

4 files changed, 22 insertions, 22 deletions

diff --git a/app-emacs/emacs-w3m/ChangeLog b/app-emacs/emacs-w3m/ChangeLog
index 31fa2d2a1d7e..6474c6bedb77 100644
--- a/app-emacs/emacs-w3m/ChangeLog
+++ b/app-emacs/emacs-w3m/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emacs/emacs-w3m
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-w3m/ChangeLog,v 1.68 2010/03/15 21:10:12 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-w3m/ChangeLog,v 1.69 2010/11/07 10:36:46 ulm Exp $
+
+  07 Nov 2010; Ulrich Mueller <ulm@gentoo.org> emacs-w3m-1.4.4-r3.ebuild:
+  Depend on <emacs-23 and check for Emacs version in pkg_setup. Drop package
+  to unstable because the released version doesn't support Emacs 23.
 
 *emacs-w3m-1.4.390_pre20100312 (15 Mar 2010)
 
diff --git a/app-emacs/emacs-w3m/emacs-w3m-1.4.379_pre20100125.ebuild b/app-emacs/emacs-w3m/emacs-w3m-1.4.379_pre20100125.ebuild
index b18f6453a380..a42bba8e8031 100644
--- a/app-emacs/emacs-w3m/emacs-w3m-1.4.379_pre20100125.ebuild
+++ b/app-emacs/emacs-w3m/emacs-w3m-1.4.379_pre20100125.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-w3m/emacs-w3m-1.4.379_pre20100125.ebuild,v 1.1 2010/01/31 01:08:35 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-w3m/emacs-w3m-1.4.379_pre20100125.ebuild,v 1.2 2010/11/07 10:36:46 ulm Exp $
 
 EAPI=3
 
@@ -52,9 +52,4 @@ pkg_postinst() {
 	einfo
 	elog "If you want to use the shimbun library, please emerge app-emacs/apel"
 	elog "and app-emacs/flim."
-	einfo
-}
-
-pkg_postrm() {
-	elisp-site-regen
 }
diff --git a/app-emacs/emacs-w3m/emacs-w3m-1.4.390_pre20100312.ebuild b/app-emacs/emacs-w3m/emacs-w3m-1.4.390_pre20100312.ebuild
index 4047d51c0007..ce2f72ab94d9 100644
--- a/app-emacs/emacs-w3m/emacs-w3m-1.4.390_pre20100312.ebuild
+++ b/app-emacs/emacs-w3m/emacs-w3m-1.4.390_pre20100312.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-w3m/emacs-w3m-1.4.390_pre20100312.ebuild,v 1.1 2010/03/15 21:10:12 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-w3m/emacs-w3m-1.4.390_pre20100312.ebuild,v 1.2 2010/11/07 10:36:46 ulm Exp $
 
 EAPI=3
 
@@ -52,9 +52,4 @@ pkg_postinst() {
 	einfo
 	elog "If you want to use the shimbun library, please emerge app-emacs/apel"
 	elog "and app-emacs/flim."
-	einfo
-}
-
-pkg_postrm() {
-	elisp-site-regen
 }
diff --git a/app-emacs/emacs-w3m/emacs-w3m-1.4.4-r3.ebuild b/app-emacs/emacs-w3m/emacs-w3m-1.4.4-r3.ebuild
index 9f62eb6db828..740a9a412693 100644
--- a/app-emacs/emacs-w3m/emacs-w3m-1.4.4-r3.ebuild
+++ b/app-emacs/emacs-w3m/emacs-w3m-1.4.4-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-w3m/emacs-w3m-1.4.4-r3.ebuild,v 1.6 2009/07/22 19:06:25 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-w3m/emacs-w3m-1.4.4-r3.ebuild,v 1.7 2010/11/07 10:36:46 ulm Exp $
 
 inherit elisp
 
@@ -10,14 +10,25 @@ SRC_URI="http://emacs-w3m.namazu.org/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc sparc x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
 IUSE="linguas_ja"
 
-DEPEND="virtual/w3m"
+DEPEND="virtual/w3m
+	<app-editors/emacs-23"
 RDEPEND="${DEPEND}"
 
 SITEFILE="70${PN}-gentoo.el"
 
+pkg_setup() {
+	local have_emacs=$(elisp-emacs-version)
+	if [ "${have_emacs%%.*}" -ge 23 ]; then
+		eerror "${P} does not support Emacs 23 or later."
+		eerror "Try the development version of ${PN} instead, or use"
+		eerror "\"eselect emacs\" to select a lower active Emacs version."
+		die "Emacs 23 not supported"
+	fi
+}
+
 src_compile() {
 	econf || die "econf failed"
 	emake all-en $(useq linguas_ja && echo all-ja) || die "emake failed"
@@ -41,9 +52,4 @@ pkg_postinst() {
 	einfo
 	elog "If you want to use the shimbun library, please emerge app-emacs/apel"
 	elog "and app-emacs/flim."
-	einfo
-}
-
-pkg_postrm() {
-	elisp-site-regen
 }