partual gtk+ dep update / move to /usr

6 files changed, 9 insertions, 93 deletions

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
 }