partual gtk+ dep update / move to /usr

author: Martin Schlemmer <azarah@gentoo.org> 2001-10-06 10:08:20 +0000
committer: Martin Schlemmer <azarah@gentoo.org> 2001-10-06 10:08:20 +0000
commit: cf72f61a25d08d0cefe9bb916ec94852bdba6bc9 (patch)
tree: d99b6fb484696c3b6a77fe38b99932a10781cea0
parent: new incoming (diff)
download: gentoo-2-cf72f61a25d08d0cefe9bb916ec94852bdba6bc9.tar.gz
gentoo-2-cf72f61a25d08d0cefe9bb916ec94852bdba6bc9.tar.bz2
gentoo-2-cf72f61a25d08d0cefe9bb916ec94852bdba6bc9.zip
131 files changed, 170 insertions, 2516 deletions
diff --git a/media-sound/gtk-gnutella/files/digest-gtk-gnutella-0.12-r2 b/media-sound/gtk-gnutella/files/digest-gtk-gnutella-0.12-r3
index e039716b3fe0..e039716b3fe0 100644
--- a/media-sound/gtk-gnutella/files/digest-gtk-gnutella-0.12-r2
+++ b/media-sound/gtk-gnutella/files/digest-gtk-gnutella-0.12-r3
diff --git a/media-sound/gtk-gnutella/gtk-gnutella-0.12-r2.ebuild b/media-sound/gtk-gnutella/gtk-gnutella-0.12-r3.ebuild
index 8f0bff9f4cbd..08261e839f29 100644
--- a/media-sound/gtk-gnutella/gtk-gnutella-0.12-r2.ebuild
+++ b/media-sound/gtk-gnutella/gtk-gnutella-0.12-r3.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/media-sound/gtk-gnutella/gtk-gnutella-0.12-r2.ebuild,v 1.1 2000/11/21 16:17:41 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gtk-gnutella/gtk-gnutella-0.12-r3.ebuild,v 1.1 2001/10/06 10:08:18 azarah Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -9,12 +9,12 @@ DESCRIPTION="A GTk gnutella Client"
 SRC_URI="ftp://${PN}.sourceforge.net/pub/${PN}/${A}"
 HOMEPAGE="http://${PN}.sourceforge.net/"
 
-DEPEND=">=x11-libs/gtk+-1.2.8"
+DEPEND=">=x11-libs/gtk+-1.2.10-r4"
 
 src_compile() {
 
     cd ${S}
-    try ./configure --prefix=/usr/X11R6 --host=${CHOST}
+    try ./configure --prefix=/usr --host=${CHOST}
     try make
 
 }
diff --git a/media-sound/lame/files/digest-lame-3.88b b/media-sound/lame/files/digest-lame-3.88b
deleted file mode 100644
index b36840e9a021..000000000000
--- a/media-sound/lame/files/digest-lame-3.88b
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7884ed84fcb1427aee06c6000cd872df lame3.88beta.tar.gz
diff --git a/media-sound/lame/files/digest-lame-3.88b-r1 b/media-sound/lame/files/digest-lame-3.88b-r1
deleted file mode 100644
index b36840e9a021..000000000000
--- a/media-sound/lame/files/digest-lame-3.88b-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7884ed84fcb1427aee06c6000cd872df lame3.88beta.tar.gz
diff --git a/media-sound/lame/files/digest-lame-3.89b b/media-sound/lame/files/digest-lame-3.89b-r1
index 80d95db5a4ed..80d95db5a4ed 100644
--- a/media-sound/lame/files/digest-lame-3.89b
+++ b/media-sound/lame/files/digest-lame-3.89b-r1
diff --git a/media-sound/lame/lame-3.88b-r1.ebuild b/media-sound/lame/lame-3.88b-r1.ebuild
deleted file mode 100644
index c2ca9f271f8d..000000000000
--- a/media-sound/lame/lame-3.88b-r1.ebuild
+++ /dev/null
@@ -1,73 +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>
-# /home/cvsroot/gentoo-x86/media-sound/lame/lame-3.86b.ebuild,v 1.4 2000/11/02 02:17:12 achim Exp
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/lame-3.88b-r1.ebuild,v 1.3 2001/08/31 03:23:39 pm Exp $
-
-
-A=lame3.88beta.tar.gz
-S=${WORKDIR}/lame-3.88
-CATEGORY="media-sound"
-DESCRIPTION="LAME Ain't an Mp3 Encoder"
-SRC_URI="ftp://lame.sourceforge.net/pub/lame/src/${A}"
-HOMEPAGE="http://www.mp3dev.org/mp3/"
-
-DEPEND="virtual/glibc dev-lang/nasm >=sys-libs/ncurses-5.2
-	gtk? ( >=x11-libs/gtk+-1.2.8 )"
-        #vorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
-
-RDEPEND="virtual/glibc >=sys-libs/ncurses-5.2
-	gtk? ( >=x11-libs/gtk+-1.2.8 )"
-        #vorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
-
-src_unpack () {
-
-  unpack ${A}
-  cd ${S}
-#  cp Makefile Makefile.orig
-#  sed -e "s:-O3:${CFLAGS}:" Makefile.orig > Makefile
-
-}
-
-src_compile() {
-
-    local myconf
-    if [ "`use vorbis`" ] ; then
-      #myconf="--with-vorbis"
-      myconf="--without-vorbis"
-    else
-      myconf="--without-vorbis"
-    fi
-    if [ "`use gtk`" ] ; then
-      myconf="$myconf --enable-mp3x"
-    fi
-    if [ "$DEBUG" ] ; then
-        myconf="$myconf --enable-debug=yes"
-    else
-        myconf="$myconf --enable-debug=no"
-    fi
-    try ./configure --enable-shared --prefix=/usr --mandir=/usr/share/man --enable-extopt=full $myconf
-    try make
-
-}
-
-src_install () {
-
-    try make prefix=${D}/usr mandir=${D}/usr/share/man install
-#    if [ "`use gtk`" ] ; then
-#      dobin frontend/.libs/mp3x
-#    fi
-#    dobin frontend/.libs/lame
-#    dolib.a  libmp3lame/.libs/libmp3lame.a  libmp3lame/.libs/libmp3lame.la
-#    dolib.so  libmp3lame/.libs/libmp3lame.so*
-#    insinto /usr/include/lame
-#    doins include/lame.h
-#    doman doc/man/lame.1
-    dodoc API COPYING HACKING PRESETS.draft LICENSE README* TODO USAGE
-    docinto html
-    dodoc doc/html/*.html doc/html/*.css
-
-}
-
-
-
diff --git a/media-sound/lame/lame-3.88b.ebuild b/media-sound/lame/lame-3.88b.ebuild
deleted file mode 100644
index 21db4fec07d9..000000000000
--- a/media-sound/lame/lame-3.88b.ebuild
+++ /dev/null
@@ -1,72 +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>
-# /home/cvsroot/gentoo-x86/media-sound/lame/lame-3.86b.ebuild,v 1.4 2000/11/02 02:17:12 achim Exp
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/lame-3.88b.ebuild,v 1.5 2001/08/31 03:23:39 pm Exp $
-
-
-A=lame3.88beta.tar.gz
-S=${WORKDIR}/lame-3.88
-CATEGORY="media-sound"
-DESCRIPTION="LAME Ain't an Mp3 Encoder"
-SRC_URI="ftp://lame.sourceforge.net/pub/lame/src/${A}"
-HOMEPAGE="http://www.mp3dev.org/mp3/"
-
-DEPEND="virtual/glibc dev-lang/nasm >=sys-libs/ncurses-5.2
-	gtk? ( >=x11-libs/gtk+-1.2.8 )"
-        #vorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
-
-RDEPEND="virtual/glibc >=sys-libs/ncurses-5.2
-	gtk? ( >=x11-libs/gtk+-1.2.8 )"
-        #vorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
-
-src_unpack () {
-
-  unpack ${A}
-  cd ${S}
-#  cp Makefile Makefile.orig
-#  sed -e "s:-O3:${CFLAGS}:" Makefile.orig > Makefile
-
-}
-
-src_compile() {
-
-    local myconf
-    if [ "`use vorbis`" ] ; then
-      #myconf="--with-vorbis"
-      myconf="--without-vorbis"
-    else
-      myconf="--without-vorbis"
-    fi
-    if [ "`use gtk`" ] ; then
-      myconf="$myconf --enable-mp3x"
-    fi
-    if [ "$DEBUG" ] ; then
-        myconf="$myconf --enable-debug=yes"
-    else
-        myconf="$myconf --enable-debug=no"
-    fi
-    try ./configure --enable-shared --prefix=/usr --enable-extopt=full $myconf
-    try make
-
-}
-
-src_install () {
-
-    if [ "`use gtk`" ] ; then
-      dobin frontend/.libs/mp3x
-    fi
-    dobin frontend/.libs/lame
-    dolib.a  libmp3lame/.libs/libmp3lame.a  libmp3lame/.libs/libmp3lame.la
-    dolib.so  libmp3lame/.libs/libmp3lame.so*
-    insinto /usr/include/lame
-    doins include/lame.h
-    doman doc/man/lame.1
-    dodoc API COPYING HACKING PRESETS.draft LICENSE README* TODO USAGE
-    docinto html
-    dodoc doc/html/*.html doc/html/*.css
-
-}
-
-
-
diff --git a/media-sound/lame/lame-3.89b.ebuild b/media-sound/lame/lame-3.89b-r1.ebuild
index bc625c64c0d1..7e1ee78b0708 100644
--- a/media-sound/lame/lame-3.89b.ebuild
+++ b/media-sound/lame/lame-3.89b-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
 # /home/cvsroot/gentoo-x86/media-sound/lame/lame-3.89b.ebuild,v 1 2000/11/02 02:17:12 achim Exp
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/lame-3.89b.ebuild,v 1.3 2001/08/31 03:23:39 pm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/lame-3.89b-r1.ebuild,v 1.1 2001/10/06 10:08:18 azarah Exp $
 
 
 A=lame3.89beta.tar.gz
@@ -13,11 +13,11 @@ SRC_URI="ftp://lame.sourceforge.net/pub/lame/src/${A}"
 HOMEPAGE="http://www.mp3dev.org/mp3/"
 
 DEPEND="virtual/glibc dev-lang/nasm >=sys-libs/ncurses-5.2
-	gtk? ( >=x11-libs/gtk+-1.2.8 )"
+	gtk? ( >=x11-libs/gtk+-1.2.10-r4 )"
         #vorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
 
 RDEPEND="virtual/glibc >=sys-libs/ncurses-5.2
-	gtk? ( >=x11-libs/gtk+-1.2.8 )"
+	gtk? ( >=x11-libs/gtk+-1.2.10-r4 )"
         #vorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
 
 src_unpack () {
diff --git a/media-sound/lopster/files/digest-lopster-0.9.9 b/media-sound/lopster/files/digest-lopster-0.9.9-r1
index 258af1d16674..258af1d16674 100644
--- a/media-sound/lopster/files/digest-lopster-0.9.9
+++ b/media-sound/lopster/files/digest-lopster-0.9.9-r1
diff --git a/media-sound/lopster/lopster-0.9.9.ebuild b/media-sound/lopster/lopster-0.9.9-r1.ebuild
index 1388387dba97..73e66c7a1158 100644
--- a/media-sound/lopster/lopster-0.9.9.ebuild
+++ b/media-sound/lopster/lopster-0.9.9-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/media-sound/lopster/lopster-0.9.9.ebuild,v 1.2 2001/06/24 20:12:40 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lopster/lopster-0.9.9-r1.ebuild,v 1.1 2001/10/06 10:08:18 azarah Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -10,25 +10,25 @@ SRC_URI="http://download.sourceforge.net/lopster/${A}"
 HOMEPAGE="http://lopster.sourceforge.net"
 
 DEPEND="virtual/glibc nls? ( sys-devel/gettext )
-	>=x11-libs/gtk+-1.2.8
+	>=x11-libs/gtk+-1.2.10-r4
         virtual/x11"
 
 RDEPEND="virtual/glibc
-	>=x11-libs/gtk+-1.2.8
+	>=x11-libs/gtk+-1.2.10-r4
         virtual/x11"
 
 src_compile() {
     if [ -z "`use nls`" ] ; then
       myconf="--disable-nls"
     fi
-    try ./configure --prefix=/usr/X11R6 --host=${CHOST} $myconf
+    try ./configure --prefix=/usr --host=${CHOST} $myconf
     try make
 
 }
 
 src_install () {
 
-    try make DESTDIR=${D} gnulocaledir=${D}/usr/X11R6/locale install
+    try make DESTDIR=${D} gnulocaledir=${D}/usr/share/locale install
     dodoc AUTHORS BUGS COPYING README ChangeLog NEWS
 }
 
diff --git a/media-sound/soundtracker/files/digest-soundtracker-0.6.4 b/media-sound/soundtracker/files/digest-soundtracker-0.6.4-r1
index 958195b18f2b..958195b18f2b 100644
--- a/media-sound/soundtracker/files/digest-soundtracker-0.6.4
+++ b/media-sound/soundtracker/files/digest-soundtracker-0.6.4-r1
diff --git a/media-sound/soundtracker/soundtracker-0.6.4.ebuild b/media-sound/soundtracker/soundtracker-0.6.4-r1.ebuild
index 4ba3067f6829..27f61fcbb737 100644
--- a/media-sound/soundtracker/soundtracker-0.6.4.ebuild
+++ b/media-sound/soundtracker/soundtracker-0.6.4-r1.ebuild
@@ -1,17 +1,18 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Bruce A. Locke <blocke@shivan.org>
-# $Header: /var/cvsroot/gentoo-x86/media-sound/soundtracker/soundtracker-0.6.4.ebuild,v 1.1 2001/09/22 06:35:42 blocke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/soundtracker/soundtracker-0.6.4-r1.ebuild,v 1.1 2001/10/06 10:08:19 azarah Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="SoundTracker is a music tracking tool for UNIX/X11 (MOD tracker)"
 SRC_URI="http://www.soundtracker.org/dl/v0.6/soundtracker-0.6.4.tar.gz"
 HOMEPAGE="http://www.soundtracker.org"
 
-DEPEND=">=x11-libs/gtk+-1.2.2 >=media-libs/audiofile-0.2.1 \
+DEPEND=">=x11-libs/gtk+-1.2.10-r4
+	>=media-libs/audiofile-0.2.1 \
 	alsa? ( media-libs/alsa-lib ) \
 	esd? ( media-sound/esound ) \
-	gnome? ( gnome-base/gnome-core ) \
+	gnome? ( >=gnome-base/gnome-core-1.4.0.4-r1 ) \
 	sys-libs/zlib"
 
 RDEPEND="$DEPEND sys-apps/bzip2 sys-apps/gzip app-arch/unzip"
@@ -40,7 +41,7 @@ src_compile() {
 		myconf="$myconf --disable-nls"
     fi
 
-	try ./configure ${myconf} --infodir=/usr/share/info --mandir=/usr/share/man --prefix=/usr/X11R6 --host=${CHOST} || die
+	try ./configure ${myconf} --infodir=/usr/share/info --mandir=/usr/share/man --prefix=/usr --host=${CHOST} || die
 
 	emake || die
 
@@ -48,10 +49,10 @@ src_compile() {
 
 src_install () {
 	
-	make prefix=${D}/usr/X11R6 install || die
+	make prefix=${D}/usr install || die
 
 	# strip suid from binary
-	chmod -s ${D}/usr/X11R6/bin/soundtracker
+	chmod -s ${D}/usr/bin/soundtracker
 
 	# documentation
 	dodoc AUTHORS COPYING ChangeLog FAQ INSTALL NEWS README TODO
diff --git a/media-sound/teknap/files/digest-teknap-1.3f b/media-sound/teknap/files/digest-teknap-1.3f-r1
index ade750cde47e..ade750cde47e 100644
--- a/media-sound/teknap/files/digest-teknap-1.3f
+++ b/media-sound/teknap/files/digest-teknap-1.3f-r1
diff --git a/media-sound/teknap/teknap-1.3f.ebuild b/media-sound/teknap/teknap-1.3f-r1.ebuild
index 8ff4e4481c2e..fd9e89fc8228 100644
--- a/media-sound/teknap/teknap-1.3f.ebuild
+++ b/media-sound/teknap/teknap-1.3f-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 Your Name <your email>
-# $Header: /var/cvsroot/gentoo-x86/media-sound/teknap/teknap-1.3f.ebuild,v 1.1 2001/07/03 10:44:43 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/teknap/teknap-1.3f-r1.ebuild,v 1.1 2001/10/06 10:08:19 azarah Exp $
 
 P=TekNap-${PV}
 A=${P}.tar.gz
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.teknap.com/pub/TekNap/${A}"
 HOMEPAGE="http://www.TekNap.com/"
 
 DEPEND="virtual/glibc >=sys-libs/ncurses-5.2
-        gtk? ( >=x11-libs/gtk+-1.2.10 )
+        gtk? ( >=x11-libs/gtk+-1.2.10-r4 )
         tcpd? ( sys-apps/tcp-wrappers )
         xmms? ( media-sound/xmms )"
 
diff --git a/media-sound/timidity++/files/digest-timidity++-2.10.4 b/media-sound/timidity++/files/digest-timidity++-2.10.4-r1
index 2d58467e6e0a..2d58467e6e0a 100644
--- a/media-sound/timidity++/files/digest-timidity++-2.10.4
+++ b/media-sound/timidity++/files/digest-timidity++-2.10.4-r1
diff --git a/media-sound/timidity++/timidity++-2.10.4.ebuild b/media-sound/timidity++/timidity++-2.10.4-r1.ebuild
index fe7e7bdd9965..2e7f505006b4 100644
--- a/media-sound/timidity++/timidity++-2.10.4.ebuild
+++ b/media-sound/timidity++/timidity++-2.10.4-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 Your Name <your email>
-# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.10.4.ebuild,v 1.2 2001/09/29 23:23:21 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.10.4-r1.ebuild,v 1.1 2001/10/06 10:08:19 azarah Exp $
 
 #P=
 A=TiMidity++-${PV}.tar.bz2
@@ -17,7 +17,7 @@ DEPEND=">=sys-libs/ncurses-5.0
 	nas? ( >=media-sound/nas-1.4 )
 	alsa? ( >=media-libs/alsa-lib-0.5.10 )
 	esd? ( >=media-sound/esound-0.2.22 )
-	gtk? ( >=x11-libs/gtk+-1.2.8 )
+	gtk? ( >=x11-libs/gtk+-1.2.10-r4 )
 	slang? ( >=sys-libs/slang-1.4 )
 	vorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
 
diff --git a/media-sound/xmms/files/digest-xmms-1.2.4-r3 b/media-sound/xmms/files/digest-xmms-1.2.4-r3
deleted file mode 100644
index 90c2194bf4e0..000000000000
--- a/media-sound/xmms/files/digest-xmms-1.2.4-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 df1081cc01628cd8b97cb5f3ca80e063 xmms-1.2.4.tar.gz
diff --git a/media-sound/xmms/files/digest-xmms-1.2.5 b/media-sound/xmms/files/digest-xmms-1.2.5-r1
index 5c9b8fdb8a0c..5c9b8fdb8a0c 100644
--- a/media-sound/xmms/files/digest-xmms-1.2.5
+++ b/media-sound/xmms/files/digest-xmms-1.2.5-r1
diff --git a/media-sound/xmms/xmms-1.2.4-r3.ebuild b/media-sound/xmms/xmms-1.2.4-r3.ebuild
deleted file mode 100644
index 03ac25b40194..000000000000
--- a/media-sound/xmms/xmms-1.2.4-r3.ebuild
+++ /dev/null
@@ -1,84 +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/media-sound/xmms/xmms-1.2.4-r3.ebuild,v 1.2 2001/06/06 16:55:51 achim Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="X MultiMedia System"
-SRC_URI="ftp://ftp.xmms.org/xmms/1.2.x/${P}.tar.gz"
-HOMEPAGE="http://www.xmms.org/"
-
-DEPEND="gnome? ( >=gnome-base/gnome-core-1.2.2.1 )
-	>=gnome-base/libxml-1.8.10
-	>=media-libs/libmikmod-3.1.9
-        >=media-sound/esound-0.2.22
-	>=media-libs/libvorbis-1.0_beta4
-	>=x11-libs/gtk+-1.2.8
-	virtual/opengl"
-
-RDEPEND="gnome? ( >=gnome-base/gnome-core-1.2.2.1 )
-	 >=gnome-base/libxml-1.8.10
-  	 >=media-libs/libmikmod-3.1.9
-         >=media-sound/esound-0.2.22
-	 >=media-libs/libvorbis-1.0_beta4
-	 >=x11-libs/gtk+-1.2.8
-	 virtual/opengl"
-
-src_unpack() {
-  unpack ${A}
-  cd ${S}
-  cp configure configure.orig
-  sed -e "s:-m486::" configure.orig > configure
-}
-src_compile() {
-
-  local myopts
-  if [ -n "`use gnome`" ]
-  then
-	myopts="--prefix=/opt/gnome --with-gnome"
-        export CFLAGS="$CFLAGS -I/opt/gnome/include"
-  else
-	myopts="--prefix=/usr/X11R6 --without-gnome"
-  fi
-  if [ "`use 3dnow`" ] ; then
-    myopts=$myopts --enable-3dnow"
-  else
-    myopts=$myopts --disable-3dnow"
-  fi
-  if [ "`use ogg`" ] ; then
-    myopts=$myopts --with-ogg"
-  else
-    myopts=$myopts --disable-ogg-test"
-  fi
-if [ "`use vorbis`" ] ; then
-    myopts=$myopts --with-vorbis"
-  else
-    myopts=$myopts --disable-vorbis-test"
-  fi
-
-
-  try ./configure --host=${CHOST} ${myopts}
-  try make
-
-}
-
-src_install() {                               
-  cd ${S}
-  if [ -n "`use gnome`" ]
-  then
-    try make prefix=${D}/opt/gnome \
-	gnorbadir=${D}/etc/opt/gnome/CORBA/servers \
-	sysdir=${D}/opt/gnome/share/applets/Multimedia \
-	install
-  else
-    try make prefix=${D}/usr/X11R6 install
-  fi
-  dodoc AUTHORS ChangeLog COPYING FAQ NEWS README TODO 
-  insinto /usr/X11R6/include/X11/pixmaps/
-  donewins gnomexmms/gnomexmms.xpm xmms.xpm
-}
-
-
-
-
-
diff --git a/media-sound/xmms/xmms-1.2.5.ebuild b/media-sound/xmms/xmms-1.2.5-r1.ebuild
index 52dc715de10c..0a23c2f77959 100644
--- a/media-sound/xmms/xmms-1.2.5.ebuild
+++ b/media-sound/xmms/xmms-1.2.5-r1.ebuild
@@ -1,27 +1,27 @@
 # 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/media-sound/xmms/xmms-1.2.5.ebuild,v 1.3 2001/08/24 19:49:08 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.5-r1.ebuild,v 1.1 2001/10/06 10:08:19 azarah Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="X MultiMedia System"
 SRC_URI="ftp://ftp.xmms.org/xmms/1.2.x/${P}.tar.gz"
 HOMEPAGE="http://www.xmms.org/"
 
-DEPEND="gnome? ( >=gnome-base/gnome-core-1.2.2.1 )
-	>=gnome-base/libxml-1.8.10
+DEPEND="gnome? ( >=gnome-base/gnome-core-1.4.0.4-r1 )
+	>=dev-libs/libxml-1.8.10
 	>=media-libs/libmikmod-3.1.9
     >=media-sound/esound-0.2.22
 	vorbis? ( >=media-libs/libvorbis-1.0_beta4 )
-	>=x11-libs/gtk+-1.2.8
+	>=x11-libs/gtk+-1.2.10-r4
 	virtual/opengl"
 
-RDEPEND="gnome? ( >=gnome-base/gnome-core-1.2.2.1 )
-	 >=gnome-base/libxml-1.8.10
+RDEPEND="gnome? ( >=gnome-base/gnome-core-1.4.0.4-r1 )
+	 >=dev-libs/libxml-1.8.10
   	 >=media-libs/libmikmod-3.1.9
 	 >=media-sound/esound-0.2.22
 	 vorbis? ( >=media-libs/libvorbis-1.0_beta4 )
-	 >=x11-libs/gtk+-1.2.8
+	 >=x11-libs/gtk+-1.2.10-r4
 	 virtual/opengl"
 
 src_unpack() {
@@ -35,10 +35,10 @@ src_compile() {
   local myopts
   if [ -n "`use gnome`" ]
   then
-	myopts="--prefix=/opt/gnome --with-gnome"
+	myopts="--with-gnome"
         export CFLAGS="$CFLAGS -I/opt/gnome/include"
   else
-	myopts="--prefix=/usr/X11R6 --without-gnome"
+	myopts="--without-gnome"
   fi
   if [ "`use 3dnow`" ] ; then
     myopts="$myopts --enable-3dnow"
@@ -57,7 +57,7 @@ if [ "`use vorbis`" ] ; then
   fi
 
 
-  try ./configure --host=${CHOST} ${myopts}
+  try ./configure --host=${CHOST} --prefix=/usr ${myopts}
   try make
 
 }
@@ -66,14 +66,14 @@ src_install() {
   cd ${S}
   if [ -n "`use gnome`" ]
   then
-    try make prefix=${D}/opt/gnome \
-	gnorbadir=${D}/etc/opt/gnome/CORBA/servers \
-	sysdir=${D}/opt/gnome/share/applets/Multimedia \
+    try make prefix=${D}/usr \
+	gnorbadir=${D}/etc/gnome/CORBA/servers \
+	sysdir=${D}/usr/share/applets/Multimedia \
 	install
   else
     try make prefix=${D}/usr/X11R6 install
   fi
   dodoc AUTHORS ChangeLog COPYING FAQ NEWS README TODO 
-  insinto /usr/X11R6/include/X11/pixmaps/
+  insinto /usr/share/pixmaps/
   donewins gnomexmms/gnomexmms.xpm xmms.xpm
 }
diff --git a/media-video/mplayer/files/codecs.conf b/media-video/mplayer/files/codecs.conf
deleted file mode 100644
index dc2cd611290f..000000000000
--- a/media-video/mplayer/files/codecs.conf
+++ /dev/null
@@ -1,486 +0,0 @@
-;  Default codecs config file. It replaces the old codecs.c file!
-
-;=============================================================================
-;                   VIDEO CODECS
-;=============================================================================
-
-; =============== Win32/libmpeg2/ProjectMayo MPEG CODECS =====================
-
-videocodec u263
-  info "UB Video H.263+ Decoder"
-  comment "added by Juanjo"
-  status working
-  fourcc U263
-  driver dshow
-  dll "ubv263d+.ax"
-  guid 0x00af1181, 0x6ebb, 0x11d4, 0x9d, 0x5a, 0x00, 0x50, 0x04, 0x79, 0x6c, 0xc0
-;  out I420 flip
-;  out YVYU flip,noflip
-;  out YV12 flip
-;  out UYVY flip,noflip
-;  out YUY2 flip
-  out BGR24 flip
-
-videocodec divxds
-  info "DivX ;-) (MS MPEG-4 v3)"
-  comment "with postprocessing"
-  status working
-  fourcc MP43,mp43 div3   ; fourcc mapping to div3
-  fourcc DIV5,div5 div3
-  fourcc DIV6,div6 div4
-  fourcc DIV3,div3,DIV4,div4
-  driver dshow
-  dll "divx_c32.ax"
-  guid 0x82CCd3E0, 0xF71A, 0x11D0, 0x9f, 0xe5, 0x00, 0x60, 0x97, 0x78, 0xaa, 0xaa
-;  out YV12
-  out YUY2
-  out BGR32,BGR24,BGR16,BGR15
-
-videocodec mpeg12
-  info "MPEG 1 or 2"
-  comment "with postprocessing"
-  status working
-  format 0x10000001
-  driver libmpeg2
-  dll "libmpeg2"
-  out YV12
-
-videocodec mpeg4
-  info "Microsoft MPEG-4 v1/v2"
-  status working
-;  comment "No postprocessing"
-  fourcc MPG4,mpg4
-  fourcc MP42,mp42
-  fourcc DIV2 mp42
-  driver vfw
-  dll "mpg4c32.dll"
-  out YUY2 yuvhack
-  out BGR32,BGR24,BGR15
-
-videocodec mpeg4ds
-  info "Microsoft MPEG-4 v1/v2"
-  status working
-;  comment "with postprocessing"
-  fourcc DIV2,div2 mp42
-  fourcc MPG4,mpg4
-  fourcc MP42,mp42
-  driver dshow
-  dll "mpg4ds32.ax"
-  guid 0x82CCD3E0, 0xF71A, 0x11D0, 0x9F, 0xE5, 0x00, 0x60, 0x97, 0x78, 0xEA, 0x66
-  out YUY2
-  out BGR32,BGR24,BGR16,BGR15
-
-videocodec divx
-  info "DivX ;-) (MS MPEG-4 v3)"
-  status working
-  fourcc MP43,mp43 div3   ; M$ MPEG4 v3   (fourcc mapping to div3)
-  fourcc DIV5,div5 div3   ; DivX 3.20 
-  fourcc DIV6,div6 div4   ;   -||-
-  fourcc DIV3,div3,DIV4,div4
-  driver vfw
-  dll "divxc32.dll"
-  out YUY2 yuvhack
-  out BGR32,BGR24,BGR15
-  
-videocodec odivx
-  info "OpenDivX (MPEG-4 v2)"
-  comment "with postprocessing"
-  status working
-  fourcc DIVX,divx
-  fourcc DIV1,div1 divx
-  fourcc MP4S,mp4s	; ISO MPEG-4 Video V1
-  format 0x4
-  driver odivx
-  dll "opendivx decore"
-  out YV12
-
-; =============== FFMPEG MPEG CODECS =========================
-
-videocodec ffdivx
-  info "FFmpeg DivX ;-) (MS MPEG-4 v3)"
-  status working
-  fourcc MP43,mp43 div3   ; M$ MPEG4 v3   (fourcc mapping to div3)
-  fourcc DIV5,div5 div3   ; DivX 3.20 
-  fourcc DIV6,div6 div4   ;   -||-
-  fourcc DIV3,div3,DIV4,div4
-  driver ffmpeg
-  dll msmpeg4
-  out YV12
-
-videocodec ffodivx
-  info "FFmpeg OpenDivX"
-  status working
-  fourcc DIVX,divx
-  fourcc DIV1,div1 divx
-  fourcc MP4S,mp4s	; ISO MPEG-4 Video V1
-  format 0x4
-  driver ffmpeg
-  dll opendivx
-  out YV12
-
-videocodec ffmpeg12
-  info "FFmpeg-1"
-  status working
-  format 0x10000001
-  driver ffmpeg
-  dll "mpeg1video"
-  out YV12
-
-
-; ============== OTHER STUFF =======================
-
-
-videocodec indeo5ds
-  info "Intel Indeo 5"
-  status working
-  fourcc IV50,iv50
-  driver dshow
-  dll "ir50_32.dll"
-  guid 0x30355649, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71
-  out YV12,I420
-  out YUY2
-  out BGR32,BGR24,BGR16,BGR15
-
-videocodec indeo5
-  info "Intel Indeo 5"
-  status working
-  fourcc IV50,iv50
-  driver vfw
-  dll "ir50_32.dll"
-  out YV12,I420
-  out YUY2
-  out BGR32,BGR24,BGR15
-
-videocodec indeo4
-  info "Intel Indeo 4.1"
-  status working
-;  comment "upside-down"
-  fourcc IV41,iv41
-  driver vfw
-  dll "ir41_32.dll"
-  out BGR24,BGR15
-
-videocodec indeo3
-  info "Intel Indeo 3.1/3.2"
-  status buggy
-  comment "upside-down with some vo drivers, (no yuv)"
-  fourcc IV31,iv31
-  fourcc IV32,iv32
-  driver vfw
-  dll "ir32_32.dll"
-  out BGR24,BGR15 flip
-
-videocodec cvid
-  info "Cinepak Video"
-  status working
-  fourcc cvid
-  driver vfw
-  dll "iccvid.dll"
-;  out YUY2
-;  out UYVY
-  out BGR24,BGR15
-
-videocodec cram
-  info "Microsoft Video 1"
-  status working
-  fourcc cram,CRAM,MSVC
-  driver vfw
-  dll "msvidc32.dll"
-  out BGR24,BGR15
-
-videocodec vcr2
-  info "ATI VCR-2"
-  status crashing
-  comment "segfault"
-  fourcc VCR2
-  driver vfw
-  dll "ativcr2.dll"
-  out YUY2
-  out BGR32,BGR24,BGR15
-
-videocodec i263
-  info "I263"
-  status working
-  fourcc I263,i263,I420,i420
-  driver vfw
-  dll "i263_32.drv"
-;  out I420
-  out YUY2
-  out BGR32,BGR24,BGR15
-
-videocodec mjpeg
-  info "Motion JPEG"
-  status working
-  fourcc MJPG
-  driver vfw
-  dll "mcmjpg32.dll"
-;  dll "m3jpeg32.dll"
-  out YUY2
-  out UYVY
-  out BGR32,BGR24,BGR15
-
-videocodec wmv7
-  info "Windows Media Video 7"
-  status working
-  fourcc WMV1
-  driver dshow
-  dll "wmvds32.ax"
-  guid 0x4facbba1, 0xffd8, 0x4cd7, 0x82, 0x28, 0x61, 0xe2, 0xf6, 0x5c, 0xb1, 0xae
-;  out I420
-  out YUY2
-  out BGR32,BGR24,BGR16,BGR15
-
-videocodec wmv8
-  info "Windows Media Video 8"
-  status crashing
-  comment "Floating point exception"
-  fourcc WMV2
-  driver dshow
-  dll "wmv8ds32.ax"
-  guid 0x521fb373, 0x7654, 0x49f2, 0xbd, 0xb1, 0x0c, 0x6e, 0x66, 0x60, 0x71, 0x4f
-  out YUY2
-  out BGR32,BGR24,BGR16,BGR15
-
-videocodec ap41
-  info "AngelPotion Definitive V1"	; yet another stolen stuff
-  comment "using the DivX ;-) codec"
-  status working
-  fourcc AP41 div3  
-  driver dshow
-  dll "divx_c32.ax"		; no need to use apmpg4v1.dll
-  guid 0x82CCd3E0, 0xF71A, 0x11D0, 0x9f, 0xe5, 0x00, 0x60, 0x97, 0x78, 0xaa, 0xaa
-  out YUY2
-  out BGR32,BGR24,BGR16,BGR15
-
-videocodec tm20
-  info "TrueMotion 2.0"
-  status crashing
-  comment "segfault in the DLL"
-  fourcc TM20
-  driver dshow
-  dll "tm20dec.ax"
-  guid 0x4cb63e61, 0xc611, 0x11D0, 0x83, 0xaa, 0x00, 0x00, 0x92, 0x90, 0x01, 0x84
-;  out UYVY
-  out YUY2
-  out BGR32,BGR24,BGR16,BGR15
-
-videocodec dv
-  info "Sony Digital Video (DV)"
-  status working
-  fourcc DVSD dvsd
-  driver dshow
-  dll "qdv.dll"
-  guid 0xB1B77C00, 0xC3E4, 0x11CF, 0xAF, 0x79, 0x00, 0xAA, 0x00, 0xB6, 0x7A, 0x42
-  out YUY2
-  out UYVY
-  out BGR32,BGR24,BGR16,BGR15
-
-videocodec morgands
-  info "Morgan MJPEG"
-  status crashing
-  fourcc MJPG mjpg
-  driver dshow
-  dll "M3JPEGdec.ax"
-  guid 0x6988b440, 0x8352, 0x11d3, 0x9b, 0xda, 0xca, 0x86, 0x73, 0x7c, 0x71, 0x68
-  out YUY2
-  out BGR32,BGR24,BGR16,BGR15
-
-videocodec huffyuv
-  info "HuffYUV"
-  status buggy
-  comment "YUY2 _or_ 24/32bpp only (depending on file encoding)"
-  fourcc HFYU
-  driver vfw
-  dll "huffyuv.dll"
-  out YUY2 flip,noflip
-;  out UYVY flip
-  out BGR32,BGR24 flip
-
-videocodec mszh
-  info "AVImszh"
-  status crashing
-  comment "calls RegEnumValueA()"
-  fourcc MSZH
-  driver vfw
-  dll "avimszh.dll"
-  out YUY2
-  out BGR32,BGR24,BGR15
-
-videocodec zlib
-  info "AVIzlib"
-  status crashing
-  comment "calls RegEnumValueA()"
-  fourcc ZLIB
-  driver vfw
-  dll "avizlib.dll"
-  out YUY2
-  out BGR32,BGR24,BGR15
-
-videocodec mwv1
-  info "Motion Wavelets"
-  status crashing
-  comment "decompressquery failed"
-  fourcc MWV1
-  driver vfw
-  dll "icmw_32.dll"
-;  out YV12
-  out YUY2
-  out BGR32,BGR24,BGR15
-
-
-videocodec m261
-  info "M261"
-  status untested
-  fourcc m261,M261
-  driver vfw
-  dll "msh261.drv"
-  out BGR32,BGR24,BGR15
-
-videocodec asv2
-  info "ASUS V2"
-  status buggy
-  comment "rgb upside down, yuv ok"
-  fourcc ASV2
-  driver vfw
-  dll "asusasv2.dll"
-;  out YVYU
-  out UYVY
-  out BGR32,BGR24,BGR15 flip
-
-videocodec asv1
-  info "ASUS V1"
-  status buggy
-  comment "rgb upside down, yuv ok"
-  fourcc ASV1
-  driver vfw
-  dll "asusasvd.dll"
-;  out YVYU
-  out UYVY
-  out BGR32,BGR24,BGR15 flip
-
-;=============================================================================
-;                   AUDIO CODECS
-;=============================================================================
-
-audiocodec pcm
-  info "Uncompressed PCM"
-  status working
-  format 0x1
-;;;; these are for hardware support only:  (alaw,ulaw,ima-adpcm,mpeg,ac3)
-;  format 0x6
-;  format 0x7
-;  format 0x11
-;  format 0x50
-;  format 0x2000
-;;;;
-  driver pcm
-  dll "uncompressed"
-
-audiocodec divx
-  info "DivX audio (WMA)"
-  status working
-  format 0x160
-  format 0x161
-  driver acm
-  dll "divxa32.acm"
-
-audiocodec msadpcm
-  info "MS ADPCM"
-  status working
-  format 0x2
-  driver acm
-  dll "msadp32.acm"
-
-; now mp3lib is stable enough!?
-audiocodec mp3
-  info "MPEG layer-2, layer-3"
-  status working
-  comment "Optimized to AMD 3Dnow!"
-  format 0x50
-  format 0x55
-  driver mp3lib
-  dll "mp3lib (mpglib)"
-  flags seekable
-
-audiocodec mp3acm
-  info "MPEG layer-3"
-  status working
-  comment "Optimized to Intel MMX/SSE, conflicts with security kernel patches"
-  format 0x55
-  driver acm
-  dll "l3codeca.acm"
-  flags seekable
-
-audiocodec imaadpcm
-  info "IMA ADPCM"
-  status working
-  format 0x11
-  driver acm
-  dll "imaadp32.acm"
-  
-audiocodec msgsmacm
-  info "MS GSM"
-  status working
-  format 0x31
-  format 0x32
-  driver acm
-  dll "msgsm32.acm"
-
-audiocodec msgsm
-  info "MS GSM"
-  status working
-  format 0x31
-  format 0x32
-  driver msgsm
-  dll "xa_gsm.c"
-
-audiocodec alaw
-  info "aLaw"
-  status working
-  format 0x6
-  driver alaw
-  dll "alaw"
-
-audiocodec ulaw
-  info "uLaw"
-  status working
-  format 0x7
-  driver alaw
-  dll "ulaw"
-
-audiocodec dvdpcm
-  info "Uncompressed DVD PCM"
-  status working
-  format 0x10001
-  driver dvdpcm
-  dll "uncompressed"
-
-audiocodec ac3
-  info "AC3"
-  status working
-  format 0x2000
-  driver libac3
-  dll "libac3"
-
-audiocodec voxware
-  info "VoxWare"
-  status working	; audio is bubbling
-  format 0x75
-  driver dshow
-  dll "voxmsdec.ax"
-  guid 0x73f7a062, 0x8829, 0x11d1, 0xb5, 0x50, 0x00, 0x60, 0x97, 0x24, 0x2d, 0x8d
-
-audiocodec acelp
-  info "ACELP.net Sipro Lab Audio Decoder"
-  status crashing
-  comment "DS: cannot connect Output pin"
-  format 0x130
-  driver dshow
-  dll "acelpdec.ax"
-  guid 0x4009f700, 0xaeba, 0x11d1, 0x83, 0x44, 0x00, 0xc0, 0x4f, 0xb9, 0x2e, 0xb7
-
-audiocodec imc
-  info "Intel Music Coder"
-  status untested
-  format 0x401
-;  driver gebasz
diff --git a/media-video/mplayer/files/digest-mplayer-0.50_pre1 b/media-video/mplayer/files/digest-mplayer-0.50_pre1
deleted file mode 100644
index 34c1a59ba7c4..000000000000
--- a/media-video/mplayer/files/digest-mplayer-0.50_pre1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5a71689dda88731e1dba596e270fa3d9 MPlayer-0.50pre1.tar.bz2
-MD5 fe5d70fb6d2c2d1291940f947e12d471 default.tar.bz2
-MD5 ab23f8e01a860a97852b28a3b0b118da mp-arial-iso-8859-1.zip
diff --git a/media-video/mplayer/files/digest-mplayer-0.50_pre3 b/media-video/mplayer/files/digest-mplayer-0.50_pre3-r1
index 8b1cb064a3a8..8b1cb064a3a8 100644
--- a/media-video/mplayer/files/digest-mplayer-0.50_pre3
+++ b/media-video/mplayer/files/digest-mplayer-0.50_pre3-r1
diff --git a/media-video/mplayer/files/mplayer b/media-video/mplayer/files/mplayer
deleted file mode 100644
index fafc84c67a52..000000000000
--- a/media-video/mplayer/files/mplayer
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-mplayerbin=`which mplayer-bin`
-
-if [ ! -d ~/.mplayer ] ; then
-	mkdir ~/.mplayer
-fi
-
-if [ ! -f ~/.mplayer/codecs.conf ] ; then
-	cp /etc/codecs.conf ~/.mplayer/codecs.conf
-fi
-
-$mplayerbin "$@"
-
diff --git a/media-video/mplayer/files/mplayer.conf b/media-video/mplayer/files/mplayer.conf
deleted file mode 100644
index 676d36bdb34e..000000000000
--- a/media-video/mplayer/files/mplayer.conf
+++ /dev/null
@@ -1,100 +0,0 @@
-##
-## MPlayer config file
-##
-## This file can be copied to /etc/mplayer.conf and/or ~/.mplayer/config .
-## If both exist, the ~/.mplayer/config's settings override the
-## /etc/mplayer.conf ones. And, of course command line overrides all.
-## The options are the same as in the command line, but they can be specified
-## more flexibly here. See below.
-##
-
-vo=sdl			# To specify default video driver (see -vo help for
-			# list)
-
-ao=sdl			# To specify default audio driver (see -ao help for
-			# list)
-
-fs=no			# Enlarges movie window to your desktop's size.
-			# Used by drivers: all
-
-vm=no			# Tries to change to a different videomode
-			# Used by drivers: dga2, x11, sdl
-
-#bpp=16			# Force changing display depth.
-			# Valid settings are: 0, 15, 16, 24, 32
-			# may need 'vm=yes' too.
-			# Used by drivers: fbdev, dga2, svga
-
-zoom=no			# Enable software scaling (powerful CPU needed)
-			# Used by drivers: svga, aalib
-
-# x=800			# scale movie to <x> pixels width
-# y=600			# scale movie to <y> pixels height
-
-##
-## Multiple languages are available :)
-##
-## Hungarian	igen	nem
-## English	yes	no
-## German	ja	nein
-## Spanish	si	no
-## Binary	1	0
-##
-## You can also use spaces and/or tabs.
-##
-
-sound	= 1
-nosound	= no
-mixer	= /dev/mixer
-master	= no		# no : set PCM volume  	yes : set MASTER volume
-
-##
-## resample the fonts' alphamap
-## 0	plain white fonts
-## 0.75	very narrow black outline (default)
-## 1	narrow black outline
-## 10	bold black outline
-##
-
-ffactor = 0.75
-
-##
-## FBdev driver: specify your monitor's timings, so resolutions
-## can be autodetected.
-## (see for example /etc/X11/XF86Config for timings!)
-## ** CAUTION! IF YOUR DISPLAY DOESN'T SUPPORT AUTOMATICALLY TURNING OFF WHEN
-##    OVERDRIVED (AND EVEN IF IT DOES), THIS MAY CAUSE DAMAGE TO YOUR DISPLAY!
-##    WE AREN'T RESPONSIBLE, IT'S YOUR DECISION! **
-##
-## k, K : means multiply by 1000
-## m, M : means multiply by 1.000.000
-##
-
-
-## NB!!  Edit this to your config .... works here, but wont work for all (:
-fb = /dev/fb0				# framebuffer device to use
-fbmode = 800x600-70			# use this mode (read from fb.modes!)
-fbmodeconfig = /etc/fb.modes		# the fb.modes file
-monitor_hfreq = 30k-70k			# horizontal frequency range
-monitor_vfreq = 50-130			# vertical frequency range
-#monitor_dotclock = 30M-300M		# dotclock (or pixelclock) range
-
-##
-## SDL driver
-##
-
-# vo = sdl		# use SDL video driver by default
-# ao = sdl		# use SDL audio driver by default
-# sdl = aalib		# specify driver to use (for ex.: aalib, dga, fbdev...)
-#noxv = yes		# whether to use XVideo hardware acceleration or not
-forcexv = yes		# force XVideo even if not detected
-# sdla = esd		# use SDL's ESD audio driver by default
-
-# nodshow		# disable usage of DirectShow video codecs
-
-##
-## You can also include other configfiles
-## Specify full path!
-##
-
-# include = /home/gabucino/.mplayer/savage4.conf
diff --git a/media-video/mplayer/mplayer-0.50_pre1.ebuild b/media-video/mplayer/mplayer-0.50_pre1.ebuild
deleted file mode 100644
index d1d0509b18a1..000000000000
--- a/media-video/mplayer/mplayer-0.50_pre1.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Authors Bruce Locke <blocke@shivan.org>, Martin Schlemmer <azarah@gentoo.org>,
-#         Donny Davies <woodchip@gentoo.org>
-
-MY_P="MPlayer-0.50pre"
-PRE_VERSION="1"
-S=${WORKDIR}/${MY_P}?
-
-# Only install Skin if GUI should be build (gtk as USE flag)
-if [ "`use gtk`" ] ; then
-	A="${MY_P}${PRE_VERSION}.tar.bz2 default.tar.bz2 mp-arial-iso-8859-1.zip"
-	SRC_URI="ftp://mplayerhq.hu/MPlayer/releases/${A}
-		 ftp://mplayerhq.hu/MPlayer/Skin/default.tar.bz2
-		 ftp://mplayerhq.hu/MPlayer/releases/mp-arial-iso-8859-1.zip"
-else		  
-        A="${MY_P}${PRE_VERSION}.tar.bz2 mp-arial-iso-8859-1.zip"
-        SRC_URI="ftp://mplayerhq.hu/MPlayer/releases/${A}
-                 ftp://mplayerhq.hu/MPlayer/releases/mp-arial-iso-8859-1.zip"
-fi
-
-DESCRIPTION="Media Player for Linux"
-HOMEPAGE="http://www.mplayerhq.hu"
-
-# Experimental USE flags dvd and decss
-DEPEND="virtual/glibc
-        dev-lang/nasm
-        media-libs/win32codecs
-	>=media-libs/divx4linux-20010824
-        dvd? ( media-libs/libdvdread )
-        decss? ( media-libs/libdvdcss )
-	opengl? ( media-libs/mesa )
-        sdl? ( media-libs/libsdl )
-        ggi? ( media-libs/libggi )
-        svga? ( media-libs/svgalib )
-        X? ( virtual/x11 )
-	gtk? ( x11-libs/gtk+ )
-        esd? ( media-sound/esound )
-        alsa? ( media-libs/alsa-lib )
-	ogg? ( media-libs/libogg )"
-
-RDEPEND="virtual/glibc
-        media-libs/win32codecs
-        >=media-libs/divx4linux-20010824
-        dvd? ( media-libs/libdvdread )
-        decss? ( media-libs/libdvdcss )
-	opengl? ( media-libs/mesa )
-        sdl? ( media-libs/libsdl )
-        ggi? ( media-libs/libggi )
-        svga? ( media-libs/svgalib )
-        X? ( virtual/x11 )
-        gtk? ( x11-libs/gtk+ )
-	esd? ( media-sound/esound )
-        alsa? ( media-libs/alsa-lib )
-	ogg? ( media-libs/libogg )"
-
-
-src_unpack() {
-
-	unpack ${A}
-
-	# Fix bug with the default Skin
-	cd ${WORKDIR}/default
-	patch <${FILESDIR}/default-skin.diff
-
-}
-
-src_compile() {
-
-	local myconf
-	use 3dnow  || myconf="${myconf} --disable-3dnow --disable-3dnowex"
-	use mmx    || myconf="${myconf} --disable-mmx --disable-mmx2"
-	use X      || myconf="${myconf} --disable-x11 --disable-xv"
-	use gtk    && myconf="${myconf} --enable-gui"
-	use oss    || myconf="${myconf} --disable-ossaudio"
-	use nls    || myconf="${myconf} --disable-nls"
-	use opengl || myconf="${myconf} --disable-gl"
-	use sdl    || myconf="${myconf} --disable-sdl"
-	use ggi    || myconf="${myconf} --disable-ggi"
-	use sse    || myconf="${myconf} --disable-sse"
-	use svga   || myconf="${myconf} --disable-svga"
-	use alsa   || myconf="${myconf} --disable-alsa"
-	use esd    || myconf="${myconf} --disable-esd"
-	use ogg    || myconf="${myconf} --disable-oggvorbis"
-	use decss  && myconf="${myconf} --enable-css"
-
-	./configure --mandir=/usr/share/man --prefix=/usr --host=${CHOST} ${myconf} || die
-	emake OPTFLAGS="${CFLAGS}" all || die
-	
-}
-
-src_install() {
-
-	make prefix=${D}/usr/share BINDIR=${D}/usr/bin install || die
-	
-	# MAN pages are already installed ...
-	rm DOCS/*.1
-	# Install the rest of the documentation
-	dodir /usr/share/doc/${PF}
-	cp -a DOCS/* ${D}/usr/share/doc/${PF}
-
-	# Install the default Skin
-	if [ "`use gtk`" ] ; then
-		insinto /usr/share/mplayer/Skin/default
-		doins ${WORKDIR}/default/*
-		# Permissions is fried by default
-		chmod a+rx ${D}/usr/share/mplayer/Skin/default/
-		chmod a+r ${D}/usr/share/mplayer/Skin/default/*
-	fi
-
-	# Install the font used by OSD and the GUI
-	dodir /usr/share/mplayer/fonts
-	cp -a ${WORKDIR}/iso-8859-1/ ${D}/usr/share/mplayer/fonts
-	dosym /usr/share/mplayer/fonts/iso-8859-1/arial-14/ /usr/share/mplayer/font
-
-	# This tries setting up mplayer.conf automagically
-	local video="sdl" audio="sdl"
-	if [ "`use X`" ] ; then
-		if [ "`use sdl`" ] ; then
-			video="sdl"
-		elif [ "`use ggi`" ] ; then
-			video="ggi"
-		elif [ "`use xv`" ] ; then
-			video="xv"
-                elif [ "`use dga`" ] ; then
-                        video="dga"
-		elif [ "`use opengl`" ] ; then
-			video="gl"
-		else
-			video="x11"
-		fi
-	else
-		if [ "`use fbcon`" ] ; then
-			video="fbdev"
-                elif [ "`use svga`" ] ; then
-                        video="svga"
-		elif [ "`use aalib`" ] ; then
-			video="aa"
-		fi
-	fi
-	if [ "`use sdl`" ] ; then
-		audio="sdl"
-	elif [ "`use alsa`" ] ; then
-		audio="alsa"
-	elif [ "`use oss`" ] ; then
-		audio="oss"
-	fi
-	sed -e "s/vo=xv/vo=${video}/" -e "s/ao=oss/ao=${audio}/" -e 's/include =/#include =/' ${S}/etc/example.conf > ${T}/mplayer.conf
-
-	insinto /etc
-	doins ${T}/mplayer.conf 
-	
-	# Thanks goes to Mog for this one!
-	insinto /usr/share/mplayer
-	doins ${S}/etc/codecs.conf
-	
-}
-
-pkg_postinst() {
-
-	echo
-	echo '######################################################################'
-	echo '# MPlayer users that are going to use the GUI, please note the       #'
-	echo '# following:                                                         #'
-	echo '#                                                                    #'
-	echo '#   The GUI works best with mplayer -vo xv -gui, but since there is  #'
-	echo '#   no USE flag for XVideo, or for using the GUI, the autodetection  #'
-	echo '#   process cannot detect this by default (SDL will be used rather). #'
-	echo '#   So, if you setup supports XVideo (xvinfo should give output),    #'
-	echo '#   maybe do something like:                                         #'
-	echo '#                                                                    #'
-	echo '#     echo "vo = xv" >~/.mplayer/config                              #'
-	echo '#     echo "gui = 1" >>~/.mplayer/config                             #'
-	echo '#                                                                    #'
-	echo '#   after launching mplayer for the first time.                      #'
-	echo '#                                                                    #'
-	echo '# NB: the GUI needs "gtk" as USE flag to build.                      #'
-	echo '######################################################################'
-	echo
-
-}
-
diff --git a/media-video/mplayer/mplayer-0.50_pre3.ebuild b/media-video/mplayer/mplayer-0.50_pre3-r1.ebuild
index eb69570daa7f..3bc80be8f9f9 100644
--- a/media-video/mplayer/mplayer-0.50_pre3.ebuild
+++ b/media-video/mplayer/mplayer-0.50_pre3-r1.ebuild
@@ -36,7 +36,7 @@ DEPEND="virtual/glibc
         ggi? ( media-libs/libggi )
         svga? ( media-libs/svgalib )
         X? ( virtual/x11 )
-	gtk? ( x11-libs/gtk+ )
+	gtk? ( >=x11-libs/gtk+-1.2.10-r4 )
         esd? ( media-sound/esound )
         alsa? ( media-libs/alsa-lib )
 	ogg? ( media-libs/libogg )"
@@ -51,7 +51,7 @@ RDEPEND="virtual/glibc
         ggi? ( media-libs/libggi )
         svga? ( media-libs/svgalib )
         X? ( virtual/x11 )
-        gtk? ( x11-libs/gtk+ )
+        gtk? ( >=x11-libs/gtk+-1.2.10-r4 )
 	esd? ( media-sound/esound )
         alsa? ( media-libs/alsa-lib )
 	ogg? ( media-libs/libogg )"
diff --git a/media-video/vlc/files/digest-vlc-0.2.73 b/media-video/vlc/files/digest-vlc-0.2.73
deleted file mode 100644
index b8473591a771..000000000000
--- a/media-video/vlc/files/digest-vlc-0.2.73
+++ /dev/null
@@ -1 +0,0 @@
-MD5 01a0b60b7c35378daf6ac006b061d3fb vlc-0.2.73.tar.gz
diff --git a/media-video/vlc/files/digest-vlc-0.2.80 b/media-video/vlc/files/digest-vlc-0.2.80
deleted file mode 100644
index 043a5bd5ad94..000000000000
--- a/media-video/vlc/files/digest-vlc-0.2.80
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d942af931892cb136a7230cf05337564 vlc-0.2.80.tar.gz
diff --git a/media-video/vlc/files/digest-vlc-0.2.83 b/media-video/vlc/files/digest-vlc-0.2.83-r1
index b2be85030c37..b2be85030c37 100644
--- a/media-video/vlc/files/digest-vlc-0.2.83
+++ b/media-video/vlc/files/digest-vlc-0.2.83-r1
diff --git a/media-video/vlc/vlc-0.2.73.ebuild b/media-video/vlc/vlc-0.2.73.ebuild
deleted file mode 100644
index 233c8bcbf413..000000000000
--- a/media-video/vlc/vlc-0.2.73.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Nathaniel Hirsch <nh2@njit.edu> Achim Gottinge <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.2.73.ebuild,v 1.3 2001/09/30 11:54:16 hallski Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="DVD / video player"
-SRC_URI="http://www.videolan.org/pub/videolan/vlc/${PV}/${P}.tar.gz"
-HOMEPAGE="http://www.videolan.org"
-
-DEPEND=">=media-libs/libsdl-1.1.8-r1
-	gnome? ( >=gnome-base/gnome-libs-1.2.12 )
-    esd? ( >=media-sound/esound-0.2.22 )
-    ggi? ( >=media-libs/libggi-2.0_beta3 )
-    qt? ( >=x11-libs/qt-x11-2.3.0 )
-    gtk? ( >=x11-libs/gtk+-1.2.9 )
-    #alsa? ( >=media-libs/alsa-lib-0.5.10 )
-    X? ( virtual/x11 )"
-    #kde? ( >=kde-base/kdelibs-2.1.1 )
-
-src_compile(){
-    local myconf
-	if [ "`use fbdev`" ]
-    then
-      myconf="--enable-fb"
-    fi
-    if [ -z "`use mmx`" ]
-    then
-      myconf="$myconf --disable-mmx"
-    fi
-    if [ "`use esd`" ]
-    then
-      myconf="$myconf --enable-esd"
-    fi
-    if [ "`use ggi`" ]
-    then
-      myconf="$myconf --with-ggi"
-    fi
-    if [ "`use qt`" ]
-    then
-      myconf="$myconf --enable-qt"
-    fi
-    #if [ "`use kde`" ]
-    #then
-    #  myconf="$myconf --enable-kde"
-    #fi
-    if [ "`use gnome`" ]
-    then
-      myconf="$myconf --enable-gnome"
-    fi
-    if [ -z "`use gtk`" ]
-    then
-      myconf="$myconf --disable-gtk"
-    fi
-    if [ "`use X`" ]
-    then
-      myconf="$myconf --enable-xvideo"
-    else
-      myconf="$myconf --disable-x11"
-    fi
-
-#    Currently alsa support in vlc requires Alsa 0.90 (which is unstable).
-#    Until some release of alsa is released which works with vlc don't use it.
-#    if [ "`use alsa`" ]
-#    then
-#      myconf="$myconf --enable-alsa"
-#    fi
-    try ./configure --prefix=/usr $myconf --with-sdl --disable-alsa
-	try make
-	}
-src_install(){
-
-    dodir /usr/{bin,lib}
-	try make DESTDIR=${D} install
-
-	}
-
diff --git a/media-video/vlc/vlc-0.2.80.ebuild b/media-video/vlc/vlc-0.2.80.ebuild
deleted file mode 100644
index 714157e97df3..000000000000
--- a/media-video/vlc/vlc-0.2.80.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Nathaniel Hirsch <nh2@njit.edu> Achim Gottinge <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.2.80.ebuild,v 1.2 2001/09/30 11:54:16 hallski Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="DVD / video player"
-SRC_URI="http://www.videolan.org/pub/videolan/vlc/${PV}/${P}.tar.gz"
-HOMEPAGE="http://www.videolan.org"
-
-DEPEND=">=media-libs/libsdl-1.1.8-r1
-	gnome? ( >=gnome-base/gnome-libs-1.2.12 )
-    esd? ( >=media-sound/esound-0.2.22 )
-    ggi? ( >=media-libs/libggi-2.0_beta3 )
-    qt? ( >=x11-libs/qt-x11-2.3.0 )
-    gtk? ( >=x11-libs/gtk+-1.2.9 )
-    #alsa? ( >=media-libs/alsa-lib-0.5.10 )
-    X? ( virtual/x11 )"
-    #kde? ( >=kde-base/kdelibs-2.1.1 )
-
-src_compile(){
-    local myconf
-	if [ "`use fbdev`" ]
-    then
-      myconf="--enable-fb"
-    fi
-    if [ -z "`use mmx`" ]
-    then
-      myconf="$myconf --disable-mmx"
-    fi
-    if [ "`use esd`" ]
-    then
-      myconf="$myconf --enable-esd"
-    fi
-    if [ "`use ggi`" ]
-    then
-      myconf="$myconf --with-ggi"
-    fi
-    if [ "`use qt`" ]
-    then
-      myconf="$myconf --enable-qt"
-    fi
-    #if [ "`use kde`" ]
-    #then
-    #  myconf="$myconf --enable-kde"
-    #fi
-    if [ "`use gnome`" ]
-    then
-      myconf="$myconf --enable-gnome"
-    fi
-    if [ -z "`use gtk`" ]
-    then
-      myconf="$myconf --disable-gtk"
-    fi
-    if [ "`use X`" ]
-    then
-      myconf="$myconf --enable-xvideo"
-    else
-      myconf="$myconf --disable-x11"
-    fi
-#    Currently alsa support in vlc requires Alsa 0.90 (which is unstable).
-#    Until some release of alsa is released which works with vlc don't use it.
-#    if [ "`use alsa`" ]
-#    then
-#      myconf="$myconf --enable-alsa"
-#    fi
-    try ./configure --prefix=/usr $myconf --with-sdl --disable-alsa
-	try make
-	}
-src_install(){
-
-    dodir /usr/{bin,lib}
-	try make DESTDIR=${D} install
-
-	}
-
diff --git a/media-video/vlc/vlc-0.2.83.ebuild b/media-video/vlc/vlc-0.2.83-r1.ebuild
index 7a53d3ca3668..298d01624c0d 100644
--- a/media-video/vlc/vlc-0.2.83.ebuild
+++ b/media-video/vlc/vlc-0.2.83-r1.ebuild
@@ -1,6 +1,6 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Nathaniel Hirsch <nh2@njit.edu> Achim Gottinge <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.2.83.ebuild,v 1.2 2001/09/30 11:54:16 hallski Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.2.83-r1.ebuild,v 1.1 2001/10/06 10:08:19 azarah Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="DVD / video player"
@@ -8,11 +8,11 @@ SRC_URI="http://www.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.gz"
 HOMEPAGE="http://www.videolan.org"
 
 DEPEND=">=media-libs/libsdl-1.1.8-r1
-	gnome? ( >=gnome-base/gnome-libs-1.2.12 )
+	gnome? ( >=gnome-base/gnome-libs-1.4.0.4-r1 )
     esd? ( >=media-sound/esound-0.2.22 )
     ggi? ( >=media-libs/libggi-2.0_beta3 )
     qt? ( >=x11-libs/qt-x11-2.3.0 )
-    gtk? ( >=x11-libs/gtk+-1.2.9 )
+    gtk? ( >=x11-libs/gtk+-1.2.10-r4 )
     #alsa? ( >=media-libs/alsa-lib-0.5.10 )
     X? ( virtual/x11 )"
     #kde? ( >=kde-base/kdelibs-2.1.1 )
diff --git a/media-video/xmps/files/digest-xmps-0.2.0 b/media-video/xmps/files/digest-xmps-0.2.0-r1
index d82edf0616c6..d82edf0616c6 100644
--- a/media-video/xmps/files/digest-xmps-0.2.0
+++ b/media-video/xmps/files/digest-xmps-0.2.0-r1
diff --git a/media-video/xmps/xmps-0.2.0.ebuild b/media-video/xmps/xmps-0.2.0-r1.ebuild
index ecf8bd2b8bb4..4f2e1f77ccb7 100644
--- a/media-video/xmps/xmps-0.2.0.ebuild
+++ b/media-video/xmps/xmps-0.2.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/media-video/xmps/xmps-0.2.0.ebuild,v 1.3 2001/06/21 20:15:00 lamer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xmps/xmps-0.2.0-r1.ebuild,v 1.1 2001/10/06 10:08:19 azarah Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -12,27 +12,24 @@ HOMEPAGE="http://xmps.sourceforge.net"
 DEPEND=">=media-libs/smpeg-0.4.1 nls? ( sys-devel/gettext )
 	>=dev-lang/nasm-0.98
         >=dev-libs/popt-1.5
-        >=x11-libs/gtk+-1.2.10
-	gnome? ( >=gnome-base/gnome-libs-1.2.4 )"
+        >=x11-libs/gtk+-1.2.10-r4
+	gnome? ( >=gnome-base/gnome-libs-1.4.0.4-r1 )"
 
 RDEPEND=">=media-libs/smpeg-0.4.1
-        >=x11-libs/gtk+-1.2.10
+        >=x11-libs/gtk+-1.2.10-r4
         >=dev-libs/popt-1.5
-	gnome? ( >=gnome-base/gnome-libs-1.2.4 )"
+	gnome? ( >=gnome-base/gnome-libs-1.4.0.4-r1 )"
 
 src_compile() {
 
     local myopts
-    if [ -n "`use gnome`" ]
-    then
-	myopts="--enable-gnome --prefix=/opt/gnome"
-    else
-	myopts="--disable-gnome --prefix=/usr/X11R6"
+    if [ -n "`use gnome`" ] ; then
+	myopts="--enable-gnome"
     fi
     if [ -z "`use nls`" ] ; then
         myopts="$myopts --disable-nls"
     fi
-    try ./configure ${myopts} --host=${CHOST}
+    try ./configure ${myopts} --host=${CHOST} --prefix=/usr
     cp Makefile Makefile.orig
     sed -e "s:\$(bindir)/xmps-config:\$(DESTDIR)\$(bindir)/xmps-config:" \
 	Makefile.orig > Makefile
@@ -42,12 +39,8 @@ src_compile() {
 
 src_install () {
 
-    if [ -n "`use gnome`" ]
-    then
-      try make prefix=${D}/opt/gnome install
-    else
-      try make prefix=${D}/usr/X11R6 install
-    fi
+    try make prefix=${D}/usr install
+
     dodoc AUTHORS ChangeLog COPYING NEWS README TODO
 
 }
diff --git a/net-analyzer/nessus/files/digest-nessus-1.0.7a b/net-analyzer/nessus/files/digest-nessus-1.0.7a-r1
index bcf5d360c85a..bcf5d360c85a 100644
--- a/net-analyzer/nessus/files/digest-nessus-1.0.7a
+++ b/net-analyzer/nessus/files/digest-nessus-1.0.7a-r1
diff --git a/net-analyzer/nessus/nessus-1.0.7a.ebuild b/net-analyzer/nessus/nessus-1.0.7a-r1.ebuild
index 46eae1d92c1b..3bb75f85af80 100644
--- a/net-analyzer/nessus/nessus-1.0.7a.ebuild
+++ b/net-analyzer/nessus/nessus-1.0.7a-r1.ebuild
@@ -1,6 +1,6 @@
 #Copyright 2000 Achim Gottinger
 #Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus/nessus-1.0.7a.ebuild,v 1.3 2001/08/31 03:23:39 pm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus/nessus-1.0.7a-r1.ebuild,v 1.1 2001/10/06 10:08:19 azarah Exp $
 
 
 # It's better to split it in four different packages
@@ -19,11 +19,11 @@ HOMEPAGE="http://www.nessus.org/"
 DEPEND="virtual/glibc virtual/x11 sys-devel/m4
         >=dev-libs/gmp-3.1.1
         >=sys-libs/zlib-1.1.3
-	>=x11-libs/gtk+-1.2.8"
+	>=x11-libs/gtk+-1.2.10-r4"
 RDEPEND="virtual/glibc virtual/x11
         >=dev-libs/gmp-3.1.1
         >=sys-libs/zlib-1.1.3
-	>=x11-libs/gtk+-1.2.8"
+	>=x11-libs/gtk+-1.2.10-r4"
 
 src_compile() {
 
diff --git a/net-analyzer/nmap/files/digest-nmap-2.54_beta24 b/net-analyzer/nmap/files/digest-nmap-2.54_beta24-r1
index b7c5adc4f8b8..b7c5adc4f8b8 100644
--- a/net-analyzer/nmap/files/digest-nmap-2.54_beta24
+++ b/net-analyzer/nmap/files/digest-nmap-2.54_beta24-r1
diff --git a/net-analyzer/nmap/nmap-2.54_beta24.ebuild b/net-analyzer/nmap/nmap-2.54_beta24-r1.ebuild
index 13f74b655f7e..920a6cc514c7 100644
--- a/net-analyzer/nmap/nmap-2.54_beta24.ebuild
+++ b/net-analyzer/nmap/nmap-2.54_beta24-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/net-analyzer/nmap/nmap-2.54_beta24.ebuild,v 1.3 2001/08/31 03:23:39 pm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-2.54_beta24-r1.ebuild,v 1.1 2001/10/06 10:08:19 azarah Exp $
 
 
 P=nmap-2.54BETA24
@@ -12,7 +12,7 @@ SRC_URI="http://www.insecure.org/nmap/dist/"${A}
 HOMEPAGE="http://www.insecure.org/nmap/"
 
 DEPEND="virtual/glibc
-	gtk? ( >=x11-libs/gtk+-1.2.8 )"
+	gtk? ( >=x11-libs/gtk+-1.2.10-r4 )"
 
 src_compile() {                           
   try ./configure --host=${CHOST} --prefix=/usr --mandir=/usr/share/man --enable-ipv6
diff --git a/net-im/everybuddy/everybuddy-0.2.1.ebuild b/net-im/everybuddy/everybuddy-0.2.1-r1.ebuild
index c8cd9cf86008..967e62f7f1bc 100644
--- a/net-im/everybuddy/everybuddy-0.2.1.ebuild
+++ b/net-im/everybuddy/everybuddy-0.2.1-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 Ben Lutgens  <blutgens@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-im/everybuddy/everybuddy-0.2.1.ebuild,v 1.3 2001/06/24 20:13:37 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/everybuddy/everybuddy-0.2.1-r1.ebuild,v 1.1 2001/10/06 10:08:19 azarah Exp $
 
 A=everybuddy-0.2.1beta3.tar.gz
 S=${WORKDIR}/everybuddy-0.2.1beta3
@@ -9,8 +9,7 @@ DESCRIPTION="Universal Instant Messaging Client"
 SRC_URI="http://www.everybuddy.com/files/${A}"
 HOMEPAGE="http://www.everybuddy.com/"
 
-DEPEND="virtual/glibc >=x11-libs/gtk+-1.2.10
-	"
+DEPEND="virtual/glibc >=x11-libs/gtk+-1.2.10-r4"
 
 
 src_compile() {
diff --git a/net-im/everybuddy/everybuddy-0.2.1_beta6.ebuild b/net-im/everybuddy/everybuddy-0.2.1_beta6.ebuild
deleted file mode 100644
index 77f67f72daa5..000000000000
--- a/net-im/everybuddy/everybuddy-0.2.1_beta6.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Ben Lutgens  <blutgens@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-im/everybuddy/everybuddy-0.2.1_beta6.ebuild,v 1.1 2001/08/30 03:37:56 pm Exp $
-
-A=everybuddy-0.2.1beta6.tar.gz
-S=${WORKDIR}/everybuddy-0.2.1beta6
-DESCRIPTION="Universal Instant Messaging Client"
-SRC_URI="http://www.everybuddy.com/files/${A}"
-HOMEPAGE="http://www.everybuddy.com/"
-
-DEPEND="virtual/glibc >=x11-libs/gtk+-1.2.10
-	"
-
-
-src_compile() {
-   local myconf
-   if [ -z "`use arts`" ]; then
-        myconf="--disable-arts"
-    fi
-
-    try ./configure --prefix=/usr --mandir=/usr/share/man --host=${CHOST} \
-	${myconf} --infodir=/usr/share/info
-    try make
-
-}
-
-src_install () {
-
-    try make DESTDIR=${D} install
-    dodoc AUTHORS NEWS README TODO COPYING ChangeLog Everybuddy.desktop
- 
-}
diff --git a/net-im/everybuddy/files/digest-everybuddy-0.2.1 b/net-im/everybuddy/files/digest-everybuddy-0.2.1-r1
index 16729777dac8..16729777dac8 100644
--- a/net-im/everybuddy/files/digest-everybuddy-0.2.1
+++ b/net-im/everybuddy/files/digest-everybuddy-0.2.1-r1
diff --git a/net-im/everybuddy/files/digest-everybuddy-0.2.1_beta6 b/net-im/everybuddy/files/digest-everybuddy-0.2.1_beta6
deleted file mode 100644
index ceb80178376c..000000000000
--- a/net-im/everybuddy/files/digest-everybuddy-0.2.1_beta6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f9f020a184459a9289fbdd9b62cf0bfb everybuddy-0.2.1beta6.tar.gz
diff --git a/net-im/gaim/files/digest-gaim-0.43 b/net-im/gaim/files/digest-gaim-0.43
deleted file mode 100644
index b057c4a6135c..000000000000
--- a/net-im/gaim/files/digest-gaim-0.43
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f130f7afc6ce72da9006fadeedf16fd0 gaim-0.43.tar.bz2
diff --git a/net-im/gaim/files/digest-gaim-0.44 b/net-im/gaim/files/digest-gaim-0.44-r1
index 04d23793aeb3..04d23793aeb3 100644
--- a/net-im/gaim/files/digest-gaim-0.44
+++ b/net-im/gaim/files/digest-gaim-0.44-r1
diff --git a/net-im/gaim/gaim-0.43.ebuild b/net-im/gaim/gaim-0.43.ebuild
deleted file mode 100644
index 02fdffc80d34..000000000000
--- a/net-im/gaim/gaim-0.43.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Joe Bormolini <lordjoe@bigfoot.com>
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.43.ebuild,v 1.2 2001/09/07 00:17:04 lordjoe Exp $
-
-A=${P}.tar.bz2
-S=${WORKDIR}/${P}
-DESCRIPTION="Gtk AOL Instant Messenger client"
-SRC_URI="http://prdownloads.sourceforge.net/gaim/${A}"
-HOMEPAGE="http://gaim.sourceforge.net"
-
-DEPEND=">=x11-libs/gtk+-1.2.3
-	nls? ( sys-devel/gettext )
-	gnome? ( >=gnome-base/gnome-libs-1.2.13 )
-	perl? ( >=sys-devel/perl-5.6.1 )
-	nas? ( >=media-sound/nas-1.4.1-r1 )
-	esd? ( >=media-sound/esound-0.2.22-r2 )
-	arts? ( >=kde-base/kdelibs-2.1.1 )"
-	
-src_compile() {
-    
-    local myopts
-    if [ "`use gnome`" ]
-    then
-    	myopts="--with-gnome=${GNOME_PATH} --enable-panel --prefix=/opt/gnome"
-    else
-    	myopts="--disable-gnome --disable-pixbuf --prefix=/usr/X11R6"
-    fi
-    if [ -z "`use esd`" ] ; then
-    	myopts="$myopts --disable-esd"
-    fi
-    if [ -z "`use nas`" ] ; then
-    	myopts="$myopts --disable-nas"
-    fi
-    if [ -z "`use perl`" ] ; then
-    	myopts="$myopts --disable-perl"
-    fi
-    if [ -z "`use arts`" ] ; then
-        myopts="$myopts --disable-arts"
-    fi
-    if [ -z "`use nls`" ] ; then
-        myopts="$myopts --disable-nls"
-    fi
-    try ./configure --host=${CHOST} ${myopts}
-    try emake
-
-}
-
-src_install () {
-
-    try make DESTDIR=${D} install
-    dodoc ChangeLog README README.plugins
-}
-
diff --git a/net-im/gaim/gaim-0.44.ebuild b/net-im/gaim/gaim-0.44-r1.ebuild
index 601b2f763a83..7253af9e0858 100644
--- a/net-im/gaim/gaim-0.44.ebuild
+++ b/net-im/gaim/gaim-0.44-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 Joe Bormolini <lordjoe@bigfoot.com>
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.44.ebuild,v 1.1 2001/09/21 00:00:49 lordjoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.44-r1.ebuild,v 1.1 2001/10/06 10:08:19 azarah Exp $
 
 A=${P}.tar.bz2
 S=${WORKDIR}/${P}
@@ -9,9 +9,9 @@ DESCRIPTION="Gtk AOL Instant Messenger client"
 SRC_URI="http://prdownloads.sourceforge.net/gaim/${A}"
 HOMEPAGE="http://gaim.sourceforge.net"
 
-DEPEND=">=x11-libs/gtk+-1.2.3
+DEPEND=">=x11-libs/gtk+-1.2.10-r4
 	nls? ( sys-devel/gettext )
-	gnome? ( >=gnome-base/gnome-libs-1.2.13 )
+	gnome? ( >=gnome-base/gnome-libs-1.4.0.4-r1 )
 	perl? ( >=sys-devel/perl-5.6.1 )
 	nas? ( >=media-sound/nas-1.4.1-r1 )
 	esd? ( >=media-sound/esound-0.2.22-r2 )
@@ -22,9 +22,9 @@ src_compile() {
     local myopts
     if [ "`use gnome`" ]
     then
-    	myopts="--with-gnome=${GNOME_PATH} --enable-panel --prefix=/opt/gnome"
+    	myopts="--with-gnome=${GNOME_PATH} --enable-panel --prefix=/usr"
     else
-    	myopts="--disable-gnome --disable-pixbuf --prefix=/usr/X11R6"
+    	myopts="--disable-gnome --disable-pixbuf --prefix=/usr"
     fi
     if [ -z "`use esd`" ] ; then
     	myopts="$myopts --disable-esd"
diff --git a/net-im/gtk+licq/files/digest-gtk+licq-0.50.1 b/net-im/gtk+licq/files/digest-gtk+licq-0.50.1
deleted file mode 100644
index 6bacfff78443..000000000000
--- a/net-im/gtk+licq/files/digest-gtk+licq-0.50.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c415a3468c0224fdde8bf43bc0a4fa99 gtk+licq-0.50.1.tar.gz
diff --git a/net-im/gtk+licq/files/digest-gtk+licq-0.51 b/net-im/gtk+licq/files/digest-gtk+licq-0.51-r1
index 5717b8d7bc99..5717b8d7bc99 100644
--- a/net-im/gtk+licq/files/digest-gtk+licq-0.51
+++ b/net-im/gtk+licq/files/digest-gtk+licq-0.51-r1
diff --git a/net-im/gtk+licq/gtk+licq-0.50.1.ebuild b/net-im/gtk+licq/gtk+licq-0.50.1.ebuild
deleted file mode 100644
index 84753f56bb88..000000000000
--- a/net-im/gtk+licq/gtk+licq-0.50.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Jules Gagnon <eonwe@users.sourceforge.net>
-# $Header: /var/cvsroot/gentoo-x86/net-im/gtk+licq/gtk+licq-0.50.1.ebuild,v 1.5 2001/08/31 03:23:39 pm Exp $
-
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="gtk+licq"
-SRC_URI="http://gtk.licq.org/download/${A}"
-HOMEPAGE="http://gtk.licq.org"
-
-DEPEND="virtual/glibc sys-devel/perl nls? ( sys-devel/gettext )
-        >=net-im/licq-1.0.2 gnome? ( >=gnome-base/gnome-core-1.4.0.4 )
-	>=x11-libs/gtk+-1.2.0
-        spell? ( >=app-text/pspell-0.11.2 )"
-
-RDEPEND="virtual/glibc >=net-im/licq-1.0.2
-	>=x11-libs/gtk+-1.2.0 gnome? ( >=gnome-base/gnome-core-1.4.0.4 )
-        spell? ( >=app-text/pspell-0.11.2 )"
-
-
-src_compile() {
-  local myconf
-  local myprefix
-  myprefix="/opt/gnome"
-  if [ -z "`use gnome`" ]
-  then
-    myconf="--disable-gnome"
-    myprefix="/usr/X11R6"
-  fi
-  if [ -z "`use spell`" ] ; then
-    myconf="$myconf --disable-pspell"
-  fi
-  if [ -z "`use nls`" ]
-  then
-    myconf="${myconf} --disable-nls"
-  fi
-  try ./configure --host=${CHOST} --prefix=${myprefix} \
-       --with-licq-includes=/usr/include/licq ${myconf}
-  try make
-}
-
-src_install() {
-  local myprefix
-  myprefix="opt/gnome"
-  if [ -z "`use gnome`" ]
-  then
-    myprefix="usr/X11R6"
-  fi
-  try make prefix=${D}/${myprefix} install
-  dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README
-  mkdir -p ${D}/usr/lib/licq
-  cd ${D}/usr/lib/licq
-  ls  ../../../${myprefix}/lib/licq
-  ln -s ../../../${myprefix}/lib/licq/* .
-}
diff --git a/net-im/gtk+licq/gtk+licq-0.51.ebuild b/net-im/gtk+licq/gtk+licq-0.51-r1.ebuild
index 6c6ba99a4789..f6cc0e2a01dd 100644
--- a/net-im/gtk+licq/gtk+licq-0.51.ebuild
+++ b/net-im/gtk+licq/gtk+licq-0.51-r1.ebuild
@@ -1,6 +1,6 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Jules Gagnon <eonwe@users.sourceforge.net>
-# $Header: /var/cvsroot/gentoo-x86/net-im/gtk+licq/gtk+licq-0.51.ebuild,v 1.1 2001/09/25 03:29:45 hallski Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gtk+licq/gtk+licq-0.51-r1.ebuild,v 1.1 2001/10/06 10:08:19 azarah Exp $
 
 
 A=${P}.tar.gz
@@ -10,23 +10,21 @@ SRC_URI="http://gtk.licq.org/download/${A}"
 HOMEPAGE="http://gtk.licq.org"
 
 DEPEND="virtual/glibc sys-devel/perl nls? ( sys-devel/gettext )
-        >=net-im/licq-1.0.2 gnome? ( >=gnome-base/gnome-core-1.4.0.4 )
-	>=x11-libs/gtk+-1.2.0
+        >=net-im/licq-1.0.2 gnome? ( >=gnome-base/gnome-core-1.4.0.4-r1 )
+	>=x11-libs/gtk+-1.2.10-r4
         spell? ( >=app-text/pspell-0.11.2 )"
 
 RDEPEND="virtual/glibc >=net-im/licq-1.0.2
-	>=x11-libs/gtk+-1.2.0 gnome? ( >=gnome-base/gnome-core-1.4.0.4 )
+	>=x11-libs/gtk+-1.2.10-r4 gnome? ( >=gnome-base/gnome-core-1.4.0.4-r1 )
         spell? ( >=app-text/pspell-0.11.2 )"
 
 
 src_compile() {
   local myconf
   local myprefix
-  myprefix="/opt/gnome"
-  if [ -z "`use gnome`" ]
-  then
+  myprefix="/usr"
+  if [ -z "`use gnome`" ] ; then
     myconf="--disable-gnome"
-    myprefix="/usr/X11R6"
   fi
   if [ -z "`use spell`" ] ; then
     myconf="$myconf --disable-pspell"
@@ -42,11 +40,7 @@ src_compile() {
 
 src_install() {
   local myprefix
-  myprefix="opt/gnome"
-  if [ -z "`use gnome`" ]
-  then
-    myprefix="usr/X11R6"
-  fi
+  myprefix="usr"
   try make prefix=${D}/${myprefix} install
   dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README
   mkdir -p ${D}/usr/lib/licq
diff --git a/net-irc/bitchx/bitchx-1.0.18-r2.ebuild b/net-irc/bitchx/bitchx-1.0.18-r2.ebuild
deleted file mode 100644
index 93fee8487f44..000000000000
--- a/net-irc/bitchx/bitchx-1.0.18-r2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2001 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/net-irc/bitchx/bitchx-1.0.18-r2.ebuild,v 1.5 2001/08/08 03:48:34 chadh Exp $
-
-A=ircii-pana-1.0c18.tar.gz
-S=${WORKDIR}/BitchX
-DESCRIPTION="An IRC Client"
-SRC_URI="ftp://ftp.bitchx.com/pub/BitchX/source/${A}"
-HOMEPAGE="http://www.bitchx.com/"
-
-DEPEND="virtual/glibc >=sys-libs/ncurses-5.1 ssl? ( >=dev-libs/openssl-0.9.6 )"
-
-src_unpack() {
-  unpack ${A}
-  cd ${S}
-  patch -p1 < ${FILESDIR}/${PF}-gentoo.diff
-}
-
-src_compile() {
-    local myopts
-    if [ -n "`use ssl`" ]
-    then
-	myopts="$myopts --with-ssl"
-    fi
-    try ./configure --prefix=/usr --without-gtk --without-esd ${myopts} --host=${CHOST} --build=${CHOST}\
-	--enable-cdrom --enable-ipv6 --with-plugins --disable-sound 
-    try make
-}
-
-src_install () {
-
-	try make prefix=${D}/usr install
-	cd ${D}/usr/bin
-	rm -f gtkBitchX
-	rm -f BitchX
-	dosym /usr/bin/BitchX-1.0c18 /usr/bin/BitchX
-	chmod -x ${D}/usr/lib/bx/plugins/BitchX.hints
-
-    cd ${S}
-    dodoc Changelog README* IPv6-support
-    cd doc
-    insinto /usr/X11R6/include/bitmaps
-    doins BitchX.xpm
-
-    dodoc BitchX-* BitchX.bot *.doc BitchX.faq README.hooks 
-    dodoc bugs *.txt functions ideas mode tcl-ideas watch
-    dodoc *.tcl
-    docinto html
-    dodoc *.html
-
-    docinto plugins
-    dodoc plugins
-    cd ../dll
-    insinto /usr/lib/bx/wav
-    doins wavplay/*.wav
-    cp acro/README acro/README.acro
-    dodoc acro/README.acro
-    cp arcfour/README arcfour/README.arcfour
-    dodoc arcfour/README.arcfour
-    cp blowfish/README blowfish/README.blowfish
-    dodoc blowfish/README.blowfish
-    dodoc nap/README.nap
-    cp qbx/README qbx/README.qbx
-    dodoc qbx/README.qbx
-}
diff --git a/net-irc/bitchx/bitchx-1.0.18-r3.ebuild b/net-irc/bitchx/bitchx-1.0.18-r4.ebuild
index b0d167f62ad8..3d913c98ed31 100644
--- a/net-irc/bitchx/bitchx-1.0.18-r3.ebuild
+++ b/net-irc/bitchx/bitchx-1.0.18-r4.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 Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-irc/bitchx/bitchx-1.0.18-r3.ebuild,v 1.4 2001/09/23 22:39:26 blocke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/bitchx/bitchx-1.0.18-r4.ebuild,v 1.1 2001/10/06 10:08:19 azarah Exp $
 
 A=ircii-pana-1.0c18.tar.gz
 S=${WORKDIR}/BitchX
@@ -12,9 +12,9 @@ HOMEPAGE="http://www.bitchx.com/"
 DEPEND="virtual/glibc
         >=sys-libs/ncurses-5.1 
         ssl? ( >=dev-libs/openssl-0.9.6 )
-	gnome? ( >=x11-libs/gtk+-1.2.0
-	         >=media-libs/imlib-1.9.4
- 	         >=gnome-base/gnome-libs-1.2 )
+	gnome? ( >=x11-libs/gtk+-1.2.10-r4
+	         >=media-libs/imlib-1.9.10-r1
+ 	         >=gnome-base/gnome-libs-1.4.0.4-r1 )
 	esd? ( >=media-sound/esound-0.2.5
 	       >=media-libs/audiofile-0.1.5 )"
 
diff --git a/net-irc/bitchx/files/digest-bitchx-1.0.18-r3 b/net-irc/bitchx/files/digest-bitchx-1.0.18-r3
deleted file mode 100644
index 3fc29729f1f9..000000000000
--- a/net-irc/bitchx/files/digest-bitchx-1.0.18-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 737276281ae911c5e1e17b028ebee045 ircii-pana-1.0c18.tar.gz
diff --git a/net-irc/bitchx/files/digest-bitchx-1.0.18-r2 b/net-irc/bitchx/files/digest-bitchx-1.0.18-r4
index 3fc29729f1f9..3fc29729f1f9 100644
--- a/net-irc/bitchx/files/digest-bitchx-1.0.18-r2
+++ b/net-irc/bitchx/files/digest-bitchx-1.0.18-r4
diff --git a/net-irc/xchat/files/digest-xchat-1.6.4-r1 b/net-irc/xchat/files/digest-xchat-1.6.4-r1
deleted file mode 100644
index 6d1083a57ca1..000000000000
--- a/net-irc/xchat/files/digest-xchat-1.6.4-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 995c02b43454ba76bb641792503c669a xchat-1.6.4.tar.bz2
diff --git a/net-irc/xchat/files/digest-xchat-1.7.7-r1 b/net-irc/xchat/files/digest-xchat-1.7.7-r1
deleted file mode 100644
index af4337b0e3d1..000000000000
--- a/net-irc/xchat/files/digest-xchat-1.7.7-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e2c9a83176361130036c42ea0f161708 xchat-1.7.7.tar.bz2
diff --git a/net-irc/xchat/files/digest-xchat-1.8.2-r1 b/net-irc/xchat/files/digest-xchat-1.8.2-r1
deleted file mode 100644
index 89fb2e1d1d53..000000000000
--- a/net-irc/xchat/files/digest-xchat-1.8.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 51987e6e79d0e902e1928918fdd7b353 xchat-1.8.2.tar.bz2
diff --git a/net-irc/xchat/files/digest-xchat-1.8.2 b/net-irc/xchat/files/digest-xchat-1.8.2-r2
index 89fb2e1d1d53..89fb2e1d1d53 100644
--- a/net-irc/xchat/files/digest-xchat-1.8.2
+++ b/net-irc/xchat/files/digest-xchat-1.8.2-r2
diff --git a/net-irc/xchat/xchat-1.6.4-r1.ebuild b/net-irc/xchat/xchat-1.6.4-r1.ebuild
deleted file mode 100644
index 7501c3b469ed..000000000000
--- a/net-irc/xchat/xchat-1.6.4-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyrigth 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/net-irc/xchat/xchat-1.6.4-r1.ebuild,v 1.2 2001/07/29 10:53:03 hallski Exp $
-
-A=${P}.tar.bz2
-S=${WORKDIR}/${P}
-DESCRIPTION="xchat"
-SRC_URI="http://www.xchat.org/files/source/1.6/"${A}
-HOMEPAGE="http://www.xchat.org/"
-
-DEPEND=">=media-libs/gdk-pixbuf-0.11.0 
-        perl? ( sys-devel/perl )
-	python? ( dev-lang/python )
-	nls? ( >=sys-devel/gettext-0.10.38 )
-	gnome? ( >=gnome-base/gnome-core-1.2.2.1 )
-        ssl? ( >=dev-libs/openssl-0.9.6a )"
-
-RDEPEND=">=media-libs/gdk-pixbuf-0.11.0
-	gnome? ( >=gnome-base/gnome-core-1.2.2.1 ) 
-        ssl? ( >=dev-libs/openssl-0.9.6a )"
-
-src_unpack() {
-  unpack ${A}
-  cd ${S}/po
-  cp zh_TW.Big5.po zh_TW.Big5.po.orig
-  sed -e 's:\\\\:\\:' zh_TW.Big5.po.orig > zh_TW.Big5.po
-}
-
-src_compile() {
-
-  local myopts
-  local myflags
-
-  if [ "`use gnome`" ]
-  then
-	myopts="--enable-gnome --enable-panel --prefix=/opt/gnome"
-  else
-	myopts="--enable-gtkfe --disable-gnome --prefix=/usr/X11R6"
-  fi
-  if [ "`use ssl`" ] ; then
-        myopts="$myopts --enable-openssl"
-  fi 
-  if [ -z "`use perl`" ] ; then
-        myopts="$myopts --disable-perl"
-  fi
-  if [ "`use python`" ] ; then
-    myflags="-lz"
-    if [ "`use berkdb`" ] ; then
-	myflags="$myflags -ldb-3.2 -lndbm"
-    fi
-    if [ "`use readline`" ] ; then
-	myflags="$myflags -lreadline -lncurses -lcrypt"
-    fi
-  else
-	myopts="$myopts --disable-python"
-  fi 
-  if [ -z "`use nls`" ] ; then
-        myopts="$myopts --disable-nls"
-  fi
-  try ./configure --host=${CHOST} ${myopts}
-  if [ "$myflags" ] ; then
-    for i in src/fe-gtk src/fe-text
-    do
-      if [ -e $i/Makefile ] ; then
-        cp  $i/Makefile $i/Makefile.orig
-        sed -e "s:-lpython2.0:-lpython2.0 $myflags:" \
-	  $i/Makefile.orig > $i/Makefile
-      fi
-    done
-  fi
-  try pmake
-}
-
-src_install() {
-  cd ${S}
-  if [ -n "`use gnome`" ]
-  then
-  	try make prefix=${D}/opt/gnome install
-  else
-  	try make prefix=${D}/usr/X11R6 install
-  fi
-  dodoc AUTHORS COPYING ChangeLog README
-}
-
-
-
-
-
-
diff --git a/net-irc/xchat/xchat-1.7.7-r1.ebuild b/net-irc/xchat/xchat-1.7.7-r1.ebuild
deleted file mode 100644
index 5a67069444bc..000000000000
--- a/net-irc/xchat/xchat-1.7.7-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyrigth 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/net-irc/xchat/xchat-1.7.7-r1.ebuild,v 1.2 2001/07/29 10:53:03 hallski Exp $
-
-A=${P}.tar.bz2
-S=${WORKDIR}/${P}
-DESCRIPTION="xchat"
-SRC_URI="http://www.xchat.org/files/source/1.7/"${A}
-HOMEPAGE="http://www.xchat.org/"
-
-DEPEND=">=media-libs/gdk-pixbuf-0.11.0 
-        perl? ( sys-devel/perl )
-	python? ( dev-lang/python )
-	nls? ( >=sys-devel/gettext-0.10.38 )
-	gnome? ( >=gnome-base/gnome-core-1.2.2.1 )
-        ssl? ( >=dev-libs/openssl-0.9.6a )"
-
-RDEPEND=">=media-libs/gdk-pixbuf-0.11.0
-	gnome? ( >=gnome-base/gnome-core-1.2.2.1 ) 
-        ssl? ( >=dev-libs/openssl-0.9.6a )"
-
-src_compile() {
-
-  local myopts
-  local myflags
-
-  if [ "`use gnome`" ]
-  then
-	myopts="--enable-gnome --enable-panel --prefix=/opt/gnome"
-  else
-	myopts="--enable-gtkfe --disable-gnome --prefix=/usr/X11R6"
-  fi
-  if [ "`use ssl`" ] ; then
-        myopts="$myopts --enable-openssl"
-  fi 
-  if [ -z "`use perl`" ] ; then
-        myopts="$myopts --disable-perl"
-  fi
-  if [ "`use python`" ] ; then
-    myflags="-lz"
-    if [ "`use berkdb`" ] ; then
-	myflags="$myflags -ldb-3.2 -lndbm"
-    fi
-    if [ "`use readline`" ] ; then
-	myflags="$myflags -lreadline -lncurses -lcrypt"
-    fi
-  else
-	myopts="$myopts --disable-python"
-  fi 
-  if [ -z "`use nls`" ] ; then
-        myopts="$myopts --disable-nls"
-  fi
-  try ./configure --host=${CHOST} ${myopts}
-  if [ "$myflags" ] ; then
-    for i in src/fe-gtk src/fe-text
-    do
-      if [ -e $i/Makefile ] ; then
-        cp  $i/Makefile $i/Makefile.orig
-        sed -e "s:-lpython2.0:-lpython2.0 $myflags:" \
-	  $i/Makefile.orig > $i/Makefile
-      fi
-    done
-  fi
-  try pmake
-}
-
-src_install() {
-  cd ${S}
-  if [ -n "`use gnome`" ]
-  then
-  	try make prefix=${D}/opt/gnome install
-  else
-  	try make prefix=${D}/usr/X11R6 install
-  fi
-  dodoc AUTHORS COPYING ChangeLog README
-}
-
-
-
-
-
-
diff --git a/net-irc/xchat/xchat-1.8.2-r1.ebuild b/net-irc/xchat/xchat-1.8.2-r2.ebuild
index 19bba27ffa4a..32da90700dfb 100644
--- a/net-irc/xchat/xchat-1.8.2-r1.ebuild
+++ b/net-irc/xchat/xchat-1.8.2-r2.ebuild
@@ -1,22 +1,22 @@
 # Copyrigth 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>, Donny Davies <woodchip@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-1.8.2-r1.ebuild,v 1.1 2001/09/24 22:41:01 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-1.8.2-r2.ebuild,v 1.1 2001/10/06 10:08:19 azarah Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="xchat irc client"
 SRC_URI="http://www.xchat.org/files/source/1.8/${P}.tar.bz2"
 HOMEPAGE="http://www.xchat.org/"
 
-DEPEND=">=x11-libs/gtk+-1.2.8
+DEPEND=">=x11-libs/gtk+-1.2.10-r4
         perl? ( sys-devel/perl )
         python? ( >=dev-lang/python-2.0-r4 )
         nls? ( >=sys-devel/gettext-0.10.38 )
-        gnome? ( >=gnome-base/gnome-core-1.2.2.1 >=media-libs/gdk-pixbuf-0.11 )
+        gnome? ( >=gnome-base/gnome-core-1.4.0.4-r1 >=media-libs/gdk-pixbuf-0.11.0-r1 )
         ssl? ( >=dev-libs/openssl-0.9.6a )"
 
 RDEPEND=">=x11-libs/gtk+-1.2.8
-         gnome? ( >=gnome-base/gnome-core-1.2.2.1 >=media-libs/gdk-pixbuf-0.11 )
+         gnome? ( >=gnome-base/gnome-core-1.4.0.4-r1 >=media-libs/gdk-pixbuf-0.11.0-r1 )
          ssl? ( >=dev-libs/openssl-0.9.6a )"
 
 src_compile() {
diff --git a/net-irc/xchat/xchat-1.8.2.ebuild b/net-irc/xchat/xchat-1.8.2.ebuild
deleted file mode 100644
index 7e0661b3d582..000000000000
--- a/net-irc/xchat/xchat-1.8.2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyrigth 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/net-irc/xchat/xchat-1.8.2.ebuild,v 1.1 2001/07/30 23:45:09 hallski Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="xchat"
-SRC_URI="http://www.xchat.org/files/source/1.8/${P}.tar.bz2"
-HOMEPAGE="http://www.xchat.org/"
-
-DEPEND=">=media-libs/gdk-pixbuf-0.11
-        perl? ( sys-devel/perl )
-        python? ( >=dev-lang/python-2.0-r4 )
-        nls? ( >=sys-devel/gettext-0.10.38 )
-        gnome? ( >=gnome-base/gnome-core-1.2.2.1 )
-        ssl? ( >=dev-libs/openssl-0.9.6a )"
-
-RDEPEND=">=media-libs/gdk-pixbuf-0.11
-         gnome? ( >=gnome-base/gnome-core-1.2.2.1 )
-         ssl? ( >=dev-libs/openssl-0.9.6a )"
-
-src_compile() {
-
-  local myopts
-  local myflags
-
-  if [ "`use gnome`" ]
-  then
-	myopts="--enable-gnome --enable-panel --prefix=/opt/gnome"
-  else
-	myopts="--enable-gtkfe --disable-gnome --prefix=/usr/X11R6 --disable-gdk-pixbuf --disable-zvt"
-  fi
-  if [ "`use ssl`" ] ; then
-        myopts="$myopts --enable-openssl"
-  fi 
-  if [ -z "`use perl`" ] ; then
-        myopts="$myopts --disable-perl"
-  fi
-  if [ "`use python`" ] ; then
-    myflags="`python-config --libs`"
-  else
-	myopts="$myopts --disable-python"
-  fi 
-  if [ -z "`use nls`" ] ; then
-        myopts="$myopts --disable-nls"
-  fi
-  try ./configure --host=${CHOST} ${myopts} --enable-ipv6
-  if [ "$myflags" ] ; then
-    for i in src/fe-gtk src/fe-text
-    do
-      if [ -e $i/Makefile ] ; then
-        cp  $i/Makefile $i/Makefile.orig
-        sed -e "s:-lpython2.0:$myflags:" \
-	  $i/Makefile.orig > $i/Makefile
-      fi
-    done
-  fi
-  try pmake
-}
-
-src_install() {
-  cd ${S}
-  if [ -n "`use gnome`" ]
-  then
-  	try make prefix=${D}/opt/gnome install
-  else
-  	try make prefix=${D}/usr/X11R6 install
-  fi
-  dodoc AUTHORS COPYING ChangeLog README
-}
-
-
-
-
-
-
diff --git a/net-mail/balsa/balsa-1.2.0.ebuild b/net-mail/balsa/balsa-1.2.0-r1.ebuild
index 7ee6da774fa2..03b4b7f64fe8 100644
--- a/net-mail/balsa/balsa-1.2.0.ebuild
+++ b/net-mail/balsa/balsa-1.2.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 Bruce A. Locke (blocke@shivan.org)
-# $Header: /var/cvsroot/gentoo-x86/net-mail/balsa/balsa-1.2.0.ebuild,v 1.1 2001/09/28 01:37:20 blocke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/balsa/balsa-1.2.0-r1.ebuild,v 1.1 2001/10/06 10:08:19 azarah Exp $
 
 A=${P}.tar.bz2
 S=${WORKDIR}/${P}
@@ -9,14 +9,14 @@ DESCRIPTION="Balsa: email client for GNOME"
 SRC_URI="http://www.theochem.kth.se/~pawsa/balsa/${A}"
 HOMEPAGE="http://www.balsa.net"
 
-DEPEND=">=dev-libs/glib-1.2.1
-	>=x11-libs/gtk+-1.2.1
-	>=media-libs/imlib-1.9.2
-	>=gnome-base/gnome-core-1.2.1
-	>=gnome-base/gnome-print-0.29
+DEPEND=">=dev-libs/glib-1.2.1-r1
+	>=x11-libs/gtk+-1.2.1-r4
+	>=media-libs/imlib-1.9.10-r1
+	>=gnome-base/gnome-core-1.4.0.4-r1
+	>=gnome-base/gnome-print-0.29-r1
 	>=app-text/pspell-0.11.2
 	>=net-libs/libesmtp-0.8.3
-	>=gnome-base/gtkhtml-0.13.0
+	>=gnome-base/gtkhtml-0.14.0-r1
 	>=dev-libs/libpcre-3.4
 	nls? ( sys-devel/gettext )
 	ssl? ( dev-libs/openssl )"
@@ -37,7 +37,7 @@ src_compile() {
      fi
 
     try libmutt/configure --prefix=/usr --host=${CHOST} --with-mailpath=/var/mail
-    try ./configure --prefix=/opt/gnome --host=${CHOST} --enable-threads --enable-gtkhtml --enable-pcre $myconf
+    try ./configure --prefix=/usr --host=${CHOST} --enable-threads --enable-gtkhtml --enable-pcre $myconf
     make || die
 }
 
diff --git a/net-mail/balsa/files/digest-balsa-1.2.0 b/net-mail/balsa/files/digest-balsa-1.2.0-r1
index 24e1f0cad03c..24e1f0cad03c 100644
--- a/net-mail/balsa/files/digest-balsa-1.2.0
+++ b/net-mail/balsa/files/digest-balsa-1.2.0-r1
diff --git a/net-mail/spruce/files/digest-spruce-0.7.6 b/net-mail/spruce/files/digest-spruce-0.7.6-r1
index 80e5815ea3f5..80e5815ea3f5 100644
--- a/net-mail/spruce/files/digest-spruce-0.7.6
+++ b/net-mail/spruce/files/digest-spruce-0.7.6-r1
diff --git a/net-mail/spruce/spruce-0.7.6.ebuild b/net-mail/spruce/spruce-0.7.6-r1.ebuild
index 34eed4e1f4d3..667b43c9c573 100644
--- a/net-mail/spruce/spruce-0.7.6.ebuild
+++ b/net-mail/spruce/spruce-0.7.6-r1.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Joe Bormolini <lordjoe@bigfoot.com>
-# $Header: /var/cvsroot/gentoo-x86/net-mail/spruce/spruce-0.7.6.ebuild,v 1.4 2001/08/15 19:26:49 lordjoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/spruce/spruce-0.7.6-r1.ebuild,v 1.1 2001/10/06 10:08:19 azarah Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Gtk email client"
 SRC_URI="ftp://spruce.sourceforge.net/pub/spruce/devel/${P}.tar.gz"
 HOMEPAGE="http://spruce.sourceforge.net/"
 
-RDEPEND=">=x11-libs/gtk+-1.2.6
+RDEPEND=">=x11-libs/gtk+-1.2.10-r4
         gnome-base/libglade
 	ssl? ( >=dev-libs/openssl-0.9.6 )
         gpg? ( app-crypt/gnupg )
-        gnome? ( gnome-base/gnome-print )"
+        gnome? ( gnome-base/gnome-print-0.29-r1 )"
 
 DEPEND="$RDEPEND nls? ( sys-devel/gettext )"
 
@@ -34,22 +34,16 @@ src_compile() {
         myopts="$myopts --disable-pgp"
     fi
     if [ "`use gnome`" ] ; then
-        myopts="$myopts --enable-gnome --prefix=/opt/gnome"
-    else
-        myopts="$myopts --prefix=/usr/X11R6"
+        myopts="$myopts --enable-gnome"
     fi
 
-    try ./configure --prefix=/usr/X11R6 --host=${CHOST} ${myopts}
+    try ./configure --prefix=/usr --host=${CHOST} ${myopts}
     try make
 
 }
 
 src_install () {
-    if [ "`use gnome`" ] ; then
-      try make prefix=${D}/opt/gnome install
-    else
-      try make prefix=${D}/usr/X11R6 install
-    fi
+    try make prefix=${D}/usr install
 
     dodoc ChangeLog README README.firewall INSTALL
 }
diff --git a/net-mail/sylpheed/files/digest-sylpheed-0.4.66 b/net-mail/sylpheed/files/digest-sylpheed-0.4.66
deleted file mode 100644
index ed56b276d7ec..000000000000
--- a/net-mail/sylpheed/files/digest-sylpheed-0.4.66
+++ /dev/null
@@ -1 +0,0 @@
-MD5 dd997ca324a77d08de834cf81a66da0e sylpheed-0.4.66.tar.bz2
diff --git a/net-mail/sylpheed/files/digest-sylpheed-0.4.99 b/net-mail/sylpheed/files/digest-sylpheed-0.4.99
deleted file mode 100644
index 6e9dee86ec46..000000000000
--- a/net-mail/sylpheed/files/digest-sylpheed-0.4.99
+++ /dev/null
@@ -1 +0,0 @@
-MD5 61de2f05d100954f328c829f7eeefc02 sylpheed-0.4.99.tar.bz2
diff --git a/net-mail/sylpheed/files/digest-sylpheed-0.5.0 b/net-mail/sylpheed/files/digest-sylpheed-0.5.0
deleted file mode 100644
index 4c3c55fc2905..000000000000
--- a/net-mail/sylpheed/files/digest-sylpheed-0.5.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5fab4e67b8a9f440c83ec9fcd22a1d24 sylpheed-0.5.0.tar.bz2
diff --git a/net-mail/sylpheed/files/digest-sylpheed-0.5.0_pre2 b/net-mail/sylpheed/files/digest-sylpheed-0.5.0_pre2
deleted file mode 100644
index 5f58d93c8336..000000000000
--- a/net-mail/sylpheed/files/digest-sylpheed-0.5.0_pre2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 09cd1711d377ffa973627a2ee6368f23 sylpheed-0.5.0pre2.tar.bz2
diff --git a/net-mail/sylpheed/files/digest-sylpheed-0.5.0_pre3 b/net-mail/sylpheed/files/digest-sylpheed-0.5.0_pre3
deleted file mode 100644
index 85fbcbc4288d..000000000000
--- a/net-mail/sylpheed/files/digest-sylpheed-0.5.0_pre3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a3cd78aa28b497a461ece5b9ba122ec1 sylpheed-0.5.0pre3.tar.bz2
diff --git a/net-mail/sylpheed/files/digest-sylpheed-0.5.2 b/net-mail/sylpheed/files/digest-sylpheed-0.5.2
deleted file mode 100644
index ae28bca379c9..000000000000
--- a/net-mail/sylpheed/files/digest-sylpheed-0.5.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 82375b7071954ba8867975570e62b111 sylpheed-0.5.2.tar.bz2
diff --git a/net-mail/sylpheed/files/digest-sylpheed-0.6.1 b/net-mail/sylpheed/files/digest-sylpheed-0.6.1
deleted file mode 100644
index 1c1c1dac7803..000000000000
--- a/net-mail/sylpheed/files/digest-sylpheed-0.6.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ab62ca10d4bbb02903248139f398e2bd sylpheed-0.6.1.tar.bz2
diff --git a/net-mail/sylpheed/files/digest-sylpheed-0.6.1-r1 b/net-mail/sylpheed/files/digest-sylpheed-0.6.1-r1
deleted file mode 100644
index 1c1c1dac7803..000000000000
--- a/net-mail/sylpheed/files/digest-sylpheed-0.6.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ab62ca10d4bbb02903248139f398e2bd sylpheed-0.6.1.tar.bz2
diff --git a/net-mail/sylpheed/files/digest-sylpheed-0.6.2 b/net-mail/sylpheed/files/digest-sylpheed-0.6.2-r1
index 294a7a1a3407..294a7a1a3407 100644
--- a/net-mail/sylpheed/files/digest-sylpheed-0.6.2
+++ b/net-mail/sylpheed/files/digest-sylpheed-0.6.2-r1
diff --git a/net-mail/sylpheed/sylpheed-0.4.66.ebuild b/net-mail/sylpheed/sylpheed-0.4.66.ebuild
deleted file mode 100644
index d09eb8ec6a90..000000000000
--- a/net-mail/sylpheed/sylpheed-0.4.66.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2000 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/net-mail/sylpheed/sylpheed-0.4.66.ebuild,v 1.3 2001/07/29 10:56:02 hallski Exp $
-
-#P=
-A=${P}.tar.bz2
-S=${WORKDIR}/${P}
-DESCRIPTION="A lightweight email client and newsreader"
-SRC_URI="http://sylpheed.good-day.net/sylpheed/${A}"
-HOMEPAGE="http://sylpheed.good-day.net"
-
-DEPEND=">=x11-libs/gtk+-1.2
-        >=media-libs/compface-1.4
-	gnome? ( >=media-libs/gdk-pixbuf-0.10 )
-	nls? ( sys-devel/gettext )"
-
-RDEPEND=">=x11-libs/gtk+-1.2
-	gnome? ( >=media-libs/gdk-pixbuf-0.10 )"
-
-src_compile() {
-
-    local myconf
-    if [ -z "`use gnome`" ] ; then
-	myconf="--disable-gdk-pixbuf --disable-imlib"
-    fi
-    if [ -z "`use nls`" ] ; then
-	myconf="$myconf --disable-nls"
-    fi
-    try ./configure --prefix=/usr/X11R6 --host=${CHOST} --enable-ipv6 $myconf
-    try make
-
-}
-
-src_install () {
-
-    try make prefix=${D}/usr manualdir=${D}/usr/share/doc/${PF}/html install
-    dodoc AUTHORS COPYING ChangeLog* NEWS README* TODO*
-
-}
-
diff --git a/net-mail/sylpheed/sylpheed-0.4.99.ebuild b/net-mail/sylpheed/sylpheed-0.4.99.ebuild
deleted file mode 100644
index 71e53979b794..000000000000
--- a/net-mail/sylpheed/sylpheed-0.4.99.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2000 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/net-mail/sylpheed/sylpheed-0.4.99.ebuild,v 1.2 2001/07/29 10:56:02 hallski Exp $
-
-#P=
-A=${P}.tar.bz2
-S=${WORKDIR}/${P}
-DESCRIPTION="A lightweight email client and newsreader"
-SRC_URI="http://sylpheed.good-day.net/sylpheed/${A}"
-HOMEPAGE="http://sylpheed.good-day.net"
-
-DEPEND=">=x11-libs/gtk+-1.2
-        >=media-libs/compface-1.4
-	gnome? ( >=media-libs/gdk-pixbuf-0.10 )
-	nls? ( sys-devel/gettext )"
-
-RDEPEND=">=x11-libs/gtk+-1.2
-	gnome? ( >=media-libs/gdk-pixbuf-0.10 )"
-
-src_compile() {
-
-    local myconf
-    if [ -z "`use gnome`" ] ; then
-	myconf="--disable-gdk-pixbuf --disable-imlib"
-    fi
-    if [ -z "`use nls`" ] ; then
-	myconf="$myconf --disable-nls"
-    fi
-    try ./configure --prefix=/usr/X11R6 --host=${CHOST} --enable-ipv6 $myconf
-    try make
-
-}
-
-src_install () {
-
-    try make prefix=${D}/usr manualdir=${D}/usr/share/doc/${PF}/html install
-    dodoc AUTHORS COPYING ChangeLog* NEWS README* TODO*
-
-}
-
diff --git a/net-mail/sylpheed/sylpheed-0.5.0.ebuild b/net-mail/sylpheed/sylpheed-0.5.0.ebuild
deleted file mode 100644
index 975a21388f25..000000000000
--- a/net-mail/sylpheed/sylpheed-0.5.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2000 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/net-mail/sylpheed/sylpheed-0.5.0.ebuild,v 1.2 2001/07/29 10:56:02 hallski Exp $
-
-#P=
-A=${PN}-0.5.0.tar.bz2
-S=${WORKDIR}/${PN}-0.5.0
-DESCRIPTION="A lightweight email client and newsreader"
-SRC_URI="http://sylpheed.good-day.net/sylpheed/${A}"
-HOMEPAGE="http://sylpheed.good-day.net"
-
-DEPEND=">=x11-libs/gtk+-1.2
-        >=media-libs/compface-1.4
-	gnome? ( >=media-libs/gdk-pixbuf-0.10 )
-	nls? ( sys-devel/gettext )"
-
-RDEPEND=">=x11-libs/gtk+-1.2
-	gnome? ( >=media-libs/gdk-pixbuf-0.10 )"
-
-src_compile() {
-
-    local myconf
-    if [ -z "`use gnome`" ] ; then
-	myconf="--disable-gdk-pixbuf --disable-imlib"
-    fi
-    if [ -z "`use nls`" ] ; then
-	myconf="$myconf --disable-nls"
-    fi
-    try ./configure --prefix=/usr/X11R6 --host=${CHOST} --enable-ipv6 $myconf
-    try make
-
-}
-
-src_install () {
-
-    try make prefix=${D}/usr manualdir=${D}/usr/share/doc/${PF}/html install
-    dodoc AUTHORS COPYING ChangeLog* NEWS README* TODO*
-
-}
-
diff --git a/net-mail/sylpheed/sylpheed-0.5.0_pre2.ebuild b/net-mail/sylpheed/sylpheed-0.5.0_pre2.ebuild
deleted file mode 100644
index 4cc0b7bbd427..000000000000
--- a/net-mail/sylpheed/sylpheed-0.5.0_pre2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2000 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/net-mail/sylpheed/sylpheed-0.5.0_pre2.ebuild,v 1.3 2001/08/02 20:16:48 danarmak Exp $
-
-#P=
-A=${PN}-0.5.0pre2.tar.bz2
-S=${WORKDIR}/${PN}-0.5.0pre2
-DESCRIPTION="A lightweight email client and newsreader"
-SRC_URI="http://sylpheed.good-day.net/sylpheed/v0.4/${A}"
-HOMEPAGE="http://sylpheed.good-day.net"
-
-DEPEND=">=x11-libs/gtk+-1.2
-        >=media-libs/compface-1.4
-	gnome? ( >=media-libs/gdk-pixbuf-0.10 )
-	nls? ( sys-devel/gettext )"
-
-RDEPEND=">=x11-libs/gtk+-1.2
-	gnome? ( >=media-libs/gdk-pixbuf-0.10 )"
-
-src_compile() {
-
-    local myconf
-    if [ -z "`use gnome`" ] ; then
-	myconf="--disable-gdk-pixbuf --disable-imlib"
-    fi
-    if [ -z "`use nls`" ] ; then
-	myconf="$myconf --disable-nls"
-    fi
-    try ./configure --prefix=/usr/X11R6 --host=${CHOST} --enable-ipv6 $myconf
-    try make
-
-}
-
-src_install () {
-
-    try make prefix=${D}/usr manualdir=${D}/usr/share/doc/${PF}/html install
-    dodoc AUTHORS COPYING ChangeLog* NEWS README* TODO*
-
-}
-
diff --git a/net-mail/sylpheed/sylpheed-0.5.0_pre3.ebuild b/net-mail/sylpheed/sylpheed-0.5.0_pre3.ebuild
deleted file mode 100644
index a7390e0defd5..000000000000
--- a/net-mail/sylpheed/sylpheed-0.5.0_pre3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2000 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/net-mail/sylpheed/sylpheed-0.5.0_pre3.ebuild,v 1.4 2001/08/02 20:16:48 danarmak Exp $
-
-#P=
-A=${PN}-0.5.0pre3.tar.bz2
-S=${WORKDIR}/${PN}-0.5.0pre3
-DESCRIPTION="A lightweight email client and newsreader"
-SRC_URI="http://sylpheed.good-day.net/sylpheed/v0.4/${A}"
-HOMEPAGE="http://sylpheed.good-day.net"
-
-DEPEND=">=x11-libs/gtk+-1.2
-        >=media-libs/compface-1.4
-	gnome? ( >=media-libs/gdk-pixbuf-0.10 )
-	nls? ( sys-devel/gettext )"
-
-RDEPEND=">=x11-libs/gtk+-1.2
-	gnome? ( >=media-libs/gdk-pixbuf-0.10 )"
-
-src_compile() {
-
-    local myconf
-#    if [ -z "`use gnome`" ] ; then
-#	myconf="--disable-gdk-pixbuf --disable-imlib"
-#    fi
-    if [ -z "`use nls`" ] ; then
-	myconf="$myconf --disable-nls"
-    fi
-    try ./configure --prefix=/usr/X11R6 --host=${CHOST} --enable-ipv6 $myconf
-    try make
-
-}
-
-src_install () {
-
-    try make prefix=${D}/usr manualdir=${D}/usr/share/doc/${PF}/html install
-    dodoc AUTHORS COPYING ChangeLog* NEWS README* TODO*
-
-}
-
diff --git a/net-mail/sylpheed/sylpheed-0.5.2.ebuild b/net-mail/sylpheed/sylpheed-0.5.2.ebuild
deleted file mode 100644
index f7468b3227c0..000000000000
--- a/net-mail/sylpheed/sylpheed-0.5.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2000 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/net-mail/sylpheed/sylpheed-0.5.2.ebuild,v 1.1 2001/08/04 15:58:54 achim Exp $
-
-#P=
-A=${P}.tar.bz2
-S=${WORKDIR}/${P}
-DESCRIPTION="A lightweight email client and newsreader"
-SRC_URI="http://sylpheed.good-day.net/sylpheed/${A}"
-HOMEPAGE="http://sylpheed.good-day.net"
-
-DEPEND=">=x11-libs/gtk+-1.2
-        >=media-libs/compface-1.4
-	gnome? ( >=media-libs/gdk-pixbuf-0.10 )
-	nls? ( sys-devel/gettext )"
-
-RDEPEND=">=x11-libs/gtk+-1.2
-	gnome? ( >=media-libs/gdk-pixbuf-0.10 )"
-
-src_compile() {
-
-    local myconf
-    if [ -z "`use gnome`" ] ; then
-	myconf="--disable-gdk-pixbuf --disable-imlib"
-    fi
-    if [ -z "`use nls`" ] ; then
-	myconf="$myconf --disable-nls"
-    fi
-    try ./configure --prefix=/usr/X11R6 --host=${CHOST} --enable-ipv6 $myconf
-    try make
-
-}
-
-src_install () {
-
-    try make prefix=${D}/usr manualdir=${D}/usr/share/doc/${PF}/html install
-    dodoc AUTHORS COPYING ChangeLog* NEWS README* TODO*
-
-}
-
diff --git a/net-mail/sylpheed/sylpheed-0.6.1-r1.ebuild b/net-mail/sylpheed/sylpheed-0.6.1-r1.ebuild
deleted file mode 100644
index 0799fa63ee8e..000000000000
--- a/net-mail/sylpheed/sylpheed-0.6.1-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2000 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/net-mail/sylpheed/sylpheed-0.6.1-r1.ebuild,v 1.1 2001/09/12 05:12:29 blocke Exp $
-
-A=${P}.tar.bz2
-S=${WORKDIR}/${P}
-DESCRIPTION="A lightweight email client and newsreader"
-SRC_URI="http://sylpheed.good-day.net/sylpheed/${A}"
-HOMEPAGE="http://sylpheed.good-day.net"
-
-DEPEND=">=x11-libs/gtk+-1.2
-        >=media-libs/compface-1.4
-	gnome? ( >=media-libs/gdk-pixbuf-0.10 )
-	nls? ( sys-devel/gettext )
-	ssl? ( dev-libs/openssl )
-	gpg? ( >=app-crypt/gnupg-1.0.6 >=app-crypt/gpgme-0.2.2 )" 
-
-
-RDEPEND=">=x11-libs/gtk+-1.2
-	gnome? ( >=media-libs/gdk-pixbuf-0.10 )
-	ssl? ( dev-libs/openssl )
-	gpg? ( >=app-crypt/gnupg-1.0.6 >=app-crypt/gpgme-0.2.2 )"
-
-src_compile() {
-
-    local myconf
-    if [ -z "`use gnome`" ] ; then
-		myconf="--disable-gdk-pixbuf --disable-imlib"
-    fi
-    if [ -z "`use nls`" ] ; then
-		myconf="$myconf --disable-nls"
-    fi
-    if [ "`use ssl`" ] ; then
-		myconf="$myconf --enable-ssl"
-    fi
-	if [ "`use gpg`" ] ; then
-		myconf="$myconf --enable-gpgme"
-    fi
-
-    try ./configure --prefix=/usr/X11R6 --host=${CHOST} --enable-ipv6 $myconf
-    try make
-
-}
-
-src_install () {
-
-    try make prefix=${D}/usr manualdir=${D}/usr/share/doc/${PF}/html install
-    dodoc AUTHORS COPYING ChangeLog* NEWS README* TODO*
-
-}
-
diff --git a/net-mail/sylpheed/sylpheed-0.6.1.ebuild b/net-mail/sylpheed/sylpheed-0.6.1.ebuild
deleted file mode 100644
index d681ef4e2854..000000000000
--- a/net-mail/sylpheed/sylpheed-0.6.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2000 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/net-mail/sylpheed/sylpheed-0.6.1.ebuild,v 1.2 2001/09/08 06:50:34 blocke Exp $
-
-A=${P}.tar.bz2
-S=${WORKDIR}/${P}
-DESCRIPTION="A lightweight email client and newsreader"
-SRC_URI="http://sylpheed.good-day.net/sylpheed/${A}"
-HOMEPAGE="http://sylpheed.good-day.net"
-
-DEPEND=">=x11-libs/gtk+-1.2
-        >=media-libs/compface-1.4
-	gnome? ( >=media-libs/gdk-pixbuf-0.10 )
-	nls? ( sys-devel/gettext )
-	ssl? ( dev-libs/openssl )"
-
-RDEPEND=">=x11-libs/gtk+-1.2
-	gnome? ( >=media-libs/gdk-pixbuf-0.10 )
-	ssl? ( dev-libs/openssl )"
-
-src_compile() {
-
-    local myconf
-    if [ -z "`use gnome`" ] ; then
-	myconf="--disable-gdk-pixbuf --disable-imlib"
-    fi
-    if [ -z "`use nls`" ] ; then
-	myconf="$myconf --disable-nls"
-    fi
-    if [ "`use ssl`" ] ; then
-	myconf="$myconf --enable-ssl"
-    fi
-
-    try ./configure --prefix=/usr/X11R6 --host=${CHOST} --enable-ipv6 $myconf
-    try make
-
-}
-
-src_install () {
-
-    try make prefix=${D}/usr manualdir=${D}/usr/share/doc/${PF}/html install
-    dodoc AUTHORS COPYING ChangeLog* NEWS README* TODO*
-
-}
-
diff --git a/net-mail/sylpheed/sylpheed-0.6.2.ebuild b/net-mail/sylpheed/sylpheed-0.6.2-r1.ebuild
index 8280ac4b84c2..f1652b949a74 100644
--- a/net-mail/sylpheed/sylpheed-0.6.2.ebuild
+++ b/net-mail/sylpheed/sylpheed-0.6.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 Your Name <your email>
-# $Header: /var/cvsroot/gentoo-x86/net-mail/sylpheed/sylpheed-0.6.2.ebuild,v 1.1 2001/09/19 05:55:25 lordjoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/sylpheed/sylpheed-0.6.2-r1.ebuild,v 1.1 2001/10/06 10:08:19 azarah Exp $
 
 A=${P}.tar.bz2
 S=${WORKDIR}/${P}
@@ -9,16 +9,16 @@ DESCRIPTION="A lightweight email client and newsreader"
 SRC_URI="http://sylpheed.good-day.net/sylpheed/${A}"
 HOMEPAGE="http://sylpheed.good-day.net"
 
-DEPEND=">=x11-libs/gtk+-1.2
+DEPEND=">=x11-libs/gtk+-1.2.10-r4
         >=media-libs/compface-1.4
-	gnome? ( >=media-libs/gdk-pixbuf-0.10 )
+	gnome? ( >=media-libs/gdk-pixbuf-0.11.0-r1 )
 	nls? ( sys-devel/gettext )
 	ssl? ( dev-libs/openssl )
 	gpg? ( >=app-crypt/gnupg-1.0.6 >=app-crypt/gpgme-0.2.2 )" 
 
 
-RDEPEND=">=x11-libs/gtk+-1.2
-	gnome? ( >=media-libs/gdk-pixbuf-0.10 )
+RDEPEND=">=x11-libs/gtk+-1.2.10-r4
+	gnome? ( >=media-libs/gdk-pixbuf-0.11.0-r1 )
 	ssl? ( dev-libs/openssl )
 	gpg? ( >=app-crypt/gnupg-1.0.6 >=app-crypt/gpgme-0.2.2 )"
 
@@ -38,7 +38,7 @@ src_compile() {
 		myconf="$myconf --enable-gpgme"
     fi
 
-    try ./configure --prefix=/usr/X11R6 --host=${CHOST} --enable-ipv6 $myconf
+    try ./configure --prefix=/usr --host=${CHOST} --enable-ipv6 $myconf
     try make
 
 }
diff --git a/net-misc/nt/files/digest-nt-1.27 b/net-misc/nt/files/digest-nt-1.27
deleted file mode 100644
index c4530463fcb7..000000000000
--- a/net-misc/nt/files/digest-nt-1.27
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4a447576a216494e50ebed3876268ae2 nt-1.27.tar.gz
diff --git a/net-misc/nt/files/digest-nt-1.29 b/net-misc/nt/files/digest-nt-1.29-r1
index 978a2c7a027d..978a2c7a027d 100644
--- a/net-misc/nt/files/digest-nt-1.29
+++ b/net-misc/nt/files/digest-nt-1.29-r1
diff --git a/net-misc/nt/nt-1.27.ebuild b/net-misc/nt/nt-1.27.ebuild
deleted file mode 100644
index 04675c66d5c6..000000000000
--- a/net-misc/nt/nt-1.27.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Ben Lutgens <lamer@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nt/nt-1.27.ebuild,v 1.1 2001/07/08 16:35:34 lamer Exp $
-S=${WORKDIR}/${P}
-
-DESCRIPTION="GTK based download manager for X (Sorta like GetRight(tm) for doze, works well with galeon."
-SRC_URI="http://www.krasu.ru/soft/chuchelo/files/${P}.tar.gz"
-HOMEPAGE="http://www.krasu.ru/soft/chuchelo/"
-DEPEND="virtual/x11
-		 >=x11-libs/gtk+-1.2"
-
-#RDEPEND=""
-
-src_compile() {
-# This upstream developer does things a little strangely
-	cd ${S}/main	
-	try emake DEST=/usr D4X_SHARE=/usr/share/nt
-}
-
-src_install () {
-
-# Note to self and other developers: create directories in install targets of Makefiles....
-	dodir /usr/bin
-	dodir /usr/share/nt
-	cd ${S}/main
-   try make DEST=${D}/usr D4X_SHARE=${D}/usr/share/nt install
-	cd ${S}
-	dodoc main/Changelog LICENSE THANKS FAQ* INSTALL* NAMES PLANS README* TODO TROUBLES
-	doman nt.1
-	insinto /usr/share/pixmaps
-	doins *.png *.xpm
-}
-
diff --git a/net-misc/nt/nt-1.29.ebuild b/net-misc/nt/nt-1.29-r1.ebuild
index 853ed82028cb..03e7ba44a3c5 100644
--- a/net-misc/nt/nt-1.29.ebuild
+++ b/net-misc/nt/nt-1.29-r1.ebuild
@@ -1,19 +1,20 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Ben Lutgens <lamer@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nt/nt-1.29.ebuild,v 1.1 2001/09/28 23:04:35 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nt/nt-1.29-r1.ebuild,v 1.1 2001/10/06 10:08:19 azarah Exp $
 S=${WORKDIR}/${P}
 
 DESCRIPTION="GTK based download manager for X (Sorta like GetRight(tm) for doze, works well with galeon."
 SRC_URI="http://www.krasu.ru/soft/chuchelo/files/${P}.tar.gz"
 HOMEPAGE="http://www.krasu.ru/soft/chuchelo/"
+
 DEPEND="virtual/glibc
 	virtual/x11
-	>=x11-libs/gtk+-1.2"
+	>=x11-libs/gtk+-1.2.10-r4"
 
 RDEPEND="virtual/glibc
 	virtual/x11
-	>=x11-libs/gtk+-1.2"
+	>=x11-libs/gtk+-1.2.10-r4"
 
 src_compile() {
 # This upstream developer does things a little strangely
diff --git a/net-print/gtklp/files/digest-gtklp-0.6g b/net-print/gtklp/files/digest-gtklp-0.6g-r1
index b2e4bf81d8d7..b2e4bf81d8d7 100644
--- a/net-print/gtklp/files/digest-gtklp-0.6g
+++ b/net-print/gtklp/files/digest-gtklp-0.6g-r1
diff --git a/net-print/gtklp/gtklp-0.6g.ebuild b/net-print/gtklp/gtklp-0.6g-r1.ebuild
index 7a81cbf068e9..d5508005b95f 100644
--- a/net-print/gtklp/gtklp-0.6g.ebuild
+++ b/net-print/gtklp/gtklp-0.6g-r1.ebuild
@@ -1,14 +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/net-print/gtklp/gtklp-0.6g.ebuild,v 1.2 2001/08/11 04:53:17 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/gtklp/gtklp-0.6g-r1.ebuild,v 1.1 2001/10/06 10:08:19 azarah Exp $
 
 S=${WORKDIR}/src
 DESCRIPTION="A GUI fort cupsd"
 SRC_URI="http://www.stud.uni-hannover.de/~sirtobi/gtklp/files/${P}.src.tgz"
 HOMEPAGE="http://www.stud.uni-hannover.de/~sirtobi/gtklp"
 
-DEPEND="virtual/glibc >=x11-libs/gtk+-1.2.10
+DEPEND="virtual/glibc >=x11-libs/gtk+-1.2.10-r4
 	>=net-print/cups-1.1.7"
 
 src_compile() {
@@ -16,7 +16,7 @@ src_compile() {
 }
 
 src_install () {
-    into /usr/X11R6
+    into /usr
     dobin gtklp
     dodoc gtklprc.path.sample
     docinto html
diff --git a/net-print/pdq/files/digest-pdq-2.2.1 b/net-print/pdq/files/digest-pdq-2.2.1-r1
index fc2c9363e081..fc2c9363e081 100644
--- a/net-print/pdq/files/digest-pdq-2.2.1
+++ b/net-print/pdq/files/digest-pdq-2.2.1-r1
diff --git a/net-print/pdq/pdq-2.2.1.ebuild b/net-print/pdq/pdq-2.2.1-r1.ebuild
index 8339a674ca1f..3b77e753a470 100644
--- a/net-print/pdq/pdq-2.2.1.ebuild
+++ b/net-print/pdq/pdq-2.2.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 Grant Goodyear <grant@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-print/pdq/pdq-2.2.1.ebuild,v 1.1 2001/06/14 00:51:54 grant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/pdq/pdq-2.2.1-r1.ebuild,v 1.1 2001/10/06 10:08:19 azarah Exp $
 
 #P=
 A=${P}.tgz
@@ -10,7 +10,7 @@ DESCRIPTION="A non-daemon-centric print system which has a built-in, and sensibl
 SRC_URI="http://pdq.sourceforge.net/ftp/${A}"
 HOMEPAGE="http://pdq.sourceforge.net"
 
-DEPEND="gtk? ( >=x11-libs/gtk+-1.2.0 )"
+DEPEND="gtk? ( >=x11-libs/gtk+-1.2.10-r4 )"
 
 src_compile() {
 
diff --git a/net-www/mozilla/files/digest-mozilla-0.9.3 b/net-www/mozilla/files/digest-mozilla-0.9.3
deleted file mode 100644
index 18ffb642c3d6..000000000000
--- a/net-www/mozilla/files/digest-mozilla-0.9.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d26c0c47d18b0e4c55bba5d4bad60d4f mozilla-source-0.9.3.tar.gz
diff --git a/net-www/mozilla/files/digest-mozilla-0.9.4-r1 b/net-www/mozilla/files/digest-mozilla-0.9.4-r1
deleted file mode 100644
index 7203f67a8c1c..000000000000
--- a/net-www/mozilla/files/digest-mozilla-0.9.4-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 495707918a7b9b8780ab659b6538e2bc mozilla-source-0.9.4.tar.gz
diff --git a/net-www/mozilla/files/digest-mozilla-0.9.4 b/net-www/mozilla/files/digest-mozilla-0.9.4-r2
index 7203f67a8c1c..7203f67a8c1c 100644
--- a/net-www/mozilla/files/digest-mozilla-0.9.4
+++ b/net-www/mozilla/files/digest-mozilla-0.9.4-r2
diff --git a/net-www/mozilla/mozilla-0.9.3.ebuild b/net-www/mozilla/mozilla-0.9.3.ebuild
deleted file mode 100644
index f40efd6a1e3c..000000000000
--- a/net-www/mozilla/mozilla-0.9.3.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>
-# /home/cvsroot/gentoo-x86/net-www/mozilla/mozilla-0.9.ebuild,v 1.4 2001/06/07 01:45:52 achim Exp
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-0.9.3.ebuild,v 1.4 2001/08/31 03:23:39 pm Exp $
-
-
-A=mozilla-source-${PV}.tar.gz
-S=${WORKDIR}/mozilla
-DESCRIPTION=""
-SRC_URI="ftp://ftp.mozilla.org/pub/mozilla/releases/mozilla${PV}/src/${A}"
-HOMEPAGE="http://www.mozilla.org"
-PROVIDE="virtual/x11-web-browser"
-
-DEPEND="sys-devel/perl >=gnome-base/ORBit-0.5.7
-	>=x11-libs/gtk+-1.2.9
-	>=media-libs/jpeg-6b
-	>=media-libs/libpng-1.0.9
-	app-arch/zip
-	app-arch/unzip
-	mozqt? ( x11-libs/qt-x11 )"
-RDEPEND=">=gnome-base/ORBit-0.5.7
-	>=x11-libs/gtk+-1.2.9
-	>=media-libs/jpeg-6b
-	>=media-libs/libpng-1.0.9
-	app-arch/zip
-	app-arch/unzip
-	mozqt? ( x11-libs/qt-x11 )"
-
-src_compile() {
-    chown -R root.root *
-    if [ "`use mozqt`" ] ; then
-	myconf="--with-qt --enable-toolkit=qt --without-gtk --with-extentions=default,venkman"
-    else
-	myconf="--with-gtk --with-extentions=default,venkman,irc"
-    fi
-    try ./configure --prefix=/opt/mozilla --host=${CHOST} \
-	$myconf --disable-tests --disable-debug --enable-jsd
-    try make
-#    if [ ! "`use mozqt`" ] ; then
-#      cd extensions/irc
-#      try make
-#      cd ../..
-#    fi
-
-    try ./configure --prefix=/opt/mozilla --host=${CHOST} \
-	$myconf --disable-tests --disable-debug
-    try make BUILD_MODULES=psm
-
-}
-
-src_install () {
-
-    dodir /opt/mozilla/include/nspr/{private,obsolete,md}
-    cd dist/include
-    cp -f *.h ${D}/opt/mozilla/include
-    cp -f nspr/*.h ${D}/opt/mozilla/include/nspr
-    cp -f nspr/obsolete/*.h ${D}/opt/mozilla/include/nspr/obsolete
-    cp -f nspr/private/*.h ${D}/opt/mozilla/include/nspr/private
-    cp -f nspr/md/*.cfg ${D}/opt/mozilla/include/nspr/md
-
-    export MOZILLA_OFFICIAL=1
-    export BUILD_OFFICIAL=1
-    cd ${S}/xpinstall/packager
-    try make
-    dodir /opt
-    tar xzf ${S}/dist/mozilla-`uname -m`-pc-linux-gnu.tar.gz -C ${D}/opt
-    mv ${D}/opt/package ${D}/opt/mozilla
-
-    exeinto /usr/bin
-    doexe ${FILESDIR}/mozilla
-    insinto /etc/env.d
-    doins ${FILESDIR}/10mozilla
-    dodoc LEGAL LICENSE README/mozilla/README*
-
-
-}
-
diff --git a/net-www/mozilla/mozilla-0.9.4-r1.ebuild b/net-www/mozilla/mozilla-0.9.4-r2.ebuild
index a90b375fcfdc..8ad4c7c71ce7 100644
--- a/net-www/mozilla/mozilla-0.9.4-r1.ebuild
+++ b/net-www/mozilla/mozilla-0.9.4-r2.ebuild
@@ -12,15 +12,15 @@ SRC_URI="ftp://ftp.mozilla.org/pub/mozilla/releases/mozilla${PV}/src/${A}"
 HOMEPAGE="http://www.mozilla.org"
 PROVIDE="virtual/x11-web-browser"
 
-DEPEND="sys-devel/perl >=gnome-base/ORBit-0.5.7
-	>=x11-libs/gtk+-1.2.9
+DEPEND="sys-devel/perl >=gnome-base/ORBit-0.5.10-r1
+	>=x11-libs/gtk+-1.2.10-r4
 	>=media-libs/jpeg-6b
 	>=media-libs/libpng-1.0.9
 	app-arch/zip
 	app-arch/unzip
 	mozqt? ( x11-libs/qt-x11 )"
-RDEPEND=">=gnome-base/ORBit-0.5.7
-	>=x11-libs/gtk+-1.2.9
+RDEPEND=">=gnome-base/ORBit-0.5.10-r1
+	>=x11-libs/gtk+-1.2.10-r4
 	>=media-libs/jpeg-6b
 	>=media-libs/libpng-1.0.9
 	app-arch/zip
diff --git a/net-www/mozilla/mozilla-0.9.4.ebuild b/net-www/mozilla/mozilla-0.9.4.ebuild
deleted file mode 100644
index 3a34715a085d..000000000000
--- a/net-www/mozilla/mozilla-0.9.4.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>
-# /home/cvsroot/gentoo-x86/net-www/mozilla/mozilla-0.9.ebuild,v 1.4 2001/06/07 01:45:52 achim Exp
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-0.9.4.ebuild,v 1.1 2001/09/22 09:07:50 blocke Exp $
-
-
-A=mozilla-source-${PV}.tar.gz
-S=${WORKDIR}/mozilla
-DESCRIPTION=""
-SRC_URI="ftp://ftp.mozilla.org/pub/mozilla/releases/mozilla${PV}/src/${A}"
-HOMEPAGE="http://www.mozilla.org"
-PROVIDE="virtual/x11-web-browser"
-
-DEPEND="sys-devel/perl >=gnome-base/ORBit-0.5.7
-	>=x11-libs/gtk+-1.2.9
-	>=media-libs/jpeg-6b
-	>=media-libs/libpng-1.0.9
-	app-arch/zip
-	app-arch/unzip
-	mozqt? ( x11-libs/qt-x11 )"
-RDEPEND=">=gnome-base/ORBit-0.5.7
-	>=x11-libs/gtk+-1.2.9
-	>=media-libs/jpeg-6b
-	>=media-libs/libpng-1.0.9
-	app-arch/zip
-	app-arch/unzip
-	mozqt? ( x11-libs/qt-x11 )"
-
-src_compile() {
-    chown -R root.root *
-    if [ "`use mozqt`" ] ; then
-	myconf="--with-qt --enable-toolkit=qt --without-gtk --with-extentions=default,venkman"
-    else
-	myconf="--with-gtk --with-extentions=default,venkman,irc"
-    fi
-    try ./configure --prefix=/opt/mozilla --host=${CHOST} \
-	$myconf --disable-tests --disable-debug --enable-jsd
-    try make
-#    if [ ! "`use mozqt`" ] ; then
-#      cd extensions/irc
-#      try make
-#      cd ../..
-#    fi
-
-    try ./configure --prefix=/opt/mozilla --host=${CHOST} \
-	$myconf --disable-tests --disable-debug
-    try make BUILD_MODULES=psm
-
-}
-
-src_install () {
-
-    dodir /opt/mozilla/include/nspr/{private,obsolete,md}
-    cd dist/include
-    cp -f *.h ${D}/opt/mozilla/include
-    cp -f nspr/*.h ${D}/opt/mozilla/include/nspr
-    cp -f nspr/obsolete/*.h ${D}/opt/mozilla/include/nspr/obsolete
-    cp -f nspr/private/*.h ${D}/opt/mozilla/include/nspr/private
-    cp -f nspr/md/*.cfg ${D}/opt/mozilla/include/nspr/md
-
-    export MOZILLA_OFFICIAL=1
-    export BUILD_OFFICIAL=1
-    cd ${S}/xpinstall/packager
-    try make
-    dodir /opt
-    tar xzf ${S}/dist/mozilla-`uname -m`-pc-linux-gnu.tar.gz -C ${D}/opt
-    mv ${D}/opt/package ${D}/opt/mozilla
-
-    exeinto /usr/bin
-    doexe ${FILESDIR}/mozilla
-    insinto /etc/env.d
-    doins ${FILESDIR}/10mozilla
-    dodoc LEGAL LICENSE README/mozilla/README*
-
-
-}
-
diff --git a/sys-apps/subterfugue/files/digest-subterfugue-0.2 b/sys-apps/subterfugue/files/digest-subterfugue-0.2-r1
index c2b874a49db0..c2b874a49db0 100644
--- a/sys-apps/subterfugue/files/digest-subterfugue-0.2
+++ b/sys-apps/subterfugue/files/digest-subterfugue-0.2-r1
diff --git a/sys-apps/subterfugue/subterfugue-0.2.ebuild b/sys-apps/subterfugue/subterfugue-0.2-r1.ebuild
index 055a02731bd9..2fabdcc7c0af 100644
--- a/sys-apps/subterfugue/subterfugue-0.2.ebuild
+++ b/sys-apps/subterfugue/subterfugue-0.2-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 Karl Trygve Kalleberg <karltk@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/subterfugue/subterfugue-0.2.ebuild,v 1.1 2001/09/25 16:00:47 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/subterfugue/subterfugue-0.2-r1.ebuild,v 1.1 2001/10/06 10:08:19 azarah Exp $
 
 S=${WORKDIR}/${P}
 
@@ -12,7 +12,7 @@ SRC_URI="http://prdownloads.sourceforge.net/subterfugue/subterfugue-0.2.tgz"
 HOMEPAGE="http://www.subterfugue.org"
 
 DEPEND=">=dev-lang/python-2.0
-        gtk? ( >=x11-libs/gtk+-1.2.8 )"
+        gtk? ( >=x11-libs/gtk+-1.2.10-r4 )"
 
 src_unpack() {
 
diff --git a/x11-libs/gtk-engines/files/digest-gtk-engines-0.12 b/x11-libs/gtk-engines/files/digest-gtk-engines-0.12
deleted file mode 100644
index 8326c972b3cd..000000000000
--- a/x11-libs/gtk-engines/files/digest-gtk-engines-0.12
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c867d1ebd6dbea355765d689a11330ec gtk-engines-0.12.tar.gz
diff --git a/x11-libs/gtk-engines/files/digest-gtk-engines-0.12-r1 b/x11-libs/gtk-engines/files/digest-gtk-engines-0.12-r2
index ba0ef27aeadf..ba0ef27aeadf 100644
--- a/x11-libs/gtk-engines/files/digest-gtk-engines-0.12-r1
+++ b/x11-libs/gtk-engines/files/digest-gtk-engines-0.12-r2
diff --git a/x11-libs/gtk-engines/gtk-engines-0.12-r1.ebuild b/x11-libs/gtk-engines/gtk-engines-0.12-r2.ebuild
index 9b48393ff16f..99a5ed5f7810 100644
--- a/x11-libs/gtk-engines/gtk-engines-0.12-r1.ebuild
+++ b/x11-libs/gtk-engines/gtk-engines-0.12-r2.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/x11-libs/gtk-engines/gtk-engines-0.12-r1.ebuild,v 1.1 2001/07/09 01:26:28 lamer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk-engines/gtk-engines-0.12-r2.ebuild,v 1.1 2001/10/06 10:08:19 azarah Exp $
 
 A="${P}.tar.gz Xenophilia-1.2.x.tar.gz"
 S=${WORKDIR}/${P}
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.gz http://d
 HOMEPAGE="http://www.gnome.org/"
 
 DEPEND="virtual/glibc virtual/x11
-	>=media-libs/imlib-1.9.8.1"
+	>=media-libs/imlib-1.9.10-r1"
 
 src_unpack() {
 	unpack ${P}.tar.gz
@@ -19,19 +19,19 @@ src_unpack() {
 }
 
 src_compile() {                           
-  try ./configure --host=${CHOST} --prefix=/usr/X11R6
+  try ./configure --host=${CHOST} --prefix=/usr
   try make
 
 	cd ${S}/Xenophilia-0.7
-	try make PREFIX=/usr/X11R6 FONTDIR=/usr/X11R6/lib/X11/fonts/misc
+	try make PREFIX=/usr FONTDIR=/usr/X11R6/lib/X11/fonts/misc
 
 }
 
 src_install() {                               
-  try make prefix=${D}/usr/X11R6 install
+  try make prefix=${D}/usr install
   dodoc AUTHORS COPYING* ChangeLog README NEWS
   cd Xenophilia-0.7
-	try make PREFIX=${D}/usr/X11R6 FONTDIR=/usr/X11R6/lib/X11/fonts/misc install
+	try make PREFIX=${D}/usr FONTDIR=/usr/X11R6/lib/X11/fonts/misc install
   dodoc AUTHORS  CONFIGURATION TODO COPYING* ChangeLog README 
 }
 
diff --git a/x11-libs/gtk-engines/gtk-engines-0.12.ebuild b/x11-libs/gtk-engines/gtk-engines-0.12.ebuild
deleted file mode 100644
index 940be9d29d4a..000000000000
--- a/x11-libs/gtk-engines/gtk-engines-0.12.ebuild
+++ /dev/null
@@ -1,27 +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-engines/gtk-engines-0.12.ebuild,v 1.2 2001/06/04 00:16:12 achim Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="gtk-engines"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${A}"
-HOMEPAGE="http://www.gnome.org/"
-
-DEPEND="virtual/glibc virtual/x11
-	>=media-libs/imlib-1.9.8.1"
-
-src_compile() {                           
-  try ./configure --host=${CHOST} --prefix=/usr/X11R6
-  try make
-}
-
-src_install() {                               
-  try make prefix=${D}/usr/X11R6 install
-  dodoc AUTHORS COPYING* ChangeLog README NEWS
-}
-
-
-
-
diff --git a/x11-libs/gtk-thinice-theme/files/digest-gtk-thinice-theme-1.0.4 b/x11-libs/gtk-thinice-theme/files/digest-gtk-thinice-theme-1.0.4-r1
index c002591a6695..c002591a6695 100644
--- a/x11-libs/gtk-thinice-theme/files/digest-gtk-thinice-theme-1.0.4
+++ b/x11-libs/gtk-thinice-theme/files/digest-gtk-thinice-theme-1.0.4-r1
diff --git a/x11-libs/gtk-thinice-theme/gtk-thinice-theme-1.0.4.ebuild b/x11-libs/gtk-thinice-theme/gtk-thinice-theme-1.0.4-r1.ebuild
index db3925c993c7..3822cca920f9 100644
--- a/x11-libs/gtk-thinice-theme/gtk-thinice-theme-1.0.4.ebuild
+++ b/x11-libs/gtk-thinice-theme/gtk-thinice-theme-1.0.4-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Your Name <your email>
 # /home/cvsroot/gentoo-x86/skel.build,v 1.2 2001/02/15 18:17:31 achim Exp
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk-thinice-theme/gtk-thinice-theme-1.0.4.ebuild,v 1.3 2001/08/31 03:23:39 pm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk-thinice-theme/gtk-thinice-theme-1.0.4-r1.ebuild,v 1.1 2001/10/06 10:08:19 azarah Exp $
 
 
 S=${WORKDIR}/${P}
@@ -10,13 +10,13 @@ DESCRIPTION="Gtk engine, thinice"
 SRC_URI="http://thinice.sourceforge.net/${P}.tar.gz"
 HOMEPAGE="http://thinice.sourceforge.net"
 
-DEPEND=">=x11-libs/gtk+-1.2.10"
+DEPEND=">=x11-libs/gtk+-1.2.10-r4"
 
 src_compile() {
-    try ./configure --prefix=/usr/X11R6 --host=${CHOST}
+    try ./configure --prefix=/usr --host=${CHOST}
     try pmake
 }
 
 src_install () {
-    try make prefix=${D}/usr/X11R6 install
+    try make prefix=${D}/usr install
 }
diff --git a/x11-libs/gtkDPS/files/digest-gtkDPS-0.3.3 b/x11-libs/gtkDPS/files/digest-gtkDPS-0.3.3-r1
index f8b5d71485e1..f8b5d71485e1 100644
--- a/x11-libs/gtkDPS/files/digest-gtkDPS-0.3.3
+++ b/x11-libs/gtkDPS/files/digest-gtkDPS-0.3.3-r1
diff --git a/x11-libs/gtkDPS/gtkDPS-0.3.3.ebuild b/x11-libs/gtkDPS/gtkDPS-0.3.3-r1.ebuild
index 413b73d94ae4..5978d833bc4b 100644
--- a/x11-libs/gtkDPS/gtkDPS-0.3.3.ebuild
+++ b/x11-libs/gtkDPS/gtkDPS-0.3.3-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/x11-libs/gtkDPS/gtkDPS-0.3.3.ebuild,v 1.4 2001/06/04 03:33:03 achim Exp $
+# $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 $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -10,7 +10,7 @@ SRC_URI="http://www.aist-nara.ac.jp/~masata-y/gtkDPS/dist/${A}"
 HOMEPAGE="http://www.aist-nara.ac.jp/~masata-y/gtkDPS/"
 
 DEPEND="virtual/glibc nls? ( sys-devel/gettext )
-	>=x11-libs/gtk+-1.2.8
+	>=x11-libs/gtk+-1.2.10-r4
 	>=app-text/dgs-0.5.9.1"
 RDEPEND="virtual/glibc"
 
@@ -19,7 +19,7 @@ src_compile() {
       myconf="--disable-nls"
     fi
 
-    try ./configure --prefix=/usr/X11R6 --host=${CHOST} \
+    try ./configure --prefix=/usr --host=${CHOST} \
 	--with-x --with-dps $myconf
     try make
 
@@ -27,7 +27,7 @@ src_compile() {
 
 src_install () {
 
-    try make prefix=${D}/usr/X11R6 install
+    try make prefix=${D}/usr install
     dodoc COPYING* ChangeLog GTKDPS-VERSION HACKING NEWS README TODO
 }
 
diff --git a/x11-libs/gtkglarea/files/digest-gtkglarea-1.2.2 b/x11-libs/gtkglarea/files/digest-gtkglarea-1.2.2-r1
index aa94bfa1fa31..aa94bfa1fa31 100644
--- a/x11-libs/gtkglarea/files/digest-gtkglarea-1.2.2
+++ b/x11-libs/gtkglarea/files/digest-gtkglarea-1.2.2-r1
diff --git a/x11-libs/gtkglarea/gtkglarea-1.2.2.ebuild b/x11-libs/gtkglarea/gtkglarea-1.2.2-r1.ebuild
index 5c92c84d0b54..1be080736236 100644
--- a/x11-libs/gtkglarea/gtkglarea-1.2.2.ebuild
+++ b/x11-libs/gtkglarea/gtkglarea-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 Your Name <your email>
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkglarea/gtkglarea-1.2.2.ebuild,v 1.1 2001/06/04 00:16:12 achim Exp $
+# $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 $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -9,11 +9,15 @@ DESCRIPTION="GL Extentions for gtk+"
 SRC_URI="http://www.student.oulu.fi/~jlof/gtkglarea/download/${A}"
 HOMEPAGE="http://www.student.oulu.fi/~jlof/gtkglarea/"
 
-DEPEND="virtual/glibc >=x11-libs/gtk+-1.2.10 virtual/glu virtual/opengl"
+DEPEND="virtual/glibc
+	>=x11-libs/gtk+-1.2.10-r4
+	virtual/glu
+	virtual/opengl"
+
 
 src_compile() {
 
-    try ./configure --prefix=/usr/X11R6 --host=${CHOST}
+    try ./configure --prefix=/usr --host=${CHOST}
     try make
 
 }
diff --git a/x11-libs/gtkmm/files/digest-gtkmm-1.2.5 b/x11-libs/gtkmm/files/digest-gtkmm-1.2.5-r1
index b9178a5a799a..b9178a5a799a 100644
--- a/x11-libs/gtkmm/files/digest-gtkmm-1.2.5
+++ b/x11-libs/gtkmm/files/digest-gtkmm-1.2.5-r1
diff --git a/x11-libs/gtkmm/gtkmm-1.2.5.ebuild b/x11-libs/gtkmm/gtkmm-1.2.5-r1.ebuild
index dd66769de048..3db14050ded8 100644
--- a/x11-libs/gtkmm/gtkmm-1.2.5.ebuild
+++ b/x11-libs/gtkmm/gtkmm-1.2.5-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/x11-libs/gtkmm/gtkmm-1.2.5.ebuild,v 1.1 2001/06/14 16:24:40 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkmm/gtkmm-1.2.5-r1.ebuild,v 1.1 2001/10/06 10:08:20 azarah Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -11,7 +11,9 @@ SRC_URI="http://download.sourceforge.net/gtkmm/${A}"
 #	 http://ftp.gnome.org/pub/GNOME/stable/sources/gtk+/${A}"
 HOMEPAGE="http://gtkmm.sourceforge.net/"
 
-DEPEND="virtual/glibc >=x11-libs/gtk+-1.2.10 >=dev-libs/libsigc++-1.0.0"
+DEPEND="virtual/glibc
+	>=x11-libs/gtk+-1.2.10-r4
+	>=dev-libs/libsigc++-1.0.0"
 
 src_compile() {
 	local myconf
@@ -23,8 +25,8 @@ src_compile() {
 		myconf="--enable-debug=no"
 	fi
 	
-  	try ./configure --host=${CHOST} --prefix=/usr/X11R6 ${myconf} \
-	--infodir=/usr/X11R6/info --mandir=/usr/X11R6/man --sysconfdir=/etc/X11 \
+  	try ./configure --host=${CHOST} --prefix=/usr ${myconf} \
+	--infodir=/usr/share/info --mandir=/usr/share/man --sysconfdir=/etc/X11 \
 	--with-xinput=xfree --with-x
 	try make
 }
diff --git a/x11-misc/bbrun/bbrun-1.1-r1.ebuild b/x11-misc/bbrun/bbrun-1.1-r2.ebuild
index a247d2a26d80..3f74d9d4ae35 100644
--- a/x11-misc/bbrun/bbrun-1.1-r1.ebuild
+++ b/x11-misc/bbrun/bbrun-1.1-r2.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 Craig Joly <joly@ee.ualberta.ca>
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbrun/bbrun-1.1-r1.ebuild,v 1.2 2001/10/01 00:20:58 lordjoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbrun/bbrun-1.1-r2.ebuild,v 1.1 2001/10/06 10:08:20 azarah Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="blackbox program execution dialog box"
@@ -9,13 +9,13 @@ SRC_URI="http://bbtools.thelinuxcommunity.org/sources/contrib/${P}.tar.gz"
 HOMEPAGE="http://bbtools.thelinuxcommunity.org/contrib.phtml"
 
 DEPEND=">=x11-wm/blackbox-0.61
-        >=x11-libs/gtk+-1.2.10"
+        >=x11-libs/gtk+-1.2.10-r4"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}/bbrun
 	mv Makefile Makefile.orig
-	try sed '/CFLAGS =/ s:$: -I/usr/X11R6/include/gtk-1.2 -I/usr/include/glib-1.2 '"${CFLAGS}"':' Makefile.orig > Makefile
+	try sed '/CFLAGS =/ s:$: -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 '"${CFLAGS}"':' Makefile.orig > Makefile
 }
 
 src_compile() {
@@ -24,14 +24,14 @@ src_compile() {
 }
 
 src_install () {
-	into /usr/X11R6
+	into /usr
 	dobin bbrun/bbrun
 	dodoc README COPYING
 }
 
 pkg_postinst() {
-	cd ${ROOT}usr/X11R6/bin/wm
+	cd ${ROOT}usr/bin/wm
 	if [ ! "`grep bbrun blackbox`" ] ; then
-	sed -e "s/.*blackbox/exec \/usr\/X11R6\/bin\/bbrun \&\n&/" blackbox | cat > blackbox
+	sed -e "s/.*blackbox/exec \/usr\/bin\/bbrun \&\n&/" blackbox | cat > blackbox
 	fi
 }
diff --git a/x11-misc/bbrun/files/digest-bbrun-1.1-r1 b/x11-misc/bbrun/files/digest-bbrun-1.1-r2
index 318980890c4f..318980890c4f 100644
--- a/x11-misc/bbrun/files/digest-bbrun-1.1-r1
+++ b/x11-misc/bbrun/files/digest-bbrun-1.1-r2
diff --git a/x11-misc/bubblemon/bubblemon-1.4.ebuild b/x11-misc/bubblemon/bubblemon-1.4-r1.ebuild
index 5bdef3426cd1..238272e28bd6 100644
--- a/x11-misc/bubblemon/bubblemon-1.4.ebuild
+++ b/x11-misc/bubblemon/bubblemon-1.4-r1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Donny Davies <woodchip@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bubblemon/bubblemon-1.4.ebuild,v 1.6 2001/09/27 16:13:36 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bubblemon/bubblemon-1.4-r1.ebuild,v 1.1 2001/10/06 10:08:20 azarah Exp $
 
 DESCRIPTION="A fun monitoring applet for your desktop, complete with swimming duck"
 HOMEPAGE="http://www.ne.jp/asahi/linux/timecop"
 
 S=${WORKDIR}/${PN}-dockapp-${PV}
 SRC_URI="http://www.ne.jp/asahi/linux/timecop/software/${PN}-dockapp-${PV}.tar.gz"
-DEPEND="virtual/glibc >=x11-libs/gtk+-1.2.8"
+DEPEND="virtual/glibc >=x11-libs/gtk+-1.2.10-r1"
 
 src_compile() {
 
diff --git a/x11-misc/bubblemon/files/digest-bubblemon-1.4 b/x11-misc/bubblemon/files/digest-bubblemon-1.4-r1
index f748191ac9a1..f748191ac9a1 100644
--- a/x11-misc/bubblemon/files/digest-bubblemon-1.4
+++ b/x11-misc/bubblemon/files/digest-bubblemon-1.4-r1
diff --git a/x11-misc/wmfishtime/files/digest-wmfishtime-1.23 b/x11-misc/wmfishtime/files/digest-wmfishtime-1.23-r1
index 810e27e9bbf8..810e27e9bbf8 100644
--- a/x11-misc/wmfishtime/files/digest-wmfishtime-1.23
+++ b/x11-misc/wmfishtime/files/digest-wmfishtime-1.23-r1
diff --git a/x11-misc/wmfishtime/wmfishtime-1.23.ebuild b/x11-misc/wmfishtime/wmfishtime-1.23-r1.ebuild
index 3e35e1a4b306..5f03abd136a6 100644
--- a/x11-misc/wmfishtime/wmfishtime-1.23.ebuild
+++ b/x11-misc/wmfishtime/wmfishtime-1.23-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 Donny Davies <woodchip@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wmfishtime/wmfishtime-1.23.ebuild,v 1.4 2001/09/27 16:16:06 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/wmfishtime/wmfishtime-1.23-r1.ebuild,v 1.1 2001/10/06 10:08:20 azarah Exp $
 
 # to make this work in KDE, run it with the -b option :)
 DESCRIPTION="A fun clock applet for your desktop featuring swimming fish"
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.ne.jp/asahi/linux/timecop"
 
 S=${WORKDIR}/${P}
 SRC_URI="http://www.ne.jp/asahi/linux/timecop/software/${P}.tar.gz"
-DEPEND="virtual/glibc >=x11-libs/gtk+-1.2.8"
+DEPEND="virtual/glibc >=x11-libs/gtk+-1.2.10-r1"
 
 src_compile() {
 
diff --git a/x11-misc/xalf/files/digest-xalf-0.12 b/x11-misc/xalf/files/digest-xalf-0.12-r1
index de80e5cd0129..de80e5cd0129 100644
--- a/x11-misc/xalf/files/digest-xalf-0.12
+++ b/x11-misc/xalf/files/digest-xalf-0.12-r1
diff --git a/x11-misc/xalf/xalf-0.12.ebuild b/x11-misc/xalf/xalf-0.12-r1.ebuild
index fc37a538619e..41dba66bcfb8 100644
--- a/x11-misc/xalf/xalf-0.12.ebuild
+++ b/x11-misc/xalf/xalf-0.12-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Mikael Hallendal <hallski@gentoo.org>
 # Maintainer: Desktop Team
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xalf/xalf-0.12.ebuild,v 1.1 2001/08/22 10:40:33 hallski Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xalf/xalf-0.12-r1.ebuild,v 1.1 2001/10/06 10:08:20 azarah Exp $
 
 A=${P}.tgz
 S=${WORKDIR}/${P}
@@ -10,8 +10,8 @@ DESCRIPTION="X11 Application Launch Feedback"
 SRC_URI="http://www.lysator.liu.se/~astrand/projects/xalf/${A}"
 HOMEPAGE="http://www.lysator.liu.se/~astrand/projects/xalf/"
 
-DEPEND=">=x11-libs/gtk+-1.2.0
-	gnome? ( >=gnome-base/gnome-core-1.2.2.1
+DEPEND=">=x11-libs/gtk+-1.2.10-r4
+	gnome? ( >=gnome-base/gnome-core-1.4.0.4-r1
 	         gnome-base/control-center )"
 
 src_compile() {
@@ -20,9 +20,9 @@ src_compile() {
 
   if [ "`use gnome`" ]
   then
-	myconf="--prefix=/opt/gnome --enable-capplet"
+	myconf="--prefix=/usr --enable-capplet"
   else
-	myconf="--prefix=/usr/X11R6 --disable-capplet"
+	myconf="--prefix=/usr --disable-capplet"
   fi
 
   ./configure --host=${CHOST} ${myconf} || die "Failed to configure package."
@@ -32,11 +32,7 @@ src_compile() {
 
 src_install() {
 
-  if [ -n "`use gnome`" ] ; then
-  	make prefix=${D}/opt/gnome install || die
-  else
-  	make prefix=${D}/usr/X11R6 install || die
-  fi
+  make prefix=${D}/usr install || die
 
   dodoc AUTHORS COPYING ChangeLog README
 }
diff --git a/x11-wm/fvwm/files/digest-fvwm-2.3.32 b/x11-wm/fvwm/files/digest-fvwm-2.3.32
deleted file mode 100644
index 039e618614e8..000000000000
--- a/x11-wm/fvwm/files/digest-fvwm-2.3.32
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b7043ae081e5b945a7387f85fbdff42d fvwm-2.3.32.tar.bz2
diff --git a/x11-wm/fvwm/files/digest-fvwm-2.4.0 b/x11-wm/fvwm/files/digest-fvwm-2.4.0-r1
index 1e039188ca46..1e039188ca46 100644
--- a/x11-wm/fvwm/files/digest-fvwm-2.4.0
+++ b/x11-wm/fvwm/files/digest-fvwm-2.4.0-r1
diff --git a/x11-wm/fvwm/fvwm-2.3.32.ebuild b/x11-wm/fvwm/fvwm-2.3.32.ebuild
deleted file mode 100644
index cc23cb597325..000000000000
--- a/x11-wm/fvwm/fvwm-2.3.32.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Peter Gavin <pete@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.3.32.ebuild,v 1.1 2001/06/04 21:58:46 achim Exp $
-
-#P=
-A=${P}.tar.bz2
-S=${WORKDIR}/${P}
-DESCRIPTION="an extremely powerful ICCCM-compliant multiple virtual desktop window manager"
-SRC_URI="ftp://ftp.fvwm.org/pub/fvwm/version-2/${A}"
-HOMEPAGE="http://www.fvwm.org/"
-
-DEPEND="virtual/glibc
-	>=sys-libs/readline-4.1
-	>=x11-libs/gtk+-1.2.8
-	gnome? ( >=gnome-base/gnome-libs-1.2.8 )"
-
-src_compile() {
-    local myconf
-    if [ -n "$( use gnome )" ]
-    then
-	myconf="--with-gnome"
-    else
-	myconf="--without-gnome"
-    fi
-    try ./configure --prefix=/usr/X11R6 --libexecdir=/usr/X11R6/lib \
-	--host=${CHOST} ${myconf}
-    try make
-}
-
-src_install () {
-
-    try make DESTDIR=${D} install
-    exeinto /usr/X11R6/bin/wm
-    doexe ${FILESDIR}/fvwm
-
-}
diff --git a/x11-wm/fvwm/fvwm-2.4.0.ebuild b/x11-wm/fvwm/fvwm-2.4.0-r1.ebuild
index a8ed7c0eddb5..fac9dee2317e 100644
--- a/x11-wm/fvwm/fvwm-2.4.0.ebuild
+++ b/x11-wm/fvwm/fvwm-2.4.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 Prakash Shetty <crux@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.4.0.ebuild,v 1.4 2001/08/31 03:23:39 pm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.4.0-r1.ebuild,v 1.1 2001/10/06 10:08:20 azarah Exp $
 
 
 S=${WORKDIR}/${P}
@@ -11,9 +11,9 @@ HOMEPAGE="http://www.fvwm.org/"
 
 DEPEND="virtual/glibc
 	>=sys-libs/readline-4.1
-	>=x11-libs/gtk+-1.2.10
+	>=x11-libs/gtk+-1.2.10-r1
 	>=dev-libs/libstroke-0.4
-	gnome? ( >=gnome-base/gnome-libs-1.2.13 )"
+	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 )"
 
 src_compile() {
     local myconf
@@ -23,7 +23,7 @@ src_compile() {
     else
 	myconf="--without-gnome"
     fi
-    try ./configure --prefix=/usr/X11R6 --libexecdir=/usr/X11R6/lib \
+    try ./configure --prefix=/usr --libexecdir=/usr/lib \
 	--mandir=/usr/share/man --infodir=/usr/share/info --host=${CHOST} ${myconf}
     try make
 }
@@ -31,7 +31,7 @@ src_compile() {
 src_install () {
 
     try make DESTDIR=${D} install
-    exeinto /usr/X11R6/bin/wm
+    exeinto /usr/bin/wm
     doexe ${FILESDIR}/fvwm
 
 }
diff --git a/x11-wm/xfce/files/digest-xfce-3.8.3 b/x11-wm/xfce/files/digest-xfce-3.8.3
deleted file mode 100644
index 1e6d508b6814..000000000000
--- a/x11-wm/xfce/files/digest-xfce-3.8.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f708f02e3a0aa290c030980d5f685b40 xfce-3.8.3.tar.gz
diff --git a/x11-wm/xfce/files/digest-xfce-3.8.6 b/x11-wm/xfce/files/digest-xfce-3.8.6
deleted file mode 100644
index 5108f25590a3..000000000000
--- a/x11-wm/xfce/files/digest-xfce-3.8.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5a121cb8cac404a06431f3ae1e0f85b4 xfce-3.8.6.tar.gz
diff --git a/x11-wm/xfce/files/digest-xfce-3.8.7 b/x11-wm/xfce/files/digest-xfce-3.8.7-r1
index 6ce71537574e..6ce71537574e 100644
--- a/x11-wm/xfce/files/digest-xfce-3.8.7
+++ b/x11-wm/xfce/files/digest-xfce-3.8.7-r1
diff --git a/x11-wm/xfce/xfce-3.8.3.ebuild b/x11-wm/xfce/xfce-3.8.3.ebuild
deleted file mode 100644
index 7a8adc979a2e..000000000000
--- a/x11-wm/xfce/xfce-3.8.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Ben Lutgens <ben@sistina.com>
-# /home/cvsroot/gentoo-x86/x11-wm/blackbox/blackbox-0.61.1.ebuild,v 1.1 2001/04/20 18:51:22 drobbins Exp
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/xfce/xfce-3.8.3.ebuild,v 1.4 2001/08/31 03:23:39 pm Exp $
-
- 
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="XFce is a lightweight desktop environment for various UNIX systems."
-SRC_URI="http://prdownloads.sourceforge.net/xfce/${A}"
-HOMEPAGE="http://www.xfce.org/"
-
-DEPEND="virtual/x11
-        >=x11-libs/gtk+-1.2
-	gnome? ( >=media-libs/gdk-pixbuf-0.10 )"
-
-if [ -z "`use gnome`" ]
-then
-    DEPEND="${DEPEND} >=media-libs/imlib-1.9.10"
-fi
-
-src_compile() {
-    local myconf
-    if [ "`use gnome`" ]
-    then
-	myconf="--enable-imlib=no --enable-gdk-pixbuf=/opt/gnome"
-    fi
-    try ./configure --prefix=/usr/X11R6 --mandir=/usr/X11R6/share/man --host=${CHOST} \
-	--with-data-dir=/usr/X11R6/share/xfce --with-conf-dir=/etc/X11/xfce \
-	--with-locale-dir=/usr/X11R6/share/locale ${myconf}
-    try make
-}
-
-src_install () {
-    try make DESTDIR=${D} install
-    dodoc ChangeLog* AUTHORS LICENSE README* TODO*
-    exeinto /usr/X11R6/bin/wm
-    doexe ${FILESDIR}/xfce
-    dodir /etc/skel/.xfce
-}
diff --git a/x11-wm/xfce/xfce-3.8.6.ebuild b/x11-wm/xfce/xfce-3.8.6.ebuild
deleted file mode 100644
index 8cfe67eebe59..000000000000
--- a/x11-wm/xfce/xfce-3.8.6.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Ben Lutgens <ben@sistina.com>
-# /home/cvsroot/gentoo-x86/x11-wm/blackbox/blackbox-0.61.1.ebuild,v 1.1 2001/04/20 18:51:22 drobbins Exp
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/xfce/xfce-3.8.6.ebuild,v 1.3 2001/08/31 03:23:39 pm Exp $
-
- 
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="XFce is a lightweight desktop environment for various UNIX systems."
-SRC_URI="http://prdownloads.sourceforge.net/xfce/${A}"
-HOMEPAGE="http://www.xfce.org/"
-
-DEPEND="virtual/x11
-        >=x11-libs/gtk+-1.2
-	gnome? ( >=media-libs/gdk-pixbuf-0.10 )"
-
-if [ -z "`use gnome`" ]
-then
-    DEPEND="${DEPEND} >=media-libs/imlib-1.9.10"
-fi
-
-src_compile() {
-    local myconf
-    if [ "`use gnome`" ]
-    then
-	myconf="--enable-imlib=no --enable-gdk-pixbuf=/opt/gnome"
-    fi
-    try ./configure --prefix=/usr/X11R6 --mandir=/usr/X11R6/share/man --host=${CHOST} \
-	--with-data-dir=/usr/X11R6/share/xfce --with-conf-dir=/etc/X11/xfce \
-	--with-locale-dir=/usr/X11R6/share/locale ${myconf}
-    try make
-}
-
-src_install () {
-    try make DESTDIR=${D} install
-    dodoc ChangeLog* AUTHORS LICENSE README* TODO*
-    exeinto /usr/X11R6/bin/wm
-    doexe ${FILESDIR}/xfce
-    dodir /etc/skel/.xfce
-}
diff --git a/x11-wm/xfce/xfce-3.8.7.ebuild b/x11-wm/xfce/xfce-3.8.7-r1.ebuild
index b94b1834d6cc..7e6f5b4574be 100644
--- a/x11-wm/xfce/xfce-3.8.7.ebuild
+++ b/x11-wm/xfce/xfce-3.8.7-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 Ben Lutgens <ben@sistina.com>
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/xfce/xfce-3.8.7.ebuild,v 1.4 2001/08/31 03:23:39 pm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xfce/xfce-3.8.7-r1.ebuild,v 1.1 2001/10/06 10:08:20 azarah Exp $
  
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -10,30 +10,30 @@ SRC_URI="http://prdownloads.sourceforge.net/xfce/${A}"
 HOMEPAGE="http://www.xfce.org/"
 
 DEPEND="virtual/x11
-        >=x11-libs/gtk+-1.2
-	gnome? ( >=media-libs/gdk-pixbuf-0.10 )"
+        >=x11-libs/gtk+-1.2.10-r4
+	gnome? ( >=media-libs/gdk-pixbuf-0.11.0-r1 )"
 
 if [ -z "`use gnome`" ]
 then
-    DEPEND="${DEPEND} >=media-libs/imlib-1.9.10"
+    DEPEND="${DEPEND} >=media-libs/imlib-1.9.10-r1"
 fi
 
 src_compile() {
     local myconf
     if [ "`use gnome`" ]
     then
-	myconf="--enable-imlib=no --enable-gdk-pixbuf=/opt/gnome"
+	myconf="--enable-imlib=no --enable-gdk-pixbuf=/usr"
     fi
-    try ./configure --prefix=/usr/X11R6 --mandir=/usr/X11R6/share/man --host=${CHOST} \
-	--with-data-dir=/usr/X11R6/share/xfce --with-conf-dir=/etc/X11/xfce \
-	--with-locale-dir=/usr/X11R6/share/locale ${myconf}
+    try ./configure --prefix=/usr --mandir=/usr/share/man --host=${CHOST} \
+	--with-data-dir=/usr/share/xfce --with-conf-dir=/etc/X11/xfce \
+	--with-locale-dir=/usr/share/locale ${myconf}
     try make
 }
 
 src_install () {
     try make DESTDIR=${D} install
     dodoc ChangeLog* AUTHORS LICENSE README* TODO*
-    exeinto /usr/X11R6/bin/wm
+    exeinto /usr/bin/wm
     doexe ${FILESDIR}/xfce
     dodir /etc/skel/.xfce
 }
author	Martin Schlemmer <azarah@gentoo.org>	2001-10-06 10:08:20 +0000
committer	Martin Schlemmer <azarah@gentoo.org>	2001-10-06 10:08:20 +0000
commit	cf72f61a25d08d0cefe9bb916ec94852bdba6bc9 (patch)
tree	d99b6fb484696c3b6a77fe38b99932a10781cea0
parent	new incoming (diff)
download	gentoo-2-cf72f61a25d08d0cefe9bb916ec94852bdba6bc9.tar.gz gentoo-2-cf72f61a25d08d0cefe9bb916ec94852bdba6bc9.tar.bz2 gentoo-2-cf72f61a25d08d0cefe9bb916ec94852bdba6bc9.zip