Adding IUSE, cleanup

12 files changed, 22 insertions, 278 deletions

diff --git a/app-sci/predict/ChangeLog b/app-sci/predict/ChangeLog
index a6a6d2feb130..70aef4547df7 100644
--- a/app-sci/predict/ChangeLog
+++ b/app-sci/predict/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-sci/predict
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/predict/ChangeLog,v 1.6 2003/12/08 08:10:21 spyderous Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-sci/predict/ChangeLog,v 1.7 2004/04/19 12:13:51 phosphan Exp $
+
+  19 Apr 2004; Patrick Kursawe <phosphan@gentoo.org> predict-2.2.1.ebuild,
+  predict-2.2.2-r1.ebuild, predict-2.2.2.ebuild:
+  Adding IUSE, cleanup
 
   08 Dec 2003; Donnie Berkholz <spyderous@gentoo.org>; predict-2.2.1.ebuild,
   predict-2.2.2-r1.ebuild, predict-2.2.2.ebuild:
diff --git a/app-sci/predict/files/digest-predict-2.2.2 b/app-sci/predict/files/digest-predict-2.2.2
deleted file mode 100644
index 8786565e5599..000000000000
--- a/app-sci/predict/files/digest-predict-2.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2512bc6b584ece66de027e46f114ab53 predict-2.2.2.tar.gz 1637893
diff --git a/app-sci/predict/predict-2.2.1.ebuild b/app-sci/predict/predict-2.2.1.ebuild
index bf6f35e4b841..a42a62c99d0f 100644
--- a/app-sci/predict/predict-2.2.1.ebuild
+++ b/app-sci/predict/predict-2.2.1.ebuild
@@ -1,6 +1,6 @@
-# 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/app-sci/predict/predict-2.2.1.ebuild,v 1.9 2003/12/08 08:10:21 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/predict/predict-2.2.1.ebuild,v 1.10 2004/04/19 12:13:51 phosphan Exp $
 
 DESCRIPTION="Satellite tracking and orbital prediction."
 HOMEPAGE="http://www.qsl.net/kd2bd/predict.html"
@@ -8,6 +8,7 @@ SRC_URI="http://www.amsat.org/amsat/ftp/software/Linux/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
+IUSE="xforms gtk nls"
 KEYWORDS="x86 ~ppc"
 
 DEPEND="sys-libs/ncurses
diff --git a/app-sci/predict/predict-2.2.2-r1.ebuild b/app-sci/predict/predict-2.2.2-r1.ebuild
index 5e6ab777a045..6fde2bc60339 100644
--- a/app-sci/predict/predict-2.2.2-r1.ebuild
+++ b/app-sci/predict/predict-2.2.2-r1.ebuild
@@ -1,6 +1,6 @@
-# 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/app-sci/predict/predict-2.2.2-r1.ebuild,v 1.2 2003/12/08 08:10:21 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/predict/predict-2.2.2-r1.ebuild,v 1.3 2004/04/19 12:13:51 phosphan Exp $
 
 DESCRIPTION="Satellite tracking and orbital prediction."
 HOMEPAGE="http://www.qsl.net/kd2bd/predict.html"
@@ -8,6 +8,7 @@ SRC_URI="http://www.amsat.org/amsat/ftp/software/Linux/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
+IUSE="xforms gtk nls"
 KEYWORDS="~x86 ~ppc"
 
 DEPEND="sys-libs/ncurses
diff --git a/app-sci/predict/predict-2.2.2.ebuild b/app-sci/predict/predict-2.2.2.ebuild
deleted file mode 100644
index 97448612410d..000000000000
--- a/app-sci/predict/predict-2.2.2.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/predict/predict-2.2.2.ebuild,v 1.3 2003/12/08 08:10:21 spyderous Exp $
-
-DESCRIPTION="Satellite tracking and orbital prediction."
-HOMEPAGE="http://www.qsl.net/kd2bd/predict.html"
-SRC_URI="http://www.amsat.org/amsat/ftp/software/Linux/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-
-DEPEND="sys-libs/ncurses
-	gtk? ( =x11-libs/gtk+-1.2* )
-	xforms? ( x11-libs/xforms )"
-RDEPEND="gtk? ( =x11-libs/gtk+-1.2* )
-	xforms? ( x11-libs/xforms )"
-
-if [ -x /usr/bin/xearth ]; then
-	EARTHTRACKOK="yes"
-elif [ -x /usr/bin/xplanet ]; then
-	EARTHTRACKOK="yes"
-fi
-
-src_compile() {
-	# predict uses a ncurses based configure script
-	# this is what it does if it was bash based ;)
-
-	# set compiler string to a var so if compiler checks
-	# can be added at a later date
-	COMPILER="cc ${CFLAGS} -fomit-frame-pointer"
-
-	# write predict.h
-	echo "char *predictpath=\"/usr/share/predict/\";" > predict.h
-	echo "char soundcard=1;" >> predict.h
-	echo "char *version=\"${PV}\";" >> predict.h
-
-	# compile predict
-	einfo "compiling predict"
-	${COMPILER} -L/lib -lm -lncurses -lpthread predict.c -o predict
-
-	# write vocalizer.h
-	cd vocalizer
-	echo "char *path={\"/use/share/predict/vocalizer/\"};" > vocalizer.h
-
-	# compile vocalizer
-	einfo "compiling vocalizer"
-	${COMPILER} vocalizer.c -o vocalizer
-
-	einfo "compiling clients"
-
-	# earthtrack
-	if test "${EARTHTRACKOK}" = "yes"; then
-		einfo "compiling earthtrack"
-		cd ${S}/clients/earthtrack
-		${COMPILER} -lm earthtrack.c -o earthtrack
-	fi
-
-	# kep_reload
-	einfo "compiling kep_reload"
-	cd ${S}/clients/kep_reload
-	${COMPILER} kep_reload.c -o kep_reload
-
-	# map
-	if [ "`use xforms`" ]; then
-		einfo "compiling map"
-		cd ${S}/clients/map
-		TCOMP="${COMPILER} -I/usr/X11R6/include -L/usr/X11R6/lib -lforms -lX11 -lm map.c map_cb.c map_main.c -o map"
-		${TCOMP}
-	fi
-
-	# gsat
-	if [ "`use gtk`" ]; then
-		# note there are plugins for gsat but they are missing header files and wont compile
-		use nls || myconf="--disable-nls"
-		einfo "compiling gsat"
-		cd ${S}/clients/gsat-*
-		./configure --prefix=/usr ${myconf}
-		cd src
-		mv globals.h globals.h.orig
-		sed -e "s:#define DEFAULTPLUGINSDIR .*:#define DEFAULTPLUGINSDIR \"/usr/lib/gsat/plugins/\":" globals.h.orig > globals.h
-		cd ..
-		emake
-	fi
-}
-
-src_install() {
-	# install predict
-	cd ${S}
-	dobin predict ${FILESDIR}/predict-update
-	dodoc CHANGES COPYING CREDITS HISTORY README
-	dodoc default/predict.*
-	dodoc docs/pdf/predict.pdf
-	dodoc docs/postscript/predict.ps
-	doman docs/man/predict.1
-
-	#install vocalizer
-	cd vocalizer
-	insinto /usr/share/predict/vocalizer
-	doins vocalizer
-	chmod a+x ${D}/usr/share/predict/vocalizer/vocalizer
-	doins *.wav
-
-	mv README README.vocalizer
-	dodoc README.vocalizer
-
-	# install clients
-
-	# earthtrack
-	if test "${EARTHTRACKOK}" = "yes"; then
-		cd ${S}/clients/earthtrack
-		ln -s earthtrack earthtrack2
-		dobin earthtrack earthtrack2
-		mv README_FIRST README_FIRST.earthtrack
-		mv README README.earthtrack
-		dodoc README_FIRST.earthtrack README.earthtrack
-	fi
-
-	# kep_reload
-	cd ${S}/clients/kep_reload
-	dobin kep_reload
-	mv INSTALL INSTALL.kep_reload
-	mv README README.kep_reload
-	dodoc INSTALL.kep_reload README.kep_reload
-
-	# map
-	if [ "`use xforms`" ]; then
-		cd ${S}/clients/map
-		dobin map
-		for i in CHANGES README COPYING; do
-			mv ${i} ${i}.map
-			dodoc ${i}.map
-		done
-	fi
-
-	# gsat
-	if [ "`use gtk`" ]; then
-		# the install seems broken so do manually...
-		cd ${S}/clients/gsat-*
-		dodir /usr/lib/gsat/plugins
-		keepdir /usr/lib/gsat/plugins
-		cd src
-		dobin gsat
-		cd ..
-		for i in AUTHORS ABOUT-NLS COPYING ChangeLog INSTALL NEWS README Plugin_API; do
-			mv ${i} ${i}.gsat
-			dodoc ${i}.gsat
-		done
-	fi
-}
-
-pkg_postinst() {
-	einfo "to use the clients the following line will"
-	einfo "have to be inserted into /etc/services"
-	einfo "predict    1210/udp"
-	einfo "the port can be changed to anything"
-	einfo "the name predict is what is needed to work"
-	einfo "after that is set run 'predict -s'"
-	einfo ""
-	einfo "to get list of satellites run 'predict-update'"
-	einfo "before running predict this script will also update"
-	einfo "the list of satellites so they are up to date."
-}
diff --git a/app-sci/pymol/ChangeLog b/app-sci/pymol/ChangeLog
index 8530b82173a0..9177bd8e9f2d 100644
--- a/app-sci/pymol/ChangeLog
+++ b/app-sci/pymol/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-sci/pymol
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/pymol/ChangeLog,v 1.8 2004/03/03 17:08:42 pbienst Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/pymol/ChangeLog,v 1.9 2004/04/19 12:16:46 phosphan Exp $
+
+  19 Apr 2004; Patrick Kursawe <phosphan@gentoo.org> pymol-0.82.ebuild,
+  pymol-0.86.ebuild, pymol-0.88.ebuild, pymol-0.90.ebuild:
+  Adding IUSE, cleanup
 
   03 Mar 2004; Peter Bienstman <pbienst@gentoo.org> pymol-0.90:
   marked stable on x86
diff --git a/app-sci/pymol/files/digest-pymol-0.82 b/app-sci/pymol/files/digest-pymol-0.82
deleted file mode 100644
index 3104b5547987..000000000000
--- a/app-sci/pymol/files/digest-pymol-0.82
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d01bf39dbaa3ada27809a0ba013a162a pymol-0_82-src.tgz 1515449
diff --git a/app-sci/pymol/files/digest-pymol-0.86 b/app-sci/pymol/files/digest-pymol-0.86
deleted file mode 100644
index 60788af1aaa8..000000000000
--- a/app-sci/pymol/files/digest-pymol-0.86
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7610bb7689230eff2ec945236fdce0b8 pymol-0_86-src.tgz 1606126
diff --git a/app-sci/pymol/pymol-0.82.ebuild b/app-sci/pymol/pymol-0.82.ebuild
deleted file mode 100644
index f7e65d235b0a..000000000000
--- a/app-sci/pymol/pymol-0.82.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/pymol/pymol-0.82.ebuild,v 1.9 2003/09/02 22:45:15 liquidx Exp $
-
-inherit eutils flag-o-matic
-
-MY_PV=${PV/./_}
-DESCRIPTION="A Python-extensible molecular graphics system."
-HOMEPAGE="http://pymol.sourceforge.net/"
-SRC_URI="mirror://sourceforge/pymol/${PN}-${MY_PV}-src.tgz"
-
-LICENSE="PSF-2.2"
-SLOT="0"
-KEYWORDS="x86"
-
-DEPEND="dev-lang/python
-	dev-python/pmw
-	dev-python/numeric
-	dev-lang/tk
-	media-libs/libpng
-	sys-libs/zlib
-	media-libs/glut"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	cp setup/Rules.linux Rules.make
-	epatch ${FILESDIR}/${PN}-gentoo.diff
-}
-
-src_compile() {
-	append-flags -ffast-math -funroll-loops
-	make || die
-}
-
-src_install() {
-	local PYMOL_PATH=/usr/lib/pymol/${PV}
-	dodir /usr/lib/pymol/${PV}
-	cp -a modules ${D}/usr/lib/pymol/${PV}
-	dodir /usr/bin
-	cat <<-EOF > ${D}/usr/bin/pymol-${PV}
-	#!/bin/sh
-	export PYMOL_PATH=/usr/lib/pymol/${PV}
-	export TCL_LIBRARY=/usr/lib/tcl8.3
-	export PYTHONPATH=/usr/lib/pymol/${PV/modules}:\${PYTHONPATH}
-	python /usr/lib/pymol/${PV}/modules/launch_pymol.py \$*
-	EOF
-	chmod 755 ${D}/usr/bin/pymol-${PV}
-	dodoc README DEVELOPERS CHANGES
-	dosym /usr/bin/pymol-${PV} /usr/bin/pymol
-}
diff --git a/app-sci/pymol/pymol-0.86.ebuild b/app-sci/pymol/pymol-0.86.ebuild
deleted file mode 100644
index 812c6f65d6b0..000000000000
--- a/app-sci/pymol/pymol-0.86.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/pymol/pymol-0.86.ebuild,v 1.5 2003/09/02 22:45:15 liquidx Exp $
-
-inherit eutils flag-o-matic
-
-MY_PV=${PV/./_}
-DESCRIPTION="A Python-extensible molecular graphics system."
-HOMEPAGE="http://pymol.sourceforge.net/"
-SRC_URI="mirror://sourceforge/pymol/${PN}-${MY_PV}-src.tgz"
-
-LICENSE="PSF-2.2"
-SLOT="0"
-KEYWORDS="x86"
-
-DEPEND="dev-lang/python
-	dev-python/pmw
-	dev-python/numeric
-	dev-lang/tk
-	media-libs/libpng
-	sys-libs/zlib
-	media-libs/glut"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	cp setup/Rules.linux Rules.make
-	epatch ${FILESDIR}/${PN}-gentoo.diff
-}
-
-src_compile() {
-	append-flags -ffast-math
-	make || die
-}
-
-src_install() {
-	local PYMOL_PATH=/usr/lib/pymol/${PV}
-	dodir /usr/lib/pymol/${PV}
-	cp -a modules ${D}/usr/lib/pymol/${PV}
-	dodir /usr/bin
-	cat <<-EOF > ${D}/usr/bin/pymol-${PV}
-	#!/bin/sh
-	export PYMOL_PATH=/usr/lib/pymol/${PV}
-	export TCL_LIBRARY=/usr/lib/tcl8.3
-	export PYTHONPATH=/usr/lib/pymol/${PV/modules}:\${PYTHONPATH}
-	python /usr/lib/pymol/${PV}/modules/launch_pymol.py \$*
-	EOF
-	chmod 755 ${D}/usr/bin/pymol-${PV}
-	dodoc README DEVELOPERS CHANGES
-	dosym /usr/bin/pymol-${PV} /usr/bin/pymol
-}
diff --git a/app-sci/pymol/pymol-0.88.ebuild b/app-sci/pymol/pymol-0.88.ebuild
index 7d018344401b..5c9082eb7e01 100644
--- a/app-sci/pymol/pymol-0.88.ebuild
+++ b/app-sci/pymol/pymol-0.88.ebuild
@@ -1,6 +1,6 @@
-# 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/app-sci/pymol/pymol-0.88.ebuild,v 1.4 2003/09/02 22:45:15 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/pymol/pymol-0.88.ebuild,v 1.5 2004/04/19 12:16:46 phosphan Exp $
 
 inherit distutils eutils
 
@@ -10,6 +10,7 @@ SRC_URI="mirror://sourceforge/pymol/${PN}-${PV/./_}-src.tgz"
 
 LICENSE="PSF-2.2"
 SLOT="0"
+IUSE=""
 KEYWORDS="x86 ppc"
 
 DEPEND="dev-lang/python
diff --git a/app-sci/pymol/pymol-0.90.ebuild b/app-sci/pymol/pymol-0.90.ebuild
index bf9cc42439ee..05183ed4931f 100644
--- a/app-sci/pymol/pymol-0.90.ebuild
+++ b/app-sci/pymol/pymol-0.90.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/pymol/pymol-0.90.ebuild,v 1.4 2004/03/03 17:08:42 pbienst Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/pymol/pymol-0.90.ebuild,v 1.5 2004/04/19 12:16:46 phosphan Exp $
 
 inherit distutils eutils
 
@@ -10,6 +10,7 @@ SRC_URI="mirror://sourceforge/pymol/${PN}-${PV/./_}-src.tgz"
 
 LICENSE="PSF-2.2"
 SLOT="0"
+IUSE=""
 KEYWORDS="x86 ~ppc"
 
 DEPEND="dev-lang/python