1 |
commit: 2c7bf8226a4299cd4d5a254042d06876afb0b921 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Apr 30 18:32:30 2014 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Apr 30 18:32:30 2014 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=2c7bf822 |
7 |
|
8 |
x11-libs/libpciaccess: Use multilib_src_install(). |
9 |
|
10 |
Package-Manager: portage-2.2.10 |
11 |
|
12 |
--- |
13 |
x11-libs/libpciaccess/libpciaccess-9999.ebuild | 24 +++++++++--------------- |
14 |
1 file changed, 9 insertions(+), 15 deletions(-) |
15 |
|
16 |
diff --git a/x11-libs/libpciaccess/libpciaccess-9999.ebuild b/x11-libs/libpciaccess/libpciaccess-9999.ebuild |
17 |
index a8669db..9f7e538 100644 |
18 |
--- a/x11-libs/libpciaccess/libpciaccess-9999.ebuild |
19 |
+++ b/x11-libs/libpciaccess/libpciaccess-9999.ebuild |
20 |
@@ -12,30 +12,24 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd6 |
21 |
IUSE="minimal zlib" |
22 |
|
23 |
DEPEND="!<x11-base/xorg-server-1.5 |
24 |
- zlib? ( sys-libs/zlib )" |
25 |
+ zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )" |
26 |
RDEPEND="${DEPEND} |
27 |
sys-apps/hwids" |
28 |
|
29 |
-src_configure() { |
30 |
+pkg_setup() { |
31 |
+ xorg-2_pkg_setup |
32 |
+ |
33 |
XORG_CONFIGURE_OPTIONS=( |
34 |
"$(use_with zlib)" |
35 |
"--with-pciids-path=${EPREFIX}/usr/share/misc" |
36 |
) |
37 |
- xorg-2_src_configure |
38 |
} |
39 |
|
40 |
-src_install() { |
41 |
- xorg-2_src_install |
42 |
- |
43 |
- if ! use minimal; then |
44 |
- scanpci_install() { |
45 |
- ${BASH} "${AUTOTOOLS_BUILD_DIR:-${S}}/libtool" \ |
46 |
- --mode=install "$(type -P install)" -c \ |
47 |
- "${AUTOTOOLS_BUILD_DIR:-${S}}/scanpci/scanpci" \ |
48 |
- "${ED}"/usr/bin || die |
49 |
- } |
50 |
+multilib_src_install() { |
51 |
+ default |
52 |
|
53 |
- dodir /usr/bin || die |
54 |
- multilib_foreach_impl scanpci_install |
55 |
+ if multilib_is_native_abi; then |
56 |
+ dodir /usr/bin |
57 |
+ ${BASH} libtool --mode=install "$(type -P install)" -c scanpci/scanpci "${ED}"/usr/bin || die |
58 |
fi |
59 |
} |