cleanup

10 files changed, 58 insertions, 235 deletions

diff --git a/x11-libs/gtk+/files/digest-gtk+-1.2.10-r4 b/x11-libs/gtk+/files/digest-gtk+-1.2.10-r4
deleted file mode 100644
index 5116729f5974..000000000000
--- a/x11-libs/gtk+/files/digest-gtk+-1.2.10-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4d5cb2fc7fb7830e4af9747a36bfce20 gtk+-1.2.10.tar.gz 2868322
diff --git a/x11-libs/gtk+/files/digest-gtk+-1.2.10-r5 b/x11-libs/gtk+/files/digest-gtk+-1.2.10-r5
deleted file mode 100644
index 5116729f5974..000000000000
--- a/x11-libs/gtk+/files/digest-gtk+-1.2.10-r5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4d5cb2fc7fb7830e4af9747a36bfce20 gtk+-1.2.10.tar.gz 2868322
diff --git a/x11-libs/gtk+/gtk+-1.2.10-r4.ebuild b/x11-libs/gtk+/gtk+-1.2.10-r4.ebuild
deleted file mode 100644
index 2161981c372b..000000000000
--- a/x11-libs/gtk+/gtk+-1.2.10-r4.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-1.2.10-r4.ebuild,v 1.3 2002/04/12 19:12:03 spider Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="gtk"
-HOMEPAGE="http://www.gtk.org/"
-SRC_URI="ftp://ftp.gtk.org/pub/gtk/v1.2/${A}
-         ftp://ftp.gnome.org/pub/GNOME/stable/sources/gtk+/${A}
-         http://ftp.gnome.org/pub/GNOME/stable/sources/gtk+/${A}"
-
-DEPEND="virtual/glibc virtual/x11
-        =dev-libs/glib-1.2*"
-
-
-src_unpack() {
-
-	unpack ${A}
-	
-	cd ${S}
-	patch -p0 < ${FILESDIR}/gtk-1.2.10.patch || die
-}
-
-src_compile() {
-
-	local myconf
-
-	if [ "${DEBUG}" ]
-	then
-		myconf="--enable-debug=yes"
-	else
-		myconf="--enable-debug=no"
-	fi
-
-	./configure --host=${CHOST} 					\
-		    --prefix=/usr 					\
-		    --sysconfdir=/etc/X11 				\
-		    --with-xinput=xfree 				\
-		    --with-x 						\
-		    ${myconf} || die
-
-	emake || die
-}
-
-src_install() {
-
-	make install DESTDIR=${D} || die
-
-	preplib /usr
-
-	dodoc AUTHORS COPYING ChangeLog* HACKING
-	dodoc NEWS* README* TODO
-	docinto docs
-	cd docs
-	dodoc *.txt *.gif text/*
-	cd html
-	docinto html
-	dodoc *.html *.gif
-
-	#install nice, clean-looking gtk+ style
-	insinto /usr/share/themes/Gentoo/gtk
-	doins ${FILESDIR}/gtkrc
-}
-
-pkg_postinst() {
-
-	echo
-	echo "**********************************************************************"
-	echo "* Older versions added /etc/X11/gtk/gtkrc which changed settings for *"
-	echo "* all themes it seems.  Please remove it manually as it will not due *"
-	echo "* to /env protection.                                                *"
-	echo "*                                                                    *"
-	echo "* NB:  The old gtkrc is available through the new Gentoo gtk theme.  *"
-	echo "**********************************************************************"
-	echo
-}
diff --git a/x11-libs/gtk+/gtk+-1.2.10-r5.ebuild b/x11-libs/gtk+/gtk+-1.2.10-r5.ebuild
deleted file mode 100644
index 0ae992fca18e..000000000000
--- a/x11-libs/gtk+/gtk+-1.2.10-r5.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-1.2.10-r5.ebuild,v 1.2 2002/04/12 19:12:03 spider Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="The GIMP Toolkit"
-HOMEPAGE="http://www.gtk.org/"
-SRC_URI="ftp://ftp.gtk.org/pub/gtk/v1.2/${A}
-         ftp://ftp.gnome.org/pub/GNOME/stable/sources/gtk+/${A}
-         http://ftp.gnome.org/pub/GNOME/stable/sources/gtk+/${A}"
-
-DEPEND="virtual/glibc virtual/x11
-        =dev-libs/glib-1.2*
-		nls? ( sys-devel/gettext
-		dev-util/intltool )"
-
-src_unpack() {
-
-	unpack ${A}
-	
-	cd ${S}
-	patch -p0 < ${FILESDIR}/gtk-1.2.10.patch || die
-}
-
-src_compile() {
-
-	local myconf
-
-	use nls || myconf="${myconf} --disable-nls"
-
-	if [ "${DEBUG}" ]
-	then
-		myconf="${myconf} --enable-debug=yes"
-	else
-		myconf="${myconf} --enable-debug=no"
-	fi
-
-	./configure --host=${CHOST} 					\
-		    --prefix=/usr 					\
-		    --sysconfdir=/etc/X11 				\
-		    --with-xinput=xfree 				\
-		    --with-x 						\
-		    ${myconf} || die
-
-	emake || die
-}
-
-src_install() {
-
-	make install DESTDIR=${D} || die
-
-	preplib /usr
-
-	dodoc AUTHORS COPYING ChangeLog* HACKING
-	dodoc NEWS* README* TODO
-	docinto docs
-	cd docs
-	dodoc *.txt *.gif text/*
-	cd html
-	docinto html
-	dodoc *.html *.gif
-
-	#install nice, clean-looking gtk+ style
-	insinto /usr/share/themes/Gentoo/gtk
-	doins ${FILESDIR}/gtkrc
-}
-
-pkg_postinst() {
-
-	echo
-	echo "**********************************************************************"
-	echo "* Older versions added /etc/X11/gtk/gtkrc which changed settings for *"
-	echo "* all themes it seems.  Please remove it manually as it will not due *"
-	echo "* to /env protection.                                                *"
-	echo "*                                                                    *"
-	echo "* NB:  The old gtkrc is available through the new Gentoo gtk theme.  *"
-	echo "**********************************************************************"
-	echo
-}
diff --git a/x11-libs/gtk+/gtk+-1.2.10-r6.ebuild b/x11-libs/gtk+/gtk+-1.2.10-r6.ebuild
index 24e0605a4391..ea1f98d64876 100644
--- a/x11-libs/gtk+/gtk+-1.2.10-r6.ebuild
+++ b/x11-libs/gtk+/gtk+-1.2.10-r6.ebuild
@@ -1,15 +1,14 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-1.2.10-r6.ebuild,v 1.3 2002/04/12 19:12:03 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-1.2.10-r6.ebuild,v 1.4 2002/04/28 04:29:34 seemant Exp $
 
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="The GIMP Toolkit"
 HOMEPAGE="http://www.gtk.org/"
-SRC_URI="ftp://ftp.gtk.org/pub/gtk/v1.2/${A}
-         ftp://ftp.gnome.org/pub/GNOME/stable/sources/gtk+/${A}
-         http://ftp.gnome.org/pub/GNOME/stable/sources/gtk+/${A}"
+SRC_URI="ftp://ftp.gtk.org/pub/gtk/v1.2/${P}.tar.gz
+         ftp://ftp.gnome.org/pub/GNOME/stable/sources/gtk+/${P}.tar.gz
+         http://ftp.gnome.org/pub/GNOME/stable/sources/gtk+/${P}.tar.gz"
 
 DEPEND="virtual/glibc virtual/x11
         =dev-libs/glib-1.2*
@@ -18,7 +17,7 @@ DEPEND="virtual/glibc virtual/x11
 
 src_unpack() {
 
-	unpack ${A}
+	unpack ${P}.tar.gz
 	
 	cd ${S}
 	patch -p0 < ${FILESDIR}/gtk-1.2.10.patch || die
diff --git a/x11-libs/gtkDPS/gtkDPS-0.3.3-r1.ebuild b/x11-libs/gtkDPS/gtkDPS-0.3.3-r1.ebuild
index 5978d833bc4b..89cd257ea992 100644
--- a/x11-libs/gtkDPS/gtkDPS-0.3.3-r1.ebuild
+++ b/x11-libs/gtkDPS/gtkDPS-0.3.3-r1.ebuild
@@ -1,33 +1,32 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkDPS/gtkDPS-0.3.3-r1.ebuild,v 1.1 2001/10/06 10:08:19 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkDPS/gtkDPS-0.3.3-r1.ebuild,v 1.2 2002/04/28 04:29:34 seemant Exp $
 
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Set of functions, objects and widgets to use DPS easily with GTK"
-SRC_URI="http://www.aist-nara.ac.jp/~masata-y/gtkDPS/dist/${A}"
+SRC_URI="http://www.aist-nara.ac.jp/~masata-y/gtkDPS/dist/${P}.tar.gz"
 HOMEPAGE="http://www.aist-nara.ac.jp/~masata-y/gtkDPS/"
 
-DEPEND="virtual/glibc nls? ( sys-devel/gettext )
+DEPEND="virtual/glibc
 	>=x11-libs/gtk+-1.2.10-r4
 	>=app-text/dgs-0.5.9.1"
-RDEPEND="virtual/glibc"
+
+RDEPEND="nls? ( sys-devel/gettext )"
 
 src_compile() {
-    if [ -z "`use nls`" ] ; then
-      myconf="--disable-nls"
-    fi
+	if [ -z "`use nls`" ] ; then
+		myconf="--disable-nls"
+	fi
 
-    try ./configure --prefix=/usr --host=${CHOST} \
-	--with-x --with-dps $myconf
-    try make
+	./configure --prefix=/usr --host=${CHOST} \
+		--with-x --with-dps $myconf || die
+	make || die
 
 }
 
 src_install () {
 
-    try make prefix=${D}/usr install
-    dodoc COPYING* ChangeLog GTKDPS-VERSION HACKING NEWS README TODO
+	make prefix=${D}/usr install || die
+	dodoc COPYING* ChangeLog GTKDPS-VERSION HACKING NEWS README TODO
 }
-
diff --git a/x11-libs/gtkglarea/gtkglarea-1.2.2-r1.ebuild b/x11-libs/gtkglarea/gtkglarea-1.2.2-r1.ebuild
index 1be080736236..ddcf695524dd 100644
--- a/x11-libs/gtkglarea/gtkglarea-1.2.2-r1.ebuild
+++ b/x11-libs/gtkglarea/gtkglarea-1.2.2-r1.ebuild
@@ -1,34 +1,33 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# Author Your Name <your email>
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkglarea/gtkglarea-1.2.2-r1.ebuild,v 1.1 2001/10/06 10:08:20 azarah Exp $
+# Author: Achim Gottinger <achim@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkglarea/gtkglarea-1.2.2-r1.ebuild,v 1.2 2002/04/28 04:29:34 seemant Exp $
 
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="GL Extentions for gtk+"
-SRC_URI="http://www.student.oulu.fi/~jlof/gtkglarea/download/${A}"
+SRC_URI="http://www.student.oulu.fi/~jlof/gtkglarea/download/${P}.tar.gz"
 HOMEPAGE="http://www.student.oulu.fi/~jlof/gtkglarea/"
 
 DEPEND="virtual/glibc
-	>=x11-libs/gtk+-1.2.10-r4
+	=x11-libs/gtk+-1.2*
 	virtual/glu
 	virtual/opengl"
 
 
 src_compile() {
 
-    try ./configure --prefix=/usr --host=${CHOST}
-    try make
+	./configure --prefix=/usr || die
+	make || die
 
 }
 
 
 src_install () {
 
-    try make DESTDIR=${D} install
-    dodoc AUTHORS COPYING ChangeLog NEWS README 
-    docinto txt
-    dodoc docs/*.txt
+	make DESTDIR=${D} install || die
+	dodoc AUTHORS COPYING ChangeLog NEWS README 
+	docinto txt
+	dodoc docs/*.txt
 
 }
 
diff --git a/x11-libs/gtkglarea/gtkglarea-1.2.3.ebuild b/x11-libs/gtkglarea/gtkglarea-1.2.3.ebuild
index 71a1b30ce992..df27bbea4fd5 100644
--- a/x11-libs/gtkglarea/gtkglarea-1.2.3.ebuild
+++ b/x11-libs/gtkglarea/gtkglarea-1.2.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# Author Your Name <your email>
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkglarea/gtkglarea-1.2.3.ebuild,v 1.1 2001/12/01 03:55:02 azarah Exp $
+# Author: Achim Gottinger <achim@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkglarea/gtkglarea-1.2.3.ebuild,v 1.2 2002/04/28 04:29:34 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="GL Extentions for gtk+"
@@ -31,4 +31,3 @@ src_install() {
     docinto txt
     dodoc docs/*.txt
 }
-
diff --git a/x11-libs/libPropList/libPropList-0.10.1-r2.ebuild b/x11-libs/libPropList/libPropList-0.10.1-r2.ebuild
index 7ceadd46a158..8e77e810ad7f 100644
--- a/x11-libs/libPropList/libPropList-0.10.1-r2.ebuild
+++ b/x11-libs/libPropList/libPropList-0.10.1-r2.ebuild
@@ -1,31 +1,26 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libPropList/libPropList-0.10.1-r2.ebuild,v 1.1 2001/03/09 10:26:59 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libPropList/libPropList-0.10.1-r2.ebuild,v 1.2 2002/04/28 04:29:34 seemant Exp $
 
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="libPropList"
-SRC_URI="ftp://ftp.windowmaker.org/pub/release/srcs/current/${A}"
+SRC_URI="ftp://ftp.windowmaker.org/pub/release/srcs/current/${P}.tar.gz"
 HOMEPAGE="http://www.windowmaker.org/"
 
 DEPEND="virtual/glibc"
 
-src_compile() {                           
+src_compile() {													 
 
-  try ./configure --host=${CHOST} --prefix=/usr
-  try make
+	./configure --host=${CHOST} --prefix=/usr || die
+	make || die
 
 }
 
-src_install() {                               
+src_install() {															 
 
-  try make prefix=${D}/usr install
+	make prefix=${D}/usr install || die
 
-  dodoc AUTHORS COPYING* ChangeLog README TODO
+	dodoc AUTHORS COPYING* ChangeLog README TODO
 
 }
-
-
-
-
diff --git a/x11-libs/openmotif/openmotif-2.1.30-r1.ebuild b/x11-libs/openmotif/openmotif-2.1.30-r1.ebuild
index 10f8938968f9..5c8a92efe3ed 100644
--- a/x11-libs/openmotif/openmotif-2.1.30-r1.ebuild
+++ b/x11-libs/openmotif/openmotif-2.1.30-r1.ebuild
@@ -1,41 +1,34 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.1.30-r1.ebuild,v 1.2 2001/06/01 14:00:14 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.1.30-r1.ebuild,v 1.3 2002/04/28 04:29:34 seemant Exp $
 
-A=openmotif-2.1.30-4_MLI.src.tar.gz
+MY_P=${P}-4_MLI.src.tar.gz
 S=${WORKDIR}/motif
 DESCRIPTION="Open Motif (Metrolink Bug Fix Release)"
-SRC_URI="ftp://ftp.metrolink.com/pub/openmotif/2.1.30-4/"${A}
+SRC_URI="ftp://ftp.metrolink.com/pub/openmotif/2.1.30-4/${MY_P}.tar.gz"
 HOMEPAGE="http://www.metrolink.com/openmotif/"
 
 DEPEND="virtual/glibc virtual/x11"
 
 src_unpack() {
-  unpack ${A}
-  cp ${FILESDIR}/site.def ${S}/config/cf/
+	unpack ${A}
+	cp ${FILESDIR}/site.def ${S}/config/cf/
 }
 
 src_compile() { 
-                          
-  mkdir -p imports/x11
-  cd imports/x11
-  ln -s /usr/X11R6/bin bin
-  ln -s /usr/X11R6/include include
-  ln -s /usr/X11R6/lib lib
-  cd ${S}
-  try make World
+													
+	mkdir -p imports/x11
+	cd imports/x11
+	ln -s /usr/X11R6/bin bin
+	ln -s /usr/X11R6/include include
+	ln -s /usr/X11R6/lib lib
+	cd ${S}
+	make World || die
 }
 
-src_install() {                               
+src_install() {															 
 
-  try make DESTDIR=${D} VARDIR=${D}/var/X11/ install
+	make DESTDIR=${D} VARDIR=${D}/var/X11/ install || die
 
 }
-
-
-
-
-
-
-