7 files changed, 8 insertions, 175 deletions
diff --git a/x11-wm/xfce/files/digest-xfce-3.8.11-r2 b/x11-wm/xfce/files/digest-xfce-3.8.11-r2
deleted file mode 100644
index 950997797ba6..000000000000
--- a/x11-wm/xfce/files/digest-xfce-3.8.11-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 def34ac608e1c956f59cae6f1a75af6d xfce-3.8.11.tar.gz 3993721
diff --git a/x11-wm/xfce/files/digest-xfce-3.8.11-r3 b/x11-wm/xfce/files/digest-xfce-3.8.11-r3
deleted file mode 100644
index 950997797ba6..000000000000
--- a/x11-wm/xfce/files/digest-xfce-3.8.11-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 def34ac608e1c956f59cae6f1a75af6d xfce-3.8.11.tar.gz 3993721
diff --git a/x11-wm/xfce/files/digest-xfce-3.8.14 b/x11-wm/xfce/files/digest-xfce-3.8.14
deleted file mode 100644
index c93a3fd12f1d..000000000000
--- a/x11-wm/xfce/files/digest-xfce-3.8.14
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e92f08aa1aa404d3246cfb21cc9a237e xfce-3.8.14.tar.gz 4575761
diff --git a/x11-wm/xfce/xfce-3.8.11-r2.ebuild b/x11-wm/xfce/xfce-3.8.11-r2.ebuild
deleted file mode 100644
index e87489622bec..000000000000
--- a/x11-wm/xfce/xfce-3.8.11-r2.ebuild
+++ /dev/null
@@ -1,48 +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>
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/xfce/xfce-3.8.11-r2.ebuild,v 1.1 2002/03/12 12:54:06 seemant Exp $
- 
-S=${WORKDIR}/${P}
-DESCRIPTION="XFce is a lightweight desktop environment for various UNIX systems."
-SRC_URI="http://prdownloads.sourceforge.net/xfce/${P}.tar.gz"
-HOMEPAGE="http://www.xfce.org/"
-
-DEPEND="virtual/x11
-        >=x11-libs/gtk+-1.2.10-r4
-	gnome? ( >=media-libs/gdk-pixbuf-0.11.0-r1 )
-	nls? ( sys-devel/gettext )"
-
-    use gnome || DEPEND="${DEPEND} >=media-libs/imlib-1.9.10-r1"
-
-src_compile() {
-    local myconf
-
-    if [ "`use gnome`" ]
-    then
-		myconf="--enable-imlib=no --enable-gdk-pixbuf=/usr"
-		myconf="${myconf} --enable-gdm"
-    fi
-	
-	use nls || myconf="${myconf} --disable-nls"
-
-    ./configure --host=${CHOST}						\
-		--prefix=/usr						\
-	 	--mandir=/usr/share/man					\
-		--with-data-dir=/usr/share/xfce				\
-		--with-conf-dir=/etc/xfce 				\
-		--enable-xft						\
-		--with-locale-dir=/usr/share/locale \
-		${myconf} || die
-    emake || die
-}
-
-src_install () {
-    try make DESTDIR=${D} install
-    dodoc ChangeLog* AUTHORS LICENSE README* TODO*
-    dodir /etc/skel/.xfce
-    
-    exeinto /etc/X11/Sessions
-    doexe $FILESDIR/xfce
-    
-}
diff --git a/x11-wm/xfce/xfce-3.8.11-r3.ebuild b/x11-wm/xfce/xfce-3.8.11-r3.ebuild
deleted file mode 100644
index e4b6d6d59d67..000000000000
--- a/x11-wm/xfce/xfce-3.8.11-r3.ebuild
+++ /dev/null
@@ -1,54 +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>
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/xfce/xfce-3.8.11-r3.ebuild,v 1.1 2002/03/18 04:59:03 seemant Exp $
- 
-S=${WORKDIR}/${P}
-DESCRIPTION="XFce is a lightweight desktop environment for various UNIX systems."
-SRC_URI="http://prdownloads.sourceforge.net/xfce/${P}.tar.gz"
-HOMEPAGE="http://www.xfce.org/"
-
-DEPEND="virtual/x11
-        >=x11-libs/gtk+-1.2.10-r4
-	gnome? ( >=media-libs/gdk-pixbuf-0.11.0-r1 )
-	nls? ( sys-devel/gettext )"
-
-    use gnome || DEPEND="${DEPEND} >=media-libs/imlib-1.9.10-r1"
-
-src_compile() {
-	cd ${S}
-    local myconf
-
-    if [ "`use gnome`" ]
-    then
-		myconf="--enable-imlib=no --enable-gdk-pixbuf=/usr"
-		myconf="${myconf} --enable-gdm"
-    fi
-	
-	use nls || myconf="${myconf} --disable-nls"
-
-    ./configure --host=${CHOST}						\
-		--prefix=/usr						\
-	 	--mandir=/usr/share/man					\
-		--with-data-dir=/usr/share/xfce				\
-		--with-conf-dir=/etc/xfce 				\
-		--enable-xft						\
-		--with-locale-dir=/usr/share/locale \
-		${myconf} || die
-	
-	cd docs/
-	cp Makefile Makefile.orig
-	cat Makefile.orig | sed "s:/usr/share/xfce:/usr/share/doc/${PF}:" > Makefile
-	cd ..
-	
-    emake || die
-}
-
-src_install () {
-    make DESTDIR=${D} install || die
-    dodoc ChangeLog* AUTHORS README* TODO*
-    dodir /etc/skel/.xfce
-    
-    exeinto /etc/X11/Sessions
-    doexe $FILESDIR/xfce
-}
diff --git a/x11-wm/xfce/xfce-3.8.14.ebuild b/x11-wm/xfce/xfce-3.8.14.ebuild
deleted file mode 100644
index e6fb3ba4a7d6..000000000000
--- a/x11-wm/xfce/xfce-3.8.14.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2002 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.14.ebuild,v 1.3 2002/04/27 23:34:21 bangert Exp $
- 
-S=${WORKDIR}/${P}
-DESCRIPTION="XFce is a lightweight desktop environment for various UNIX systems."
-SRC_URI="http://prdownloads.sourceforge.net/xfce/${P}.tar.gz"
-HOMEPAGE="http://www.xfce.org/"
-
-DEPEND="virtual/x11
-	>=x11-libs/gtk+-1.2.10-r4
-	gnome? ( dev-libs/libxml2 )
-	gtk? ( >=media-libs/gdk-pixbuf-0.11.0-r1 )
-	arts? ( kde-base/kdelibs )
-	nls? ( sys-devel/gettext )"
-
-	use gtk || DEPEND="${DEPEND} >=media-libs/imlib-1.9.10-r1"
-RDEPEND=""
-
-src_compile() {
-	local myconf
-
-	use gtk && myconf="--enable-imlib=no --enable-gdk-pixbuf=/usr"
-
-	if [ "`use gnome`" ]
-	then
-		myconf="${myconf} --enable-gdm"
-		myconf="${myconf} --enable-libxml2"
-	fi
-	
-	use nls || myconf="${myconf} --disable-nls"
-	use arts && myconf="${myconf} --enable-arts"
-
-	./configure --host=${CHOST}						\
-		--prefix=/usr						\
-	 	--mandir=/usr/share/man					\
-		--with-data-dir=/usr/share/xfce				\
-		--with-conf-dir=/etc/xfce 				\
-		--enable-xft						\
-		--with-locale-dir=/usr/share/locale \
-		${myconf} || die
-
-	cd docs
-	cp Makefile Makefile.orig
-	sed "s:/usr/share/xfce:/usr/share/doc/${PF}:" Makefile.orig > Makefile
-	cd ..
-
-	emake || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-	dodoc ChangeLog* AUTHORS LICENSE README* TODO*
-	dodir /etc/skel/.xfce
-
-	exeinto /etc/X11/Sessions
-	doexe $FILESDIR/xfce
-}
diff --git a/x11-wm/xfce/xfce-3.8.16.ebuild b/x11-wm/xfce/xfce-3.8.16.ebuild
index 55a9eaa87618..89251cddfc61 100644
--- a/x11-wm/xfce/xfce-3.8.16.ebuild
+++ b/x11-wm/xfce/xfce-3.8.16.ebuild
@@ -1,7 +1,6 @@
 # Copyright 1999-2002 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.16.ebuild,v 1.2 2002/04/27 23:34:21 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xfce/xfce-3.8.16.ebuild,v 1.3 2002/04/29 21:10:22 drobbins Exp $
  
 S=${WORKDIR}/${P}
 DESCRIPTION="XFce is a lightweight desktop environment for various UNIX systems."
@@ -11,11 +10,9 @@ HOMEPAGE="http://www.xfce.org/"
 DEPEND="virtual/x11
 	>=x11-libs/gtk+-1.2.10-r4
 	gnome? ( dev-libs/libxml2 )
-	gtk? ( >=media-libs/gdk-pixbuf-0.11.0-r1 )
+	gtk? ( >=media-libs/gdk-pixbuf-0.11.0-r1 >=media-libs/imlib-1.9.10-r1 )
 	arts? ( kde-base/kdelibs )
 	nls? ( sys-devel/gettext )"
-
-	use gtk || DEPEND="${DEPEND} >=media-libs/imlib-1.9.10-r1"
 RDEPEND=""
 
 src_compile() {
@@ -32,12 +29,12 @@ src_compile() {
 	use nls || myconf="${myconf} --disable-nls"
 	use arts && myconf="${myconf} --enable-arts"
 
-	./configure --host=${CHOST}						\
-		--prefix=/usr						\
-	 	--mandir=/usr/share/man					\
-		--with-data-dir=/usr/share/xfce				\
-		--with-conf-dir=/etc/xfce 				\
-		--enable-xft						\
+	./configure --host=${CHOST} \
+		--prefix=/usr \
+	 	--mandir=/usr/share/man \
+		--with-data-dir=/usr/share/xfce \
+		--with-conf-dir=/etc/xfce \
+		--enable-xft \
 		--with-locale-dir=/usr/share/locale \
 		${myconf} || die