The Big Commit. Modifies apps to install into /usr instead of /usr/X11R6. If it breaks, fix it.

8 files changed, 10 insertions, 14 deletions

diff --git a/x11-terms/eterm/eterm-0.8.10.ebuild b/x11-terms/eterm/eterm-0.8.10-r1.ebuild
index f4c322e48fab..1ec253f6a66b 100644
--- a/x11-terms/eterm/eterm-0.8.10.ebuild
+++ b/x11-terms/eterm/eterm-0.8.10-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 Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/eterm/eterm-0.8.10.ebuild,v 1.2 2000/11/02 08:31:54 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/eterm/eterm-0.8.10-r1.ebuild,v 1.1 2001/10/06 15:30:16 danarmak Exp $
 
 P=Eterm-${PV}
 A=${P}.tar.gz
@@ -17,7 +17,7 @@ DEPEND=">=sys-libs/glibc-2.1.3
 src_compile() {
 
     cd ${S}
-    try ./configure --prefix=/usr/X11R6 --host=${CHOST} \
+    try ./configure --prefix=/usr --host=${CHOST} \
 	--with-imlib
     try make
 
diff --git a/x11-terms/eterm/eterm-0.9.ebuild b/x11-terms/eterm/eterm-0.9-r1.ebuild
index 5f7966afa155..48448d6504de 100644
--- a/x11-terms/eterm/eterm-0.9.ebuild
+++ b/x11-terms/eterm/eterm-0.9-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 Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/eterm/eterm-0.9.ebuild,v 1.1 2001/06/22 18:35:17 lamer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/eterm/eterm-0.9-r1.ebuild,v 1.1 2001/10/06 15:30:16 danarmak Exp $
 
 P=Eterm-${PV}
 A=${P}.tar.gz
@@ -17,7 +17,7 @@ DEPEND=">=sys-libs/glibc-2.1.3
 src_compile() {
 
     cd ${S}
-    try ./configure --prefix=/usr/X11R6 --host=${CHOST} \
+    try ./configure --prefix=/usr --host=${CHOST} \
 	--with-imlib
     try make
 
diff --git a/x11-terms/eterm/files/digest-eterm-0.8.10 b/x11-terms/eterm/files/digest-eterm-0.8.10
deleted file mode 100644
index 67bac0a14364..000000000000
--- a/x11-terms/eterm/files/digest-eterm-0.8.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 44b0b498d8186205d0898b266643fbf1 Eterm-0.8.10.tar.gz
diff --git a/x11-terms/eterm/files/digest-eterm-0.9 b/x11-terms/eterm/files/digest-eterm-0.9
deleted file mode 100644
index 4ab5c19be277..000000000000
--- a/x11-terms/eterm/files/digest-eterm-0.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0da2a2c9a5d9e9f698d7f89ccb2f9f38 Eterm-0.9.tar.gz
diff --git a/x11-terms/rxvt/files/digest-rxvt-2.6.3 b/x11-terms/rxvt/files/digest-rxvt-2.6.3
deleted file mode 100644
index 58f94a9ebc89..000000000000
--- a/x11-terms/rxvt/files/digest-rxvt-2.6.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4aae8a7e478cd09d3701faf35c6300c9 rxvt-2.6.3.tar.bz2
diff --git a/x11-terms/rxvt/files/digest-rxvt-2.7.7 b/x11-terms/rxvt/files/digest-rxvt-2.7.7
deleted file mode 100644
index bef12816faa2..000000000000
--- a/x11-terms/rxvt/files/digest-rxvt-2.7.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 aa3ad9d27d6e2d848cbdd6215b613323 rxvt-2.7.7.tar.gz
diff --git a/x11-terms/rxvt/rxvt-2.6.3.ebuild b/x11-terms/rxvt/rxvt-2.6.3-r1.ebuild
index 91fd3d04d505..876e940a8935 100644
--- a/x11-terms/rxvt/rxvt-2.6.3.ebuild
+++ b/x11-terms/rxvt/rxvt-2.6.3-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-terms/rxvt/rxvt-2.6.3.ebuild,v 1.4 2001/06/24 20:16:02 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt/rxvt-2.6.3-r1.ebuild,v 1.1 2001/10/06 15:30:16 danarmak Exp $
 
 A=${P}.tar.bz2
 S=${WORKDIR}/${P}
@@ -13,14 +13,14 @@ DEPEND="virtual/glibc virtual/x11"
 
 src_compile() {
 
-  try ./configure --host=${CHOST} --prefix=/usr/X11R6 --enable-next-scroll \
+  try ./configure --host=${CHOST} --prefix=/usr --enable-next-scroll \
         --enable-transparency --enable-xpm-background --enable-utmp --enable-wtmp
   try make
 }
 
 src_install() {
 
-  try make prefix=${D}/usr/X11R6 install
+  try make prefix=${D}/usr install
   dodoc doc/README* doc/*.html doc/*.txt doc/BUGS doc/FAQ
 
 }
diff --git a/x11-terms/rxvt/rxvt-2.7.7.ebuild b/x11-terms/rxvt/rxvt-2.7.7-r1.ebuild
index 3549f05b92be..364eed050c55 100644
--- a/x11-terms/rxvt/rxvt-2.7.7.ebuild
+++ b/x11-terms/rxvt/rxvt-2.7.7-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-terms/rxvt/rxvt-2.7.7.ebuild,v 1.1 2001/08/09 23:10:56 blocke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt/rxvt-2.7.7-r1.ebuild,v 1.1 2001/10/06 15:30:16 danarmak Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -14,7 +14,7 @@ DEPEND="virtual/glibc virtual/x11"
 
 src_compile() {
 
-  try ./configure --host=${CHOST} --prefix=/usr/X11R6 --enable-next-scroll \
+  try ./configure --host=${CHOST} --prefix=/usr --enable-next-scroll \
         --enable-transparency --enable-xpm-background --enable-utmp --enable-wtmp \
 	--enable-mousewheel --enable-slipwheeling --enable-smart-resize \
 	--enable-menubar --enable-shared --enable-keepscrolling
@@ -24,7 +24,7 @@ src_compile() {
 
 src_install() {
 
-  try make prefix=${D}/usr/X11R6 install
+  try make prefix=${D}/usr install
   dodoc doc/README* doc/*.html doc/*.txt doc/BUGS doc/FAQ
 
 }