multilib fixes in existing versions. Revbump to build shared library.

7 files changed, 140 insertions, 14 deletions

diff --git a/dev-libs/libebml/ChangeLog b/dev-libs/libebml/ChangeLog
index e7aa9bac353c..c9edb1acf876 100644
--- a/dev-libs/libebml/ChangeLog
+++ b/dev-libs/libebml/ChangeLog
@@ -1,6 +1,10 @@
 # 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.20 2004/09/25 19:24:47 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libebml/ChangeLog,v 1.21 2004/10/08 10:28:57 eradicator Exp $
+
+  08 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/libebml-0.7.1-shared.patch:
+  multilib fixes in existing versions.  Revbump to build shared library.
 
   25 Sep 2004; Jason Wever <weeve@gentoo.org> libebml-0.6.5.ebuild:
   Stable on sparc.
diff --git a/dev-libs/libebml/Manifest b/dev-libs/libebml/Manifest
index 094c71e3a8eb..e629fba8e27d 100644
--- a/dev-libs/libebml/Manifest
+++ b/dev-libs/libebml/Manifest
@@ -1,14 +1,27 @@
-MD5 8654386d0249abe66d66eb6ad90ea87c ChangeLog 3815
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 994ceb062f52de8af1de8e9ce73b83b3 ChangeLog 3988
 MD5 4d4cadb55b24d41d9b6714be2b4e73a4 libebml-0.6.0.ebuild 688
 MD5 ecd9f4c5ab356847fba19d0c248da980 libebml-0.6.3.ebuild 733
 MD5 cb2b159b15aaa5b2e54f4dfcdc679de7 libebml-0.6.4.ebuild 1059
-MD5 53f3518cde239843a6faf83feef99db5 libebml-0.6.5.ebuild 1054
-MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
+MD5 cc8895170ad0b9a5d5856c217f2a4ec9 libebml-0.6.5.ebuild 1097
 MD5 be28a87eeb5c19c0afe4468499fd0756 libebml-0.7.0.ebuild 1067
-MD5 3f669ce21439f56026da6ad83a585422 libebml-0.7.1.ebuild 1073
+MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
+MD5 6f621d31d5deabc35208b1e448704528 libebml-0.7.1.ebuild 1113
+MD5 31e47d69eafffb3619d2a16b1c8a4dc8 libebml-0.7.1-r1.ebuild 1195
 MD5 178fbe7e5f862e2225559792f6de2159 files/digest-libebml-0.6.0 64
 MD5 325a21d1656821ab9f4f388824a61a6c files/digest-libebml-0.6.3 64
 MD5 dc8f1854a12fdae99bc01ab43674680c files/digest-libebml-0.6.4 64
 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 505ac5c579900c6a541ced0d9cc9442e files/libebml-0.7.1-shared.patch 1880
+MD5 3ff5642e6fac5f3c15a074ae89af2e6c files/digest-libebml-0.7.1-r1 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBZmv0ArHZZzCEUG0RAqUFAKCDnqTd8uuqfp1B0+qoSbGdkbGd3wCfQ6sM
+goDxUigFVRuz3j6H8bmGrbw=
+=r/yk
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/libebml/files/digest-libebml-0.7.1-r1 b/dev-libs/libebml/files/digest-libebml-0.7.1-r1
new file mode 100644
index 000000000000..a26599a8b7b8
--- /dev/null
+++ b/dev-libs/libebml/files/digest-libebml-0.7.1-r1
@@ -0,0 +1 @@
+MD5 9f777f392d4b50c28151f0bd4e23733e libebml-0.7.1.tar.bz2 50912
diff --git a/dev-libs/libebml/files/libebml-0.7.1-shared.patch b/dev-libs/libebml/files/libebml-0.7.1-shared.patch
new file mode 100644
index 000000000000..881d0792bb44
--- /dev/null
+++ b/dev-libs/libebml/files/libebml-0.7.1-shared.patch
@@ -0,0 +1,64 @@
+diff -Naur libebml-0.7.1.orig/make/linux/Makefile libebml-0.7.1/make/linux/Makefile
+--- libebml-0.7.1.orig/make/linux/Makefile	2004-07-19 09:39:13.000000000 -0700
++++ libebml-0.7.1/make/linux/Makefile	2004-10-08 03:26:40.522886558 -0700
+@@ -49,6 +49,8 @@
+ 
+ # Names
+ LIBRARY=libebml.a
++LIBRARY_SO=libebml.so
++LIBRARY_SO_VER=libebml.so.0
+ 
+ # source-files
+ sources:=$(wildcard ${SRC_DIR}*$(EXTENSION))
+@@ -61,36 +63,48 @@
+ 
+ # 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 $(dependencies)
+ 	rm -f $(LIBRARY)
++	rm -f $(LIBRARY_SO)
++	rm -f $(LIBRARY_SO_VER)
+ 	rm -f CORE
+ 
+ # what are the source dependencies
+ depend: $(sources)
+ 	$(DEPEND) $(DEPENDFLAGS) $(sources)
+ 
+-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.5.ebuild b/dev-libs/libebml/libebml-0.6.5.ebuild
index 61dc846f0adc..54dfeabbd7e8 100644
--- a/dev-libs/libebml/libebml-0.6.5.ebuild
+++ b/dev-libs/libebml/libebml-0.6.5.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2004 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.9 2004/09/25 19:24:47 weeve Exp $
-
-inherit flag-o-matic
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libebml/libebml-0.6.5.ebuild,v 1.10 2004/10/08 10:28:57 eradicator Exp $
 
 IUSE=""
 
+inherit flag-o-matic eutils
 
 DESCRIPTION="Extensible binary format library (kinda like XML)"
 SRC_URI="http://matroska.free.fr/downloads/${PN}/${P}.tar.gz"
@@ -13,7 +12,7 @@ HOMEPAGE="http://www.matroska.org"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc ~amd64 alpha ~ia64 sparc ~hppa ~mips"
+KEYWORDS="x86 ~ppc amd64 alpha ~ia64 sparc ~hppa ~mips"
 
 DEPEND="virtual/libc"
 
@@ -33,6 +32,6 @@ src_compile() {
 
 src_install () {
 	cd ${S}/make/linux
-	einstall || die "make install failed"
+	einstall libdir="${D}/usr/$(get_libdir)" || die "make install failed"
 	dodoc ${S}/LICENSE.*
 }
diff --git a/dev-libs/libebml/libebml-0.7.1-r1.ebuild b/dev-libs/libebml/libebml-0.7.1-r1.ebuild
new file mode 100644
index 000000000000..a9e225d29e96
--- /dev/null
+++ b/dev-libs/libebml/libebml-0.7.1-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2004 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.1 2004/10/08 10:28:57 eradicator 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 ~ppc ~sparc ~mips ~alpha ~hppa ~amd64 ~ia64"
+
+DEPEND="virtual/libc"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-shared.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.*
+}
diff --git a/dev-libs/libebml/libebml-0.7.1.ebuild b/dev-libs/libebml/libebml-0.7.1.ebuild
index 33f50b728402..ae8af8d90825 100644
--- a/dev-libs/libebml/libebml-0.7.1.ebuild
+++ b/dev-libs/libebml/libebml-0.7.1.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2004 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.1 2004/07/26 17:50:21 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libebml/libebml-0.7.1.ebuild,v 1.2 2004/10/08 10:28:57 eradicator Exp $
 
-inherit flag-o-matic
+IUSE=""
+
+inherit flag-o-matic eutils
 
 DESCRIPTION="Extensible binary format library (kinda like XML)"
 HOMEPAGE="http://www.matroska.org/"
@@ -11,7 +13,6 @@ SRC_URI="http://www.bunkus.org/videotools/mkvtoolnix/sources/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~hppa ~amd64 ~ia64"
-IUSE=""
 
 DEPEND="virtual/libc"
 
@@ -31,6 +32,6 @@ src_compile() {
 
 src_install() {
 	cd ${S}/make/linux
-	einstall || die "make install failed"
+	einstall libdir="${D}/usr/$(get_libdir)" || die "make install failed"
 	dodoc ${S}/LICENSE.*
 }