move sawfish to /usr

4 files changed, 11 insertions, 85 deletions

diff --git a/x11-wm/sawfish/files/digest-sawfish-0.38 b/x11-wm/sawfish/files/digest-sawfish-0.38
deleted file mode 100644
index 2c1e40a9024f..000000000000
--- a/x11-wm/sawfish/files/digest-sawfish-0.38
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f9da1e553d427f61c36e850aa7cf1b7b sawfish-0.38.tar.gz
diff --git a/x11-wm/sawfish/files/digest-sawfish-1.0 b/x11-wm/sawfish/files/digest-sawfish-1.0-r1
index 6eaf123c18d7..6eaf123c18d7 100644
--- a/x11-wm/sawfish/files/digest-sawfish-1.0
+++ b/x11-wm/sawfish/files/digest-sawfish-1.0-r1
diff --git a/x11-wm/sawfish/sawfish-0.38.ebuild b/x11-wm/sawfish/sawfish-0.38.ebuild
deleted file mode 100644
index 062b2b31ed2e..000000000000
--- a/x11-wm/sawfish/sawfish-0.38.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 Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/sawfish-0.38.ebuild,v 1.6 2001/09/30 12:24:09 azarah Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="Extensible window manager using a Lisp-based scripting language"
-SRC_URI="ftp://sawmill.sourceforge.net/pub/sawmill/"${A}
-HOMEPAGE="http://sawmill.sourceforge.net/"
-
-DEPEND=">=dev-libs/rep-gtk-0.15-r1
-        >=dev-libs/librep-0.13.6
-	>=media-libs/imlib-1.9.10
-	esd? ( >=media-sound/esound-0.2.22 )
-        readline? ( >=sys-libs/readline-4.1 )
-        nls? ( sys-devel/gettext )
-	gnome? ( >=media-libs/gdk-pixbuf-0.11
-                 >=gnome-base/gnome-core-1.4.0 )"
-
-RDEPEND=">=dev-libs/rep-gtk-0.15-r1
-        >=dev-libs/librep-0.13.6
-        >=x11-libs/gtk+-1.2.10
-	>=media-libs/imlib-1.9.10
-	esd? ( >=media-sound/esound-0.2.22 )
-	gnome? ( >=media-libs/gdk-pixbuf-0.11
-                 >=gnome-base/gnome-core-1.4.0 )"
-
-src_compile() {
-
-  	local myconf
-        if [ "`use esd`" ]
-        then
-          myconf="--with-esd"
-        else
-          myconf="--without-esd"
-        fi
-        if [ "`use gnome`" ]
-        then
-          myconf="${myconf} --with-gnome-prefix=/opt/gnome --enable-gnome-widgets --enable-capplet"
-        else
-          myconf="${myconf} --disable-gnome-widgets --disable-capplet --without-gdk-pixbuf"
-        fi
-        if [ "`use readline`" ]
-        then
-          myconf="${myconf} --with-readline"
-        else
-          myconf="${myconf} --without-readline"
-        fi
-        if [ -z "`use nls`" ]
-        then
-          myconf="${myconf} --disable-linguas"
-        fi
-
- 	try ./configure --host=${CHOST} --prefix=/usr/X11R6 --infodir=/usr/X11R6/info --libexecdir=/usr/X11R6/lib --with-audiofile ${myconf}
-
-	#pmake doesn't work, stick with make
-	try make
-}
-
-src_install() {
-
-  try make DESTDIR=${D} install
-  dodoc AUTHORS BUGS COPYING ChangeLog DOC FAQ NEWS README THANKS TODO
-
-  # Add to Gnome CC's Window Manager list
-  insinto ${GNOME_PATH}/share/gnome/wm-properties
-  doins ${FILESDIR}/Sawfish.desktop
-      
-}
-
-
-
diff --git a/x11-wm/sawfish/sawfish-1.0.ebuild b/x11-wm/sawfish/sawfish-1.0-r1.ebuild
index 0ac1c428e52c..29528316152c 100644
--- a/x11-wm/sawfish/sawfish-1.0.ebuild
+++ b/x11-wm/sawfish/sawfish-1.0-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/sawfish-1.0.ebuild,v 1.4 2001/09/29 17:29:10 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/sawfish-1.0-r1.ebuild,v 1.1 2001/10/05 23:42:41 azarah Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -11,20 +11,20 @@ HOMEPAGE="http://sawmill.sourceforge.net/"
 
 DEPEND=">=dev-libs/rep-gtk-0.15-r1
         >=dev-libs/librep-0.14
-	>=media-libs/imlib-1.9.10
+	>=media-libs/imlib-1.9.10-r1
 	esd? ( >=media-sound/esound-0.2.22 )
         readline? ( >=sys-libs/readline-4.1 )
         nls? ( sys-devel/gettext )
-	gnome? ( >=media-libs/gdk-pixbuf-0.11
-                 >=gnome-base/gnome-core-1.4.0 )"
+	gnome? ( >=media-libs/gdk-pixbuf-0.11.0-r1
+                 >=gnome-base/gnome-core-1.4.0.4-r1 )"
 
 RDEPEND=">=dev-libs/rep-gtk-0.15-r1
         >=dev-libs/librep-0.14
-        >=x11-libs/gtk+-1.2.10
-	>=media-libs/imlib-1.9.10
+        >=x11-libs/gtk+-1.2.10-r4
+	>=media-libs/imlib-1.9.10-r1
 	esd? ( >=media-sound/esound-0.2.22 )
-	gnome? ( >=media-libs/gdk-pixbuf-0.11
-                 >=gnome-base/gnome-core-1.4.0 )"
+	gnome? ( >=media-libs/gdk-pixbuf-0.11.0-r1
+                 >=gnome-base/gnome-core-1.4.0.4-r1 )"
 
 src_unpack() {
         unpack ${A}
@@ -45,7 +45,7 @@ src_compile() {
         fi
         if [ "`use gnome`" ]
         then
-          myconf="${myconf} --with-gnome-prefix=/opt/gnome --enable-gnome-widgets --enable-capplet"
+          myconf="${myconf} --with-gnome-prefix=/usr --enable-gnome-widgets --enable-capplet"
         else
           myconf="${myconf} --disable-gnome-widgets --disable-capplet --without-gdk-pixbuf"
         fi
@@ -60,7 +60,7 @@ src_compile() {
           myconf="${myconf} --disable-linguas"
         fi
 
- 	try ./configure --host=${CHOST} --prefix=/usr/X11R6 --infodir=/usr/X11R6/info --libexecdir=/usr/X11R6/lib --with-audiofile ${myconf}
+ 	try ./configure --host=${CHOST} --prefix=/usr --infodir=/usr/share/info --libexecdir=/usr/lib --with-audiofile ${myconf}
 
 	#pmake doesn't work, stick with make
 	try make
@@ -72,7 +72,7 @@ src_install() {
   dodoc AUTHORS BUGS COPYING ChangeLog DOC FAQ NEWS README THANKS TODO
 
   # Add to Gnome CC's Window Manager list
-  insinto ${GNOME_PATH}/share/gnome/wm-properties
+  insinto /usr/share/gnome/wm-properties
   doins ${FILESDIR}/Sawfish.desktop
 
 }