6 files changed, 16 insertions, 112 deletions
diff --git a/net-www/gplflash/ChangeLog b/net-www/gplflash/ChangeLog
index bc90fab587a1..d3d2f01adc11 100644
--- a/net-www/gplflash/ChangeLog
+++ b/net-www/gplflash/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-www/gplflash
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/gplflash/ChangeLog,v 1.20 2005/12/17 00:13:25 vapier Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/gplflash/ChangeLog,v 1.21 2006/01/26 21:03:47 genstef Exp $
+
+  26 Jan 2006; Stefan Schweizer <genstef@gentoo.org>
+  -gplflash-0.4.12.ebuild, -gplflash-0.4.13.ebuild,
+  gplflash-0.4.13-r1.ebuild:
+  Remove old ebuilds, fix modular X depends
 
 *gplflash-0.4.13-r1 (17 Dec 2005)
 
diff --git a/net-www/gplflash/files/digest-gplflash-0.4.12 b/net-www/gplflash/files/digest-gplflash-0.4.12
deleted file mode 100644
index 2dd067bdd288..000000000000
--- a/net-www/gplflash/files/digest-gplflash-0.4.12
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7d53803486b255665a80cd834ee3c463 gplflash-0.4.12.tar.bz2 378727
diff --git a/net-www/gplflash/files/digest-gplflash-0.4.13 b/net-www/gplflash/files/digest-gplflash-0.4.13
deleted file mode 100644
index 7fd42a74bd2d..000000000000
--- a/net-www/gplflash/files/digest-gplflash-0.4.13
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1b14c21094eb07416842ac0f5298b3f1 gplflash-0.4.13.tar.bz2 323128
diff --git a/net-www/gplflash/gplflash-0.4.12.ebuild b/net-www/gplflash/gplflash-0.4.12.ebuild
deleted file mode 100644
index 2ab7bbdead47..000000000000
--- a/net-www/gplflash/gplflash-0.4.12.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/gplflash/gplflash-0.4.12.ebuild,v 1.2 2005/03/08 14:34:14 corsair Exp $
-
-inherit nsplugins eutils flag-o-matic
-
-DESCRIPTION="GPLFlash is a free portable and useable alternative to the
-	flash-decoder released by Macromedia"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://gplflash.sourceforge.net/"
-
-KEYWORDS="-ppc64 ~x86 ~ppc ~sparc ~amd64"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="debug alsa oss"
-
-RDEPEND="media-libs/libmad
-		media-libs/jpeg
-		sys-libs/zlib
-		virtual/x11
-		!net-www/netscape-flash
-		!media-libs/libflash"
-
-PLUGDIR="/opt/netscape/plugins"
-
-src_compile() {
-	# check if sound support is wanted
-	if ( ( use !alsa ) && ( use !oss ) ); then
-		einfo "you don't have alsa or oss in your use flags."
-		einfo "disabling sound support..."
-		append-flags -DNOSOUND
-	fi
-
-	# configure
-	econf --with-plugin-dir=${D}/${PLUGDIR} $(use_enable debug) \
-		|| die "configure failed"
-
-	# compile
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install
-
-	# install the plugin
-	inst_plugin ${PLUGDIR}/libnpflash.so
-
-	# install doc
-	cd ${S}
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
-}
diff --git a/net-www/gplflash/gplflash-0.4.13-r1.ebuild b/net-www/gplflash/gplflash-0.4.13-r1.ebuild
index 9ede30bfa9ae..09a729d2272b 100644
--- a/net-www/gplflash/gplflash-0.4.13-r1.ebuild
+++ b/net-www/gplflash/gplflash-0.4.13-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/gplflash/gplflash-0.4.13-r1.ebuild,v 1.1 2005/12/17 00:13:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/gplflash/gplflash-0.4.13-r1.ebuild,v 1.2 2006/01/26 21:03:47 genstef Exp $
 
 inherit nsplugins eutils flag-o-matic autotools
 
@@ -16,10 +16,16 @@ IUSE="nosound"
 DEPEND="media-libs/libmad
 	media-libs/jpeg
 	sys-libs/zlib
-	virtual/x11
+	|| ( ( x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXt
+	x11-proto/xextproto
+	x11-proto/xproto )
+	virtual/x11 )
 	!net-www/netscape-flash
 	!media-libs/libflash"
 
+
 PLUGDIR="/opt/netscape/plugins"
 
 src_unpack() {
diff --git a/net-www/gplflash/gplflash-0.4.13.ebuild b/net-www/gplflash/gplflash-0.4.13.ebuild
deleted file mode 100644
index ef16cf5e193c..000000000000
--- a/net-www/gplflash/gplflash-0.4.13.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/gplflash/gplflash-0.4.13.ebuild,v 1.2 2005/03/17 19:51:29 lanius Exp $
-
-inherit nsplugins eutils flag-o-matic
-
-DESCRIPTION="GPLFlash is a free portable and useable alternative to the
-	flash-decoder released by Macromedia"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://gplflash.sourceforge.net/"
-
-KEYWORDS="-ppc64 ~x86 ~ppc ~sparc ~amd64"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="debug alsa oss"
-
-RDEPEND="media-libs/libmad
-		media-libs/jpeg
-		sys-libs/zlib
-		virtual/x11
-		!net-www/netscape-flash
-		!media-libs/libflash"
-
-PLUGDIR="/opt/netscape/plugins"
-
-src_compile() {
-	# check if sound support is wanted
-	if ( ( use !alsa ) && ( use !oss ) ); then
-		einfo "you don't have alsa or oss in your use flags."
-		einfo "disabling sound support..."
-		append-flags -DNOSOUND
-	fi
-
-	# configure -- includes and libraries won't be found correctly.
-	# temporal solution is pointing configure to the exaclt location
-	# until a better solution is found. bug #79270
-	econf --with-plugin-dir=${PLUGDIR} $(use_enable debug) \
-		--x-includes=/usr/include/X11/ --x-libraries=/usr/lib/ \
-		|| die "configure failed"
-
-	# compile
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install
-
-	# install the plugin
-	inst_plugin ${PLUGDIR}/libnpflash.so
-
-	# install doc
-	cd ${S}
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
-}