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

100 files changed, 147 insertions, 244 deletions

diff --git a/app-i18n/kde-i18n-en_GB/files/digest-kde-i18n-en_GB-2.2.1-r1 b/app-i18n/kde-i18n-en_GB/files/digest-kde-i18n-en_GB-2.2.1-r1
new file mode 100644
index 000000000000..e32e57902c60
--- /dev/null
+++ b/app-i18n/kde-i18n-en_GB/files/digest-kde-i18n-en_GB-2.2.1-r1
@@ -0,0 +1 @@
+MD5 94f12acbaab46a901654eb6aa316ea4e kde-i18n-en_GB-2.2.1.tar.bz2
diff --git a/app-text/acroread/acroread-4.05.ebuild b/app-text/acroread/acroread-4.05-r1.ebuild
index 22a8b2fd302d..abb1ee65ebf1 100644
--- a/app-text/acroread/acroread-4.05.ebuild
+++ b/app-text/acroread/acroread-4.05-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/app-text/acroread/acroread-4.05.ebuild,v 1.3 2001/05/01 18:29:05 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-4.05-r1.ebuild,v 1.1 2001/10/06 15:30:15 danarmak Exp $
 
 A=linux-ar-405.tar.gz
 S=${WORKDIR}/ILINXR.install
@@ -16,21 +16,21 @@ src_compile() {
 
   tar xvf ILINXR.TAR
   tar xvf READ.TAR 
-  sed -e "s:REPLACE_ME:/usr/X11R6/lib/Acrobat4/Reader:" \
+  sed -e "s:REPLACE_ME:/usr/lib/Acrobat4/Reader:" \
 	bin/acroread.sh > acroread
 }
 
 src_install () {
 
-  dodir /usr/X11R6/lib/Acrobat4
+  dodir /usr/lib/Acrobat4
   for i in Browsers Reader Resource
   do
-    cp -a ${S}/${i} ${D}/usr/X11R6/lib/Acrobat4
+    cp -a ${S}/${i} ${D}/usr/lib/Acrobat4
   done
-  exeinto /usr/X11R6/bin
+  exeinto /usr/bin
   doexe acroread
   dodoc ReadMe LICREAD.TXT
   dodir /opt/netscape/plugins
-  dosym /usr/X11R6/lib/Acrobat4/Browsers/intellinux/nppdf.so /opt/netscape/plugins
+  dosym /usr/lib/Acrobat4/Browsers/intellinux/nppdf.so /opt/netscape/plugins
 }
 
diff --git a/app-text/acroread/files/digest-acroread-4.05 b/app-text/acroread/files/digest-acroread-4.05-r1
index 28e599efa303..28e599efa303 100644
--- a/app-text/acroread/files/digest-acroread-4.05
+++ b/app-text/acroread/files/digest-acroread-4.05-r1
diff --git a/app-text/xpdf/files/digest-xpdf-0.92-r1 b/app-text/xpdf/files/digest-xpdf-0.92-r1
deleted file mode 100644
index ccae308af5da..000000000000
--- a/app-text/xpdf/files/digest-xpdf-0.92-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2d6e9fb157db928bd0cca4214ddd2c80 xpdf-0.92.tgz
diff --git a/app-text/xpdf/xpdf-0.92-r1.ebuild b/app-text/xpdf/xpdf-0.92-r2.ebuild
index 57f29f29b104..686d23cb4317 100644
--- a/app-text/xpdf/xpdf-0.92-r1.ebuild
+++ b/app-text/xpdf/xpdf-0.92-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Ryan Tolboom <ryan@intphsys.com>
-# $Header: /var/cvsroot/gentoo-x86/app-text/xpdf/xpdf-0.92-r1.ebuild,v 1.5 2001/08/01 18:44:26 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xpdf/xpdf-0.92-r2.ebuild,v 1.1 2001/10/06 15:30:16 danarmak Exp $
 
 S=${WORKDIR}/${P}
 
@@ -14,12 +14,15 @@ DEPEND="virtual/x11
 	>=media-libs/t1lib-1.0.1"
 
 src_compile() {
-    try ./configure --prefix=/usr/X11R6 --mandir=/usr/X11R6/man --with-gzip
-    try make
+	./configure --prefix=/usr --mandir=/usr/man --with-gzip || die
+	make || die
 }
 
 
 src_install() {
-    try make DESTDIR=${D} install
-    dodoc README ANNOUNCE CHANGES
+	# don't use builtin make install, as it doesn't compress manpages
+	into /usr
+	dodoc README ANNOUNCE CHANGES
+	doman doc/*.1
+	dobin xpdf/pdfimages xpdf/pdfinfo xpdf/pdftopbm xpdf/pdftops xpdf/pdftotext xpdf/xpdf        
 }
diff --git a/dev-util/lincvs/files/digest-lincvs-0.3.0 b/dev-util/lincvs/files/digest-lincvs-0.3.0-r1
index b8f9c5855598..b8f9c5855598 100644
--- a/dev-util/lincvs/files/digest-lincvs-0.3.0
+++ b/dev-util/lincvs/files/digest-lincvs-0.3.0-r1
diff --git a/dev-util/lincvs/files/lincvs-0.3.0-gentoo.diff b/dev-util/lincvs/files/lincvs-0.3.0-r1-gentoo.diff
index 1c3f8356869b..1c3f8356869b 100644
--- a/dev-util/lincvs/files/lincvs-0.3.0-gentoo.diff
+++ b/dev-util/lincvs/files/lincvs-0.3.0-r1-gentoo.diff
diff --git a/dev-util/lincvs/lincvs-0.3.0.ebuild b/dev-util/lincvs/lincvs-0.3.0-r1.ebuild
index efa1b97a3fe6..340bd064feec 100644
--- a/dev-util/lincvs/lincvs-0.3.0.ebuild
+++ b/dev-util/lincvs/lincvs-0.3.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/dev-util/lincvs/lincvs-0.3.0.ebuild,v 1.2 2001/05/09 04:37:31 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/lincvs/lincvs-0.3.0-r1.ebuild,v 1.1 2001/10/06 15:30:16 danarmak Exp $
 
 S=${WORKDIR}/LinCVS-0.3
 DESCRIPTION="A Graphical CVS Client"
@@ -37,11 +37,16 @@ src_compile() {
 
 src_install () {
 
-    into /usr/X11R6
+    into /usr
     dobin LinCVS tools/*.sh
-    insinto /usr/X11R6/share/icons/lincvs
+    insinto /usr/share/icons/lincvs
     doins res/*.xpm
-    dodoc AUTHORS COPYING ChangeLog *.{txt,TXT}
+    dodoc AUTHORS COPYING ChangeLog 
+    #This is required by the app - uncmopressed txt's
+    cd ${D}/usr/share/doc
+    ln -s ${P}-${PR} ${PN}
+    cd ${PN}
+    cp ${S}/*.{txt,TXT} .
 
 }
 
diff --git a/incoming/epplet-base-0.5.ebuild b/incoming/epplet-base-0.5.ebuild
index 55e21af15950..12090de71967 100644
--- a/incoming/epplet-base-0.5.ebuild
+++ b/incoming/epplet-base-0.5.ebuild
@@ -13,7 +13,7 @@ DEPEND=">=x11-wm/enlightenment-0.16"
 src_compile() {
 
     cd ${S}
-    try ./configure --prefix=/usr/X11R6 --host=${CHOST} 
+    try ./configure --prefix=/usr --host=${CHOST} 
     try make
 
 }
diff --git a/kde-base/kdelibs/kdelibs-2.2.1-r1.ebuild b/kde-base/kdelibs/kdelibs-2.2.1-r1.ebuild
index d323a173f98f..b71afd023262 100644
--- a/kde-base/kdelibs/kdelibs-2.2.1-r1.ebuild
+++ b/kde-base/kdelibs/kdelibs-2.2.1-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 Dan Armak <danarmak@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-2.2.1-r1.ebuild,v 1.2 2001/10/06 14:36:55 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-2.2.1-r1.ebuild,v 1.3 2001/10/06 15:30:16 danarmak Exp $
 . /usr/portage/eclass/inherit.eclass || die
 inherit kde-dist || die
 
@@ -11,7 +11,7 @@ DESCRIPTION="${DESCRIPTION}Libraries"
 # DEPEND from scratch.
 COMMONDEPEND=">=sys-devel/gcc-2.95.2
 			virtual/glibc
-			sys-deve/ld.so
+			sys-devel/ld.so
 			sys-devel/perl
 			>=media-libs/audiofile-0.1.9
 			>=x11-libs/qt-x11-2.3.0
diff --git a/kde-i18n/kde-i18n-en_GB/files/digest-kde-i18n-en_GB-2.2.1-r1 b/kde-i18n/kde-i18n-en_GB/files/digest-kde-i18n-en_GB-2.2.1-r1
new file mode 100644
index 000000000000..e32e57902c60
--- /dev/null
+++ b/kde-i18n/kde-i18n-en_GB/files/digest-kde-i18n-en_GB-2.2.1-r1
@@ -0,0 +1 @@
+MD5 94f12acbaab46a901654eb6aa316ea4e kde-i18n-en_GB-2.2.1.tar.bz2
diff --git a/media-gfx/blender-static/blender-static-2.12.ebuild b/media-gfx/blender-static/blender-static-2.12-r1.ebuild
index 92130d35e202..e416a92b6338 100644
--- a/media-gfx/blender-static/blender-static-2.12.ebuild
+++ b/media-gfx/blender-static/blender-static-2.12-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-gfx/blender-static/blender-static-2.12.ebuild,v 1.1 2001/05/14 11:02:40 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender-static/blender-static-2.12-r1.ebuild,v 1.1 2001/10/06 15:30:16 danarmak Exp $
 
 A="blender${PV}-linux-glibc2.1.2-i386-static.tar.gz manual_1.5.zip"
 S=${WORKDIR}
@@ -23,7 +23,7 @@ src_install () {
     cd ${D}/usr/share/doc/${P}
     unzip ${DISTDIR}/manual_1.5.zip
     mv manual_1.5 html
-    insinto /usr/X11R6/bin
+    insinto /usr/bin
     insopts -m755
     newins ${FILESDIR}/${PV} blender-static
 
diff --git a/media-gfx/blender-static/files/blender-static-2.12 b/media-gfx/blender-static/files/blender-static-2.12-r1
index 23a6d1c61359..23a6d1c61359 100644
--- a/media-gfx/blender-static/files/blender-static-2.12
+++ b/media-gfx/blender-static/files/blender-static-2.12-r1
diff --git a/media-gfx/blender-static/files/digest-blender-static-2.12 b/media-gfx/blender-static/files/digest-blender-static-2.12
deleted file mode 100644
index 8a607ae031cc..000000000000
--- a/media-gfx/blender-static/files/digest-blender-static-2.12
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 edf2e3fc0262d1955afb27d42a0667e7 blender2.12-linux-glibc2.1.2-i386-static.tar.gz
-MD5 489f4b961370f0bc1b4d8e7737157fbd manual_1.5.zip
diff --git a/media-gfx/blender/blender-2.12.ebuild b/media-gfx/blender/blender-2.12-r1.ebuild
index 62df70f6bc70..26d292e97da5 100644
--- a/media-gfx/blender/blender-2.12.ebuild
+++ b/media-gfx/blender/blender-2.12-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-gfx/blender/blender-2.12.ebuild,v 1.1 2001/05/14 11:10:45 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.12-r1.ebuild,v 1.1 2001/10/06 15:30:16 danarmak Exp $
 
 A="blender${PV}-linux-glibc2.1.2-i386.tar.gz manual_1.5.zip"
 S=${WORKDIR}/blender${PV}-linux-glibc2.1.2-i386
@@ -21,7 +21,7 @@ src_install () {
     cd ${D}/usr/share/doc/${P}
     unzip ${DISTDIR}/manual_1.5.zip
     mv manual_1.5 html
-    insinto /usr/X11R6/bin
+    insinto /usr/bin
     insopts -m755
     newins ${FILESDIR}/${P} blender
 
diff --git a/media-gfx/blender/blender-2.14.ebuild b/media-gfx/blender/blender-2.14-r1.ebuild
index deeec14a8fe6..988ac2a827c3 100644
--- a/media-gfx/blender/blender-2.14.ebuild
+++ b/media-gfx/blender/blender-2.14-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-gfx/blender/blender-2.14.ebuild,v 1.1 2001/07/26 05:54:55 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.14-r1.ebuild,v 1.1 2001/10/06 15:30:16 danarmak Exp $
 
 S=${WORKDIR}/blender${PV}-linux-glibc2.1.2-i386
 DESCRIPTION="Extremely fast and versatile 3D rendering package"
@@ -20,10 +20,10 @@ src_install () {
     cd ${D}/usr/share/doc/${P}
     unzip ${DISTDIR}/manual_1.5.zip
     mv manual_1.5 html
-    insinto /usr/X11R6/bin
+    insinto /usr/bin
     insopts -m755
     newins ${FILESDIR}/${P} blender
-	dodir /usr/X11R6/bin
-	dosym /opt/blender-${PV}/blender /usr/X11R6/bin/blender
+	dodir /usr/bin
+	dosym /opt/blender-${PV}/blender /usr/bin/blender
 }
 
diff --git a/media-gfx/blender/files/digest-blender-2.12 b/media-gfx/blender/files/digest-blender-2.12
deleted file mode 100644
index 621fee5f3933..000000000000
--- a/media-gfx/blender/files/digest-blender-2.12
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 c5545d360226b69f7c8ac6be53aae5d5 blender2.12-linux-glibc2.1.2-i386.tar.gz
-MD5 489f4b961370f0bc1b4d8e7737157fbd manual_1.5.zip
diff --git a/media-gfx/blender/files/digest-blender-2.14 b/media-gfx/blender/files/digest-blender-2.14
deleted file mode 100644
index 0a6af753d419..000000000000
--- a/media-gfx/blender/files/digest-blender-2.14
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 3410e73541ac6e239c0c4bf7a4098eef blender2.14-linux-glibc2.1.2-i386.tar.gz
-MD5 489f4b961370f0bc1b4d8e7737157fbd manual_1.5.zip
diff --git a/media-gfx/feh/feh-1.0.1-r1.ebuild b/media-gfx/feh/feh-1.0.1-r2.ebuild
index 543a6512a837..e8425561e150 100644
--- a/media-gfx/feh/feh-1.0.1-r1.ebuild
+++ b/media-gfx/feh/feh-1.0.1-r2.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 Craig Joly <joly@ee.ualberta.ca>
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/feh/feh-1.0.1-r1.ebuild,v 1.1 2001/08/29 20:04:08 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/feh/feh-1.0.1-r2.ebuild,v 1.1 2001/10/06 15:30:16 danarmak Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A fast, lightweight imageviewer using imlib2"
@@ -12,7 +12,7 @@ DEPEND="media-libs/imlib2"
 
 src_compile() {
 
-    ./configure --prefix=/usr/X11R6 --infodir=/usr/share/info --host=${CHOST}
+    ./configure --prefix=/usr --infodir=/usr/share/info --host=${CHOST}
     assert
     emake || die
 }
diff --git a/media-gfx/feh/files/digest-feh-1.0.1-r1 b/media-gfx/feh/files/digest-feh-1.0.1-r1
deleted file mode 100644
index 004e3fc2672f..000000000000
--- a/media-gfx/feh/files/digest-feh-1.0.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 151f54f6ad7a2fad87aebb1205d28b79 feh-1.0.1.tar.gz
diff --git a/media-gfx/gliv/files/digest-gliv-1.0.3 b/media-gfx/gliv/files/digest-gliv-1.0.3
deleted file mode 100644
index c3307ff31df1..000000000000
--- a/media-gfx/gliv/files/digest-gliv-1.0.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 70c0bbeb701bf5ed84cbc02113f9a268 gliv-1.0.3.tar.gz
diff --git a/media-gfx/gliv/gliv-1.0.3.ebuild b/media-gfx/gliv/gliv-1.0.3-r1.ebuild
index 5e75b398dd91..dda26bc30f15 100644
--- a/media-gfx/gliv/gliv-1.0.3.ebuild
+++ b/media-gfx/gliv/gliv-1.0.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 Your Name <your email>
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gliv/gliv-1.0.3.ebuild,v 1.1 2001/06/21 18:43:51 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gliv/gliv-1.0.3-r1.ebuild,v 1.1 2001/10/06 15:30:16 danarmak Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -13,7 +13,7 @@ DEPEND="media-libs/imlib2 virtual/opengl"
 
 src_compile() {
 
-    try ./configure --prefix=/usr/X11R6 --host=${CHOST}
+    try ./configure --prefix=/usr --host=${CHOST}
     try make
 
 }
diff --git a/media-gfx/imagemagick/files/digest-imagemagick-5.3.4 b/media-gfx/imagemagick/files/digest-imagemagick-5.3.4
deleted file mode 100644
index 26c4b41c70aa..000000000000
--- a/media-gfx/imagemagick/files/digest-imagemagick-5.3.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 39c762e1a492798bf119b3814d653518 ImageMagick-5.3.4.tar.gz
diff --git a/media-gfx/imagemagick/imagemagick-5.3.4.ebuild b/media-gfx/imagemagick/imagemagick-5.3.4-r1.ebuild
index 05d46a20642f..42e236357604 100644
--- a/media-gfx/imagemagick/imagemagick-5.3.4.ebuild
+++ b/media-gfx/imagemagick/imagemagick-5.3.4-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-gfx/imagemagick/imagemagick-5.3.4.ebuild,v 1.3 2001/06/11 08:11:28 hallski Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-5.3.4-r1.ebuild,v 1.1 2001/10/06 15:30:16 danarmak Exp $
 
 P=ImageMagick-${PV}
 A=${P}.tar.gz
@@ -31,20 +31,20 @@ src_compile() {
       myconf="--without-perl"
     fi
     try ./configure \
-		--prefix=/usr/X11R6 --build=${CHOST} --enable-shared --enable-static \
+		--prefix=/usr --build=${CHOST} --enable-shared --enable-static \
 		--without-xml --without-lcms --enable-lzw --with-ttf --without-fpx \
                 --without-gslib --without-hdf --without-jbig --without-wmf
-		--enable-shared --with-threads --mandir=/usr/X11R6/man $myconf
+		--enable-shared --with-threads --mandir=/usr/man $myconf
     try pmake
 
 }
 
 src_install () {
 
-    try make prefix=${D}/usr/X11R6 PREFIX=${D}/usr \
+    try make prefix=${D}/usr PREFIX=${D}/usr \
 	INSTALLMAN3DIR=${D}/usr/share/man/man3 \
 	INSTALLMAN1DIR=${D}/usr/share/man/man1 \
-	mandir=${D}/usr/X11R6/man install
+	mandir=${D}/usr/man install
 
 }
 
diff --git a/media-gfx/qiv/files/digest-qiv-1.7 b/media-gfx/qiv/files/digest-qiv-1.7
deleted file mode 100644
index bd04346724d0..000000000000
--- a/media-gfx/qiv/files/digest-qiv-1.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f8b0f4edaf6b596bc9aab4be5f0faf4c qiv-1.7-src.tgz
diff --git a/media-gfx/qiv/qiv-1.7.ebuild b/media-gfx/qiv/qiv-1.7-r1.ebuild
index 2d079407e85c..ee10e1be6e8e 100644
--- a/media-gfx/qiv/qiv-1.7.ebuild
+++ b/media-gfx/qiv/qiv-1.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 Thread <thread@threadbox.net>
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/qiv/qiv-1.7.ebuild,v 1.2 2001/08/06 20:50:20 lordjoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/qiv/qiv-1.7-r1.ebuild,v 1.1 2001/10/06 15:30:16 danarmak Exp $
 
 A=${P}-src.tgz
 S=${WORKDIR}/${P}
@@ -20,7 +20,7 @@ src_compile(){
 }
 
 src_install () {
-    into /usr/X11R6
+    into /usr
     dobin qiv
     doman qiv.1
     dodoc README*
diff --git a/media-gfx/sane-frontends/files/digest-sane-frontends-1.0.4-r1 b/media-gfx/sane-frontends/files/digest-sane-frontends-1.0.4-r1
deleted file mode 100644
index 49b611435e64..000000000000
--- a/media-gfx/sane-frontends/files/digest-sane-frontends-1.0.4-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f8d1d0afba88f1d1604c67e14738b74d sane-frontends-1.0.4.tar.gz
diff --git a/media-gfx/sane-frontends/sane-frontends-1.0.4-r1.ebuild b/media-gfx/sane-frontends/sane-frontends-1.0.4-r2.ebuild
index 13abbb4e1c35..be90819bd0d6 100644
--- a/media-gfx/sane-frontends/sane-frontends-1.0.4-r1.ebuild
+++ b/media-gfx/sane-frontends/sane-frontends-1.0.4-r2.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-gfx/sane-frontends/sane-frontends-1.0.4-r1.ebuild,v 1.2 2001/06/04 06:41:14 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-frontends/sane-frontends-1.0.4-r2.ebuild,v 1.1 2001/10/06 15:30:16 danarmak Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -14,18 +14,18 @@ DEPEND=">=media-gfx/gimp-1.2
 
 src_compile() {
 
-    try ./configure --prefix=/usr/X11R6 --mandir=/usr/X11R6/man \
-		--datadir=/usr/X11R6/share/misc --host=${CHOST}
+    try ./configure --prefix=/usr --mandir=/usr/man \
+		--datadir=/usr/share/misc --host=${CHOST}
     try make
 
 }
 
 src_install () {
 
-    try make prefix=${D}/usr/X11R6 datadir=${D}/usr/X11R6/share/misc \
-	mandir=${D}/usr/X11R6/man install
-    dodir /usr/X11R6/lib/gimp/1.2/plug-ins
-    dosym /usr/X11R6/bin/xscanimage /usr/X11R6/lib/gimp/1.2/plug-ins/xscanimage
+    try make prefix=${D}/usr datadir=${D}/usr/share/misc \
+	mandir=${D}/usr/man install
+    dodir /usr/lib/gimp/1.2/plug-ins
+    dosym /usr/bin/xscanimage /usr/lib/gimp/1.2/plug-ins/xscanimage
 
     dodoc AUTHORS COPYING Changelog NEWS PROBLEMS README TODO
 }
diff --git a/media-gfx/xsane/files/digest-xsane-0.77 b/media-gfx/xsane/files/digest-xsane-0.77
deleted file mode 100644
index e68112128cad..000000000000
--- a/media-gfx/xsane/files/digest-xsane-0.77
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3d0902bd81d49bd523c15ffbb72d98aa xsane-0.77.tar.gz
diff --git a/media-gfx/xsane/xsane-0.77.ebuild b/media-gfx/xsane/xsane-0.77-r1.ebuild
index 2ff54f636d93..90e964f7c540 100644
--- a/media-gfx/xsane/xsane-0.77.ebuild
+++ b/media-gfx/xsane/xsane-0.77-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-gfx/xsane/xsane-0.77.ebuild,v 1.1 2001/06/04 06:41:14 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsane/xsane-0.77-r1.ebuild,v 1.1 2001/10/06 15:30:16 danarmak Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -13,14 +13,14 @@ DEPEND="media-gfx/sane-backends media-gfx/gimp"
 
 src_compile() {
 
-    try ./configure --prefix=/usr/X11R6 --mandir=/usr/X11R6/man --host=${CHOST}
+    try ./configure --prefix=/usr --mandir=/usr/man --host=${CHOST}
     try make
 
 }
 
 src_install () {
 
-    try make prefix=${D}/usr/X11R6 mandir=${D}/usr/X11R6/man install
+    try make prefix=${D}/usr/ mandir=${D}/usr/man install
     dodoc xsane.[A-Z]*
     docinto html
     dodoc doc/*.{jpg,html}
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
 
diff --git a/media-sound/wmix/files/digest-wmix-3.0 b/media-sound/wmix/files/digest-wmix-3.0
deleted file mode 100644
index 55ffa651d8e2..000000000000
--- a/media-sound/wmix/files/digest-wmix-3.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 06d8542907f7174c108a1352817f332f wmix-3.0.tar.gz
diff --git a/media-sound/wmix/wmix-3.0.ebuild b/media-sound/wmix/wmix-3.0-r1.ebuild
index cec3d1c730b2..6fdaa050488f 100644
--- a/media-sound/wmix/wmix-3.0.ebuild
+++ b/media-sound/wmix/wmix-3.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 Jano (default3) <your email>
-# $Header: /var/cvsroot/gentoo-x86/media-sound/wmix/wmix-3.0.ebuild,v 1.1 2001/08/31 01:24:30 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/wmix/wmix-3.0-r1.ebuild,v 1.1 2001/10/06 15:30:16 danarmak Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Dockapp mixer for OSS or ALSA"
@@ -25,7 +25,7 @@ src_compile() {
 
 src_install () {
 
-	exeinto /usr/X11R6/bin
+	exeinto /usr/bin
 	doexe wmix
 	gzip -cd wmix.1x.gz > wmix.1
 	doman wmix.1
diff --git a/media-video/avifile/avifile-0.53.5.ebuild b/media-video/avifile/avifile-0.53.5-r1.ebuild
index 72bb5cfea68a..706fb565f56c 100644
--- a/media-video/avifile/avifile-0.53.5.ebuild
+++ b/media-video/avifile/avifile-0.53.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-video/avifile/avifile-0.53.5.ebuild,v 1.5 2001/08/08 10:47:10 hallski Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.53.5-r1.ebuild,v 1.1 2001/10/06 15:30:16 danarmak Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Library for AVI-Files"
@@ -26,7 +26,7 @@ src_compile() {
 	LDFLAGS="-L/usr/X11R6/lib -lXt"
     fi
     export CFLAGS=${CFLAGS/-O?/-O2}
-    try LDFLAGS="$LDFLAGS" ./configure --prefix=/usr/X11R6 --host=${CHOST} --disable-tsc $myconf
+    try LDFLAGS="$LDFLAGS" ./configure --prefix=/usr --host=${CHOST} --disable-tsc $myconf
     cp Makefile Makefile.orig
     sed -e "s:/usr/lib/win32:${D}/usr/lib/win32:" \
 	Makefile.orig > Makefile
@@ -41,10 +41,10 @@ src_compile() {
 
 src_install () {
 
-    dodir /usr/X11R6/lib /usr/X11R6/bin
+    dodir /usr/lib /usr/bin
     dodir /usr/lib/win32
 
-    make prefix=${D}/usr/X11R6 install
+    make prefix=${D}/usr install
 
     cd ${D}/usr/lib/win32
     unzip ${DISTDIR}/binaries-010122.zip
diff --git a/media-video/avifile/avifile-0.6.0.20010503.ebuild b/media-video/avifile/avifile-0.6.0.20010503-r1.ebuild
index 17c268d5f5de..c98b2ccccf06 100644
--- a/media-video/avifile/avifile-0.6.0.20010503.ebuild
+++ b/media-video/avifile/avifile-0.6.0.20010503-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-video/avifile/avifile-0.6.0.20010503.ebuild,v 1.2 2001/08/08 10:47:10 hallski Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.6.0.20010503-r1.ebuild,v 1.1 2001/10/06 15:30:16 danarmak Exp $
 
 S=${WORKDIR}/${PN}-0.6.0
 DESCRIPTION="Library for AVI-Files"
@@ -28,7 +28,7 @@ src_compile() {
 	LDFLAGS="-L/usr/X11R6/lib -lXt"
     fi
     export CFLAGS=${CFLAGS/-O?/-O2}
-    try LDFLAGS="$LDFLAGS" ./configure --prefix=/usr/X11R6 --host=${CHOST} \
+    try LDFLAGS="$LDFLAGS" ./configure --prefix=/usr --host=${CHOST} \
 	--enable-quiet --disable-tsc $myconf
 #    cp Makefile Makefile.orig
 #    sed -e "s:/usr/lib/win32:${D}/usr/lib/win32:" \
@@ -38,10 +38,10 @@ src_compile() {
 
 src_install () {
 
-    dodir /usr/X11R6/lib /usr/X11R6/bin
+    dodir /usr/lib /usr/bin
     dodir /usr/lib/win32
 
-    make prefix=${D}/usr/X11R6 install
+    make prefix=${D}/usr install
 
     cd ${D}/usr/lib/win32
     unzip ${DISTDIR}/binaries-010122.zip
diff --git a/media-video/avifile/avifile-0.6.0.20011003.ebuild b/media-video/avifile/avifile-0.6.0.20011003-r1.ebuild
index 45cd8a84301f..7e6a4b9a6309 100644
--- a/media-video/avifile/avifile-0.6.0.20011003.ebuild
+++ b/media-video/avifile/avifile-0.6.0.20011003-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-video/avifile/avifile-0.6.0.20011003.ebuild,v 1.1 2001/10/05 11:34:17 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.6.0.20011003-r1.ebuild,v 1.1 2001/10/06 15:30:16 danarmak Exp $
 
 P=${PN}-0.6.0-20011003
 S=${WORKDIR}/${PN}-0.6.0
@@ -30,7 +30,7 @@ src_compile() {
 	LDFLAGS="-L/usr/X11R6/lib -lXt"
     fi
     export CFLAGS=${CFLAGS/-O?/-O2}
-    try LDFLAGS="$LDFLAGS" ./configure --prefix=/usr/X11R6 --host=${CHOST} \
+    try LDFLAGS="$LDFLAGS" ./configure --prefix=/usr --host=${CHOST} \
 	--enable-quiet --disable-tsc $myconf
 #    cp Makefile Makefile.orig
 #    sed -e "s:/usr/lib/win32:${D}/usr/lib/win32:" \
@@ -40,10 +40,10 @@ src_compile() {
 
 src_install () {
 
-    dodir /usr/X11R6/lib /usr/X11R6/bin
+    dodir /usr/lib /usr/bin
     dodir /usr/lib/win32
 
-    make prefix=${D}/usr/X11R6 install
+    make prefix=${D}/usr install
 
     cd ${D}/usr/lib/win32
     unzip ${DISTDIR}/binaries-011002.zip
diff --git a/media-video/avifile/files/digest-avifile-0.53.5 b/media-video/avifile/files/digest-avifile-0.53.5
deleted file mode 100644
index 2dc688978b84..000000000000
--- a/media-video/avifile/files/digest-avifile-0.53.5
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 3d51465e8a720af0bb1afa68aa4e7373 avifile-0.53.5.tar.gz
-MD5 ffc44e68b581994613931a9e47500446 binaries-010122.zip
diff --git a/media-video/avifile/files/digest-avifile-0.6.0.20010503 b/media-video/avifile/files/digest-avifile-0.6.0.20010503
deleted file mode 100644
index 4b3229d8aa21..000000000000
--- a/media-video/avifile/files/digest-avifile-0.6.0.20010503
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 df4139ede83515a1d3e5f173b6267747 avifile-0.6.0.20010503.tar.gz
-MD5 ffc44e68b581994613931a9e47500446 binaries-010122.zip
diff --git a/media-video/avifile/files/digest-avifile-0.6.0.20010803 b/media-video/avifile/files/digest-avifile-0.6.0.20010803
deleted file mode 100644
index 14d5a9974c9e..000000000000
--- a/media-video/avifile/files/digest-avifile-0.6.0.20010803
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 e2bbf4d25a756846b4d3860c550d487d avifile-0.6.0-20010803.tgz
-MD5 ffc44e68b581994613931a9e47500446 binaries-010122.zip
diff --git a/media-video/avifile/files/digest-avifile-0.6.0.20011003 b/media-video/avifile/files/digest-avifile-0.6.0.20011003
deleted file mode 100644
index ba5c4d5db1ce..000000000000
--- a/media-video/avifile/files/digest-avifile-0.6.0.20011003
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 875679e16e226533c09bf45b70c6be68 avifile-0.6.0-20011003.tgz
-MD5 4db4edeeceefb9353b15b047207fa6d3 binaries-011002.tgz
diff --git a/media-video/bcast/bcast-2000c.ebuild b/media-video/bcast/bcast-2000c-r1.ebuild
index 05140f9d6b1d..1b8f6fb1c674 100644
--- a/media-video/bcast/bcast-2000c.ebuild
+++ b/media-video/bcast/bcast-2000c-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-video/bcast/bcast-2000c.ebuild,v 1.4 2001/06/19 21:46:47 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/bcast/bcast-2000c-r1.ebuild,v 1.1 2001/10/06 15:30:16 danarmak Exp $
 
 A=${P}-src.tar.gz
 S=${WORKDIR}/${P}
@@ -35,12 +35,12 @@ src_compile() {
 
 src_install () {
 
-    into /usr/X11R6
+    into /usr
     dobin bcast/bcast2000
     dolib.so bcbase/libbcbase.so
     dolib.so guicast/libguicast.so
     insopts -m 755
-    insinto /usr/X11R6/lib/bcast/plugins
+    insinto /usr/lib/bcast/plugins
     doins plugins/*.plugin
     dodoc COPYING
     docinto html
diff --git a/media-video/bcast/files/digest-bcast-2000c b/media-video/bcast/files/digest-bcast-2000c
deleted file mode 100644
index d9839988671f..000000000000
--- a/media-video/bcast/files/digest-bcast-2000c
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1648ade202eadfca9522d5371c003820 bcast-2000c-src.tar.gz
diff --git a/media-video/mpeg2vidcodec/files/digest-mpeg2vidcodec-12 b/media-video/mpeg2vidcodec/files/digest-mpeg2vidcodec-12
deleted file mode 100644
index 8a1a59cfd148..000000000000
--- a/media-video/mpeg2vidcodec/files/digest-mpeg2vidcodec-12
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4a66565979be0818bd8a41d948943451 mpeg2vidcodec_v12.tar.gz
diff --git a/media-video/mpeg2vidcodec/mpeg2vidcodec-12.ebuild b/media-video/mpeg2vidcodec/mpeg2vidcodec-12-r1.ebuild
index 3aded88ad0ec..9b5488b3e38b 100644
--- a/media-video/mpeg2vidcodec/mpeg2vidcodec-12.ebuild
+++ b/media-video/mpeg2vidcodec/mpeg2vidcodec-12-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-video/mpeg2vidcodec/mpeg2vidcodec-12.ebuild,v 1.1 2000/11/26 20:54:18 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg2vidcodec/mpeg2vidcodec-12-r1.ebuild,v 1.1 2001/10/06 15:30:16 danarmak Exp $
 
 P=mpeg2vidcodec_v12
 A=${P}.tar.gz
@@ -30,7 +30,7 @@ src_compile() {
 src_install () {
 
     cd ${S}
-    into /usr/X11R6
+    into /usr
     dobin src/mpeg2dec/mpeg2decode
     dobin src/mpeg2enc/mpeg2encode
     dodoc README doc/*
diff --git a/media-video/xanim-export/files/digest-xanim-export-2.80.1 b/media-video/xanim-export/files/digest-xanim-export-2.80.1
deleted file mode 100644
index bada2567b706..000000000000
--- a/media-video/xanim-export/files/digest-xanim-export-2.80.1
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 aeb4b2379d7b5ae8a04431d5c7f86e22 xanim_exporting_edition.tar.gz
-MD5 a158a6eff799cf6769625ea90889cf71 xa1.0_cyuv_linuxELFg21.o.gz
-MD5 e72191744dbf09ad7c522904cb95ecfd xa2.0_cvid_linuxELFg21.o.gz
-MD5 f10efd80c7ea22d1c7ea4962b6c09cdf xa2.1_iv32_linuxELFg21.o.gz
diff --git a/media-video/xanim-export/xanim-export-2.80.1.ebuild b/media-video/xanim-export/xanim-export-2.80.1-r1.ebuild
index 62def356125d..564447281fc7 100644
--- a/media-video/xanim-export/xanim-export-2.80.1.ebuild
+++ b/media-video/xanim-export/xanim-export-2.80.1-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-video/xanim-export/xanim-export-2.80.1.ebuild,v 1.6 2001/06/03 09:54:22 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xanim-export/xanim-export-2.80.1-r1.ebuild,v 1.1 2001/10/06 15:30:16 danarmak Exp $
 
 A="xanim_exporting_edition.tar.gz xa1.0_cyuv_linuxELFg21.o.gz xa2.0_cvid_linuxELFg21.o.gz
    xa2.1_iv32_linuxELFg21.o.gz"
@@ -43,9 +43,9 @@ src_compile() {
 
 src_install () {
 
-    into /usr/X11R6
+    into /usr
     newbin xanim xanim-export
-    insinto /usr/X11R6/lib/xanim/mods-export
+    insinto /usr/lib/xanim/mods-export
     doins mods/*
     dodoc README*
     dodoc docs/README.* docs/*.readme docs/*.doc
diff --git a/net-dialup/minicom/files/digest-minicom-1.83.1 b/net-dialup/minicom/files/digest-minicom-1.83.1
deleted file mode 100644
index 9e217268a1bb..000000000000
--- a/net-dialup/minicom/files/digest-minicom-1.83.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 54311e7ab398a87088eafbe5e7c09cad minicom-1.83.1.src.tar.gz
diff --git a/net-dialup/minicom/minicom-1.83.1.ebuild b/net-dialup/minicom/minicom-1.83.1-r1.ebuild
index e23efed43320..c50fbe6e4291 100644
--- a/net-dialup/minicom/minicom-1.83.1.ebuild
+++ b/net-dialup/minicom/minicom-1.83.1-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Ryan Tolboom <ryan@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/minicom/minicom-1.83.1.ebuild,v 1.2 2001/09/09 16:44:42 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/minicom/minicom-1.83.1-r1.ebuild,v 1.1 2001/10/06 15:30:16 danarmak Exp $
 
 A="${P}.src.tar.gz"
 S=${WORKDIR}/${P}
@@ -44,7 +44,7 @@ src_install() {
     dodoc doc/minicom.FAQ
     docinto scripts
     dodoc demos/*
-    exeinto /usr/X11R6/bin
+    exeinto /usr/bin
     doexe src/xminicom
     insinto /etc/minicom
     doins ${FILESDIR}/minirc.dfl 
diff --git a/net-dialup/qtwvdialer/files/digest-qtwvdialer-0.3.1 b/net-dialup/qtwvdialer/files/digest-qtwvdialer-0.3.1
deleted file mode 100644
index 84e84680773f..000000000000
--- a/net-dialup/qtwvdialer/files/digest-qtwvdialer-0.3.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0f74cd54b8d702ae16777122b9a622ab qtwvdialer-0.3.1.tgz
diff --git a/net-dialup/qtwvdialer/qtwvdialer-0.3.1.ebuild b/net-dialup/qtwvdialer/qtwvdialer-0.3.1-r1.ebuild
index ab496511a042..667d0dd08ff9 100644
--- a/net-dialup/qtwvdialer/qtwvdialer-0.3.1.ebuild
+++ b/net-dialup/qtwvdialer/qtwvdialer-0.3.1-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-dialup/qtwvdialer/qtwvdialer-0.3.1.ebuild,v 1.5 2001/08/11 04:53:17 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/qtwvdialer/qtwvdialer-0.3.1-r1.ebuild,v 1.1 2001/10/06 15:30:16 danarmak Exp $
 
 S=${WORKDIR}/QtWvDialer-${PV}
 DESCRIPTION="QT Frontend for wvdial"
@@ -30,7 +30,7 @@ src_compile() {
 
 src_install () {
 
-    insinto /usr/X11R6
+    insinto /usr
     dobin bin/qtwvdialer
     dodoc AUTHORS CHANGELOG COPYING README
 
diff --git a/net-misc/vnc/files/digest-vnc-3.3.3-r2 b/net-misc/vnc/files/digest-vnc-3.3.3-r2
deleted file mode 100644
index cff5bbab901c..000000000000
--- a/net-misc/vnc/files/digest-vnc-3.3.3-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6fc83e1b6153d3252649953267713f17 vnc-3.3.3r2_unixsrc.tgz
diff --git a/net-misc/vnc/vnc-3.3.3-r2.ebuild b/net-misc/vnc/vnc-3.3.3-r2.ebuild
index 38c38b0f55e3..5850a5edb72e 100644
--- a/net-misc/vnc/vnc-3.3.3-r2.ebuild
+++ b/net-misc/vnc/vnc-3.3.3-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Grant Goodyear <g2boojum@hotmail.com>
 # /home/cvsroot/gentoo-x86/skel.build,v 1.2 2001/02/15 18:17:31 achim Exp
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/vnc-3.3.3-r2.ebuild,v 1.4 2001/09/03 23:58:33 blocke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/vnc-3.3.3-r2.ebuild,v 1.5 2001/10/06 15:30:16 danarmak Exp $
 
 
 #P=
@@ -43,8 +43,8 @@ src_compile() {
 src_install () {
 
     cd ${S}
-    mkdir -p ${D}/usr/X11R6/bin
-    try ./vncinstall ${D}/usr/X11R6/bin
+    mkdir -p ${D}/usr/bin
+    try ./vncinstall ${D}/usr/bin
 
 }
 
diff --git a/net-print/qtcups/files/digest-qtcups-2.0 b/net-print/qtcups/files/digest-qtcups-2.0
deleted file mode 100644
index c3f772da717e..000000000000
--- a/net-print/qtcups/files/digest-qtcups-2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5c3a82d374a3073c0761b8c45519782e qtcups-2.0.tar.gz
diff --git a/net-print/qtcups/qtcups-2.0.ebuild b/net-print/qtcups/qtcups-2.0-r1.ebuild
index 795424eac49b..73789291f257 100644
--- a/net-print/qtcups/qtcups-2.0.ebuild
+++ b/net-print/qtcups/qtcups-2.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-print/qtcups/qtcups-2.0.ebuild,v 1.1 2001/01/27 08:41:36 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/qtcups/qtcups-2.0-r1.ebuild,v 1.1 2001/10/06 15:30:16 danarmak Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -15,7 +15,7 @@ DEPEND=">=x11-libs/qt-x11-2.2.2
 src_compile() {
 
     cd ${S}
-    try ./configure --prefix=/usr/X11R6 --host=${CHOST}
+    try ./configure --prefix=/usr --host=${CHOST}
     try make
 
 }
diff --git a/net-print/xpp/files/digest-xpp-0.7 b/net-print/xpp/files/digest-xpp-0.7
deleted file mode 100644
index d263b18d7551..000000000000
--- a/net-print/xpp/files/digest-xpp-0.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4a959f60c0807901b5ac236d5b372ff5 xpp-0.7.tar.gz
diff --git a/net-print/xpp/files/digest-xpp-1.0 b/net-print/xpp/files/digest-xpp-1.0
deleted file mode 100644
index b0a7426c4220..000000000000
--- a/net-print/xpp/files/digest-xpp-1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fc2649b2db29a3ae4bec6842ccd8e268 xpp-1.0.tar.gz
diff --git a/net-print/xpp/xpp-0.7.ebuild b/net-print/xpp/xpp-0.7.ebuild
deleted file mode 100644
index b29431b97f36..000000000000
--- a/net-print/xpp/xpp-0.7.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# 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-print/xpp/xpp-0.7.ebuild,v 1.3 2001/06/03 09:54:22 achim Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="X Printing Panel"
-SRC_URI="ftp://cups.sourceforge.net/pub/cups/xpp/${P}.tar.gz"
-HOMEPAGE="http://cups.sourceforge.net/xpp/"
-
-DEPEND="virtual/glibc >=net-print/cups-1.1.7
-	 >=x11-libs/fltk-1.0.10"
-
-src_compile() {
-
-    try ./configure --prefix=/usr/X11R6 --host=${CHOST}
-    try make
-
-}
-
-src_install () {
-
-    try make DESTDIR=${D} install
-    dodoc LICENSE ChangeLog README
-}
-
diff --git a/net-print/xpp/xpp-1.0.ebuild b/net-print/xpp/xpp-1.0-r1.ebuild
index a95680f57381..cb2881a93a0a 100644
--- a/net-print/xpp/xpp-1.0.ebuild
+++ b/net-print/xpp/xpp-1.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Your Name <your email>
 # /home/cvsroot/gentoo-x86/net-print/xpp/xpp-0.7.ebuild,v 1.3 2001/06/03 09:54:22 achim Exp
-# $Header: /var/cvsroot/gentoo-x86/net-print/xpp/xpp-1.0.ebuild,v 1.3 2001/08/31 03:23:39 pm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/xpp/xpp-1.0-r1.ebuild,v 1.1 2001/10/06 15:30:16 danarmak Exp $
 
 
 S=${WORKDIR}/${P}
@@ -15,7 +15,7 @@ DEPEND="virtual/glibc >=net-print/cups-1.1.7
 
 src_compile() {
 
-    try ./configure --prefix=/usr/X11R6 --host=${CHOST}
+    try ./configure --prefix=/usr --host=${CHOST}
     try make
 
 }
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 
 }
diff --git a/sys-apps/pcmcia-cs/pcmcia-cs-3.1.29.ebuild b/sys-apps/pcmcia-cs/pcmcia-cs-3.1.29.ebuild
index 07b9a1bc07f0..0cc6a3a86b86 100644
--- a/sys-apps/pcmcia-cs/pcmcia-cs-3.1.29.ebuild
+++ b/sys-apps/pcmcia-cs/pcmcia-cs-3.1.29.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: System Team <system@gentoo.org>
 # Author: Craig Joly <joly@ee.ualberta.ca>, Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/pcmcia-cs-3.1.29.ebuild,v 1.4 2001/09/23 20:12:24 lamer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/pcmcia-cs-3.1.29.ebuild,v 1.5 2001/10/06 15:30:16 danarmak Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="PCMCIA tools for Linux"
@@ -42,6 +42,7 @@ src_install () {
 	#this is simply much easier than patching configure or the makefiles
 	#not to build them in the first place
 	use X || rm -rf usr/X11R6
+	# todo: if they are nstalled, move them to /usr
 		
 	#install our own init script
 	exeinto /etc/init.d
diff --git a/x11-misc/bbapm/bbapm-0.0.1.ebuild b/x11-misc/bbapm/bbapm-0.0.1-r1.ebuild
index 5b14308b37bf..7af21e5df536 100644
--- a/x11-misc/bbapm/bbapm-0.0.1.ebuild
+++ b/x11-misc/bbapm/bbapm-0.0.1-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 Craig Joly <joly@ee.ualberta.ca>
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbapm/bbapm-0.0.1.ebuild,v 1.2 2001/10/01 00:20:58 lordjoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbapm/bbapm-0.0.1-r1.ebuild,v 1.1 2001/10/06 15:30:16 danarmak Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="blackbox advanced power management tool"
@@ -12,7 +12,7 @@ DEPEND=">=x11-wm/blackbox-0.61
         >=sys-apps/apmd-3.0.1"
 
 src_compile() {
-	./configure --prefix=/usr/X11R6 --host=${CHOST} || die
+	./configure --prefix=/usr --host=${CHOST} || die
 	emake || die
 }
 
diff --git a/x11-misc/bbapm/files/digest-bbapm-0.0.1 b/x11-misc/bbapm/files/digest-bbapm-0.0.1
deleted file mode 100644
index 33ef2d23d594..000000000000
--- a/x11-misc/bbapm/files/digest-bbapm-0.0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4d2629959bd907696c7765b7c34bc54f bbapm-0.0.1.tar.gz
diff --git a/x11-misc/bbkeys/bbkeys-0.8.2-r1.ebuild b/x11-misc/bbkeys/bbkeys-0.8.2-r1.ebuild
deleted file mode 100644
index bb6d391c1a74..000000000000
--- a/x11-misc/bbkeys/bbkeys-0.8.2-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Joe Bormolini <lordjoe@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbkeys/bbkeys-0.8.2-r1.ebuild,v 1.1 2001/08/30 06:50:04 woodchip Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Use keyboard shortcuts in the blackbox wm"
-HOMEPAGE="http://movingparts.thelinuxcommunity.org"
-SRC_URI="http://movingparts.thelinuxcommunity.org/bbkeys/${P}.tar.gz"
-
-DEPEND=">=x11-wm/blackbox-0.61"
-
-src_compile() {
-	./configure --prefix=/usr/X11R6 --host=${CHOST} || die
-	emake || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-	rm -rf ${D}/usr/X11R6/doc
-	dodoc AUTHORS ChangeLog README
-}
-
-pkg_postinst() {
-	cd ${ROOT}usr/X11R6/bin/wm
-	sed -e "s/.*blackbox/exec \/usr\/X11R6\/bin\/bbkeys \&\n&/" blackbox | cat > blackbox
-}
diff --git a/x11-misc/bbkeys/bbkeys-0.8.3.ebuild b/x11-misc/bbkeys/bbkeys-0.8.3-r1.ebuild
index 6e485d679e8b..db6d09641d22 100644
--- a/x11-misc/bbkeys/bbkeys-0.8.3.ebuild
+++ b/x11-misc/bbkeys/bbkeys-0.8.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 Joe Bormolini <lordjoe@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbkeys/bbkeys-0.8.3.ebuild,v 1.1 2001/10/01 00:20:58 lordjoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbkeys/bbkeys-0.8.3-r1.ebuild,v 1.1 2001/10/06 15:30:16 danarmak Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Use keyboard shortcuts in the blackbox wm"
@@ -11,7 +11,7 @@ SRC_URI="http://movingparts.thelinuxcommunity.org/bbkeys/${P}.tar.gz"
 DEPEND=">=x11-wm/blackbox-0.61"
 
 src_compile() {
-	./configure --prefix=/usr/X11R6 --host=${CHOST} || die
+	./configure --prefix=/usr --host=${CHOST} || die
 	emake || die
 }
 
diff --git a/x11-misc/bbkeys/files/digest-bbkeys-0.8.2-r1 b/x11-misc/bbkeys/files/digest-bbkeys-0.8.2-r1
deleted file mode 100644
index 5016d7965c30..000000000000
--- a/x11-misc/bbkeys/files/digest-bbkeys-0.8.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ce506020fbb17dab286129dcde444ffa bbkeys-0.8.2.tar.gz
diff --git a/x11-misc/bbkeys/files/digest-bbkeys-0.8.3 b/x11-misc/bbkeys/files/digest-bbkeys-0.8.3
deleted file mode 100644
index e7695ae67c83..000000000000
--- a/x11-misc/bbkeys/files/digest-bbkeys-0.8.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f38ea900ad8c6a797833b4d380f737cd bbkeys-0.8.3.tar.gz
diff --git a/x11-misc/bbkeysconf/bbkeysconf-1.3.ebuild b/x11-misc/bbkeysconf/bbkeysconf-1.3-r1.ebuild
index 763876238f61..b2f289f10d72 100644
--- a/x11-misc/bbkeysconf/bbkeysconf-1.3.ebuild
+++ b/x11-misc/bbkeysconf/bbkeysconf-1.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 Joe Bormolini <lordjoe@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbkeysconf/bbkeysconf-1.3.ebuild,v 1.2 2001/09/02 05:51:01 lordjoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbkeysconf/bbkeysconf-1.3-r1.ebuild,v 1.1 2001/10/06 15:30:16 danarmak Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -21,7 +21,7 @@ src_compile() {
 
 src_install () {
 
-    into /usr/X11R6
+    into /usr
     dobin bbkeysconf
 }
 
diff --git a/x11-misc/bbkeysconf/files/digest-bbkeysconf-1.3 b/x11-misc/bbkeysconf/files/digest-bbkeysconf-1.3
deleted file mode 100644
index a883842b923a..000000000000
--- a/x11-misc/bbkeysconf/files/digest-bbkeysconf-1.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 23cb901110dc398c6972f0849714cecb bbkeysconf-1.3.tar.gz
diff --git a/x11-misc/bbmail/bbmail-0.6.11.ebuild b/x11-misc/bbmail/bbmail-0.6.11-r1.ebuild
index 2c7404d56bba..0e818aa7d465 100644
--- a/x11-misc/bbmail/bbmail-0.6.11.ebuild
+++ b/x11-misc/bbmail/bbmail-0.6.11-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 Craig Joly <joly@ee.ualberta.ca>
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbmail/bbmail-0.6.11.ebuild,v 1.2 2001/10/01 00:20:58 lordjoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbmail/bbmail-0.6.11-r1.ebuild,v 1.1 2001/10/06 15:30:16 danarmak Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="blackbox mail notification, patched for maildir"
@@ -18,7 +18,7 @@ src_unpack () {
 }
 
 src_compile() {
-	./configure --prefix=/usr/X11R6 --host=${CHOST} || die
+	./configure --prefix=/usr --host=${CHOST} || die
 	emake || die
 }
 
@@ -30,6 +30,6 @@ src_install () {
 pkg_postinst() {
 	cd ${ROOT}usr/X11R6/bin/wm
 	if [ ! "`grep bbmail blackbox`" ] ; then
-	sed -e "s/.*blackbox/exec \/usr\/X11R6\/bin\/bbmail \&\n&/" blackbox | cat > blackbox
+	sed -e "s/.*blackbox/exec \/usr\/bin\/bbmail \&\n&/" blackbox | cat > blackbox
 	fi
 }
diff --git a/x11-misc/bbmail/files/digest-bbmail-0.6.11 b/x11-misc/bbmail/files/digest-bbmail-0.6.11
deleted file mode 100644
index 98e7288a0d76..000000000000
--- a/x11-misc/bbmail/files/digest-bbmail-0.6.11
+++ /dev/null
@@ -1 +0,0 @@
-MD5 26e442a09ceab67a39b73ad80ceafff9 bbmail-0.6.11.tar.gz
diff --git a/x11-misc/bbpager/bbpager-0.3.0.ebuild b/x11-misc/bbpager/bbpager-0.3.0-r1.ebuild
index 5425811b18ad..b9e3cc5da36d 100644
--- a/x11-misc/bbpager/bbpager-0.3.0.ebuild
+++ b/x11-misc/bbpager/bbpager-0.3.0-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Gontran Zepeda <gontran@gontran.net>
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbpager/bbpager-0.3.0.ebuild,v 1.2 2001/10/01 00:20:58 lordjoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbpager/bbpager-0.3.0-r1.ebuild,v 1.1 2001/10/06 15:30:16 danarmak Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="An understated pager for Blackbox."
@@ -11,7 +11,7 @@ HOMEPAGE="http://bbtools.windsofstorm.net/available.phtml#bbpager"
 DEPEND=">=x11-wm/blackbox-0.61"
 
 src_compile() {
-	./configure --prefix=/usr/X11R6 --host=${CHOST} || die
+	./configure --prefix=/usr --host=${CHOST} || die
 	emake || die
 }
 
@@ -23,6 +23,6 @@ src_install () {
 pkg_postinst() {
 	cd ${ROOT}usr/X11R6/bin/wm
 	if [ ! "`grep bbpager blackbox`" ] ; then
-	sed -e "s/.*blackbox/exec \/usr\/X11R6\/bin\/bbpager \&\n&/" blackbox | cat > blackbox
+	sed -e "s/.*blackbox/exec \/usr\/bin\/bbpager \&\n&/" blackbox | cat > blackbox
 	fi
 }
diff --git a/x11-misc/bbpager/files/digest-bbpager-0.3.0 b/x11-misc/bbpager/files/digest-bbpager-0.3.0
deleted file mode 100644
index 8d64ea0c93a0..000000000000
--- a/x11-misc/bbpager/files/digest-bbpager-0.3.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0a8aa4b0c68346b71f8d375f4362c3cb bbpager-0.3.0.tar.gz
diff --git a/x11-misc/bbppp/bbppp-0.2.2.ebuild b/x11-misc/bbppp/bbppp-0.2.2-r1.ebuild
index 5ac3cf8a2fb8..8a306f30691a 100644
--- a/x11-misc/bbppp/bbppp-0.2.2.ebuild
+++ b/x11-misc/bbppp/bbppp-0.2.2-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 Joe Bormolini <lordjoe@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbppp/bbppp-0.2.2.ebuild,v 1.2 2001/10/01 00:20:58 lordjoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbppp/bbppp-0.2.2-r1.ebuild,v 1.1 2001/10/06 15:30:16 danarmak Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="blackbox ppp frontend/monitor"
@@ -11,7 +11,7 @@ HOMEPAGE="http://bbtools.windsofstorm.net/available.phtml#bbppp"
 DEPEND=">=x11-wm/blackbox-0.61"
 
 src_compile() {
-	./configure --prefix=/usr/X11R6 --host=${CHOST} || die
+	./configure --prefix=/usr --host=${CHOST} || die
 	emake || die
 }
 
@@ -23,6 +23,6 @@ src_install () {
 pkg_postinst() {
 	cd ${ROOT}usr/X11R6/bin/wm
 	if [ ! "`grep bbppp blackbox`" ] ; then
-	sed -e "s/.*blackbox/exec \/usr\/X11R6\/bin\/bbppp \&\n&/" blackbox | cat > blackbox
+	sed -e "s/.*blackbox/exec \/usr\/bin\/bbppp \&\n&/" blackbox | cat > blackbox
 	fi
 }
diff --git a/x11-misc/bbppp/files/digest-bbppp-0.2.2 b/x11-misc/bbppp/files/digest-bbppp-0.2.2
deleted file mode 100644
index 09f57dd1507b..000000000000
--- a/x11-misc/bbppp/files/digest-bbppp-0.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e1e8a4795c5446688144ec25112a5b40 bbppp-0.2.2.tar.gz
diff --git a/x11-misc/bbsload/bbsload-0.2.5.ebuild b/x11-misc/bbsload/bbsload-0.2.5-r1.ebuild
index 3e3937ada609..7f1650a4981d 100644
--- a/x11-misc/bbsload/bbsload-0.2.5.ebuild
+++ b/x11-misc/bbsload/bbsload-0.2.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 Joe Bormolini <lordjoe@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbsload/bbsload-0.2.5.ebuild,v 1.2 2001/10/01 00:20:58 lordjoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbsload/bbsload-0.2.5-r1.ebuild,v 1.1 2001/10/06 15:30:16 danarmak Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="blackbox load monitor"
@@ -11,7 +11,7 @@ HOMEPAGE="http://bbtools.windsofstorm.net/available.phtml#bbsload"
 DEPEND=">=x11-wm/blackbox-0.61"
 
 src_compile() {
-	./configure --prefix=/usr/X11R6 --host=${CHOST} || die
+	./configure --prefix=/usr --host=${CHOST} || die
 	emake || die
 }
 
@@ -23,6 +23,6 @@ src_install () {
 pkg_postinst() {
 	cd ${ROOT}usr/X11R6/bin/wm
 	if [ ! "`grep bbsload blackbox`" ] ; then
-	sed -e "s/.*blackbox/exec \/usr\/X11R6\/bin\/bbsload \&\n&/" blackbox | cat > blackbox
+	sed -e "s/.*blackbox/exec \/usr\/bin\/bbsload \&\n&/" blackbox | cat > blackbox
 	fi
 }
diff --git a/x11-misc/bbsload/files/digest-bbsload-0.2.5 b/x11-misc/bbsload/files/digest-bbsload-0.2.5
deleted file mode 100644
index 43177b055ffe..000000000000
--- a/x11-misc/bbsload/files/digest-bbsload-0.2.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b7096bddeffbc37d87fa1000370b67e6 bbsload-0.2.5.tar.gz
diff --git a/x11-misc/bbweather/bbweather-0.3.ebuild b/x11-misc/bbweather/bbweather-0.3-r1.ebuild
index 5b30315a3d12..f926539efdfe 100644
--- a/x11-misc/bbweather/bbweather-0.3.ebuild
+++ b/x11-misc/bbweather/bbweather-0.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 Joe Bormolini <lordjoe@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbweather/bbweather-0.3.ebuild,v 1.1 2001/08/31 00:49:02 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbweather/bbweather-0.3-r1.ebuild,v 1.1 2001/10/06 15:30:16 danarmak Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="blackbox weather monitor"
@@ -13,7 +13,7 @@ DEPEND=">=x11-wm/blackbox-0.61
         >=sys-devel/perl-5.6.1"
 
 src_compile() {
-	./configure --prefix=/usr/X11R6 --host=${CHOST} || die
+	./configure --prefix=/usr --host=${CHOST} || die
 	emake || die
 }
 
diff --git a/x11-misc/bbweather/files/digest-bbweather-0.3 b/x11-misc/bbweather/files/digest-bbweather-0.3
deleted file mode 100644
index 31562ff36cc9..000000000000
--- a/x11-misc/bbweather/files/digest-bbweather-0.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 526e505dc2938016fb0a7622896b5d3d bbweather-0.3.tar.bz2
diff --git a/x11-misc/toolbox/files/digest-toolbox-0.6.0 b/x11-misc/toolbox/files/digest-toolbox-0.6.0
deleted file mode 100644
index 1f89040a69bb..000000000000
--- a/x11-misc/toolbox/files/digest-toolbox-0.6.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 72283d94f128bdfd90887eb1489daafb toolbox-0.6.0.tar.gz
diff --git a/x11-misc/toolbox/toolbox-0.6.0.ebuild b/x11-misc/toolbox/toolbox-0.6.0-r1.ebuild
index 24dcd10d7102..d21552b18442 100644
--- a/x11-misc/toolbox/toolbox-0.6.0.ebuild
+++ b/x11-misc/toolbox/toolbox-0.6.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 Craig Joly <joly@ee.ualberta.ca>
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/toolbox/toolbox-0.6.0.ebuild,v 1.1 2001/08/31 01:04:15 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/toolbox/toolbox-0.6.0-r1.ebuild,v 1.1 2001/10/06 15:30:16 danarmak Exp $
 
 
 A=${P}.tar.gz
@@ -15,7 +15,7 @@ DEPEND=">=x11-wm/blackbox-0.61
 
 src_compile() {
 
-    try ./configure --prefix=/usr/X11R6 --host=${CHOST}
+    try ./configure --prefix=/usr --host=${CHOST}
     try emake
 
 }
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
 
 }