more fixes and updates. expect all the rest, plus app-doc/qt-docs (and 3.0.1 qt and

qt-docs) ebuilds tomorrow evening IST.

3 files changed, 13 insertions, 10 deletions

diff --git a/media-video/vlc/files/digest-vlc-0.2.91 b/media-video/vlc/files/digest-vlc-0.2.91
new file mode 100644
index 000000000000..ae18fef8828e
--- /dev/null
+++ b/media-video/vlc/files/digest-vlc-0.2.91
@@ -0,0 +1 @@
+MD5 a96a4ef83def70b9ab5a4ec364e43709 vlc-0.2.91.tar.gz 1081344
diff --git a/media-video/vlc/vlc-0.2.83-r1.ebuild b/media-video/vlc/vlc-0.2.83-r1.ebuild
index 8eec4cd64019..22a8ffbf1c72 100644
--- a/media-video/vlc/vlc-0.2.83-r1.ebuild
+++ b/media-video/vlc/vlc-0.2.83-r1.ebuild
@@ -1,6 +1,6 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Nathaniel Hirsch <nh2@njit.edu> Achim Gottinge <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.2.83-r1.ebuild,v 1.2 2001/10/07 11:11:08 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.2.83-r1.ebuild,v 1.3 2001/12/29 21:45:08 danarmak Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="DVD / video player"
@@ -11,7 +11,7 @@ DEPEND=">=media-libs/libsdl-1.1.8-r1
 	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 )
     esd? ( >=media-sound/esound-0.2.22 )
     ggi? ( >=media-libs/libggi-2.0_beta3 )
-    qt? ( >=x11-libs/qt-x11-2.3.0 )
+    qt? ( >=x11-libs/qt-2.3.0 )
     gtk? ( >=x11-libs/gtk+-1.2.10-r4 )
     #alsa? ( >=media-libs/alsa-lib-0.5.10 )
     X? ( virtual/x11 )"
@@ -37,6 +37,7 @@ src_compile(){
     fi
     if [ "`use qt`" ]
     then
+      export QTDIr=/usr/qt/2
       myconf="$myconf --enable-qt"
     fi
     #if [ "`use kde`" ]
@@ -65,14 +66,14 @@ src_compile(){
 #      myconf="$myconf --enable-alsa"
 #    fi
 
-    try ./configure --prefix=/usr $myconf --with-sdl --disable-alsa
-    try make
+    ./configure --prefix=/usr $myconf --with-sdl --disable-alsa || die
+    make || die
 }
 
 src_install() {
 
     dodir /usr/{bin,lib}
-    try make DESTDIR=${D} install
+    make DESTDIR=${D} install || die
 
 }
 
diff --git a/media-video/vlc/vlc-0.2.90.ebuild b/media-video/vlc/vlc-0.2.90.ebuild
index 977022727aa5..a011904c3965 100644
--- a/media-video/vlc/vlc-0.2.90.ebuild
+++ b/media-video/vlc/vlc-0.2.90.ebuild
@@ -1,6 +1,6 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Nathaniel Hirsch <nh2@njit.edu> Achim Gottinge <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.2.90.ebuild,v 1.1 2001/10/22 18:13:34 hallski Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.2.90.ebuild,v 1.2 2001/12/29 21:45:08 danarmak Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="DVD / video player"
@@ -11,7 +11,7 @@ DEPEND=">=media-libs/libsdl-1.1.8-r1
 	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 )
     esd? ( >=media-sound/esound-0.2.22 )
     ggi? ( >=media-libs/libggi-2.0_beta3 )
-    qt? ( >=x11-libs/qt-x11-2.3.0 )
+    qt? ( >=x11-libs/qt-2.3.0 )
     gtk? ( >=x11-libs/gtk+-1.2.10-r4 )
     #alsa? ( >=media-libs/alsa-lib-0.5.10 )
     X? ( virtual/x11 )"
@@ -37,6 +37,7 @@ src_compile(){
     fi
     if [ "`use qt`" ]
     then
+      export QTDIR=/usr/qt/2
       myconf="$myconf --enable-qt"
     fi
     #if [ "`use kde`" ]
@@ -65,14 +66,14 @@ src_compile(){
 #      myconf="$myconf --enable-alsa"
 #    fi
 
-    try ./configure --prefix=/usr $myconf --with-sdl --disable-alsa
-    try make
+    ./configure --prefix=/usr $myconf --with-sdl --disable-alsa || die
+    make || die
 }
 
 src_install() {
 
     dodir /usr/{bin,lib}
-    try make DESTDIR=${D} install
+    make DESTDIR=${D} install || die
 
 }