Add --disable-gnash thanks to g-ranquet <ranquet@imerir.com> in bug 169336

Package-Manager: portage-2.1.2-r12

diff --git a/net-www/gnash/ChangeLog b/net-www/gnash/ChangeLog
index 5d7ce8bedc5024e861ada9f93ddd557c346b1178..db6cede447e44d765c3d0b3731d997fdcb49e16a 100644 (file)
--- a/net-www/gnash/ChangeLog
+++ b/net-www/gnash/ChangeLog
@@ -1,8 +1,8 @@
 # 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.37 2007/03/04 19:06:42 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/ChangeLog,v 1.38 2007/03/04 19:12:43 genstef Exp $
 
-  04 Mar 2007; <genstef@gentoo.org> ChangeLog:
+  04 Mar 2007; <genstef@gentoo.org> gnash-0.7.2_p20099999.ebuild:
   Add --disable-gnash thanks to g-ranquet <ranquet@imerir.com> in bug 169336
 
   23 Feb 2007; <genstef@gentoo.org> gnash-0.7.2_p20099999.ebuild:

diff --git a/net-www/gnash/Manifest b/net-www/gnash/Manifest
index 988e896ec82123a563a1de95aff15c6c97f48685..ef7ed3fec3f145cdb585d18073dcb4757fe09a42 100644 (file)
--- a/net-www/gnash/Manifest
+++ b/net-www/gnash/Manifest
@@ -1,22 +1,23 @@
-EBUILD gnash-0.7.2.ebuild 3340 RMD160 5a895dc7eec4ef8035373e17dba394074cf7e8f6 SHA1 3fae2f2b11f4bd5d653b094639b14a01b542001c SHA256 3e213cf0cc0b80e314f2cd91726af42c5cf6a76b266c442e18e5d34c5066e9d8
-MD5 98858df278cde08357cd8df45dbc53ec gnash-0.7.2.ebuild 3340
-RMD160 5a895dc7eec4ef8035373e17dba394074cf7e8f6 gnash-0.7.2.ebuild 3340
-SHA256 3e213cf0cc0b80e314f2cd91726af42c5cf6a76b266c442e18e5d34c5066e9d8 gnash-0.7.2.ebuild 3340
-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 7460 RMD160 b51cb0ea0af5e098098bb258164897c68ea5c7c4 SHA1 20961fb88b41b0ed2646d328a38d20cddc424c4d SHA256 0de08527698421d2d86d9c699238c3d26139dcea21fb4ad2ebde6e41d6d7fe08
-MD5 e59d41bf8e953e4eb8717a0f598a64b8 ChangeLog 7460
-RMD160 b51cb0ea0af5e098098bb258164897c68ea5c7c4 ChangeLog 7460
-SHA256 0de08527698421d2d86d9c699238c3d26139dcea21fb4ad2ebde6e41d6d7fe08 ChangeLog 7460
+DIST gnash-0.7.2.tar.bz2 1599810 RMD160 0f5904b6c13ffb3b2b4a5f723d9fdacb0a8a6198 SHA1 e2bbd71d61665c435ed22339078070af196ea31a SHA256 12dccb4bc69488f516e0283e988412ba7db5dfad32744425f97d641392a2e98b
+EBUILD gnash-0.7.2.ebuild 2952 RMD160 1f3a37a15d2c561e2c1d617967fb1d251801c2d6 SHA1 04e53e58ce018e367138aa68f1d30d2c2947f748 SHA256 d512e03a6c9535c182ab3c3af2b0b7314174f24b7352a9e7aeacba892ac92610
+MD5 fe8254c1e0f870d00ba059649880e679 gnash-0.7.2.ebuild 2952
+RMD160 1f3a37a15d2c561e2c1d617967fb1d251801c2d6 gnash-0.7.2.ebuild 2952
+SHA256 d512e03a6c9535c182ab3c3af2b0b7314174f24b7352a9e7aeacba892ac92610 gnash-0.7.2.ebuild 2952
+EBUILD gnash-0.7.2_p20099999.ebuild 3329 RMD160 e4e727605108c2aaf75afd79c3f6859a8bfda259 SHA1 5e2e35169e73d7f0e715e19d61011dc0312cee67 SHA256 035437e6129da25e2bfd2f0a6b47e817eeab6f6cbbf04de203c7b6cb32bdd981
+MD5 ff4acd96ca05fcbbf4f12b420387613e gnash-0.7.2_p20099999.ebuild 3329
+RMD160 e4e727605108c2aaf75afd79c3f6859a8bfda259 gnash-0.7.2_p20099999.ebuild 3329
+SHA256 035437e6129da25e2bfd2f0a6b47e817eeab6f6cbbf04de203c7b6cb32bdd981 gnash-0.7.2_p20099999.ebuild 3329
+MISC ChangeLog 7479 RMD160 16a1af90ad44c4af3ff887e9e0bdaf89dee0a28b SHA1 82d0887b9ae4908de10db486a38cc2ff7db582d6 SHA256 11984d0fa4029fa66f5027dbc4f50de8e704567679cc7f40dedecd2de21e4bf1
+MD5 8e45251418ebbb259414ca6fb2fd0e42 ChangeLog 7479
+RMD160 16a1af90ad44c4af3ff887e9e0bdaf89dee0a28b ChangeLog 7479
+SHA256 11984d0fa4029fa66f5027dbc4f50de8e704567679cc7f40dedecd2de21e4bf1 ChangeLog 7479
 MISC metadata.xml 242 RMD160 0c1495108d642a4ab0e1bffef66b6ff60a3e619c SHA1 383cfdd7a210a459dd71b1a8bad03be54f047d5b SHA256 771b4e1c8b0943aae8c90480ad18a37ee37bd086f0eeb329099eee9d238c81f2
 MD5 d5ce5bbf8880322ebca9672595e248ab metadata.xml 242
 RMD160 0c1495108d642a4ab0e1bffef66b6ff60a3e619c metadata.xml 242
 SHA256 771b4e1c8b0943aae8c90480ad18a37ee37bd086f0eeb329099eee9d238c81f2 metadata.xml 242
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnash-0.7.2 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-gnash-0.7.2 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-gnash-0.7.2 0
+MD5 42d1c9e2aa371ea4e97f9c0276ae9d8f files/digest-gnash-0.7.2 241
+RMD160 be77f585eab622de3489263945670952b8999b66 files/digest-gnash-0.7.2 241
+SHA256 818baff3a56f0cf9dd4e112e8d00c9816500f61d0be9ae2ddf77ba2a8975bfda files/digest-gnash-0.7.2 241
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnash-0.7.2_p20099999 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-gnash-0.7.2_p20099999 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-gnash-0.7.2_p20099999 0

diff --git a/net-www/gnash/files/digest-gnash-0.7.2 b/net-www/gnash/files/digest-gnash-0.7.2
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..449beee42c3f16c571ef7e593ccc13cfc071c94d 100644 (file)
--- a/net-www/gnash/files/digest-gnash-0.7.2
+++ b/net-www/gnash/files/digest-gnash-0.7.2
@@ -0,0 +1,3 @@
+MD5 ccef0f45be01a4c2992b46c2363a514f gnash-0.7.2.tar.bz2 1599810
+RMD160 0f5904b6c13ffb3b2b4a5f723d9fdacb0a8a6198 gnash-0.7.2.tar.bz2 1599810
+SHA256 12dccb4bc69488f516e0283e988412ba7db5dfad32744425f97d641392a2e98b gnash-0.7.2.tar.bz2 1599810

diff --git a/net-www/gnash/gnash-0.7.2.ebuild b/net-www/gnash/gnash-0.7.2.ebuild
index 8ae9995c523bd7291fd58d29f8616b8934b166b9..170da4dce7c8b867ee3a3711bfedd4632b99510e 100644 (file)
--- a/net-www/gnash/gnash-0.7.2.ebuild
+++ b/net-www/gnash/gnash-0.7.2.ebuild
@@ -1,23 +1,17 @@
 # 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.ebuild,v 1.7 2007/03/04 19:06:42 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/gnash-0.7.2.ebuild,v 1.8 2007/03/04 19:12:43 genstef Exp $
 
-WANT_AUTOCONF=latest
-inherit nsplugins autotools cvs kde-functions qt3 multilib
+inherit nsplugins kde-functions
 set-kdedir
 
 DESCRIPTION="Gnash is a GNU Flash movie player that supports many SWF v7 features"
 HOMEPAGE="http://www.gnu.org/software/gnash"
-#SRC_URI="mirror://gnu/${PN}/${PV}/${P}.tar.bz2"
-ECVS_SERVER="cvs.sv.gnu.org:/sources/${PN}"
-ECVS_MODULE="${PN}"
-[ "${PV/0.7.2_p}" != "20099999" ] && ECVS_CO_OPTS="-D ${PV/0.7.2_p}"
-ECVS_UP_OPTS="-dP ${ECVS_CO_OPTS}"
-S=${WORKDIR}/${PN}
+SRC_URI="mirror://gnu/${PN}/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~ppc -sparc ~x86 ~x86-fbsd"
 IUSE="agg gstreamer ffmpeg kde nsplugin xml video_cards_i810"
 #dmalloc, broken see bug 142939
 #dmalloc? ( dev-libs/dmalloc )
@@ -67,7 +61,6 @@ pkg_setup() {
 }
 
 src_compile() {
-       ./autogen.sh
        local myconf
 
        use nsplugin && myconf="${myconf} --with-plugindir=/opt/netscape/plugins"
@@ -97,20 +90,14 @@ 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)"
-        else
-                myconf="${myconf} --disable-klash"
-       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"
+       emake || die "emake failed"
 }
 
 src_install() {

diff --git a/net-www/gnash/gnash-0.7.2_p20099999.ebuild b/net-www/gnash/gnash-0.7.2_p20099999.ebuild
index 166a6319d03e4999088d10af8462201948ddaccc..d8872a1f6bf283f954925f31bfaca1e0b045cf00 100644 (file)
--- a/net-www/gnash/gnash-0.7.2_p20099999.ebuild
+++ b/net-www/gnash/gnash-0.7.2_p20099999.ebuild
@@ -1,6 +1,6 @@
 # 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.7 2007/02/23 12:38:46 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/gnash-0.7.2_p20099999.ebuild,v 1.8 2007/03/04 19:12:43 genstef Exp $
 
 WANT_AUTOCONF=latest
 inherit nsplugins autotools cvs kde-functions qt3 multilib
@@ -100,6 +100,8 @@ src_compile() {
        if use kde; then
                myconf="${myconf} --enable-klash --with-qt-incl=${QTDIR}/include
                        --with-qt-lib=${QTDIR}/$(get_libdir)"
+       else
+               myconf="${myconf} --disable-klash"
        fi
 
        econf \