move dox bin to edox since the dox package uses /usr/bin/dox

2 files changed, 60 insertions, 1 deletions

diff --git a/x11-wm/enlightenment/enlightenment-0.16.6.ebuild b/x11-wm/enlightenment/enlightenment-0.16.6.ebuild
index a4bb4abf6b6b..6bd82352eb24 100644
--- a/x11-wm/enlightenment/enlightenment-0.16.6.ebuild
+++ b/x11-wm/enlightenment/enlightenment-0.16.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/enlightenment/enlightenment-0.16.6.ebuild,v 1.6 2003/11/12 16:24:02 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/enlightenment/enlightenment-0.16.6.ebuild,v 1.7 2003/12/11 15:41:55 vapier Exp $
 
 DESCRIPTION="Enlightenment Window Manager"
 HOMEPAGE="http://www.enlightenment.org/"
@@ -24,6 +24,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${PV}-kde-menu.patch
+	epatch ${FILESDIR}/${PV}-edox.patch
 }
 
 src_compile() {
@@ -48,6 +49,7 @@ src_compile() {
 src_install() {
 	export USER=root
 	emake install DESTDIR=${D} || die
+	mv ${D}/usr/bin/{,e}dox
 	exeinto /etc/X11/Sessions
 	doexe ${FILESDIR}/enlightenment
 
diff --git a/x11-wm/enlightenment/files/0.16.6-edox.patch b/x11-wm/enlightenment/files/0.16.6-edox.patch
new file mode 100644
index 000000000000..eb6dfcb2ad75
--- /dev/null
+++ b/x11-wm/enlightenment/files/0.16.6-edox.patch
@@ -0,0 +1,57 @@
+diff -ur enlightenment-0.16.6.orig/src/main.c enlightenment-0.16.6/src/main.c
+--- enlightenment-0.16.6.orig/src/main.c	2003-12-11 10:31:21.860105832 -0500
++++ enlightenment-0.16.6/src/main.c	2003-12-11 10:31:31.081703936 -0500
+@@ -33,7 +33,7 @@
+    if (fork())
+       EDBUG_RETURN_;
+ 
+-   Esnprintf(file, sizeof(file), "exec %s/dox %s/E-docs", ENLIGHTENMENT_BIN,
++   Esnprintf(file, sizeof(file), "exec %s/edox %s/E-docs", ENLIGHTENMENT_BIN,
+ 	     ENLIGHTENMENT_ROOT);
+    execl(usershell(getuid()), usershell(getuid()), "-c", (char *)file, NULL);
+    exit(0);
+diff -ur enlightenment-0.16.6.orig/src/misc.c enlightenment-0.16.6/src/misc.c
+--- enlightenment-0.16.6.orig/src/misc.c	2003-12-11 10:31:21.860105832 -0500
++++ enlightenment-0.16.6/src/misc.c	2003-12-11 10:31:38.475579896 -0500
+@@ -38,7 +38,7 @@
+    char                s[1024];
+    char               *bins[3] =
+ #ifndef __EMX__
+-   { "dox", "eesh", "epp" };
++   { "edox", "eesh", "epp" };
+ 
+ #else
+    { "dox.exe", "eesh.exe", "epp.exe" };
+@@ -74,14 +74,14 @@
+ 	  {
+ 	     Alert(_
+ 		   ("!!!!!!!! ERROR ERROR ERROR ERROR !!!!!!!!\n" "\n"
+-		    "Enlightenment's dox executable is not able to be executed:\n"
++		    "Enlightenment's edox executable is not able to be executed:\n"
+ 		    "\n" "%s\n"
+ 		    "This is a fatal error and Enlightenment will cease to run.\n"
+-		    "Please rectify this situation and ensure dox is installed\n"
++		    "Please rectify this situation and ensure edox is installed\n"
+ 		    "correctly.\n"), s);
+ 	     EExit(NULL);
+ 	  }
+-	Esnprintf(s, sizeof(s), "%s/dox", ENLIGHTENMENT_BIN);
++	Esnprintf(s, sizeof(s), "%s/edox", ENLIGHTENMENT_BIN);
+      }
+    for (i = 0; i < 3; i++)
+      {
+diff -ur enlightenment-0.16.6.orig/src/themes/configs/menus.cfg enlightenment-0.16.6/src/themes/configs/menus.cfg
+--- enlightenment-0.16.6.orig/src/themes/configs/menus.cfg	2003-12-11 10:31:21.922096408 -0500
++++ enlightenment-0.16.6/src/themes/configs/menus.cfg	2003-12-11 10:31:49.277937688 -0500
+@@ -109,9 +109,9 @@
+ ADD_MENU_SUBMENU_TEXT_ITEM("Settings",        "CONFIG_SUBMENU")
+ ADD_MENU_SUBMENU_TEXT_ITEM("Themes",          "THEMES_SUBMENU")
+ ADD_MENU_SUBMENU_TEXT_ITEM("Maintenance",     "MAINT_SUBMENU")
+-ADD_MENU_TEXT_ITEM("Help",                 __A_EXEC, ENLIGHTENMENT_BIN"/dox" $EROOT"/E-docs")
++ADD_MENU_TEXT_ITEM("Help",                 __A_EXEC, ENLIGHTENMENT_BIN"/edox" $EROOT"/E-docs")
+ ADD_MENU_TEXT_ITEM("About Enlightenment",  __A_ABOUT, "")
+-ADD_MENU_TEXT_ITEM("About this theme",     __A_EXEC, ENLIGHTENMENT_BIN"/dox" $ETHEME"/ABOUT")
++ADD_MENU_TEXT_ITEM("About this theme",     __A_EXEC, ENLIGHTENMENT_BIN"/edox" $ETHEME"/ABOUT")
+ ADD_MENU_TEXT_ITEM("Restart Enlightenment",__A_EXIT, "restart")
+ ADD_MENU_TEXT_ITEM("Log Out",              __A_EXIT, "logout")
+ END_MENU