Version bumped. Closes 81468

(Portage version: 2.0.51.16)

14 files changed, 183 insertions, 32 deletions

diff --git a/media-libs/libmatroska/ChangeLog b/media-libs/libmatroska/ChangeLog
index 1ae1ad2b3726..3c943d5de186 100644
--- a/media-libs/libmatroska/ChangeLog
+++ b/media-libs/libmatroska/ChangeLog
@@ -1,6 +1,13 @@
 # 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.43 2004/12/19 00:11:10 hansmi Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmatroska/ChangeLog,v 1.44 2005/02/27 14:50:41 mholzer Exp $
+
+*libmatroska-0.7.5 (27 Feb 2005)
+
+  27 Feb 2005; Martin Holzer <mholzer@gentoo.org>
+  +files/libmatroska-shared2.patch, +libmatroska-0.7.5.ebuild:
+  Version bumped. Closes 81468
+  Thx to Martin Wienold <martin.wienold@uni-dortmund.de> 
 
   19 Dec 2004; Michael Hanselmann <hansmi@gentoo.org>
   libmatroska-0.7.4.ebuild:
diff --git a/media-libs/libmatroska/Manifest b/media-libs/libmatroska/Manifest
index ffdc9256ad55..4558d5ac4580 100644
--- a/media-libs/libmatroska/Manifest
+++ b/media-libs/libmatroska/Manifest
@@ -1,21 +1,23 @@
-MD5 1181172e4127a0ffcdfb1dce4746235a libmatroska-0.7.4.ebuild 1386
+MD5 f5be7d29e8409e995e53efc1ef53e513 ChangeLog 5308
+MD5 22726ebef63511c8c3ccff6f506d6088 libmatroska-0.7.0.ebuild 1303
 MD5 dd67452cc7502dee0a6f742598518b89 libmatroska-0.5.2.ebuild 798
+MD5 1be73c5b1a49e1afa1a1a05f2d33b981 libmatroska-0.7.1.ebuild 1272
 MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
-MD5 f5be7d29e8409e995e53efc1ef53e513 ChangeLog 5308
-MD5 53ca9a7acdd8e2c10b020f81eba5b0c4 libmatroska-0.7.2.ebuild 1272
 MD5 6f7373b6e5601004c3705913ba64c22b libmatroska-0.6.2.ebuild 843
-MD5 1463e9ecdc6b6e0acff05208e9dca3da libmatroska-0.7.3-r1.ebuild 1417
 MD5 09ceba418710ee955b3eba5f2011b255 libmatroska-0.6.3.ebuild 1048
+MD5 53ca9a7acdd8e2c10b020f81eba5b0c4 libmatroska-0.7.2.ebuild 1272
 MD5 f95ba9379892613fac53cdb4775d3c5f libmatroska-0.7.3.ebuild 1361
-MD5 1be73c5b1a49e1afa1a1a05f2d33b981 libmatroska-0.7.1.ebuild 1272
-MD5 22726ebef63511c8c3ccff6f506d6088 libmatroska-0.7.0.ebuild 1303
+MD5 1463e9ecdc6b6e0acff05208e9dca3da libmatroska-0.7.3-r1.ebuild 1417
+MD5 1181172e4127a0ffcdfb1dce4746235a libmatroska-0.7.4.ebuild 1386
+MD5 899f906a3521cf45f2c16c957871eb7a libmatroska-0.7.5.ebuild 1386
+MD5 4529e58fa584a5c14c77777cb6b57671 files/digest-libmatroska-0.7.0 69
+MD5 053bc87332097c45be3866399a4ef3da files/digest-libmatroska-0.7.1 69
+MD5 a517d15638be5ee91357b70059040e06 files/digest-libmatroska-0.5.2 68
+MD5 2cbdb96adeda267055be4eea02b96327 files/digest-libmatroska-0.7.2 69
+MD5 a37de967f24a547a9f51018af01ccd30 files/digest-libmatroska-0.6.2 68
 MD5 5e4b1f66449918a4ae7b7a77a47dcde6 files/digest-libmatroska-0.6.3 68
 MD5 fd84899f8aaf8c41f8bc2fd83b744cdc files/digest-libmatroska-0.7.3 69
-MD5 053bc87332097c45be3866399a4ef3da files/digest-libmatroska-0.7.1 69
+MD5 fd84899f8aaf8c41f8bc2fd83b744cdc files/digest-libmatroska-0.7.3-r1 69
 MD5 c95f16fd10678062af97f9f35ac7fd5f files/libmatroska-shared.patch 2513
-MD5 2cbdb96adeda267055be4eea02b96327 files/digest-libmatroska-0.7.2 69
-MD5 a517d15638be5ee91357b70059040e06 files/digest-libmatroska-0.5.2 68
-MD5 4529e58fa584a5c14c77777cb6b57671 files/digest-libmatroska-0.7.0 69
 MD5 e876907179da59e732df35668dd6e656 files/digest-libmatroska-0.7.4 69
-MD5 fd84899f8aaf8c41f8bc2fd83b744cdc files/digest-libmatroska-0.7.3-r1 69
-MD5 a37de967f24a547a9f51018af01ccd30 files/digest-libmatroska-0.6.2 68
+MD5 5475fed72c7b74bc5336c9a3619927db files/digest-libmatroska-0.7.5 69
diff --git a/media-libs/libmatroska/files/digest-libmatroska-0.7.5 b/media-libs/libmatroska/files/digest-libmatroska-0.7.5
new file mode 100644
index 000000000000..8818d7a1cb89
--- /dev/null
+++ b/media-libs/libmatroska/files/digest-libmatroska-0.7.5
@@ -0,0 +1 @@
+MD5 8f034dc9253dbb1f8a214dafa12785ae libmatroska-0.7.5.tar.bz2 85383
diff --git a/media-libs/libmatroska/files/libmatroska-shared2.patch b/media-libs/libmatroska/files/libmatroska-shared2.patch
new file mode 100644
index 000000000000..c6abe98b0a1b
--- /dev/null
+++ b/media-libs/libmatroska/files/libmatroska-shared2.patch
@@ -0,0 +1,87 @@
+diff -Naur make/linux/Makefile.org make/linux/Makefile
+--- make/linux/Makefile.org	2005-02-06 19:12:08.000000000 +0100
++++ make/linux/Makefile	2005-02-10 10:16:59.317212360 +0100
+@@ -56,6 +56,8 @@
+ 
+ # Names
+ LIBRARY=libmatroska.a
++LIBRARY_SO=libmatroska.so
++LIBRARY_SO_VER=libmatroska.so.0
+ 
+ # source-files
+ sources:=$(wildcard ${SRC_DIR}*$(EXTENSION))
+@@ -66,27 +68,38 @@
+ # object files; replace .cxx extension with .o
+ objects:=$(patsubst %$(EXTENSION),%.o,$(sources))
+ 
++objects_so:=$(patsubst %$(EXTENSION),%.lo,$(sources))
++
+ WARNINGFLAGS=-Wall -Wno-unknown-pragmas -ansi -fno-gnu-keywords -D_GNU_SOURCE \
+ 		-Wshadow
+ COMPILEFLAGS=$(DEBUGFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(WARNINGFLAGS) $(INCLUDE)
+ LINKFLAGS=-L. -L$(LIBEBML_LIB_DIR) $(LDFLAGS)
+ DEPENDFLAGS  = $(CXXFLAGS) $(INCLUDE)
+ 
+-all: $(LIBRARY)
++all: $(LIBRARY) $(LIBRARY_SO)
+ 
+-lib library: $(LIBRARY)
++lib library: $(LIBRARY) $(LIBRARY_SO)
+ 
+ # Build rules
+ %.o: %$(EXTENSION)
+ 	$(CXX) -c $(COMPILEFLAGS) -o $@ $<
+ 
++%.lo: %$(EXTENSION)
++	$(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $<
++
+ $(LIBRARY): $(objects)
+ 	$(AR) $@ $(objects)
+ 	$(RANLIB) $@
+ 
++$(LIBRARY_SO): $(objects_so)
++	$(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) -lebml
++	ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO)
++
+ clean:	cleantest
+ 	rm -f $(objects)
+ 	rm -f $(LIBRARY)
++	rm -f $(LIBRARY_SO)
++	rm -f $(LIBRARY_SO_VER)
+ 	rm -f CORE
+ 
+ cleantest:
+@@ -107,27 +120,29 @@
+ 
+ test: test6 test9
+ 
+-test6:	test6.o $(LIBRARY)
++test6:	test6.o $(LIBRARY) $(LIBRARY_SO)
+ 	$(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
+ 
+ test6.o: $(MUX_SRC_DIR)test6.cpp
+ 	$(CXX) -c $(COMPILEFLAGS) -o $@ $<
+ 
+-test8:	test8.o $(LIBRARY)
++test8:	test8.o $(LIBRARY) $(LIBRARY_SO)
+ 	$(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
+ 
+ test8.o: $(MUX_SRC_DIR)test8.cpp
+ 	$(CXX) -c $(COMPILEFLAGS) -o $@ $<
+ 
+-test9:	test9.o $(LIBRARY)
++test9:	test9.o $(LIBRARY) $(LIBRARY_SO)
+ 	$(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
+ 
+ test9.o: $(TAG_SRC_DIR)test9.cpp
+ 	$(CXX) -c $(COMPILEFLAGS) -o $@ $<
+ 
+-install: $(LIBRARY)
++install: $(LIBRARY) $(LIBRARY_SO)
+ 	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
+ 	$(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir)
++	$(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(libdir)
++	ln -s $(LIBRARY_SO_VER) $(libdir)/$(LIBRARY_SO)
+ 	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)
+ 	for i in $(INCLUDE_DIR)/*.h; do \
+ 		$(INSTALL) $(INSTALL_OPTS) $$i $(includedir) ; \
diff --git a/media-libs/libmatroska/libmatroska-0.5.2.ebuild b/media-libs/libmatroska/libmatroska-0.5.2.ebuild
index f4a08c9a629f..8045ae7e9ad2 100644
--- a/media-libs/libmatroska/libmatroska-0.5.2.ebuild
+++ b/media-libs/libmatroska/libmatroska-0.5.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmatroska/libmatroska-0.5.2.ebuild,v 1.9 2004/07/14 20:10:09 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmatroska/libmatroska-0.5.2.ebuild,v 1.10 2005/02/27 14:50:41 mholzer Exp $
 
 inherit flag-o-matic
 
diff --git a/media-libs/libmatroska/libmatroska-0.6.2.ebuild b/media-libs/libmatroska/libmatroska-0.6.2.ebuild
index a6075178aa22..8fc44ce3e30c 100644
--- a/media-libs/libmatroska/libmatroska-0.6.2.ebuild
+++ b/media-libs/libmatroska/libmatroska-0.6.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmatroska/libmatroska-0.6.2.ebuild,v 1.11 2004/07/14 20:10:09 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmatroska/libmatroska-0.6.2.ebuild,v 1.12 2005/02/27 14:50:41 mholzer Exp $
 
 inherit flag-o-matic
 
diff --git a/media-libs/libmatroska/libmatroska-0.6.3.ebuild b/media-libs/libmatroska/libmatroska-0.6.3.ebuild
index e89924565c8d..d97b1b0b2fc6 100644
--- a/media-libs/libmatroska/libmatroska-0.6.3.ebuild
+++ b/media-libs/libmatroska/libmatroska-0.6.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmatroska/libmatroska-0.6.3.ebuild,v 1.13 2004/11/01 11:19:23 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmatroska/libmatroska-0.6.3.ebuild,v 1.14 2005/02/27 14:50:41 mholzer Exp $
 
 inherit flag-o-matic
 
diff --git a/media-libs/libmatroska/libmatroska-0.7.0.ebuild b/media-libs/libmatroska/libmatroska-0.7.0.ebuild
index 33abbf528f72..ef6323d3fb36 100644
--- a/media-libs/libmatroska/libmatroska-0.7.0.ebuild
+++ b/media-libs/libmatroska/libmatroska-0.7.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmatroska/libmatroska-0.7.0.ebuild,v 1.13 2004/12/15 21:22:09 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmatroska/libmatroska-0.7.0.ebuild,v 1.14 2005/02/27 14:50:41 mholzer Exp $
 
 inherit flag-o-matic gcc eutils
 
diff --git a/media-libs/libmatroska/libmatroska-0.7.1.ebuild b/media-libs/libmatroska/libmatroska-0.7.1.ebuild
index 6ce5a4ee4a96..3fda539a5799 100644
--- a/media-libs/libmatroska/libmatroska-0.7.1.ebuild
+++ b/media-libs/libmatroska/libmatroska-0.7.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmatroska/libmatroska-0.7.1.ebuild,v 1.1 2004/07/26 17:58:18 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmatroska/libmatroska-0.7.1.ebuild,v 1.2 2005/02/27 14:50:41 mholzer Exp $
 
 inherit flag-o-matic gcc
 
diff --git a/media-libs/libmatroska/libmatroska-0.7.2.ebuild b/media-libs/libmatroska/libmatroska-0.7.2.ebuild
index 5896cfa95ce9..43c3ec3f85b3 100644
--- a/media-libs/libmatroska/libmatroska-0.7.2.ebuild
+++ b/media-libs/libmatroska/libmatroska-0.7.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmatroska/libmatroska-0.7.2.ebuild,v 1.1 2004/08/13 00:52:34 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmatroska/libmatroska-0.7.2.ebuild,v 1.2 2005/02/27 14:50:41 mholzer Exp $
 
 inherit flag-o-matic gcc
 
diff --git a/media-libs/libmatroska/libmatroska-0.7.3-r1.ebuild b/media-libs/libmatroska/libmatroska-0.7.3-r1.ebuild
index ee218447706b..6e2219822fb4 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
+# Copyright 1999-2005 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.3 2004/12/19 00:05:59 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmatroska/libmatroska-0.7.3-r1.ebuild,v 1.4 2005/02/27 14:50:41 mholzer Exp $
 
 IUSE=""
 
diff --git a/media-libs/libmatroska/libmatroska-0.7.3.ebuild b/media-libs/libmatroska/libmatroska-0.7.3.ebuild
index e48a0d6e6681..4f87b07de26a 100644
--- a/media-libs/libmatroska/libmatroska-0.7.3.ebuild
+++ b/media-libs/libmatroska/libmatroska-0.7.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 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.ebuild,v 1.2 2004/10/08 10:29:50 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmatroska/libmatroska-0.7.3.ebuild,v 1.3 2005/02/27 14:50:41 mholzer Exp $
 
 IUSE=""
 
diff --git a/media-libs/libmatroska/libmatroska-0.7.4.ebuild b/media-libs/libmatroska/libmatroska-0.7.4.ebuild
index 5cd3ab87140b..ca034fec7eb9 100644
--- a/media-libs/libmatroska/libmatroska-0.7.4.ebuild
+++ b/media-libs/libmatroska/libmatroska-0.7.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 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.5 2004/12/19 00:11:10 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmatroska/libmatroska-0.7.4.ebuild,v 1.6 2005/02/27 14:50:41 mholzer Exp $
 
 IUSE=""
 
diff --git a/media-libs/libmatroska/libmatroska-0.7.5.ebuild b/media-libs/libmatroska/libmatroska-0.7.5.ebuild
new file mode 100644
index 000000000000..10c21075c96c
--- /dev/null
+++ b/media-libs/libmatroska/libmatroska-0.7.5.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmatroska/libmatroska-0.7.5.ebuild,v 1.1 2005/02/27 14:50:41 mholzer 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 ~sparc ~ppc64 ~ppc"
+
+DEPEND=">=dev-libs/libebml-0.7.3"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/libmatroska-shared2.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
+}