new version

6 files changed, 69 insertions, 17 deletions

diff --git a/media-libs/libmatroska/ChangeLog b/media-libs/libmatroska/ChangeLog
index d696658a8d4d..41b32ce48432 100644
--- a/media-libs/libmatroska/ChangeLog
+++ b/media-libs/libmatroska/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for media-libs/libmatroska
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmatroska/ChangeLog,v 1.33 2004/10/08 10:29:50 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmatroska/ChangeLog,v 1.34 2004/10/25 20:04:24 arj Exp $
 
+*libmatroska-0.7.4 (25 Oct 2004)
+
+  25 Oct 2004; Anders Rune Jensen <arj@gentoo.org> libmatroska-0.7.4.ebuild:
+  Version bumped. Closes #66954
+	
   08 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
   +files/libmatroska-0.7.3-shared.patch:
   multilib fixes in existing versions.  Revbump to build shared library.
diff --git a/media-libs/libmatroska/Manifest b/media-libs/libmatroska/Manifest
index 6283e0af18e7..1642bad01bba 100644
--- a/media-libs/libmatroska/Manifest
+++ b/media-libs/libmatroska/Manifest
@@ -1,16 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 9a50214058f829540cb6bf651ecbd320 ChangeLog 4334
 MD5 dd67452cc7502dee0a6f742598518b89 libmatroska-0.5.2.ebuild 798
 MD5 6f7373b6e5601004c3705913ba64c22b libmatroska-0.6.2.ebuild 843
 MD5 5470f49d19c22dbc469431c1bf17ca3a libmatroska-0.6.3.ebuild 1048
 MD5 aa41a4c5e2e7f4044cdc0625ce787d16 libmatroska-0.7.0.ebuild 1310
-MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
-MD5 3820d6c025269a8cc6746bb0bf435a57 ChangeLog 4196
 MD5 1be73c5b1a49e1afa1a1a05f2d33b981 libmatroska-0.7.1.ebuild 1272
+MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
 MD5 53ca9a7acdd8e2c10b020f81eba5b0c4 libmatroska-0.7.2.ebuild 1272
 MD5 f95ba9379892613fac53cdb4775d3c5f libmatroska-0.7.3.ebuild 1361
-MD5 855fa113ca5e596f7daf3ddc9def9709 libmatroska-0.7.3-r1.ebuild 1415
+MD5 25560df0a9989c22b4f3fc5e1b737b0b libmatroska-0.7.3-r1.ebuild 1415
+MD5 46856857f2a8750fab291f2c71f583d5 libmatroska-0.7.4.ebuild 1365
 MD5 a517d15638be5ee91357b70059040e06 files/digest-libmatroska-0.5.2 68
 MD5 a37de967f24a547a9f51018af01ccd30 files/digest-libmatroska-0.6.2 68
 MD5 5e4b1f66449918a4ae7b7a77a47dcde6 files/digest-libmatroska-0.6.3 68
@@ -19,11 +17,5 @@ MD5 053bc87332097c45be3866399a4ef3da files/digest-libmatroska-0.7.1 69
 MD5 2cbdb96adeda267055be4eea02b96327 files/digest-libmatroska-0.7.2 69
 MD5 fd84899f8aaf8c41f8bc2fd83b744cdc files/digest-libmatroska-0.7.3 69
 MD5 fd84899f8aaf8c41f8bc2fd83b744cdc files/digest-libmatroska-0.7.3-r1 69
-MD5 c95f16fd10678062af97f9f35ac7fd5f files/libmatroska-0.7.3-shared.patch 2513
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBZmwoArHZZzCEUG0RAlTpAJ9TbgwXwxQx8KQivUHlH5aDEG4I3wCfZbg6
-ts2MRNciPLD57cQ+sWMYF80=
-=kYxd
------END PGP SIGNATURE-----
+MD5 e876907179da59e732df35668dd6e656 files/digest-libmatroska-0.7.4 69
+MD5 c95f16fd10678062af97f9f35ac7fd5f files/libmatroska-shared.patch 2513
diff --git a/media-libs/libmatroska/files/digest-libmatroska-0.7.4 b/media-libs/libmatroska/files/digest-libmatroska-0.7.4
new file mode 100644
index 000000000000..8e5e0609514e
--- /dev/null
+++ b/media-libs/libmatroska/files/digest-libmatroska-0.7.4
@@ -0,0 +1 @@
+MD5 a91b7a30141122edb02f9e42bbae69d9 libmatroska-0.7.4.tar.bz2 83239
diff --git a/media-libs/libmatroska/files/libmatroska-0.7.3-shared.patch b/media-libs/libmatroska/files/libmatroska-shared.patch
index 0ce1a7fa5f15..0ce1a7fa5f15 100644
--- a/media-libs/libmatroska/files/libmatroska-0.7.3-shared.patch
+++ b/media-libs/libmatroska/files/libmatroska-shared.patch
diff --git a/media-libs/libmatroska/libmatroska-0.7.3-r1.ebuild b/media-libs/libmatroska/libmatroska-0.7.3-r1.ebuild
index 501b97685944..5dc9a2256d44 100644
--- a/media-libs/libmatroska/libmatroska-0.7.3-r1.ebuild
+++ b/media-libs/libmatroska/libmatroska-0.7.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmatroska/libmatroska-0.7.3-r1.ebuild,v 1.1 2004/10/08 10:29:50 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmatroska/libmatroska-0.7.3-r1.ebuild,v 1.2 2004/10/25 20:04:24 arj Exp $
 
 IUSE=""
 
@@ -20,7 +20,7 @@ src_unpack() {
 	unpack ${A}
 
 	cd ${S}
-	epatch ${FILESDIR}/${P}-shared.patch
+	epatch ${FILESDIR}/libmatroska-shared.patch
 
 	cd ${S}/make/linux
 	sed -i -e 's/CXXFLAGS=/CXXFLAGS+=/g' Makefile
diff --git a/media-libs/libmatroska/libmatroska-0.7.4.ebuild b/media-libs/libmatroska/libmatroska-0.7.4.ebuild
new file mode 100644
index 000000000000..d62aac2f55d7
--- /dev/null
+++ b/media-libs/libmatroska/libmatroska-0.7.4.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmatroska/libmatroska-0.7.4.ebuild,v 1.1 2004/10/25 20:04:24 arj Exp $
+
+IUSE=""
+
+inherit flag-o-matic gcc eutils
+
+DESCRIPTION="Extensible multimedia container format based on EBML"
+HOMEPAGE="http://www.matroska.org/"
+SRC_URI="http://www.bunkus.org/videotools/mkvtoolnix/sources/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+
+DEPEND=">=dev-libs/libebml-0.7.2"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/libmatroska-shared.patch
+
+	cd ${S}/make/linux
+	sed -i -e 's/CXXFLAGS=/CXXFLAGS+=/g' Makefile
+}
+
+src_compile() {
+	cd ${S}/make/linux
+
+	# This is needed on amd64 to create shared libraries that make
+	# use of matroska, like libvlcplugin from vlc.
+	# Travis Tilley <lv@gentoo.org> 09 Apr 2004
+	use amd64 && append-flags -fPIC
+	use ppc && append-flags -fPIC
+
+	#fixes locale for gcc3.4.0 to close bug 52385
+	if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]
+	then
+		append-flags -finput-charset=ISO8859-15
+	fi
+
+	make PREFIX=/usr \
+		LIBEBML_INCLUDE_DIR=/usr/include/ebml \
+		LIBEBML_LIB_DIR=/usr/$(get_libdir) || die "make failed"
+}
+
+src_install() {
+	cd ${S}/make/linux
+
+	einstall libdir="${D}/usr/$(get_libdir)" || die "make install failed"
+	dodoc ../../ChangeLog
+}