Fix multilib-strict QA checks (again)

Package-Manager: portage-2.1.2-r9

diff --git a/media-tv/linuxtv-dvb-apps/ChangeLog b/media-tv/linuxtv-dvb-apps/ChangeLog
index 8ab90036fb75bf09bf5997f1261a57d206edd501..926e832cd0c5c6651a9d0dac819343ca1c7e7d5d 100644 (file)
--- a/media-tv/linuxtv-dvb-apps/ChangeLog
+++ b/media-tv/linuxtv-dvb-apps/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-tv/linuxtv-dvb-apps
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-apps/ChangeLog,v 1.24 2007/01/14 22:03:33 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-apps/ChangeLog,v 1.25 2007/02/19 19:47:40 malc Exp $
+
+  19 Feb 2007; <malc@gentoo.org> linuxtv-dvb-apps-1.1.1.20070114.ebuild:
+  Fix multilib-strict QA checks (again)
 
 *linuxtv-dvb-apps-1.1.1.20070114 (14 Jan 2007)
 

diff --git a/media-tv/linuxtv-dvb-apps/Manifest b/media-tv/linuxtv-dvb-apps/Manifest
index 99617004e5d838a5e1b6957e956c8e7299d18542..6f97d3dba39bc5cbcf74a3bd86f37fcdadf48eaf 100644 (file)
--- a/media-tv/linuxtv-dvb-apps/Manifest
+++ b/media-tv/linuxtv-dvb-apps/Manifest
@@ -9,14 +9,14 @@ EBUILD linuxtv-dvb-apps-1.1.1.20060917.ebuild 2449 RMD160 6f2e1d7e16a94a4c750bd2
 MD5 f85b3dcf10ee4f2c0eba7b6dc4895a88 linuxtv-dvb-apps-1.1.1.20060917.ebuild 2449
 RMD160 6f2e1d7e16a94a4c750bd2249e48afd4f4d597f4 linuxtv-dvb-apps-1.1.1.20060917.ebuild 2449
 SHA256 0c36c9cc16089cefb445220756e2af9eedd555fb9b9d00edeb04e45606ffb22a linuxtv-dvb-apps-1.1.1.20060917.ebuild 2449
-EBUILD linuxtv-dvb-apps-1.1.1.20070114.ebuild 2525 RMD160 a712d3df58b93f83955d3e8f9a3a308d986df1ed SHA1 550913152d494eb4a1fc108ec6d427699fc07f7a SHA256 6614193232170a8d6d9db0510d2bfc9435842e2d45ca37e0390a2d672e671bfa
-MD5 907f019ea4d5bc2abad28da336682ae7 linuxtv-dvb-apps-1.1.1.20070114.ebuild 2525
-RMD160 a712d3df58b93f83955d3e8f9a3a308d986df1ed linuxtv-dvb-apps-1.1.1.20070114.ebuild 2525
-SHA256 6614193232170a8d6d9db0510d2bfc9435842e2d45ca37e0390a2d672e671bfa linuxtv-dvb-apps-1.1.1.20070114.ebuild 2525
-MISC ChangeLog 4994 RMD160 4c090fed153e9c7533498ab528189aa5c6323e83 SHA1 373a6d38a1f512f28da60c5e06ed28b5947dc65d SHA256 692c96b6620845dda09eacda82b41029339432be39e6cd0efc80693246e38441
-MD5 00c25d3dacfa7593ee72a64426946cef ChangeLog 4994
-RMD160 4c090fed153e9c7533498ab528189aa5c6323e83 ChangeLog 4994
-SHA256 692c96b6620845dda09eacda82b41029339432be39e6cd0efc80693246e38441 ChangeLog 4994
+EBUILD linuxtv-dvb-apps-1.1.1.20070114.ebuild 2328 RMD160 b692844e2b5c94ade93efb9c37bc832e5b926146 SHA1 216d1d17787472cd043334b151ddf361673a648f SHA256 4fc091cf9993c3ad607562354f662d30048ef65f70009175df119e6b8e309f4e
+MD5 2689c6fe1bdd3182a91eff97d76e349d linuxtv-dvb-apps-1.1.1.20070114.ebuild 2328
+RMD160 b692844e2b5c94ade93efb9c37bc832e5b926146 linuxtv-dvb-apps-1.1.1.20070114.ebuild 2328
+SHA256 4fc091cf9993c3ad607562354f662d30048ef65f70009175df119e6b8e309f4e linuxtv-dvb-apps-1.1.1.20070114.ebuild 2328
+MISC ChangeLog 5108 RMD160 3d773f9c74e44e15224df1d06dea1c9d1e8982e4 SHA1 a910c56085478c625a3ea4fe476e1e650b4679f6 SHA256 a1db61976f289ffb671e225bd00bcc2092cff0819b7ace7d35d611080a4c0e93
+MD5 21f08624f7b2225668e99dc528b016b1 ChangeLog 5108
+RMD160 3d773f9c74e44e15224df1d06dea1c9d1e8982e4 ChangeLog 5108
+SHA256 a1db61976f289ffb671e225bd00bcc2092cff0819b7ace7d35d611080a4c0e93 ChangeLog 5108
 MISC metadata.xml 217 RMD160 2daa552f0b03b2d6ab99fec1eee8ab6648890b75 SHA1 a3ae417f36e171df6c47fbb7460f85a3f957ed3a SHA256 11770dd9c2b190c9d2ba13d3ce36a56e6dddcc8d8a9d11eb20d930cac5d7990f
 MD5 dff9ded73ffb6549a59f5e6144af1cfd metadata.xml 217
 RMD160 2daa552f0b03b2d6ab99fec1eee8ab6648890b75 metadata.xml 217

diff --git a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20070114.ebuild b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20070114.ebuild
index b879b964f54cdd4bb6b6b4b3046156b135735565..36d4cf43d037a1e14bc26f7274ee7486124900b0 100644 (file)
--- a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20070114.ebuild
+++ b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20070114.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20070114.ebuild,v 1.1 2007/01/14 22:03:33 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20070114.ebuild,v 1.2 2007/02/19 19:47:40 malc Exp $
 
 
 inherit eutils versionator
@@ -36,11 +36,6 @@ src_unpack()
        # do not compile test-progs
        sed -i Makefile -e '/-C test/d'
 
-       # [QA] Fix library install paths on multilib aware platforms.
-       # (you'd think passing libdir=/usr/$(get_libdir) to emake would work, but
-       # no...)
-       sed -i Make.rules -e "s:\$(prefix)/lib:\$(prefix)/$(get_libdir):g"
-
        # remove copy of header-files
        rm -rf ${S}/include
 }
@@ -50,7 +45,7 @@ src_compile()
        # interferes with variable in Makefile
        unset ARCH
 
-       emake bindir=/usr/bin datadir=/usr/share libdir=/usr/lib || die "failed to compile"
+       emake bindir=/usr/bin datadir=/usr/share libdir=/usr/$(get_libdir) || die "failed to compile"
 }
 
 src_install()
@@ -59,7 +54,7 @@ src_install()
        unset ARCH
 
        insinto /usr/bin
-       emake bindir=/usr/bin datadir=/usr/share libdir=/usr/lib prefix=/usr \
+       emake bindir=/usr/bin datadir=/usr/share libdir=/usr/$(get_libdir) prefix=/usr \
                DESTDIR=${D} INSTDIR=${T} install || die "install failed"
 
        # rename scan to dvbscan