From a2cf64998cdbc71902015b4a86d00f975cf47183 Mon Sep 17 00:00:00 2001
From: Davide Pesavento <davidepesa@gmail.com>
Date: Tue, 24 Mar 2009 17:01:59 +0100
Subject: [PATCH] Improvements to media-libs/SoQt-1.4.1-r1.

 o Switched to EAPI 2.
 o More precise dependencies.
 o Don't append library link instructions to LDFLAGS,
   use CONFIG_QTLIBS instead.
 o Force emake -j1 because parallel building fails.
---
 media-libs/SoQt/Manifest             |   5 +-
 media-libs/SoQt/SoQt-1.4.1-r1.ebuild | 102 +++++++++++++++++------------------
 media-libs/SoQt/metadata.xml         |   8 ---
 3 files changed, 50 insertions(+), 65 deletions(-)
 rewrite media-libs/SoQt/Manifest (66%)
 rewrite media-libs/SoQt/SoQt-1.4.1-r1.ebuild (64%)
 delete mode 100644 media-libs/SoQt/metadata.xml

diff --git a/media-libs/SoQt/Manifest b/media-libs/SoQt/Manifest
dissimilarity index 66%
index 535d859..6b6b938 100644
--- a/media-libs/SoQt/Manifest
+++ b/media-libs/SoQt/Manifest
@@ -1,3 +1,2 @@
-DIST SoQt-1.4.1.tar.gz 1706403 RMD160 5978543ff90db0943675bd3acf883849b42d3586 SHA1 bbbb4eedf308fa4ea46bb20700cb5bbdc39fe85f SHA256 741449af3619a60995d27838d94b8a77e6f8bedf00d6fd3745a8d15cbaaea1ea
-EBUILD SoQt-1.4.1-r1.ebuild 1319 RMD160 f0bac92733b94e396e1d4fac044697050713e97c SHA1 685cf962ac668487fb2f14d8f6d5be51095537cb SHA256 4e7507496c798f962025c2e0dbb05e1de1124515c8a8113dc51216968931f717
-MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a
+DIST SoQt-1.4.1.tar.gz 1706403 RMD160 5978543ff90db0943675bd3acf883849b42d3586 SHA1 bbbb4eedf308fa4ea46bb20700cb5bbdc39fe85f SHA256 741449af3619a60995d27838d94b8a77e6f8bedf00d6fd3745a8d15cbaaea1ea
+EBUILD SoQt-1.4.1-r1.ebuild 1155 RMD160 be9547aebc5f10c04abcc12f65b6821c5c4ec91f SHA1 b86ae8438fed8c4f1f37dbc094b31444d764d7e2 SHA256 b4177b89e6b60da0fe024dbd85c530ec5a3c959e196059f48565282afc9baf34
diff --git a/media-libs/SoQt/SoQt-1.4.1-r1.ebuild b/media-libs/SoQt/SoQt-1.4.1-r1.ebuild
dissimilarity index 64%
index b2efa44..190f963 100644
--- a/media-libs/SoQt/SoQt-1.4.1-r1.ebuild
+++ b/media-libs/SoQt/SoQt-1.4.1-r1.ebuild
@@ -1,54 +1,48 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/SoQt/SoQt-1.4.1.ebuild,v 1.1 2007/10/21 13:19:51 carlo Exp $
-
-EAPI=1
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="SoQt provides the glue between Coin high-level 3D visualization library and Qt 2D GUI library"
-SRC_URI="ftp://ftp.coin3d.org/pub/coin/src/all/${P}.tar.gz"
-HOMEPAGE="http://www.coin3d.org/"
-
-SLOT="0"
-LICENSE="|| ( GPL-2 PEL )"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc qt4"
-
-RDEPEND="qt4? ( ||
-		(
-			( x11-libs/qt-gui:4 x11-libs/qt-opengl:4 x11-libs/qt-qt3support:4 )
-			<x11-libs/qt-4.4:4
-		)
-	)
-	!qt4? ( x11-libs/qt:3 )
-	>=media-libs/coin-2.4.4"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-use qt4 && QT4_BUILT_WITH_USE_CHECK="qt3support"
-
-src_compile() {
-	if use qt4; then
-		export QTDIR="/usr"
-		export PATH="/usr/bin/:${PATH}"
-		append-ldflags $(pkg-config --libs QtCore QtGui)
-	else
-		export QTDIR="/usr/qt/3"
-	fi
-
-	filter-ldflags -Wl,--as-needed
-
-	econf --with-coin \
-		--disable-html-help \
-		$(use_enable doc html) \
-		htmldir="${ROOT}"usr/share/doc/${PF}/html \
-		|| die "configure failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "installation failed"
-	dodoc AUTHORS BUGS.txt ChangeLog FAQ NEWS README
-}
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/SoQt/SoQt-1.4.1.ebuild,v 1.2 2008/12/15 19:05:07 angelos Exp $
+
+EAPI="2"
+
+inherit flag-o-matic
+
+DESCRIPTION="The glue between Coin3D and Qt"
+SRC_URI="ftp://ftp.coin3d.org/pub/coin/src/all/${P}.tar.gz"
+HOMEPAGE="http://www.coin3d.org/"
+
+SLOT="0"
+LICENSE="|| ( GPL-2 PEL )"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc qt4"
+
+RDEPEND=">=media-libs/coin-2.4.4
+	qt4? (
+		x11-libs/qt-gui:4[qt3support]
+		x11-libs/qt-opengl:4[qt3support]
+		x11-libs/qt-qt3support:4
+	)
+	!qt4? ( x11-libs/qt:3[opengl] )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+src_configure() {
+	if use qt4; then
+		export PATH="/usr/bin/:${PATH}"
+		export QTDIR="/usr"
+		export CONFIG_QTLIBS="$(pkg-config --libs QtGui)"
+	fi
+
+	append-ldflags -Wl,--no-as-needed
+
+	econf --with-coin --disable-html-help $(use_enable doc html) htmldir=/usr/share/doc/${PF}/html
+}
+
+src_compile() {
+	emake -j1 || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS ChangeLog NEWS README*
+}
diff --git a/media-libs/SoQt/metadata.xml b/media-libs/SoQt/metadata.xml
deleted file mode 100644
index 54494c4..0000000
--- a/media-libs/SoQt/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
-- 
2.11.4.GIT