Make bzip2 and zlib support optional

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/media-libs/coin/ChangeLog b/media-libs/coin/ChangeLog
index f07271f6a792027ded7ab5462e605bd0273805ff..261707df867b5883ef9312d8445edd7c795b3da9 100644 (file)
--- 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/Manifest b/media-libs/coin/Manifest
index 357073d813c11a43b38bab6726e80187babdce4e..b3c9d0424aba517a30e2d7f03114f8e74af6429d 100644 (file)
--- a/media-libs/coin/Manifest
+++ b/media-libs/coin/Manifest
@@ -2,6 +2,6 @@ AUX coin-3.1.0-javascript.patch 1259 RMD160 b5d2b39d7f75bf975efde6e2e96f21ba9789
 DIST Coin-3.1.0.tar.gz 5632452 RMD160 0fd8125b08be4d623d2ded14feceb0c70b45eec4 SHA1 369f3b28baa7725ab2a3f0f2cf4ccaa191fcecc5 SHA256 81ec8c4bf0daca6718d6b59eca76354f5f9e1c5a19c20dd4fa173d65f04cb899
 DIST Coin-3.1.3.tar.gz 5981534 RMD160 e57fd6a4876a06874429f9ad6b96f166f5609362 SHA1 8e9f05628461963623686d3ec53102214e233dd1 SHA256 583478c581317862aa03a19f14c527c3888478a06284b9a46a0155fa5886d417
 EBUILD coin-3.1.0.ebuild 1666 RMD160 79cba148c500a2246c814dff55cf3505fc039dc9 SHA1 acb72332065b1a2a8163c5235c3289d691c0c186 SHA256 985d0c3d0de3e164994cd1006ef8b6ce0932928ed5b082acbd41b9c075a046b0
-EBUILD coin-3.1.3.ebuild 2351 RMD160 918584e0b16f8cf96361afda9b6b35c4b6d587cc SHA1 02cd6773f5e8b63630a45d5d725451fafd467198 SHA256 f565958fa93082a8f11d01c7e616e5a7801befaa195cfd896b33d331174daa87
-MISC ChangeLog 4641 RMD160 e94847b7c2749b51f2f697b5971f0676aa8b47af SHA1 e11f39407fed17901cbca8b6c8bf93e3b3bcc258 SHA256 578c34c4bb669430b1e12122ab1cf7bb772647c1151a58b17c5d220101ffd62d
+EBUILD coin-3.1.3.ebuild 2426 RMD160 139aba7cfd0acee0e315c084880f78e65c1d24dc SHA1 2514bdfe7ecaca81a0e8789e2e3bc1536ca94f76 SHA256 b291dce87dbb2d634d795f7101301b027a0abead09ad915b6d2558c118cfe90a
+MISC ChangeLog 4754 RMD160 5bfeb78c8201a6c3333646120ef1ccd8064dfb2c SHA1 57fc1af6fa4b6db888efad06b05e0ea1c4520e7a SHA256 7ff23afb7c674a7b92c7c2f10373e8437184d944ed0a0bb7dbbfed3c5b53fee3
 MISC metadata.xml 224 RMD160 5b3a088ab8ba1bf9e9d131509866de4dedc1319c SHA1 a2a6bf3ce344afeae1cce509356f4a8de1bc7f9c SHA256 35675eac9b2dc95504ecab20a2641ae7eb34e111132c07de56ba90238381fa94

diff --git a/media-libs/coin/coin-3.1.3.ebuild b/media-libs/coin/coin-3.1.3.ebuild
index 9ac965f2dc640f4deaffdf03bab84906b090ea1a..3412efa9e51bcaca33a0e22f67acc1b8c7eaafc1 100644 (file)
--- 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() {