media-libs/coin: Add fix for build with gcc-4.7, #448614; move to EAPI=5 and autotools-utils.eclass; add some prefix awareness; drop old

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916)

6 files changed, 125 insertions, 78 deletions

diff --git a/media-libs/coin/ChangeLog b/media-libs/coin/ChangeLog
index f539e9a396a4..279248d63a18 100644
--- a/media-libs/coin/ChangeLog
+++ b/media-libs/coin/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/coin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/coin/ChangeLog,v 1.40 2012/05/05 08:02:38 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/coin/ChangeLog,v 1.41 2012/12/26 14:30:07 jlec Exp $
+
+*coin-3.1.3-r2 (26 Dec 2012)
+
+  26 Dec 2012; Justin Lecher <jlec@gentoo.org> -coin-3.1.0.ebuild,
+  +coin-3.1.3-r2.ebuild, +files/coin-3.1.3-gcc-4.7.patch,
+  files/coin-3.1.3-pkgconfig-partial.patch, metadata.xml:
+  Add fix for build with gcc-4.7, #448614; move to EAPI=5 and
+  autotools-utils.eclass; add some prefix awareness; drop old
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org> coin-3.1.0.ebuild,
   coin-3.1.3-r1.ebuild:
diff --git a/media-libs/coin/coin-3.1.0.ebuild b/media-libs/coin/coin-3.1.0.ebuild
deleted file mode 100644
index ab73bd0a9aef..000000000000
--- a/media-libs/coin/coin-3.1.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2012 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.8 2012/05/05 08:02:38 jdhore 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 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
-	javascript? ( dev-lang/spidermonkey )
-	openal? ( media-libs/openal )"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-javascript.patch"
-	epatch "${FILESDIR}/${P}-wrap-msvc-wine-fix.patch"
-}
-
-src_configure() {
-	econf \
-		htmldir=/usr/share/doc/${PF}/html				\
-		--disable-java-wrapper							\
-		--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 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-r2.ebuild b/media-libs/coin/coin-3.1.3-r2.ebuild
new file mode 100644
index 000000000000..a707285f5adb
--- /dev/null
+++ b/media-libs/coin/coin-3.1.3-r2.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2012 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-r2.ebuild,v 1.1 2012/12/26 14:30:07 jlec Exp $
+
+EAPI=5
+
+inherit autotools-utils flag-o-matic
+
+MY_P=${P/c/C}
+
+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="bzip2 debug doc javascript openal simage static-libs threads zlib"
+
+# NOTE: expat is not really needed as --enable-system-expat is broken
+RDEPEND="
+	dev-libs/expat
+	media-libs/fontconfig
+	media-libs/freetype:2
+	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 )
+	simage? ( media-libs/simage )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	x11-proto/xextproto
+	doc? ( app-doc/doxygen )
+"
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1.0-javascript.patch
+	"${FILESDIR}"/${P}-pkgconfig-partial.patch
+	"${FILESDIR}"/${P}-gcc-4.7.patch
+)
+
+DOCS=(
+	AUTHORS FAQ FAQ.legal NEWS README RELNOTES THANKS
+	docs/{ChangeLog.v${PV},HACKING,oiki-launch.txt}
+)
+
+src_configure() {
+	append-cppflags -I"${EPREFIX}/usr/include/freetype2"
+	# Prefer link-time linking over dlopen
+	local myeconfargs=(
+		htmldir="/usr/share/doc/${PF}/html"
+		--disable-dl-fontconfig
+		--disable-dl-freetype
+		--disable-dl-libbzip2
+		--disable-dl-openal
+		--disable-dl-simage
+		--disable-dl-zlib
+		--disable-dyld
+		--disable-loadlibrary
+		--disable-man
+		--disable-java-wrapper
+		--enable-3ds-import
+		--enable-compact
+		--enable-dl-glu
+		--enable-dl-spidermonkey
+		--enable-system-expat
+		--includedir="/usr/include/${PN}"
+		--with-fontconfig
+		--with-freetype
+		$(use_with bzip2)
+		$(use_enable debug)
+		$(use_enable debug symbols)
+		$(use_enable doc html)
+		$(use_enable javascript javascript-api)
+		$(use_with javascript spidermonkey)
+		$(use_enable openal sound)
+		$(use_with openal)
+		$(use_with simage)
+		$(use_enable threads threadsafe)
+		$(use_with zlib)
+		)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	# Remove Coin from Libs.private
+	sed -e '/Libs.private/s/ -lCoin//' -i "${BUILD_DIR}"/Coin.pc || die
+
+	autotools-utils_src_install
+}
diff --git a/media-libs/coin/files/coin-3.1.3-gcc-4.7.patch b/media-libs/coin/files/coin-3.1.3-gcc-4.7.patch
new file mode 100644
index 000000000000..fd2430903802
--- /dev/null
+++ b/media-libs/coin/files/coin-3.1.3-gcc-4.7.patch
@@ -0,0 +1,10 @@
+--- coin3-3.1.3.orig/include/Inventor/SbBasic.h
++++ coin3-3.1.3/include/Inventor/SbBasic.h
+@@ -24,6 +24,7 @@
+  *
+ \**************************************************************************/
+ 
++#include <Inventor/C/errors/debugerror.h>
+ #include <Inventor/C/basic.h>
+ 
+ /* ********************************************************************** */
diff --git a/media-libs/coin/files/coin-3.1.3-pkgconfig-partial.patch b/media-libs/coin/files/coin-3.1.3-pkgconfig-partial.patch
index a6dc1fa5f1e2..3fd3bca726d4 100644
--- a/media-libs/coin/files/coin-3.1.3-pkgconfig-partial.patch
+++ b/media-libs/coin/files/coin-3.1.3-pkgconfig-partial.patch
@@ -1,6 +1,6 @@
 diff -ru ../Coin-3.1.3/Coin.pc.in ./Coin.pc.in
---- ../Coin-3.1.3/Coin.pc.in	2010-03-02 14:20:09.000000000 +0100
-+++ ./Coin.pc.in	2010-06-28 19:27:59.634534460 +0200
+--- Coin.pc.in	2010-03-02 14:20:09.000000000 +0100
++++ Coin.pc.in	2010-06-28 19:27:59.634534460 +0200
 @@ -10,7 +10,8 @@
  Version: @COIN_VERSION@
  Requires:
diff --git a/media-libs/coin/metadata.xml b/media-libs/coin/metadata.xml
index d1d10583cc14..82c9c9c00eb8 100644
--- a/media-libs/coin/metadata.xml
+++ b/media-libs/coin/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>reavertm@gentoo.org</email>
-</maintainer>
-<use>
-	<flag name="simage">Texture loading via <pkg>media-libs/simage</pkg> library</flag>
-</use>
+  <maintainer>
+    <email>reavertm@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name="simage">Texture loading via <pkg>media-libs/simage</pkg> library</flag>
+  </use>
 </pkgmetadata>