public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/
@ 2017-06-11 11:27 Alexis Ballier
  0 siblings, 0 replies; 28+ messages in thread
From: Alexis Ballier @ 2017-06-11 11:27 UTC (permalink / raw
  To: gentoo-commits

commit:     7a10a6c230beb4f38e27ef6452efd0ffef0d64cc
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 11 11:24:00 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Sun Jun 11 11:24:00 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a10a6c2

app-i18n/canna: adapt deps for texlive 2017

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 app-i18n/canna/canna-3.7_p3-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-i18n/canna/canna-3.7_p3-r2.ebuild b/app-i18n/canna/canna-3.7_p3-r2.ebuild
index de02627c1fc..a449de4f5f9 100644
--- a/app-i18n/canna/canna-3.7_p3-r2.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 inherit cannadic eutils multilib
@@ -22,7 +22,7 @@ DEPEND=">=sys-apps/sed-4
 		app-text/ghostscript-gpl
 		>=dev-texlive/texlive-langcjk-2010
 		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-genericrecommended
+		|| ( dev-texlive/texlive-plaingeneric dev-texlive/texlive-genericrecommended )
 		dev-texlive/texlive-latexrecommended
 	)"
 RDEPEND=""


^ permalink raw reply related	[flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/
@ 2021-06-19 23:48 Sam James
  0 siblings, 0 replies; 28+ messages in thread
From: Sam James @ 2021-06-19 23:48 UTC (permalink / raw
  To: gentoo-commits

commit:     4fa34e5c72a9b985e1e1a09fc6c0fcae549c40c3
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 19 23:36:18 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 19 23:48:17 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fa34e5c

app-i18n/canna: fix DeprecatedInsinto

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-i18n/canna/canna-3.7_p3-r4.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app-i18n/canna/canna-3.7_p3-r4.ebuild b/app-i18n/canna/canna-3.7_p3-r4.ebuild
index 998ca0d1f7f..a5e3cf174d4 100644
--- a/app-i18n/canna/canna-3.7_p3-r4.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r4.ebuild
@@ -119,8 +119,7 @@ src_install() {
 	fi
 
 	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins doc/man/guide/tex/canna.{dvi,ps,pdf}
+		dodoc doc/man/guide/tex/canna.{dvi,ps,pdf}
 	fi
 
 	# for backward compatibility


^ permalink raw reply related	[flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/
@ 2021-06-19 22:54 David Seifert
  0 siblings, 0 replies; 28+ messages in thread
From: David Seifert @ 2021-06-19 22:54 UTC (permalink / raw
  To: gentoo-commits

commit:     290951188f0e3abd163d561860508bdacf982160
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 19 22:54:30 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Jun 19 22:54:30 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29095118

app-i18n/canna: Port to EAPI 7

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 ...nna-3.7_p3-r3.ebuild => canna-3.7_p3-r4.ebuild} | 58 +++++++++++-----------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/app-i18n/canna/canna-3.7_p3-r3.ebuild b/app-i18n/canna/canna-3.7_p3-r4.ebuild
similarity index 74%
rename from app-i18n/canna/canna-3.7_p3-r3.ebuild
rename to app-i18n/canna/canna-3.7_p3-r4.ebuild
index 9540c471791..998ca0d1f7f 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
@@ -41,21 +43,18 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-Wformat-security.patch
 )
 
-DOCS="*CHANGES* ChangeLog INSTALL* README* RKCCONF* WHATIS*"
-
 src_prepare() {
 	default
 
 	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
 }
 
@@ -63,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
 }
 
@@ -84,7 +83,7 @@ src_compile() {
 		CDEBUGFLAGS="${CFLAGS}" \
 		LOCAL_LDFLAGS="${LDFLAGS}" \
 		SHLIBGLOBALSFLAGS="${LDFLAGS}" \
-		${PN}
+		canna
 
 	if use canuum; then
 		einfo "Compiling canuum"
@@ -103,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
@@ -120,26 +120,26 @@ src_install() {
 
 	if use doc; then
 		insinto /usr/share/doc/${PF}
-		doins doc/man/guide/tex/${PN}.{dvi,ps,pdf}
+		doins 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() {
@@ -148,7 +148,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


^ permalink raw reply related	[flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/
@ 2021-06-19 21:40 David Seifert
  0 siblings, 0 replies; 28+ messages in thread
From: David Seifert @ 2021-06-19 21:40 UTC (permalink / raw
  To: gentoo-commits

commit:     d371f177bc23ba2d011c3809fb135d969fade356
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 19 21:40:34 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Jun 19 21:40:34 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d371f177

app-i18n/canna: drop 3.7_p3-r1, 3.7_p3-r2

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 app-i18n/canna/canna-3.7_p3-r1.ebuild |  98 --------------------------
 app-i18n/canna/canna-3.7_p3-r2.ebuild | 128 ----------------------------------
 2 files changed, 226 deletions(-)

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 ceff5914058..00000000000
--- 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 a06d55f21d7..00000000000
--- 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
-}


^ permalink raw reply related	[flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/
@ 2021-04-22 12:18 Sam James
  0 siblings, 0 replies; 28+ messages in thread
From: Sam James @ 2021-04-22 12:18 UTC (permalink / raw
  To: gentoo-commits

commit:     a17f847eeaf8abafb8a93dd7a27596a516cbcb83
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 22 12:16:48 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Apr 22 12:17:45 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a17f847e

app-i18n/canna: Stabilize 3.7_p3-r3 ppc, #783927

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-i18n/canna/canna-3.7_p3-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/canna/canna-3.7_p3-r3.ebuild b/app-i18n/canna/canna-3.7_p3-r3.ebuild
index 34b7fc8f3b1..f5293dd2e68 100644
--- a/app-i18n/canna/canna-3.7_p3-r3.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/9565/${MY_P}.tar.bz2"
 
 LICENSE="MIT GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 sparc ~x86"
 IUSE="canuum doc ipv6"
 
 RDEPEND="canuum? (


^ permalink raw reply related	[flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/
@ 2021-04-22 12:18 Sam James
  0 siblings, 0 replies; 28+ messages in thread
From: Sam James @ 2021-04-22 12:18 UTC (permalink / raw
  To: gentoo-commits

commit:     7e7a8862a8da4a328814e7edc8172f0eca89dc75
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 22 12:15:13 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Apr 22 12:17:32 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e7a8862

app-i18n/canna: Stabilize 3.7_p3-r3 ppc64, #783927

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-i18n/canna/canna-3.7_p3-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/canna/canna-3.7_p3-r3.ebuild b/app-i18n/canna/canna-3.7_p3-r3.ebuild
index ba516286511..34b7fc8f3b1 100644
--- a/app-i18n/canna/canna-3.7_p3-r3.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/9565/${MY_P}.tar.bz2"
 
 LICENSE="MIT GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 sparc ~x86"
 IUSE="canuum doc ipv6"
 
 RDEPEND="canuum? (


^ permalink raw reply related	[flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/
@ 2021-04-21 18:53 Sam James
  0 siblings, 0 replies; 28+ messages in thread
From: Sam James @ 2021-04-21 18:53 UTC (permalink / raw
  To: gentoo-commits

commit:     11801aeafaef35ed1d39fddbf03fe69d51d9d99a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 21 18:52:31 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Apr 21 18:52:31 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11801aea

app-i18n/canna: Stabilize 3.7_p3-r3 amd64, #783927

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-i18n/canna/canna-3.7_p3-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/canna/canna-3.7_p3-r3.ebuild b/app-i18n/canna/canna-3.7_p3-r3.ebuild
index d8e29355ad4..ba516286511 100644
--- a/app-i18n/canna/canna-3.7_p3-r3.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/9565/${MY_P}.tar.bz2"
 
 LICENSE="MIT GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86"
 IUSE="canuum doc ipv6"
 
 RDEPEND="canuum? (


^ permalink raw reply related	[flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/
@ 2021-04-20 17:06 Sergei Trofimovich
  0 siblings, 0 replies; 28+ messages in thread
From: Sergei Trofimovich @ 2021-04-20 17:06 UTC (permalink / raw
  To: gentoo-commits

commit:     402e3377a6acdc8ebbf9d3bab2f64bde11393150
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Tue Apr 20 13:55:03 2021 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Tue Apr 20 17:05:51 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=402e3377

app-i18n/canna: stable 3.7_p3-r3 for sparc, bug #783927

Package-Manager: Portage-3.0.17, Repoman-3.0.2
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 app-i18n/canna/canna-3.7_p3-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/canna/canna-3.7_p3-r3.ebuild b/app-i18n/canna/canna-3.7_p3-r3.ebuild
index f36088baafd..dd0821916b6 100644
--- a/app-i18n/canna/canna-3.7_p3-r3.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/9565/${MY_P}.tar.bz2"
 
 LICENSE="MIT GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86"
 IUSE="canuum doc ipv6"
 
 RDEPEND="canuum? (


^ permalink raw reply related	[flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/
@ 2020-06-06 12:57 Sergei Trofimovich
  0 siblings, 0 replies; 28+ messages in thread
From: Sergei Trofimovich @ 2020-06-06 12:57 UTC (permalink / raw
  To: gentoo-commits

commit:     74bbeadd02c4e71d5359b4f362029b5a9fa8d686
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Sat Jun  6 07:02:04 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Jun  6 12:57:11 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74bbeadd

app-i18n/canna: keyworded 3.7_p3-r3 for hppa, bug #624226

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 app-i18n/canna/canna-3.7_p3-r3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-i18n/canna/canna-3.7_p3-r3.ebuild b/app-i18n/canna/canna-3.7_p3-r3.ebuild
index ac8473821f7..a2494559aaa 100644
--- a/app-i18n/canna/canna-3.7_p3-r3.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/9565/${MY_P}.tar.bz2"
 
 LICENSE="MIT GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="canuum doc ipv6"
 
 RDEPEND="canuum? (


^ permalink raw reply related	[flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/
@ 2019-07-27 12:54 Aaron Bauman
  0 siblings, 0 replies; 28+ messages in thread
From: Aaron Bauman @ 2019-07-27 12:54 UTC (permalink / raw
  To: gentoo-commits

commit:     3e6f14c93d8fb804d5be93f9a0a885a3f353c6cd
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 27 12:29:29 2019 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sat Jul 27 12:29:29 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e6f14c9

app-i18n/canna: arm64 stable

Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="arm64"

 app-i18n/canna/canna-3.7_p3-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-i18n/canna/canna-3.7_p3-r1.ebuild b/app-i18n/canna/canna-3.7_p3-r1.ebuild
index e38caaff6fb..c6a52cd04a7 100644
--- a/app-i18n/canna/canna-3.7_p3-r1.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge.jp/canna/9565/${MY_P}.tar.bz2"
 
 LICENSE="MIT GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="x11-misc/gccmakedep


^ permalink raw reply related	[flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/
@ 2018-03-05 20:26 Sergei Trofimovich
  0 siblings, 0 replies; 28+ messages in thread
From: Sergei Trofimovich @ 2018-03-05 20:26 UTC (permalink / raw
  To: gentoo-commits

commit:     1181ba102473cc3031e88266b214ffb654154d34
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Mon Mar  5 19:15:43 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Mar  5 20:26:27 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1181ba10

app-i18n/canna: keyworded 3.7_p3-r3 for sparc, bug #624226

Package-Manager: Portage-2.3.19, Repoman-2.3.6
RepoMan-Options: --include-arches="sparc"

 app-i18n/canna/canna-3.7_p3-r3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-i18n/canna/canna-3.7_p3-r3.ebuild b/app-i18n/canna/canna-3.7_p3-r3.ebuild
index beb1f7613d3..ac8473821f7 100644
--- a/app-i18n/canna/canna-3.7_p3-r3.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r3.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"
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/9565/${MY_P}.tar.bz2"
 
 LICENSE="MIT GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="canuum doc ipv6"
 
 RDEPEND="canuum? (


^ permalink raw reply related	[flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/
@ 2017-09-07 19:28 Markus Meier
  0 siblings, 0 replies; 28+ messages in thread
From: Markus Meier @ 2017-09-07 19:28 UTC (permalink / raw
  To: gentoo-commits

commit:     d7737ccdbdc0003e7877483356caf9bb22daaff9
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  7 19:27:29 2017 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Thu Sep  7 19:27:29 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7737ccd

app-i18n/canna: add ~arm64, bug #624226

Package-Manager: Portage-2.3.6, Repoman-2.3.1
RepoMan-Options: --include-arches="arm64"

 app-i18n/canna/canna-3.7_p3-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/canna/canna-3.7_p3-r3.ebuild b/app-i18n/canna/canna-3.7_p3-r3.ebuild
index 056f6c92ad0..beb1f7613d3 100644
--- a/app-i18n/canna/canna-3.7_p3-r3.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/9565/${MY_P}.tar.bz2"
 
 LICENSE="MIT GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="canuum doc ipv6"
 
 RDEPEND="canuum? (


^ permalink raw reply related	[flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/
@ 2017-08-10 21:05 Sergei Trofimovich
  0 siblings, 0 replies; 28+ messages in thread
From: Sergei Trofimovich @ 2017-08-10 21:05 UTC (permalink / raw
  To: gentoo-commits

commit:     a5b026cfa2a719820eec84c65f6900d326a77a21
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 10 21:04:57 2017 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Thu Aug 10 21:04:57 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5b026cf

app-i18n/canna: keyworded 3.7_p3-r3 for ppc64, bug #624226

Package-Manager: Portage-2.3.6, Repoman-2.3.3
RepoMan-Options: --include-arches="ppc64"

 app-i18n/canna/canna-3.7_p3-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/canna/canna-3.7_p3-r3.ebuild b/app-i18n/canna/canna-3.7_p3-r3.ebuild
index 5a74d90d566..056f6c92ad0 100644
--- a/app-i18n/canna/canna-3.7_p3-r3.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/9565/${MY_P}.tar.bz2"
 
 LICENSE="MIT GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="canuum doc ipv6"
 
 RDEPEND="canuum? (


^ permalink raw reply related	[flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/
@ 2017-07-24 17:44 Markus Meier
  0 siblings, 0 replies; 28+ messages in thread
From: Markus Meier @ 2017-07-24 17:44 UTC (permalink / raw
  To: gentoo-commits

commit:     3a8030627b19d4f7d5035f8572fdc53c4ecc05a9
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 24 17:44:33 2017 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Mon Jul 24 17:44:33 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a803062

app-i18n/canna: add ~arm, bug #624226

Package-Manager: Portage-2.3.6, Repoman-2.3.1
RepoMan-Options: --include-arches="arm"

 app-i18n/canna/canna-3.7_p3-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/canna/canna-3.7_p3-r3.ebuild b/app-i18n/canna/canna-3.7_p3-r3.ebuild
index e9b38ff15c1..5a74d90d566 100644
--- a/app-i18n/canna/canna-3.7_p3-r3.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/9565/${MY_P}.tar.bz2"
 
 LICENSE="MIT GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~x86"
 IUSE="canuum doc ipv6"
 
 RDEPEND="canuum? (


^ permalink raw reply related	[flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/
@ 2017-07-23 12:26 Akinori Hattori
  0 siblings, 0 replies; 28+ messages in thread
From: Akinori Hattori @ 2017-07-23 12:26 UTC (permalink / raw
  To: gentoo-commits

commit:     37c7221a142aa8164d18f3442f9cb6273cb4318e
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 23 12:23:14 2017 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sun Jul 23 12:26:11 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37c7221a

app-i18n/canna: inherit autotools

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 app-i18n/canna/canna-3.7_p3-r3.ebuild | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/app-i18n/canna/canna-3.7_p3-r3.ebuild b/app-i18n/canna/canna-3.7_p3-r3.ebuild
index 26a3d509594..e9b38ff15c1 100644
--- a/app-i18n/canna/canna-3.7_p3-r3.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r3.ebuild
@@ -3,13 +3,13 @@
 
 EAPI="6"
 
-inherit cannadic toolchain-funcs
+inherit autotools 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"
+SRC_URI="mirror://sourceforge.jp/${PN}/9565/${MY_P}.tar.bz2"
 
 LICENSE="MIT GPL-2"
 SLOT="0"
@@ -23,9 +23,7 @@ RDEPEND="canuum? (
 DEPEND="${RDEPEND}
 	x11-misc/gccmakedep
 	x11-misc/imake
-	canuum? (
-		virtual/pkgconfig
-	)
+	canuum? ( virtual/pkgconfig )
 	doc? (
 		app-text/ghostscript-gpl
 		dev-texlive/texlive-langjapanese
@@ -50,7 +48,7 @@ src_prepare() {
 	sed -i \
 		-e "/DefLibCannaDir/s:/lib$:/$(get_libdir):" \
 		-e "/UseInet6/s:0:$(usex ipv6 1 0):" \
-		Canna.conf
+		${PN^c}.conf
 
 	if use canuum; then
 		cd canuum


^ permalink raw reply related	[flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/
@ 2017-07-11  7:51 Sergei Trofimovich
  0 siblings, 0 replies; 28+ messages in thread
From: Sergei Trofimovich @ 2017-07-11  7:51 UTC (permalink / raw
  To: gentoo-commits

commit:     83502f9516b8633524a53fc0bc3efd827d192d5e
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 11 07:51:05 2017 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Tue Jul 11 07:51:05 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83502f95

app-i18n/canna: ia64 keyworded, bug #624226

Package-Manager: Portage-2.3.6, Repoman-2.3.2
RepoMan-Options: --include-arches="ia64"

 app-i18n/canna/canna-3.7_p3-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/canna/canna-3.7_p3-r3.ebuild b/app-i18n/canna/canna-3.7_p3-r3.ebuild
index 506184539b7..26a3d509594 100644
--- a/app-i18n/canna/canna-3.7_p3-r3.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge.jp/canna/9565/${MY_P}.tar.bz2"
 
 LICENSE="MIT GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86"
 IUSE="canuum doc ipv6"
 
 RDEPEND="canuum? (


^ permalink raw reply related	[flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/
@ 2017-07-09 13:06 Akinori Hattori
  0 siblings, 0 replies; 28+ messages in thread
From: Akinori Hattori @ 2017-07-09 13:06 UTC (permalink / raw
  To: gentoo-commits

commit:     25021f8f6575aebb146303c6b728094bdc4a4924
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  9 13:05:43 2017 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sun Jul  9 13:05:43 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25021f8f

app-i18n/canna: fix *DEPEND

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 app-i18n/canna/canna-3.7_p3-r3.ebuild | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app-i18n/canna/canna-3.7_p3-r3.ebuild b/app-i18n/canna/canna-3.7_p3-r3.ebuild
index 8dbf091e2dd..506184539b7 100644
--- a/app-i18n/canna/canna-3.7_p3-r3.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r3.ebuild
@@ -16,11 +16,14 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~x86"
 IUSE="canuum doc ipv6"
 
-DEPEND="x11-misc/gccmakedep
+RDEPEND="canuum? (
+		dev-libs/libspt
+		sys-libs/ncurses:=
+	)"
+DEPEND="${RDEPEND}
+	x11-misc/gccmakedep
 	x11-misc/imake
 	canuum? (
-		dev-libs/libspt
-		sys-libs/ncurses
 		virtual/pkgconfig
 	)
 	doc? (
@@ -28,7 +31,6 @@ DEPEND="x11-misc/gccmakedep
 		dev-texlive/texlive-langjapanese
 		dev-texlive/texlive-latexrecommended
 	)"
-RDEPEND=""
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(


^ permalink raw reply related	[flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/
@ 2017-07-08  8:11 Akinori Hattori
  0 siblings, 0 replies; 28+ messages in thread
From: Akinori Hattori @ 2017-07-08  8:11 UTC (permalink / raw
  To: gentoo-commits

commit:     5a0b53c2c241ad013c1ffb1f3f6456f0debb4845
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  8 08:10:39 2017 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Jul  8 08:10:39 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a0b53c2

app-i18n/canna: add ipv6 USE flag

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 app-i18n/canna/canna-3.7_p3-r2.ebuild | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app-i18n/canna/canna-3.7_p3-r2.ebuild b/app-i18n/canna/canna-3.7_p3-r2.ebuild
index 9045702ca03..4bc24066bb8 100644
--- a/app-i18n/canna/canna-3.7_p3-r2.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r2.ebuild
@@ -14,7 +14,7 @@ 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"
+IUSE="doc ipv6"
 
 DEPEND="x11-misc/gccmakedep
 	x11-misc/imake
@@ -38,8 +38,10 @@ src_prepare() {
 
 	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
+	sed -i \
+		-e "/DefLibCannaDir/s:/lib$:/$(get_libdir):" \
+		-e "/UseInet6/s:0:$(usex ipv6 1 0):" \
+		Canna.conf
 }
 
 src_configure() {


^ permalink raw reply related	[flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/
@ 2017-07-08  8:06 Akinori Hattori
  0 siblings, 0 replies; 28+ messages in thread
From: Akinori Hattori @ 2017-07-08  8:06 UTC (permalink / raw
  To: gentoo-commits

commit:     09e280459d51afebdaa8874b128c6bd349137ee6
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  8 08:05:58 2017 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Jul  8 08:05:58 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09e28045

app-i18n/canna: fix DEPEND

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 app-i18n/canna/canna-3.7_p3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/canna/canna-3.7_p3-r2.ebuild b/app-i18n/canna/canna-3.7_p3-r2.ebuild
index 19fd9c3667d..9045702ca03 100644
--- a/app-i18n/canna/canna-3.7_p3-r2.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r2.ebuild
@@ -20,7 +20,7 @@ DEPEND="x11-misc/gccmakedep
 	x11-misc/imake
 	doc? (
 		app-text/ghostscript-gpl
-		>=dev-texlive/texlive-langcjk-2010
+		dev-texlive/texlive-langjapanese
 		dev-texlive/texlive-latexrecommended
 	)"
 RDEPEND=""


^ permalink raw reply related	[flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/
@ 2017-07-08  7:58 Akinori Hattori
  0 siblings, 0 replies; 28+ messages in thread
From: Akinori Hattori @ 2017-07-08  7:58 UTC (permalink / raw
  To: gentoo-commits

commit:     9ea8f97ee8e8f3f42e95e1e526c312096b52cdf6
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  8 07:56:05 2017 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Jul  8 07:56:05 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ea8f97e

app-i18n/canna: update to EAPI 6

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 app-i18n/canna/canna-3.7_p3-r1.ebuild |  99 +++++++++++-----------------
 app-i18n/canna/canna-3.7_p3-r2.ebuild | 121 +++++++++++++++++-----------------
 app-i18n/canna/metadata.xml           |  14 ++--
 3 files changed, 107 insertions(+), 127 deletions(-)

diff --git a/app-i18n/canna/canna-3.7_p3-r1.ebuild b/app-i18n/canna/canna-3.7_p3-r1.ebuild
index 2dac49233f0..d6727b9c284 100644
--- a/app-i18n/canna/canna-3.7_p3-r1.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r1.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-inherit cannadic eutils multilib
+EAPI="6"
 
-MY_P="Canna${PV//./}"
-MY_P="${MY_P/_/}"
+inherit cannadic toolchain-funcs
+
+MY_P="Canna${PV//[._]/}"
 
 DESCRIPTION="A client-server based Kana-Kanji conversion system"
 HOMEPAGE="http://canna.osdn.jp/"
@@ -15,90 +16,70 @@ SLOT="0"
 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 IUSE=""
 
-DEPEND=">=sys-apps/sed-4
-	x11-misc/gccmakedep
+DEPEND="x11-misc/gccmakedep
 	x11-misc/imake"
 RDEPEND=""
 S="${WORKDIR}/${MY_P}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+PATCHES=(
+	"${FILESDIR}"/${PN}-gentoo.patch
+	"${FILESDIR}"/${PN}-kpdef.patch
+	"${FILESDIR}"/${PN}-posix-sort.patch
+)
+DOCS="*CHANGES* ChangeLog INSTALL* README* RKCCONF* WHATIS*"
 
-	epatch "${FILESDIR}"/${PN}-gentoo.patch \
-		"${FILESDIR}"/${PN}-kpdef.patch \
-		"${FILESDIR}"/${PN}-posix-sort.patch
+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 -e "s:\(DefLibCannaDir.*\)/lib:\1/$(get_libdir):g" Canna.conf* || die
+	sed -i "/DefLibCannaDir/s:/lib$:/$(get_libdir):" Canna.conf
 }
 
-src_compile() {
-	xmkmf || die
+src_configure() {
+	xmkmf -a || die
+}
 
-	#make libCannaDir=../lib/canna canna || die
+src_compile() {
 	# bug #279706
-	emake -j1 CDEBUGFLAGS="${CFLAGS}" canna || die
-
-	#if use doc ; then
-	#	einfo "Compiling DVI, PS (and PDF) document"
-	#	cd doc/man/guide/tex
-	#	xmkmf || die
-	#	emake -j1 JLATEXCMD=platex \
-	#		DVI2PSCMD="dvips -f" \
-	#		canna.dvi canna.ps || die
-	#	if has_version 'app-text/dvipdfmx' && \
-	#		( has_version 'app-text/acroread' \
-	#		|| has_version 'app-text/xpdf-japanese' ); then
-	#		emake -j1 JLATEXCMD=platex \
-	#			DVI2PSCMD="dvips -f" \
-	#			canna.pdf || die
-	#	fi
-	#fi
+	emake -j1 \
+		CC="$(tc-getCC)" \
+		CDEBUGFLAGS="${CFLAGS}" \
+		LOCAL_LDFLAGS="${LDFLAGS}" \
+		SHLIBGLOBALSFLAGS="${LDFLAGS}" \
+		${PN}
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
-	emake DESTDIR="${D}" install.man || die
-
-	# install default.canna (removed from Canna36p4)
-	insinto /usr/share/canna
-	newins misc/initfiles/verbose.canna default.canna
+	emake DESTDIR="${D}" install install.man
+	einstalldocs
 
-	# cannakill should link to /usr/bin/catdic
-	dosym ../bin/catdic /usr/sbin/cannakill
-
-	dodir /usr/share/man/man8 /usr/share/man/ja/man8
+	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
 
-	dodoc CHANGES.jp ChangeLog INSTALL* README* WHATIS*
+	# for backward compatibility
+	dosbin "${FILESDIR}"/update-canna-dics_dir
 
-	#if use doc ; then
-	#	insinto /usr/share/doc/${PF}
-	#	doins doc/man/guide/tex/canna.{dvi,ps,pdf}
-	#fi
+	keepdir /var/lib/${PN}/dic/{user,group}
+	fowners bin:bin /var/lib/${PN}/dic/{user,group}
+	fperms 0775 /var/lib/${PN}/dic/{user,group}
 
-	newinitd "${FILESDIR}"/${PN}.initd canna || die
-	newconfd "${FILESDIR}"/${PN}.confd canna || die
-	insinto /etc/ ; newins "${FILESDIR}"/canna.hosts hosts.canna || die
-	keepdir /var/log/canna/ || die
+	insinto /var/lib/${PN}/dic/dics.d
+	newins "${ED}"/var/lib/${PN}/dic/${PN}/dics.dir 00${PN}.dics.dir
 
-	# for backward compatibility
-	dosbin "${FILESDIR}"/update-canna-dics_dir
+	keepdir /var/log/${PN}
 
-	insinto /var/lib/canna/dic/dics.d/
-	newins "${D}"/var/lib/canna/dic/canna/dics.dir 00canna.dics.dir
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
 
-	# fix permission for user dictionary
-	keepdir /var/lib/canna/dic/{user,group}
-	fowners root:bin /var/lib/canna/dic/{user,group}
-	fperms 775 /var/lib/canna/dic/{user,group}
+	insinto /etc
+	newins "${FILESDIR}"/${PN}.hosts hosts.${PN}
 }
 
 pkg_postinst() {

diff --git a/app-i18n/canna/canna-3.7_p3-r2.ebuild b/app-i18n/canna/canna-3.7_p3-r2.ebuild
index 6511e2168c8..2a51c4b0815 100644
--- a/app-i18n/canna/canna-3.7_p3-r2.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r2.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-inherit cannadic eutils multilib
+EAPI="6"
 
-MY_P="Canna${PV//./}"
-MY_P="${MY_P/_/}"
+inherit cannadic toolchain-funcs
+
+MY_P="Canna${PV//[._]/}"
 
 DESCRIPTION="A client-server based Kana-Kanji conversion system"
 HOMEPAGE="http://canna.osdn.jp/"
@@ -15,8 +16,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc"
 
-DEPEND=">=sys-apps/sed-4
-	x11-misc/gccmakedep
+DEPEND="x11-misc/gccmakedep
 	x11-misc/imake
 	doc? (
 		app-text/ghostscript-gpl
@@ -28,89 +28,88 @@ DEPEND=">=sys-apps/sed-4
 RDEPEND=""
 S="${WORKDIR}/${MY_P}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+PATCHES=(
+	"${FILESDIR}"/${PN}-gentoo.patch
+	"${FILESDIR}"/${PN}-kpdef.patch
+	"${FILESDIR}"/${PN}-posix-sort.patch
+)
+DOCS="*CHANGES* ChangeLog INSTALL* README* RKCCONF* WHATIS*"
 
-	epatch "${FILESDIR}"/${PN}-gentoo.patch \
-		"${FILESDIR}"/${PN}-kpdef.patch \
-		"${FILESDIR}"/${PN}-posix-sort.patch
+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 -e "s:\(DefLibCannaDir.*\)/lib:\1/$(get_libdir):g" Canna.conf* || die
+	sed -i "/DefLibCannaDir/s:/lib$:/$(get_libdir):" Canna.conf
 }
 
-src_compile() {
-	xmkmf || die
-
-	#make libCannaDir=../lib/canna canna || die
-	# bug #279706
-	emake -j1 CC="$(tc-getCC)" CDEBUGFLAGS="${CFLAGS}" \
-		LOCAL_LDFLAGS="${LDFLAGS}" SHLIBGLOBALSFLAGS="${LDFLAGS}" canna || die
+src_configure() {
+	xmkmf -a || die
 
-	if use doc ; then
-		einfo "Compiling DVI, PS (and PDF) document"
+	if use doc; then
 		cd doc/man/guide/tex
-		xmkmf || die
-		emake -j1 CC="$(tc-getCC)" CDEBUGFLAGS="${CFLAGS}" \
-			LOCAL_LDFLAGS="${LDFLAGS}" SHLIBGLOBALSFLAGS="${LDFLAGS}" \
-			JLATEXCMD=platex \
-			DVI2PSCMD="dvips -f" VARTEXFONTS="${T}"/fonts \
-			canna.dvi canna.ps || die
-		if has_version 'app-text/dvipdfmx' && \
-			( has_version 'app-text/acroread' \
-			|| has_version 'app-text/xpdf-japanese' ); then
-			emake -j1 CC="$(tc-getCC)" CDEBUGFLAGS="${CFLAGS}" \
-				LOCAL_LDFLAGS="${LDFLAGS}" SHLIBGLOBALSFLAGS="${LDFLAGS}" \
-				JLATEXCMD=platex \
-				DVI2PSCMD="dvips -f" VARTEXFONTS="${T}"/fonts \
-				canna.pdf || die
-		fi
+		xmkmf -a || die
+		cd - > /dev/null
 	fi
 }
 
-src_install() {
-	emake DESTDIR="${D}" install || die
-	emake DESTDIR="${D}" install.man || die
-
-	# install default.canna (removed from Canna36p4)
-	insinto /usr/share/canna
-	newins misc/initfiles/verbose.canna default.canna
+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
+}
 
-	# cannakill should link to /usr/bin/catdic
-	dosym ../bin/catdic /usr/sbin/cannakill
+src_install() {
+	emake DESTDIR="${D}" install install.man
+	einstalldocs
 
-	dodir /usr/share/man/man8 /usr/share/man/ja/man8
+	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
 
-	dodoc CHANGES.jp ChangeLog INSTALL* README* WHATIS*
-
-	if use doc ; then
+	if use doc; then
 		insinto /usr/share/doc/${PF}
-		doins doc/man/guide/tex/canna.{dvi,ps,pdf}
+		doins doc/man/guide/tex/${PN}.{dvi,ps,pdf}
 	fi
 
-	newinitd "${FILESDIR}"/${PN}.initd canna || die
-	newconfd "${FILESDIR}"/${PN}.confd canna || die
-	insinto /etc/ ; newins "${FILESDIR}"/canna.hosts hosts.canna || die
-	keepdir /var/log/canna/ || die
-
 	# for backward compatibility
 	dosbin "${FILESDIR}"/update-canna-dics_dir
 
-	insinto /var/lib/canna/dic/dics.d/
-	newins "${D}"/var/lib/canna/dic/canna/dics.dir 00canna.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}
 
-	# fix permission for user dictionary
-	keepdir /var/lib/canna/dic/{user,group}
-	fowners root:bin /var/lib/canna/dic/{user,group}
-	fperms 775 /var/lib/canna/dic/{user,group}
+	insinto /etc
+	newins "${FILESDIR}"/${PN}.hosts hosts.${PN}
 }
 
 pkg_postinst() {

diff --git a/app-i18n/canna/metadata.xml b/app-i18n/canna/metadata.xml
index 87548929aea..68869af5812 100644
--- a/app-i18n/canna/metadata.xml
+++ b/app-i18n/canna/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>cjk@gentoo.org</email>
-		<name>Cjk</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge-jp">canna</remote-id>
-	</upstream>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge-jp">canna</remote-id>
+  </upstream>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/
@ 2017-07-08  7:58 Akinori Hattori
  0 siblings, 0 replies; 28+ messages in thread
From: Akinori Hattori @ 2017-07-08  7:58 UTC (permalink / raw
  To: gentoo-commits

commit:     ce74ba0b07a01be5e3814965d5f5bc57bb528b2c
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  8 07:57:34 2017 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Jul  8 07:57:34 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce74ba0b

app-i18n/canna: drop unused DEPEND

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 app-i18n/canna/canna-3.7_p3-r2.ebuild | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app-i18n/canna/canna-3.7_p3-r2.ebuild b/app-i18n/canna/canna-3.7_p3-r2.ebuild
index 2a51c4b0815..19fd9c3667d 100644
--- a/app-i18n/canna/canna-3.7_p3-r2.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r2.ebuild
@@ -21,8 +21,6 @@ DEPEND="x11-misc/gccmakedep
 	doc? (
 		app-text/ghostscript-gpl
 		>=dev-texlive/texlive-langcjk-2010
-		dev-texlive/texlive-fontsextra
-		|| ( dev-texlive/texlive-plaingeneric dev-texlive/texlive-genericrecommended )
 		dev-texlive/texlive-latexrecommended
 	)"
 RDEPEND=""


^ permalink raw reply related	[flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/
@ 2017-07-08  7:08 Akinori Hattori
  0 siblings, 0 replies; 28+ messages in thread
From: Akinori Hattori @ 2017-07-08  7:08 UTC (permalink / raw
  To: gentoo-commits

commit:     8fb28e6f65c094a6300e41efe46ae84e0cf7458f
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  8 07:08:31 2017 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Jul  8 07:08:31 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fb28e6f

app-i18n/canna: keyword ia64

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 app-i18n/canna/canna-3.7_p3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/canna/canna-3.7_p3-r2.ebuild b/app-i18n/canna/canna-3.7_p3-r2.ebuild
index 4b23269bdc0..a8c2701d3d5 100644
--- a/app-i18n/canna/canna-3.7_p3-r2.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge.jp/canna/9565/${MY_P}.tar.bz2"
 
 LICENSE="MIT GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc"
 
 DEPEND=">=sys-apps/sed-4


^ permalink raw reply related	[flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/
@ 2017-07-08  7:04 Akinori Hattori
  0 siblings, 0 replies; 28+ messages in thread
From: Akinori Hattori @ 2017-07-08  7:04 UTC (permalink / raw
  To: gentoo-commits

commit:     9c89a22ad52ed7f2af39de029a39e27650970a57
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  8 07:04:08 2017 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Jul  8 07:04:08 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c89a22a

app-i18n/canna: update HOMEPAGE

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 app-i18n/canna/canna-3.7_p3-r1.ebuild | 2 +-
 app-i18n/canna/canna-3.7_p3-r2.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-i18n/canna/canna-3.7_p3-r1.ebuild b/app-i18n/canna/canna-3.7_p3-r1.ebuild
index 2d56ee7ccd6..d9b11fd2453 100644
--- a/app-i18n/canna/canna-3.7_p3-r1.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r1.ebuild
@@ -7,7 +7,7 @@ MY_P="Canna${PV//./}"
 MY_P="${MY_P/_/}"
 
 DESCRIPTION="A client-server based Kana-Kanji conversion system"
-HOMEPAGE="http://canna.sourceforge.jp/"
+HOMEPAGE="http://canna.osdn.jp/"
 SRC_URI="mirror://sourceforge.jp/canna/9565/${MY_P}.tar.bz2"
 
 LICENSE="MIT GPL-2"

diff --git a/app-i18n/canna/canna-3.7_p3-r2.ebuild b/app-i18n/canna/canna-3.7_p3-r2.ebuild
index 0a609c5c94e..4b23269bdc0 100644
--- a/app-i18n/canna/canna-3.7_p3-r2.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r2.ebuild
@@ -7,7 +7,7 @@ MY_P="Canna${PV//./}"
 MY_P="${MY_P/_/}"
 
 DESCRIPTION="A client-server based Kana-Kanji conversion system"
-HOMEPAGE="http://canna.sourceforge.jp/"
+HOMEPAGE="http://canna.osdn.jp/"
 SRC_URI="mirror://sourceforge.jp/canna/9565/${MY_P}.tar.bz2"
 
 LICENSE="MIT GPL-2"


^ permalink raw reply related	[flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/
@ 2017-07-08  6:59 Akinori Hattori
  0 siblings, 0 replies; 28+ messages in thread
From: Akinori Hattori @ 2017-07-08  6:59 UTC (permalink / raw
  To: gentoo-commits

commit:     6a4f353f033ae652c443132d2296035d9cc2702f
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  8 06:58:33 2017 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Jul  8 06:58:33 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a4f353f

app-i18n/canna: update pkg_postinst

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 app-i18n/canna/canna-3.7_p3-r1.ebuild | 12 ++++++++----
 app-i18n/canna/canna-3.7_p3-r2.ebuild | 13 +++----------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/app-i18n/canna/canna-3.7_p3-r1.ebuild b/app-i18n/canna/canna-3.7_p3-r1.ebuild
index 51effafc6b7..2d56ee7ccd6 100644
--- a/app-i18n/canna/canna-3.7_p3-r1.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r1.ebuild
@@ -112,8 +112,12 @@ src_install() {
 
 pkg_postinst() {
 	update-cannadic-dir
-	elog
-	elog "Canna dictionary format has been changed."
-	elog "You should rebuild app-dict/canna-* after emerge."
-	elog
+
+	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
index 0f222e9dac2..0a609c5c94e 100644
--- a/app-i18n/canna/canna-3.7_p3-r2.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r2.ebuild
@@ -124,16 +124,9 @@ src_install() {
 
 pkg_postinst() {
 	update-cannadic-dir
-	elog
-	elog "Canna dictionary format has been changed."
-	elog "You should rebuild app-dict/canna-* after emerge."
-	elog
-
-	local localearchive="${ROOT}usr/$(get_libdir)/locale/locale-archive"
-	if [ -f "${localearchive}" -a -x /usr/bin/localedef ] && \
-		! /usr/bin/localedef --list-archive "${localearchive}" | grep -i 'ja_JP.eucjp' >/dev/null 2>&1 ; then
-		elog "Some dictionary tools in this package require ja_JP.eucJP locale."
-		elog "Please add ja_JP.eucJP locale to /etc/locale.gen:"
+
+	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"


^ permalink raw reply related	[flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/
@ 2017-07-08  6:50 Akinori Hattori
  0 siblings, 0 replies; 28+ messages in thread
From: Akinori Hattori @ 2017-07-08  6:50 UTC (permalink / raw
  To: gentoo-commits

commit:     98fc3da5328a90e90d93fe6fddd3aec964f579c0
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  8 06:49:59 2017 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Jul  8 06:49:59 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98fc3da5

app-i18n/canna: remove pkg_prerm and pkg_postrm

Gentoo-Bug: 328693

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 app-i18n/canna/canna-3.7_p3-r1.ebuild | 26 +-------------------------
 app-i18n/canna/canna-3.7_p3-r2.ebuild | 24 ------------------------
 2 files changed, 1 insertion(+), 49 deletions(-)

diff --git a/app-i18n/canna/canna-3.7_p3-r1.ebuild b/app-i18n/canna/canna-3.7_p3-r1.ebuild
index 1153ee9dc23..51effafc6b7 100644
--- a/app-i18n/canna/canna-3.7_p3-r1.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 inherit cannadic eutils multilib
@@ -19,7 +19,6 @@ DEPEND=">=sys-apps/sed-4
 	x11-misc/gccmakedep
 	x11-misc/imake"
 RDEPEND=""
-
 S="${WORKDIR}/${MY_P}"
 
 src_unpack() {
@@ -118,26 +117,3 @@ pkg_postinst() {
 	elog "You should rebuild app-dict/canna-* after emerge."
 	elog
 }
-
-pkg_prerm() {
-	if [ -S /tmp/.iroha_unix/IROHA ] ; then
-		# make sure cannaserver get stopped because otherwise
-		# we cannot stop it with /etc/init.d after emerge -C canna
-		einfo
-		einfo "Stopping Canna for safe unmerge"
-		einfo
-		/etc/init.d/canna stop
-		touch "${T}"/canna.cookie
-	fi
-}
-
-pkg_postrm() {
-	if [ -f /usr/sbin/cannaserver -a -e "${T}"/canna.cookie ] ; then
-		#update-cannadic-dir
-		einfo
-		einfo "Restarting Canna"
-		einfo
-		/etc/init.d/canna start
-		rm -f "${T}"/canna.cookie
-	fi
-}

diff --git a/app-i18n/canna/canna-3.7_p3-r2.ebuild b/app-i18n/canna/canna-3.7_p3-r2.ebuild
index 1f4b241bce4..0f222e9dac2 100644
--- a/app-i18n/canna/canna-3.7_p3-r2.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r2.ebuild
@@ -26,7 +26,6 @@ DEPEND=">=sys-apps/sed-4
 		dev-texlive/texlive-latexrecommended
 	)"
 RDEPEND=""
-
 S="${WORKDIR}/${MY_P}"
 
 src_unpack() {
@@ -141,26 +140,3 @@ pkg_postinst() {
 		elog
 	fi
 }
-
-pkg_prerm() {
-	if [ -S /tmp/.iroha_unix/IROHA ] ; then
-		# make sure cannaserver get stopped because otherwise
-		# we cannot stop it with /etc/init.d after emerge -C canna
-		einfo
-		einfo "Stopping Canna for safe unmerge"
-		einfo
-		/etc/init.d/canna stop
-		touch "${T}"/canna.cookie
-	fi
-}
-
-pkg_postrm() {
-	if [ -f /usr/sbin/cannaserver -a -e "${T}"/canna.cookie ] ; then
-		#update-cannadic-dir
-		einfo
-		einfo "Restarting Canna"
-		einfo
-		/etc/init.d/canna start
-		rm -f "${T}"/canna.cookie
-	fi
-}


^ permalink raw reply related	[flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/
@ 2017-06-22 11:48 Alexis Ballier
  0 siblings, 0 replies; 28+ messages in thread
From: Alexis Ballier @ 2017-06-22 11:48 UTC (permalink / raw
  To: gentoo-commits

commit:     4693c919c0d97325519190e3609576fa4631e146
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 22 11:30:29 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Jun 22 11:47:52 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4693c919

app-i18n/canna: keyword ~arm64

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 app-i18n/canna/canna-3.7_p3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/canna/canna-3.7_p3-r2.ebuild b/app-i18n/canna/canna-3.7_p3-r2.ebuild
index a449de4f5f9..1f4b241bce4 100644
--- a/app-i18n/canna/canna-3.7_p3-r2.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge.jp/canna/9565/${MY_P}.tar.bz2"
 
 LICENSE="MIT GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc"
 
 DEPEND=">=sys-apps/sed-4


^ permalink raw reply related	[flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/
@ 2016-06-14  2:29 Yixun Lan
  0 siblings, 0 replies; 28+ messages in thread
From: Yixun Lan @ 2016-06-14  2:29 UTC (permalink / raw
  To: gentoo-commits

commit:     c56d8e167b2809dfeb4d65796a8c854646950291
Author:     Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 14 02:20:23 2016 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Tue Jun 14 02:20:23 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c56d8e16

app-i18n/canna: keyword ~arm

requested by app-i18n/uim

Gentoo-Bug: 585670

Package-Manager: portage-2.3.0_rc1

 app-i18n/canna/canna-3.7_p3-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-i18n/canna/canna-3.7_p3-r2.ebuild b/app-i18n/canna/canna-3.7_p3-r2.ebuild
index 9979712..97e8a62 100644
--- a/app-i18n/canna/canna-3.7_p3-r2.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge.jp/canna/9565/${MY_P}.tar.bz2"
 
 LICENSE="MIT GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc"
 
 DEPEND=">=sys-apps/sed-4


^ permalink raw reply related	[flat|nested] 28+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/
@ 2015-09-27 11:51 Manuel Rüger
  0 siblings, 0 replies; 28+ messages in thread
From: Manuel Rüger @ 2015-09-27 11:51 UTC (permalink / raw
  To: gentoo-commits

commit:     a1053d197a9ff55a8d9d2329342c50bfe3447a05
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 27 11:50:44 2015 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Sun Sep 27 11:50:44 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1053d19

app-i18n/canna: Quote variables

Package-Manager: portage-2.2.22

 app-i18n/canna/canna-3.7_p3-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-i18n/canna/canna-3.7_p3-r2.ebuild b/app-i18n/canna/canna-3.7_p3-r2.ebuild
index 533560a..9979712 100644
--- a/app-i18n/canna/canna-3.7_p3-r2.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r2.ebuild
@@ -68,7 +68,7 @@ src_compile() {
 		emake -j1 CC="$(tc-getCC)" CDEBUGFLAGS="${CFLAGS}" \
 			LOCAL_LDFLAGS="${LDFLAGS}" SHLIBGLOBALSFLAGS="${LDFLAGS}" \
 			JLATEXCMD=platex \
-			DVI2PSCMD="dvips -f" VARTEXFONTS=${T}/fonts \
+			DVI2PSCMD="dvips -f" VARTEXFONTS="${T}"/fonts \
 			canna.dvi canna.ps || die
 		if has_version 'app-text/dvipdfmx' && \
 			( has_version 'app-text/acroread' \
@@ -76,7 +76,7 @@ src_compile() {
 			emake -j1 CC="$(tc-getCC)" CDEBUGFLAGS="${CFLAGS}" \
 				LOCAL_LDFLAGS="${LDFLAGS}" SHLIBGLOBALSFLAGS="${LDFLAGS}" \
 				JLATEXCMD=platex \
-				DVI2PSCMD="dvips -f" VARTEXFONTS=${T}/fonts \
+				DVI2PSCMD="dvips -f" VARTEXFONTS="${T}"/fonts \
 				canna.pdf || die
 		fi
 	fi


^ permalink raw reply related	[flat|nested] 28+ messages in thread

end of thread, other threads:[~2021-06-19 23:48 UTC | newest]

Thread overview: 28+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-06-11 11:27 [gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/ Alexis Ballier
  -- strict thread matches above, loose matches on Subject: below --
2021-06-19 23:48 Sam James
2021-06-19 22:54 David Seifert
2021-06-19 21:40 David Seifert
2021-04-22 12:18 Sam James
2021-04-22 12:18 Sam James
2021-04-21 18:53 Sam James
2021-04-20 17:06 Sergei Trofimovich
2020-06-06 12:57 Sergei Trofimovich
2019-07-27 12:54 Aaron Bauman
2018-03-05 20:26 Sergei Trofimovich
2017-09-07 19:28 Markus Meier
2017-08-10 21:05 Sergei Trofimovich
2017-07-24 17:44 Markus Meier
2017-07-23 12:26 Akinori Hattori
2017-07-11  7:51 Sergei Trofimovich
2017-07-09 13:06 Akinori Hattori
2017-07-08  8:11 Akinori Hattori
2017-07-08  8:06 Akinori Hattori
2017-07-08  7:58 Akinori Hattori
2017-07-08  7:58 Akinori Hattori
2017-07-08  7:08 Akinori Hattori
2017-07-08  7:04 Akinori Hattori
2017-07-08  6:59 Akinori Hattori
2017-07-08  6:50 Akinori Hattori
2017-06-22 11:48 Alexis Ballier
2016-06-14  2:29 Yixun Lan
2015-09-27 11:51 Manuel Rüger

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox