summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Faulhammer <fauli@gentoo.org>2009-07-09 14:24:00 +0000
committerChristian Faulhammer <fauli@gentoo.org>2009-07-09 14:24:00 +0000
commit30c17e5a3ff0aab18f7efb01412c4454c21e540d (patch)
treeaba2d1bd48f6ead8587fbf7272cd2bcbb0ef778f /sys-apps
parentRemove extra acl and xattr deps wrt #276574, thanks to Darren Smith for repor... (diff)
downloadgentoo-2-30c17e5a3ff0aab18f7efb01412c4454c21e540d.tar.gz
gentoo-2-30c17e5a3ff0aab18f7efb01412c4454c21e540d.tar.bz2
gentoo-2-30c17e5a3ff0aab18f7efb01412c4454c21e540d.zip
also allow eselect 1.1 or higher instead of eselect-news, the first ships another news reading module
(Portage version: 2.1.6.13/cvs/Linux i686)
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/portage/ChangeLog7
-rw-r--r--sys-apps/portage/portage-2.1.6.13.ebuild4
-rw-r--r--sys-apps/portage/portage-2.1.6.7.ebuild4
-rw-r--r--sys-apps/portage/portage-2.2_rc33.ebuild4
4 files changed, 12 insertions, 7 deletions
diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index e080dd52bdb0..c0a36034723e 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sys-apps/portage
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.617 2009/07/05 22:16:55 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.618 2009/07/09 14:24:00 fauli Exp $
+
+ 09 Jul 2009; Christian Faulhammer <fauli@gentoo.org>
+ portage-2.1.6.7.ebuild, portage-2.1.6.13.ebuild, portage-2.2_rc33.ebuild:
+ also allow eselect 1.1 or higher instead of eselect-news, the first ships
+ another news reading module
05 Jul 2009; Zac Medico <zmedico@gentoo.org> -portage-2.1.6.4.ebuild,
portage-2.1.6.7.ebuild, -portage-2.1.6.11.ebuild, portage-2.1.6.13.ebuild:
diff --git a/sys-apps/portage/portage-2.1.6.13.ebuild b/sys-apps/portage/portage-2.1.6.13.ebuild
index 17c719577835..0f25b120d072 100644
--- a/sys-apps/portage/portage-2.1.6.13.ebuild
+++ b/sys-apps/portage/portage-2.1.6.13.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.6.13.ebuild,v 1.10 2009/07/05 22:16:55 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.6.13.ebuild,v 1.11 2009/07/09 14:24:00 fauli Exp $
inherit eutils multilib python
@@ -21,7 +21,7 @@ DEPEND="${python_dep}
RDEPEND="${python_dep}
!build? ( >=sys-apps/sed-4.0.5
>=app-shells/bash-3.2_p17
- >=app-admin/eselect-news-20071201 )
+ || ( >=app-admin/eselect-news-20071201 >=app-admin/eselect-1.1 ) )
elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
elibc_glibc? ( >=sys-apps/sandbox-1.2.17 !mips? ( >=sys-apps/sandbox-1.2.18.1-r2 ) )
elibc_uclibc? ( >=sys-apps/sandbox-1.2.17 !mips? ( >=sys-apps/sandbox-1.2.18.1-r2 ) )
diff --git a/sys-apps/portage/portage-2.1.6.7.ebuild b/sys-apps/portage/portage-2.1.6.7.ebuild
index f8b99553ede5..f247aa40699a 100644
--- a/sys-apps/portage/portage-2.1.6.7.ebuild
+++ b/sys-apps/portage/portage-2.1.6.7.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.6.7.ebuild,v 1.9 2009/07/05 22:16:55 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.6.7.ebuild,v 1.10 2009/07/09 14:24:00 fauli Exp $
inherit eutils multilib python
@@ -21,7 +21,7 @@ DEPEND="${python_dep}
RDEPEND="${python_dep}
!build? ( >=sys-apps/sed-4.0.5
>=app-shells/bash-3.2_p17
- >=app-admin/eselect-news-20071201 )
+ || ( >=app-admin/eselect-news-20071201 >=app-admin/eselect-1.1 ) )
elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
elibc_glibc? ( >=sys-apps/sandbox-1.2.17 !mips? ( >=sys-apps/sandbox-1.2.18.1-r2 ) )
elibc_uclibc? ( >=sys-apps/sandbox-1.2.17 !mips? ( >=sys-apps/sandbox-1.2.18.1-r2 ) )
diff --git a/sys-apps/portage/portage-2.2_rc33.ebuild b/sys-apps/portage/portage-2.2_rc33.ebuild
index 7021fa16c239..ba2f9899c1b8 100644
--- a/sys-apps/portage/portage-2.2_rc33.ebuild
+++ b/sys-apps/portage/portage-2.2_rc33.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2_rc33.ebuild,v 1.4 2009/06/07 07:54:03 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2_rc33.ebuild,v 1.5 2009/07/09 14:24:00 fauli Exp $
inherit eutils multilib python
@@ -21,7 +21,7 @@ DEPEND="${python_dep}
RDEPEND="${python_dep}
!build? ( >=sys-apps/sed-4.0.5
>=app-shells/bash-3.2_p17
- >=app-admin/eselect-news-20071201 )
+ || ( >=app-admin/eselect-news-20071201 >=app-admin/eselect-1.1 ) )
elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
elibc_glibc? ( >=sys-apps/sandbox-1.6 )
elibc_uclibc? ( >=sys-apps/sandbox-1.6 )