public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-text/cmigemo/
@ 2018-08-19 22:52 Patrice Clement
  0 siblings, 0 replies; 7+ messages in thread
From: Patrice Clement @ 2018-08-19 22:52 UTC (permalink / raw
  To: gentoo-commits

commit:     0ad4790571e2166cd403d14a3a00b7e9aad0c13b
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Aug 17 15:14:52 2018 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sun Aug 19 22:50:34 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ad47905

app-text/cmigemo: revbump for EAPI7.

Closes: https://bugs.gentoo.org/663880
Closes: https://github.com/gentoo/gentoo/pull/9599

 app-text/cmigemo/cmigemo-1.3c-r3.ebuild | 95 +++++++++++++++++++++++++++++++++
 1 file changed, 95 insertions(+)

diff --git a/app-text/cmigemo/cmigemo-1.3c-r3.ebuild b/app-text/cmigemo/cmigemo-1.3c-r3.ebuild
new file mode 100644
index 00000000000..dadb8751f0b
--- /dev/null
+++ b/app-text/cmigemo/cmigemo-1.3c-r3.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic toolchain-funcs
+
+MY_P="${P}-MIT"
+DESCRIPTION="Migemo library implementation in C"
+HOMEPAGE="http://www.kaoriya.net/#CMIGEMO"
+SRC_URI="http://www.kaoriya.net/dist/var/${MY_P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE="emacs unicode vim-syntax"
+
+DEPEND=">=app-dicts/migemo-dict-200812[unicode=]
+	dev-lang/perl
+	|| (
+		net-misc/curl
+		net-misc/wget
+		net-misc/fetch
+	)
+	app-i18n/nkf"
+RDEPEND="${DEPEND}
+	emacs? ( >=app-text/migemo-0.40-r1 )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	# Bug #246953
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-ldflags.patch
+)
+
+src_prepare() {
+	default
+
+	touch dict/SKK-JISYO.L || die
+	if use unicode ; then
+		sed -i -e "/gcc:/s/euc-jp/utf-8/" dict/dict.mak || die
+	fi
+
+	# Bug #255813
+	sed -i -e "/^docdir/s:/doc/migemo:/share/doc/${PF}:" compile/config.mk.in || die
+}
+
+src_compile() {
+	append-flags -fPIC
+	# parallel make b0rked
+	emake -j1 \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		gcc-all
+}
+
+src_install() {
+	# parallel make b0rked
+	emake -j1 \
+		prefix="${D}/usr" \
+		libdir="${D}/usr/$(get_libdir)" \
+		gcc-install
+
+	local encoding
+	if use unicode ; then
+		encoding="utf-8"
+	else
+		encoding="euc-jp"
+	fi
+
+	mv "${D}/usr/share/migemo/${encoding}/"*.dat "${D}/usr/share/migemo/" || die
+	rm -rf "${D}/usr/share/migemo/"{cp932,euc-jp,utf-8} || die
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/plugin
+		doins tools/migemo.vim
+	fi
+
+	dodoc doc/{README_j,TODO_j,vimigemo}.txt
+}
+
+pkg_postinst() {
+	if use emacs ; then
+		elog
+		elog "Please add to your ~/.emacs"
+		elog "    (setq migemo-command \"cmigemo\")"
+		elog "    (setq migemo-options '(\"-q\" \"--emacs\" \"-i\" \"\\\\a\"))"
+		elog "    (setq migemo-dictionary \"/usr/share/migemo/migemo-dict\")"
+		elog "    (setq migemo-user-dictionary nil)"
+		elog "    (setq migemo-regex-dictionary nil)"
+		elog "to use cmigemo instead of migemo under emacs."
+		elog
+	fi
+}


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

* [gentoo-commits] repo/gentoo:master commit in: app-text/cmigemo/
@ 2018-08-26  8:59 Michał Górny
  0 siblings, 0 replies; 7+ messages in thread
From: Michał Górny @ 2018-08-26  8:59 UTC (permalink / raw
  To: gentoo-commits

commit:     705901a1a3582cf7a0c8e5f4025768944cf36385
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 26 08:27:50 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Aug 26 08:59:19 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=705901a1

app-text/cmigemo: Fix dep on fetch

 app-text/cmigemo/cmigemo-1.3c-r2.ebuild | 2 +-
 app-text/cmigemo/cmigemo-1.3c-r3.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-text/cmigemo/cmigemo-1.3c-r2.ebuild b/app-text/cmigemo/cmigemo-1.3c-r2.ebuild
index 87e1a7d68af..cffb45a64ac 100644
--- a/app-text/cmigemo/cmigemo-1.3c-r2.ebuild
+++ b/app-text/cmigemo/cmigemo-1.3c-r2.ebuild
@@ -19,7 +19,7 @@ DEPEND=">=app-dicts/migemo-dict-200812[unicode=]
 	|| (
 		net-misc/curl
 		net-misc/wget
-		net-misc/fetch
+		www-client/fetch
 	)
 	app-i18n/nkf"
 RDEPEND="${RDEPEND}

diff --git a/app-text/cmigemo/cmigemo-1.3c-r3.ebuild b/app-text/cmigemo/cmigemo-1.3c-r3.ebuild
index dadb8751f0b..9008d0eeba9 100644
--- a/app-text/cmigemo/cmigemo-1.3c-r3.ebuild
+++ b/app-text/cmigemo/cmigemo-1.3c-r3.ebuild
@@ -19,7 +19,7 @@ DEPEND=">=app-dicts/migemo-dict-200812[unicode=]
 	|| (
 		net-misc/curl
 		net-misc/wget
-		net-misc/fetch
+		www-client/fetch
 	)
 	app-i18n/nkf"
 RDEPEND="${DEPEND}


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

* [gentoo-commits] repo/gentoo:master commit in: app-text/cmigemo/
@ 2018-12-08  9:36 Sergei Trofimovich
  0 siblings, 0 replies; 7+ messages in thread
From: Sergei Trofimovich @ 2018-12-08  9:36 UTC (permalink / raw
  To: gentoo-commits

commit:     d203100b5573463d42ec1074e1dec0da8297f742
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  8 09:33:53 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Dec  8 09:33:53 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d203100b

app-text/cmigemo: stable 1.3c-r3 for ppc, bug #672562

Package-Manager: Portage-2.3.52, Repoman-2.3.12
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 app-text/cmigemo/cmigemo-1.3c-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/cmigemo/cmigemo-1.3c-r3.ebuild b/app-text/cmigemo/cmigemo-1.3c-r3.ebuild
index 7271af94503..640c0c057de 100644
--- a/app-text/cmigemo/cmigemo-1.3c-r3.ebuild
+++ b/app-text/cmigemo/cmigemo-1.3c-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.kaoriya.net/dist/var/${MY_P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc x86"
+KEYWORDS="~alpha ~amd64 ppc x86"
 IUSE="unicode vim-syntax"
 
 DEPEND=">=app-dicts/migemo-dict-200812[unicode=]


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

* [gentoo-commits] repo/gentoo:master commit in: app-text/cmigemo/
@ 2018-12-11  9:24 Mikle Kolyada
  0 siblings, 0 replies; 7+ messages in thread
From: Mikle Kolyada @ 2018-12-11  9:24 UTC (permalink / raw
  To: gentoo-commits

commit:     c921163bfb8486a987ec4e1446b1a9b69c7fdd6b
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 11 09:22:04 2018 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Tue Dec 11 09:22:04 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c921163b

app-text/cmigemo: amd64/alpha stable wrt bug #672562

Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 app-text/cmigemo/cmigemo-1.3c-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/cmigemo/cmigemo-1.3c-r3.ebuild b/app-text/cmigemo/cmigemo-1.3c-r3.ebuild
index 640c0c057de..b39dc8bc473 100644
--- a/app-text/cmigemo/cmigemo-1.3c-r3.ebuild
+++ b/app-text/cmigemo/cmigemo-1.3c-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.kaoriya.net/dist/var/${MY_P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ppc x86"
+KEYWORDS="alpha amd64 ppc x86"
 IUSE="unicode vim-syntax"
 
 DEPEND=">=app-dicts/migemo-dict-200812[unicode=]


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

* [gentoo-commits] repo/gentoo:master commit in: app-text/cmigemo/
@ 2024-04-28  6:16 Akinori Hattori
  0 siblings, 0 replies; 7+ messages in thread
From: Akinori Hattori @ 2024-04-28  6:16 UTC (permalink / raw
  To: gentoo-commits

commit:     eeb92afd0e2b0c7e965bc05c2f50255702a1ff30
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 28 06:07:55 2024 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sun Apr 28 06:07:55 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eeb92afd

app-text/cmigemo: update HOMEPAGE and SRC_URI

Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>

 app-text/cmigemo/cmigemo-1.3c-r3.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-text/cmigemo/cmigemo-1.3c-r3.ebuild b/app-text/cmigemo/cmigemo-1.3c-r3.ebuild
index 13e4e867cedb..4c38d653a795 100644
--- a/app-text/cmigemo/cmigemo-1.3c-r3.ebuild
+++ b/app-text/cmigemo/cmigemo-1.3c-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,8 +6,8 @@ inherit flag-o-matic toolchain-funcs
 
 MY_P="${P}-MIT"
 DESCRIPTION="Migemo library implementation in C"
-HOMEPAGE="http://www.kaoriya.net/#CMIGEMO"
-SRC_URI="http://www.kaoriya.net/dist/var/${MY_P}.tar.bz2"
+HOMEPAGE="https://www.kaoriya.net/software/cmigemo/"
+SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"


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

* [gentoo-commits] repo/gentoo:master commit in: app-text/cmigemo/
@ 2024-04-28  6:16 Akinori Hattori
  0 siblings, 0 replies; 7+ messages in thread
From: Akinori Hattori @ 2024-04-28  6:16 UTC (permalink / raw
  To: gentoo-commits

commit:     98a7c1043eae43a5360c92b3b2d1accb6816a29f
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 28 06:10:18 2024 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sun Apr 28 06:10:18 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98a7c104

app-text/cmigemo: rename vim-syntax USE flag to vim

Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>

 app-text/cmigemo/cmigemo-1.3c-r4.ebuild | 4 ++--
 app-text/cmigemo/metadata.xml           | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app-text/cmigemo/cmigemo-1.3c-r4.ebuild b/app-text/cmigemo/cmigemo-1.3c-r4.ebuild
index 624176e11d29..117b79b92d71 100644
--- a/app-text/cmigemo/cmigemo-1.3c-r4.ebuild
+++ b/app-text/cmigemo/cmigemo-1.3c-r4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 ppc x86"
-IUSE="unicode vim-syntax"
+IUSE="unicode vim"
 
 RDEPEND=">=app-dicts/migemo-dict-200812[unicode=]"
 DEPEND="${RDEPEND}"
@@ -74,7 +74,7 @@ src_install() {
 	mv "${ED}"/usr/share/migemo/${encoding}/*.dat "${ED}"/usr/share/migemo || die
 	rm -rf "${ED}"/usr/share/migemo/{cp932,euc-jp,utf-8}
 
-	if use vim-syntax; then
+	if use vim; then
 		insinto /usr/share/vim/vimfiles/plugin
 		doins tools/migemo.vim
 	fi

diff --git a/app-text/cmigemo/metadata.xml b/app-text/cmigemo/metadata.xml
index a94766977fa6..05296999f1ce 100644
--- a/app-text/cmigemo/metadata.xml
+++ b/app-text/cmigemo/metadata.xml
@@ -5,4 +5,7 @@
 		<email>cjk@gentoo.org</email>
 		<name>Cjk</name>
 	</maintainer>
+	<use>
+		<flag name="vim">Install Vim plugin for C/Migemo</flag>
+	</use>
 </pkgmetadata>


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

* [gentoo-commits] repo/gentoo:master commit in: app-text/cmigemo/
@ 2024-04-28  6:16 Akinori Hattori
  0 siblings, 0 replies; 7+ messages in thread
From: Akinori Hattori @ 2024-04-28  6:16 UTC (permalink / raw
  To: gentoo-commits

commit:     ea791c26b4451ffb6276dcdfc5c29126519a409e
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 28 06:08:36 2024 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sun Apr 28 06:08:36 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea791c26

app-text/cmigemo: update to EAPI 8

Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>

 ...igemo-1.3c-r3.ebuild => cmigemo-1.3c-r4.ebuild} | 39 +++++++++++-----------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/app-text/cmigemo/cmigemo-1.3c-r3.ebuild b/app-text/cmigemo/cmigemo-1.3c-r4.ebuild
similarity index 62%
rename from app-text/cmigemo/cmigemo-1.3c-r3.ebuild
rename to app-text/cmigemo/cmigemo-1.3c-r4.ebuild
index 4c38d653a795..3a03e2143a77 100644
--- a/app-text/cmigemo/cmigemo-1.3c-r3.ebuild
+++ b/app-text/cmigemo/cmigemo-1.3c-r4.ebuild
@@ -1,10 +1,12 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI="8"
+
 inherit flag-o-matic toolchain-funcs
 
 MY_P="${P}-MIT"
+
 DESCRIPTION="Migemo library implementation in C"
 HOMEPAGE="https://www.kaoriya.net/software/cmigemo/"
 SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
@@ -14,34 +16,34 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ppc x86"
 IUSE="unicode vim-syntax"
 
-DEPEND=">=app-dicts/migemo-dict-200812[unicode=]
+RDEPEND=">=app-dicts/migemo-dict-200812[unicode=]"
+DEPEND="${RDEPEND}"
+BDEPEND="app-i18n/nkf
 	dev-lang/perl
 	|| (
 		net-misc/curl
 		net-misc/wget
 		www-client/fetch
-	)
-	app-i18n/nkf"
-RDEPEND="${DEPEND}"
-
+	)"
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
-	# Bug #246953
+	# bug #246953
 	"${FILESDIR}"/${P}-gentoo.patch
 	"${FILESDIR}"/${P}-ldflags.patch
 )
+DOCS=( doc/{README_j,TODO_j,vimigemo}.txt )
 
 src_prepare() {
 	default
 
 	touch dict/SKK-JISYO.L || die
-	if use unicode ; then
-		sed -i -e "/gcc:/s/euc-jp/utf-8/" dict/dict.mak || die
+	if use unicode; then
+		sed -i "/gcc:/s/euc-jp/utf-8/" dict/dict.mak || die
 	fi
 
-	# Bug #255813
-	sed -i -e "/^docdir/s:/doc/migemo:/share/doc/${PF}:" compile/config.mk.in || die
+	# bug #255813
+	sed -i "/^docdir/s:/doc/migemo:/share/doc/${PF}:" compile/config.mk.in || die
 }
 
 src_compile() {
@@ -57,24 +59,23 @@ src_compile() {
 src_install() {
 	# parallel make b0rked
 	emake -j1 \
-		prefix="${D}/usr" \
-		libdir="${D}/usr/$(get_libdir)" \
+		prefix="${ED}/usr" \
+		libdir="${ED}/usr/$(get_libdir)" \
 		gcc-install
+	einstalldocs
 
 	local encoding
-	if use unicode ; then
+	if use unicode; then
 		encoding="utf-8"
 	else
 		encoding="euc-jp"
 	fi
 
-	mv "${D}/usr/share/migemo/${encoding}/"*.dat "${D}/usr/share/migemo/" || die
-	rm -rf "${D}/usr/share/migemo/"{cp932,euc-jp,utf-8} || die
+	mv "${ED}"/usr/share/migemo/${encoding}/*.dat "${ED}"/usr/share/migemo || die
+	rm -rf "${ED}"/usr/share/migemo/{cp932,euc-jp,utf-8}
 
-	if use vim-syntax ; then
+	if use vim-syntax; then
 		insinto /usr/share/vim/vimfiles/plugin
 		doins tools/migemo.vim
 	fi
-
-	dodoc doc/{README_j,TODO_j,vimigemo}.txt
 }


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

end of thread, other threads:[~2024-04-28  6:16 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-04-28  6:16 [gentoo-commits] repo/gentoo:master commit in: app-text/cmigemo/ Akinori Hattori
  -- strict thread matches above, loose matches on Subject: below --
2024-04-28  6:16 Akinori Hattori
2024-04-28  6:16 Akinori Hattori
2018-12-11  9:24 Mikle Kolyada
2018-12-08  9:36 Sergei Trofimovich
2018-08-26  8:59 Michał Górny
2018-08-19 22:52 Patrice Clement

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