move enlightenment to /usr

5 files changed, 41 insertions, 44 deletions

diff --git a/x11-wm/enlightenment/enlightenment-0.16.5-r1.ebuild b/x11-wm/enlightenment/enlightenment-0.16.5-r1.ebuild
deleted file mode 100644
index a891732d59f7..000000000000
--- a/x11-wm/enlightenment/enlightenment-0.16.5-r1.ebuild
+++ /dev/null
@@ -1,40 +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/enlightenment/enlightenment-0.16.5-r1.ebuild,v 1.6 2001/08/11 05:32:14 drobbins Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="Enlightenment Window Manager"
-SRC_URI="ftp://ftp.enlightenment.org/enlightenment/enlightenment/"${A}
-HOMEPAGE="http://www.enlightenment.org/"
-
-DEPEND=">=media-libs/fnlib-0.5
-	>=media-sound/esound-0.2.19
-	=media-libs/freetype-1.3.1-r2
-	>=gnome-base/libghttp-1.0.7"
-
-
-src_compile() {
-  
-  try CFLAGS="${CFLAGS} -I/opt/gnome/include" LDFLAGS="-L/opt/gnome/lib" \
-	./configure --host=${CHOST} --prefix=/usr/X11R6
-  try make
-}
-
-src_install() {
-  try make prefix=${D}/usr/X11R6 localedir=${D}/usr/X11R6/enlightenment/locale \
-	gnulocaledir=${D}/usr/X11R6/enlightenment/locale install
-  insinto /etc/env.d
-  doins ${FILESDIR}/90enlightenment
-  exeinto /usr/X11R6/bin/wm
-  doexe ${FILESDIR}/enlightenment
-  dodoc AUTHORS ChangeLog COPYING NEWS README 
-  docinto sample-scripts
-  dosym /usr/X11R6/enlightenment/bin/enlightenment /usr/X11R6/bin/
-  dosym /usr/X11R6/enlightenment/bin/enlightenment.install /usr/X11R6/bin/
-  dodoc sample-scripts/*
-}
-
-
-
diff --git a/x11-wm/enlightenment/enlightenment-0.16.5-r2.ebuild b/x11-wm/enlightenment/enlightenment-0.16.5-r2.ebuild
new file mode 100644
index 000000000000..47eb69146bb4
--- /dev/null
+++ b/x11-wm/enlightenment/enlightenment-0.16.5-r2.ebuild
@@ -0,0 +1,41 @@
+# 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/enlightenment/enlightenment-0.16.5-r2.ebuild,v 1.1 2001/10/08 22:49:41 azarah Exp $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="Enlightenment Window Manager"
+SRC_URI="ftp://ftp.enlightenment.org/enlightenment/enlightenment/${P}.tar.gz"
+HOMEPAGE="http://www.enlightenment.org/"
+
+DEPEND=">=media-libs/fnlib-0.5
+	>=media-sound/esound-0.2.19
+	~media-libs/freetype-1.3.1-r3
+	>=gnome-base/libghttp-1.0.9-r1"
+
+
+src_compile() {
+  
+	./configure --host=${CHOST} 				\
+		    --enable-fsstd				\
+		    --prefix=/usr				\
+		    --mandir=/usr/share/man			\
+		    --infodir=/usr/share/info || die
+	emake || die
+}
+
+src_install() {
+
+	make prefix=${D}/usr 				\
+		localedir=${D}/usr/share/locale		\
+		gnulocaledir=${D}/usr/share/locale	\
+		install || die
+  
+	doman man/enlightenment.1
+	dodoc ABOUT-NLS AUTHORS ChangeLog COPYING FAQ INSTALL NEWS README
+	docinto sample-scripts
+	dodoc sample-scripts/*
+}
+
+
+
diff --git a/x11-wm/enlightenment/files/90enlightenment b/x11-wm/enlightenment/files/90enlightenment
deleted file mode 100644
index d7a2b197b02d..000000000000
--- a/x11-wm/enlightenment/files/90enlightenment
+++ /dev/null
@@ -1,2 +0,0 @@
-PATH=/usr/X11R6/enlightenment/bin
-ROOTPATH=/usr/X11R6/enlightenment/bin
diff --git a/x11-wm/enlightenment/files/digest-enlightenment-0.16.5-r1 b/x11-wm/enlightenment/files/digest-enlightenment-0.16.5-r2
index 96494ff73e9c..96494ff73e9c 100644
--- a/x11-wm/enlightenment/files/digest-enlightenment-0.16.5-r1
+++ b/x11-wm/enlightenment/files/digest-enlightenment-0.16.5-r2
diff --git a/x11-wm/enlightenment/files/enlightenment b/x11-wm/enlightenment/files/enlightenment
deleted file mode 100755
index 7be70796db51..000000000000
--- a/x11-wm/enlightenment/files/enlightenment
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-/usr/X11R6/enlightenment/bin/enlightenment