Test for sufficient Gnus version in pkg_setup.

Package-Manager: portage-2.1.3_rc6

5 files changed, 58 insertions, 34 deletions

diff --git a/virtual/gnus/ChangeLog b/virtual/gnus/ChangeLog
index 96eb6c96d305..b6e347f83c01 100644
--- a/virtual/gnus/ChangeLog
+++ b/virtual/gnus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for virtual/gnus
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/gnus/ChangeLog,v 1.3 2007/06/05 15:42:11 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/gnus/ChangeLog,v 1.4 2007/07/02 14:10:11 ulm Exp $
+
+*gnus-5.10 (02 Jul 2007)
+
+  02 Jul 2007; Ulrich Mueller <ulm@gentoo.org> -gnus-0.ebuild,
+  +gnus-5.10.ebuild:
+  Test for sufficient Gnus version in pkg_setup, output instructions otherwise.
 
   05 Jun 2007; Ulrich Mueller <ulm@gentoo.org> gnus-0.ebuild:
   Alternative emacs-cvs removed; virtual/emacs has all of its keywords now.
diff --git a/virtual/gnus/Manifest b/virtual/gnus/Manifest
index 033d6af39b15..bf8d8e0d419b 100644
--- a/virtual/gnus/Manifest
+++ b/virtual/gnus/Manifest
@@ -1,25 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-EBUILD gnus-0.ebuild 512 RMD160 5cc8dd27ce70f27df7fcab89a157d965810cd95b SHA1 bf037457afe7ad88ae30f4c328e9f69d1d5b84fd SHA256 f2b143f917981c1bb0f1c252114085f1231da6749b610a7e35391ab0aba3877d
-MD5 38637e785cb063acd60786265dd8e7b2 gnus-0.ebuild 512
-RMD160 5cc8dd27ce70f27df7fcab89a157d965810cd95b gnus-0.ebuild 512
-SHA256 f2b143f917981c1bb0f1c252114085f1231da6749b610a7e35391ab0aba3877d gnus-0.ebuild 512
-MISC ChangeLog 565 RMD160 f66957ebfbebf4138b751f01f541f39d2f73182a SHA1 9fea41d3776401bde2d162da95b7bee571166cd4 SHA256 66366efdf2a47ffc5f969010509b54f07db05aef32e3b98751bdf29963f0fe17
-MD5 6043dc5d80c7d4ff7480eb1291090cc7 ChangeLog 565
-RMD160 f66957ebfbebf4138b751f01f541f39d2f73182a ChangeLog 565
-SHA256 66366efdf2a47ffc5f969010509b54f07db05aef32e3b98751bdf29963f0fe17 ChangeLog 565
+EBUILD gnus-5.10.ebuild 1043 RMD160 a2152644272b31093482a46c0891022d5a5c8f65 SHA1 0a888a912fc29094e2b5c519d01ba4b787f4b610 SHA256 dd8bd2274c2290b381e78f2043b561df2bbe383827fcae0ad1d8b0e4930dd274
+MD5 86264b29464699673b31323e50a092c2 gnus-5.10.ebuild 1043
+RMD160 a2152644272b31093482a46c0891022d5a5c8f65 gnus-5.10.ebuild 1043
+SHA256 dd8bd2274c2290b381e78f2043b561df2bbe383827fcae0ad1d8b0e4930dd274 gnus-5.10.ebuild 1043
+MISC ChangeLog 756 RMD160 312642c828d184b792e94753e5104bee227adfdf SHA1 de3533df269c80681798c5ca6302e87f65c0bf35 SHA256 afdb5d615dfc225622ae8823fbecba0bfdbdcf96ab86ec69ebd7f0cd17196388
+MD5 f9825f159deeeab1c43a83fe268f0a87 ChangeLog 756
+RMD160 312642c828d184b792e94753e5104bee227adfdf ChangeLog 756
+SHA256 afdb5d615dfc225622ae8823fbecba0bfdbdcf96ab86ec69ebd7f0cd17196388 ChangeLog 756
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab metadata.xml 158
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnus-0 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-gnus-0 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-gnus-0 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnus-5.10 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-gnus-5.10 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-gnus-5.10 0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGZYRYOeoy/oIi7uwRAk8bAKCUfBb80z0I+NzoyyDEBJB1ydgRWwCg6/nx
-W0sBXAbcDeCLi7bpwuCOY6w=
-=zIK1
+iD8DBQFGiQdGOeoy/oIi7uwRAtzgAKDS9IGCdtu9CCBst9/IM20hrbp11wCgyZwI
+GlGtdtATVrRqpYfKhqf2LFo=
+=1Xg4
 -----END PGP SIGNATURE-----
diff --git a/virtual/gnus/files/digest-gnus-0 b/virtual/gnus/files/digest-gnus-5.10
index e69de29bb2d1..e69de29bb2d1 100644
--- a/virtual/gnus/files/digest-gnus-0
+++ b/virtual/gnus/files/digest-gnus-5.10
diff --git a/virtual/gnus/gnus-0.ebuild b/virtual/gnus/gnus-0.ebuild
deleted file mode 100644
index 404b060d72bf..000000000000
--- a/virtual/gnus/gnus-0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/gnus/gnus-0.ebuild,v 1.3 2007/06/05 15:42:11 ulm Exp $
-
-DESCRIPTION="Virtual for the Gnus newsreader"
-HOMEPAGE="http://www.gentoo.org/proj/en/lisp/emacs/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc ~ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-RDEPEND="|| (
-			>=app-emacs/gnus-5.10.8
-			>=app-emacs/gnus-cvs-5.11
-			>=virtual/emacs-22
-		)"
diff --git a/virtual/gnus/gnus-5.10.ebuild b/virtual/gnus/gnus-5.10.ebuild
new file mode 100644
index 000000000000..3a150d570150
--- /dev/null
+++ b/virtual/gnus/gnus-5.10.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/virtual/gnus/gnus-5.10.ebuild,v 1.1 2007/07/02 14:10:11 ulm Exp $
+
+inherit versionator
+
+DESCRIPTION="Virtual for the Gnus newsreader"
+HOMEPAGE="http://www.gentoo.org/proj/en/lisp/emacs/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ppc ~ppc64 sparc ~sparc-fbsd x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="|| (
+		>=app-emacs/gnus-5.10.8
+		>=app-emacs/gnus-cvs-5.11
+		>=virtual/emacs-22
+	)"
+
+DEPEND="${RDEPEND}
+	virtual/emacs"
+
+pkg_setup () {
+	local gvn=$(emacs -batch -q \
+		--eval "(and (require 'gnus nil t) (princ gnus-version-number))")
+
+	if [ "${gvn}" ] && version_is_at_least ${PV} "${gvn}"; then
+		einfo "Gnus version ${gvn} detected."
+	else
+		eerror "virtual/${P} requires at least Gnus version ${PV}."
+		eerror "You should either install package app-emacs/{gnus,gnus-cvs},"
+		eerror "or use \"eselect emacs\" to select an Emacs version >= 22."
+		die "Gnus version ${gvn} is too low."
+	fi
+}