*** empty log message ***

7 files changed, 29 insertions, 21 deletions

diff --git a/dev-python/gnome-python/gnome-python-1.4.1.ebuild b/dev-python/gnome-python/gnome-python-1.4.1.ebuild
index 8fb4c43ba7de..18bd6da77488 100644
--- a/dev-python/gnome-python/gnome-python-1.4.1.ebuild
+++ b/dev-python/gnome-python/gnome-python-1.4.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/dev-python/gnome-python/gnome-python-1.4.1.ebuild,v 1.1 2001/04/28 23:00:39 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gnome-python/gnome-python-1.4.1.ebuild,v 1.2 2001/05/15 15:41:32 achim Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -16,7 +16,7 @@ DEPEND=">=gnome-base/libglade-0.16
 src_compile() {                           
   cd ${S}
   PYTHON="/usr/bin/python" try ./configure --host=${CHOST} --prefix=/usr \
-    --with-gnome --with-gtkhtml
+    --with-gnome 
   try make
 }
 
diff --git a/gnome-apps/gphoto/gphoto-0.4.3.ebuild b/gnome-apps/gphoto/gphoto-0.4.3.ebuild
index 29e65984ad14..db1cca73a2ef 100644
--- a/gnome-apps/gphoto/gphoto-0.4.3.ebuild
+++ b/gnome-apps/gphoto/gphoto-0.4.3.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 AJ Lewis <aj@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/gnome-apps/gphoto/gphoto-0.4.3.ebuild,v 1.3 2001/05/06 18:32:54 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-apps/gphoto/gphoto-0.4.3.ebuild,v 1.4 2001/05/15 15:41:32 achim Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -17,7 +17,7 @@ DEPEND="virtual/glibc
 	
 
 src_compile() {                           
-   try ./configure --prefix=/usr/ --mandir=/usr/share/man --infodir=/usr/share/info
+   try CFLAGS=\"${CFLAGS/-pipe/}\" ./configure --prefix=/usr/ --mandir=/usr/share/man --infodir=/usr/share/info
    try make clean
    try make ${MAKEOPTS}
 }
diff --git a/media-gfx/gphoto/gphoto-0.4.3.ebuild b/media-gfx/gphoto/gphoto-0.4.3.ebuild
index 06aa21ad9cb6..6460510bebb7 100644
--- a/media-gfx/gphoto/gphoto-0.4.3.ebuild
+++ b/media-gfx/gphoto/gphoto-0.4.3.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 AJ Lewis <aj@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gphoto/gphoto-0.4.3.ebuild,v 1.3 2001/05/06 18:32:54 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gphoto/gphoto-0.4.3.ebuild,v 1.4 2001/05/15 15:41:32 achim Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -17,7 +17,7 @@ DEPEND="virtual/glibc
 	
 
 src_compile() {                           
-   try ./configure --prefix=/usr/ --mandir=/usr/share/man --infodir=/usr/share/info
+   try CFLAGS=\"${CFLAGS/-pipe/}\" ./configure --prefix=/usr/ --mandir=/usr/share/man --infodir=/usr/share/info
    try make clean
    try make ${MAKEOPTS}
 }
diff --git a/media-libs/smjpeg/smjpeg-0.2.1-r2.ebuild b/media-libs/smjpeg/smjpeg-0.2.1-r2.ebuild
index 212370b0cf9b..6d77a553ffd5 100644
--- a/media-libs/smjpeg/smjpeg-0.2.1-r2.ebuild
+++ b/media-libs/smjpeg/smjpeg-0.2.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 Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-libs/smjpeg/smjpeg-0.2.1-r2.ebuild,v 1.2 2001/04/29 18:42:54 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/smjpeg/smjpeg-0.2.1-r2.ebuild,v 1.3 2001/05/15 15:41:32 achim Exp $
 
 P=smjpeg-0.2.1
 A=${P}.tar.gz
@@ -13,8 +13,10 @@ HOMEPAGE="http://www.lokigames.com/development/smjpeg.php3"
 DEPEND=">=media-libs/libsdl-1.1.7"
 
 src_compile() {
-
-    try ./configure --prefix=/usr --host=${CHOST}
+    if [ "`use nas`" ] ; then
+	LDFLAGS="-L/usr/X11R6/lib -lXt"
+    fi
+    try LDFLAGS=\"$LDFLAGS\" ./configure --prefix=/usr --host=${CHOST}
     try make
 
 }
diff --git a/media-video/avifile/avifile-0.53.5.ebuild b/media-video/avifile/avifile-0.53.5.ebuild
index 4a03a6af8ba8..5f5532042b5a 100644
--- a/media-video/avifile/avifile-0.53.5.ebuild
+++ b/media-video/avifile/avifile-0.53.5.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.2 2001/02/13 04:58:15 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.53.5.ebuild,v 1.3 2001/05/15 15:41:32 achim Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Library for AVI-Files"
@@ -16,14 +16,13 @@ RDEPEND=">=x11-libs/qt-x11-2.2.2
 	 >=x11-libs/gtk+-1.2.8
 	 >=media-sound/esound-0.2.19"
 	
-src_unpack () {
-    unpack ${P}.tar.gz
-    cd ${S}
-}
 
 src_compile() {
-    cd ${S}
-    try ./configure --prefix=/usr/X11R6 --host=${CHOST} --disable-tsc
+    if [ "`use nas`" ] ; then
+	LDFLAGS="-L/usr/X11R6/lib -lXt"
+    fi
+    export CFLAGS=${CFLAGS/-O?/-O2}
+    try LDFLAGS=\"$LDFLAGS\" ./configure --prefix=/usr/X11R6 --host=${CHOST} --disable-tsc
     cp Makefile Makefile.orig
     sed -e "s:/usr/lib/win32:${D}/usr/lib/win32:" \
 	Makefile.orig > Makefile
@@ -38,7 +37,6 @@ src_compile() {
 
 src_install () {
 
-    cd ${S}
     dodir /usr/X11R6/lib /usr/X11R6/bin
     dodir /usr/lib/win32
 
diff --git a/media-video/mjpeg-tools/mjpeg-tools-1a.ebuild b/media-video/mjpeg-tools/mjpeg-tools-1a.ebuild
index 9afa66389a4f..b769f6c189c4 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.6 2001/04/29 22:44:00 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpeg-tools/mjpeg-tools-1a.ebuild,v 1.7 2001/05/15 15:41:32 achim Exp $
 
 P=mjpeg-tools-1a
 A="mjpeg_beta_1a.tar.gz quicktime4linux-1.1.9.tar.gz"
@@ -26,6 +26,11 @@ src_unpack() {
     cp Makefile Makefile.orig
     sed -e "s:^#USE_ALSA:USE_ALSA:" Makefile.orig > Makefile
   fi
+  if [ "`use nas`" ] ; then
+    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
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 c6a64d42d101..cb9324c788c2 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.8 2001/05/01 18:29:06 achim Exp $
+# $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 $
 
 P=mpeg-movie-1.6.0
 A=mpeg_movie-1.6.0.tar.gz
@@ -53,10 +53,13 @@ src_unpack() {
   cd ${S}/audio_out
   cp GNUmake GNUmake.orig
   sed -e "s:SDL_DIR += /usr/local:SDL_DIR += /usr:" GNUmake.orig > GNUmake
+  if [ "`use nas`" ] ; then
+	cp GNUmake GNUmake.orig
+	sed -e "s#^SDLLIB := -L#SDLLIB := -L/usr/X11R6/lib -lXt -L#" GNUmake.orig > GNUmake
+  fi
+  
 }
 src_compile() {
-
-    cd ${S}
     try make
 
 }