commit: bb04fe44a8e5c8e07d644d4a3898182c6ce21418 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Jun 16 12:49:12 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Jun 16 12:50:16 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb04fe44
app-i18n/atokx3: Remove last-rited package Closes: https://bugs.gentoo.org/694920 Closes: https://bugs.gentoo.org/720848 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> app-i18n/atokx3/Manifest | 3 - app-i18n/atokx3/atokx3-3.0.0-r12.ebuild | 209 -------------------------------- app-i18n/atokx3/files/xinput-iiimf | 11 -- app-i18n/atokx3/metadata.xml | 8 -- profiles/package.mask | 6 - 5 files changed, 237 deletions(-) diff --git a/app-i18n/atokx3/Manifest b/app-i18n/atokx3/Manifest deleted file mode 100644 index b8046be7ebc..00000000000 --- a/app-i18n/atokx3/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST a20y1406lx.tgz 8491493 BLAKE2B d5823dbc49661434c48d056d0d1d082be3d1d136e8eb8aab6b48f27b8198102201d5daeaca11717fba512b6260b928e165e6f500e8f1d70665c8907b9b1e5ce2 SHA512 bf350be4f15db63b384ff10ec7e362c469a836d052e8885aac1bab049f7d4f0b04dacaecbe5c1303211405938bc3f674136ba5ae3b55ff31aa5e4f14dbec0273 -DIST atokx3gtk216.tar.gz 69246 BLAKE2B 73d246e5c79da0888ffc32deed9d8770500c64377845c553f1ef4ca18b6c9ce93e20dd9188983d9a7664ead60dfb66f53f605a2ab7bf065db336266b5fb38178 SHA512 39c0ff01807626f417f34ef02e4be2fe07c52edc931775299e90fd8725d9c870c3473005fc87be5023d089e94fb4700f9ad36a10ad3373be22ec35e2a418eddd -DIST atokx3up2.tar.gz 8427265 BLAKE2B 6af19673dd443f69870316413bd53712a5b1f148f07d7b7f9dddff3290a4b6d65866e7d38a3c6a3d1ff15990560b706d46a558a77ff4c8200b36b4f1345c62bb SHA512 b4ce05882418a18e6a0ab58d805a1edeca69187bfa16a98b8f79d749ec0cfdc1b838de30f3049d3b8b0929214164c4c2054dbe283dce0f18a1ab2daa181e306d diff --git a/app-i18n/atokx3/atokx3-3.0.0-r12.ebuild b/app-i18n/atokx3/atokx3-3.0.0-r12.ebuild deleted file mode 100644 index c1178520384..00000000000 --- a/app-i18n/atokx3/atokx3-3.0.0-r12.ebuild +++ /dev/null @@ -1,209 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -MULTILIB_COMPAT=( abi_x86_{32,64} ) - -inherit cdrom eutils gnome2-utils multilib-build - -MY_UPDATE_P="${PN}up2" -MY_UPDATE_GTK="${PN}gtk216" -MY_ZIPCODE_P="a20y1406lx" - -DESCRIPTION="ATOK X3 for Linux - The most famous Japanese Input Method Engine" -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" - -LICENSE="ATOK MIT" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86" -IUSE="" -RESTRICT="strip mirror" - -RDEPEND="dev-libs/atk - dev-libs/glib:2 - dev-libs/libxml2:2 - media-libs/fontconfig - media-libs/libpng - sys-apps/tcp-wrappers - sys-libs/pam - x11-libs/cairo - >=x11-libs/gtk+-2.4.13:2 - x11-libs/libICE - x11-libs/libSM - x11-libs/libXcomposite - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXi - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXxf86vm - x11-libs/libdrm - x11-libs/pangox-compat - 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(-)] - >=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(-)] - >=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(-)] - >=x11-libs/libdrm-2.4.46[abi_x86_32(-)] - >=x11-libs/pangox-compat-0.0.2[abi_x86_32(-)] - )" -S="${WORKDIR}" - -EMULTILIB_PKG="true" - -pkg_setup() { - if ! cdrom_get_cds ${PN}index ; 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/${PN}/lib/server/* - opt/${PN}/lib/client/xaux/* - opt/${PN}/lib/client/* - opt/${PN}/bin/* - usr/libexec/* - usr/bin/* - usr/$(get_libdir)/* - usr/$(get_libdir)/gtk-2.0/immodules/* - usr/$(get_libdir)/iiim/le/${PN}/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/${PN}/*" -} - -src_unpack() { - local targets=" - IIIMF/iiimf-client-lib-trunk_r3104-js*.i386.tar.gz - IIIMF/iiimf-gtk-trunk_r3104-js*.i386.tar.gz - IIIMF/iiimf-protocol-lib-trunk_r3104-js*.i386.tar.gz - IIIMF/iiimf-server-trunk_r3104-js*.i386.tar.gz - IIIMF/iiimf-x-trunk_r3104-js*.i386.tar.gz - IIIMF/iiimf-client-lib-devel-trunk_r3104-js*.i386.tar.gz - IIIMF/iiimf-protocol-lib-devel-trunk_r3104-js*.i386.tar.gz - ATOK/atokx-20.0-*.0.0.i386.tar.gz" - # IIIMF/iiimf-properties-trunk_r3104-js*.i386.tar.gz - # IIIMF/iiimf-docs-trunk_r3104-js*.i386.tar.gz - # IIIMF/iiimf-notuse-trunk_r3104-js*.i386.tar.gz - - if use abi_x86_64 ; then - targets+=" - IIIMF/iiimf-client-lib-64-trunk_r3104-js*.x86_64.tar.gz - IIIMF/iiimf-gtk-64-trunk_r3104-js*.x86_64.tar.gz - IIIMF/iiimf-protocol-lib-64-trunk_r3104-js*.x86_64.tar.gz - ATOK/atokx-64-20.0-*.0.0.x86_64.tar.gz" - # IIIMF/iiimf-client-lib-devel-64-trunk_r3104-js*.x86_64.tar.gz - # IIIMF/iiimf-protocol-lib-devel-64-trunk_r3104-js*.x86_64.tar.gz - # IIIMF/iiimf-notuse-64-trunk_r3104-js*.x86_64.tar.gz - fi - - targets+=" ATOK/atokxup-20.0-*.0.0.i386.tar.gz" - - unpack ${MY_UPDATE_P}.tar.gz - - local i - for i in ${targets} ; do - if [[ -f "${S}"/${MY_UPDATE_P}/bin/${i} ]] ; then - einfo "unpack" $(basename "${S}"/${MY_UPDATE_P}/bin/${i}) - tar xzf "${S}"/${MY_UPDATE_P}/bin/${i} || die "Failed to unpack ${i}" - elif [[ -f "${CDROM_ROOT}"/bin/tarball/${i} ]] ; then - einfo "unpack" $(basename "${CDROM_ROOT}"/bin/tarball/${i}) - tar xzf "${CDROM_ROOT}"/bin/tarball/${i} || die "Failed to unpack ${i}" - else - die "${i} not found." - fi - done - unpack ${MY_UPDATE_GTK}.tar.gz - unpack ${MY_ZIPCODE_P}.tgz -} - -src_prepare() { - if use abi_x86_64 ; then - local lib32="$(ABI=x86 get_libdir)" - local lib64="$(get_libdir)" - if [[ "lib" != "${lib32}" ]] ; then - mv usr/lib "usr/${lib32}" || die - fi - if [[ "lib64" != "${lib64}" ]] ; then - mv usr/lib64 "usr/${lib64}" || die - fi - mkdir -p "usr/${lib64}/iiim/le/${PN}" || die - mv "usr/${lib32}/iiim/le/${PN}/64" "usr/${lib64}/iiim/le/${PN}/64" || die - rm "usr/${lib32}/iiim/le/${PN}/amd64" || die - sed -e "s:/usr/lib:/usr/${lib64}:" "usr/${lib32}/libiiimcf.la" > "usr/${lib64}/libiiimcf.la" || die - sed -e "s:/usr/lib:/usr/${lib64}:" "usr/${lib32}/libiiimp.la" > "usr/${lib64}/libiiimp.la" || die - sed -i -e "s:/usr/lib:/usr/${lib32}:" "usr/${lib32}/libiiimcf.la" || die - sed -i -e "s:/usr/lib:/usr/${lib32}:" "usr/${lib32}/libiiimp.la" || die - fi -} - -src_install() { - DOCS=( ${MY_UPDATE_P}/README_UP2.txt "${CDROM_ROOT}"/doc/atok.pdf ) - HTML_DOCS=( "${CDROM_ROOT}"/readme.html ) - einstalldocs - rm -rf ${MY_UPDATE_P} - - cp -dpR * "${ED}" || die - - # amd64 hack - if use abi_x86_64 ; then - local lib32="$(ABI=x86 get_libdir)" - local lib64="$(get_libdir)" - 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 "../../${lib32}/iiim/${f}" "/usr/${lib64}/iiim/${f}" - done - for f in ${PN}aux.so ${PN}.so ; do - dosym "../../../../${lib32}/iiim/le/${PN}/${f}" "/usr/${lib64}/iiim/le/${PN}/${f}" - done - 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 - - sed -e "s:@EPREFIX@:${EPREFIX}:" "${FILESDIR}/xinput-iiimf" > "${T}/iiimf.conf" || die - insinto /etc/X11/xinit/xinput.d - doins "${T}/iiimf.conf" -} - -pkg_preinst() { - # bug #343325 - if use abi_x86_64 && has_multilib_profile && [[ -L "${EPREFIX}/usr/$(get_libdir)/iiim" ]] ; then - rm -f "${EPREFIX}/usr/$(get_libdir)/iiim" - fi -} - -pkg_postinst() { - elog - elog "To use ATOK for Linux, you need to add following to .xinitrc or .xprofile:" - elog - elog ". /opt/${PN}/bin/${PN}start.sh" - elog - multilib_foreach_abi gnome2_query_immodules_gtk2 -} - -pkg_postrm() { - multilib_foreach_abi gnome2_query_immodules_gtk2 -} diff --git a/app-i18n/atokx3/files/xinput-iiimf b/app-i18n/atokx3/files/xinput-iiimf deleted file mode 100644 index bc2330c4997..00000000000 --- a/app-i18n/atokx3/files/xinput-iiimf +++ /dev/null @@ -1,11 +0,0 @@ -XIM=iiimx -XIM_PROGRAM="@EPREFIX@/usr/bin/iiimx" -XIM_ARGS=-iiimd -GTK_IM_MODULE=iiim -QT_IM_MODULE=xim - -export HTT_DISABLE_STATUS_WINDOW=t -export HTT_GENERATES_KANAKEY=t -export HTT_USES_LINUX_XKEYSYM=t -export HTT_IGNORES_LOCK_MASK=t -export JS_FEEDBACK_CONVERT=t diff --git a/app-i18n/atokx3/metadata.xml b/app-i18n/atokx3/metadata.xml deleted file mode 100644 index e1a49f49888..00000000000 --- a/app-i18n/atokx3/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>c...@gentoo.org</email> - <name>Cjk</name> - </maintainer> -</pkgmetadata> diff --git a/profiles/package.mask b/profiles/package.mask index a39d25fc2d7..7dc6827a250 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -247,12 +247,6 @@ sci-chemistry/nmrdepaker # Removal in 30 days. Bug #544228. dev-python/restkit -# Andreas Sturmlechner <ast...@gentoo.org> (2020-05-17) -# Depends on deprecated x11-libs/pangox-compat, commercial software that -# since 2017 does no longer support Linux. Bugs #694920, #720848 -# Masked for removal in 30 days. -app-i18n/atokx3 - # Aaron W. Swenson <titanof...@gentoo.org> (2020-05-15) # PostgreSQL 9.4 series is EOL. Migrate your database cluster to a more recent # version.