From 7136164885a7334eb021ffaa20324edaaecb924e Mon Sep 17 00:00:00 2001 From: Thomas Anderson Date: Sun, 22 Jun 2008 16:38:06 +0000 Subject: amd64 stable, fix multilib issues, bug #213033 Package-Manager: portage-2.1.4.4 --- media-libs/libkarma/ChangeLog | 6 ++- media-libs/libkarma/Manifest | 11 +++--- .../libkarma/files/libkarma-0.1.0-multilib.patch | 43 ++++++++++++++++++++++ media-libs/libkarma/libkarma-0.1.0.ebuild | 6 ++- 4 files changed, 58 insertions(+), 8 deletions(-) create mode 100644 media-libs/libkarma/files/libkarma-0.1.0-multilib.patch (limited to 'media-libs/libkarma') diff --git a/media-libs/libkarma/ChangeLog b/media-libs/libkarma/ChangeLog index b041dd7d9394..001e32509c44 100644 --- a/media-libs/libkarma/ChangeLog +++ b/media-libs/libkarma/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/libkarma # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libkarma/ChangeLog,v 1.9 2008/05/18 16:31:16 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libkarma/ChangeLog,v 1.10 2008/06/22 16:38:05 gentoofan23 Exp $ + + 22 Jun 2008; Thomas Anderson + +files/libkarma-0.1.0-multilib.patch, libkarma-0.1.0.ebuild: + amd64 stable, fix multilib issues, bug #213033 18 May 2008; Markus Meier libkarma-0.1.0.ebuild: x86 stable, bug #213033 diff --git a/media-libs/libkarma/Manifest b/media-libs/libkarma/Manifest index aa9741ab9f25..37a17d12604e 100644 --- a/media-libs/libkarma/Manifest +++ b/media-libs/libkarma/Manifest @@ -4,16 +4,17 @@ Hash: SHA1 AUX libkarma-0.0.6-gentoo.patch 583 RMD160 b5019f17f39ae5c353f0dd938bd7645894c5f68a SHA1 35fe837d84f79d0653ba9e0caa137fa35409abcd SHA256 f18be831649bd3f554b92c81a3774b2c160f814714e42d0129723c925e22923d AUX libkarma-0.0.6-mono.patch 583 RMD160 b5019f17f39ae5c353f0dd938bd7645894c5f68a SHA1 35fe837d84f79d0653ba9e0caa137fa35409abcd SHA256 f18be831649bd3f554b92c81a3774b2c160f814714e42d0129723c925e22923d AUX libkarma-0.0.6-soname.patch 404 RMD160 1a8e1d0103b2b33e9449aab52bd8273c5360cd90 SHA1 0de114fed42581c7b30f559b2aa18b46af2ff74c SHA256 3d7145ddbf2cd5647ff52c969fbecfb2174440d1768420dd3624f91ed5c0e4b8 +AUX libkarma-0.1.0-multilib.patch 1559 RMD160 fe38e092df4b6bf5e8237bbcca538a7b27cb0ce5 SHA1 0626e4e20db1dfa80cf30ef2fb7e92c013d5f5ee SHA256 0c39caad3627c1f7cb074790ff78096c66a3db95d1724b8b3f76a0bb80b63e4f DIST libkarma-0.0.6.tar.gz 73957 RMD160 ce160a5264de7d981494f365b6e35db4113ef2f8 SHA1 4992e883b93bd62c185362d7f6399b2e99a235f7 SHA256 5ead4907c9e4c61d243f78a9d7adfa8116dbcd0eaaae1094e341f887cf59341e DIST libkarma-0.1.0.tar.gz 79137 RMD160 d992f77f0ca419bf3f87a5258623bb1e93fe54d5 SHA1 44f73f3e61b41eb14d42108863865bce7df3eeb0 SHA256 eb5d4e8468c92d480f469cd467a7d9a3ee51a76d7f217c0d34e9c7a503984523 EBUILD libkarma-0.0.6-r1.ebuild 932 RMD160 32ce45837085bc20cbdf9a2c85db401c5b10f310 SHA1 cedb9f3c0180a590cdec0e4e9b476f21dfadd766 SHA256 fa7021cfeee3095cf94cf61e5da75ace429890b740df38f4e39b882bcc886ad3 -EBUILD libkarma-0.1.0.ebuild 821 RMD160 e9ece2d211dd86683ef4b42152091f2d6d60a194 SHA1 12c2514e518de2a878a3ccf963165b4dd9e20418 SHA256 a564602f7fef5ed6db591348f4f74a8960b4febbb26c1a179f5ee27301d37025 -MISC ChangeLog 1466 RMD160 c79d004afa408aad7588e6fe9208d233eb0fa001 SHA1 06bf5e1b3c24323547b7d99b2786e9504ff4c6f1 SHA256 f5b70c6e797a7e4e698c9f37cba4aa8e3440cceeb1622ac9d284f755bc23fff9 +EBUILD libkarma-0.1.0.ebuild 907 RMD160 680272ec8588fe85dea89d51cc72951daf9dccab SHA1 da357ad32e0a94414ccd2b403bedc95bf14ef38e SHA256 8f9e9b399387843f54e8b8cd82c1ad1b4edd5d20881184c30519c086496c8be2 +MISC ChangeLog 1641 RMD160 2ac4000bf45898aba0c9777a88afe0ce2e020d21 SHA1 ccfbc7b11806b328c47fdbcd62c9211b185fa3f5 SHA256 b5c601fe04faaf416c9cec554a7430166e738a6ca83e2e61657a16cf068dfcf9 MISC metadata.xml 175 RMD160 8217c4a76a964b25b18eb6446b5364cf64b138a8 SHA1 8ae12528d1d4edb7a19134a659e8e7e8027fdec8 SHA256 2f35f6077ef4ecfad27847015b45c84c02488fb5a80413e5537e28b410141053 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) -iEYEARECAAYFAkgwWgkACgkQkKaRLQcq0GK2kwCeNPHwtsKKiBMc0BEMulZ+Foz+ -CaAAnRuirZgtFsP3nWt0UzpqYuQHxz7l -=q0/e +iEYEARECAAYFAkheg18ACgkQF6yMcaBxwHkPnwCeN9HOsczXguiumKLxMg0go9te +tWwAoIycrhmkWuDVXptOwyFOzwj60koN +=Q6nP -----END PGP SIGNATURE----- diff --git a/media-libs/libkarma/files/libkarma-0.1.0-multilib.patch b/media-libs/libkarma/files/libkarma-0.1.0-multilib.patch new file mode 100644 index 000000000000..716f56087762 --- /dev/null +++ b/media-libs/libkarma/files/libkarma-0.1.0-multilib.patch @@ -0,0 +1,43 @@ +--- libkarma-0.1.0-orig/src/Makefile 2007-05-15 12:29:02.000000000 -0400 ++++ libkarma-0.1.0/src/Makefile 2008-05-28 19:15:24.000000000 -0400 +@@ -6,7 +6,7 @@ + util.c wav.c + INST_HEADERS=lkarma.h utf8.h + +-LIBDIR=../lib ++LIBDIR=../$(_LIBDIR) + + CC?=gcc + AR?=ar +@@ -37,15 +37,15 @@ + default: all + + install: shared-lib-stamp static-lib-stamp +- ../install-sh -m 0755 -d $(DEST)/lib ++ ../install-sh -m 0755 -d $(DEST)/$(_LIBDIR) + ../install-sh -m 0755 -d $(DEST)/include + ../install-sh -m 0755 -d $(DEST)/include/libkarma +- ../install-sh -m 0644 -t $(DEST)/lib/ $(LIBDIR)/$(TARGET).a +- ../install-sh -m 0755 -t $(PREFIX)/lib/ $(LIBDIR)/$(OUT_VERSION) +- $(RM) $(PREFIX)/lib/$(OUT_MAJOR) +- $(RM) $(PREFIX)/lib/$(OUT_BASE) +- $(LN_S) $(OUT_VERSION) $(PREFIX)/lib/$(OUT_MAJOR) +- $(LN_S) $(OUT_VERSION) $(PREFIX)/lib/$(OUT_BASE) ++ ../install-sh -m 0644 -t $(DEST)/$(_LIBDIR)/ $(LIBDIR)/$(TARGET).a ++ ../install-sh -m 0755 -t $(PREFIX)/$(_LIBDIR)/ $(LIBDIR)/$(OUT_VERSION) ++ $(RM) $(PREFIX)/$(_LIBDIR)/$(OUT_MAJOR) ++ $(RM) $(PREFIX)/$(_LIBDIR)/$(OUT_BASE) ++ $(LN_S) $(OUT_VERSION) $(PREFIX)/$(_LIBDIR)/$(OUT_MAJOR) ++ $(LN_S) $(OUT_VERSION) $(PREFIX)/$(_LIBDIR)/$(OUT_BASE) + ../install-sh -m 0644 -t $(DEST)/include/libkarma/ $(INST_HEADERS) + + uninstall: +--- libkarma-0.1.0-orig/tools/Makefile 2007-05-15 12:29:02.000000000 -0400 ++++ libkarma-0.1.0/tools/Makefile 2008-05-28 20:14:23.000000000 -0400 +@@ -1,5 +1,5 @@ + INCLUDES=-I../src +-LIBDIR=../lib ++LIBDIR=../$(_LIBDIR) + LIBKARMA=$(LIBDIR)/libkarma.a + ifeq ($(MAKECMDGOALS),static) + LIBKARMA=$(LIBDIR)/libkarma.a diff --git a/media-libs/libkarma/libkarma-0.1.0.ebuild b/media-libs/libkarma/libkarma-0.1.0.ebuild index c8c9d1fa2f98..b10becd506d0 100644 --- a/media-libs/libkarma/libkarma-0.1.0.ebuild +++ b/media-libs/libkarma/libkarma-0.1.0.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libkarma/libkarma-0.1.0.ebuild,v 1.4 2008/05/18 16:31:16 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libkarma/libkarma-0.1.0.ebuild,v 1.5 2008/06/22 16:38:05 gentoofan23 Exp $ -inherit eutils mono +inherit eutils mono multilib DESCRIPTION="Support library for using Rio devices with mtp" HOMEPAGE="http://www.freakysoft.de/html/libkarma/" @@ -22,6 +22,7 @@ src_unpack() { unpack ${A} cd "${S}" use !mono && epatch "${FILESDIR}/libkarma-0.0.6-mono.patch" + epatch "${FILESDIR}/${P}-multilib.patch" } src_compile() { @@ -29,5 +30,6 @@ src_compile() { } src_install() { + export _LIBDIR=$(get_libdir) emake -j1 PREFIX="${D}/usr" install || die "emake install failed" } -- cgit v1.2.3-65-gdbad