amd64

8 files changed, 59 insertions, 140 deletions

diff --git a/net-www/gplflash/files/digest-gplflash-0.4.10 b/net-www/gplflash/files/digest-gplflash-0.4.10
deleted file mode 100644
index 559fd82f09cb..000000000000
--- a/net-www/gplflash/files/digest-gplflash-0.4.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1473f085c599d8076fa866cd91e11598 flash-0.4.10.tgz 358995
diff --git a/net-www/gplflash/files/digest-gplflash-0.4.10-r1 b/net-www/gplflash/files/digest-gplflash-0.4.10-r1
deleted file mode 100644
index 559fd82f09cb..000000000000
--- a/net-www/gplflash/files/digest-gplflash-0.4.10-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1473f085c599d8076fa866cd91e11598 flash-0.4.10.tgz 358995
diff --git a/net-www/gplflash/files/digest-gplflash-0.4.10-r2 b/net-www/gplflash/files/digest-gplflash-0.4.10-r2
deleted file mode 100644
index 559fd82f09cb..000000000000
--- a/net-www/gplflash/files/digest-gplflash-0.4.10-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1473f085c599d8076fa866cd91e11598 flash-0.4.10.tgz 358995
diff --git a/net-www/gplflash/files/gplflash-0.4.10-fPIC.patch b/net-www/gplflash/files/gplflash-0.4.10-fPIC.patch
new file mode 100644
index 000000000000..eeaf12abae87
--- /dev/null
+++ b/net-www/gplflash/files/gplflash-0.4.10-fPIC.patch
@@ -0,0 +1,47 @@
+diff -urN flash-0.4.10/Jpeg/Makefile flash-0.4.10/Jpeg/Makefile
+--- flash-0.4.10/Jpeg/Makefile	1999-01-27 18:10:51.000000000 -0500
++++ flash-0.4.10/Jpeg/Makefile	2004-02-07 15:04:08.009581920 -0500
+@@ -20,7 +20,7 @@
+ mandir = $(prefix)/man/man$(manext)
+ 
+ # You may need to adjust these cc options:
+-CFLAGS= -O2  -I$(srcdir)
++CFLAGS= -O2  -I$(srcdir) -fPIC
+ # Generally, we recommend defining any configuration symbols in jconfig.h,
+ # NOT via -D switches here.
+ # However, any special defines for ansi2knr.c may be included here:
+diff -urN flash-0.4.10/Lib/Makefile flash-0.4.10/Lib/Makefile
+--- flash-0.4.10/Lib/Makefile	2000-06-04 05:49:23.000000000 -0400
++++ flash-0.4.10/Lib/Makefile	2004-02-07 15:03:50.707212280 -0500
+@@ -1,6 +1,6 @@
+ CPPFLAGS=-I../Jpeg -I../Zlib
+ # Comment out the following line if you use egcs :
+-CXXFLAGS=-O3 -Wall -fno-rtti -fno-exceptions
++CXXFLAGS=-O3 -Wall -fno-rtti -fno-exceptions -fPIC
+ 
+ INCLUDES= adpcm.h        cxform.h       graphic.h      script.h       sqrt.h\
+ 	bitmap.h       displaylist.h  matrix.h       shape.h        swf.h\
+diff -urN flash-0.4.10/Plugin/Makefile flash-0.4.10/Plugin/Makefile
+--- flash-0.4.10/Plugin/Makefile	1999-09-28 08:13:38.000000000 -0400
++++ flash-0.4.10/Plugin/Makefile	2004-02-07 15:04:48.137481552 -0500
+@@ -35,7 +35,7 @@
+ # Linux
+ SHARED=-shared
+ 
+-CFLAGS=  $(OPTIMIZER) $(PLUGIN_DEFINES) -I$(FLASH) -I/usr/X11R6/include
++CFLAGS=  $(OPTIMIZER) $(PLUGIN_DEFINES) -I$(FLASH) -I/usr/X11R6/include -fPIC
+ LDFLAGS= $(FLASH)/libflash.a $(LIBCXX) ../Jpeg/libjpeg.a ../Zlib/libz.a
+ 
+ SRC= plugin.c npunix.c
+diff -urN flash-0.4.10/Zlib/Makefile flash-0.4.10/Zlib/Makefile
+--- flash-0.4.10/Zlib/Makefile	1999-01-27 18:11:10.000000000 -0500
++++ flash-0.4.10/Zlib/Makefile	2004-02-07 15:04:13.985673416 -0500
+@@ -2,7 +2,7 @@
+ # Copyright (C) 1995-1998 Jean-loup Gailly.
+ # For conditions of distribution and use, see copyright notice in zlib.h 
+ 
+-CFLAGS=-O3 -DHAVE_UNISTD_H -DUSE_MMAP
++CFLAGS=-O3 -DHAVE_UNISTD_H -DUSE_MMAP -fPIC
+ 
+ CPP=$(CC) -E
+ 
diff --git a/net-www/gplflash/gplflash-0.4.10-r1.ebuild b/net-www/gplflash/gplflash-0.4.10-r1.ebuild
deleted file mode 100644
index 8f10abad9eb5..000000000000
--- a/net-www/gplflash/gplflash-0.4.10-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/gplflash/gplflash-0.4.10-r1.ebuild,v 1.14 2003/10/03 22:58:04 hillster Exp $
-
-S=${WORKDIR}/flash-0.4.10
-DESCRIPTION="GPL Shockwave Flash Player/Plugin"
-SRC_URI="http://www.swift-tools.net/Flash/flash-0.4.10.tgz"
-HOMEPAGE="http://www.swift-tools.net/Flash"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc "
-
-DEPEND="media-libs/libflash"
-
-src_unpack() {
-	cd ${WORKDIR}
-	unpack flash-0.4.10.tgz
-	cd ${S}
-	patch -p1 <${FILESDIR}/${P}-gcc3-gentoo.diff || die
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	cd ${S}/Plugin
-	insinto /opt/netscape/plugins
-	doins npflash.so
-	cd ${S}
-	dodoc README COPYING
-
-	if [ "`use mozilla`" ] ; then
-		dodir /usr/lib/mozilla/plugins
-		dosym /opt/netscape/plugins/npflash.so \
-			/usr/lib/mozilla/plugins/npflash.so
-	fi
-}
diff --git a/net-www/gplflash/gplflash-0.4.10-r2.ebuild b/net-www/gplflash/gplflash-0.4.10-r2.ebuild
deleted file mode 100644
index 3bf329cc7c73..000000000000
--- a/net-www/gplflash/gplflash-0.4.10-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/gplflash/gplflash-0.4.10-r2.ebuild,v 1.4 2003/10/03 22:58:04 hillster Exp $
-
-S=${WORKDIR}/flash-0.4.10
-DESCRIPTION="GPL Shockwave Flash Player/Plugin"
-SRC_URI="http://www.swift-tools.net/Flash/flash-0.4.10.tgz"
-HOMEPAGE="http://www.swift-tools.net/Flash"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc"
-
-DEPEND="media-libs/libflash"
-
-src_unpack() {
-	cd ${WORKDIR}
-	unpack flash-0.4.10.tgz
-	cd ${S}
-	epatch ${FILESDIR}/${P}-gcc3-gentoo.diff || die
-
-	if [ "${ARCH}" = "ppc" ]; then
-		epatch ${FILESDIR}/${P}-ppc.diff || die
-	fi
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	cd ${S}/Plugin
-	insinto /opt/netscape/plugins
-	doins npflash.so
-	cd ${S}
-	dodoc README COPYING
-
-	if [ "`use mozilla`" ] ; then
-		dodir /usr/lib/mozilla/plugins
-		dosym /opt/netscape/plugins/npflash.so \
-			/usr/lib/mozilla/plugins/npflash.so
-	fi
-}
diff --git a/net-www/gplflash/gplflash-0.4.10-r3.ebuild b/net-www/gplflash/gplflash-0.4.10-r3.ebuild
index 236ef96d2677..27d3f0e14504 100644
--- a/net-www/gplflash/gplflash-0.4.10-r3.ebuild
+++ b/net-www/gplflash/gplflash-0.4.10-r3.ebuild
@@ -1,30 +1,28 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/gplflash/gplflash-0.4.10-r3.ebuild,v 1.2 2003/10/04 01:11:15 hillster Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/gplflash/gplflash-0.4.10-r3.ebuild,v 1.3 2004/02/07 20:25:44 vapier Exp $
 
-inherit nsplugins
+inherit nsplugins eutils
 
-S=${WORKDIR}/flash-0.4.10
 DESCRIPTION="GPL Shockwave Flash Player/Plugin, Supports Older Ver <=4 Only"
+HOMEPAGE="http://www.swift-tools.net/Flash/"
 SRC_URI="http://www.swift-tools.net/Flash/flash-0.4.10.tgz"
-HOMEPAGE="http://www.swift-tools.net/Flash"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc"
+SLOT="0"
+KEYWORDS="x86 ppc sparc amd64"
 
 DEPEND="media-libs/libflash"
 RDEPEND="!net-www/netscape-flash"
 
+S=${WORKDIR}/flash-${PV}
+
 src_unpack() {
-	cd ${WORKDIR}
-	unpack flash-0.4.10.tgz
+	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${P}-gcc3-gentoo.diff || die
-
-	if [ "${ARCH}" = "ppc" ]; then
-		epatch ${FILESDIR}/${P}-ppc.diff || die
-	fi
+	epatch ${FILESDIR}/${P}-gcc3-gentoo.diff
+	use amd64 && epatch ${FILESDIR}/${P}-fPIC.patch
+	use ppc && epatch ${FILESDIR}/${P}-ppc.diff
 }
 
 src_compile() {
diff --git a/net-www/gplflash/gplflash-0.4.10.ebuild b/net-www/gplflash/gplflash-0.4.10.ebuild
deleted file mode 100644
index de5f878911c1..000000000000
--- a/net-www/gplflash/gplflash-0.4.10.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/gplflash/gplflash-0.4.10.ebuild,v 1.13 2003/10/03 22:58:04 hillster Exp $
-
-S=${WORKDIR}/flash-0.4.10
-DESCRIPTION="GPL Shockwave Flash Player/Plugin"
-SRC_URI="http://www.swift-tools.net/Flash/flash-0.4.10.tgz"
-HOMEPAGE="http://www.swift-tools.net/Flash"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc "
-
-DEPEND="media-libs/libflash"
-
-PATCH=${FILESDIR}/gentoo.diff
-
-src_unpack() {
-	cd ${WORKDIR}
-	unpack flash-0.4.10.tgz
-	cd ${S}
-	cat ${PATCH} | patch -p0 || die
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	cd ${S}/Plugin
-	insinto /opt/netscape/plugins
-	doins npflash.so
-	cd ${S}
-	dodoc README ReadMe.htm
-
-	if [ "`use mozilla`" ] ; then
-		dodir /usr/lib/mozilla/plugins
-		dosym /opt/netscape/plugins/npflash.so \
-			/usr/lib/mozilla/plugins/npflash.so
-	fi
-}