summaryrefslogtreecommitdiff
path: root/app-i18n/canna
diff options
context:
space:
mode:
Diffstat (limited to 'app-i18n/canna')
-rw-r--r--app-i18n/canna/Manifest4
-rw-r--r--app-i18n/canna/canna-3.7_p3-r1.ebuild98
-rw-r--r--app-i18n/canna/canna-3.7_p3-r2.ebuild128
-rw-r--r--app-i18n/canna/canna-3.7_p3-r4.ebuild (renamed from app-i18n/canna/canna-3.7_p3-r3.ebuild)58
4 files changed, 30 insertions, 258 deletions
diff --git a/app-i18n/canna/Manifest b/app-i18n/canna/Manifest
index 5814554c46e2..b7d838aea8f9 100644
--- a/app-i18n/canna/Manifest
+++ b/app-i18n/canna/Manifest
@@ -10,7 +10,5 @@ AUX canna.hosts 5 BLAKE2B a10fe2813bf946464641605e8cdda362629a62817de0a7f72f2b0e
AUX canna.initd 782 BLAKE2B 1e34cfc3ed28f5903600f591e55d0eb559aa5336eee54a54a7ab40d2be3816f6a62a947e9c87d4834425f71640c96847836830439f4eeb76a4f25a372fc9d1d0 SHA512 1fd348f2aa4139bbe6154b157b75bf8a39a8ddf36a9a072088279c88241981a9af9024df71aa777ca4e93270d53d0bea8363b31cfb07d229d4a37c48828779e6
AUX update-canna-dics_dir 1101 BLAKE2B 9b429c2ddfb0e3c2c8a754f7fb61b776abbb809f81c93127e5f8be9ec768df6c28fcce75fe69a5b92a195ce49e20572c083aca5b4309f042a50b53bffafc4042 SHA512 135fdabf3995ddf82d3f14aece908e952f3d514fd83e2f86d8113b1026b7dcaea2156225be251a6d9a74a35ee075d5ebb32c05d9deb85905120287d0af1f4207
DIST Canna37p3.tar.bz2 1263065 BLAKE2B b5fb496c0ef71dc57b2da1409eea2238ea62ece3286d498d694bc7a18cb0f5e052dca95d692b4302988acd2199d350b893ae4aedc91aab0b737c3e0675be9cba SHA512 82846f2393aa2654dd2c97a93178098b8bd11e5409b584447f1b6fdf303adacc9802e2293cafd98b68af8b69622625ed00aa9712bf270feaa119adfdf4211158
-EBUILD canna-3.7_p3-r1.ebuild 2264 BLAKE2B cd59e7889883924274c75eabaf64ca6264456b4a0218a6e326e038d3bf7dd3df3b79679118db7a4d09741f56fcee3c19e5edd3a8edc4bde6eeaa4720c34d839b SHA512 dd51d607cff4107ae904abe906e5d0396e0bcbe53d3b1df3157680b56a95cbc336f96a006cc7ec9498db4e7dc657808749b42b549ffaa4aab755d1c5b0f87b6d
-EBUILD canna-3.7_p3-r2.ebuild 2893 BLAKE2B caf22d1d8914257992917784c03f173446e3cfa0c28aeb55a9007b07d053e33d9cc574d4f55eb253954442ab8c6f17805bf72c04113b36874a6693fe690490a2 SHA512 8c5a7660f2be089841953914fa8863d0ba9190b88c23d8266d5181c1da9e17f313e36b4448ec8009a65802b203d69c72428a640a3a2e0bf01049dffac3f12bba
-EBUILD canna-3.7_p3-r3.ebuild 3303 BLAKE2B 6fe3d13730d9f125f8458e1668cf8bbb54624d6972f5ff0aa5f8ab7f715650950be720c31490d8b7ddefcbd11dd56cc90b5622ee41c4e429ccaa7fe06df6d05a SHA512 7ed105d416e17c8ffd56157e50540f063e071d512e60e7152a0b50169ad0da310ea1f8a1b3063c2ac8c68a2e6d2060650f1971f6bfd6de61bbe5fc83f05fbee1
+EBUILD canna-3.7_p3-r4.ebuild 3336 BLAKE2B b2ff41c2a285a79be1c643d7e79275967684c609484beb5fb45f31b99d2a4dca47b908aa87b281d9def01914869935ab0eeee650833da435c21b99c1b99df5d9 SHA512 e93ffdf2f98e97ce5dfb0704daad8389576e81ec7c1d1706a7711185e9548b8dd2206642a03f07d250db96e3e6b8a66796c82eb111b366c87f62b0ea1a5671db
MISC metadata.xml 383 BLAKE2B 2947ceefe007eb9bcfd46a69a4b97a2406383931cb320cb594b96952697378147824461f1b55d5caddc419b19aebeb1c5ce69c0f0d31568cbbbe3d1d15fba9ba SHA512 8affc10d697147ea5430d73c40eb4e7621ee9a06d444725566d4e16a28ccab4f53aed3025905894fe6cba0ea874dcf0d2d583d3dcedf3a0ccc8b139af02e5e98
diff --git a/app-i18n/canna/canna-3.7_p3-r1.ebuild b/app-i18n/canna/canna-3.7_p3-r1.ebuild
deleted file mode 100644
index ceff59140582..000000000000
--- a/app-i18n/canna/canna-3.7_p3-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cannadic toolchain-funcs
-
-MY_P="Canna${PV//[._]/}"
-
-DESCRIPTION="A client-server based Kana-Kanji conversion system"
-HOMEPAGE="http://canna.osdn.jp/"
-SRC_URI="mirror://sourceforge.jp/canna/9565/${MY_P}.tar.bz2"
-
-LICENSE="MIT GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND="x11-misc/gccmakedep
- x11-misc/imake"
-RDEPEND=""
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-gentoo.patch
- "${FILESDIR}"/${PN}-kpdef.patch
- "${FILESDIR}"/${PN}-overflow.patch
- "${FILESDIR}"/${PN}-posix-sort.patch
- "${FILESDIR}"/${PN}-Wformat.patch
- "${FILESDIR}"/${PN}-Wformat-security.patch
-)
-DOCS="*CHANGES* ChangeLog INSTALL* README* RKCCONF* WHATIS*"
-
-src_prepare() {
- default
-
- find . -name '*.man' -o -name '*.jmn' | xargs sed -i.bak -e 's/1M/8/g' || die
-
- # Multilib-strict fix for amd64
- sed -i "/DefLibCannaDir/s:/lib$:/$(get_libdir):" Canna.conf
-}
-
-src_configure() {
- xmkmf -a || die
-}
-
-src_compile() {
- # bug #279706
- emake -j1 \
- CC="$(tc-getCC)" \
- CDEBUGFLAGS="${CFLAGS}" \
- LOCAL_LDFLAGS="${LDFLAGS}" \
- SHLIBGLOBALSFLAGS="${LDFLAGS}" \
- ${PN}
-}
-
-src_install() {
- emake DESTDIR="${D}" install install.man
- einstalldocs
-
- dodir /usr/share/man{,/ja}/man8
- local man mandir
- for man in cannaserver cannakill ; do
- for mandir in "${D}"/usr/share/man "${D}"/usr/share/man/ja ; do
- mv ${mandir}/man1/${man}.1 ${mandir}/man8/${man}.8
- done
- done
-
- # for backward compatibility
- dosbin "${FILESDIR}"/update-canna-dics_dir
-
- keepdir /var/lib/${PN}/dic/{user,group}
- fowners bin:bin /var/lib/${PN}/dic/{user,group}
- fperms 0775 /var/lib/${PN}/dic/{user,group}
-
- insinto /var/lib/${PN}/dic/dics.d
- newins "${ED}"/var/lib/${PN}/dic/${PN}/dics.dir 00${PN}.dics.dir
-
- keepdir /var/log/${PN}
-
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
-
- insinto /etc
- newins "${FILESDIR}"/${PN}.hosts hosts.${PN}
-}
-
-pkg_postinst() {
- update-cannadic-dir
-
- if ! locale -a | grep -iq "ja_JP.eucjp"; then
- elog "Some dictionary tools in this package require ja_JP.EUC-JP locale."
- elog
- elog "# echo 'ja_JP.EUC-JP EUC-JP' >> /etc/locale.gen"
- elog "# locale-gen"
- elog
- fi
-}
diff --git a/app-i18n/canna/canna-3.7_p3-r2.ebuild b/app-i18n/canna/canna-3.7_p3-r2.ebuild
deleted file mode 100644
index a06d55f21d76..000000000000
--- a/app-i18n/canna/canna-3.7_p3-r2.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cannadic toolchain-funcs
-
-MY_P="Canna${PV//[._]/}"
-
-DESCRIPTION="A client-server based Kana-Kanji conversion system"
-HOMEPAGE="http://canna.osdn.jp/"
-SRC_URI="mirror://sourceforge.jp/canna/9565/${MY_P}.tar.bz2"
-
-LICENSE="MIT GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc ipv6"
-
-DEPEND="x11-misc/gccmakedep
- x11-misc/imake
- doc? (
- app-text/ghostscript-gpl
- dev-texlive/texlive-langjapanese
- dev-texlive/texlive-latexrecommended
- )"
-RDEPEND=""
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-gentoo.patch
- "${FILESDIR}"/${PN}-kpdef.patch
- "${FILESDIR}"/${PN}-overflow.patch
- "${FILESDIR}"/${PN}-posix-sort.patch
- "${FILESDIR}"/${PN}-Wformat.patch
- "${FILESDIR}"/${PN}-Wformat-security.patch
-)
-DOCS="*CHANGES* ChangeLog INSTALL* README* RKCCONF* WHATIS*"
-
-src_prepare() {
- default
-
- find . -name '*.man' -o -name '*.jmn' | xargs sed -i.bak -e 's/1M/8/g' || die
-
- sed -i \
- -e "/DefLibCannaDir/s:/lib$:/$(get_libdir):" \
- -e "/UseInet6/s:0:$(usex ipv6 1 0):" \
- Canna.conf
-}
-
-src_configure() {
- xmkmf -a || die
-
- if use doc; then
- cd doc/man/guide/tex
- xmkmf -a || die
- cd - > /dev/null
- fi
-}
-
-src_compile() {
- # bug #279706
- emake -j1 \
- CC="$(tc-getCC)" \
- CDEBUGFLAGS="${CFLAGS}" \
- LOCAL_LDFLAGS="${LDFLAGS}" \
- SHLIBGLOBALSFLAGS="${LDFLAGS}" \
- ${PN}
-
- if use doc; then
- # NOTE: build fails if infinality enabled in fontconfig
- einfo "Compiling DVI, PS, and PDF documents"
- # bug #223077
- emake -C doc/man/guide/tex -j1 \
- JLATEXCMD="platex -kanji=euc" \
- DVI2PSCMD="dvips" \
- VARTEXFONTS="${T}"/fonts \
- ${PN}.ps \
- ${PN}.pdf
- fi
-}
-
-src_install() {
- emake DESTDIR="${D}" install install.man
- einstalldocs
-
- dodir /usr/share/man{,/ja}/man8
- local man mandir
- for man in cannaserver cannakill ; do
- for mandir in "${D}"/usr/share/man "${D}"/usr/share/man/ja ; do
- mv ${mandir}/man1/${man}.1 ${mandir}/man8/${man}.8
- done
- done
-
- if use doc; then
- insinto /usr/share/doc/${PF}
- doins doc/man/guide/tex/${PN}.{dvi,ps,pdf}
- fi
-
- # for backward compatibility
- dosbin "${FILESDIR}"/update-canna-dics_dir
-
- keepdir /var/lib/${PN}/dic/{user,group}
- fowners bin:bin /var/lib/${PN}/dic/{user,group}
- fperms 0775 /var/lib/${PN}/dic/{user,group}
-
- insinto /var/lib/${PN}/dic/dics.d
- newins "${ED}"/var/lib/${PN}/dic/${PN}/dics.dir 00${PN}.dics.dir
-
- keepdir /var/log/${PN}
-
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
-
- insinto /etc
- newins "${FILESDIR}"/${PN}.hosts hosts.${PN}
-}
-
-pkg_postinst() {
- update-cannadic-dir
-
- if ! locale -a | grep -iq "ja_JP.eucjp"; then
- elog "Some dictionary tools in this package require ja_JP.EUC-JP locale."
- elog
- elog "# echo 'ja_JP.EUC-JP EUC-JP' >> /etc/locale.gen"
- elog "# locale-gen"
- elog
- fi
-}
diff --git a/app-i18n/canna/canna-3.7_p3-r3.ebuild b/app-i18n/canna/canna-3.7_p3-r4.ebuild
index 5550c3d89b3e..a5e3cf174d49 100644
--- a/app-i18n/canna/canna-3.7_p3-r3.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r4.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI=7
inherit autotools cannadic toolchain-funcs
@@ -10,17 +10,20 @@ MY_P="Canna${PV//[._]/}"
DESCRIPTION="A client-server based Kana-Kanji conversion system"
HOMEPAGE="http://canna.osdn.jp/"
SRC_URI="mirror://sourceforge.jp/${PN}/9565/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
LICENSE="MIT GPL-2"
SLOT="0"
KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
IUSE="canuum doc ipv6"
-RDEPEND="canuum? (
+RDEPEND="
+ canuum? (
dev-libs/libspt
sys-libs/ncurses:=
)"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
x11-misc/gccmakedep
x11-misc/imake
canuum? ( virtual/pkgconfig )
@@ -29,7 +32,6 @@ DEPEND="${RDEPEND}
dev-texlive/texlive-langjapanese
dev-texlive/texlive-latexrecommended
)"
-S="${WORKDIR}/${MY_P}"
PATCHES=(
"${FILESDIR}"/${PN}-gentoo.patch
@@ -40,7 +42,6 @@ PATCHES=(
"${FILESDIR}"/${PN}-Wformat.patch
"${FILESDIR}"/${PN}-Wformat-security.patch
)
-DOCS="*CHANGES* ChangeLog INSTALL* README* RKCCONF* WHATIS*"
src_prepare() {
default
@@ -48,13 +49,12 @@ src_prepare() {
sed -i \
-e "/DefLibCannaDir/s:/lib$:/$(get_libdir):" \
-e "/UseInet6/s:0:$(usex ipv6 1 0):" \
- ${PN^c}.conf
+ ${PN^c}.conf || die
if use canuum; then
- cd canuum
- mv configure.{in,ac}
+ cd canuum || die
+ mv configure.{in,ac} || die
eautoreconf
- cd - > /dev/null
fi
}
@@ -62,17 +62,17 @@ src_configure() {
xmkmf -a || die
if use canuum; then
- cd canuum
+ pushd canuum >/dev/null || die
xmkmf -a || die
# workaround for sys-libs/ncurses[tinfo]
- sed -i "/^TERMCAP_LIB/s:=.*:=$($(tc-getPKG_CONFIG) --libs ncurses):" Makefile
- cd - > /dev/null
+ sed -i "/^TERMCAP_LIB/s:=.*:=$($(tc-getPKG_CONFIG) --libs ncurses):" Makefile || die
+ popd >/dev/null || die
fi
if use doc; then
- cd doc/man/guide/tex
+ pushd doc/man/guide/tex >/dev/null || die
xmkmf -a || die
- cd - > /dev/null
+ popd >/dev/null || die
fi
}
@@ -83,7 +83,7 @@ src_compile() {
CDEBUGFLAGS="${CFLAGS}" \
LOCAL_LDFLAGS="${LDFLAGS}" \
SHLIBGLOBALSFLAGS="${LDFLAGS}" \
- ${PN}
+ canna
if use canuum; then
einfo "Compiling canuum"
@@ -102,14 +102,15 @@ src_compile() {
JLATEXCMD="platex -kanji=euc" \
DVI2PSCMD="dvips" \
VARTEXFONTS="${T}"/fonts \
- ${PN}.ps \
- ${PN}.pdf
+ canna.ps \
+ canna.pdf
fi
}
src_install() {
emake DESTDIR="${D}" install install.man
einstalldocs
+ dodoc *CHANGES* INSTALL* RKCCONF* WHATIS*
if use canuum; then
emake -C canuum DESTDIR="${D}" install install.man
@@ -118,27 +119,26 @@ src_install() {
fi
if use doc; then
- insinto /usr/share/doc/${PF}
- doins doc/man/guide/tex/${PN}.{dvi,ps,pdf}
+ dodoc doc/man/guide/tex/canna.{dvi,ps,pdf}
fi
# for backward compatibility
dosbin "${FILESDIR}"/update-canna-dics_dir
- keepdir /var/lib/${PN}/dic/{user,group}
- fowners bin:bin /var/lib/${PN}/dic/{user,group}
- fperms 0775 /var/lib/${PN}/dic/{user,group}
+ keepdir /var/lib/canna/dic/{user,group}
+ fowners bin:bin /var/lib/canna/dic/{user,group}
+ fperms 0775 /var/lib/canna/dic/{user,group}
- insinto /var/lib/${PN}/dic/dics.d
- newins "${ED}"/var/lib/${PN}/dic/${PN}/dics.dir 00${PN}.dics.dir
+ insinto /var/lib/canna/dic/dics.d
+ newins "${ED}"/var/lib/canna/dic/canna/dics.dir 00canna.dics.dir
- keepdir /var/log/${PN}
+ keepdir /var/log/canna
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ newconfd "${FILESDIR}"/canna.confd canna
+ newinitd "${FILESDIR}"/canna.initd canna
insinto /etc
- newins "${FILESDIR}"/${PN}.hosts hosts.${PN}
+ newins "${FILESDIR}"/canna.hosts hosts.canna
}
pkg_postinst() {
@@ -147,7 +147,7 @@ pkg_postinst() {
if ! locale -a | grep -iq "ja_JP.eucjp"; then
elog "Some dictionary tools in this package require ja_JP.EUC-JP locale."
elog
- elog "# echo 'ja_JP.EUC-JP EUC-JP' >> /etc/locale.gen"
+ elog "# echo 'ja_JP.EUC-JP EUC-JP' >> ${EROOT}/etc/locale.gen"
elog "# locale-gen"
elog
fi