gcc-4.4 fix (bug 320353), rework libtool files and static libs installation

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

4 files changed, 33 insertions, 7 deletions

diff --git a/media-libs/quarter/ChangeLog b/media-libs/quarter/ChangeLog
index b38b4e9d0228..a6cf6ca7da8a 100644
--- a/media-libs/quarter/ChangeLog
+++ b/media-libs/quarter/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/quarter
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/quarter/ChangeLog,v 1.2 2010/01/30 04:18:11 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/quarter/ChangeLog,v 1.3 2010/05/18 14:34:59 reavertm Exp $
+
+*quarter-1.0.0-r1 (18 May 2010)
+
+  18 May 2010; Maciej Mrozowski <reavertm@gentoo.org> -quarter-1.0.0.ebuild,
+  +quarter-1.0.0-r1.ebuild, +files/quarter-1.0.0-gcc44.patch:
+  gcc-4.4 fix (bug 320353), rework libtool files and static libs
+  installation
 
   30 Jan 2010; Maciej Mrozowski <reavertm@gentoo.org> metadata.xml:
   Updated my email
diff --git a/media-libs/quarter/Manifest b/media-libs/quarter/Manifest
index 08089e018433..aba24f47f04b 100644
--- a/media-libs/quarter/Manifest
+++ b/media-libs/quarter/Manifest
@@ -1,4 +1,5 @@
+AUX quarter-1.0.0-gcc44.patch 362 RMD160 61899dc2641fcf0452ba7626c8b662d93abbe333 SHA1 c4da271e7f7f1436af4790266a30c9306daf851e SHA256 553f8a82511027f76bbb1ecf47afacfbdc322315ca91c06a01387f6253add735
 DIST Quarter-1.0.0.tar.gz 617534 RMD160 d954cac8d35e83ffb565c28fd3e28864b8dfa023 SHA1 f141490008c3139cb8f01c71148e2dd8802a97d0 SHA256 ed7a29856e2bdc9db20b7c4fa27c47af1bf325d62ef3700fccbc83476f41da1a
-EBUILD quarter-1.0.0.ebuild 1125 RMD160 57da192f526a33d25d1fbd59ffefcf31a0027cd4 SHA1 d4c40a9b77a72e21380d03215478d76602586e93 SHA256 9bb38cbf6ba7380f1aa01831ef09e3fcc5e981ba46934211567cc20a703f20e3
-MISC ChangeLog 499 RMD160 5105d053efc0a6c11c430d05f6b34bded7c51806 SHA1 a47f6560cf11dfe22c9727c2b14da48bbb2c5c24 SHA256 e09cd83e9d8adea40f4de2ae21fe99b5df099083aebb75fe8b54198be4003ab9
+EBUILD quarter-1.0.0-r1.ebuild 1179 RMD160 d793745a5925ecbcc144ca3b1b66760b46f2bb60 SHA1 212f1801712368393df08e75f2e63aa9f4e4ad7c SHA256 6f630f25e16ce166fa55bca2ca1adf5d2bcf59fc60e755822854b1bfd7dc2051
+MISC ChangeLog 752 RMD160 7e9fcee2334f243ad77813f2f3078333f0b01f76 SHA1 855ad4016ba1745a1c4475b8e2fb5167f2838af4 SHA256 5380b4a84e6e6b7210e2d21742bdb375117ade35d9b8a1a4578d2eed6e3d1c61
 MISC metadata.xml 254 RMD160 f661acd63a04d82c4a9aedbe1f22e1b113db802f SHA1 822d4fb144325dd7f74d249a2dfccae18436fc0c SHA256 d39f6360d9c640cc051d3cdea582f0a1b604c98c5760dc4b1cab7e2ee2fb2036
diff --git a/media-libs/quarter/files/quarter-1.0.0-gcc44.patch b/media-libs/quarter/files/quarter-1.0.0-gcc44.patch
new file mode 100644
index 000000000000..9c3a44c1b513
--- /dev/null
+++ b/media-libs/quarter/files/quarter-1.0.0-gcc44.patch
@@ -0,0 +1,11 @@
+diff -ru ../Quarter-1.0.0/src/Quarter/Quarter.cpp ./src/Quarter/Quarter.cpp
+--- ../Quarter-1.0.0/src/Quarter/Quarter.cpp	2009-01-26 22:47:07.000000000 +0100
++++ ./src/Quarter/Quarter.cpp	2010-05-18 16:17:25.246880238 +0200
+@@ -123,6 +123,7 @@
+   \subpage examiner
+ */
+ 
++#include <stdio.h>
+ 
+ #include <Inventor/SoDB.h>
+ #include <Inventor/nodekits/SoNodeKit.h>
diff --git a/media-libs/quarter/quarter-1.0.0.ebuild b/media-libs/quarter/quarter-1.0.0-r1.ebuild
index d33c5cd5c9d4..3fee254655b3 100644
--- a/media-libs/quarter/quarter-1.0.0.ebuild
+++ b/media-libs/quarter/quarter-1.0.0-r1.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/quarter/quarter-1.0.0.ebuild,v 1.1 2009/11/24 17:21:02 ayoy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/quarter/quarter-1.0.0-r1.ebuild,v 1.1 2010/05/18 14:34:59 reavertm Exp $
 
 EAPI="2"
 
+inherit base
+
 MY_P="${P/q/Q}"
 
 DESCRIPTION="A glue between Nokia Qt4 and Coin3D"
@@ -28,6 +30,10 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-gcc44.patch"
+)
+
 src_configure() {
 	econf \
 		htmldir="${ROOT}usr/share/doc/${PF}/html" \
@@ -39,8 +45,9 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	base_src_install
 	dodoc AUTHORS NEWS README || die "dodoc failed"
 	# Do not install .la files
-	rm -f "${D}"/usr/lib*/*.la "${D}"/usr/lib*/qt4/plugins/designer/*.la
+	rm -f "${D}"/usr/lib*/qt4/plugins/designer/*.{la,a}
+	use static-libs || rm -f "${D}"/usr/lib*/*.la
 }