Remove old.

Package-Manager: portage-2.2.0_alpha77/cvs/Linux x86_64

10 files changed, 17 insertions, 549 deletions

diff --git a/dev-libs/libebml/ChangeLog b/dev-libs/libebml/ChangeLog
index 004a5682f190..02041f7ab33c 100644
--- a/dev-libs/libebml/ChangeLog
+++ b/dev-libs/libebml/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/libebml
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libebml/ChangeLog,v 1.112 2011/11/20 10:21:11 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libebml/ChangeLog,v 1.113 2011/11/27 02:48:27 radhermit Exp $
+
+  27 Nov 2011; Tim Harder <radhermit@gentoo.org> -libebml-0.7.8-r1.ebuild,
+  -libebml-0.7.8-r2.ebuild, -files/libebml-0.7.8-makefile-fixup.patch,
+  -libebml-0.8.0.ebuild, -files/libebml-0.8.0-makefile-fixup.patch,
+  -libebml-1.0.0.ebuild, -files/libebml-1.0.0-makefile-fixup.patch,
+  -libebml-1.2.0.ebuild:
+  Remove old.
 
   20 Nov 2011; Kacper Kowalik <xarthisius@gentoo.org> libebml-1.2.1.ebuild:
   ppc/ppc64 stable wrt #376395
diff --git a/dev-libs/libebml/Manifest b/dev-libs/libebml/Manifest
index 4b995dbf9be4..048b994051b0 100644
--- a/dev-libs/libebml/Manifest
+++ b/dev-libs/libebml/Manifest
@@ -1,39 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
-AUX libebml-0.7.8-makefile-fixup.patch 3742 RMD160 ce09079f8992ae605644fc00fdd25aacb2035545 SHA1 6223ba77014b783236bfbb2d5b00d45b581f6a42 SHA256 44f39a64dae902ee4ffa9108fc49115af9813b58f5be1b8bb88b313c855fc7c7
-AUX libebml-0.8.0-makefile-fixup.patch 3333 RMD160 14b15e75009e7c56d3548af1f79acfab8b6fd391 SHA1 2e898040cadc9779218564de93bf1372bcf0eb1e SHA256 17f7f548a76bad1dbed9655a5129ad54c974f66b2dd508113706aea58ea48876
-AUX libebml-1.0.0-makefile-fixup.patch 3612 RMD160 dfd359606df06d5c64a1f7b76df8deb1ce3d2564 SHA1 beaf50e089208a45fdcf2e7b9757dfe4b1345ed6 SHA256 3ac2eccef97c8185a62e710250adc79f402dd08150247761f9ecb08eb8ccd4ae
 AUX libebml-1.2.0-makefile-fixup.patch 3568 RMD160 ebd30863d4cf6bc7ed6f8331e6bed687f6b8af46 SHA1 1f2949ab287335db494b94ff628703764f639299 SHA256 f3d1432c6b9b72e12621cc11679d80014b93ba553f8b20e0870f15147a922929
-DIST libebml-0.7.8.tar.bz2 58121 RMD160 73e196e03df254536e20aa390acc0c2c79940054 SHA1 2b1b9a8f4bc2a5b6a709f00ec520353dcc0a1d18 SHA256 bcf51ad8f059f52523d1683f2234fe0103d747d9fe0eb49b1e9be67ee842a0f8
-DIST libebml-0.8.0.tar.bz2 60039 RMD160 a4cf04486fb65adc33c2b865b95ce7860f24c1ea SHA1 d927e787e3c2cb95d206c7ad9febb599ce676d06 SHA256 9e7a0d7ffe6007b9f70f2cd3938ac9e1f15cfd724c3dd8ba837bd9c26703ee5d
-DIST libebml-1.0.0.tar.bz2 60058 RMD160 932552ae239007253f0526d8bb0d506776ca14df SHA1 8b79752ddb6cadab0346b43785432c554dbf220d SHA256 72480dec736cd5df5bc9e8c3864a58d17715542c83ff1b2095dca46cc1b8b178
-DIST libebml-1.2.0.tar.bz2 60532 RMD160 213b7f9e18cf71f250d83d278ebd7e27220cdebc SHA1 4107fd6496b5aae3f0e7a96cb3008341a5b224bc SHA256 e4559dc37b496ae42914da95124da968c453ee63bec7b66f62a5e6f622b1ff25
 DIST libebml-1.2.1.tar.bz2 60662 RMD160 99f5fd7a610947e0828b47db0c68bfcbb8698edd SHA1 b26c39bf923429c835364ccd99ceb8cdb47a3623 SHA256 8f9e06630eab83f337d280d38eff53e41e030530015a4c423d509a20f6ea81b2
 DIST libebml-1.2.2.tar.bz2 60802 RMD160 a5399b991d613c4ae3e37bfd7e0a8db33db91131 SHA1 f8ef2e044b79b6e4f777b20c0e0e2382c16fbafc SHA256 476b08c6436a96c024a53e788e7c945ce9b41cd8654165763444aa7e5245b7a5
-EBUILD libebml-0.7.8-r1.ebuild 767 RMD160 d67546e2621e717d24a3b25173300c9611122139 SHA1 fc6f0ea73e4db5463bdfee8f0f21248135bcbf7d SHA256 c42b134c5cb02055da3ee628ce3de74dd950959c13e5265a3e57096abdcc8628
-EBUILD libebml-0.7.8-r2.ebuild 1115 RMD160 371b0b6802ebb1a7fd1c349bd985c299dbfe8a8a SHA1 6f9ec2796e3db7a3e0576cf8165e5333c66c4b7d SHA256 11169330752d67aa7b74e7f950b3d2a36f7a5768b50368d25e14c1340ed6e118
-EBUILD libebml-0.8.0.ebuild 1108 RMD160 d68a56a828919182fc271e9b88e20d8ec66f845c SHA1 305de139f6809731d191b1947824ffbfa6768f5e SHA256 1af150d0cb7204866b203adc9ad9a427683d32063370034f294a02c1ccef89e3
-EBUILD libebml-1.0.0.ebuild 1108 RMD160 9ef40f0c4949e9cff16dd5895e90fd38da37808d SHA1 295f4489d3478d08b19fe81af734fa57c2f82ca0 SHA256 43a64f464435696ca9b31a1d5d6dd9df285fa201bd2e009060dd233b87035a26
-EBUILD libebml-1.2.0.ebuild 1147 RMD160 d1e34987d836eb61ae97e8d85a4fef06a32cba28 SHA1 60aeed8da1183ca9c193e918e214715ebc5b2bbe SHA256 badcf1c895664cabcd306e4481eb06c37711958998e745ef46546a99f0e835a5
 EBUILD libebml-1.2.1.ebuild 1146 RMD160 7ca88cc0afc412a24e99ad9253a1bbd25f9672be SHA1 61f768cb4524eb267c88704b6bcbda0e3ce8d57c SHA256 1041edbe84660d0e0f058887bd9831232ab4d4f0474816b0082beca22120da0f
 EBUILD libebml-1.2.2.ebuild 1585 RMD160 3123113845220133ded9a1591fc51398fce2a400 SHA1 a90b0afa0d8d6e0ff0b334a329aceb813b69a8bf SHA256 1fd0e6d4dec975ef02dd3134871ce00d4bb9dcf84451708d721344e9792e7acf
-MISC ChangeLog 15912 RMD160 f4afa67aeca5f00b662c1631723d71d46493a49c SHA1 841a60f2e38ca825c77d1581b4737a69ddd527e7 SHA256 bbdb608d62ca176537fc34d4681813f2a81300e29f49da57451d9d44d942b45d
+MISC ChangeLog 16233 RMD160 cd5c329d059b095e2a624117fbe6d58c39c0b244 SHA1 8e7edf830ec659cbdd00821d46cba8b469799e26 SHA256 5309b3149ae35bfeb253024bda9f842030f6996821f74b0bd527efc6840a67c5
 MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOyNSdAAoJEF0huFKJUZL5JckP/Rnizg1zaSA/zRYJvh4SfbqG
-M3c7VvLpCF3IIDMlf83G9kWzD4H5FLUW7brDAntS3R6fOxPGc8oyaLFDF6rBHmj4
-nVXmvblkBAqOvIewtuKnEyN/UIcoCnwnQiEis2KuChOBHmgp+skbeHJWrVpsNkxh
-DhUT8mh7+Z1ZLR/TS46817BNUbJvMOR6QULgBpUdtdZSUv4G18PPdosBo+Smr6XF
-WZT9ZyhRFHeHebmoKa1jyaV2tt+g0TxLQdIyrNMSfAHtQZVZA1S2xzfIwljUW1MJ
-fWOb5Y8MSThEEJ4d6hw6Ftk6mQOxAqufLlNzgs+9E45Pz8O7/hqY2aFR4+sSOWw0
-IiH6u1XpfhqLQL87K5lRd5UkQJuatqlb/USukzjMw/vQd7XCJbnsJe0iC1z/0sr1
-AX63J92z9ZCk04IuKX60mU8wfPNBWp/xd11Gav0yq/hgfcKChbC2hDgNE/qLacdQ
-HQdRT+5dn7cVntWPHOheBWhpDq3YteiVT3v9Z32K1ffTFu4M4yZgSbp52Ip8QB3l
-3+h3w5ppO1u0cVH4LrWDCrgEmlTqVMsu6mlSSpEko7svsPtpuzwoFJHRQ66v4Dv5
-NLWOxtrIu4Ac/b8ZhsQCmdV9FzbkDZMvPc34qUk7YdWmmLQIS0qsvM9yS0TGp4rZ
-eSaqylVbdGtatd/WPCpo
-=L5hZ
+iQEcBAEBCgAGBQJO0aUAAAoJEEqz6FtPBkyjPpUIAKVqyIyeJq38dPH7rMCl+o/a
+yPGMylgEFU6D6iNVeBFJYzIiZKoyOMbMmqlMRCmvyeOyadvIR/RJGlpw+4CO0hcJ
+Z/YZbehfIfP72lHgfe9YCDPFVdC8hQ9OoWYaOp2XFS4eAGMNAdxY51ARyRDqgHTD
+wKlK4tJ7ub3Hd58Pb0BzjKnxap/sQdHnhlXghRinKyM4LUmbz+oMxyaiTbW/Mt/O
+ji4V0eYWHSy+5Ax2OHP0X67IAON5+BE8Lf8cxJN9bzt2HBe/w7iPRNN7CPi0Bb+s
+yA6nEl1H7k2RzzCJ3yDijzMEU36TEwkkOZaYrLTV5aWG6skRLUADYiffddM+4oY=
+=gMfH
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libebml/files/libebml-0.7.8-makefile-fixup.patch b/dev-libs/libebml/files/libebml-0.7.8-makefile-fixup.patch
deleted file mode 100644
index dc25bee65e94..000000000000
--- a/dev-libs/libebml/files/libebml-0.7.8-makefile-fixup.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-This patch fixes three issues:
-- http://bugs.gentoo.org/show_bug.cgi?id=292171
-  respect DESTDIR, patch by Darik Horn
-- don't inject random warning flags
-- http://bugs.gentoo.org/show_bug.cgi?id=262973
-  respect LDFLAGS and LIBS
-- build a dynamic lib on Darwin also (not just only a static lib), patch
-  by Fabian Groffen
-
-
---- make/linux/Makefile
-+++ make/linux/Makefile
-@@ -53,6 +53,8 @@
- LIBRARY=libebml.a
- LIBRARY_SO=libebml.so
- LIBRARY_SO_VER=libebml.so.0
-+LIBRARY_DYLIB=libebml.dylib
-+LIBRARY_DYLIB_VER=libebml.0.dylib
- 
- # source-files
- sources:=$(wildcard ${SRC_DIR}*$(EXTENSION))
-@@ -65,11 +67,11 @@
- objects_so:=$(patsubst %$(EXTENSION),%.lo,$(sources))
- 
- WARNINGFLAGS=-Wall -Wno-unknown-pragmas -ansi -fno-gnu-keywords -Wshadow
--COMPILEFLAGS=$(WARNINGFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(DEBUGFLAGS) $(INCLUDE)
-+COMPILEFLAGS=$(CXXFLAGS) $(CPPFLAGS) $(DEBUGFLAGS) $(INCLUDE)
- DEPENDFLAGS  = $(CXXFLAGS) $(INCLUDE)
- 
- ifeq (Darwin,$(shell uname -s))
--all: staticlib
-+all: staticlib macholib
- else
- all: staticlib sharedlib
- endif
-@@ -78,8 +80,10 @@
- 
- sharedlib: $(LIBRARY_SO)
- 
-+macholib: $(LIBRARY_DYLIB)
-+
- lib:
--	@echo "Use the 'staticlib', 'sharedlib' or 'all' targets."
-+	@echo "Use the 'staticlib', 'sharedlib', 'macholib' or 'all' targets."
- 	@false
- 
- # Build rules
-@@ -94,15 +98,22 @@
- 	$(RANLIB) $@
- 
- $(LIBRARY_SO): $(objects_so)
--	$(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so)
-+	$(CXX) $(LDFLAGS) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) $(LIBS)
- 	rm -f $(LIBRARY_SO)
- 	ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO)
- 
-+$(LIBRARY_DYLIB): $(objects_so)
-+	$(CXX) $(LDFLAGS) -dynamiclib -install_name $(libdir)/$(LIBRARY_DYLIB_VER) -o $(LIBRARY_DYLIB_VER) $(objects_so) $(LIBS)
-+	rm -f $(LIBRARY_DYLIB)
-+	ln -s $(LIBRARY_DYLIB_VER) $(LIBRARY_DYLIB)
-+
- clean:
- 	rm -f $(objects) $(objects_so)
- 	rm -f $(LIBRARY)
- 	rm -f $(LIBRARY_SO)
- 	rm -f $(LIBRARY_SO_VER)
-+	rm -f $(LIBRARY_DYLIB)
-+	rm -f $(LIBRARY_DYLIB_VER)
- 	rm -f CORE
- 
- distclean dist-clean: clean
-@@ -119,29 +130,34 @@
- 	done
- 
- ifeq (Darwin,$(shell uname -s))
--install: install_staticlib install_headers
-+install: install_staticlib install_macholib install_headers
- else
- install: install_staticlib install_sharedlib install_headers
- endif
- 
- install_headers:
--	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)
-+	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)
- 	for i in $(INCLUDE_DIR)/*.h; do \
--		$(INSTALL) $(INSTALL_OPTS) $$i $(includedir) ; \
-+		$(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir) ; \
- 	done
--	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)/c
-+	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)/c
- 	for i in $(INCLUDE_DIR)/c/*.h; do \
--		$(INSTALL) $(INSTALL_OPTS) $$i $(includedir)/c ; \
-+		$(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir)/c ; \
- 	done
- 
- install_staticlib: $(LIBRARY)
--	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
--	$(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir)
-+	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)
-+	$(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(DESTDIR)$(libdir)
- 
- install_sharedlib: $(LIBRARY_SO)
--	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
--	$(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(libdir)
--	ln -fs $(LIBRARY_SO_VER) $(libdir)/$(LIBRARY_SO)
-+	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)
-+	$(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(DESTDIR)$(libdir)
-+	ln -fs $(LIBRARY_SO_VER) $(DESTDIR)$(libdir)/$(LIBRARY_SO)
-+
-+install_macholib: $(LIBRARY_DYLIB)
-+	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)
-+	$(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_DYLIB_VER) $(DESTDIR)$(libdir)
-+	ln -fs $(LIBRARY_DYLIB_VER) $(DESTDIR)$(libdir)/$(LIBRARY_DYLIB)
- 
- 
- ifneq ($(wildcard .depend),)
diff --git a/dev-libs/libebml/files/libebml-0.8.0-makefile-fixup.patch b/dev-libs/libebml/files/libebml-0.8.0-makefile-fixup.patch
deleted file mode 100644
index 4c3efdb4ae32..000000000000
--- a/dev-libs/libebml/files/libebml-0.8.0-makefile-fixup.patch
+++ /dev/null
@@ -1,102 +0,0 @@
---- make/linux/Makefile.orig	2010-06-05 09:38:38.000000000 -0600
-+++ make/linux/Makefile	2010-06-05 10:01:26.000000000 -0600
-@@ -50,6 +50,8 @@
- LIBRARY=libebml.a

- LIBRARY_SO=libebml.so

- LIBRARY_SO_VER=libebml.so.0

-+LIBRARY_DYLIB=libebml.dylib

-+LIBRARY_DYLIB_VER=libebml.0.dylib

- 

- # source-files

- sources:=$(wildcard ${SRC_DIR}*$(EXTENSION))

-@@ -66,7 +68,7 @@
- DEPENDFLAGS  = $(CXXFLAGS) $(INCLUDE)

- 

- ifeq (Darwin,$(shell uname -s))

--all: staticlib

-+all: staticlib macholib

- else

- all: staticlib sharedlib

- endif

-@@ -75,8 +77,10 @@
- 

- sharedlib: $(LIBRARY_SO)

- 

-+macholib: $(LIBRARY_DYLIB)

-+

- lib:

--	@echo "Use the 'staticlib', 'sharedlib' or 'all' targets."

-+	@echo "Use the 'staticlib', 'sharedlib', 'macholib' or 'all' targets."

- 	@false

- 

- # Build rules

-@@ -91,15 +95,22 @@
- 	$(RANLIB) $@

- 

- $(LIBRARY_SO): $(objects_so)

--	$(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so)

-+	$(CXX) $(LDFLAGS) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) $(LIBS)

- 	rm -f $(LIBRARY_SO)

- 	ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO)

- 

-+$(LIBRARY_DYLIB): $(objects_so)

-+	$(CXX) $(LDFLAGS) -dynamiclib -install_name $(libdir)/$(LIBRARY_DYLIB_VER) -o $(LIBRARY_DYLIB_VER) $(objects_so) $(LIBS)

-+	rm -f $(LIBRARY_DYLIB)

-+	ln -s $(LIBRARY_DYLIB_VER) $(LIBRARY_DYLIB)

-+

- clean:

- 	rm -f $(objects) $(objects_so)

- 	rm -f $(LIBRARY)

- 	rm -f $(LIBRARY_SO)

- 	rm -f $(LIBRARY_SO_VER)

-+	rm -f $(LIBRARY_DYLIB)

-+	rm -f $(LIBRARY_DYLIB_VER)

- 	rm -f CORE

- 

- distclean dist-clean: clean

-@@ -116,30 +127,34 @@
- 	done

- 

- ifeq (Darwin,$(shell uname -s))

--install: install_staticlib install_headers

-+install: install_staticlib install_macholib install_headers

- else

- install: install_staticlib install_sharedlib install_headers

- endif

- 

- install_headers:

--	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)

-+	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)

- 	for i in $(INCLUDE_DIR)/*.h; do \

--		$(INSTALL) $(INSTALL_OPTS) $$i $(includedir) ; \

-+		$(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir) ; \

- 	done

--	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)/c

-+	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)/c

- 	for i in $(INCLUDE_DIR)/c/*.h; do \

--		$(INSTALL) $(INSTALL_OPTS) $$i $(includedir)/c ; \

-+		$(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir)/c ; \

- 	done

- 

- install_staticlib: $(LIBRARY)

--	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)

--	$(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir)

-+	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)

-+	$(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(DESTDIR)$(libdir)

- 

- install_sharedlib: $(LIBRARY_SO)

--	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)

--	$(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(libdir)

--	ln -fs $(LIBRARY_SO_VER) $(libdir)/$(LIBRARY_SO)

--

-+	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)

-+	$(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(DESTDIR)$(libdir)

-+	ln -fs $(LIBRARY_SO_VER) $(DESTDIR)$(libdir)/$(LIBRARY_SO)

-+	

-+install_macholib: $(LIBRARY_DYLIB)

-+	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)

-+	$(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_DYLIB_VER) $(DESTDIR)$(libdir)

-+	ln -fs $(LIBRARY_DYLIB_VER) $(DESTDIR)$(libdir)/$(LIBRARY_DYLIB)

- 

- ifneq ($(wildcard .depend),)

- include .depend

diff --git a/dev-libs/libebml/files/libebml-1.0.0-makefile-fixup.patch b/dev-libs/libebml/files/libebml-1.0.0-makefile-fixup.patch
deleted file mode 100644
index 18508e6b3278..000000000000
--- a/dev-libs/libebml/files/libebml-1.0.0-makefile-fixup.patch
+++ /dev/null
@@ -1,107 +0,0 @@
---- make/linux/Makefile.orig	2010-06-05 09:00:43.000000000 -0600
-+++ make/linux/Makefile	2010-06-05 09:34:40.000000000 -0600
-@@ -50,6 +50,8 @@
- LIBRARY=libebml.a

- LIBRARY_SO=libebml.so

- LIBRARY_SO_VER=libebml.so.2

-+LIBRARY_DYLIB=libebml.dylib

-+LIBRARY_DYLIB_VER=libebml.2.dylib

- 

- # source-files

- sources:=$(wildcard ${SRC_DIR}*$(EXTENSION))

-@@ -62,11 +64,11 @@
- objects_so:=$(patsubst %$(EXTENSION),%.lo,$(sources))

- 

- WARNINGFLAGS=-Wall -Wno-unknown-pragmas -ansi -fno-gnu-keywords -Wshadow

--COMPILEFLAGS=$(WARNINGFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(DEBUGFLAGS) $(INCLUDE)

-+COMPILEFLAGS=$(CXXFLAGS) $(CPPFLAGS) $(DEBUGFLAGS) $(INCLUDE)

- DEPENDFLAGS  = $(CXXFLAGS) $(INCLUDE)

- 

- ifeq (Darwin,$(shell uname -s))

--all: staticlib

-+all: staticlib macholib

- else

- all: staticlib sharedlib

- endif

-@@ -75,8 +77,10 @@
- 

- sharedlib: $(LIBRARY_SO)

- 

-+macholib: $(LIBRARY_DYLIB)

-+

- lib:

--	@echo "Use the 'staticlib', 'sharedlib' or 'all' targets."

-+	@echo "Use the 'staticlib', 'sharedlib', 'macholib' or 'all' targets."

- 	@false

- 

- # Build rules

-@@ -91,15 +95,22 @@
- 	$(RANLIB) $@

- 

- $(LIBRARY_SO): $(objects_so)

--	$(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so)

-+	$(CXX) $(LDFLAGS) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) $(LIBS)

- 	rm -f $(LIBRARY_SO)

- 	ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO)

- 

-+$(LIBRARY_DYLIB): $(objects_so)

-+	$(CXX) $(LDFLAGS) -dynamiclib -install_name $(libdir)/$(LIBRARY_DYLIB_VER) -o $(LIBRARY_DYLIB_VER) $(objects_so) $(LIBS)

-+	rm -f $(LIBRARY_DYLIB)

-+	ln -s $(LIBRARY_DYLIB_VER) $(LIBRARY_DYLIB)

-+

- clean:

- 	rm -f $(objects) $(objects_so)

- 	rm -f $(LIBRARY)

- 	rm -f $(LIBRARY_SO)

- 	rm -f $(LIBRARY_SO_VER)

-+	rm -f $(LIBRARY_DYLIB)

-+	rm -f $(LIBRARY_DYLIB_VER)

- 	rm -f CORE

- 

- distclean dist-clean: clean

-@@ -116,30 +127,34 @@
- 	done

- 

- ifeq (Darwin,$(shell uname -s))

--install: install_staticlib install_headers

-+install: install_staticlib install_macholib install_headers

- else

- install: install_staticlib install_sharedlib install_headers

- endif

- 

- install_headers:

--	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)

-+	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)

- 	for i in $(INCLUDE_DIR)/*.h; do \

--		$(INSTALL) $(INSTALL_OPTS) $$i $(includedir) ; \

-+		$(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir) ; \

- 	done

--	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)/c

-+	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)/c

- 	for i in $(INCLUDE_DIR)/c/*.h; do \

--		$(INSTALL) $(INSTALL_OPTS) $$i $(includedir)/c ; \

-+		$(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir)/c ; \

- 	done

- 

- install_staticlib: $(LIBRARY)

--	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)

--	$(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir)

-+	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)

-+	$(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(DESTDIR)$(libdir)

- 

- install_sharedlib: $(LIBRARY_SO)

--	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)

--	$(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(libdir)

--	ln -fs $(LIBRARY_SO_VER) $(libdir)/$(LIBRARY_SO)

--

-+	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)

-+	$(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(DESTDIR)$(libdir)

-+	ln -fs $(LIBRARY_SO_VER) $(DESTDIR)$(libdir)/$(LIBRARY_SO)

-+

-+install_macholib: $(LIBRARY_DYLIB)

-+	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)

-+	$(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_DYLIB_VER) $(DESTDIR)$(libdir)

-+	ln -fs $(LIBRARY_DYLIB_VER) $(DESTDIR)$(libdir)/$(LIBRARY_DYLIB)

- 

- ifneq ($(wildcard .depend),)

- include .depend

diff --git a/dev-libs/libebml/libebml-0.7.8-r1.ebuild b/dev-libs/libebml/libebml-0.7.8-r1.ebuild
deleted file mode 100644
index 347d07ac8734..000000000000
--- a/dev-libs/libebml/libebml-0.7.8-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libebml/libebml-0.7.8-r1.ebuild,v 1.7 2008/09/27 16:45:45 armin76 Exp $
-
-inherit multilib toolchain-funcs
-
-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="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-S="${S}/make/linux"
-
-src_compile() {
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die "emake failed"
-}
-
-src_install() {
-	einstall libdir="${D}/usr/$(get_libdir)" || die "make install failed"
-	dodoc "${WORKDIR}/${P}/ChangeLog"
-}
diff --git a/dev-libs/libebml/libebml-0.7.8-r2.ebuild b/dev-libs/libebml/libebml-0.7.8-r2.ebuild
deleted file mode 100644
index e2f211d299e2..000000000000
--- a/dev-libs/libebml/libebml-0.7.8-r2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libebml/libebml-0.7.8-r2.ebuild,v 1.1 2009/11/13 18:55:08 grobian Exp $
-
-EAPI=2
-
-inherit eutils multilib toolchain-funcs
-
-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="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-S="${S}/make/linux"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile-fixup.patch
-}
-
-src_compile() {
-	# keep the prefix in here to make sure the binary is built with a correct
-	# install_name on Darwin
-	emake \
-		prefix="${EPREFIX}/usr" \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		|| die "emake failed"
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		prefix="${EPREFIX}/usr" \
-		libdir="${EPREFIX}/usr/$(get_libdir)" \
-		install || die "emake install failed"
-
-	dodoc "${WORKDIR}/${P}/ChangeLog"
-}
diff --git a/dev-libs/libebml/libebml-0.8.0.ebuild b/dev-libs/libebml/libebml-0.8.0.ebuild
deleted file mode 100644
index bb872e0501d2..000000000000
--- a/dev-libs/libebml/libebml-0.8.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libebml/libebml-0.8.0.ebuild,v 1.4 2010/10/15 21:38:00 ranger Exp $
-
-EAPI=2
-
-inherit eutils multilib toolchain-funcs
-
-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="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-S="${S}/make/linux"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile-fixup.patch
-}
-
-src_compile() {
-	# keep the prefix in here to make sure the binary is built with a correct
-	# install_name on Darwin
-	emake \
-		prefix="${EPREFIX}/usr" \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		|| die "emake failed"
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		prefix="${EPREFIX}/usr" \
-		libdir="${EPREFIX}/usr/$(get_libdir)" \
-		install || die "emake install failed"
-
-	dodoc "${WORKDIR}/${P}/ChangeLog"
-}
diff --git a/dev-libs/libebml/libebml-1.0.0.ebuild b/dev-libs/libebml/libebml-1.0.0.ebuild
deleted file mode 100644
index 51a02e407b88..000000000000
--- a/dev-libs/libebml/libebml-1.0.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libebml/libebml-1.0.0.ebuild,v 1.4 2011/05/28 11:46:47 ranger Exp $
-
-EAPI=2
-
-inherit eutils multilib toolchain-funcs
-
-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="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-S="${S}/make/linux"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile-fixup.patch
-}
-
-src_compile() {
-	# keep the prefix in here to make sure the binary is built with a correct
-	# install_name on Darwin
-	emake \
-		prefix="${EPREFIX}/usr" \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		|| die "emake failed"
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		prefix="${EPREFIX}/usr" \
-		libdir="${EPREFIX}/usr/$(get_libdir)" \
-		install || die "emake install failed"
-
-	dodoc "${WORKDIR}/${P}/ChangeLog"
-}
diff --git a/dev-libs/libebml/libebml-1.2.0.ebuild b/dev-libs/libebml/libebml-1.2.0.ebuild
deleted file mode 100644
index 17ecdc1c1f02..000000000000
--- a/dev-libs/libebml/libebml-1.2.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libebml/libebml-1.2.0.ebuild,v 1.2 2011/02/02 03:40:30 radhermit Exp $
-
-EAPI=2
-
-inherit eutils multilib toolchain-funcs
-
-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="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/${P}/make/linux"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile-fixup.patch
-}
-
-src_compile() {
-	# keep the prefix in here to make sure the binary is built with a correct
-	# install_name on Darwin
-	emake \
-		prefix="${EPREFIX}/usr" \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		|| die "emake failed"
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		prefix="${EPREFIX}/usr" \
-		libdir="${EPREFIX}/usr/$(get_libdir)" \
-		install || die "emake install failed"
-
-	dodoc "${WORKDIR}/${P}/ChangeLog"
-}