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

8 files changed, 11 insertions, 15 deletions

diff --git a/media-libs/SoGtk/SoGtk-20010601.ebuild b/media-libs/SoGtk/SoGtk-20010601-r1.ebuild
index a5692575f17a..61fbe10cc343 100644
--- a/media-libs/SoGtk/SoGtk-20010601.ebuild
+++ b/media-libs/SoGtk/SoGtk-20010601-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 Your Name <your email>
-# $Header: /var/cvsroot/gentoo-x86/media-libs/SoGtk/SoGtk-20010601.ebuild,v 1.3 2001/06/23 21:34:37 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/SoGtk/SoGtk-20010601-r1.ebuild,v 1.1 2001/10/06 15:30:16 danarmak Exp $
 
 
 A=${P}.tar.gz
@@ -21,14 +21,14 @@ src_compile() {
 
     ./bootstrap --add
 
-    try ./configure --prefix=/usr/X11R6 --host=${CHOST} --build=${CHOST}
+    try ./configure --prefix=/usr --host=${CHOST} --build=${CHOST}
     try make
 
 }
 
 src_install () {
     
-    try make prefix=${D}/usr/X11R6 install
+    try make prefix=${D}/usr install
     cd ${S}
     dodoc AUTHORS COPYING ChangeLog* LICENSE* NEWS README*
     docinto txt
diff --git a/media-libs/SoGtk/files/digest-SoGtk-20010601 b/media-libs/SoGtk/files/digest-SoGtk-20010601
deleted file mode 100644
index 82ec1a9223cb..000000000000
--- a/media-libs/SoGtk/files/digest-SoGtk-20010601
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4aee289d80ca35bf91408170c8be4863 SoGtk-20010601.tar.gz
diff --git a/media-libs/SoQt/SoQt-20010601.ebuild b/media-libs/SoQt/SoQt-20010601-r1.ebuild
index 805ba1f5debe..dae600bd8242 100644
--- a/media-libs/SoQt/SoQt-20010601.ebuild
+++ b/media-libs/SoQt/SoQt-20010601-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 Your Name <your email>
-# $Header: /var/cvsroot/gentoo-x86/media-libs/SoQt/SoQt-20010601.ebuild,v 1.2 2001/06/08 01:08:06 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/SoQt/SoQt-20010601-r1.ebuild,v 1.1 2001/10/06 15:30:16 danarmak Exp $
 
 
 A=${P}.tar.gz
@@ -17,7 +17,7 @@ DEPEND="virtual/x11
 
 src_compile() {
 
-    try ./configure --prefix=/usr/X11R6 --host=${CHOST} --build=${CHOST}
+    try ./configure --prefix=/usr --host=${CHOST} --build=${CHOST}
     try make
 
 }
diff --git a/media-libs/SoQt/files/digest-SoQt-20010601 b/media-libs/SoQt/files/digest-SoQt-20010601
deleted file mode 100644
index fa835cc53498..000000000000
--- a/media-libs/SoQt/files/digest-SoQt-20010601
+++ /dev/null
@@ -1 +0,0 @@
-MD5 62c2382154d450379858f299bbfb424d SoQt-20010601.tar.gz
diff --git a/media-libs/coin/coin-20010601.ebuild b/media-libs/coin/coin-20010601-r1.ebuild
index 545ab98f188d..6e0f8618d182 100644
--- a/media-libs/coin/coin-20010601.ebuild
+++ b/media-libs/coin/coin-20010601-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 Your Name <your email>
-# $Header: /var/cvsroot/gentoo-x86/media-libs/coin/coin-20010601.ebuild,v 1.1 2001/06/04 06:41:14 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/coin/coin-20010601-r1.ebuild,v 1.1 2001/10/06 15:30:16 danarmak Exp $
 
 
 A=Coin-${PV}.tar.gz
@@ -19,14 +19,14 @@ src_compile() {
     then
       myconf="--without-x"
     fi
-    try ./configure --prefix=/usr/X11R6 --host=${CHOST} --build=${CHOST} $myconf
+    try ./configure --prefix=/usr --host=${CHOST} --build=${CHOST} $myconf
     try make
 
 }
 
 src_install () {
 
-    try make prefix=${D}/usr/X11R6 install
+    try make prefix=${D}/usr install
     dodoc AUTHORS COPYING ChangeLog* HACKING LICENSE* NEWS README*
     docinto txt
     dodoc docs/*.txt docs/coin.doxygen docs/whitepapers/*.txt
diff --git a/media-libs/coin/files/digest-coin-20010601 b/media-libs/coin/files/digest-coin-20010601
deleted file mode 100644
index d4b7cc03fa09..000000000000
--- a/media-libs/coin/files/digest-coin-20010601
+++ /dev/null
@@ -1 +0,0 @@
-MD5 46a639d2562c91c669044c29063f4d27 Coin-20010601.tar.gz
diff --git a/media-libs/fnlib/files/digest-fnlib-0.5 b/media-libs/fnlib/files/digest-fnlib-0.5
deleted file mode 100644
index 2de8efb8069b..000000000000
--- a/media-libs/fnlib/files/digest-fnlib-0.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 42093ed5b684da01e7a674b2adac52c7 fnlib-0.5.tar.gz
diff --git a/media-libs/fnlib/fnlib-0.5.ebuild b/media-libs/fnlib/fnlib-0.5-r1.ebuild
index 62875ba182d9..b4bfce750981 100644
--- a/media-libs/fnlib/fnlib-0.5.ebuild
+++ b/media-libs/fnlib/fnlib-0.5-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/media-libs/fnlib/fnlib-0.5.ebuild,v 1.7 2001/06/04 03:33:03 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fnlib/fnlib-0.5-r1.ebuild,v 1.1 2001/10/06 15:30:16 danarmak Exp $
 
 P=fnlib-0.5
 A=${P}.tar.gz
@@ -13,13 +13,13 @@ DEPEND="virtual/glibc >=media-libs/imlib-1.9.8.1"
 
 src_compile() {
 
-  try ./configure --host=${CHOST} --prefix=/usr/X11R6 --sysconfdir=/etc/X11/fnlib
+  try ./configure --host=${CHOST} --prefix=/usr --sysconfdir=/etc/fnlib
   try make
 }
 
 src_install() {
   
-  try make prefix=${D}/usr/X11R6 sysconfdir=${D}/etc/X11/fnlib install
+  try make prefix=${D}/usr sysconfdir=${D}/etc/fnlib install
   dodoc AUTHORS ChangeLog COPYING* HACKING NEWS README
   dodoc doc/fontinfo.README