1 |
commit: e80fea5b9f61492e9f7ba0a620c07f2f9f892e78 |
2 |
Author: Andrew Church <achurch+gentoo <AT> achurch <DOT> org> |
3 |
AuthorDate: Wed Jun 11 22:38:51 2014 +0000 |
4 |
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Aug 14 13:58:56 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e80fea5b |
7 |
|
8 |
app-i18n/atokx3: inherit multilib-build |
9 |
|
10 |
Gentoo-Bug: 511930 |
11 |
|
12 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
13 |
|
14 |
app-i18n/atokx3/atokx3-3.0.0-r11.ebuild | 31 ++++++++++++++++--------------- |
15 |
1 file changed, 16 insertions(+), 15 deletions(-) |
16 |
|
17 |
diff --git a/app-i18n/atokx3/atokx3-3.0.0-r11.ebuild b/app-i18n/atokx3/atokx3-3.0.0-r11.ebuild |
18 |
index b74ba422049..2df07f1d9dd 100644 |
19 |
--- a/app-i18n/atokx3/atokx3-3.0.0-r11.ebuild |
20 |
+++ b/app-i18n/atokx3/atokx3-3.0.0-r11.ebuild |
21 |
@@ -1,9 +1,10 @@ |
22 |
-# Copyright 1999-2015 Gentoo Foundation |
23 |
+# Copyright 1999-2017 Gentoo Foundation |
24 |
# Distributed under the terms of the GNU General Public License v2 |
25 |
|
26 |
-EAPI=5 |
27 |
+EAPI="5" |
28 |
+MULTILIB_COMPAT=( abi_x86_{32,64} ) |
29 |
|
30 |
-inherit cdrom eutils gnome2-utils multilib |
31 |
+inherit cdrom eutils gnome2-utils multilib-build |
32 |
|
33 |
MY_UPDATE_P="${PN}up2" |
34 |
MY_UPDATE_GTK="${PN}gtk216" |
35 |
@@ -19,7 +20,7 @@ LICENSE="ATOK MIT" |
36 |
|
37 |
SLOT="0" |
38 |
KEYWORDS="-* ~amd64 ~x86" |
39 |
-IUSE="multilib" |
40 |
+IUSE="" |
41 |
|
42 |
RESTRICT="strip mirror" |
43 |
|
44 |
@@ -52,16 +53,16 @@ RDEPEND="!app-i18n/atokx2 |
45 |
x11-libs/libXxf86vm |
46 |
x11-libs/libdrm |
47 |
x11-libs/pangox-compat |
48 |
- multilib? ( |
49 |
- >=dev-libs/atk-2.10.0[abi_x86_32] |
50 |
+ amd64? ( |
51 |
+ >=dev-libs/atk-2.10.0[abi_x86_32(-)] |
52 |
>=dev-libs/glib-2.34.3:2[abi_x86_32(-)] |
53 |
>=dev-libs/libxml2-2.9.1-r4:2[abi_x86_32(-)] |
54 |
>=media-libs/fontconfig-2.10.92[abi_x86_32(-)] |
55 |
>=media-libs/libpng-1.2.51[abi_x86_32(-)] |
56 |
>=sys-apps/tcp-wrappers-7.6.22-r1[abi_x86_32(-)] |
57 |
>=virtual/pam-0-r1[abi_x86_32(-)] |
58 |
- >=x11-libs/cairo-1.12.14-r4[abi_x86_32] |
59 |
- >=x11-libs/gtk+-2.24.23:2[abi_x86_32] |
60 |
+ >=x11-libs/cairo-1.12.14-r4[abi_x86_32(-)] |
61 |
+ >=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)] |
62 |
>=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)] |
63 |
>=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)] |
64 |
>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] |
65 |
@@ -75,7 +76,7 @@ RDEPEND="!app-i18n/atokx2 |
66 |
>=x11-libs/libXrender-0.9.8[abi_x86_32(-)] |
67 |
>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] |
68 |
>=x11-libs/libdrm-2.4.46[abi_x86_32(-)] |
69 |
- >=x11-libs/pangox-compat-0.0.2[abi_x86_32] |
70 |
+ >=x11-libs/pangox-compat-0.0.2[abi_x86_32(-)] |
71 |
)" |
72 |
|
73 |
QA_PREBUILT="opt/atokx3/lib/server/* |
74 |
@@ -116,7 +117,7 @@ src_unpack() { |
75 |
# IIIMF/iiimf-docs-trunk_r3104-js*.i386.tar.gz |
76 |
# IIIMF/iiimf-notuse-trunk_r3104-js*.i386.tar.gz |
77 |
|
78 |
- if use amd64 ; then |
79 |
+ if use abi_x86_64 ; then |
80 |
targets="${targets} |
81 |
IIIMF/iiimf-client-lib-64-trunk_r3104-js*.x86_64.tar.gz |
82 |
IIIMF/iiimf-gtk-64-trunk_r3104-js*.x86_64.tar.gz |
83 |
@@ -148,7 +149,7 @@ src_unpack() { |
84 |
} |
85 |
|
86 |
src_prepare() { |
87 |
- if use amd64 ; then |
88 |
+ if use abi_x86_64 ; then |
89 |
local lib32="$(ABI=x86 get_libdir)" |
90 |
local lib64="$(get_libdir)" |
91 |
if [ "lib" != "${lib32}" ] ; then |
92 |
@@ -176,7 +177,7 @@ src_install() { |
93 |
cp -dpR * "${ED}" || die |
94 |
|
95 |
# amd64 hack |
96 |
- if use amd64 ; then |
97 |
+ if use abi_x86_64 ; then |
98 |
local lib32="$(ABI=x86 get_libdir)" |
99 |
local lib64="$(get_libdir)" |
100 |
if [ "${lib32}" != "${lib64}" ] ; then |
101 |
@@ -201,7 +202,7 @@ src_install() { |
102 |
|
103 |
pkg_preinst() { |
104 |
# bug #343325 |
105 |
- if use amd64 && has_multilib_profile && [ -L "${EPREFIX}/usr/$(get_libdir)/iiim" ] ; then |
106 |
+ if use abi_x86_64 && has_multilib_profile && [ -L "${EPREFIX}/usr/$(get_libdir)/iiim" ] ; then |
107 |
rm -f "${EPREFIX}/usr/$(get_libdir)/iiim" |
108 |
fi |
109 |
} |
110 |
@@ -212,9 +213,9 @@ pkg_postinst() { |
111 |
elog |
112 |
elog ". /opt/atokx3/bin/atokx3start.sh" |
113 |
elog |
114 |
- gnome2_query_immodules_gtk2 |
115 |
+ multilib_foreach_abi gnome2_query_immodules_gtk2 |
116 |
} |
117 |
|
118 |
pkg_postrm() { |
119 |
- gnome2_query_immodules_gtk2 |
120 |
+ multilib_foreach_abi gnome2_query_immodules_gtk2 |
121 |
} |