summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Ruppert <idl0r@gentoo.org>2010-12-28 22:06:33 +0000
committerChristian Ruppert <idl0r@gentoo.org>2010-12-28 22:06:33 +0000
commit16df58b8631c0951a73f0f90102dbd5403813d2f (patch)
treef645b13d96e4512d40488daf9066ffe4a7bf99f7 /app-backup
parentstable ppc64, bug 346447 (diff)
downloadgentoo-2-16df58b8631c0951a73f0f90102dbd5403813d2f.tar.gz
gentoo-2-16df58b8631c0951a73f0f90102dbd5403813d2f.tar.bz2
gentoo-2-16df58b8631c0951a73f0f90102dbd5403813d2f.zip
Make curl and readline optional.
(Portage version: 2.1.9.25/cvs/Linux i686)
Diffstat (limited to 'app-backup')
-rw-r--r--app-backup/amanda/ChangeLog5
-rw-r--r--app-backup/amanda/amanda-3.2.1.ebuild12
2 files changed, 12 insertions, 5 deletions
diff --git a/app-backup/amanda/ChangeLog b/app-backup/amanda/ChangeLog
index b52f9caa5cc8..d3ce1da7cd4f 100644
--- a/app-backup/amanda/ChangeLog
+++ b/app-backup/amanda/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-backup/amanda
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/ChangeLog,v 1.74 2010/12/28 00:16:10 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/ChangeLog,v 1.75 2010/12/28 22:06:33 idl0r Exp $
+
+ 28 Dec 2010; Christian Ruppert <idl0r@gentoo.org> amanda-3.2.1.ebuild:
+ Make curl and readline optional.
28 Dec 2010; Christian Ruppert <idl0r@gentoo.org> amanda-3.2.1.ebuild:
Fix amandahomedir in amaddclient and amserverconfig to use /var/spool/amanda
diff --git a/app-backup/amanda/amanda-3.2.1.ebuild b/app-backup/amanda/amanda-3.2.1.ebuild
index 2a65d1ab6e7c..21e6cf316812 100644
--- a/app-backup/amanda/amanda-3.2.1.ebuild
+++ b/app-backup/amanda/amanda-3.2.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-3.2.1.ebuild,v 1.2 2010/12/28 00:16:10 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-3.2.1.ebuild,v 1.3 2010/12/28 22:06:33 idl0r Exp $
EAPI=3
inherit autotools eutils perl-module
@@ -21,10 +21,11 @@ RDEPEND="sys-libs/readline
net-misc/openssh
>=dev-libs/glib-2.26.0
nls? ( virtual/libintl )
- s3? ( >=net-misc/curl-7.10.0 )
+ curl? ( >=net-misc/curl-7.10.0 )
samba? ( net-fs/samba )
kerberos? ( app-crypt/mit-krb5 )
xfs? ( sys-fs/xfsdump )
+ readline? ( sys-libs/readline )
!minimal? (
virtual/mailx
app-arch/mt-st
@@ -41,7 +42,7 @@ DEPEND="${RDEPEND}
app-text/docbook-xml-dtd
"
-IUSE="gnuplot ipv6 kerberos minimal nls s3 samba xfs"
+IUSE="curl gnuplot ipv6 kerberos minimal nls readline s3 samba xfs"
S="${WORKDIR}/${MY_P}"
@@ -267,7 +268,10 @@ src_configure() {
# build manpages
myconf="${myconf} --enable-manpage-build"
- econf ${myconf} || die "econf failed!"
+ econf \
+ $(use_with readline) \
+ $(use_with curl libcurl) \
+ ${myconf}
}
src_compile() {