Readd kde support on popular demand. Drizztbsd and others say that it is working

Package-Manager: portage-2.1.2_rc2-r1

4 files changed, 30 insertions, 23 deletions

diff --git a/net-www/gnash/ChangeLog b/net-www/gnash/ChangeLog
index ea28086c16c1..347ce77ebee3 100644
--- a/net-www/gnash/ChangeLog
+++ b/net-www/gnash/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-www/gnash
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/ChangeLog,v 1.29 2006/11/18 20:58:06 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/ChangeLog,v 1.30 2006/11/21 11:56:41 genstef Exp $
+
+  21 Nov 2006; Stefan Schweizer <genstef@gentoo.org> gnash-0.7.2.ebuild,
+  gnash-0.7.2_p20099999.ebuild:
+  Readd kde support on popular demand. Drizztbsd and others say that it is
+  working
 
 *gnash-0.7.2_p20099999 (18 Nov 2006)
 
diff --git a/net-www/gnash/Manifest b/net-www/gnash/Manifest
index 69d5bdbaaca0..6a99224c3eda 100644
--- a/net-www/gnash/Manifest
+++ b/net-www/gnash/Manifest
@@ -1,16 +1,16 @@
 DIST gnash-0.7.2.tar.bz2 1599810 RMD160 0f5904b6c13ffb3b2b4a5f723d9fdacb0a8a6198 SHA1 e2bbd71d61665c435ed22339078070af196ea31a SHA256 12dccb4bc69488f516e0283e988412ba7db5dfad32744425f97d641392a2e98b
-EBUILD gnash-0.7.2.ebuild 2729 RMD160 9cbd3c4fafb11dda9e61547f71b7c7f7ea96053c SHA1 8d17e8efb65e02277a12cd4cf493ddbdb28aad37 SHA256 62cb5422f7f567b0aa8375fe018d6fb8e727d905ed25b9a4f3712c20be376cfe
-MD5 786bc089a22ff637f54a4c7cc232e56e gnash-0.7.2.ebuild 2729
-RMD160 9cbd3c4fafb11dda9e61547f71b7c7f7ea96053c gnash-0.7.2.ebuild 2729
-SHA256 62cb5422f7f567b0aa8375fe018d6fb8e727d905ed25b9a4f3712c20be376cfe gnash-0.7.2.ebuild 2729
-EBUILD gnash-0.7.2_p20099999.ebuild 3059 RMD160 97ebc92e2438c6c548b4960f10a47492262e69fa SHA1 806b960092d1096b685e694e5cfd14f0bc142fca SHA256 fbd4a1757ceadb09dffee08e9820ca42157f83d4113653967e05293a39da0371
-MD5 c2b5303f30107b41833da91b4265c375 gnash-0.7.2_p20099999.ebuild 3059
-RMD160 97ebc92e2438c6c548b4960f10a47492262e69fa gnash-0.7.2_p20099999.ebuild 3059
-SHA256 fbd4a1757ceadb09dffee08e9820ca42157f83d4113653967e05293a39da0371 gnash-0.7.2_p20099999.ebuild 3059
-MISC ChangeLog 6272 RMD160 a38e4f8c54dee68e058d4fe7a8a7cd5961d503f7 SHA1 35a7a753948c7be89159a115590eb9ec7f85b2bf SHA256 7e79129c36ce93a49e4c6ff74622d14e6f6e2a64e47998c9782f946c96a06517
-MD5 4e4b30ac962ea06da5ed04171ddf4fe3 ChangeLog 6272
-RMD160 a38e4f8c54dee68e058d4fe7a8a7cd5961d503f7 ChangeLog 6272
-SHA256 7e79129c36ce93a49e4c6ff74622d14e6f6e2a64e47998c9782f946c96a06517 ChangeLog 6272
+EBUILD gnash-0.7.2.ebuild 2748 RMD160 00f5a9f39812eb6528ab8c67598abf9cacbd307a SHA1 6cb7be8d771f5c3844684ab7311b037a4f041796 SHA256 0dc2b76e7ef78e4627eabe6769bbe42e68c8005ec0030ba412fa2f1dbbc841b6
+MD5 7d39de1337d5d991434654da6c8e7ed7 gnash-0.7.2.ebuild 2748
+RMD160 00f5a9f39812eb6528ab8c67598abf9cacbd307a gnash-0.7.2.ebuild 2748
+SHA256 0dc2b76e7ef78e4627eabe6769bbe42e68c8005ec0030ba412fa2f1dbbc841b6 gnash-0.7.2.ebuild 2748
+EBUILD gnash-0.7.2_p20099999.ebuild 3079 RMD160 e1d56ef51931efcc618a1673ccf60b87aa20600e SHA1 90ef3706884ed2e8c9dccff54c51b40576f65981 SHA256 995c012201b08fd94522247b57f8bd10318d2fa066f7c45306072c490c69529f
+MD5 08eaa708d53264fa9e582e3119576042 gnash-0.7.2_p20099999.ebuild 3079
+RMD160 e1d56ef51931efcc618a1673ccf60b87aa20600e gnash-0.7.2_p20099999.ebuild 3079
+SHA256 995c012201b08fd94522247b57f8bd10318d2fa066f7c45306072c490c69529f gnash-0.7.2_p20099999.ebuild 3079
+MISC ChangeLog 6463 RMD160 46455b49033be1db97786a74b3b0ea2f7ebb833a SHA1 3172aa17ae2390ae8e2abd8ea21867f535cdbfcb SHA256 bdaa7a592de7f074d29a7f6cb2fc00834f17f77eb4a1c7837674f95ef0ec6698
+MD5 1ff232c2d13d33d799766073cc964b1c ChangeLog 6463
+RMD160 46455b49033be1db97786a74b3b0ea2f7ebb833a ChangeLog 6463
+SHA256 bdaa7a592de7f074d29a7f6cb2fc00834f17f77eb4a1c7837674f95ef0ec6698 ChangeLog 6463
 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.ebuild b/net-www/gnash/gnash-0.7.2.ebuild
index 0713194ef9de..b3dafc212c50 100644
--- a/net-www/gnash/gnash-0.7.2.ebuild
+++ b/net-www/gnash/gnash-0.7.2.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2006 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.2 2006/11/18 20:52:55 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/gnash-0.7.2.ebuild,v 1.3 2006/11/21 11:56:41 genstef Exp $
 
-inherit nsplugins
+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"
@@ -11,7 +12,7 @@ SRC_URI="ftp://ftp.gnu.org/pub/gnu/${PN}/${PV}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 -sparc ~x86 ~ppc"
-IUSE="agg gstreamer ffmpeg nsplugin xml video_cards_i810"
+IUSE="agg gstreamer ffmpeg kde nsplugin xml video_cards_i810"
 #dmalloc, broken see bug 142939
 #dmalloc? ( dev-libs/dmalloc )
 #		$(use_enable dmalloc) \
@@ -47,6 +48,7 @@ RDEPEND="
 	>x11-libs/gtk+-2
 	x11-libs/pango
 	!agg? ( virtual/opengl x11-libs/gtkglext )
+	kde? ( kde-base/kdelibs )
 	agg? ( x11-libs/agg )"
 	#cairo? ( x11-libs/cairo )
 
@@ -80,13 +82,12 @@ src_compile() {
 		myconf="${myconf} --with-mp3-decoder=ffmpeg"
 	fi
 
-	# klash is broken, thus we do not offer it
 	econf \
 		$(use_enable nsplugin plugin) \
 		$(use_enable xml) \
 		$(use_enable video_cards_i810 i810-lod-bias) \
 		--without-gcc-arch \
-		--disable-klash \
+		$(use_enable kde klash) \
 		${myconf} || die "econf failed"
 	emake || die "emake failed"
 }
diff --git a/net-www/gnash/gnash-0.7.2_p20099999.ebuild b/net-www/gnash/gnash-0.7.2_p20099999.ebuild
index 1db71f575ee0..242d02fff449 100644
--- a/net-www/gnash/gnash-0.7.2_p20099999.ebuild
+++ b/net-www/gnash/gnash-0.7.2_p20099999.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2006 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.1 2006/11/18 20:58:06 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/gnash-0.7.2_p20099999.ebuild,v 1.2 2006/11/21 11:56:41 genstef Exp $
 
 WANT_AUTOCONF=latest
-inherit nsplugins autotools cvs
+inherit nsplugins autotools cvs 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"
@@ -17,7 +18,7 @@ S=${WORKDIR}/${PN}
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="-*"
-IUSE="agg gstreamer ffmpeg nsplugin xml video_cards_i810"
+IUSE="agg gstreamer ffmpeg kde nsplugin xml video_cards_i810"
 #dmalloc, broken see bug 142939
 #dmalloc? ( dev-libs/dmalloc )
 #		$(use_enable dmalloc) \
@@ -53,6 +54,7 @@ RDEPEND="
 	>x11-libs/gtk+-2
 	x11-libs/pango
 	!agg? ( virtual/opengl x11-libs/gtkglext )
+	kde? ( kde-base/kdelibs )
 	agg? ( x11-libs/agg )"
 	#cairo? ( x11-libs/cairo )
 
@@ -94,13 +96,12 @@ src_compile() {
 		myconf="${myconf} --with-mp3-decoder=ffmpeg"
 	fi
 
-	# klash is broken, thus we do not offer it
 	econf \
 		$(use_enable nsplugin plugin) \
 		$(use_enable xml) \
 		$(use_enable video_cards_i810 i810-lod-bias) \
 		--without-gcc-arch \
-		--disable-klash \
+		$(use_enable kde klash) \
 		${myconf} || die "econf failed"
 	emake -j1 || die "emake failed"
 }