Dependencie fixes

9 files changed, 61 insertions, 41 deletions

diff --git a/media-video/bcast/bcast-2000c.ebuild b/media-video/bcast/bcast-2000c.ebuild
index b7be9dd9e958..67b7e51248b3 100644
--- a/media-video/bcast/bcast-2000c.ebuild
+++ b/media-video/bcast/bcast-2000c.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.1 2001/05/10 12:15:52 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/bcast/bcast-2000c.ebuild,v 1.2 2001/06/03 09:54:22 achim Exp $
 
 A=${P}-src.tar.gz
 S=${WORKDIR}/${P}
@@ -9,30 +9,25 @@ DESCRIPTION="Realtime audio and video editor"
 SRC_URI="ftp://heroines.sourceforge.net/pub/heroines/${A}"
 HOMEPAGE="http://heroines.sourceforge.net/"
 
+DEPEND="virtual/glibc dev-lang/nasm-0.98
+	>=sys-devel/gcc-2.95.2
+        >=dev-libs/glib-1.2.10
+	>=media-libs/libpng-1.0.7
+	virtual/x11"
+
 DEPEND="virtual/glibc
 	>=sys-devel/gcc-2.95.2
-	>=media-sound/esound-0.2.19
-	>=media-libs/jpeg-6b
-	>=media-libs/tiff-3.5.5
+        >=dev-libs/glib-1.2.10
 	>=media-libs/libpng-1.0.7
 	virtual/x11"
 
 src_unpack() {
   unpack ${A}
-  cd ${S}/bcast
-  cp main.C main.C.orig
-  sed -e "s:/usr/local/bcast/plugins:/usr/X11R6/lib/bcast/plugins:" \
-	main.C.orig > main.C
-  cd ${S}/esound
-  cp esd.h esd.h.orig 
-#  sed -e "s:<audiofile\.h>:\"\.\./audiofile/audiofile\.h\":" esd.h.orig > esd.h
-  cd ${S}/quicktime/libdv
-  cp dvprivate.h dvprivate.h.orig
-#  sed -e "s:<libraw1394/raw1394\.h>:\"\.\./\.\./libraw1394/raw1394\.h\":" dvprivate.h.orig > dvprivate.h
+  patch -p0 < ${FILESDIR}/${PF}-gentoo.diff
 }
+
 src_compile() {
 
-    cd ${S}
     try ./configure
     try make
 
@@ -40,8 +35,7 @@ src_compile() {
 
 src_install () {
 
-    cd ${S}
-    into /usr
+    into /usr/X11R6
     dobin bcast/bcast2000
     dolib.so bcbase/libbcbase.so
     dolib.so guicast/libguicast.so
@@ -51,7 +45,6 @@ src_install () {
     dodoc COPYING
     docinto html
     dodoc docs/*.html docs/*.png docs/*.jpg
-    	
 
 }
 
diff --git a/media-video/bcast/files/bcast-2000c-gentoo.diff b/media-video/bcast/files/bcast-2000c-gentoo.diff
new file mode 100644
index 000000000000..8cf70c3a580c
--- /dev/null
+++ b/media-video/bcast/files/bcast-2000c-gentoo.diff
@@ -0,0 +1,21 @@
+--- bcast-2000c/bcast/Makefile~	Tue Jan  2 22:27:16 2001
++++ bcast-2000c/bcast/Makefile	Sat Jun  2 16:50:30 2001
+@@ -199,6 +199,7 @@
+ 	-I../quicktime/libdv \
+ 	-I../audiofile \
+ 	-I../esound \
++	-I../tiff \
+ 	$(shell glib-config --cflags)
+ 
+ export CFLAGS
+--- bcast-2000c/bcast/main.C~	Tue Jan  2 22:27:16 2001
++++ bcast-2000c/bcast/main.C	Sat Jun  2 16:51:24 2001
+@@ -231,7 +231,7 @@
+ 	char path[1024];
+ 
+ // get the plugin directories
+-	sprintf(global_plugin_dir, "/usr/local/bcast/plugins");
++	sprintf(global_plugin_dir, "/usr/X11R6/lib/bcast/plugins");
+ 	defaults->get("GLOBAL_PLUGIN_DIR", global_plugin_dir);
+ 	sprintf(local_plugin_dir, "");
+ 	defaults->get("LOCAL_PLUGIN_DIR", local_plugin_dir);
diff --git a/media-video/mjpeg-tools/mjpeg-tools-1a.ebuild b/media-video/mjpeg-tools/mjpeg-tools-1a.ebuild
index b769f6c189c4..1cae51ff6a22 100644
--- a/media-video/mjpeg-tools/mjpeg-tools-1a.ebuild
+++ b/media-video/mjpeg-tools/mjpeg-tools-1a.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/mjpeg-tools/mjpeg-tools-1a.ebuild,v 1.7 2001/05/15 15:41:32 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpeg-tools/mjpeg-tools-1a.ebuild,v 1.8 2001/06/03 09:54:22 achim Exp $
 
 P=mjpeg-tools-1a
 A="mjpeg_beta_1a.tar.gz quicktime4linux-1.1.9.tar.gz"
@@ -11,13 +11,17 @@ SRC_URI="http://download.sourceforge.net/mjpeg/${A}
 	 http://heroinewarrior.com/quicktime4linux-1.1.9.tar.gz"
 HOMEPAGE="http://mjpeg.sourceforge.net/"
 
-DEPEND=">=sys-libs/glibc-2.1.3
+DEPEND="virtual/glibc
 	>=dev-libs/glib-1.2.8
 	>=media-libs/libsdl-1.1.5
 	>=media-libs/jpeg-6b
 	>=media-libs/libpng-1.0.7
 	alsa? ( >=media-libs/alsa-lib-0.5.10 ) "
-
+RDEPEND="virtual/glibc
+	>=dev-libs/glib-1.2.8
+	>=media-libs/libsdl-1.1.5
+	>=media-libs/jpeg-6b
+	>=media-libs/libpng-1.0.7"
 src_unpack() {
   unpack ${A}
   cd ${S}
@@ -30,10 +34,14 @@ src_unpack() {
     cp Makefile Makefile.orig
     sed -e "s:^L_FLAGS =:L_FLAGS = -L/usr/X11R6/lib -lXt:" Makefile.orig > Makefile
   fi
-  
+
   cd aenc
   cp Makefile Makefile.orig
-  sed -e "s:\.\./jpeg-6b-mmx/libjpeg\.a:-ljpeg:" Makefile.orig > Makefile
+  sed -e "s:\.\./jpeg-6b-mmx/libjpeg\.a:-ljpeg:" \
+      -e "s:-O3 -m486:${CFLAGS}:" Makefile.orig > Makefile
+
+
+
 }
 src_compile() {
 
diff --git a/media-video/mpeg-movie/mpeg-movie-1.6.0.ebuild b/media-video/mpeg-movie/mpeg-movie-1.6.0.ebuild
index cb9324c788c2..dd415c0b7feb 100644
--- a/media-video/mpeg-movie/mpeg-movie-1.6.0.ebuild
+++ b/media-video/mpeg-movie/mpeg-movie-1.6.0.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/mpeg-movie/mpeg-movie-1.6.0.ebuild,v 1.9 2001/05/15 15:41:32 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg-movie/mpeg-movie-1.6.0.ebuild,v 1.10 2001/06/03 09:54:22 achim Exp $
 
 P=mpeg-movie-1.6.0
 A=mpeg_movie-1.6.0.tar.gz
@@ -10,7 +10,7 @@ DESCRIPTION="Tools for MPEG-I movies"
 SRC_URI="http://heroine.linuxave.net/${A}"
 HOMEPAGE="http://heroine.linuxave.net/toys.html"
 
-DEPEND=">=sys-libs/glibc-2.1.3
+DEPEND="virtual/glibc
 	>=sys-devel/gcc-2.95.2
 	>=media-libs/jpeg-6b
 	>=media-libs/libsdl-1.1.5
@@ -66,7 +66,6 @@ src_compile() {
 
 src_install () {
 
-    cd ${S}
     into /usr
     newbin audio_in/encode mpeg_audio_encode
     newbin audio_out/plaympeg mpeg_audio_play
diff --git a/media-video/xanim-export/files/Makefile b/media-video/xanim-export/files/Makefile
index 377cb8178caa..8316a73bd7d5 100644
--- a/media-video/xanim-export/files/Makefile
+++ b/media-video/xanim-export/files/Makefile
@@ -143,7 +143,7 @@ XA_DLL_LIB = -ldl
 # If you'd like to change the default directory that XAnim searches while
 # looking for dlls, then change the directory below. 
 #
-XA_DLL_PATH = /usr/libexec/xanim/mods
+XA_DLL_PATH = /usr/X11R6/lib/xanim/mods-export
 
 
 ##########################################################################
diff --git a/media-video/xanim-export/xanim-export-2.80.1.ebuild b/media-video/xanim-export/xanim-export-2.80.1.ebuild
index f8d5f37ad258..62def356125d 100644
--- a/media-video/xanim-export/xanim-export-2.80.1.ebuild
+++ b/media-video/xanim-export/xanim-export-2.80.1.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.5 2001/05/01 18:29:06 achim Exp $
+# $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 $
 
 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,10 +43,9 @@ src_compile() {
 
 src_install () {
 
-    cd ${S}
     into /usr/X11R6
     newbin xanim xanim-export
-    insinto /usr/libexec/xanim/mods
+    insinto /usr/X11R6/lib/xanim/mods-export
     doins mods/*
     dodoc README*
     dodoc docs/README.* docs/*.readme docs/*.doc
diff --git a/media-video/xanim/files/Makefile b/media-video/xanim/files/Makefile
index ef22d74c2ff2..9ed8e9488a3b 100644
--- a/media-video/xanim/files/Makefile
+++ b/media-video/xanim/files/Makefile
@@ -140,7 +140,7 @@ XA_DLL_LIB = -ldl
 # If you'd like to change the default directory that XAnim searches while
 # looking for dlls, then change the directory below. 
 #
-XA_DLL_PATH = /usr/libexec/xanim/mods
+XA_DLL_PATH = /usr/X11R6/lib/xanim/mods
 
 
 ##########################################################################
diff --git a/media-video/xanim/xanim-2.80.1.ebuild b/media-video/xanim/xanim-2.80.1.ebuild
index 04c5c8b16e98..484b5e517245 100644
--- a/media-video/xanim/xanim-2.80.1.ebuild
+++ b/media-video/xanim/xanim-2.80.1.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/xanim-2.80.1.ebuild,v 1.5 2001/05/01 18:29:06 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xanim/xanim-2.80.1.ebuild,v 1.6 2001/06/03 09:54:22 achim Exp $
 
 A="xanim2801.tar.gz xa1.0_cyuv_linuxELFg21.o.gz xa2.0_cvid_linuxELFg21.o.gz
    xa2.1_iv32_linuxELFg21.o.gz"
@@ -13,7 +13,7 @@ SRC_URI="ftp://xanim.va.pubnix.com/xanim2801.tar.gz
 	 ftp://xanim.va.pubnix.com/modules/xa2.1_iv32_linuxELFg21.o.gz"
 HOMEPAGE="http://xanim.va.pubnix.com"
 
-DEPEND="virtual/glibc virtual/x11"
+DEPEND="virtual/glibc virtual/x11 >=sys-libs/zlib-1.1.3"
 
 src_unpack() {
   unpack xanim2801.tar.gz
@@ -29,18 +29,16 @@ src_unpack() {
 }
 src_compile() {
 
-    cd ${S}
     try make
 
 }
 
 src_install () {
 
-    cd ${S}
     into /usr/X11R6
     dobin xanim
     newman docs/xanim.man xanim.1
-    insinto /usr/libexec/xanim/mods
+    insinto /usr/X11R6/lib/xanim/mods
     doins mods/*
     dodoc README
     dodoc docs/README.* docs/*.readme docs/*.doc
diff --git a/media-video/xmovie/xmovie-1.7.ebuild b/media-video/xmovie/xmovie-1.7.ebuild
index acfcdfebb9c2..870962192efb 100644
--- a/media-video/xmovie/xmovie-1.7.ebuild
+++ b/media-video/xmovie/xmovie-1.7.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/xmovie/xmovie-1.7.ebuild,v 1.2 2001/05/11 20:42:31 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xmovie/xmovie-1.7.ebuild,v 1.3 2001/06/03 09:54:22 achim Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -9,12 +9,14 @@ DESCRIPTION="A Player for MPEG and Quicktime movies"
 SRC_URI="http://heroinewarrior.com/${A}"
 HOMEPAGE="http://heroines.sourceforge.net/"
 
-DEPEND=">=sys-devel/gcc-2.95.2
-	>=sys-libs/glibc-2.1.3
+DEPEND="virtual/glibc virtual/x11 >=sys-devel/gcc-2.95.2
 	>=dev-lang/nasm-0.98
 	>=dev-libs/glib-1.2.8
-	>=media-libs/libpng-1.0.7
-	>=x11-base/xfree-4.0.1"
+	>=media-libs/libpng-1.0.7"
+
+RDEPEND="virtual/glibc virtual/x11 >=sys-devel/gcc-2.95.2
+	>=dev-libs/glib-1.2.8
+	>=media-libs/libpng-1.0.7"
 
 src_compile() {