Merge branch 'master' of http://dberkholz@overlays.gentoo.org/git/dev/dberkholz

Conflicts:

	media-libs/mesa/Manifest

13 files changed, 202 insertions, 13 deletions

diff --git a/media-libs/gnonlin/ChangeLog b/media-libs/gnonlin/ChangeLog
new file mode 100644
index 0000000..389b198
--- /dev/null
+++ b/media-libs/gnonlin/ChangeLog
@@ -0,0 +1,31 @@
+# ChangeLog for media-libs/gnonlin
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gnonlin/ChangeLog,v 1.5 2006/05/11 14:26:57 zaheerm Exp $
+
+*gnonlin-0.10.4 (11 May 2006)
+
+  11 May 2006; Zaheer Abbas Merali <zaheerm@gentoo.org>
+  -gnonlin-0.10.3.ebuild, +gnonlin-0.10.4.ebuild:
+  version bump
+
+  27 Apr 2006; Marien Zwart <marienz@gentoo.org> Manifest:
+  Fixing SHA256 digest, pass four
+
+*gnonlin-0.10.3 (26 Apr 2006)
+
+  26 Apr 2006; Zaheer Abbas Merali <zaheerm@gentoo.org>
+  -gnonlin-0.10.1.ebuild, -gnonlin-0.10.2.ebuild, +gnonlin-0.10.3.ebuild:
+  version bump
+
+*gnonlin-0.10.2 (21 Apr 2006)
+
+  21 Apr 2006; Zaheer Abbas Merali <zaheerm@gentoo.org>
+  +gnonlin-0.10.2.ebuild:
+  version bump
+
+*gnonlin-0.10.1 (07 Apr 2006)
+
+  07 Apr 2006; Zaheer Abbas Merali <zaheerm@gentoo.org> +metadata.xml,
+  +gnonlin-0.10.1.ebuild:
+  Initial import
+
diff --git a/media-libs/gnonlin/Manifest b/media-libs/gnonlin/Manifest
new file mode 100644
index 0000000..5294be9
--- /dev/null
+++ b/media-libs/gnonlin/Manifest
@@ -0,0 +1,16 @@
+DIST gnonlin-0.10.7.tar.bz2 362704 RMD160 6d1bec3f603ac9d277526b840b3c8e68d3c1909b SHA1 d4c3223e00c24c38cd5f539433d3a7d0cb058720 SHA256 32eb49d5d8bbe08c39425fbc738feab459161ab25d835a4623b19f8fbf66c799
+EBUILD gnonlin-0.10.7.ebuild 727 RMD160 689af2b2222939d88686b9e7fe9b6f4ad0c58910 SHA1 c30aaef554f6608209c8ccb7dde6cb39e3f36615 SHA256 6b68bbebb94653c592c01b5ffba0da7059719ae601a1ef6654bf568844827a7c
+MD5 f240677eaf0f3f44ba529ff16f65c17d gnonlin-0.10.7.ebuild 727
+RMD160 689af2b2222939d88686b9e7fe9b6f4ad0c58910 gnonlin-0.10.7.ebuild 727
+SHA256 6b68bbebb94653c592c01b5ffba0da7059719ae601a1ef6654bf568844827a7c gnonlin-0.10.7.ebuild 727
+MISC ChangeLog 909 RMD160 ba4ca9c84ac81e6be5ef343ee7bafe036a6cc666 SHA1 54505007556a36de2198880252056f79f48e1d20 SHA256 1286deaec8724b624ecb1ddcd035c3213e351de8133ff6450f7dd5eb35cc4159
+MD5 967de8aa18cd5ff409482af9fc7449b5 ChangeLog 909
+RMD160 ba4ca9c84ac81e6be5ef343ee7bafe036a6cc666 ChangeLog 909
+SHA256 1286deaec8724b624ecb1ddcd035c3213e351de8133ff6450f7dd5eb35cc4159 ChangeLog 909
+MISC metadata.xml 162 RMD160 c6078d82a9ff46dbb283bc14ade9d117144cca67 SHA1 f46f8ccd62374b17183b5aca523c4dcf60d718f9 SHA256 3ac891ee23de8c6e2bef32e0c7aa3e6607e808de76ed723fbe7a1fb92f6093f1
+MD5 6050196ef420c3e4025029ebee5a813f metadata.xml 162
+RMD160 c6078d82a9ff46dbb283bc14ade9d117144cca67 metadata.xml 162
+SHA256 3ac891ee23de8c6e2bef32e0c7aa3e6607e808de76ed723fbe7a1fb92f6093f1 metadata.xml 162
+MD5 ca4ce1816132dab7ca1f5308da294bbb files/digest-gnonlin-0.10.7 247
+RMD160 46859a5a44d7abe731e09eddb3adc09136081ea0 files/digest-gnonlin-0.10.7 247
+SHA256 6af0d155e64dd5836a62fc6771c8cdfc5e0eaff2283a3815bb6fa1cec5ba81d1 files/digest-gnonlin-0.10.7 247
diff --git a/media-libs/gnonlin/files/digest-gnonlin-0.10.7 b/media-libs/gnonlin/files/digest-gnonlin-0.10.7
new file mode 100644
index 0000000..71ef11b
--- /dev/null
+++ b/media-libs/gnonlin/files/digest-gnonlin-0.10.7
@@ -0,0 +1,3 @@
+MD5 81f683b7fca9a035635977d1235a1bf5 gnonlin-0.10.7.tar.bz2 362704
+RMD160 6d1bec3f603ac9d277526b840b3c8e68d3c1909b gnonlin-0.10.7.tar.bz2 362704
+SHA256 32eb49d5d8bbe08c39425fbc738feab459161ab25d835a4623b19f8fbf66c799 gnonlin-0.10.7.tar.bz2 362704
diff --git a/media-libs/gnonlin/gnonlin-0.10.7.ebuild b/media-libs/gnonlin/gnonlin-0.10.7.ebuild
new file mode 100644
index 0000000..8bbb73f
--- /dev/null
+++ b/media-libs/gnonlin/gnonlin-0.10.7.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gnonlin/gnonlin-0.10.5.ebuild,v 1.1 2006/07/21 12:38:27 zaheerm Exp $
+
+SRC_URI="http://gstreamer.freedesktop.org/src/${PN}/${P}.tar.bz2"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DESCRIPTION="Gnonlin is a set of GStreamer elements to ease the creation of non-linear multimedia editors."
+HOMEPAGE="http://gnonlin.sourceforge.net"
+LICENSE="LGPL-2"
+SLOT=0.10
+
+S=${WORKDIR}/${P}
+RDEPEND=">=media-libs/gstreamer-0.10.9
+	 >=media-libs/gst-plugins-base-0.10.9"
+
+DEPEND="${RDEPEND}"
+
+src_install() {
+	make DESTDIR=${D} install || die
+	dodoc AUTHORS README RELEASE INSTALL REQUIREMENTS
+}
diff --git a/media-libs/gnonlin/metadata.xml b/media-libs/gnonlin/metadata.xml
new file mode 100644
index 0000000..9e260ce
--- /dev/null
+++ b/media-libs/gnonlin/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gstreamer</herd>
+</pkgmetadata>
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 1fbd6c6..b412543 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -31,10 +31,10 @@ EBUILD mesa-6.5.3_rc1.ebuild 9306 RMD160 32d0af7ce89434bc880a85dee573ab6838e3282
 MD5 6dae90ebd0d1d82fb7b9df6e37b7147b mesa-6.5.3_rc1.ebuild 9306
 RMD160 32d0af7ce89434bc880a85dee573ab6838e32823 mesa-6.5.3_rc1.ebuild 9306
 SHA256 38a6e6f8946ad1aa49dae419d243c9b37703edda0c6c56ae41e4702be63c6d3b mesa-6.5.3_rc1.ebuild 9306
-EBUILD mesa-9999.ebuild 9159 RMD160 6c7e86a58db0d43c31a1404b7b581c3a17d0bbb1 SHA1 1eb5028e6058d40573a7db548bccd073ee75b288 SHA256 0586bcf4e1ec40e8f0e03b6233ada08b840f5d350e40061e834ea8de47c3dfc0
-MD5 0a0867026834f8c6198c05cf3f5f1be2 mesa-9999.ebuild 9159
-RMD160 6c7e86a58db0d43c31a1404b7b581c3a17d0bbb1 mesa-9999.ebuild 9159
-SHA256 0586bcf4e1ec40e8f0e03b6233ada08b840f5d350e40061e834ea8de47c3dfc0 mesa-9999.ebuild 9159
+EBUILD mesa-9999.ebuild 9033 RMD160 a78a598e8f0986a741f9f7a7dfe91cbb1b79c611 SHA1 d28ac7ec9963dd155b3aa0feec4e9b1eba71cfbe SHA256 0cc4a7b23adc0de69cfb039ebd17dd98931b99640dc1a7c5360aa838fc76fe56
+MD5 556b17c2b876d1316bfbea09aa071687 mesa-9999.ebuild 9033
+RMD160 a78a598e8f0986a741f9f7a7dfe91cbb1b79c611 mesa-9999.ebuild 9033
+SHA256 0cc4a7b23adc0de69cfb039ebd17dd98931b99640dc1a7c5360aa838fc76fe56 mesa-9999.ebuild 9033
 MD5 ebeca2ef7982590facbc88c2dac192ae files/digest-mesa-6.5.3_rc1 253
 RMD160 57c31532e914f2a5f831b58b706cf2dabd822aec files/digest-mesa-6.5.3_rc1 253
 SHA256 683e3dae23124a1b4d2bacd60b504b7d6ca5e2dd83266211ec988903ada3be8d files/digest-mesa-6.5.3_rc1 253
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 30ccc75..d290cca 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -2,20 +2,16 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.4.1-r1.ebuild,v 1.3 2005/12/26 13:49:10 stefaan Exp $
 
-inherit eutils toolchain-funcs multilib cvs flag-o-matic portability
+inherit eutils toolchain-funcs multilib git flag-o-matic portability
 
-ECVS_SERVER="pdx.freedesktop.org:/cvs/mesa"
-ECVS_MODULE="Mesa"
-S=${WORKDIR}/${ECVS_MODULE}
+EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
+SRC_URI=""
 
 OPENGL_DIR="xorg-x11"
 
-MY_PN="${PN/m/M}"
-MY_P="${MY_PN}-${PV}"
-MY_SRC_P="${MY_PN}Lib-${PV}"
+MY_SRC_P="${PN}Lib-${PV}"
 DESCRIPTION="OpenGL-like graphic library for Linux"
 HOMEPAGE="http://mesa3d.sourceforge.net/"
-#SRC_URI="mirror://sourceforge/mesa3d/${MY_SRC_P}.tar.bz2"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
@@ -103,7 +99,7 @@ pkg_setup() {
 src_unpack() {
 	HOSTCONF="${S}/configs/${CONFIG}"
 
-	cvs_src_unpack
+	git_src_unpack
 	cd ${S}
 	# FreeBSD 6.* doesn't have posix_memalign().
 	[[ ${CHOST} == *-freebsd6.* ]] && sed -i -e "s/-DHAVE_POSIX_MEMALIGN//" configs/freebsd{,-dri}
diff --git a/media-libs/swfdec-mozilla/Manifest b/media-libs/swfdec-mozilla/Manifest
new file mode 100644
index 0000000..cc8f3e2
--- /dev/null
+++ b/media-libs/swfdec-mozilla/Manifest
@@ -0,0 +1,8 @@
+DIST swfdec-mozilla-0.4.3.tar.gz 350850 RMD160 d202849eb684729fa22f7ad159fd417ed3775101 SHA1 ca9c4d7c111017bfc67bf28fff139ce19ba02f44 SHA256 4db8e245354c6b05ef2b297da1a72292b48d477653a6ff50b90cf3663ef0f8aa
+EBUILD swfdec-mozilla-0.4.3.ebuild 1069 RMD160 ec11a38b7a3b196c81cebb46a62ea79e08583a35 SHA1 7cf122b249f8c1a6bf37d9626797b2ec4ffc6c8e SHA256 a9b0ca908336952fdd9b62ab338a787fdb2f67ba97d0aa9672e61c5236e806f9
+MD5 1923f6aa8153e45a55c6e7626bb709ab swfdec-mozilla-0.4.3.ebuild 1069
+RMD160 ec11a38b7a3b196c81cebb46a62ea79e08583a35 swfdec-mozilla-0.4.3.ebuild 1069
+SHA256 a9b0ca908336952fdd9b62ab338a787fdb2f67ba97d0aa9672e61c5236e806f9 swfdec-mozilla-0.4.3.ebuild 1069
+MD5 54bf84939f30a691b9290852665d95be files/digest-swfdec-mozilla-0.4.3 262
+RMD160 f37f8b8102f530588addda8ea645cb9020ea2efc files/digest-swfdec-mozilla-0.4.3 262
+SHA256 77ee3b2233b1bd7bfa4ffd2dd9b3ffb1dfb988d937951e1f67f10a2adc1c29bd files/digest-swfdec-mozilla-0.4.3 262
diff --git a/media-libs/swfdec-mozilla/files/digest-swfdec-mozilla-0.4.3 b/media-libs/swfdec-mozilla/files/digest-swfdec-mozilla-0.4.3
new file mode 100644
index 0000000..0c2fca7
--- /dev/null
+++ b/media-libs/swfdec-mozilla/files/digest-swfdec-mozilla-0.4.3
@@ -0,0 +1,3 @@
+MD5 b2a412a9cd603e6769a402bd0b68451b swfdec-mozilla-0.4.3.tar.gz 350850
+RMD160 d202849eb684729fa22f7ad159fd417ed3775101 swfdec-mozilla-0.4.3.tar.gz 350850
+SHA256 4db8e245354c6b05ef2b297da1a72292b48d477653a6ff50b90cf3663ef0f8aa swfdec-mozilla-0.4.3.tar.gz 350850
diff --git a/media-libs/swfdec-mozilla/swfdec-mozilla-0.4.3.ebuild b/media-libs/swfdec-mozilla/swfdec-mozilla-0.4.3.ebuild
new file mode 100644
index 0000000..adeb673
--- /dev/null
+++ b/media-libs/swfdec-mozilla/swfdec-mozilla-0.4.3.ebuild
@@ -0,0 +1,38 @@
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils
+
+DESCRIPTION="Swfdec-mozilla is a decoder/renderer netscape style plugin for Macromedia Flash animations."
+HOMEPAGE="http://swfdec.freedesktop.org/"
+SRC_URI="http://swfdec.freedesktop.org/download/swfdec-mozilla/0.4/swfdec-mozilla-0.4.3.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="
+    >=media-libs/swfdec-0.4.3
+	|| ( www-client/mozilla-firefox
+	     www-client/seamonkey )"
+RDEPEND=""
+
+src_compile() {
+	econf || die "Configure Failed"
+	emake || die "Make failed"
+}
+
+src_install() {
+	exeinto /usr/$(get_libdir)/nsbrowser/plugins 
+		doexe src/.libs/libswfdecmozilla.so || die "libswfdecmozilla.so failed"
+		#/usr/$(get_libdir)/nsbrowser/plugins/libswfdecmozilla.so
+
+	insinto /usr/$(get_libdir)/nsbrowser/plugins
+		doins src/libswfdecmozilla.la || die "libswfdecmozilla.la failed"
+		#/usr/$(get_libdir)/nsbrowser/plugins/libswfdecmozilla.la 
+
+}
+
+pkg_postinst() {
+	einfo "=) \o/ (="
+	einfo "Remember to report bugs to: https://bugzilla.freedesktop.org"
+}
diff --git a/media-libs/swfdec/Manifest b/media-libs/swfdec/Manifest
new file mode 100644
index 0000000..2c44792
--- /dev/null
+++ b/media-libs/swfdec/Manifest
@@ -0,0 +1,8 @@
+DIST swfdec-0.4.3.tar.gz 1558787 RMD160 1f88bcbd6cfbfd22582a3f4ab5a8126d1ec45660 SHA1 2cc4f40db8c779c41f655058cf9d38319869885c SHA256 35c1584fcc279d87734684457e16f1df4a7bb67c303726b6de270076cb3882e0
+EBUILD swfdec-0.4.3.ebuild 1230 RMD160 6dc38cae65e07d059d6d4630ec21fff57ab7a0e8 SHA1 06eda41201204587633b5dbf85c383a36cd85179 SHA256 b3440d1c8abedacbfe718a2ebdbe3821e2721f3598d7cab9efc040b24e23d742
+MD5 fa90f18cdfeed0ab3d33c936bc04fe74 swfdec-0.4.3.ebuild 1230
+RMD160 6dc38cae65e07d059d6d4630ec21fff57ab7a0e8 swfdec-0.4.3.ebuild 1230
+SHA256 b3440d1c8abedacbfe718a2ebdbe3821e2721f3598d7cab9efc040b24e23d742 swfdec-0.4.3.ebuild 1230
+MD5 02434d860df63e3cb26553949ba4e358 files/digest-swfdec-0.4.3 241
+RMD160 146b6ab6cd3296622c0e0c856e23d37338cf3f18 files/digest-swfdec-0.4.3 241
+SHA256 030bcfa7a6ed54a7b9b7121390db1e511ea9c5ecc1be4c80c0a5fdd36474e981 files/digest-swfdec-0.4.3 241
diff --git a/media-libs/swfdec/files/digest-swfdec-0.4.3 b/media-libs/swfdec/files/digest-swfdec-0.4.3
new file mode 100644
index 0000000..8457457
--- /dev/null
+++ b/media-libs/swfdec/files/digest-swfdec-0.4.3
@@ -0,0 +1,3 @@
+MD5 7a857dcc9228ac590327b04a90db2e64 swfdec-0.4.3.tar.gz 1558787
+RMD160 1f88bcbd6cfbfd22582a3f4ab5a8126d1ec45660 swfdec-0.4.3.tar.gz 1558787
+SHA256 35c1584fcc279d87734684457e16f1df4a7bb67c303726b6de270076cb3882e0 swfdec-0.4.3.tar.gz 1558787
diff --git a/media-libs/swfdec/swfdec-0.4.3.ebuild b/media-libs/swfdec/swfdec-0.4.3.ebuild
new file mode 100644
index 0000000..9c9658f
--- /dev/null
+++ b/media-libs/swfdec/swfdec-0.4.3.ebuild
@@ -0,0 +1,55 @@
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils
+
+DESCRIPTION="Swfdec is a decoder/renderer for Macromedia Flash animations."
+HOMEPAGE="http://swfdec.freedesktop.org/"
+SRC_URI="http://swfdec.freedesktop.org/download/swfdec/0.4/swfdec-0.4.3.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="mad ffmpeg doc"
+
+DEPEND="ffmpeg? ( media-video/ffmpeg )
+	dev-libs/glib
+	x11-libs/pango
+	x11-libs/gtk+
+	x11-libs/cairo
+	media-libs/alsa-lib
+	mad? ( media-libs/libmad )"
+RDEPEND=""
+
+src_compile() {
+	if use doc ; then
+		docconf="--enable-gtk-doc"
+	else
+		docconf="--disable-gtk-doc"
+	fi
+
+	econf \
+		$(use_enable ffmpeg) \
+		$(use_enable mad) \
+		${docconf} \
+		|| die "Configure failed"
+
+	emake -j1 || "Make failed"
+}
+
+src_install() {
+	emake -j1 install DESTDIR="${D}" || die "make install failed"
+	
+	dodoc CHANGES CREDITS README TODO VERSION
+
+	# This file must be updated with each version update
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins "${FILESDIR}"/swfdec.pc
+
+	# Use correct libdir in pkgconfig file
+	dosed "s:^libdir.*:libdir=/usr/$(get_libdir):" \
+		/usr/$(get_libdir)/pkgconfig/swfdec.pc
+
+}
+
+pkg_postinst() {
+	einfo "Remember to report bugs to: https://bugzilla.freedesktop.org"
+}