diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2009-11-16 19:49:44 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2009-11-16 19:49:44 +0000 |
| commit | 5a051fbfca0b20b51eb1ed1dea92877cc3f29074 (patch) | |
| tree | a57ff6c78381170d56e065e3401202f3d958dde9 /virtual | |
| parent | Stable for HPPA (bug #290194). (diff) | |
| download | gentoo-2-5a051fbfca0b20b51eb1ed1dea92877cc3f29074.tar.gz gentoo-2-5a051fbfca0b20b51eb1ed1dea92877cc3f29074.tar.bz2 gentoo-2-5a051fbfca0b20b51eb1ed1dea92877cc3f29074.zip | |
Change test in pkg_setup to account for app-emacs/gnus cvs snapshots.
(Portage version: 2.2_rc49/cvs/Linux i686)
Diffstat (limited to 'virtual')
| -rw-r--r-- | virtual/gnus/ChangeLog | 7 | ||||
| -rw-r--r-- | virtual/gnus/gnus-5.10.ebuild | 35 |
2 files changed, 22 insertions, 20 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/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 } |