summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMalcolm Lashley <malc@gentoo.org>2007-02-19 19:47:40 +0000
committerMalcolm Lashley <malc@gentoo.org>2007-02-19 19:47:40 +0000
commit33aef25f3c74928fd749fe9ed66992b34dd6dd75 (patch)
treec762aace32f342aace544a914e075fc932fc9d0d /media-tv/linuxtv-dvb-apps
parentVersion bump (diff)
downloadgentoo-2-33aef25f3c74928fd749fe9ed66992b34dd6dd75.tar.gz
gentoo-2-33aef25f3c74928fd749fe9ed66992b34dd6dd75.tar.bz2
gentoo-2-33aef25f3c74928fd749fe9ed66992b34dd6dd75.zip
Fix multilib-strict QA checks (again)
(Portage version: 2.1.2-r9)
Diffstat (limited to 'media-tv/linuxtv-dvb-apps')
-rw-r--r--media-tv/linuxtv-dvb-apps/ChangeLog5
-rw-r--r--media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20070114.ebuild11
2 files changed, 7 insertions, 9 deletions
diff --git a/media-tv/linuxtv-dvb-apps/ChangeLog b/media-tv/linuxtv-dvb-apps/ChangeLog
index 8ab90036fb75..926e832cd0c5 100644
--- 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/linuxtv-dvb-apps-1.1.1.20070114.ebuild b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20070114.ebuild
index b879b964f54c..36d4cf43d037 100644
--- 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