Version bump, bug 321021

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

diff --git a/dev-libs/libebml/ChangeLog b/dev-libs/libebml/ChangeLog
index 58a6934298461a3d7617fa55a4ea181dedda3e57..321bfb75fa4a7e3a44212d371259b04c0438e1bb 100644 (file)
--- a/dev-libs/libebml/ChangeLog
+++ b/dev-libs/libebml/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libebml
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libebml/ChangeLog,v 1.95 2010/06/05 15:37:14 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libebml/ChangeLog,v 1.96 2010/06/05 16:03:28 beandog Exp $
+
+*libebml-0.8.0 (05 Jun 2010)
+
+  05 Jun 2010; Steve Dibb <beandog@gentoo.org> +libebml-0.8.0.ebuild,
+  +files/libebml-0.8.0-makefile-fixup.patch:
+  Version bump, bug 321021
 
 *libebml-1.0.0 (05 Jun 2010)
 

diff --git a/dev-libs/libebml/Manifest b/dev-libs/libebml/Manifest
index 7b8045d810fc8e0bab00491f9ee8de616851e859..77d3703bfe76d9e9c0011f80ad39ef6e48e85089 100644 (file)
--- a/dev-libs/libebml/Manifest
+++ b/dev-libs/libebml/Manifest
@@ -1,9 +1,12 @@
 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
 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
 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 1112 RMD160 2486f9e1eb217e3933f04f34567fd853f5388f3c SHA1 8f1c03a1a446b829b7066b1c0f344c4593cede3c SHA256 9f567e95253880c8fa87c28e4b2ba860e53375b7532ec4c508ce522923fdc4e0
 EBUILD libebml-1.0.0.ebuild 1112 RMD160 8eba52bae1c3a7b4e5460e62ba64e93d826309a7 SHA1 2c6e843c4fee1db66ab215e4dfd40a60bceb244d SHA256 8e91b88c43173d68985a13158751402c87619a0392dc35707a52046c7e480133
-MISC ChangeLog 13763 RMD160 316c31f8ffc5001182541b38e885f684d110c3ca SHA1 e9862b122e6a2103b74a601f98b60c9f2518151a SHA256 b20d0828edf676c935a994d882e232723dac681172317ae09a2861cbefd73e32
+MISC ChangeLog 13936 RMD160 ef59eee2395f3638f441e18a489769f90a58cbb6 SHA1 99c7c192fde3f94055978798c5802ceec11184b4 SHA256 6cf3abcd1efe5526618b137dc127c156d9f5286f08f91d05325a6920f8dc6a32
 MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5

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
new file mode 100644 (file)
index 0000000..4c3efdb
--- /dev/null
+++ b/dev-libs/libebml/files/libebml-0.8.0-makefile-fixup.patch
@@ -0,0 +1,102 @@
+--- 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\r
+ LIBRARY_SO=libebml.so\r
+ LIBRARY_SO_VER=libebml.so.0\r
++LIBRARY_DYLIB=libebml.dylib\r
++LIBRARY_DYLIB_VER=libebml.0.dylib\r
+ \r
+ # source-files\r
+ sources:=$(wildcard ${SRC_DIR}*$(EXTENSION))\r
+@@ -66,7 +68,7 @@
+ DEPENDFLAGS  = $(CXXFLAGS) $(INCLUDE)\r
+ \r
+ ifeq (Darwin,$(shell uname -s))\r
+-all: staticlib\r
++all: staticlib macholib\r
+ else\r
+ all: staticlib sharedlib\r
+ endif\r
+@@ -75,8 +77,10 @@
+ \r
+ sharedlib: $(LIBRARY_SO)\r
+ \r
++macholib: $(LIBRARY_DYLIB)\r
++\r
+ lib:\r
+-      @echo "Use the 'staticlib', 'sharedlib' or 'all' targets."\r
++      @echo "Use the 'staticlib', 'sharedlib', 'macholib' or 'all' targets."\r
+       @false\r
+ \r
+ # Build rules\r
+@@ -91,15 +95,22 @@
+       $(RANLIB) $@\r
+ \r
+ $(LIBRARY_SO): $(objects_so)\r
+-      $(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so)\r
++      $(CXX) $(LDFLAGS) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) $(LIBS)\r
+       rm -f $(LIBRARY_SO)\r
+       ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO)\r
+ \r
++$(LIBRARY_DYLIB): $(objects_so)\r
++      $(CXX) $(LDFLAGS) -dynamiclib -install_name $(libdir)/$(LIBRARY_DYLIB_VER) -o $(LIBRARY_DYLIB_VER) $(objects_so) $(LIBS)\r
++      rm -f $(LIBRARY_DYLIB)\r
++      ln -s $(LIBRARY_DYLIB_VER) $(LIBRARY_DYLIB)\r
++\r
+ clean:\r
+       rm -f $(objects) $(objects_so)\r
+       rm -f $(LIBRARY)\r
+       rm -f $(LIBRARY_SO)\r
+       rm -f $(LIBRARY_SO_VER)\r
++      rm -f $(LIBRARY_DYLIB)\r
++      rm -f $(LIBRARY_DYLIB_VER)\r
+       rm -f CORE\r
+ \r
+ distclean dist-clean: clean\r
+@@ -116,30 +127,34 @@
+       done\r
+ \r
+ ifeq (Darwin,$(shell uname -s))\r
+-install: install_staticlib install_headers\r
++install: install_staticlib install_macholib install_headers\r
+ else\r
+ install: install_staticlib install_sharedlib install_headers\r
+ endif\r
+ \r
+ install_headers:\r
+-      $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)\r
++      $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)\r
+       for i in $(INCLUDE_DIR)/*.h; do \\r
+-              $(INSTALL) $(INSTALL_OPTS) $$i $(includedir) ; \\r
++              $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir) ; \\r
+       done\r
+-      $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)/c\r
++      $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)/c\r
+       for i in $(INCLUDE_DIR)/c/*.h; do \\r
+-              $(INSTALL) $(INSTALL_OPTS) $$i $(includedir)/c ; \\r
++              $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir)/c ; \\r
+       done\r
+ \r
+ install_staticlib: $(LIBRARY)\r
+-      $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)\r
+-      $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir)\r
++      $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)\r
++      $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(DESTDIR)$(libdir)\r
+ \r
+ install_sharedlib: $(LIBRARY_SO)\r
+-      $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)\r
+-      $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(libdir)\r
+-      ln -fs $(LIBRARY_SO_VER) $(libdir)/$(LIBRARY_SO)\r
+-\r
++      $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)\r
++      $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(DESTDIR)$(libdir)\r
++      ln -fs $(LIBRARY_SO_VER) $(DESTDIR)$(libdir)/$(LIBRARY_SO)\r
++      \r
++install_macholib: $(LIBRARY_DYLIB)\r
++      $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)\r
++      $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_DYLIB_VER) $(DESTDIR)$(libdir)\r
++      ln -fs $(LIBRARY_DYLIB_VER) $(DESTDIR)$(libdir)/$(LIBRARY_DYLIB)\r
+ \r
+ ifneq ($(wildcard .depend),)\r
+ include .depend\r

diff --git a/dev-libs/libebml/libebml-0.8.0.ebuild b/dev-libs/libebml/libebml-0.8.0.ebuild
new file mode 100644 (file)
index 0000000..f73c1d9
--- /dev/null
+++ b/dev-libs/libebml/libebml-0.8.0.ebuild
@@ -0,0 +1,42 @@
+# 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.1 2010/06/05 16:03:28 beandog 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"
+}