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

13 files changed, 20 insertions, 34 deletions

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