* [gentoo-commits] repo/gentoo:master commit in: app-i18n/atokx3/
@ 2017-08-14 14:08 Akinori Hattori
0 siblings, 0 replies; 6+ messages in thread
From: Akinori Hattori @ 2017-08-14 14:08 UTC (permalink / raw
To: gentoo-commits
commit: 6ccd3799d64b471dea2cbda38504edd1cc0db0d9
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 14 14:01:55 2017 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Mon Aug 14 14:01:55 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ccd3799
app-i18n/atokx3: do not call get_libdir in global scope
Gentoo-Bug: 593390
Package-Manager: Portage-2.3.6, Repoman-2.3.1
app-i18n/atokx3/atokx3-3.0.0-r12.ebuild | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/app-i18n/atokx3/atokx3-3.0.0-r12.ebuild b/app-i18n/atokx3/atokx3-3.0.0-r12.ebuild
index d046c5e27ef..620a2651127 100644
--- a/app-i18n/atokx3/atokx3-3.0.0-r12.ebuild
+++ b/app-i18n/atokx3/atokx3-3.0.0-r12.ebuild
@@ -79,20 +79,6 @@ RDEPEND="!app-i18n/atokx2
>=x11-libs/pangox-compat-0.0.2[abi_x86_32(-)]
)"
-QA_PREBUILT="opt/atokx3/lib/server/*
- opt/atokx3/lib/client/xaux/*
- opt/atokx3/lib/client/*
- opt/atokx3/bin/*
- usr/libexec/*
- usr/bin/*
- usr/$(get_libdir)/*
- usr/$(get_libdir)/gtk-2.0/immodules/*
- usr/$(get_libdir)/iiim/le/atokx3/64/*
- usr/$(ABI=x86 get_libdir)/*
- usr/$(ABI=x86 get_libdir)/gtk-2.0/immodules/*
- usr/$(ABI=x86 get_libdir)/iiim/*
- usr/$(ABI=x86 get_libdir)/iiim/le/atokx3/*"
-
EMULTILIB_PKG="true"
S="${WORKDIR}"
@@ -101,6 +87,20 @@ pkg_setup() {
if ! cdrom_get_cds atokx3index ; then
die "Please mount ATOK for Linux CD-ROM or set CD_ROOT variable to the directory containing ATOK X3 for Linux."
fi
+
+ QA_PREBUILT="opt/atokx3/lib/server/*
+ opt/atokx3/lib/client/xaux/*
+ opt/atokx3/lib/client/*
+ opt/atokx3/bin/*
+ usr/libexec/*
+ usr/bin/*
+ usr/$(get_libdir)/*
+ usr/$(get_libdir)/gtk-2.0/immodules/*
+ usr/$(get_libdir)/iiim/le/atokx3/64/*
+ usr/$(ABI=x86 get_libdir)/*
+ usr/$(ABI=x86 get_libdir)/gtk-2.0/immodules/*
+ usr/$(ABI=x86 get_libdir)/iiim/*
+ usr/$(ABI=x86 get_libdir)/iiim/le/atokx3/*"
}
src_unpack() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/atokx3/
@ 2017-08-14 14:08 Akinori Hattori
0 siblings, 0 replies; 6+ messages in thread
From: Akinori Hattori @ 2017-08-14 14:08 UTC (permalink / raw
To: gentoo-commits
commit: f7c9cc09cd31c4b970fcbcea698d4eb79e537ed9
Author: Andrew Church <achurch+gentoo <AT> achurch <DOT> org>
AuthorDate: Fri Nov 14 16:31:31 2014 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Mon Aug 14 13:59:17 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7c9cc09
app-i18n/atokx3: update SRC_URI
Gentoo-Bug: 529248
Package-Manager: Portage-2.3.6, Repoman-2.3.1
app-i18n/atokx3/Manifest | 2 +-
.../atokx3/{atokx3-3.0.0-r11.ebuild => atokx3-3.0.0-r12.ebuild} | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/app-i18n/atokx3/Manifest b/app-i18n/atokx3/Manifest
index 53fa0ce7c9b..502e3311dc0 100644
--- a/app-i18n/atokx3/Manifest
+++ b/app-i18n/atokx3/Manifest
@@ -1,3 +1,3 @@
-DIST a20y1311lx.tgz 8463681 SHA256 6f63b0402c01f29fb9a508a022945fc8ed26bfc4101f3613ea2814063dc1ed9f SHA512 e295ba03a3ef8266f07e9feb1b208accf76923ab215dd022836550cc93c5e8eed70c21dd4ad264e9be25b906ac8996f3d1f90d1865daf2790ddf268e7797c39d WHIRLPOOL 11cfc180d07b15cc32eb156b0b7b12ed50f7487da38a1728ff714ebfa687461339bd242ee5d7329bb36055682062b38570dd5f8a901aaaf567137f7292fd58e1
+DIST a20y1406lx.tgz 8491493 SHA256 df19a3fc57c2a3cd09d5de8694f68b1e05826a67103d970815249ac5e5a8de73 SHA512 bf350be4f15db63b384ff10ec7e362c469a836d052e8885aac1bab049f7d4f0b04dacaecbe5c1303211405938bc3f674136ba5ae3b55ff31aa5e4f14dbec0273 WHIRLPOOL 747cbed162028853ab9f19f66eb039ab09827aa7665daa92814d2af3ae49865f749b0fe3f098e2a4780b69bbaddc4f1af594bd7b975062e9a056bb87e2c1feab
DIST atokx3gtk216.tar.gz 69246 SHA256 cd81d0e85872274135d94511ee71eda3f29f00ed299c1dacbdf024b9d96c62e2 SHA512 39c0ff01807626f417f34ef02e4be2fe07c52edc931775299e90fd8725d9c870c3473005fc87be5023d089e94fb4700f9ad36a10ad3373be22ec35e2a418eddd WHIRLPOOL 9bdad5de28564d0c7e3e1b3d67bc0fea09e2b1e9af5fb301ebbb90bc41e58fee405468020a06c84b0d97e3bbab28d7e421a0d9d293d9b957230fa476f823302d
DIST atokx3up2.tar.gz 8427265 SHA256 d9aae2b3917c3370bd40a3f0f767ad15a09a586986e906835952264cd5c1d28e SHA512 b4ce05882418a18e6a0ab58d805a1edeca69187bfa16a98b8f79d749ec0cfdc1b838de30f3049d3b8b0929214164c4c2054dbe283dce0f18a1ab2daa181e306d WHIRLPOOL 43b5e32e62cba0122e918f497a5c5d1da1b303721af8eb00b70a840431cc2aa0ffa7a7009cb4253caab690445a9921741aa6a6394044c4907e1acd1376c6c76e
diff --git a/app-i18n/atokx3/atokx3-3.0.0-r11.ebuild b/app-i18n/atokx3/atokx3-3.0.0-r12.ebuild
similarity index 96%
rename from app-i18n/atokx3/atokx3-3.0.0-r11.ebuild
rename to app-i18n/atokx3/atokx3-3.0.0-r12.ebuild
index 2df07f1d9dd..d046c5e27ef 100644
--- a/app-i18n/atokx3/atokx3-3.0.0-r11.ebuild
+++ b/app-i18n/atokx3/atokx3-3.0.0-r12.ebuild
@@ -8,13 +8,13 @@ inherit cdrom eutils gnome2-utils multilib-build
MY_UPDATE_P="${PN}up2"
MY_UPDATE_GTK="${PN}gtk216"
-MY_ZIPCODE_P="a20y1311lx"
+MY_ZIPCODE_P="a20y1406lx"
DESCRIPTION="ATOK X3 for Linux - The most famous Japanese Input Method Engine"
HOMEPAGE="http://www.justsystems.com/jp/products/atok_linux/"
-SRC_URI="http://www3.justsystem.co.jp/download/atok/up/lin/${MY_UPDATE_P}.tar.gz
- http://www3.justsystem.co.jp/download/atok/up/lin/${MY_UPDATE_GTK}.tar.gz
- http://www3.justsystem.co.jp/download/zipcode/up/lin/${MY_ZIPCODE_P}.tgz"
+SRC_URI="https://gate.justsystems.com/download/atok/up/lin/${MY_UPDATE_P}.tar.gz
+ https://gate.justsystems.com/download/atok/up/lin/${MY_UPDATE_GTK}.tar.gz
+ https://gate.justsystems.com/download/zipcode/up/lin/${MY_ZIPCODE_P}.tgz"
LICENSE="ATOK MIT"
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/atokx3/
@ 2017-08-14 14:08 Akinori Hattori
0 siblings, 0 replies; 6+ messages in thread
From: Akinori Hattori @ 2017-08-14 14:08 UTC (permalink / raw
To: gentoo-commits
commit: e80fea5b9f61492e9f7ba0a620c07f2f9f892e78
Author: Andrew Church <achurch+gentoo <AT> achurch <DOT> org>
AuthorDate: Wed Jun 11 22:38:51 2014 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Mon Aug 14 13:58:56 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e80fea5b
app-i18n/atokx3: inherit multilib-build
Gentoo-Bug: 511930
Package-Manager: Portage-2.3.6, Repoman-2.3.1
app-i18n/atokx3/atokx3-3.0.0-r11.ebuild | 31 ++++++++++++++++---------------
1 file changed, 16 insertions(+), 15 deletions(-)
diff --git a/app-i18n/atokx3/atokx3-3.0.0-r11.ebuild b/app-i18n/atokx3/atokx3-3.0.0-r11.ebuild
index b74ba422049..2df07f1d9dd 100644
--- a/app-i18n/atokx3/atokx3-3.0.0-r11.ebuild
+++ b/app-i18n/atokx3/atokx3-3.0.0-r11.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI="5"
+MULTILIB_COMPAT=( abi_x86_{32,64} )
-inherit cdrom eutils gnome2-utils multilib
+inherit cdrom eutils gnome2-utils multilib-build
MY_UPDATE_P="${PN}up2"
MY_UPDATE_GTK="${PN}gtk216"
@@ -19,7 +20,7 @@ LICENSE="ATOK MIT"
SLOT="0"
KEYWORDS="-* ~amd64 ~x86"
-IUSE="multilib"
+IUSE=""
RESTRICT="strip mirror"
@@ -52,16 +53,16 @@ RDEPEND="!app-i18n/atokx2
x11-libs/libXxf86vm
x11-libs/libdrm
x11-libs/pangox-compat
- multilib? (
- >=dev-libs/atk-2.10.0[abi_x86_32]
+ amd64? (
+ >=dev-libs/atk-2.10.0[abi_x86_32(-)]
>=dev-libs/glib-2.34.3:2[abi_x86_32(-)]
>=dev-libs/libxml2-2.9.1-r4:2[abi_x86_32(-)]
>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
>=media-libs/libpng-1.2.51[abi_x86_32(-)]
>=sys-apps/tcp-wrappers-7.6.22-r1[abi_x86_32(-)]
>=virtual/pam-0-r1[abi_x86_32(-)]
- >=x11-libs/cairo-1.12.14-r4[abi_x86_32]
- >=x11-libs/gtk+-2.24.23:2[abi_x86_32]
+ >=x11-libs/cairo-1.12.14-r4[abi_x86_32(-)]
+ >=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)]
>=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)]
>=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)]
>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)]
@@ -75,7 +76,7 @@ RDEPEND="!app-i18n/atokx2
>=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
>=x11-libs/libdrm-2.4.46[abi_x86_32(-)]
- >=x11-libs/pangox-compat-0.0.2[abi_x86_32]
+ >=x11-libs/pangox-compat-0.0.2[abi_x86_32(-)]
)"
QA_PREBUILT="opt/atokx3/lib/server/*
@@ -116,7 +117,7 @@ src_unpack() {
# IIIMF/iiimf-docs-trunk_r3104-js*.i386.tar.gz
# IIIMF/iiimf-notuse-trunk_r3104-js*.i386.tar.gz
- if use amd64 ; then
+ if use abi_x86_64 ; then
targets="${targets}
IIIMF/iiimf-client-lib-64-trunk_r3104-js*.x86_64.tar.gz
IIIMF/iiimf-gtk-64-trunk_r3104-js*.x86_64.tar.gz
@@ -148,7 +149,7 @@ src_unpack() {
}
src_prepare() {
- if use amd64 ; then
+ if use abi_x86_64 ; then
local lib32="$(ABI=x86 get_libdir)"
local lib64="$(get_libdir)"
if [ "lib" != "${lib32}" ] ; then
@@ -176,7 +177,7 @@ src_install() {
cp -dpR * "${ED}" || die
# amd64 hack
- if use amd64 ; then
+ if use abi_x86_64 ; then
local lib32="$(ABI=x86 get_libdir)"
local lib64="$(get_libdir)"
if [ "${lib32}" != "${lib64}" ] ; then
@@ -201,7 +202,7 @@ src_install() {
pkg_preinst() {
# bug #343325
- if use amd64 && has_multilib_profile && [ -L "${EPREFIX}/usr/$(get_libdir)/iiim" ] ; then
+ if use abi_x86_64 && has_multilib_profile && [ -L "${EPREFIX}/usr/$(get_libdir)/iiim" ] ; then
rm -f "${EPREFIX}/usr/$(get_libdir)/iiim"
fi
}
@@ -212,9 +213,9 @@ pkg_postinst() {
elog
elog ". /opt/atokx3/bin/atokx3start.sh"
elog
- gnome2_query_immodules_gtk2
+ multilib_foreach_abi gnome2_query_immodules_gtk2
}
pkg_postrm() {
- gnome2_query_immodules_gtk2
+ multilib_foreach_abi gnome2_query_immodules_gtk2
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/atokx3/
@ 2018-06-10 3:04 Akinori Hattori
0 siblings, 0 replies; 6+ messages in thread
From: Akinori Hattori @ 2018-06-10 3:04 UTC (permalink / raw
To: gentoo-commits
commit: 9f92fc881944df301fae773f0f0e40f44b0327b3
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Jun 9 19:36:36 2018 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sun Jun 10 03:03:37 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f92fc88
app-i18n/atokx3: use HTTPs
Closes: https://github.com/gentoo/gentoo/pull/8775
Package-Manager: Portage-2.3.40, Repoman-2.3.9
app-i18n/atokx3/atokx3-3.0.0-r12.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-i18n/atokx3/atokx3-3.0.0-r12.ebuild b/app-i18n/atokx3/atokx3-3.0.0-r12.ebuild
index 00345250cc3..70c48e5edce 100644
--- a/app-i18n/atokx3/atokx3-3.0.0-r12.ebuild
+++ b/app-i18n/atokx3/atokx3-3.0.0-r12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -11,7 +11,7 @@ MY_UPDATE_GTK="${PN}gtk216"
MY_ZIPCODE_P="a20y1406lx"
DESCRIPTION="ATOK X3 for Linux - The most famous Japanese Input Method Engine"
-HOMEPAGE="http://www.justsystems.com/jp/products/atok_linux/"
+HOMEPAGE="https://www.justsystems.com/jp/products/atok_linux/"
SRC_URI="https://gate.justsystems.com/download/atok/up/lin/${MY_UPDATE_P}.tar.gz
https://gate.justsystems.com/download/atok/up/lin/${MY_UPDATE_GTK}.tar.gz
https://gate.justsystems.com/download/zipcode/up/lin/${MY_ZIPCODE_P}.tgz"
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/atokx3/
@ 2019-10-12 18:42 Mikle Kolyada
0 siblings, 0 replies; 6+ messages in thread
From: Mikle Kolyada @ 2019-10-12 18:42 UTC (permalink / raw
To: gentoo-commits
commit: cfd90fa0271ceaceaecd2df0e08e66623816bd6f
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 12 18:42:13 2019 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Oct 12 18:42:13 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfd90fa0
app-i18n/atokx3: migrate to sys-libs/pam
Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
app-i18n/atokx3/atokx3-3.0.0-r12.ebuild | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/app-i18n/atokx3/atokx3-3.0.0-r12.ebuild b/app-i18n/atokx3/atokx3-3.0.0-r12.ebuild
index 70c48e5edce..4cc9cf8691c 100644
--- a/app-i18n/atokx3/atokx3-3.0.0-r12.ebuild
+++ b/app-i18n/atokx3/atokx3-3.0.0-r12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -28,7 +28,7 @@ RDEPEND="dev-libs/atk
media-libs/fontconfig
media-libs/libpng
sys-apps/tcp-wrappers
- virtual/pam
+ sys-libs/pam
x11-libs/cairo
>=x11-libs/gtk+-2.4.13:2
x11-libs/libICE
@@ -51,7 +51,7 @@ RDEPEND="dev-libs/atk
>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
>=media-libs/libpng-1.2.51[abi_x86_32(-)]
>=sys-apps/tcp-wrappers-7.6.22-r1[abi_x86_32(-)]
- >=virtual/pam-0-r1[abi_x86_32(-)]
+ >=sys-libs/pam-0-r1[abi_x86_32(-)]
>=x11-libs/cairo-1.12.14-r4[abi_x86_32(-)]
>=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)]
>=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)]
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/atokx3/
@ 2020-01-31 8:08 Michał Górny
0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2020-01-31 8:08 UTC (permalink / raw
To: gentoo-commits
commit: 10495bec56ca604c48c1ca7e09e325a3d0e5a534
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 31 07:49:26 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jan 31 08:07:58 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10495bec
app-i18n/atokx3: Fix AbsoluteSymlink
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
app-i18n/atokx3/atokx3-3.0.0-r12.ebuild | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/app-i18n/atokx3/atokx3-3.0.0-r12.ebuild b/app-i18n/atokx3/atokx3-3.0.0-r12.ebuild
index 4cc9cf8691c..c1178520384 100644
--- a/app-i18n/atokx3/atokx3-3.0.0-r12.ebuild
+++ b/app-i18n/atokx3/atokx3-3.0.0-r12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -173,13 +173,13 @@ src_install() {
if [[ "${lib32}" != "${lib64}" ]] ; then
local f
for f in xiiimp.so xiiimp.a iiim-xbe xiiimp.so.2 xiiimp.so.2.0.0 iiimd-watchdog xiiimp.la ; do
- dosym "${EPREFIX}/usr/${lib32}/iiim/${f}" "/usr/${lib64}/iiim/${f}"
+ dosym "../../${lib32}/iiim/${f}" "/usr/${lib64}/iiim/${f}"
done
for f in ${PN}aux.so ${PN}.so ; do
- dosym "${EPREFIX}/usr/${lib32}/iiim/le/${PN}/${f}" "/usr/${lib64}/iiim/le/${PN}/${f}"
+ dosym "../../../../${lib32}/iiim/le/${PN}/${f}" "/usr/${lib64}/iiim/le/${PN}/${f}"
done
- dosym "${EPREFIX}/usr/${lib64}/iiim/le/${PN}/64" "/usr/${lib32}/iiim/le/${PN}/64"
- dosym "${EPREFIX}/usr/${lib64}/iiim/le/${PN}/64" "/usr/${lib32}/iiim/le/${PN}/amd64"
+ dosym "../../../../${lib64}/iiim/le/${PN}/64" "/usr/${lib32}/iiim/le/${PN}/64"
+ dosym "../../../../${lib64}/iiim/le/${PN}/64" "/usr/${lib32}/iiim/le/${PN}/amd64"
fi
fi
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-01-31 8:08 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-08-14 14:08 [gentoo-commits] repo/gentoo:master commit in: app-i18n/atokx3/ Akinori Hattori
-- strict thread matches above, loose matches on Subject: below --
2020-01-31 8:08 Michał Górny
2019-10-12 18:42 Mikle Kolyada
2018-06-10 3:04 Akinori Hattori
2017-08-14 14:08 Akinori Hattori
2017-08-14 14:08 Akinori Hattori
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox