*** empty log message ***

11 files changed, 36 insertions, 96 deletions

diff --git a/ChangeLog b/ChangeLog
index 6b9465d8b0ca..1c1760c90ac5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 05.10.2999
 
+	- Update aviplay 0.47.3 -> 0.48		(achim)
 	- Update sawfish 0.30.3 -> 0.31.1	(achim)
 	- Update whois 4.5.0 -> 4.5.1		(achim)
 	- Update rsync 2.4.5 -> 2.4.6		(achim)
diff --git a/app-office/abiword/abiword-0.7.10.ebuild b/app-office/abiword/abiword-0.7.10.ebuild
deleted file mode 100644
index e157ba522e84..000000000000
--- a/app-office/abiword/abiword-0.7.10.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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/app-office/abiword/abiword-0.7.10.ebuild,v 1.3 2000/09/15 20:08:57 drobbins Exp $
-
-P=abiword-0.7.10
-A="abi-0.7.10.tar.gz abidistfiles-0.7.10.tar.gz expat-0.7.10.tar.gz 
-   unixfonts-0.7.10.tar.gz wv-0.7.10.tar.gz"
-S=${WORKDIR}/abi-0.7.10
-DESCRIPTION="Framework for creating database applications"
-SRC_URI="http://download.abisource.com/releases/0.7.10/src/lf/abi-0.7.10.tar.gz
-	 http://download.abisource.com/releases/0.7.10/src/lf/abidistfiles-0.7.10.tar.gz 
-	 http://download.abisource.com/releases/0.7.10/src/lf/expat-0.7.10.tar.gz 
-	 http://download.abisource.com/releases/0.7.10/src/lf/unixfonts-0.7.10.tar.gz 
-	 http://download.abisource.com/releases/0.7.10/src/lf/wv-0.7.10.tar.gz"
-
-	
-HOMEPAGE="http://www.gnome.org/gnome-office/abiword.shtml/"
-
-src_unpack() {
-  unpack ${A}
-  cd ${S}
-}
-
-src_compile() {                           
-  cd ${S}
-  try make prefix=/opt/gnome/ UNIX_CAN_BUILD_STATIC=0
-}
-
-src_install() {                               
-  cd ${S}
-  try make prefix=${D}/opt/gnome  UNIX_CAN_BUILD_STATIC=0 install
-}
-
-
-
-
diff --git a/app-office/abiword/files/digest-abiword-0.7.10 b/app-office/abiword/files/digest-abiword-0.7.10
deleted file mode 100644
index 913c91e1e809..000000000000
--- a/app-office/abiword/files/digest-abiword-0.7.10
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 3caa34f2698d5b29240b59d4e80dbcbb abi-0.7.10.tar.gz
-MD5 1d95aa15cb355d238c853f1f254f0f4f abidistfiles-0.7.10.tar.gz
-MD5 fa7137a2b8a9688b97e5a0359ee308ad expat-0.7.10.tar.gz
-MD5 4bb4899dd0aec17ddee8787d3a5a7e36 unixfonts-0.7.10.tar.gz
-MD5 c3c984b79b3cc1554022552c1e4a3c4e wv-0.7.10.tar.gz
diff --git a/current-packages b/current-packages
index 6ff2191fe062..4339f1e4045f 100644
--- a/current-packages
+++ b/current-packages
@@ -175,7 +175,7 @@
 ./media-gfx/imagemagick/imagemagick-5.2.4.ebuild
 ./media-libs/alsa-lib/alsa-lib-0.5.9.ebuild
 ./media-libs/audiofile/audiofile-0.1.9.ebuild
-./media-libs/avifile/avifile-0.47.3.ebuild 
+./media-libs/avifile/avifile-0.48.ebuild 
 ./media-libs/fnlib/fnlib-0.5.ebuild
 ./media-libs/freetype/freetype-1.3.1-r1.ebuild
 ./media-libs/giflib/giflib-4.1.0-r1.ebuild
diff --git a/gnome-office/abiword/abiword-0.7.10.ebuild b/gnome-office/abiword/abiword-0.7.10.ebuild
deleted file mode 100644
index d1c0893c7dd3..000000000000
--- a/gnome-office/abiword/abiword-0.7.10.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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/gnome-office/abiword/abiword-0.7.10.ebuild,v 1.3 2000/09/15 20:08:57 drobbins Exp $
-
-P=abiword-0.7.10
-A="abi-0.7.10.tar.gz abidistfiles-0.7.10.tar.gz expat-0.7.10.tar.gz 
-   unixfonts-0.7.10.tar.gz wv-0.7.10.tar.gz"
-S=${WORKDIR}/abi-0.7.10
-DESCRIPTION="Framework for creating database applications"
-SRC_URI="http://download.abisource.com/releases/0.7.10/src/lf/abi-0.7.10.tar.gz
-	 http://download.abisource.com/releases/0.7.10/src/lf/abidistfiles-0.7.10.tar.gz 
-	 http://download.abisource.com/releases/0.7.10/src/lf/expat-0.7.10.tar.gz 
-	 http://download.abisource.com/releases/0.7.10/src/lf/unixfonts-0.7.10.tar.gz 
-	 http://download.abisource.com/releases/0.7.10/src/lf/wv-0.7.10.tar.gz"
-
-	
-HOMEPAGE="http://www.gnome.org/gnome-office/abiword.shtml/"
-
-src_unpack() {
-  unpack ${A}
-  cd ${S}
-}
-
-src_compile() {                           
-  cd ${S}
-  try make prefix=/opt/gnome/ UNIX_CAN_BUILD_STATIC=0
-}
-
-src_install() {                               
-  cd ${S}
-  try make prefix=${D}/opt/gnome  UNIX_CAN_BUILD_STATIC=0 install
-}
-
-
-
-
diff --git a/gnome-office/abiword/files/digest-abiword-0.7.10 b/gnome-office/abiword/files/digest-abiword-0.7.10
deleted file mode 100644
index 913c91e1e809..000000000000
--- a/gnome-office/abiword/files/digest-abiword-0.7.10
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 3caa34f2698d5b29240b59d4e80dbcbb abi-0.7.10.tar.gz
-MD5 1d95aa15cb355d238c853f1f254f0f4f abidistfiles-0.7.10.tar.gz
-MD5 fa7137a2b8a9688b97e5a0359ee308ad expat-0.7.10.tar.gz
-MD5 4bb4899dd0aec17ddee8787d3a5a7e36 unixfonts-0.7.10.tar.gz
-MD5 c3c984b79b3cc1554022552c1e4a3c4e wv-0.7.10.tar.gz
diff --git a/media-libs/avifile/avifile-0.47.3.ebuild b/media-libs/avifile/avifile-0.47.3.ebuild
index 351de755f086..5244bae16d5d 100644
--- a/media-libs/avifile/avifile-0.47.3.ebuild
+++ b/media-libs/avifile/avifile-0.47.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 Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-libs/avifile/avifile-0.47.3.ebuild,v 1.1 2000/09/19 01:19:46 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/avifile/avifile-0.47.3.ebuild,v 1.2 2000/10/05 20:45:06 achim Exp $
 
 A="${P}.tar.gz binaries.zip"
 S=${WORKDIR}/${P}
@@ -22,6 +22,7 @@ src_unpack () {
     cp configure configure.orig
     sed -e "s:/usr/lib/win32:$WIN32:" configure.orig > configure
 
+
     cd ${S}/lib/loader
 
     cp elfdll.c elfdll.c.orig
@@ -45,6 +46,9 @@ src_compile() {
 
     cd ${S}
     try ./configure --prefix=/usr/X11R6 --host=${CHOST} 
+    cp Makefile Makefile.orig
+    sed -e "s:/usr/libexec/avifile/win32:${D}/usr/libexec/avifile/win32:" \
+	Makefile.orig > Makefile
     try make
     cd xmps-avi-plugin
     try make
@@ -55,14 +59,16 @@ src_install () {
 
     cd ${S}
     dodir /usr/X11R6/lib /usr/X11R6/bin
-    try make prefix=${D}/usr/X11R6 install
+    dodir /usr/libexec/avifile/win32
+
+    make prefix=${D}/usr/X11R6 install
 
     cd xmps-avi-plugin
     insinto /usr/X11R6/lib/xmps/Codecs
     insopts -m755
     doins libavi.so
 
-    dodir /usr/libexec/avifile/win32
+
     cd ${D}/usr/libexec/avifile/win32
     unzip ${DISTDIR}/binaries.zip
     cd ${S}
diff --git a/media-libs/avifile/avifile-0.46.1.ebuild b/media-libs/avifile/avifile-0.48.ebuild
index 426392f10cb8..f6738f585e98 100644
--- a/media-libs/avifile/avifile-0.46.1.ebuild
+++ b/media-libs/avifile/avifile-0.48.ebuild
@@ -1,13 +1,13 @@
 # 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/avifile/avifile-0.46.1.ebuild,v 1.4 2000/09/15 20:09:01 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/avifile/avifile-0.48.ebuild,v 1.1 2000/10/05 20:45:06 achim Exp $
 
 A="${P}.tar.gz binaries.zip"
 S=${WORKDIR}/${P}
 DESCRIPTION="Library for AVI-Files"
-SRC_URI="http://divx.euro.ru/${P}.tar.gz
-	 http://divx.euro.ru/binaries.zip"
+SRC_URI="ftp://ftp.e1.bmstu.ru/pub/devtools/SDL/AVI/${P}.tar.gz
+	 ftp://ftp.e1.bmstu.ru/pub/devtools/SDL/AVI/binaries.zip"
 
 HOMEPAGE="http://divx.euro.ru/"
 
@@ -22,6 +22,7 @@ src_unpack () {
     cp configure configure.orig
     sed -e "s:/usr/lib/win32:$WIN32:" configure.orig > configure
 
+
     cd ${S}/lib/loader
 
     cp elfdll.c elfdll.c.orig
@@ -37,6 +38,7 @@ src_unpack () {
     cp mywidget.cpp mywidget.cpp.orig
     sed -e "s:/usr/lib/win32:$WIN32:" mywidget.cpp.orig > mywidget.cpp
 
+    cp ${FILESDIR}/capproc.cpp ${S}/samples/qtvidcap
 
 }
 
@@ -44,7 +46,11 @@ src_compile() {
 
     cd ${S}
     try ./configure --prefix=/usr/X11R6 --host=${CHOST} 
-
+    cp Makefile Makefile.orig
+    sed -e "s:/usr/libexec/avifile/win32:${D}/usr/libexec/avifile/win32:" \
+	Makefile.orig > Makefile
+    try make
+    cd xmps-avi-plugin
     try make
 
 }
@@ -53,8 +59,16 @@ src_install () {
 
     cd ${S}
     dodir /usr/X11R6/lib /usr/X11R6/bin
-    try make prefix=${D}/usr/X11R6 install
     dodir /usr/libexec/avifile/win32
+
+    make prefix=${D}/usr/X11R6 install
+
+    cd xmps-avi-plugin
+    insinto /usr/X11R6/lib/xmps/Codecs
+    insopts -m755
+    doins libavi.so
+
+
     cd ${D}/usr/libexec/avifile/win32
     unzip ${DISTDIR}/binaries.zip
     cd ${S}
diff --git a/media-libs/avifile/files/digest-avifile-0.46.1 b/media-libs/avifile/files/digest-avifile-0.46.1
deleted file mode 100644
index e30fc0b373da..000000000000
--- a/media-libs/avifile/files/digest-avifile-0.46.1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 d33e980a6ece2360ceba83756670add2 avifile-0.46.1.tar.gz
-MD5 6df7c0a266ba6e8c022160605791644b binaries.zip
diff --git a/media-libs/avifile/files/digest-avifile-0.48 b/media-libs/avifile/files/digest-avifile-0.48
new file mode 100644
index 000000000000..6693c747bc88
--- /dev/null
+++ b/media-libs/avifile/files/digest-avifile-0.48
@@ -0,0 +1,2 @@
+MD5 1ef3dc746db373f34288922901577245 avifile-0.48.tar.gz
+MD5 6df7c0a266ba6e8c022160605791644b binaries.zip
diff --git a/media-video/xmps/xmps-0.1.3-r1.ebuild b/media-video/xmps/xmps-0.1.3-r1.ebuild
index 3c074bf922f0..a5f1fa81e594 100644
--- a/media-video/xmps/xmps-0.1.3-r1.ebuild
+++ b/media-video/xmps/xmps-0.1.3-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/xmps/xmps-0.1.3-r1.ebuild,v 1.3 2000/09/15 20:09:06 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xmps/xmps-0.1.3-r1.ebuild,v 1.4 2000/10/05 20:45:06 achim Exp $
 
 P=xmps-0.1.3
 A=${P}.tar.gz
@@ -15,6 +15,9 @@ src_compile() {
     cd ${S}
     try ./configure --prefix=/usr/X11R6 --host=${CHOST} \
 	--with-catgets
+    cp Makefile Makefile.orig
+    sed -e "s:\$(bindir)/xmps-config:\$(DESTDIR)\$(bindir)/xmps-config:" \
+	Makefile.orig > Makefile
     try make
 
 }