Fix multilib-strict support. Bug #327449

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/media-video/rtmpdump/ChangeLog b/media-video/rtmpdump/ChangeLog
index 7af35b063ce59db29e8e85789b77b54e4fc3a30d..dadb5bef77295c25e68a93e1951240ed2f044153 100644 (file)
--- a/media-video/rtmpdump/ChangeLog
+++ b/media-video/rtmpdump/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/rtmpdump
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/rtmpdump/ChangeLog,v 1.7 2010/07/07 22:25:30 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/rtmpdump/ChangeLog,v 1.8 2010/07/08 10:02:30 hwoarang Exp $
+
+  08 Jul 2010; Markos Chandras <hwoarang@gentoo.org> rtmpdump-2.3.ebuild:
+  Fix multilib-strict support. Bug #327449
 
 *rtmpdump-2.3 (07 Jul 2010)
 

diff --git a/media-video/rtmpdump/Manifest b/media-video/rtmpdump/Manifest
index ad99abfa04da79da5fa421dbd4f1ac8937692eb2..95a0206e451b0a239cee5cafbaeca7d59c43d19f 100644 (file)
--- a/media-video/rtmpdump/Manifest
+++ b/media-video/rtmpdump/Manifest
@@ -3,6 +3,6 @@ DIST rtmpdump-2.2e.tar.gz 123742 RMD160 ddb796dfa0287622c2e34ecf6add2d75259b6859
 DIST rtmpdump-2.3.tgz 125103 RMD160 1d48925e6567783806fa68819d6a695cd06138bc SHA1 b65ce7708ae79adb51d1f43dd0b6d987076d7c42 SHA256 ef38b7a99d82ce6912063d21063aeaf28185341b3df486e24bffce5354224b2c
 EBUILD rtmpdump-2.2d.ebuild 1569 RMD160 0a989cb5bc53185505d3984e3f041d96de9d641e SHA1 01f610da5b07908681e5f3eb44222c1619042a9e SHA256 9ea4eb0a03f9b8782054a5a9b51b496a46fc4a4f9ae655caa95da3885e7129bc
 EBUILD rtmpdump-2.2e-r3.ebuild 1734 RMD160 9cf6f4438c89d79215625764d887b03091403810 SHA1 3e2edadf5df46a399f2fd0136ac12e324c7c7de5 SHA256 eeffbb85dbdf47fc6fe9b0408df6a68e1947ce259ea2f54b634256cb447697ae
-EBUILD rtmpdump-2.3.ebuild 1760 RMD160 049383d6904a6dc1c0fa918f53c0e20bbe764115 SHA1 5d8b1b87f1d49ddb21424dad1e282dee33f95873 SHA256 59eee5dd0189af3bfe91bd59ab6756f5929d5fa0143e4bb74ed4a42a8c8373ac
-MISC ChangeLog 1773 RMD160 4cddba660cd01d22763297178f9f620b8f760964 SHA1 ad99e1da1fb8a4cf3b239efe02e0fd289731d693 SHA256 e09052294ac3b520e98f483d5b375d7b45bef1b8c05de060a4842ebc40e9cd5a
+EBUILD rtmpdump-2.3.ebuild 1880 RMD160 8c3930a9734eac5aba67c067d4ea7f8455691bea SHA1 9a5d35a70e99207bb1612ecabd3fbafe195263b7 SHA256 4064723cec7347767ee4eb12726f4cceb9073e535e2bf236d5f9f92133793bdf
+MISC ChangeLog 1891 RMD160 a9d8a4830969b6cc423bf336b0f84cffb511b346 SHA1 ee21434de88ba9351fe3446a7ed0bb1de789ac5a SHA256 ea057a6059a534db6d4d3cd039db84509b459c2c39ecb101b331b77815a319e1
 MISC metadata.xml 472 RMD160 4835468842fdab943f6be092477f49086c6a29b9 SHA1 956aa390149904e2c64696cf44e36d5cfea8ac0f SHA256 e8efe99d2c5cee392b1222aedf2703c49f8b1a452d125a371fd3c3b2bbbe2b03

diff --git a/media-video/rtmpdump/rtmpdump-2.3.ebuild b/media-video/rtmpdump/rtmpdump-2.3.ebuild
index 40f6b73b678f37e6e73434d8047439d6d7e2e004..a47e7f12d11c877e5a24b761ab5eefba1ee646c9 100644 (file)
--- a/media-video/rtmpdump/rtmpdump-2.3.ebuild
+++ b/media-video/rtmpdump/rtmpdump-2.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/rtmpdump/rtmpdump-2.3.ebuild,v 1.1 2010/07/07 22:25:30 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/rtmpdump/rtmpdump-2.3.ebuild,v 1.2 2010/07/08 10:02:30 hwoarang Exp $
 
 EAPI="2"
 
-inherit toolchain-funcs
+inherit multilib toolchain-funcs
 
 DESCRIPTION="Open source command-line RTMP client intended to stream audio or video flash content"
 HOMEPAGE="http://rtmpdump.mplayerhq.hu/"
@@ -50,13 +50,14 @@ src_compile() {
                        crypto="OPENSSL"
                fi
        fi
-
+       #fix multilib-script support. Bug #327449
+       sed -i "/^libdir/s:lib$:$(get_libdir)$:" librtmp/Makefile
        emake CC=$(tc-getCC) LD=$(tc-getLD) \
                OPT="${CFLAGS}" XLDFLAGS="${LDFLAGS}" CRYPTO="${crypto}" SYS=posix || die "emake failed"
 }
 
 src_install() {
-       mkdir -p "${D}"/${DESTTREE}/lib
+       mkdir -p "${D}"/${DESTTREE}/$(get_libdir)
        emake DESTDIR="${D}" prefix="${DESTTREE}" mandir="${DESTTREE}/share/man" \
        CRYPTO="${crypto}" install      || die "emake install failed"
        dodoc README ChangeLog rtmpdump.1.html rtmpgw.8.html || die "dodoc failed"