Take over maintenance, version bump 3.1.3: static-libs, la files removal, install manual pages in private location (bug 312043), install headers in own subdir (bug 297644)

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

6 files changed, 118 insertions, 92 deletions

diff --git a/media-libs/coin/ChangeLog b/media-libs/coin/ChangeLog
index d974cab3bd60..15d017db0aec 100644
--- a/media-libs/coin/ChangeLog
+++ b/media-libs/coin/ChangeLog
@@ -1,6 +1,14 @@
 # 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.30 2010/06/25 12:15:47 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/coin/ChangeLog,v 1.31 2010/06/25 20:26:39 reavertm Exp $
+
+*coin-3.1.3 (25 Jun 2010)
+
+  25 Jun 2010; Maciej Mrozowski <reavertm@gentoo.org> -coin-3.1.2.ebuild,
+  +coin-3.1.3.ebuild, metadata.xml:
+  Take over maintenance, version bump 3.1.3: static-libs, la files removal,
+  install manual pages in private location (bug 312043), install headers
+  in own subdir (bug 297644)
 
   25 Jun 2010; Justin Lecher <jlec@gentoo.org> coin-3.1.0.ebuild,
   coin-3.1.2.ebuild:
@@ -111,11 +119,11 @@
   update to later snapshot (bug 20541)
 
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
+
 *coin-20010601-r1 (1 Feb 2002)
 
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
+
   Added initial ChangeLog which should be updated whenever the package is
   updated in any way. This changelog is targetted to users. This means that the
   comments should well explained and written in clean English. The details about
diff --git a/media-libs/coin/Manifest b/media-libs/coin/Manifest
index dda06b93bf86..f8d1e4223240 100644
--- a/media-libs/coin/Manifest
+++ b/media-libs/coin/Manifest
@@ -1,17 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX coin-3.1.0-javascript.patch 1259 RMD160 b5d2b39d7f75bf975efde6e2e96f21ba97894fc0 SHA1 8ab2f91bc9fdf1e23ba49f9cd2cd4f50810dd7aa SHA256 179489dfd99872150cc229d4f9d1bd40a03c67df5daad20741ff8b3a1874a883
 DIST Coin-3.1.0.tar.gz 5632452 RMD160 0fd8125b08be4d623d2ded14feceb0c70b45eec4 SHA1 369f3b28baa7725ab2a3f0f2cf4ccaa191fcecc5 SHA256 81ec8c4bf0daca6718d6b59eca76354f5f9e1c5a19c20dd4fa173d65f04cb899
-DIST Coin-3.1.2.tar.gz 5557072 RMD160 8b357238ed8f9d718b240911ee9c6fc7d1881213 SHA1 5cf0018da2e67e0fa2858f094bb170acb20f3055 SHA256 2b97c7fc738f73cb76e59f72d16013012ef07733d6455c5efa3a897ef7cb0845
-EBUILD coin-3.1.0.ebuild 1697 RMD160 eb725e9fb3e0f20bf514bd66bcdb0a4d2b24158c SHA1 f34e1ae5e5d5c1b00e5cae079c4054a24aeccd3d SHA256 af1ca228e82709f1491d29f5835c23abb43fb8454852688512fb9e5dff54dc25
-EBUILD coin-3.1.2.ebuild 1705 RMD160 8263908350fcb74eab5bce25ce5aa7bec7098f4c SHA1 143c1690300d8eef06dcac9f0e53f619be4131fe SHA256 8a7186b19690dbcfa51bd852b7e431b0085e8d3b4174934a131b55062b8f540f
-MISC ChangeLog 4217 RMD160 0c1ae9a044ef16c63d3d44e9e28589ef336581e3 SHA1 93f0001597af4cde30af4451e505b78d467ce6bb SHA256 e30cf0257f9986e91cd2b851c231af5ff084440314206b9e62b6caa995823f5c
-MISC metadata.xml 233 RMD160 d81ec1a0582856aeac5ef3bfec5c80d9850216f6 SHA1 9b94f113e7f382076b1749c2a856e409c96cade3 SHA256 dce03f6cdd96135caf3c971a5ca4a8c916f44532fe8cfb6df88b7bdade407e8b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkwknfkACgkQgAnW8HDreRaXmwCdFqPreriWA98G1uVqXVP1Rfwx
-qwMAoMdT/EQNi1av+vNlGz+Mjj2xTETB
-=8KqR
------END PGP SIGNATURE-----
+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 2288 RMD160 d16fc947f61024fca4cbeeb7c53cce706ff80867 SHA1 2a5c9abf3b28defdbb084f670f7808ede705291b SHA256 d2dbe01e1192934625564015327bcde054ca89528f9e746a3851776a26839260
+MISC ChangeLog 4534 RMD160 2faaff21c93bbc17d0ae28630135b6dde9d4c0a7 SHA1 a7faec0201d7c309329772403791e85210c787cb SHA256 5d1249100de45d8ef620219338718c2d399f4f968a680738cfb9c7e4d395b16f
+MISC metadata.xml 224 RMD160 5b3a088ab8ba1bf9e9d131509866de4dedc1319c SHA1 a2a6bf3ce344afeae1cce509356f4a8de1bc7f9c SHA256 35675eac9b2dc95504ecab20a2641ae7eb34e111132c07de56ba90238381fa94
diff --git a/media-libs/coin/coin-3.1.0.ebuild b/media-libs/coin/coin-3.1.0.ebuild
index c09c29237f47..a0c905c12ccd 100644
--- a/media-libs/coin/coin-3.1.0.ebuild
+++ b/media-libs/coin/coin-3.1.0.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.0.ebuild,v 1.4 2010/06/25 12:15:47 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/coin/coin-3.1.0.ebuild,v 1.5 2010/06/25 20:26:39 reavertm Exp $
 
 EAPI=2
 
@@ -16,7 +16,7 @@ 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"
+IUSE="debug doc javascript openal"
 
 RDEPEND="
 	!x11-libs/qwt[doc]
@@ -29,7 +29,6 @@ RDEPEND="
 	x11-libs/libX11
 	x11-libs/libXt
 	x11-libs/libXext
-	java? ( virtual/jdk )
 	javascript? ( dev-lang/spidermonkey )
 	openal? ( media-libs/openal )"
 
@@ -44,6 +43,7 @@ src_prepare() {
 src_configure() {
 	econf \
 		htmldir=/usr/share/doc/${PF}/html				\
+		--disable-java-wrapper							\
 		--enable-3ds-import								\
 		--enable-threadsafe								\
 		--with-fontconfig								\
@@ -52,7 +52,6 @@ src_configure() {
 		$(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)				\
diff --git a/media-libs/coin/coin-3.1.2.ebuild b/media-libs/coin/coin-3.1.2.ebuild
deleted file mode 100644
index ac6cb21e1377..000000000000
--- a/media-libs/coin/coin-3.1.2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# 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.2.ebuild,v 1.2 2010/06/25 12:15:47 jlec Exp $
-
-EAPI=2
-
-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="debug doc java javascript openal"
-
-RDEPEND="
-	!x11-libs/qwt[doc]
-	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_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.1.0-javascript.patch
-}
-
-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}
-}
diff --git a/media-libs/coin/coin-3.1.3.ebuild b/media-libs/coin/coin-3.1.3.ebuild
new file mode 100644
index 000000000000..3e92da186c36
--- /dev/null
+++ b/media-libs/coin/coin-3.1.3.ebuild
@@ -0,0 +1,98 @@
+# 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.1 2010/06/25 20:26:39 reavertm Exp $
+
+EAPI=2
+
+inherit eutils base flag-o-matic
+
+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 )"
+KEYWORDS="~amd64 ~ppc ~x86"
+SLOT="0"
+IUSE="debug doc javascript openal static-libs threads"
+
+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
+	javascript? ( dev-lang/spidermonkey )
+	openal? ( media-libs/openal )
+"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	x11-proto/xextproto
+	doc? ( app-doc/doxygen )
+"
+
+DOCS=(
+	AUTHORS FAQ FAQ.legal NEWS README RELNOTES THANKS
+	docs/{ChangeLog.v${PV},HACKING,oiki-launch.txt}
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.1.0-javascript.patch"
+)
+
+src_configure() {
+	MANDIR=/usr/share/Coin/man
+	append-cppflags -I/usr/include/freetype2
+	# Prefer link-time linking over dlopen
+	econf \
+		htmldir="/usr/share/doc/${PF}/html" \
+		--disable-dl-fontconfig \
+		--disable-dl-freetype \
+		--disable-dl-libbzip2 \
+		--disable-dl-openal \
+		--disable-dl-zlib \
+		--disable-dyld \
+		--disable-loadlibrary \
+		--disable-java-wrapper \
+		--enable-3ds-import \
+		--enable-compact \
+		--enable-dl-glu \
+		--enable-dl-spidermonkey \
+		--enable-system-expat \
+		--includedir="/usr/include/${PN}" \
+		--mandir="${MANDIR}" \
+		--with-fontconfig \
+		--with-freetype \
+		$(use_enable debug) \
+		$(use_enable debug symbols) \
+		$(use_enable doc html) \
+		$(use_enable doc man) \
+		$(use_enable javascript javascript-api) \
+		$(use_enable openal sound) \
+		$(use_enable static-libs static) \
+		$(use_enable threads threadsafe) \
+		$(use_with javascript spidermonkey) \
+		$(use_with openal)
+}
+
+src_install() {
+	base_src_install
+
+	if use doc; then
+		cat >"${T}/50coin" <<-__EOF__
+MANPATH=${MANDIR}
+__EOF__
+		doenvd "${T}/50coin"
+	fi
+
+	# Remove libtool files when not needed.
+	use static-libs || rm -f "${D}"/usr/lib*/*.la
+}
diff --git a/media-libs/coin/metadata.xml b/media-libs/coin/metadata.xml
index 73420b6cf0f0..b95a6037b551 100644
--- a/media-libs/coin/metadata.xml
+++ b/media-libs/coin/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 <herd>no-herd</herd>
 <maintainer>
-  <email>maintainer-needed@gentoo.org</email>
+  <email>reavertm@gentoo.org</email>
 </maintainer>
 </pkgmetadata>