move gtk+ apps to /usr and use gtk+-1.2.10-r4, #5

23 files changed, 32 insertions, 83 deletions

diff --git a/app-admin/gkrellm/files/digest-gkrellm-1.0.7 b/app-admin/gkrellm/files/digest-gkrellm-1.0.7
deleted file mode 100644
index 2f899ae3d7c7..000000000000
--- a/app-admin/gkrellm/files/digest-gkrellm-1.0.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a72acffc0c110522cf4d39a01b53e7b7 gkrellm-1.0.7.tar.gz
diff --git a/app-admin/gkrellm/files/digest-gkrellm-1.0.8 b/app-admin/gkrellm/files/digest-gkrellm-1.0.8
deleted file mode 100644
index 3e71a5c300b5..000000000000
--- a/app-admin/gkrellm/files/digest-gkrellm-1.0.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4fd95064782d6c6061097e5cddf19889 gkrellm-1.0.8.tar.gz
diff --git a/app-admin/gkrellm/files/digest-gkrellm-1.2.1 b/app-admin/gkrellm/files/digest-gkrellm-1.2.1
deleted file mode 100644
index a173fdf0424b..000000000000
--- a/app-admin/gkrellm/files/digest-gkrellm-1.2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cc40732a0319f99cdb8ee6814882978a gkrellm-1.2.1.tar.gz
diff --git a/app-admin/gkrellm/files/digest-gkrellm-1.2.2 b/app-admin/gkrellm/files/digest-gkrellm-1.2.2-r1
index d83ee9ae63ed..d83ee9ae63ed 100644
--- a/app-admin/gkrellm/files/digest-gkrellm-1.2.2
+++ b/app-admin/gkrellm/files/digest-gkrellm-1.2.2-r1
diff --git a/app-admin/gkrellm/gkrellm-1.2.1.ebuild b/app-admin/gkrellm/gkrellm-1.2.1.ebuild
deleted file mode 100644
index 82e6ab1b5a99..000000000000
--- a/app-admin/gkrellm/gkrellm-1.2.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Jerry Alexandratos <jerry@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-1.2.1.ebuild,v 1.4 2001/08/31 03:23:38 pm Exp $
-
-
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Single process stack of various system monitors"
-SRC_URI="http://web.wt.net/~billw/${PN}/${P}.tar.gz"
-
-DEPEND="virtual/glibc
-        >=x11-libs/gtk+-1.2
-        >=media-libs/imlib-1.9"
-
-src_compile() {
-
-    emake || die
-
-}
-
-src_install () {
-
-    cd src
-	 exeinto /usr/X11R6/bin
-    doexe gkrellm
-
-    insinto /usr/include/gkrellm
-    for i in gkrellm.h gkrellm_private_proto.h gkrellm_public_proto.h
-    do
-      doins $i
-    done
-
-    dodir /usr/X11R6/share/gkrellm/{themes,plugins}
-
-    cd ${S}
-
-    dodoc COPYRIGHT README Changelog
-    docinto html
-    dodoc Changelog-plugins.html Changelog-themes.html Themes.html
-}
-
-
diff --git a/app-admin/gkrellm/gkrellm-1.2.2.ebuild b/app-admin/gkrellm/gkrellm-1.2.2-r1.ebuild
index 45f641c0cd43..7bb02cc6d165 100644
--- a/app-admin/gkrellm/gkrellm-1.2.2.ebuild
+++ b/app-admin/gkrellm/gkrellm-1.2.2-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Jerry Alexandratos <jerry@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-1.2.2.ebuild,v 1.4 2001/09/04 21:26:57 lamer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-1.2.2-r1.ebuild,v 1.1 2001/10/06 13:20:34 azarah Exp $
 
 
 
@@ -10,19 +10,19 @@ DESCRIPTION="Single process stack of various system monitors"
 SRC_URI="http://web.wt.net/~billw/${PN}/${P}.tar.gz"
 
 DEPEND="virtual/glibc
-        >=x11-libs/gtk+-1.2
-        >=media-libs/imlib-1.9"
+        >=x11-libs/gtk+-1.2.10-r4
+        >=media-libs/imlib-1.9.10-r1"
 
 src_compile() {
 
-    emake  || die
+    emake  PREFIX=/usr prefix=/usr || die
 
 }
 
 src_install () {
 
     cd src
-	 exeinto /usr/X11R6/bin
+	 exeinto /usr/bin
     doexe gkrellm
 
     insinto /usr/include/gkrellm
@@ -31,7 +31,7 @@ src_install () {
       doins $i
     done
 
-    dodir /usr/X11R6/share/gkrellm/{themes,plugins}
+    dodir /usr/share/gkrellm/{themes,plugins}
 
     cd ${S}
 
diff --git a/app-admin/powertweak/files/digest-powertweak-0.1.17 b/app-admin/powertweak/files/digest-powertweak-0.1.17-r1
index 13869b7e3360..13869b7e3360 100644
--- a/app-admin/powertweak/files/digest-powertweak-0.1.17
+++ b/app-admin/powertweak/files/digest-powertweak-0.1.17-r1
diff --git a/app-admin/powertweak/files/digest-powertweak-0.99.0 b/app-admin/powertweak/files/digest-powertweak-0.99.0
deleted file mode 100644
index 2db3d869dce4..000000000000
--- a/app-admin/powertweak/files/digest-powertweak-0.99.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 818f74a9cef02a33c901522fdcada8be powertweak-0.99.0.tar.bz2
diff --git a/app-admin/powertweak/powertweak-0.1.17.ebuild b/app-admin/powertweak/powertweak-0.1.17-r1.ebuild
index 78a3c62c9c1c..54f38807bce9 100644
--- a/app-admin/powertweak/powertweak-0.1.17.ebuild
+++ b/app-admin/powertweak/powertweak-0.1.17-r1.ebuild
@@ -1,7 +1,7 @@
 # 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/app-admin/powertweak/powertweak-0.1.17.ebuild,v 1.4 2001/08/31 03:23:38 pm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/powertweak/powertweak-0.1.17-r1.ebuild,v 1.1 2001/10/06 13:20:34 azarah Exp $
 
 
 
@@ -11,24 +11,20 @@ DESCRIPTION="Powertweak"
 SRC_URI="http://powertweak.sourceforge.net/files/"${A}
 HOMEPAGE="http://powertweak.sourceforge.net"
 
-DEPEND=">=x11-libs/gtk+-1.2.8
-	>=gnome-base/libxml-1.8.10"
+DEPEND=">=x11-libs/gtk+-1.2.10-r1
+	>=dev-libs/libxml-1.8.10"
 
 src_compile() {
   cd ${S}                           
-  try ./configure --host=${CHOST} --prefix=/usr/X11R6
+  try ./configure --host=${CHOST} --prefix=/usr
   try make
 }
 
 src_install() {
   cd ${S}
-  try make install prefix=${D}/usr/X11R6
+  try make install prefix=${D}/usr
   dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README
   docinto Documentation
   dodoc Documentation/* 
 }
 
-
-
-
-
diff --git a/app-admin/puregui/files/digest-puregui-1 b/app-admin/puregui/files/digest-puregui-1-r1
index 119afaef1504..119afaef1504 100644
--- a/app-admin/puregui/files/digest-puregui-1
+++ b/app-admin/puregui/files/digest-puregui-1-r1
diff --git a/app-admin/puregui/puregui-1.ebuild b/app-admin/puregui/puregui-1-r1.ebuild
index 0c724a68f034..87154fcdaf2d 100644
--- a/app-admin/puregui/puregui-1.ebuild
+++ b/app-admin/puregui/puregui-1-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Prakash Shetty (Crux) <crux@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puregui/puregui-1.ebuild,v 1.4 2001/08/31 03:23:38 pm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puregui/puregui-1-r1.ebuild,v 1.1 2001/10/06 13:20:34 azarah Exp $
 
 
 
@@ -12,7 +12,7 @@ SRC_URI="http://prdownloads.sourceforge.net/pureftpd/puregui.tar.gz"
 HOMEPAGE="http://pureftpd.sourceforge.net"
 
 DEPEND="virtual/glibc
-	>=x11-libs/gtk+-1.2.10"
+	>=x11-libs/gtk+-1.2.10-r4"
 
 src_compile() {
 
diff --git a/app-admin/usbview/files/digest-usbview-1.0 b/app-admin/usbview/files/digest-usbview-1.0-r1
index 3d6978a95b34..3d6978a95b34 100644
--- a/app-admin/usbview/files/digest-usbview-1.0
+++ b/app-admin/usbview/files/digest-usbview-1.0-r1
diff --git a/app-admin/usbview/usbview-1.0.ebuild b/app-admin/usbview/usbview-1.0-r1.ebuild
index f63f545e9e42..1ef498051216 100644
--- a/app-admin/usbview/usbview-1.0.ebuild
+++ b/app-admin/usbview/usbview-1.0-r1.ebuild
@@ -1,7 +1,7 @@
 # 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/app-admin/usbview/usbview-1.0.ebuild,v 1.1 2001/04/09 20:30:42 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/usbview/usbview-1.0-r1.ebuild,v 1.1 2001/10/06 13:20:34 azarah Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -10,11 +10,11 @@ SRC_URI="http://www.kroah.com/linux-usb/${A}"
 HOMEPAGE="http://www.kroah.com/linux-usb/"
 
 DEPEND="virtual/glibc
-	>=x11-libs/gtk+-1.2.8"
+	>=x11-libs/gtk+-1.2.10-r4"
 
 src_compile() {
 
-  try ./configure --host=${CHOST} --prefix=/usr/X11R6
+  try ./configure --host=${CHOST} --prefix=/usr
   try make
 
 }
diff --git a/app-cdr/simplecdrx/files/digest-simplecdrx-0.92 b/app-cdr/simplecdrx/files/digest-simplecdrx-0.92-r1
index bf1d01d358e3..bf1d01d358e3 100644
--- a/app-cdr/simplecdrx/files/digest-simplecdrx-0.92
+++ b/app-cdr/simplecdrx/files/digest-simplecdrx-0.92-r1
diff --git a/app-cdr/simplecdrx/simplecdrx-0.92.ebuild b/app-cdr/simplecdrx/simplecdrx-0.92-r1.ebuild
index 5b33d499fc7b..962dc172bc51 100644
--- a/app-cdr/simplecdrx/simplecdrx-0.92.ebuild
+++ b/app-cdr/simplecdrx/simplecdrx-0.92-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Dan Armak <danarmak@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/simplecdrx/simplecdrx-0.92.ebuild,v 1.2 2001/09/10 17:19:58 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/simplecdrx/simplecdrx-0.92-r1.ebuild,v 1.1 2001/10/06 13:20:34 azarah Exp $
 
 S=${WORKDIR}/${PN}
 SRC_URI="http://ogre.rocky-road.net/files/${P}.tar.gz"
@@ -12,12 +12,12 @@ DESCRIPTION="CD ripping/mastering"
 #todo: add blade encoder
 DEPEND="sys-devel/gcc media-sound/mad app-cdr/cdrecord app-cdr/cdrdao 
 		media-sound/cdparanoia media-sound/lame media-libs/libogg
-		media-sound/mpg123 virtual/x11 x11-libs/gtk+ \
+		media-sound/mpg123 virtual/x11 >=x11-libs/gtk+-1.2.10-r4 \
 		dev-libs/glib media-libs/libvorbis
 		media-libs/libao"
 RDEPEND="media-sound/mad app-cdr/cdrecord app-cdr/cdrdao 
 		media-sound/cdparanoia media-sound/lame media-libs/libogg
-		media-sound/mpg123 virtual/x11 x11-libs/gtk+ \
+		media-sound/mpg123 virtual/x11 >=x11-libs/gtk+-1.2.10-r4 \
 		dev-libs/glib media-libs/libvorbis
 		media-libs/libao"
 
diff --git a/app-cdr/xcdroast/files/digest-xcdroast-0.98_alpha8 b/app-cdr/xcdroast/files/digest-xcdroast-0.98_alpha8-r1
index 630881ebfbe4..630881ebfbe4 100644
--- a/app-cdr/xcdroast/files/digest-xcdroast-0.98_alpha8
+++ b/app-cdr/xcdroast/files/digest-xcdroast-0.98_alpha8-r1
diff --git a/app-cdr/xcdroast/xcdroast-0.98_alpha8.ebuild b/app-cdr/xcdroast/xcdroast-0.98_alpha8-r1.ebuild
index fd6db87b24c3..776b272e6c4a 100644
--- a/app-cdr/xcdroast/xcdroast-0.98_alpha8.ebuild
+++ b/app-cdr/xcdroast/xcdroast-0.98_alpha8-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Ben Lutgens <blutgens@sistina.com> 
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/xcdroast/xcdroast-0.98_alpha8.ebuild,v 1.6 2001/08/31 03:23:38 pm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/xcdroast/xcdroast-0.98_alpha8-r1.ebuild,v 1.1 2001/10/06 13:20:34 azarah Exp $
 
 
 A=xcdroast-0.98alpha8.tar.gz
@@ -10,9 +10,9 @@ DESCRIPTION="Menu based front-end to mkisofs and cdrecord"
 SRC_URI="http://www.xcdroast.org/download/${A}"
 HOMEPAGE="http://www.xcdroast.org/"
 
-DEPEND=">=dev-libs/glib-1.2.3
-	>=x11-libs/gtk+-1.2.3
-	>=media-libs/imlib-1.8
+DEPEND=">=dev-libs/glib-1.2.10
+	>=x11-libs/gtk+-1.2.10-r4
+	>=media-libs/imlib-1.9.10-r1
 	>=media-libs/giflib-3.0"
 
 RDEPEND=">=app-cdr/cdrecord-1.9"
diff --git a/app-editors/bluefish/bluefish-0.6.ebuild b/app-editors/bluefish/bluefish-0.6-r1.ebuild
index b535e77885da..7621cf3bd022 100644
--- a/app-editors/bluefish/bluefish-0.6.ebuild
+++ b/app-editors/bluefish/bluefish-0.6-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Grant Goodyear <g2boojum@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-editors/bluefish/bluefish-0.6.ebuild,v 1.1 2001/07/03 15:42:38 g2boojum Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/bluefish/bluefish-0.6-r1.ebuild,v 1.1 2001/10/06 13:20:34 azarah Exp $
 
 #P=
 A=${P}.tar.bz2
@@ -10,8 +10,8 @@ DESCRIPTION="Bluefish is a GTK HTML editor for the experienced web designer or p
 SRC_URI="http://pkedu.fbt.eitn.wau.nl/~olivier/downloads/${A}"
 HOMEPAGE="http://bluefish.openoffice.nl/"
 
-DEPEND=">=x11-libs/gtk+-1.2
-        media-libs/imlib"
+DEPEND=">=x11-libs/gtk+-1.2.10-r1
+        >=media-libs/imlib-1.9.10-r1"
 
 src_compile() {
 
diff --git a/app-editors/bluefish/files/digest-bluefish-0.6 b/app-editors/bluefish/files/digest-bluefish-0.6-r1
index 56640fb52abd..56640fb52abd 100644
--- a/app-editors/bluefish/files/digest-bluefish-0.6
+++ b/app-editors/bluefish/files/digest-bluefish-0.6-r1
diff --git a/app-editors/vim/files/digest-vim-6.0 b/app-editors/vim/files/digest-vim-6.0-r1
index ed106c3dcd70..ed106c3dcd70 100644
--- a/app-editors/vim/files/digest-vim-6.0
+++ b/app-editors/vim/files/digest-vim-6.0-r1
diff --git a/app-editors/vim/vim-6.0.ebuild b/app-editors/vim/vim-6.0-r1.ebuild
index a4dc12d3e740..6af2ec7b1c5e 100644
--- a/app-editors/vim/vim-6.0.ebuild
+++ b/app-editors/vim/vim-6.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Authors Ben Beuchler <insyte@mazer.squad51.net> 
 #     and Aron Griffis <agriffis@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-6.0.ebuild,v 1.1 2001/09/27 14:45:53 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-6.0-r1.ebuild,v 1.1 2001/10/06 13:20:34 azarah Exp $
 
 # Please name the ebuild as follows.  If this is followed, there
 # should be no need to modify this ebuild when the Vim version is
@@ -70,8 +70,8 @@ DEPEND="$guidep
         >=sys-libs/ncurses-5.2-r2
 	dev-util/cscope
         gpm?    ( >=sys-libs/gpm-1.19.3 )
-	gnome?  ( gnome-base/gnome-libs )
-	gtk?    ( x11-libs/gtk+ )
+	gnome?  ( >=gnome-base/gnome-libs-1.4.1.2-r1 )
+	gtk?    ( >=x11-libs/gtk+-1.2.10-r1 )
 	X?      ( x11-base/xfree )
 	perl?   ( sys-devel/perl )
 	python? ( dev-lang/python )
diff --git a/app-emulation/darcnes/dn9b-0401.ebuild b/app-emulation/darcnes/dn9b-0401-r1.ebuild
index e50f24af836e..6f1ba0e3287c 100644
--- a/app-emulation/darcnes/dn9b-0401.ebuild
+++ b/app-emulation/darcnes/dn9b-0401-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Ryan Tolboom <ryan@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/darcnes/dn9b-0401.ebuild,v 1.1 2001/05/27 22:39:02 ryan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/darcnes/dn9b-0401-r1.ebuild,v 1.1 2001/10/06 13:20:34 azarah Exp $
 
 A=dn9b0401.tgz
 S=${WORKDIR}/darcnes
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.netway.com/~nyef"
 
 DEPEND=">=media-libs/svgalib-1.4.2
 	X? ( virtual/x11 )
-	gtk? ( >=x11-libs/gtk+-1.2.8 )"
+	gtk? ( >=x11-libs/gtk+-1.2.10-r4 )"
 
 src_compile() {
 
@@ -40,7 +40,7 @@ src_install () {
     doexe sdarcnes
     if [ "`use X`" ]
     then
-	exeinto /usr/X11R6/bin
+	exeinto /usr/bin
         doexe darcnes
     fi
     dodoc readme
diff --git a/app-emulation/darcnes/files/digest-dn9b-0401 b/app-emulation/darcnes/files/digest-dn9b-0401-r1
index 52909ccd7004..52909ccd7004 100644
--- a/app-emulation/darcnes/files/digest-dn9b-0401
+++ b/app-emulation/darcnes/files/digest-dn9b-0401-r1