Improve qt3 detection thanks to Sarath Menon <sarathmenon@gmail.com> in bug 168112

Package-Manager: portage-2.1.2-r9

diff --git a/net-www/gnash/ChangeLog b/net-www/gnash/ChangeLog
index d7c9b62885fc99f41d34c5f88b7206e8cb9935b1..0ad0c05ca214738bcded2cc91bffcb68ae2e2c8f 100644 (file)
--- a/net-www/gnash/ChangeLog
+++ b/net-www/gnash/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-www/gnash
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/ChangeLog,v 1.35 2007/02/05 13:24:47 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/ChangeLog,v 1.36 2007/02/23 12:38:46 genstef Exp $
+
+  23 Feb 2007; <genstef@gentoo.org> gnash-0.7.2_p20099999.ebuild:
+  Improve qt3 detection thanks to Sarath Menon <sarathmenon@gmail.com> in bug
+  168112
 
   05 Feb 2007; <genstef@gentoo.org> gnash-0.7.2.ebuild,
   gnash-0.7.2_p20099999.ebuild:

diff --git a/net-www/gnash/Manifest b/net-www/gnash/Manifest
index 0b11f32bad4e55aa90b326b76e45d87bc38fe85f..3454f37838f7c31ede61a738909f91eda696fcc5 100644 (file)
--- a/net-www/gnash/Manifest
+++ b/net-www/gnash/Manifest
@@ -3,14 +3,14 @@ EBUILD gnash-0.7.2.ebuild 2952 RMD160 fdf10f0ac8bb76b0d827a1bf7d1aa65cc132bd42 S
 MD5 9f620e5f680ca09eba507ee525dec20d gnash-0.7.2.ebuild 2952
 RMD160 fdf10f0ac8bb76b0d827a1bf7d1aa65cc132bd42 gnash-0.7.2.ebuild 2952
 SHA256 e11e4771fab25ccc3e0c8c0b3ebfbefba6c36ead1ba2328b7b9b5eea1adc68ad gnash-0.7.2.ebuild 2952
-EBUILD gnash-0.7.2_p20099999.ebuild 3170 RMD160 94c04f2d6f79284ccd38a5d6a12977f568c45bff SHA1 f3dec52f1a67849385db22b45a1cda8fdcd990e8 SHA256 132a37fbf18701ad39b59791d1fc302dc17bc8168acde9eb9e2eab6277e90d9a
-MD5 a1515fc28c62280d767888fa4c63e128 gnash-0.7.2_p20099999.ebuild 3170
-RMD160 94c04f2d6f79284ccd38a5d6a12977f568c45bff gnash-0.7.2_p20099999.ebuild 3170
-SHA256 132a37fbf18701ad39b59791d1fc302dc17bc8168acde9eb9e2eab6277e90d9a gnash-0.7.2_p20099999.ebuild 3170
-MISC ChangeLog 7181 RMD160 2fea45cb523c6cd99b15a57a73a3732fbedb038c SHA1 2e09b12f5fe9ba492578c14ce82868510a6084b8 SHA256 e365d197c508ed9d4a27b22630da11f99c1161d4b6d2f8d98d0492a3c3eb5e5e
-MD5 7916e3c910a461d9dfa233b31f5211dd ChangeLog 7181
-RMD160 2fea45cb523c6cd99b15a57a73a3732fbedb038c ChangeLog 7181
-SHA256 e365d197c508ed9d4a27b22630da11f99c1161d4b6d2f8d98d0492a3c3eb5e5e ChangeLog 7181
+EBUILD gnash-0.7.2_p20099999.ebuild 3286 RMD160 6f3df0d48be4700c0604fc4e0f1878f7636ef2f2 SHA1 a821a9711806b9ad2be7fba5b5c7a5ed640ce276 SHA256 4b5941e4bd163039b481cc4e1029091d864e2984b128573905fdf1f563ee6a29
+MD5 abe65ac30ff7e5330593d3b71cb9c50b gnash-0.7.2_p20099999.ebuild 3286
+RMD160 6f3df0d48be4700c0604fc4e0f1878f7636ef2f2 gnash-0.7.2_p20099999.ebuild 3286
+SHA256 4b5941e4bd163039b481cc4e1029091d864e2984b128573905fdf1f563ee6a29 gnash-0.7.2_p20099999.ebuild 3286
+MISC ChangeLog 7335 RMD160 5173673c7b479f4157fd4b79c8f5946c27afe0bb SHA1 3e6c37ffa98c4da412ca09ebedb93584c3f91cff SHA256 f6a54dd08562447fb432f20d3f29d444ab2b9e0f2bccea88e0e54de94d6ca819
+MD5 d305708c83846924b39218b7113d7e73 ChangeLog 7335
+RMD160 5173673c7b479f4157fd4b79c8f5946c27afe0bb ChangeLog 7335
+SHA256 f6a54dd08562447fb432f20d3f29d444ab2b9e0f2bccea88e0e54de94d6ca819 ChangeLog 7335
 MISC metadata.xml 242 RMD160 0c1495108d642a4ab0e1bffef66b6ff60a3e619c SHA1 383cfdd7a210a459dd71b1a8bad03be54f047d5b SHA256 771b4e1c8b0943aae8c90480ad18a37ee37bd086f0eeb329099eee9d238c81f2
 MD5 d5ce5bbf8880322ebca9672595e248ab metadata.xml 242
 RMD160 0c1495108d642a4ab0e1bffef66b6ff60a3e619c metadata.xml 242

diff --git a/net-www/gnash/gnash-0.7.2_p20099999.ebuild b/net-www/gnash/gnash-0.7.2_p20099999.ebuild
index 26603c7fa9854bbfaa88214ae2a7ff9c7c963ee2..166a6319d03e4999088d10af8462201948ddaccc 100644 (file)
--- a/net-www/gnash/gnash-0.7.2_p20099999.ebuild
+++ b/net-www/gnash/gnash-0.7.2_p20099999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/gnash-0.7.2_p20099999.ebuild,v 1.6 2007/02/05 13:24:47 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/gnash-0.7.2_p20099999.ebuild,v 1.7 2007/02/23 12:38:46 genstef Exp $
 
 WANT_AUTOCONF=latest
-inherit nsplugins autotools cvs kde-functions
+inherit nsplugins autotools cvs kde-functions qt3 multilib
 set-kdedir
 
 DESCRIPTION="Gnash is a GNU Flash movie player that supports many SWF v7 features"
@@ -97,12 +97,16 @@ src_compile() {
                myconf="${myconf} --with-mp3-decoder=ffmpeg"
        fi
 
+       if use kde; then
+               myconf="${myconf} --enable-klash --with-qt-incl=${QTDIR}/include
+                       --with-qt-lib=${QTDIR}/$(get_libdir)"
+       fi
+
        econf \
                $(use_enable nsplugin plugin) \
                $(use_enable xml) \
                $(use_enable video_cards_i810 i810-lod-bias) \
                --without-gcc-arch \
-               $(use_enable kde klash) \
                ${myconf} || die "econf failed"
        emake -j1 || die "emake failed"
 }