Change test in pkg_setup to account for app-emacs/gnus cvs snapshots.

Package-Manager: portage-2.2_rc49/cvs/Linux i686

3 files changed, 28 insertions, 26 deletions

diff --git a/virtual/gnus/ChangeLog b/virtual/gnus/ChangeLog
index aba66b563f07..144ca8d32343 100644
--- a/virtual/gnus/ChangeLog
+++ b/virtual/gnus/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for virtual/gnus
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/gnus/ChangeLog,v 1.11 2008/05/29 13:44:18 ulm Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/virtual/gnus/ChangeLog,v 1.12 2009/11/16 19:49:44 ulm Exp $
+
+  16 Nov 2009; Ulrich Mueller <ulm@gentoo.org> gnus-5.10.ebuild:
+  Change test in pkg_setup to account for app-emacs/gnus cvs snapshots.
 
   29 May 2008; Ulrich Mueller <ulm@gentoo.org> gnus-5.10.ebuild:
   Empty HOMEPAGE according to devmanual.
diff --git a/virtual/gnus/Manifest b/virtual/gnus/Manifest
index d3d0b5e4e692..bb2ba109ec67 100644
--- a/virtual/gnus/Manifest
+++ b/virtual/gnus/Manifest
@@ -1,13 +1,13 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-EBUILD gnus-5.10.ebuild 1148 RMD160 c4b0ff0da9ae6388abdf961a92a306b235095363 SHA1 88291cb48963e21f877c33593ff3e766f2dfc457 SHA256 4db604696a0e8d0cd75bf60522cfb6bd3eb2b00ec49b1989c2c8badf222d5d27
-MISC ChangeLog 1633 RMD160 dcf18f68ac24b0fd58f9e059c2a04915207ab5d0 SHA1 bfdb404629927203c7c2903ed9bd7a481a94199c SHA256 3a7db29f46a1229574dd146136c3d8e1bd2131a88611ca78b9f9ee39e021c1ef
+EBUILD gnus-5.10.ebuild 1065 RMD160 c525b543485bea774527426608a6b3554eacf9c3 SHA1 47349f38ccb1aa9523a30f96b0b4640801f15785 SHA256 97875044d71d82a1974b8c4c6c695110491255bdf623e2299abefb813b55e69b
+MISC ChangeLog 1771 RMD160 1faddaedb657f61bd31a4d98d5309f94b64502a4 SHA1 7302806b6d51003f006bff67b2c811006db88984 SHA256 b968b5c9728906ee2bc61ec6ed20ac32fe4d9c4b42bc15104285dc53b5b1351a
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
+Version: GnuPG v1.4.10 (GNU/Linux)
 
-iEYEARECAAYFAkg+s1oACgkQOeoy/oIi7uyjjgCfQwCSRtOjGhtJNu4jzpxQViJE
-vawAn00UgdDSvqOekZMJ+3nZ6f/uB1g1
-=/RIu
+iEYEARECAAYFAksBrXAACgkQOeoy/oIi7uxVqwCfXyPlrflJFFSUgThzgg5Fd28j
+X+EAoJRPu+Yb4k+wlrj5EWeOs+AiRix4
+=gtlT
 -----END PGP SIGNATURE-----
diff --git a/virtual/gnus/gnus-5.10.ebuild b/virtual/gnus/gnus-5.10.ebuild
index aac88566d7ef..8998e638cea6 100644
--- a/virtual/gnus/gnus-5.10.ebuild
+++ b/virtual/gnus/gnus-5.10.ebuild
@@ -1,8 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.10 2008/05/29 13:44:18 ulm Exp $
-
-inherit versionator
+# $Header: /var/cvsroot/gentoo-x86/virtual/gnus/gnus-5.10.ebuild,v 1.11 2009/11/16 19:49:44 ulm Exp $
 
 DESCRIPTION="Virtual for the Gnus newsreader"
 HOMEPAGE=""
@@ -13,28 +11,29 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND="|| (
-		>=app-emacs/gnus-5.10.8
-		>=app-emacs/ngnus-0.6
-		>=virtual/emacs-22
-	)"
+RDEPEND="|| ( >=app-emacs/gnus-5.10.8
+		>=virtual/emacs-22 )"
 
 DEPEND="${RDEPEND}
 	virtual/emacs"
 
 pkg_setup () {
-	local gvn=$(emacs -batch -q \
-		--eval "(and (require 'gnus nil t) (princ gnus-version-number))")
+	local gvn
+	gvn=$(emacs -batch -q --eval "
+		(progn
+		  (require 'gnus)
+		  (princ gnus-version)
+		  (if (< (gnus-continuum-version gnus-version)
+				 (gnus-continuum-version \"Gnus v${PV}\"))
+			  (error \"gnus-version too low\")))
+		")
 
-	if [ "${gvn}" ] && version_is_at_least ${PV} "${gvn}"; then
-		einfo "Gnus version ${gvn} detected."
-	elif has_version app-emacs/ngnus; then
-		# ngnus doesn't follow the usual versioning scheme
-		einfo "No Gnus version ${gvn} detected."
+	if [ $? -eq 0 ]; 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,ngnus},"
+		eerror "You should either install package app-emacs/gnus,"
 		eerror "or use \"eselect emacs\" to select an Emacs version >= 22."
-		die "Gnus version ${gvn} is too low."
+		die "Gnus version \"${gvn}\" is too low."
 	fi
 }