moved and unmasked avi-xmms to media-plugins

7 files changed, 70 insertions, 8 deletions

diff --git a/app-doc/qt-docs/qt-docs-3.0.5.ebuild b/app-doc/qt-docs/qt-docs-3.0.5.ebuild
index a4a1f43bd8e4..a78075fea4d0 100644
--- a/app-doc/qt-docs/qt-docs-3.0.5.ebuild
+++ b/app-doc/qt-docs/qt-docs-3.0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-doc/qt-docs/qt-docs-3.0.5.ebuild,v 1.4 2002/08/02 05:03:34 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/qt-docs/qt-docs-3.0.5.ebuild,v 1.5 2002/08/30 16:50:01 seemant Exp $
 
 S=${WORKDIR}/qt-x11-free-$PV
 SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.gz"
@@ -37,5 +37,3 @@ src_install() {
 	cp -r ${S}/tutorial ${D}/${QTBASE}
 
 }
-
-
diff --git a/media-plugins/avi-xmms/ChangeLog b/media-plugins/avi-xmms/ChangeLog
new file mode 100644
index 000000000000..b5bd1d28484a
--- /dev/null
+++ b/media-plugins/avi-xmms/ChangeLog
@@ -0,0 +1,34 @@
+# ChangeLog for media-plugins/avi-xmms
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/avi-xmms/ChangeLog,v 1.1 2002/08/30 16:50:01 seemant Exp $
+
+*avi-xmms-1.2.3 (23 Aug 2002)
+
+  30 Aug 2002; Seemant Kulleen <seemant@gentoo.org> *:
+
+  Relocated to media-plugins
+
+  23 Aug 2002; Seemant Kulleen <seemant@gentoo.org> avi-xmms-1.2.3.ebuild
+  files/digest-avi-xmms-1.2.3 :
+
+  Courtesy of Olle Hällnäs <olle@xmms.org>, a new version of avi-xmms has
+  come out, which has avifile statically compiled, so that the system's
+  avifile version is independent of this.
+
+*avi-xmms-1.2.2-r3 (28 Mar 2002)
+
+  28 Mar 2002; Seemant Kulleen <seemant@gentoo.org> avi-xmms-1.2.2-r3.ebuild :
+
+  This ebuild is now just a virtual package for avi4xmms.  Eventually, avi-xmms
+  will be removed completely (unless 4Front Technologies releases a version
+  that is compatible with avifile-0.6).
+
+*avi-xmms-1.2.2-r2 (1 Feb 2002)
+
+  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
+  
+  Added initial ChangeLog which should be updated whenever the package is
+  updated in any way. This changelog is targetted to users. This means that the
+  comments should well explained and written in clean English. The details about
+  writing correct changelogs are explained in the skel.ChangeLog file which you
+  can find in the root directory of the portage repository.
diff --git a/media-plugins/avi-xmms/avi-xmms-1.2.3.ebuild b/media-plugins/avi-xmms/avi-xmms-1.2.3.ebuild
new file mode 100644
index 000000000000..f1d4b8d16c81
--- /dev/null
+++ b/media-plugins/avi-xmms/avi-xmms-1.2.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/avi-xmms/avi-xmms-1.2.3.ebuild,v 1.1 2002/08/30 16:50:01 seemant Exp $
+
+inherit flag-o-matic
+
+S=${WORKDIR}/${P}
+DESCRIPTION="A xmms plugin for AVI/DivX movies"
+SRC_URI="http://www.xmms.org/files/plugins/avi-xmms/${P}.tar.gz"
+HOMEPAGE="http://www.xmms.org/plugins_input.html"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
+DEPEND="media-sound/xmms
+	media-libs/libsdl"
+
+src_compile() {
+	filter-flags -fno-exceptions
+
+	econf || die
+	emake || die
+}
+
+src_install () {
+	make libdir=/usr/lib/xmms/Input DESTDIR=${D} install || die
+	dodoc AUTHORS COPYING ChangeLog README TODO
+}
diff --git a/media-plugins/avi-xmms/files/digest-avi-xmms-1.2.3 b/media-plugins/avi-xmms/files/digest-avi-xmms-1.2.3
new file mode 100644
index 000000000000..274ce48a3aca
--- /dev/null
+++ b/media-plugins/avi-xmms/files/digest-avi-xmms-1.2.3
@@ -0,0 +1 @@
+MD5 1eb3ce58d21ec00b38d7786363ff271c avi-xmms-1.2.3.tar.gz 703044
diff --git a/profiles/package.mask b/profiles/package.mask
index 0a0c932d0809..0115af6b2838 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -133,9 +133,7 @@ dev-perl/CDDB-File
 # masked for testing.  x3270 for version bump, and xmms for removal of avi
 # stuff, gpgme for version bump.
 =net-misc/x3270-3.2.19
-=media-sound/xmms-1.2.7-r13
 =media-video/avi4xmms-0.1-r2
-=app-crypt/gpgme-0.3.9
 
 # <blizzy@gentoo.org> (23 Aug 2002)
 # masked for testing
@@ -975,8 +973,9 @@ dev-lang/tcl-tk
 #seemant@gentoo.org 19 Mar 2002
 # Masking avi-xmms because it will not compile against avifile-0.6, instead
 # xmms has a hacked native support in it now for avi playing against avifile-0.6
+# 30 Aug 2002; Seemant Kulleen: avi-xmms is now statically compiled against
+# avifile, so it has been restored to portage.
 <media-video/avifile-0.6
->=media-video/avi-xmms-1.2.2-r2
 
 
 #seemant@gentoo.org 20 Mar 2002
diff --git a/profiles/updates/3Q-2002 b/profiles/updates/3Q-2002
index f60e16844d84..8b720db53c97 100644
--- a/profiles/updates/3Q-2002
+++ b/profiles/updates/3Q-2002
@@ -73,3 +73,4 @@ move media-sound/xmms-sid media-plugins/xmms-sid
 move media-sound/xmms-status-plugin media-plugins/xmms-status-plugin
 move media-sound/xmms-volnorm media-plugins/xmms-volnorm
 move media-sound/xmms-xosd media-plugins/xmms-xosd
+move media-video/avi-xmms media-plugins/avi-xmms
diff --git a/x11-libs/gtk+/gtk+-1.2.10-r8.ebuild b/x11-libs/gtk+/gtk+-1.2.10-r8.ebuild
index e4c208cd794f..865fffce7076 100644
--- a/x11-libs/gtk+/gtk+-1.2.10-r8.ebuild
+++ b/x11-libs/gtk+/gtk+-1.2.10-r8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-1.2.10-r8.ebuild,v 1.8 2002/08/14 13:05:59 murphy Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-1.2.10-r8.ebuild,v 1.9 2002/08/30 16:50:01 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="The GIMP Toolkit"
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.gtk.org/pub/gtk/v1.2/${P}.tar.gz
 	http://ftp.gnome.org/pub/GNOME/stable/sources/gtk+/${P}.tar.gz
 	http://www.ibiblio.org/gentoo/distfiles/gtk+-1.2.10-r8-gentoo.diff.bz2"
 
-DEPEND="virtual/glibc virtual/x11
+DEPEND="virtual/x11
 	=dev-libs/glib-1.2*
 	nls? ( sys-devel/gettext
 	dev-util/intltool )"