ppc KEYWORDS and misc fixes

17 files changed, 48 insertions, 179 deletions

diff --git a/media-gfx/gimp/gimp-1.2.3-r2.ebuild b/media-gfx/gimp/gimp-1.2.3-r2.ebuild
index 49300bfce6a3..4d58cb019165 100644
--- a/media-gfx/gimp/gimp-1.2.3-r2.ebuild
+++ b/media-gfx/gimp/gimp-1.2.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-1.2.3-r2.ebuild,v 1.5 2002/07/13 16:31:43 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-1.2.3-r2.ebuild,v 1.6 2002/07/16 11:36:46 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="The GIMP"
@@ -8,6 +8,8 @@ SRC_URI="ftp://ftp.gimp.org/pub/gimp/v1.2/v${PV}/${P}.tar.bz2"
 HOMEPAGE="http://www.gimp.org/"
 
 SLOT="1.2"
+KEYWORDS="x86 ppc"
+LICENSE="GPL"
 
 DEPEND="nls? ( sys-devel/gettext )
 	sys-devel/autoconf
@@ -15,7 +17,9 @@ DEPEND="nls? ( sys-devel/gettext )
 	=x11-libs/gtk+-1.2*
 	>=media-libs/mpeg-lib-1.3.1
 	aalib? ( >=media-libs/aalib-1.2 )
-	perl? ( >=dev-perl/PDL-2.2.1 >=dev-perl/Parse-RecDescent-1.80 >=dev-perl/gtk-perl-0.7004 )
+	perl? ( >=dev-perl/PDL-2.2.1 
+		>=dev-perl/Parse-RecDescent-1.80 
+		>=dev-perl/gtk-perl-0.7004 )
 	python? ( >=dev-lang/python-2.0 )
 	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 )"
 
diff --git a/media-gfx/gimp/gimp-1.3.7-r1.ebuild b/media-gfx/gimp/gimp-1.3.7-r1.ebuild
index f866b2b37bdf..f8a602220219 100644
--- a/media-gfx/gimp/gimp-1.3.7-r1.ebuild
+++ b/media-gfx/gimp/gimp-1.3.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-1.3.7-r1.ebuild,v 1.1 2002/06/02 18:14:43 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-1.3.7-r1.ebuild,v 1.2 2002/07/16 11:36:46 seemant Exp $
 
 
 # Do _NOT_ strip symbols in the build! Need both lines for Portage 1.8.9+
@@ -16,6 +16,8 @@ DESCRIPTION="Development series of Gimp"
 SRC_URI="ftp://ftp.gimp.org/pub/gimp/v1.3/v${PV}/${P}.tar.bz2"
 HOMEPAGE="http://www.gimp.org/"
 SLOT="1.4"
+LICENSE="GPL-2"
+KEYWORDS="x86 ppc"
 
 #libglade
 RDEPEND=">=x11-libs/gtk+-2.0.0
diff --git a/media-gfx/imagemagick/imagemagick-5.4.6.ebuild b/media-gfx/imagemagick/imagemagick-5.4.6.ebuild
index 6f288d6489b0..9afc11f78d0e 100644
--- a/media-gfx/imagemagick/imagemagick-5.4.6.ebuild
+++ b/media-gfx/imagemagick/imagemagick-5.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-5.4.6.ebuild,v 1.1 2002/06/29 14:38:14 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-5.4.6.ebuild,v 1.2 2002/07/16 11:36:46 seemant Exp $
 
 inherit perl-module
 
@@ -12,6 +12,7 @@ SRC_URI="http://imagemagick.sourceforge.net/http/${MY_P}.tar.bz2"
 HOMEPAGE="http://www.imagemagick.org/"
 SLOT="0"
 LICENSE="as-is"
+KEYWORDS="x86 ppc"
 
 DEPEND="X? ( virtual/x11
 	>=app-text/dgs-0.5.9.1 )
diff --git a/media-gfx/sane-backends/files/digest-sane-backends-1.0.8 b/media-gfx/sane-backends/files/digest-sane-backends-1.0.8
deleted file mode 100644
index d53f0d86d97c..000000000000
--- a/media-gfx/sane-backends/files/digest-sane-backends-1.0.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 10785bf9a87e0f45ad445e34a8529a3d sane-backends-1.0.8.tar.gz 2169657
diff --git a/media-gfx/sane-backends/sane-backends-1.0.8-r2.ebuild b/media-gfx/sane-backends/sane-backends-1.0.8-r2.ebuild
index e97faf40d170..ed8b91662320 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.8-r2.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.8-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.8-r2.ebuild,v 1.2 2002/07/05 17:12:27 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.8-r2.ebuild,v 1.3 2002/07/16 11:36:46 seemant Exp $
 
 DESCRIPTION="Scanner Access Now Easy - Backends"
 HOMEPAGE="http://www.mostang.com/sane/"
@@ -16,8 +16,9 @@ DEPEND=">=media-libs/jpeg-6b
 
 SRC_URI="ftp://ftp.mostang.com/pub/sane/sane-$PV/$P.tar.gz"
 S=${WORKDIR}/${P}
-SLOT=""
+SLOT="0"
 LICENSE="GPL"
+KEYWORDS="x86 ppc"
 
 src_unpack() {
 	unpack ${A}
diff --git a/media-gfx/sane-backends/sane-backends-1.0.8.ebuild b/media-gfx/sane-backends/sane-backends-1.0.8.ebuild
deleted file mode 100644
index 9a51273ad18e..000000000000
--- a/media-gfx/sane-backends/sane-backends-1.0.8.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.8.ebuild,v 1.3 2002/07/11 06:30:27 drobbins Exp $
-
-DESCRIPTION="Scanner Access Now Easy - Backends"
-HOMEPAGE="http://www.mostang.com/sane/"
-
-DEPEND=">=media-libs/jpeg-6b"
-
-SRC_URI="ftp://ftp.mostang.com/pub/sane/sane-$PV/$P.tar.gz"
-S=${WORKDIR}/${P}
-
-src_unpack() {
-	unpack ${A}
-	cp ${FILESDIR}/linux_sg3_err.h ${S}/sanei
-
-	#only generate the .ps and not the fonts 
-	cp ${S}/doc/Makefile.in ${S}/doc/Makefile.in.orig
-	sed -e 's:dvips sane.dvi -o sane.ps:dvips sane.dvi -o -M0 sane.ps:' \
-		${S}/doc/Makefile.in.orig > ${S}/doc/Makefile.in
-}
-
-src_compile() {
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--host=${CHOST} || die
-	make || die
-}
-
-src_install () {
-	make prefix=${D}/usr \
-		sysconfdir=${D}/etc \
-		mandir=${D}/usr/share/man \
-		docdir=${D}/usr/share/doc/${PF} \
-		install || die
-
-	docinto backend
-	cd backend
-	dodoc GUIDE *.README *.BUGS *.CHANGES *.FAQ *.TODO
-}
-
-
-pkg_postinst() {
-	
-	echo "SANE_CONFIG_DIR=/etc/sane.d" > /etc/env.d/30sane
-
-}
diff --git a/media-gfx/sane-frontends/sane-frontends-1.0.8.ebuild b/media-gfx/sane-frontends/sane-frontends-1.0.8.ebuild
index 9179d12ced78..7c8da7d25fe5 100644
--- a/media-gfx/sane-frontends/sane-frontends-1.0.8.ebuild
+++ b/media-gfx/sane-frontends/sane-frontends-1.0.8.ebuild
@@ -1,14 +1,17 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-frontends/sane-frontends-1.0.8.ebuild,v 1.3 2002/07/11 06:30:28 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-frontends/sane-frontends-1.0.8.ebuild,v 1.4 2002/07/16 11:36:46 seemant Exp $
 
+S=${WORKDIR}/${P}
 DESCRIPTION="Scanner Access Now Easy"
 HOMEPAGE="http://www.mostang.com/sane/"
+SRC_URI="ftp://ftp.mostang.com/pub/sane/sane-${PV}/${P}.tar.gz"
 
 DEPEND=">=media-gfx/sane-backends-1.0.8"
 
-SRC_URI="ftp://ftp.mostang.com/pub/sane/sane-${PV}/${P}.tar.gz"
-S=${WORKDIR}/${P}
+SLOT="0"
+LICENSE="GPL"
+KEYWORDS="x86 ppc"
 
 src_compile() {
 	./configure \
diff --git a/media-gfx/xsane/ChangeLog b/media-gfx/xsane/ChangeLog
index 242f7f268cc1..911e76490ce7 100644
--- a/media-gfx/xsane/ChangeLog
+++ b/media-gfx/xsane/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-gfx/xsane
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsane/ChangeLog,v 1.3 2002/07/08 17:03:00 owen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsane/ChangeLog,v 1.4 2002/07/16 11:36:46 seemant Exp $
+
+*xsane-0.86-r1 (16 Jul 2002)
+
+  16 Jul 2002; Seemant Kulleen <seemant@gentoo.org> xsane-0.86-r1.ebuild
+  files/digest-xsane-0.86-r1 :
+
+  Added ppc to KEYWORDS, because it works, and USE dependent nls, jpeg,
+  tiff, png supports.
 
 *xsane-0.86 (11 June 2002)
   07 July 2002; Owen Stampflee <owen@gentoo.org> xsane-0.86.ebuild :
diff --git a/media-gfx/xsane/files/digest-xsane-0.77-r1 b/media-gfx/xsane/files/digest-xsane-0.77-r1
deleted file mode 100644
index 8d7ea8b7530c..000000000000
--- a/media-gfx/xsane/files/digest-xsane-0.77-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3d0902bd81d49bd523c15ffbb72d98aa xsane-0.77.tar.gz 1235878
diff --git a/media-gfx/xsane/files/digest-xsane-0.86 b/media-gfx/xsane/files/digest-xsane-0.86-r1
index 43b011f6822d..43b011f6822d 100644
--- a/media-gfx/xsane/files/digest-xsane-0.86
+++ b/media-gfx/xsane/files/digest-xsane-0.86-r1
diff --git a/media-gfx/xsane/xsane-0.77-r1.ebuild b/media-gfx/xsane/xsane-0.77-r1.ebuild
deleted file mode 100644
index 3e6311224129..000000000000
--- a/media-gfx/xsane/xsane-0.77-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsane/xsane-0.77-r1.ebuild,v 1.3 2002/07/11 06:30:38 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="XSane is a graphical scanning frontend"
-SRC_URI="http://www.xsane.org/download/${P}.tar.gz"
-HOMEPAGE="http://www.xsane.org"
-
-DEPEND="media-gfx/sane-backends media-gfx/gimp"
-
-src_compile() {
-
-	./configure --prefix=/usr --mandir=/usr/man --host=${CHOST} || die
-	make || die
-
-}
-
-src_install () {
-
-	make prefix=${D}/usr/ mandir=${D}/usr/man install || die
-	dodoc xsane.[A-Z]*
-	dohtml -r doc
-}
diff --git a/media-gfx/xsane/xsane-0.86.ebuild b/media-gfx/xsane/xsane-0.86-r1.ebuild
index ddf7c457544a..1c9c2981b9bc 100644
--- a/media-gfx/xsane/xsane-0.86.ebuild
+++ b/media-gfx/xsane/xsane-0.86-r1.ebuild
@@ -9,16 +9,28 @@ HOMEPAGE="http://www.xsane.org"
 
 DEPEND="media-gfx/sane-backends"
 
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDs="x86 ppc"
+
 src_compile() {
 
-	./configure --prefix=/usr --mandir=/usr/man --host=${CHOST} || die
+	local myconf
+	use nls || myconf="${myconf} --disable-nls"
+	use jpeg || myconf="${myconf} --disable-jpeg"
+	use png || myconf="${myconf} --disable-png"
+	use tiff || myconf="${myconf} --disable-tiff"
+
+	econf \
+		--prefix=/usr \
+		${myconf} || die
 	make || die
 
 }
 
 src_install () {
 
-	make prefix=${D}/usr/ mandir=${D}/usr/man install || die
+	einstall || die
 	dodoc xsane.[A-Z]*
 	dohtml -r doc
 	
diff --git a/media-gfx/xv/files/digest-xv-3.10a b/media-gfx/xv/files/digest-xv-3.10a
deleted file mode 100644
index f6f83423ac38..000000000000
--- a/media-gfx/xv/files/digest-xv-3.10a
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2d4fbeec1561304362781cc8e2f7f72d xv-3.10a.tar.gz 2259124
diff --git a/media-gfx/xv/files/digest-xv-3.10a-r1 b/media-gfx/xv/files/digest-xv-3.10a-r1
deleted file mode 100644
index 48d744cce2ec..000000000000
--- a/media-gfx/xv/files/digest-xv-3.10a-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 2d4fbeec1561304362781cc8e2f7f72d xv-3.10a.tar.gz 2259124
-MD5 c8cbe14db6e2104ed4eb5330cdaba420 xv-3.10a-png-1.2d.tar.gz 20971
diff --git a/media-gfx/xv/xv-3.10a-r1.ebuild b/media-gfx/xv/xv-3.10a-r1.ebuild
deleted file mode 100644
index 53bfea5fffbc..000000000000
--- a/media-gfx/xv/xv-3.10a-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/xv-3.10a-r1.ebuild,v 1.2 2002/07/11 06:30:38 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="An interactive image manipulation program for X which can
-deal with a wide variety of image formats"
-SRC_URI="ftp://ftp.cis.upenn.edu/pub/xv/${P}.tar.gz"
-HOMEPAGE="http://www.trilon.com/xv/index.html"
-
-DEPEND="virtual/x11
-	png? ( media-libs/jpeg
-		media-libs/tiff
-		media-libs/libpng
-		>=sys-libs/zlib-1.1.4 )"
-
-PATCHDIR=${WORKDIR}/patches
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	
-	cd ${S}
-	patch -p1 < ${FILESDIR}/${PN}-naz-gentoo.patch
-}
-
-src_compile() {
-	
-	make || die
-}
-
-src_install () {
-	
-	dodir /usr/bin
-	dodir /usr/share/man/man1
-	
-	make \
-		DESTDIR=${D} \
-		BINDIR=${D}/usr/bin \
-		MANDIR=${D}/usr/share/man/man1 \
-		LIBDIR=${D}/usr/lib \
-		install || die
-
-	 dodoc README INSTALL CHANGELOG BUGS IDEAS
-}
diff --git a/media-gfx/xv/xv-3.10a-r2.ebuild b/media-gfx/xv/xv-3.10a-r2.ebuild
index b42324ad1c1a..9ba7b6674883 100644
--- a/media-gfx/xv/xv-3.10a-r2.ebuild
+++ b/media-gfx/xv/xv-3.10a-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/xv-3.10a-r2.ebuild,v 1.3 2002/07/11 06:30:38 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/xv-3.10a-r2.ebuild,v 1.4 2002/07/16 11:36:46 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="An interactive image manipulation program for X which can
@@ -17,6 +17,10 @@ DEPEND="virtual/x11
 
 PATCHDIR=${WORKDIR}/patches
 
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="x86 ppc"
+
 src_unpack() {
 	unpack ${A}
 	
diff --git a/media-gfx/xv/xv-3.10a.ebuild b/media-gfx/xv/xv-3.10a.ebuild
deleted file mode 100644
index 63b44574fb40..000000000000
--- a/media-gfx/xv/xv-3.10a.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/xv-3.10a.ebuild,v 1.4 2002/07/11 06:30:38 drobbins Exp $
-S=${WORKDIR}/${P}
-DESCRIPTION="xv - image viewer for X"
-SRC_URI="ftp://ftp.cis.upenn.edu/pub/xv/${P}.tar.gz"
-HOMEPAGE="http://www.trilon.com/xv/index.html"
-DEPEND="virtual/x11
-		  virtual/glibc
-		>=media-libs/tiff-3.5.6_beta1
-		>=media-libs/jpeg-6b
-		>=sys-libs/zlib-1.1.3"
-
-#RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	mv Makefile Makefile.orig
-
-
-	sed -e "s:^CCOPTS.*:CCOPTS = ${CFLAGS}:" \
-		Makefile.orig > Makefile
-
-	# I know very little about make but somehow I was able to riddle out how to
-	# fix this makefile so it not unly understood DESTDIR but makes it's own
-	# dirs to. I fail to understand why people can't seem to do that. Do they
-	# want packagers to have a hard time with thier source trees?
-	patch -p1 < ${FILESDIR}/xv.diff
-}
-
-src_compile() {
-
-#	try emake
-	make || die
-}
-
-src_install () {
-
-	make DESTDIR=${D} install || die
-
-	dodoc README INSTALL CHANGELOG BUGS IDEAS
-}
-