summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2009-06-05 03:13:10 +0000
committerJeroen Roovers <jer@gentoo.org>2009-06-05 03:13:10 +0000
commit1468ed1da47231686b6bb65352d9dd9484c7b33b (patch)
tree16595305af1bf8b86d6e7af134f90b33f8f2a2a2
parentAdded workarounds to address bugs #263645, #263880, and #267936. (diff)
downloadhistorical-1468ed1da47231686b6bb65352d9dd9484c7b33b.tar.gz
historical-1468ed1da47231686b6bb65352d9dd9484c7b33b.tar.bz2
historical-1468ed1da47231686b6bb65352d9dd9484c7b33b.zip
Depend on either net-nds/{rpcbind,portmap} (bug #272386).
Package-Manager: portage-2.2_rc33/cvs/Linux i686
-rw-r--r--app-admin/fam/ChangeLog5
-rw-r--r--app-admin/fam/Manifest4
-rw-r--r--app-admin/fam/fam-2.7.0-r4.ebuild5
3 files changed, 9 insertions, 5 deletions
diff --git a/app-admin/fam/ChangeLog b/app-admin/fam/ChangeLog
index 1afafc5f6caa..52b975e2d81f 100644
--- a/app-admin/fam/ChangeLog
+++ b/app-admin/fam/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-admin/fam
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/fam/ChangeLog,v 1.55 2009/05/06 20:48:26 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/fam/ChangeLog,v 1.56 2009/06/05 03:13:10 jer Exp $
+
+ 05 Jun 2009; Jeroen Roovers <jer@gentoo.org> fam-2.7.0-r4.ebuild:
+ Depend on either net-nds/{rpcbind,portmap} (bug #272386).
06 May 2009; Jeroen Roovers <jer@gentoo.org> fam-2.7.0-r4.ebuild:
Do not redundantly set WANT_AUTO{CONF.MAKE}.
diff --git a/app-admin/fam/Manifest b/app-admin/fam/Manifest
index 08411cc82c49..12b121c5e56e 100644
--- a/app-admin/fam/Manifest
+++ b/app-admin/fam/Manifest
@@ -5,6 +5,6 @@ AUX fam-2.7.0-limits.patch 316 RMD160 13df15ec643cb8b976b3704b8e6dc9d5aaeb83d0 S
AUX famd 490 RMD160 ba0a1761b473c946d645aac2cc6b20d6bfbe8382 SHA1 a705c2b8dda3fb79fad015523ea2fced12569170 SHA256 1ce8019d276ef5f9ddaa38d0fc0eff12f66934eea21931b1f98ad8bcafc22bd9
DIST fam-2.7.0-dnotify.patch.bz2 7127 RMD160 dfca4dc1fa98c968ba684cb0510e0ad241dc7d4a SHA1 058c8eb3dee154e2f63b1a2ec585911ec76b13fd SHA256 c5b7df410521f919c98ca9814743c9dd753b71c1bbc048d62f967625d8e4afdb
DIST fam-2.7.0.tar.gz 301974 RMD160 1895b578d6a141c36d5bee4e3fbbc2a298a91430 SHA1 6c2316f02acf89a41c42ffc3d7fd9cf5eada83a8 SHA256 1e0aa136693a3e9f4b43ebd71e7bd934cea31817a4a6cba2edc7aac353b8a93f
-EBUILD fam-2.7.0-r4.ebuild 2151 RMD160 7ef869944a94e09a121f98be0d0fa632267ee42c SHA1 76fb670fac6e575ecc6d1bab166041378c7bc891 SHA256 6a679e2375c902fb8b6dff493a1e7a3741d0bb0bd9b0ca8484f6c144c9d389e9
-MISC ChangeLog 10614 RMD160 17a3d9f893df4f8321520b1d3b15dfbd74f84116 SHA1 7ac45966cb3618c0442e998176cdd19531a2893c SHA256 fd60ee91350feddad98fbdd3d0f01320f198978551ca8b0fb0ec3c490be2449e
+EBUILD fam-2.7.0-r4.ebuild 2194 RMD160 df18e9d78aef7528798c515d2c6c2e3a5bdaf005 SHA1 efd4f8c740ddcb6693bcb83ace03ff6e9f1dc092 SHA256 d5fd20279ef5723fe1172dbb719be2cfc5acc092c262181dcd6081234ab88ecd
+MISC ChangeLog 10743 RMD160 378cff466a68162bbe871a8f276a7ca608092066 SHA1 9f7152638e4f2738dde9ae556f7ed42e73f05c17 SHA256 dec336edacc04797d6dfba58d0559aec849bee6b0280ffa3594a095028829dfa
MISC metadata.xml 252 RMD160 ed7e3d6637ec96975f17ce5c33628aa482dfd663 SHA1 ddd00321e20f4a53a140eeb56cb01b9fab24d657 SHA256 76fd24f00e95b2892ca60acdce02d8c85dfeff84fc89ca14ffdbc00b82de44b3
diff --git a/app-admin/fam/fam-2.7.0-r4.ebuild b/app-admin/fam/fam-2.7.0-r4.ebuild
index 2427ce4e3fea..8ceae289b6b3 100644
--- a/app-admin/fam/fam-2.7.0-r4.ebuild
+++ b/app-admin/fam/fam-2.7.0-r4.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/fam/fam-2.7.0-r4.ebuild,v 1.21 2009/05/06 20:48:26 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/fam/fam-2.7.0-r4.ebuild,v 1.22 2009/06/05 03:13:10 jer Exp $
inherit libtool eutils autotools
@@ -14,8 +14,9 @@ SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
IUSE=""
-DEPEND=">=net-nds/portmap-5b-r6
+DEPEND="|| ( net-dns/rpcbind >=net-nds/portmap-5b-r6 )
!app-admin/gamin"
+RDEPEND="${DEPEND}"
PROVIDE="virtual/fam"
src_unpack() {