Removed nonexistent LICENSE file from dodoc, and relocated html documents to the docs directory.

5 files changed, 31 insertions, 55 deletions

diff --git a/x11-wm/xfce/ChangeLog b/x11-wm/xfce/ChangeLog
index 43a89957eaf4..afd7be45d539 100644
--- a/x11-wm/xfce/ChangeLog
+++ b/x11-wm/xfce/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-wm/xfce
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/xfce/ChangeLog,v 1.3 2002/03/12 12:54:06 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xfce/ChangeLog,v 1.4 2002/03/18 04:59:03 seemant Exp $
+
+*xfce-3.8.11-r3 (17 Mar 2002)
+
+  17 Mar 2002; Seemant Kulleen <seemant@gentoo.org> xfce-3.8.11-r3 :
+  The LICENSE file is no longer distributed with the source, so I removed the
+  entry for that from the dodoc statement.  While I was at it, I decided to
+  have the `make install` step which installs the html documentation, place 
+  the html stuff into /usr/share/doc/${PF} where all the other docs are, instead
+  of /usr/share/xfce/doc where they are installed by default.
 
 *xfce-3.8.11-r2 (12 Mar 2002)
 
diff --git a/x11-wm/xfce/files/digest-xfce-3.8.11-r1 b/x11-wm/xfce/files/digest-xfce-3.8.11-r1
deleted file mode 100644
index 950997797ba6..000000000000
--- a/x11-wm/xfce/files/digest-xfce-3.8.11-r1
+++ /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 b/x11-wm/xfce/files/digest-xfce-3.8.11-r3
index 950997797ba6..950997797ba6 100644
--- a/x11-wm/xfce/files/digest-xfce-3.8.11
+++ b/x11-wm/xfce/files/digest-xfce-3.8.11-r3
diff --git a/x11-wm/xfce/xfce-3.8.11-r1.ebuild b/x11-wm/xfce/xfce-3.8.11-r3.ebuild
index 44ba60c7c366..e4b6d6d59d67 100644
--- a/x11-wm/xfce/xfce-3.8.11-r1.ebuild
+++ b/x11-wm/xfce/xfce-3.8.11-r3.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.11-r1.ebuild,v 1.1 2002/02/14 22:13:04 danarmak Exp $
+# $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."
@@ -10,36 +10,45 @@ HOMEPAGE="http://www.xfce.org/"
 
 DEPEND="virtual/x11
         >=x11-libs/gtk+-1.2.10-r4
-	gnome? ( >=media-libs/gdk-pixbuf-0.11.0-r1 )"
+	gnome? ( >=media-libs/gdk-pixbuf-0.11.0-r1 )
+	nls? ( sys-devel/gettext )"
 
-if [ -z "`use gnome`" ]
-then
-    DEPEND="${DEPEND} >=media-libs/imlib-1.9.10-r1"
-fi
+    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="--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 				\
-		--with-locale-dir=/usr/share/locale ${myconf}
-    try make
+		--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 () {
-    try make DESTDIR=${D} install
-    dodoc ChangeLog* AUTHORS LICENSE README* TODO*
+    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.11.ebuild b/x11-wm/xfce/xfce-3.8.11.ebuild
deleted file mode 100644
index 01b946139f2e..000000000000
--- a/x11-wm/xfce/xfce-3.8.11.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>
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/xfce/xfce-3.8.11.ebuild,v 1.1 2001/11/02 11:52:21 achim 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 )"
-
-if [ -z "`use gnome`" ]
-then
-    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=/usr"
-    fi
-
-    ./configure --host=${CHOST}						\
-		--prefix=/usr						\
-	 	--mandir=/usr/share/man					\
-		--with-data-dir=/usr/share/xfce				\
-		--with-conf-dir=/etc/xfce 				\
-		--with-locale-dir=/usr/share/locale ${myconf}
-    try make
-}
-
-src_install () {
-    try make DESTDIR=${D} install
-    dodoc ChangeLog* AUTHORS LICENSE README* TODO*
-    dodir /etc/skel/.xfce
-}