summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Stakenvicius <axs@gentoo.org>2014-11-12 17:59:56 +0000
committerIan Stakenvicius <axs@gentoo.org>2014-11-12 17:59:56 +0000
commitd6a752c4f204c5ff56f8015c4aa0f6d30b66364c (patch)
treef7fe4ed0327a37fe575fb9b341ff024b8c1e7d70 /app-i18n/atokx3
parentTemporary mask for app-editors/emacs-vcs live git ebuilds. (diff)
downloadhistorical-d6a752c4f204c5ff56f8015c4aa0f6d30b66364c.tar.gz
historical-d6a752c4f204c5ff56f8015c4aa0f6d30b66364c.tar.bz2
historical-d6a752c4f204c5ff56f8015c4aa0f6d30b66364c.zip
bumped EAPI to 5, adjusted multilib dependencies
Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64 Manifest-Sign-Key: 0x2B6559ED
Diffstat (limited to 'app-i18n/atokx3')
-rw-r--r--app-i18n/atokx3/ChangeLog8
-rw-r--r--app-i18n/atokx3/Manifest22
-rw-r--r--app-i18n/atokx3/atokx3-3.0.0-r11.ebuild (renamed from app-i18n/atokx3/atokx3-3.0.0-r10.ebuild)68
3 files changed, 46 insertions, 52 deletions
diff --git a/app-i18n/atokx3/ChangeLog b/app-i18n/atokx3/ChangeLog
index 3b04add56948..93c5a2753db4 100644
--- a/app-i18n/atokx3/ChangeLog
+++ b/app-i18n/atokx3/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for app-i18n/atokx3
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/atokx3/ChangeLog,v 1.24 2014/06/25 06:34:14 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/atokx3/ChangeLog,v 1.25 2014/11/12 17:59:52 axs Exp $
+
+*atokx3-3.0.0-r11 (12 Nov 2014)
+
+ 12 Nov 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org>
+ +atokx3-3.0.0-r11.ebuild, -atokx3-3.0.0-r10.ebuild:
+ bumped EAPI to 5, adjusted multilib dependencies
25 Jun 2014; Michał Górny <mgorny@gentoo.org> atokx3-3.0.0-r10.ebuild:
Lower dev-libs/glib dep to first known EAPI=5 version, requested by Funtoo for
diff --git a/app-i18n/atokx3/Manifest b/app-i18n/atokx3/Manifest
index 91af8e607e55..a54062fadff0 100644
--- a/app-i18n/atokx3/Manifest
+++ b/app-i18n/atokx3/Manifest
@@ -5,25 +5,13 @@ AUX xinput-iiimf 257 SHA256 0b0f3cc4afed265d420d8ad430950f66db051231447467e607ed
DIST a20y1311lx.tgz 8463681 SHA256 6f63b0402c01f29fb9a508a022945fc8ed26bfc4101f3613ea2814063dc1ed9f SHA512 e295ba03a3ef8266f07e9feb1b208accf76923ab215dd022836550cc93c5e8eed70c21dd4ad264e9be25b906ac8996f3d1f90d1865daf2790ddf268e7797c39d WHIRLPOOL 11cfc180d07b15cc32eb156b0b7b12ed50f7487da38a1728ff714ebfa687461339bd242ee5d7329bb36055682062b38570dd5f8a901aaaf567137f7292fd58e1
DIST atokx3gtk216.tar.gz 69246 SHA256 cd81d0e85872274135d94511ee71eda3f29f00ed299c1dacbdf024b9d96c62e2 SHA512 39c0ff01807626f417f34ef02e4be2fe07c52edc931775299e90fd8725d9c870c3473005fc87be5023d089e94fb4700f9ad36a10ad3373be22ec35e2a418eddd WHIRLPOOL 9bdad5de28564d0c7e3e1b3d67bc0fea09e2b1e9af5fb301ebbb90bc41e58fee405468020a06c84b0d97e3bbab28d7e421a0d9d293d9b957230fa476f823302d
DIST atokx3up2.tar.gz 8427265 SHA256 d9aae2b3917c3370bd40a3f0f767ad15a09a586986e906835952264cd5c1d28e SHA512 b4ce05882418a18e6a0ab58d805a1edeca69187bfa16a98b8f79d749ec0cfdc1b838de30f3049d3b8b0929214164c4c2054dbe283dce0f18a1ab2daa181e306d WHIRLPOOL 43b5e32e62cba0122e918f497a5c5d1da1b303721af8eb00b70a840431cc2aa0ffa7a7009cb4253caab690445a9921741aa6a6394044c4907e1acd1376c6c76e
-EBUILD atokx3-3.0.0-r10.ebuild 7158 SHA256 a07cfd2c6658d2870a39dd8c832d125941fd3661f0986910457ddf495d851351 SHA512 3acb601a15ab74981bdbda126526fac7a7356bc9de06f7ad5acbdec7d28fe68c896572afa7c8f962e2db414f1a1d5a9cdaf5d2875bf6eb0834aff6b5c57a54df WHIRLPOOL b9db6836c158b24ab59be6002b02e5164d772de4089751291acb7e0a024ea73c1e72c4d1e26ce7c1e4d55bf7efd603682da5a60a534980b5af4752d99b9ec593
-MISC ChangeLog 4344 SHA256 a25d0b07d6fff44b3bd8ceb18a9ee512cef7536d9f5c31692addfa971a4aee43 SHA512 cb854c976dd4b07cfba38fa2daa3768f9ff328cc2bff8bfef6e7033f5188681b79f5df5ca20b43c7432acf07208c5b1573ca04739d31a0ef4c6b4180baf1b7ae WHIRLPOOL 711e771b1c2e47ff71886a3dce8020b21496fa9f8ff719a1dd20d51b5f1535629810382764e6adf9a52d1289bec427c1f8a94681c657c63ff28ff8f155a8beff
+EBUILD atokx3-3.0.0-r11.ebuild 7221 SHA256 98f1e5b70a561d3956e5144a26cc27b116569fdc6d01a9f340f2dbb2c3940a16 SHA512 5d99a6ea2818cfb3385306c8739b9a77259e4a18f711ab5fd00148a592efe031024e539e96ab96599dcae9f17b584f4cdaceebcb54c54ddb13a3c37db9cc963d WHIRLPOOL ff6a4cb2935ae3bb98f1970eda4bc5afef6cbe39e5e8a3eec0bb7b56991db255e11fe64a7f16089de4078c4528d7fe19e794d3d24a12569f77a29a9ff6463d4b
+MISC ChangeLog 4537 SHA256 aa9090d2d95d9d31753bae927a98e0c130d9448f26459132a2d20a65c29e188a SHA512 26790484bdb398b3dd7fe45655e9d50a175e5216b631abdc37336be956526cc5328054bf4fdbdc0f746165e70982eb336aed57693a351cee7108364641bbc640 WHIRLPOOL 1f9d8bfd81a95b70098e72cd4c60e877c0e38234f8111656191c18fbb0b42feb6c7e2cc4740213c286aa5bda06d87c8729a04d6e06c3253713c4ffc3394f112b
MISC metadata.xml 156 SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215 SHA512 e46682afa9f674a8685beb29de6485f750484180d86f8980a3c5c220861f38495ac6f4ceda7cf21c317c640d0d218af3ea9bc1a406b207124c1ffb4bcc99628b WHIRLPOOL 347b826ae650374a01eb144ef127dea2fb96c8646b9a1e4b142bce523822988c4597bc2980cc29dcbfeabc1e44ba70136ddea73f1837d4c6ef7d5e3e9d1d1268
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQJ8BAEBCABmBQJTqm1nXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOlmkQAL0QkGuk05sb992DtCRf9YeZ
-7X3htWoqIJDwxvORg1GEOltv6WeEGElIkjyiNvoP/3+80k+Ii3+yeXLoscLx5/7W
-cKpAmn8HhRLXk80TrRQsY9eFB6OFvubtPRdXQ+QGb2PBIkNj7oqdZMiywpHgo2No
-6Roh2LkYeNRN2HT2qV6G7TzvPDgGwCSaIitr4qEpt8akoqxS8zt24a2QnBlWkQNi
-OOUSN5IXxhtCHEPQ/RmfK/YgY4LvTDssGYhj1qqVmTbKUr9yaKQeYDvX6ppX+JRA
-20Wiu9vANJwSL8e0PFuSCBxrb4zOIcgBqftcJ5DSKWkqKG3NgYt737Lk57sq0NTc
-9OMdNxSkBPfynCs4fpYy9SN0nZDqKunXZvMv+daLYu7mrApPd7hTStMAAjhrXVjv
-1abxUVPGRp7N19aDOhiVQhNvi9CdpDlXQCJ8D8QBerZ5WE5wIb6uEP4AgmMAcKKt
-lbvJdwuO/24DwT6l6AkG+mNtbi5mFQtOdHRdN7RrkFZY2A4U9y4YTUBZSroZE2+n
-zM8Fm/k5M3qG3Wq3Lu5+73Q9RZ88Zap9Wf7dkLkUT+Ur2Klm0t9feT8OniCCdpzA
-ClNG0m9gggXwI1Z1EJZw1YqPe40ruq/PqieGGc3KAe2JJ3ffH1Jw6Y0oJckaU0mA
-CcXvtwDwrl4VITT10RJt
-=1uUL
+iF4EAREIAAYFAlRjoB0ACgkQ2ugaI38ACPB2DQD+PwJ9jpxtPpUQ+Nn2sxARhxqc
+zjxmT6HMsFBqcaVrJOsA+wdASkPlBhwoPIhzn+ohkTeDLq7zVo2YyJLc8T08q+xB
+=g+4Q
-----END PGP SIGNATURE-----
diff --git a/app-i18n/atokx3/atokx3-3.0.0-r10.ebuild b/app-i18n/atokx3/atokx3-3.0.0-r11.ebuild
index ed1237898916..8f70f1f07a95 100644
--- a/app-i18n/atokx3/atokx3-3.0.0-r10.ebuild
+++ b/app-i18n/atokx3/atokx3-3.0.0-r11.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/atokx3/atokx3-3.0.0-r10.ebuild,v 1.4 2014/06/25 06:34:14 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/atokx3/atokx3-3.0.0-r11.ebuild,v 1.1 2014/11/12 17:59:52 axs Exp $
-EAPI="3"
+EAPI=5
inherit cdrom eutils gnome2-utils multilib
@@ -19,7 +19,7 @@ SRC_URI="http://www3.justsystem.co.jp/download/atok/up/lin/${MY_UPDATE_P}.tar.gz
LICENSE="ATOK MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="-* ~amd64 ~x86"
IUSE="multilib"
RESTRICT="strip mirror"
@@ -55,45 +55,45 @@ RDEPEND="!app-i18n/atokx2
x11-libs/pangox-compat
multilib? (
|| (
- app-emulation/emul-linux-x86-baselibs
(
- >=dev-libs/glib-2.34.3:2[abi_x86_32]
- >=dev-libs/libxml2-2.9.1-r4:2[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]
+ >=dev-libs/glib-2.34.3:2[abi_x86_32(-)]
+ >=dev-libs/libxml2-2.9.1-r4:2[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(-)]
)
+ app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
)
|| (
- app-emulation/emul-linux-x86-gtklibs
(
>=dev-libs/atk-2.10.0[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/pangox-compat-0.0.2[abi_x86_32]
)
+ app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
)
|| (
- app-emulation/emul-linux-x86-opengl
- >=x11-libs/libdrm-2.4.46[abi_x86_32]
+ >=x11-libs/libdrm-2.4.46[abi_x86_32(-)]
+ app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
)
|| (
- app-emulation/emul-linux-x86-xlibs
(
- >=media-libs/fontconfig-2.10.92[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]
- >=x11-libs/libXcursor-1.1.14[abi_x86_32]
- >=x11-libs/libXdamage-1.1.4-r1[abi_x86_32]
- >=x11-libs/libXext-1.3.2[abi_x86_32]
- >=x11-libs/libXfixes-5.0.1[abi_x86_32]
- >=x11-libs/libXft-2.3.1-r1[abi_x86_32]
- >=x11-libs/libXi-1.7.2[abi_x86_32]
- >=x11-libs/libXrandr-1.4.2[abi_x86_32]
- >=x11-libs/libXrender-0.9.8[abi_x86_32]
- >=x11-libs/libXxf86vm-1.1.3[abi_x86_32]
+ >=media-libs/fontconfig-2.10.92[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(-)]
+ >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+ >=x11-libs/libXdamage-1.1.4-r1[abi_x86_32(-)]
+ >=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+ >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)]
+ >=x11-libs/libXft-2.3.1-r1[abi_x86_32(-)]
+ >=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+ >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+ >=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
+ >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
)
+ app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
)
)"
@@ -189,7 +189,7 @@ src_prepare() {
}
src_install() {
- dodoc "${MY_UPDATE_P}/README_UP2.txt" || die
+ dodoc "${MY_UPDATE_P}/README_UP2.txt"
rm -rf "${MY_UPDATE_P}"
cp -dpR * "${ED}" || die
@@ -200,22 +200,22 @@ src_install() {
local lib64="$(get_libdir)"
if [ "${lib32}" != "${lib64}" ] ; then
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}" || die
+ dosym "${EPREFIX}/usr/${lib32}/iiim/${f}" "/usr/${lib64}/iiim/${f}"
done
for f in atokx3aux.so atokx3.so ; do
- dosym "${EPREFIX}/usr/${lib32}/iiim/le/atokx3/${f}" "/usr/${lib64}/iiim/le/atokx3/${f}" || die
+ dosym "${EPREFIX}/usr/${lib32}/iiim/le/atokx3/${f}" "/usr/${lib64}/iiim/le/atokx3/${f}"
done
- dosym "${EPREFIX}/usr/${lib64}/iiim/le/atokx3/64" /usr/"${lib32}"/iiim/le/atokx3/64 || die
- dosym "${EPREFIX}/usr/${lib64}/iiim/le/atokx3/64" /usr/"${lib32}"/iiim/le/atokx3/amd64 || die
+ dosym "${EPREFIX}/usr/${lib64}/iiim/le/atokx3/64" /usr/"${lib32}"/iiim/le/atokx3/64
+ dosym "${EPREFIX}/usr/${lib64}/iiim/le/atokx3/64" /usr/"${lib32}"/iiim/le/atokx3/amd64
fi
fi
sed -e "s:@EPREFIX@:${EPREFIX}:" "${FILESDIR}/xinput-iiimf" > "${T}/iiimf.conf" || die
insinto /etc/X11/xinit/xinput.d
- doins "${T}/iiimf.conf" || die
+ doins "${T}/iiimf.conf"
- dodoc "${CDROM_ROOT}"/doc/atok.pdf || die
- dohtml "${CDROM_ROOT}"/readme.html || die
+ dodoc "${CDROM_ROOT}"/doc/atok.pdf
+ dohtml "${CDROM_ROOT}"/readme.html
}
pkg_preinst() {