summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2009-06-02 22:32:11 +0000
committerUlrich Müller <ulm@gentoo.org>2009-06-02 22:32:11 +0000
commit43542dd66a8322e3be700c7742d0178308e1e232 (patch)
tree7e7c1333b1c9930b623557b53ef802c345fbe353 /app-admin
parentMarked ~hppa (bug #272046). (diff)
downloadgentoo-2-43542dd66a8322e3be700c7742d0178308e1e232.tar.gz
gentoo-2-43542dd66a8322e3be700c7742d0178308e1e232.tar.bz2
gentoo-2-43542dd66a8322e3be700c7742d0178308e1e232.zip
Don't depend on paludis, in order to avoid a circular dependency.
(Portage version: 2.2_rc33/cvs/Linux i686)
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/eselect/ChangeLog10
-rw-r--r--app-admin/eselect/eselect-1.1.ebuild10
2 files changed, 14 insertions, 6 deletions
diff --git a/app-admin/eselect/ChangeLog b/app-admin/eselect/ChangeLog
index 38c0c817e9ab..4818cfaf8194 100644
--- a/app-admin/eselect/ChangeLog
+++ b/app-admin/eselect/ChangeLog
@@ -1,10 +1,12 @@
# ChangeLog for app-admin/eselect
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/ChangeLog,v 1.101 2009/06/02 16:21:11 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/ChangeLog,v 1.102 2009/06/02 22:32:11 ulm Exp $
- 02 Jun 2009; Ulrich Mueller <ulm@gentoo.org> -eselect-1.1_rc2.ebuild,
- -eselect-1.1_rc3.ebuild:
- Remove release candidates.
+ 02 Jun 2009; Ulrich Mueller <ulm@gentoo.org> eselect-1.1.ebuild,
+ -eselect-1.1_rc2.ebuild, -eselect-1.1_rc3.ebuild:
+ Don't depend on paludis, in order to avoid a circular dependency; thanks
+ to Ingmar Vanhassel for pointing this out. Print a warning message in
+ pkg_postinst instead. Remove release candidates.
*eselect-1.1 (27 May 2009)
diff --git a/app-admin/eselect/eselect-1.1.ebuild b/app-admin/eselect/eselect-1.1.ebuild
index eaff27d94e61..4746abfbb59a 100644
--- a/app-admin/eselect/eselect-1.1.ebuild
+++ b/app-admin/eselect/eselect-1.1.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/app-admin/eselect/eselect-1.1.ebuild,v 1.1 2009/05/28 05:35:51 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/eselect-1.1.ebuild,v 1.2 2009/06/02 22:32:11 ulm Exp $
DESCRIPTION="Gentoo's multi-purpose configuration and management tool"
HOMEPAGE="http://www.gentoo.org/proj/en/eselect/"
@@ -22,7 +22,6 @@ DEPEND="${RDEPEND}
RDEPEND="${RDEPEND}
sys-apps/file
sys-libs/ncurses
- paludis? ( sys-apps/paludis )
!paludis? ( >=sys-apps/portage-2.1.6 )"
# Commented out: only few users of eselect will edit its source
@@ -60,6 +59,13 @@ pkg_postinst() {
chgrp portage "${ROOT}/var/lib/gentoo/news" \
&& chmod g+w "${ROOT}/var/lib/gentoo/news"
+ # we cannot properly depend on paludis because of circular dependencies
+ if use paludis && ! has_version sys-apps/paludis; then
+ ewarn "You have emerged ${PN} with the \"paludis\" USE flag enabled,"
+ ewarn "but apparently Paludis is not installed on your system."
+ ewarn "Part of eselect's functionality may therefore be missing."
+ fi
+
if use bash-completion ; then
elog "In case you have not yet enabled command-line completion"
elog "for eselect, you can run:"