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

6 files changed, 12 insertions, 15 deletions

diff --git a/net-www/konqueror-embedded/files/digest-konqueror-embedded-20010207 b/net-www/konqueror-embedded/files/digest-konqueror-embedded-20010207
deleted file mode 100644
index 97e5aeb61b8d..000000000000
--- a/net-www/konqueror-embedded/files/digest-konqueror-embedded-20010207
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cf8b7ec11b6a6631b9ebc1d07a0a8ba7 konqueror-embedded-snapshot.tar.gz
diff --git a/net-www/konqueror-embedded/konqueror-embedded-20010207.ebuild b/net-www/konqueror-embedded/konqueror-embedded-20010207-r1.ebuild
index 1419fb1eefec..7a16dcdc8b69 100644
--- a/net-www/konqueror-embedded/konqueror-embedded-20010207.ebuild
+++ b/net-www/konqueror-embedded/konqueror-embedded-20010207-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/net-www/konqueror-embedded/konqueror-embedded-20010207.ebuild,v 1.1 2001/02/27 03:06:16 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/konqueror-embedded/konqueror-embedded-20010207-r1.ebuild,v 1.1 2001/10/06 15:30:16 danarmak Exp $
 
 A=${PN}-snapshot.tar.gz
 S=${WORKDIR}/${PN}-snapshot
@@ -19,8 +19,8 @@ src_compile() {
       export LDFLAGS="-L/usr/lib -lmng -ljpeg"
       myconf="--enable-qt-embedded --enable-static --disable-shared --prefix=/usr/embedded"
     else
-      export QTDIR=/usr/X11R6/lib/qt
-      myconf="--prefix=/usr/X11R6"
+      #export QTDIR=/usr/X11R6/lib/qt
+      myconf="--prefix=/usr"
     fi
     try ./configure ${myconf} --host=${CHOST} \
 	--with-qt-dir=$QTDIR \
@@ -37,8 +37,10 @@ src_install () {
       dodir /usr/embedded/bin
       mv ${D}/usr/embedded/konq* ${D}/usr/embedded/bin
     else
-      dodir /usr/X11R6/bin
-      mv ${D}/usr/X11R6/konq* ${D}/usr/X11R6/bin
+      dodir /usr/bin
+      # i don't know what an embedded konq loks like, bt it had better not
+      # conflict with the main konqueror of kde! - danarmak
+      mv ${D}/usr/konq* ${D}/usr/bin
     fi
 
 }
diff --git a/net-www/opera/files/digest-opera-5.0 b/net-www/opera/files/digest-opera-5.0
deleted file mode 100644
index 2e9afe5710d9..000000000000
--- a/net-www/opera/files/digest-opera-5.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 be5bf254a6b6ac36b32446cbc50de304 opera-5.0-dynamic.i386.tar.gz
diff --git a/net-www/opera/opera-5.0.ebuild b/net-www/opera/opera-5.0-r1.ebuild
index 82bc769e24a4..125a2ee3236f 100644
--- a/net-www/opera/opera-5.0.ebuild
+++ b/net-www/opera/opera-5.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 Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-www/opera/opera-5.0.ebuild,v 1.3 2001/07/12 23:01:40 tadpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/opera/opera-5.0-r1.ebuild,v 1.1 2001/10/06 15:30:16 danarmak Exp $
 
 P=opera-5.0-dynamic.i386
 A=${P}.tar.gz
@@ -14,7 +14,7 @@ DEPEND=">=x11-libs/qt-x11-2.3.0"
 
 src_install() {
 
-  T=/usr/X11R6
+  T=/usr
   exeinto $T/bin
   doexe opera
 
diff --git a/net-www/skipstone/files/digest-skipstone-0.7.5 b/net-www/skipstone/files/digest-skipstone-0.7.5
deleted file mode 100644
index db9795d1521c..000000000000
--- a/net-www/skipstone/files/digest-skipstone-0.7.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f7864391e09779f1719663fcd99b4ea1 skipstone-0.7.5.tar.gz
diff --git a/net-www/skipstone/skipstone-0.7.5.ebuild b/net-www/skipstone/skipstone-0.7.5-r1.ebuild
index 1611013fce56..00f5b9d7ea2a 100644
--- a/net-www/skipstone/skipstone-0.7.5.ebuild
+++ b/net-www/skipstone/skipstone-0.7.5-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Damon Conway <damon@3jane.net> 
-# $Header: /var/cvsroot/gentoo-x86/net-www/skipstone/skipstone-0.7.5.ebuild,v 1.1 2001/09/14 05:30:16 lordjoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/skipstone/skipstone-0.7.5-r1.ebuild,v 1.1 2001/10/06 15:30:16 danarmak Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -18,12 +18,10 @@ src_compile() {
  	myconf="enable_nls=1"
     fi
     cd ${S}/src
-    mv skipstone.h skipstone.h.bak
-    sed skipstone.h.bak -e "s:/usr/share:/usr/X11R6/share:" > skipstone.h
-    make $myconf PREFIX="/usr/X11R6" MOZILLA_INCLUDES="-I${MOZILLA_FIVE_HOME}/include -I${MOZILLA_FIVE_HOME}/include/nspr" MOZILLA_LIBS="-L${MOZILLA_FIVE_HOME} -lgtkembedmoz -lplds4 -lplc4 -lnspr4 -lgtksuperwin -lxpcom" || die
+    make $myconf PREFIX="/usr" MOZILLA_INCLUDES="-I${MOZILLA_FIVE_HOME}/include -I${MOZILLA_FIVE_HOME}/include/nspr" MOZILLA_LIBS="-L${MOZILLA_FIVE_HOME} -lgtkembedmoz -lplds4 -lplc4 -lnspr4 -lgtksuperwin -lxpcom" || die
 }
 
 src_install () {
-    make PREFIX=${D}/usr/X11R6 install || die
+    make PREFIX=${D}/usr install || die
     dodoc AUTHORS COPYING README README.copying 
 }