big commit :-) read gentoo-announce msg and eclass/doc/news.txt for details

6 files changed, 37 insertions, 27 deletions

diff --git a/media-video/avifile/avifile-0.53.5-r1.ebuild b/media-video/avifile/avifile-0.53.5-r1.ebuild
index 706fb565f56c..603028768f67 100644
--- a/media-video/avifile/avifile-0.53.5-r1.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-r1.ebuild,v 1.1 2001/10/06 15:30:16 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.53.5-r1.ebuild,v 1.2 2001/12/29 17:41:37 danarmak Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Library for AVI-Files"
@@ -10,8 +10,8 @@ SRC_URI="http://divx.euro.ru/${P}.tar.gz
 
 HOMEPAGE="http://divx.euro.ru/"
 
-DEPEND="virtual/glibc qt? ( >=x11-libs/qt-x11-2.2.2 ) >=media-libs/libsdl-1.1.5  app-arch/unzip"
-RDEPEND="virtual/glibc qt? ( >=x11-libs/qt-x11-2.2.2 ) >=media-libs/libsdl-1.1.5"
+DEPEND="virtual/glibc qt? ( >=x11-libs/qt-2.2.2 ) >=media-libs/libsdl-1.1.5  app-arch/unzip"
+RDEPEND="virtual/glibc qt? ( >=x11-libs/qt-2.2.2 ) >=media-libs/libsdl-1.1.5"
 
 src_unpack() {
   unpack ${P}.tar.gz
@@ -21,16 +21,18 @@ src_compile() {
     local myconf
     if [ -z "`use qt`" ] ; then
       myconf="$myconf --disable-qt"
+    else
+      myconf="$myconf --with-qt-dir=/usr/qt/2"
     fi
     if [ "`use nas`" ] ; then
 	LDFLAGS="-L/usr/X11R6/lib -lXt"
     fi
     export CFLAGS=${CFLAGS/-O?/-O2}
-    try LDFLAGS="$LDFLAGS" ./configure --prefix=/usr --host=${CHOST} --disable-tsc $myconf
+    LDFLAGS="$LDFLAGS" ./configure --prefix=/usr --host=${CHOST} --disable-tsc $myconf || die
     cp Makefile Makefile.orig
     sed -e "s:/usr/lib/win32:${D}/usr/lib/win32:" \
 	Makefile.orig > Makefile
-    try make
+    make || die
     #cd xmps-avi-plugin
     #cp Makefile Makefile.orig
     #sed -e "s:INCLUDES = :INCLUDES = -I/usr/X11R6/include -I/usr/include/glib/include -I/opt/gnome/include:" \
diff --git a/media-video/avifile/avifile-0.6.0.20010503-r1.ebuild b/media-video/avifile/avifile-0.6.0.20010503-r1.ebuild
index bd337c52592b..d524c3e92e7b 100644
--- a/media-video/avifile/avifile-0.6.0.20010503-r1.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-r1.ebuild,v 1.2 2001/10/07 08:05:06 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.6.0.20010503-r1.ebuild,v 1.3 2001/12/29 17:41:37 danarmak Exp $
 
 S=${WORKDIR}/${PN}-0.6.0
 DESCRIPTION="Library for AVI-Files"
@@ -10,8 +10,8 @@ SRC_URI="http://www.directfb.org/download/contrib/${P}.tar.gz
 
 HOMEPAGE="http://divx.euro.ru/"
 
-DEPEND="virtual/glibc qt? ( >=x11-libs/qt-x11-2.3.1-r1 ) >=media-libs/libsdl-1.1.5  app-arch/unzip"
-RDEPEND="virtual/glibc qt? ( >=x11-libs/qt-x11-2.2.2 ) >=media-libs/libsdl-1.1.5"
+DEPEND="virtual/glibc qt? ( >=x11-libs/qt-2.3.1-r1 ) >=media-libs/libsdl-1.1.5  app-arch/unzip"
+RDEPEND="virtual/glibc qt? ( >=x11-libs/qt-2.2.2 ) >=media-libs/libsdl-1.1.5"
 
 src_unpack() {
   unpack ${P}.tar.gz
@@ -22,18 +22,18 @@ src_compile() {
     if [ -z "`use qt`" ] ; then
       myconf="$myconf --disable-qt"
     else
-      myconf="$myconf --with-qt-includes=$QTDIR/include --with-qt-libraries=$QTDIR/lib"
+      myconf="$myconf --with-qt-dir=/usr/qt/2"
     fi
     if [ "`use nas`" ] ; then
 	LDFLAGS="-L/usr/X11R6/lib -lXt"
     fi
     export CFLAGS=${CFLAGS/-O?/-O2}
-    try LDFLAGS="$LDFLAGS" ./configure --prefix=/usr --host=${CHOST} \
-	--enable-quiet --disable-tsc $myconf
+    LDFLAGS="$LDFLAGS" ./configure --prefix=/usr --host=${CHOST} \
+	--enable-quiet --disable-tsc $myconf || die
 #    cp Makefile Makefile.orig
 #    sed -e "s:/usr/lib/win32:${D}/usr/lib/win32:" \
 #	Makefile.orig > Makefile
-    try make
+    make || die
 }
 
 src_install () {
diff --git a/media-video/avifile/avifile-0.6.0.20011003-r1.ebuild b/media-video/avifile/avifile-0.6.0.20011003-r1.ebuild
index f23981bfb6a6..23f7c3b861c4 100644
--- a/media-video/avifile/avifile-0.6.0.20011003-r1.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-r1.ebuild,v 1.2 2001/10/07 08:05:06 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.6.0.20011003-r1.ebuild,v 1.3 2001/12/29 17:41:37 danarmak Exp $
 
 P=${PN}-0.6.0-20011003
 S=${WORKDIR}/${PN}-0.6.0
@@ -12,8 +12,8 @@ SRC_URI="http://avifile.sourceforge.net/${P}.tgz
 
 HOMEPAGE="http://divx.euro.ru/"
 
-DEPEND="virtual/glibc qt? ( >=x11-libs/qt-x11-2.2.2 ) >=media-libs/libsdl-1.1.5  app-arch/unzip"
-RDEPEND="virtual/glibc qt? ( >=x11-libs/qt-x11-2.2.2 ) >=media-libs/libsdl-1.1.5"
+DEPEND="virtual/glibc qt? ( >=x11-libs/qt-2.2.2 ) >=media-libs/libsdl-1.1.5  app-arch/unzip"
+RDEPEND="virtual/glibc qt? ( >=x11-libs/qt-2.2.2 ) >=media-libs/libsdl-1.1.5"
 
 src_unpack() {
   unpack ${P}.tgz
@@ -23,17 +23,19 @@ src_compile() {
     local myconf
     if [ -z "`use qt`" ] ; then
       myconf="$myconf --disable-qt"
+    else
+      myconf="$myconf --with-qt-dir=/usr/qt/2"
     fi
     if [ "`use nas`" ] ; then
 	LDFLAGS="-L/usr/X11R6/lib -lXt"
     fi
     export CFLAGS=${CFLAGS/-O?/-O2}
-    try LDFLAGS="$LDFLAGS" ./configure --prefix=/usr --host=${CHOST} \
-	--enable-quiet --disable-tsc $myconf
+    LDFLAGS="$LDFLAGS" ./configure --prefix=/usr --host=${CHOST} \
+	--enable-quiet --disable-tsc $myconf || die
 #    cp Makefile Makefile.orig
 #    sed -e "s:/usr/lib/win32:${D}/usr/lib/win32:" \
 #	Makefile.orig > Makefile
-    try make
+    make || die
 }
 
 src_install () {
diff --git a/media-video/avifile/avifile-0.6.0.20011026.ebuild b/media-video/avifile/avifile-0.6.0.20011026.ebuild
index 0ed38f220ca2..08ca4beae222 100644
--- a/media-video/avifile/avifile-0.6.0.20011026.ebuild
+++ b/media-video/avifile/avifile-0.6.0.20011026.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.20011026.ebuild,v 1.1 2001/11/02 15:44:31 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.6.0.20011026.ebuild,v 1.2 2001/12/29 17:41:37 danarmak Exp $
 
 P0=${PN}-0.6.0-20011026
 S=${WORKDIR}/${PN}0.6-0.6.4
@@ -12,8 +12,8 @@ SRC_URI="http://avifile.sourceforge.net/${P0}.tgz
 
 HOMEPAGE="http://divx.euro.ru/"
 
-DEPEND="virtual/glibc qt? ( >=x11-libs/qt-x11-2.2.2 ) >=media-libs/libsdl-1.1.5  app-arch/unzip >=media-libs/divx4linux-20011025"
-RDEPEND="virtual/glibc qt? ( >=x11-libs/qt-x11-2.2.2 ) >=media-libs/libsdl-1.1.5 >=media-libs/divx4linux-20011025"
+DEPEND="virtual/glibc qt? ( >=x11-libs/qt-2.2.2 ) >=media-libs/libsdl-1.1.5  app-arch/unzip >=media-libs/divx4linux-20011025"
+RDEPEND="virtual/glibc qt? ( >=x11-libs/qt-2.2.2 ) >=media-libs/libsdl-1.1.5 >=media-libs/divx4linux-20011025"
 
 src_unpack() {
   unpack ${P0}.tgz
@@ -24,18 +24,20 @@ src_compile() {
     local myconf
     if [ -z "`use qt`" ] ; then
       myconf="$myconf --disable-qt"
+    else
+      myconf="$myconf --with-qt-dir=/usr/qt/2"
     fi
     if [ "`use nas`" ] ; then
 	LDFLAGS="-L/usr/X11R6/lib -lXt"
     fi
     export CFLAGS=${CFLAGS/-O?/-O2}
     export LDFLAGS
-    try ./configure --prefix=/usr --host=${CHOST} \
-	--enable-quiet --disable-tsc $myconf
+    ./configure --prefix=/usr --host=${CHOST} \
+	--enable-quiet --disable-tsc $myconf || die
 #    cp Makefile Makefile.orig
 #    sed -e "s:/usr/lib/win32:${D}/usr/lib/win32:" \
 #	Makefile.orig > Makefile
-    try make
+    make || die
 }
 
 src_install () {
diff --git a/media-video/avifile/avifile-0.6.0.20011109.ebuild b/media-video/avifile/avifile-0.6.0.20011109.ebuild
index f4f5ebc4dd48..028cbbb3c0cb 100644
--- a/media-video/avifile/avifile-0.6.0.20011109.ebuild
+++ b/media-video/avifile/avifile-0.6.0.20011109.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.20011109.ebuild,v 1.4 2001/11/15 14:30:14 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.6.0.20011109.ebuild,v 1.5 2001/12/29 17:41:37 danarmak Exp $
 
 P0=${PN}-0.6.0-20011109
 S=${WORKDIR}/${P0}
@@ -12,7 +12,7 @@ SRC_URI="http://avifile.sourceforge.net/${P0}.tgz
 
 HOMEPAGE="http://divx.euro.ru/"
 
-RDEPEND="virtual/glibc qt? ( >=x11-libs/qt-x11-2.2.2 ) >=media-libs/libsdl-1.2.2 >=media-libs/divx4linux-20011025 >=media-sound/mad-0.14"
+RDEPEND="virtual/glibc qt? ( >=x11-libs/qt-2.2.2 ) >=media-libs/libsdl-1.2.2 >=media-libs/divx4linux-20011025 >=media-sound/mad-0.14"
 DEPEND="$RDEPEND app-arch/unzip"
 
 src_unpack() {
@@ -23,6 +23,8 @@ src_compile() {
     local myconf
     if [ -z "`use qt`" ] ; then
       myconf="$myconf --disable-qt"
+    else
+      myconf="$myconf --with-qt-dir=/usr/qt/2"
     fi
     if [ "`use nas`" ] ; then
 	LDFLAGS="-L/usr/X11R6/lib -lXt"
diff --git a/media-video/avifile/avifile-0.6.0.20011130.ebuild b/media-video/avifile/avifile-0.6.0.20011130.ebuild
index bb0220af1017..c3ac2f86860d 100644
--- a/media-video/avifile/avifile-0.6.0.20011130.ebuild
+++ b/media-video/avifile/avifile-0.6.0.20011130.ebuild
@@ -14,13 +14,15 @@ HOMEPAGE="http://divx.euro.ru/"
 DEPEND="media-libs/win32codecs
 	>=media-libs/libsdl-1.2.2
 	>=media-libs/divx4linux-20011025
-	qt? ( >=x11-libs/qt-x11-2.2.2 )
+	qt? ( >=x11-libs/qt-2.2.2 )
 	nas? ( >=media-libs/nas-1.4.2 )"
 
 src_compile() {
     local myconf
     if [ -z "`use qt`" ] ; then
       myconf="$myconf --disable-qt"
+    else
+      myconf="$myconf --with-qt-dir=/usr/qt/2"
     fi
     if [ "`use nas`" ] ; then
 	LDFLAGS="-L/usr/X11R6/lib -lXt"