81468 and bug #81467

(Portage version: 2.0.51.16)

13 files changed, 148 insertions, 30 deletions

diff --git a/dev-libs/libebml/ChangeLog b/dev-libs/libebml/ChangeLog
index 19b439af7f51..57bc7bd1a67a 100644
--- a/dev-libs/libebml/ChangeLog
+++ b/dev-libs/libebml/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/libebml
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libebml/ChangeLog,v 1.32 2004/12/29 22:21:22 ciaranm Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libebml/ChangeLog,v 1.33 2005/02/27 14:35:58 mholzer Exp $
+
+*libebml-0.7.3 (27 Feb 2005)
+
+  27 Feb 2005; Martin Holzer <mholzer@gentoo.org>
+  +files/libebml-shared2.patch, +libebml-0.7.3.ebuild:
+  Version bumped. Closes 81467.
+  Thx to Andre Hinrichs <andre.hinrichs@gmx.de>
 
   29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/dev-libs/libebml/Manifest b/dev-libs/libebml/Manifest
index cf839398cf0f..10aa775bc716 100644
--- a/dev-libs/libebml/Manifest
+++ b/dev-libs/libebml/Manifest
@@ -1,19 +1,21 @@
-MD5 cc8895170ad0b9a5d5856c217f2a4ec9 libebml-0.6.5.ebuild 1097
-MD5 cb2b159b15aaa5b2e54f4dfcdc679de7 libebml-0.6.4.ebuild 1059
-MD5 4d4cadb55b24d41d9b6714be2b4e73a4 libebml-0.6.0.ebuild 688
-MD5 ecd9f4c5ab356847fba19d0c248da980 libebml-0.6.3.ebuild 733
 MD5 959eb432b5c9eca5595ef4c9f3080eee ChangeLog 5159
+MD5 cc8895170ad0b9a5d5856c217f2a4ec9 libebml-0.6.5.ebuild 1097
 MD5 793de857d04a69883bb2d0c8bf634854 libebml-0.7.0.ebuild 1065
+MD5 1d014133e99230715c3c119947b2888d libebml-0.7.3.ebuild 1172
+MD5 4d4cadb55b24d41d9b6714be2b4e73a4 libebml-0.6.0.ebuild 688
 MD5 6f621d31d5deabc35208b1e448704528 libebml-0.7.1.ebuild 1113
-MD5 1d014133e99230715c3c119947b2888d libebml-0.7.2.ebuild 1172
-MD5 97ab0cef5de5ba822d757a0d7cee6d42 libebml-0.7.1-r1.ebuild 1193
+MD5 ecd9f4c5ab356847fba19d0c248da980 libebml-0.6.3.ebuild 733
 MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
-MD5 178fbe7e5f862e2225559792f6de2159 files/digest-libebml-0.6.0 64
-MD5 505ac5c579900c6a541ced0d9cc9442e files/libebml-shared.patch 1880
-MD5 325a21d1656821ab9f4f388824a61a6c files/digest-libebml-0.6.3 64
-MD5 3ff5642e6fac5f3c15a074ae89af2e6c files/digest-libebml-0.7.1-r1 65
-MD5 dc8f1854a12fdae99bc01ab43674680c files/digest-libebml-0.6.4 64
-MD5 80f94afa7c615d7c39e782c3766177ea files/digest-libebml-0.7.0 65
+MD5 cb2b159b15aaa5b2e54f4dfcdc679de7 libebml-0.6.4.ebuild 1059
+MD5 97ab0cef5de5ba822d757a0d7cee6d42 libebml-0.7.1-r1.ebuild 1193
+MD5 1d014133e99230715c3c119947b2888d libebml-0.7.2.ebuild 1172
 MD5 74c7637fdf8fd2cfc27642333c763eb9 files/digest-libebml-0.6.5 64
+MD5 80f94afa7c615d7c39e782c3766177ea files/digest-libebml-0.7.0 65
 MD5 3ff5642e6fac5f3c15a074ae89af2e6c files/digest-libebml-0.7.1 65
+MD5 178fbe7e5f862e2225559792f6de2159 files/digest-libebml-0.6.0 64
 MD5 78a2d79355d9331b5c2923c9c4538679 files/digest-libebml-0.7.2 65
+MD5 325a21d1656821ab9f4f388824a61a6c files/digest-libebml-0.6.3 64
+MD5 dc8f1854a12fdae99bc01ab43674680c files/digest-libebml-0.6.4 64
+MD5 3ff5642e6fac5f3c15a074ae89af2e6c files/digest-libebml-0.7.1-r1 65
+MD5 505ac5c579900c6a541ced0d9cc9442e files/libebml-shared.patch 1880
+MD5 8248b9a5ed1f0dcb65620a691b5e52d0 files/digest-libebml-0.7.3 65
diff --git a/dev-libs/libebml/files/digest-libebml-0.7.3 b/dev-libs/libebml/files/digest-libebml-0.7.3
new file mode 100644
index 000000000000..c5ad6197b306
--- /dev/null
+++ b/dev-libs/libebml/files/digest-libebml-0.7.3
@@ -0,0 +1 @@
+MD5 5d9fee0755cef7d7e88ee7065f3e728f libebml-0.7.3.tar.bz2 52827
diff --git a/dev-libs/libebml/files/libebml-shared2.patch b/dev-libs/libebml/files/libebml-shared2.patch
new file mode 100644
index 000000000000..36b03c0663af
--- /dev/null
+++ b/dev-libs/libebml/files/libebml-shared2.patch
@@ -0,0 +1,64 @@
+diff -ruN make/linux/Makefile.org make/linux/Makefile
+--- make/linux/Makefile.org	2005-02-06 19:11:15.000000000 +0100
++++ make/linux/Makefile	2005-02-15 21:02:39.589581560 +0100
+@@ -51,6 +51,8 @@
+ 
+ # Names
+ LIBRARY=libebml.a
++LIBRARY_SO=libebml.so
++LIBRARY_SO_VER=libebml.so.0
+ 
+ # source-files
+ sources:=$(wildcard ${SRC_DIR}*$(EXTENSION))
+@@ -60,26 +62,36 @@
+ 
+ # 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 -Wshadow
+ COMPILEFLAGS=$(WARNINGFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(DEBUGFLAGS) $(INCLUDE)
+ 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)
++	ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO)
++
+ clean:
+ 	rm -f $(objects)
+ 	rm -f $(LIBRARY)
++	rm -f $(LIBRARY_SO)
++	rm -f $(LIBRARY_SO_VER)
+ 	rm -f CORE
+ 
+ distclean dist-clean: clean
+@@ -95,9 +107,11 @@
+ 		$(CXX) $(DEPENDFLAGS) -MM -MT $$o $$i >> .depend ; \
+ 	done
+ 
+-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/dev-libs/libebml/libebml-0.6.0.ebuild b/dev-libs/libebml/libebml-0.6.0.ebuild
index 3678ffd42d1b..e0f7d7220c5c 100644
--- a/dev-libs/libebml/libebml-0.6.0.ebuild
+++ b/dev-libs/libebml/libebml-0.6.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/dev-libs/libebml/libebml-0.6.0.ebuild,v 1.5 2004/07/14 14:36:08 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libebml/libebml-0.6.0.ebuild,v 1.6 2005/02/27 14:35:58 mholzer Exp $
 
 inherit flag-o-matic
 
diff --git a/dev-libs/libebml/libebml-0.6.3.ebuild b/dev-libs/libebml/libebml-0.6.3.ebuild
index 847c2c48df67..e77e03a11677 100644
--- a/dev-libs/libebml/libebml-0.6.3.ebuild
+++ b/dev-libs/libebml/libebml-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/dev-libs/libebml/libebml-0.6.3.ebuild,v 1.8 2004/07/14 14:36:08 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libebml/libebml-0.6.3.ebuild,v 1.9 2005/02/27 14:35:58 mholzer Exp $
 
 inherit flag-o-matic
 
diff --git a/dev-libs/libebml/libebml-0.6.4.ebuild b/dev-libs/libebml/libebml-0.6.4.ebuild
index 540f541bd214..73a56998a27f 100644
--- a/dev-libs/libebml/libebml-0.6.4.ebuild
+++ b/dev-libs/libebml/libebml-0.6.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/dev-libs/libebml/libebml-0.6.4.ebuild,v 1.10 2004/08/25 19:35:51 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libebml/libebml-0.6.4.ebuild,v 1.11 2005/02/27 14:35:58 mholzer Exp $
 
 inherit flag-o-matic
 
diff --git a/dev-libs/libebml/libebml-0.6.5.ebuild b/dev-libs/libebml/libebml-0.6.5.ebuild
index 54dfeabbd7e8..18f719f618a3 100644
--- a/dev-libs/libebml/libebml-0.6.5.ebuild
+++ b/dev-libs/libebml/libebml-0.6.5.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/dev-libs/libebml/libebml-0.6.5.ebuild,v 1.10 2004/10/08 10:28:57 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libebml/libebml-0.6.5.ebuild,v 1.11 2005/02/27 14:35:58 mholzer Exp $
 
 IUSE=""
 
diff --git a/dev-libs/libebml/libebml-0.7.0.ebuild b/dev-libs/libebml/libebml-0.7.0.ebuild
index 241219cd5969..9efc91e12ffe 100644
--- a/dev-libs/libebml/libebml-0.7.0.ebuild
+++ b/dev-libs/libebml/libebml-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/dev-libs/libebml/libebml-0.7.0.ebuild,v 1.10 2004/12/15 21:20:26 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libebml/libebml-0.7.0.ebuild,v 1.11 2005/02/27 14:35:58 mholzer Exp $
 
 inherit flag-o-matic
 
diff --git a/dev-libs/libebml/libebml-0.7.1-r1.ebuild b/dev-libs/libebml/libebml-0.7.1-r1.ebuild
index 62a2e2c5c71f..73a23503cbd1 100644
--- a/dev-libs/libebml/libebml-0.7.1-r1.ebuild
+++ b/dev-libs/libebml/libebml-0.7.1-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/dev-libs/libebml/libebml-0.7.1-r1.ebuild,v 1.3 2004/12/19 00:05:37 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libebml/libebml-0.7.1-r1.ebuild,v 1.4 2005/02/27 14:35:58 mholzer Exp $
 
 IUSE=""
 
diff --git a/dev-libs/libebml/libebml-0.7.1.ebuild b/dev-libs/libebml/libebml-0.7.1.ebuild
index ae8af8d90825..df23cc812aba 100644
--- a/dev-libs/libebml/libebml-0.7.1.ebuild
+++ b/dev-libs/libebml/libebml-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/dev-libs/libebml/libebml-0.7.1.ebuild,v 1.2 2004/10/08 10:28:57 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libebml/libebml-0.7.1.ebuild,v 1.3 2005/02/27 14:35:58 mholzer Exp $
 
 IUSE=""
 
diff --git a/dev-libs/libebml/libebml-0.7.2.ebuild b/dev-libs/libebml/libebml-0.7.2.ebuild
index 44218f5ebbe7..bf8705c54cd5 100644
--- a/dev-libs/libebml/libebml-0.7.2.ebuild
+++ b/dev-libs/libebml/libebml-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/dev-libs/libebml/libebml-0.7.2.ebuild,v 1.6 2004/12/19 00:08:47 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libebml/libebml-0.7.2.ebuild,v 1.7 2005/02/27 14:35:58 mholzer Exp $
 
 IUSE=""
 
diff --git a/dev-libs/libebml/libebml-0.7.3.ebuild b/dev-libs/libebml/libebml-0.7.3.ebuild
new file mode 100644
index 000000000000..9ae607368d35
--- /dev/null
+++ b/dev-libs/libebml/libebml-0.7.3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libebml/libebml-0.7.3.ebuild,v 1.1 2005/02/27 14:35:58 mholzer Exp $
+
+IUSE=""
+
+inherit flag-o-matic eutils
+
+DESCRIPTION="Extensible binary format library (kinda like XML)"
+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 ~alpha ~ppc"
+
+DEPEND="virtual/libc"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/libebml-shared2.patch
+}
+
+src_compile() {
+	cd ${S}/make/linux
+
+	# This fix is necessary due to libebml being used to generate
+	# shared libraries, such as the vlc plugin for mozilla. on archs
+	# that require shared objects to be compiled with -fPIC, this
+	# really shouldn't happen, but libebml doesn't produce an so.
+	# Travis Tilley <lv@gentoo.org>
+	append-flags -fPIC
+
+	sed -i -e 's/CXXFLAGS=/CXXFLAGS+=/g' Makefile
+	make PREFIX=/usr || die "make failed"
+}
+
+src_install() {
+	cd ${S}/make/linux
+	einstall libdir="${D}/usr/$(get_libdir)" || die "make install failed"
+	dodoc ${S}/LICENSE.*
+}