summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaciej Mrozowski <reavertm@gentoo.org>2010-06-25 21:53:04 +0000
committerMaciej Mrozowski <reavertm@gentoo.org>2010-06-25 21:53:04 +0000
commit859596f32de07a7f1501820a0a44b522dd7fac58 (patch)
tree0dcab9051e781446886a7d0481e29b18afcd708f /media-libs/coin
parentEAPI=2; add pkgconfig dep (diff)
downloadgentoo-2-859596f32de07a7f1501820a0a44b522dd7fac58.tar.gz
gentoo-2-859596f32de07a7f1501820a0a44b522dd7fac58.tar.bz2
gentoo-2-859596f32de07a7f1501820a0a44b522dd7fac58.zip
Make bzip2 and zlib support optional
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/coin')
-rw-r--r--media-libs/coin/ChangeLog5
-rw-r--r--media-libs/coin/coin-3.1.3.ebuild14
2 files changed, 12 insertions, 7 deletions
diff --git a/media-libs/coin/ChangeLog b/media-libs/coin/ChangeLog
index f07271f6a792..261707df867b 100644
--- a/media-libs/coin/ChangeLog
+++ b/media-libs/coin/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-libs/coin
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/coin/ChangeLog,v 1.32 2010/06/25 21:26:52 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/coin/ChangeLog,v 1.33 2010/06/25 21:53:04 reavertm Exp $
+
+ 25 Jun 2010; Maciej Mrozowski <reavertm@gentoo.org> coin-3.1.3.ebuild:
+ Make bzip2 and zlib support optional
25 Jun 2010; Maciej Mrozowski <reavertm@gentoo.org> coin-3.1.3.ebuild:
Try harder to use system expat
diff --git a/media-libs/coin/coin-3.1.3.ebuild b/media-libs/coin/coin-3.1.3.ebuild
index 9ac965f2dc64..3412efa9e51b 100644
--- a/media-libs/coin/coin-3.1.3.ebuild
+++ b/media-libs/coin/coin-3.1.3.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/media-libs/coin/coin-3.1.3.ebuild,v 1.2 2010/06/25 21:26:52 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/coin/coin-3.1.3.ebuild,v 1.3 2010/06/25 21:53:04 reavertm Exp $
EAPI=2
@@ -16,22 +16,22 @@ SRC_URI="ftp://ftp.coin3d.org/pub/coin/src/all/${MY_P}.tar.gz"
LICENSE="|| ( GPL-2 PEL )"
KEYWORDS="~amd64 ~ppc ~x86"
SLOT="0"
-IUSE="debug doc javascript openal static-libs threads"
+IUSE="bzip2 debug doc javascript openal static-libs threads zlib"
RDEPEND="
- app-arch/bzip2
dev-libs/expat
media-libs/fontconfig
media-libs/freetype:2
- sys-libs/zlib
virtual/opengl
virtual/glu
x11-libs/libICE
x11-libs/libSM
x11-libs/libX11
x11-libs/libXext
+ bzip2? ( app-arch/bzip2 )
javascript? ( dev-lang/spidermonkey )
openal? ( media-libs/openal )
+ zlib? ( sys-libs/zlib )
"
DEPEND="${RDEPEND}
dev-util/pkgconfig
@@ -72,16 +72,18 @@ src_configure() {
--mandir="${MANDIR}" \
--with-fontconfig \
--with-freetype \
+ $(use_with bzip2) \
$(use_enable debug) \
$(use_enable debug symbols) \
$(use_enable doc html) \
$(use_enable doc man) \
$(use_enable javascript javascript-api) \
+ $(use_with javascript spidermonkey) \
$(use_enable openal sound) \
+ $(use_with openal) \
$(use_enable static-libs static) \
$(use_enable threads threadsafe) \
- $(use_with javascript spidermonkey) \
- $(use_with openal)
+ $(use_with zlib)
}
src_install() {