Version bump. (bug #270448)

Fix dependencies and configure options. (bug #239767)
Re-enable java and javascript support. Make doxygen optional.
(Portage version: 2.2_rc38/cvs/Linux x86_64)

3 files changed, 71 insertions, 74 deletions

diff --git a/media-libs/coin/ChangeLog b/media-libs/coin/ChangeLog
index 8593e31fd066..bda4bb3f3032 100644
--- a/media-libs/coin/ChangeLog
+++ b/media-libs/coin/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/coin
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/coin/ChangeLog,v 1.24 2008/12/15 19:39:51 angelos Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/coin/ChangeLog,v 1.25 2009/08/12 05:16:07 dirtyepic Exp $
+
+*coin-3.1.0 (12 Aug 2009)
+
+  12 Aug 2009; Ryan Hill <dirtyepic@gentoo.org> -coin-2.4.6.ebuild,
+  +coin-3.1.0.ebuild:
+  Version bump. (bug #270448)
+  Fix dependencies and configure options. (bug #239767)
+  Re-enable java and javascript support. Make doxygen optional.
 
   15 Dec 2008; Christoph Mende <angelos@gentoo.org> coin-2.4.5.ebuild,
   coin-2.4.6.ebuild, coin-2.5.0.ebuild:
diff --git a/media-libs/coin/coin-2.4.6.ebuild b/media-libs/coin/coin-2.4.6.ebuild
deleted file mode 100644
index 47a8c7a22471..000000000000
--- a/media-libs/coin/coin-2.4.6.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/coin/coin-2.4.6.ebuild,v 1.2 2008/12/15 19:39:51 angelos Exp $
-
-inherit eutils
-
-MY_P=${P/c/C}
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="a high-level 3D graphics toolkit, fully compatible with SGI Open Inventor 2.1."
-HOMEPAGE="http://www.coin3d.org/"
-SRC_URI="ftp://ftp.coin3d.org/pub/coin/src/all/${MY_P}.tar.gz"
-
-LICENSE="|| ( GPL-2 PEL )"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="bzip2 debug doc fontconfig openal opengl X zlib" # java javascript
-
-RDEPEND="media-libs/freetype
-	bzip2?	( app-arch/bzip2 )
-	fontconfig? ( media-libs/fontconfig )
-	openal?	( media-libs/openal )
-	opengl? ( virtual/opengl virtual/glu )
-	X?      ( x11-libs/libXt x11-libs/libXext )
-	zlib? 	( sys-libs/zlib )"
-	# java?	( virtual/jdk )
-	# javascript? ( dev-lang/spidermonkey )
-DEPEND="${RDEPEND}
-	app-doc/doxygen"
-
-src_compile() {
-	# "waiting" for someone needing mesa, instead opengl
-	# simage currently not in the repository
-	# java and javascript support fails for differnt reasons
-	# otherwise hopefully sensible defaults and enough use flags
-	local myconf="--enable-optimization \
-			--enable-3ds-import \
-			--enable-vrml97 \
-			--enable-man  \
-			--disable-html-help \
-			--without-mesa \
-			--without-simage \
-			--with-doxygen \
-			--with-freetype \
-			$(use_enable debug) \
-			$(use_enable debug symbols) \
-			$(use_enable doc html) \
-			$(use_with bzip2) \
-			$(use_with fontconfig) \
-			$(use_with openal) \
-			$(use_with opengl) \
-			$(use_with opengl glu) \
-			$(use_with X x) \
-			$(use_with zlib ) \
-			--disable-java-wrapper \
-			--disable-javascript-api \
-			--without-spidermokey"
-			# $(use_enable java java-wrapper) \
-			# $(use_enable javascript javascript-api) \
-			# $(use_with javascript spidermonkey) \
-
-	econf ${myconf} htmldir=/usr/share/doc/${PF}/html
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS NEWS README* RELNOTES THANKS
-
-	# Waiting for a maintainer to fix, see #117756.
-	rm -f "${D}"/usr/share/man/man3/_var_tmp* "${D}"/usr/sharedoc/coin-2.4.4/html/dir__*
-}
diff --git a/media-libs/coin/coin-3.1.0.ebuild b/media-libs/coin/coin-3.1.0.ebuild
new file mode 100644
index 000000000000..707d19f5157d
--- /dev/null
+++ b/media-libs/coin/coin-3.1.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/coin/coin-3.1.0.ebuild,v 1.1 2009/08/12 05:16:07 dirtyepic Exp $
+
+EAPI=2
+
+MY_P=${P/c/C}
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="a high-level 3D graphics toolkit, fully compatible with SGI Open Inventor 2.1."
+HOMEPAGE="http://www.coin3d.org/"
+SRC_URI="ftp://ftp.coin3d.org/pub/coin/src/all/${MY_P}.tar.gz"
+
+LICENSE="|| ( GPL-2 PEL )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug doc java javascript openal"
+
+RDEPEND="media-libs/fontconfig
+		media-libs/freetype
+		virtual/opengl
+		virtual/glu
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXt
+		x11-libs/libXext
+		java? ( virtual/jdk )
+		javascript? ( dev-lang/spidermonkey )
+		openal? ( media-libs/openal )"
+
+DEPEND="${RDEPEND}
+		doc? ( app-doc/doxygen )
+		dev-util/pkgconfig"
+
+src_configure() {
+	econf \
+		htmldir=/usr/share/doc/${PF}/html				\
+		--enable-3ds-import								\
+		--enable-threadsafe								\
+		--with-fontconfig								\
+		--with-freetype									\
+		$(use_enable debug)								\
+		$(use_enable debug symbols)						\
+		$(use_enable doc html)							\
+		$(use_enable doc man)							\
+		$(use_enable java java-wrapper)					\
+		$(use_enable javascript javascript-api)			\
+		$(use_enable openal sound)						\
+		$(use_with javascript spidermonkey)				\
+		$(use_with openal)
+}
+
+src_compile() {
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS FAQ FAQ.legal NEWS README RELNOTES THANKS	docs/ChangeLog.v${PV}
+}