Fixed install directory issue, bug #320617. The patch was submitted by Tomoh K. Clean up.

Package-Manager: portage-2.1.10.22/cvs/Linux x86_64

diff --git a/app-text/migemo/ChangeLog b/app-text/migemo/ChangeLog
index 3e9aa285db6ff1fbe001567b781c4c0fa91f7116..8168b6a735c5f7938de18ddcfe42133595cf04f2 100644 (file)
--- a/app-text/migemo/ChangeLog
+++ b/app-text/migemo/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/migemo
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/migemo/ChangeLog,v 1.31 2010/11/29 21:31:03 fauli Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/migemo/ChangeLog,v 1.32 2011/10/12 17:05:30 matsuu Exp $
+
+*migemo-0.40-r5 (12 Oct 2011)
+
+  12 Oct 2011; MATSUU Takuto <matsuu@gentoo.org> +migemo-0.40-r5.ebuild,
+  +files/migemo-0.40-r5-without-emacs.patch, +files/migemo-0.40-ruby-ng.patch:
+  Fixed install directory issue, bug #320617. The patch was submitted by Tomoh
+  K. Clean up.
 
   29 Nov 2010; Christian Faulhammer <fauli@gentoo.org> metadata.xml:
   Drop from emacs herd

diff --git a/app-text/migemo/Manifest b/app-text/migemo/Manifest
index 518eb65a56068edbfab0f3a12e75c0731b5b6799..295a3e5639592907df42811f0d470e90c07b4f80 100644 (file)
--- a/app-text/migemo/Manifest
+++ b/app-text/migemo/Manifest
@@ -2,15 +2,28 @@
 Hash: SHA1
 
 AUX 50migemo-gentoo.el 38 RMD160 93ecb185b2729f847b6b34bbb1dd96a207510df2 SHA1 4363c907b30fe150f1d4de4be733f943256a0b82 SHA256 f34ea07a3270a25cce3430e4781df47d9903052c9f3a4ea24efb64b1e63bd115
+AUX migemo-0.40-r5-without-emacs.patch 529 RMD160 893ae0d3b19e0c8cc41b43b0e354c25109f279cb SHA1 fecf6ebb3d39d48e0eb841be3aae9130cb5470a8 SHA256 0db5ac9d4f9da5ca77e480f4ef47be3281b8db4382c76c1116eded819675c165
+AUX migemo-0.40-ruby-ng.patch 3566 RMD160 dc15b51a66dc5e84cee064e91ac604e5da8cd1e8 SHA1 89cb0f11514688ca3fb81a8a1f5241fa1df11d9e SHA256 8eceb3cfec2fcaa5a078380ff39338be1d8b538a8a34974c3aa5adf638cb053c
 AUX migemo-0.40-without-emacs.patch 374 RMD160 2d60e165eb107a0015ea8a97070df0999a2e9ff3 SHA1 50d0adeb50316159c03f9d7603b0b4c59828b590 SHA256 013da8dd7f65754199f29619e7306504c72d8ce252b00952b0db3957c7ba1bc7
 DIST migemo-0.40.tar.gz 1674941 RMD160 6663ac89abc89e4c568c44a71e8ae1f016920df0 SHA1 0c7f066c4c271a8e2556ea9d9cc850c650eaebc8 SHA256 89c2125e903edf6f6fe035137eceef79382fce43783e5da240fc4a34b0878934
 EBUILD migemo-0.40-r4.ebuild 1460 RMD160 3f08eec4c45d86d4dc10a1402b0a69303301ff7e SHA1 defbddaf735bce24ecd37936a5578e08ab3178a8 SHA256 a761cae9038fc1ecf7734758fee0874b44e0d17ab1e9e19003879b701eb4e67f
-MISC ChangeLog 3967 RMD160 faa5cf35646f59628bbb75a7c37928b3527201b7 SHA1 d872034c123a0ffd48c91676c2092d4e61ad8144 SHA256 74b9af1f37e42e0146c224a3ae908a0552cc5dcc52407caa6d6208fb77fb0063
+EBUILD migemo-0.40-r5.ebuild 1637 RMD160 2497982e95f32c4d40a513f4e665cd8668484845 SHA1 c3134bb88be59815771e229fcb90e47170c0d8ad SHA256 38dd1679d0c69a2e532586ff7ba9a1ea0bdbd2c93b869a0c5a80b05bf351d9f4
+MISC ChangeLog 4246 RMD160 5fdde3ec50afd9b60e0f99dae2e0cf813a2a1da1 SHA1 e9472e9c3907db0c3d25ccc06d71e5ff1c247e1e SHA256 0a2a067752c28752c9fae89d1158ac72c338e9a65a04ac91d1873cade8c2ba48
 MISC metadata.xml 157 RMD160 1305e8c09c6d49c0db2a18bb50b045460c124ebe SHA1 874689ae30dfe223d487e0e6a5e0a0dbf06a69f4 SHA256 c3c089740b31ec0f4d7fbc3bf2d6bb8460ccfd0694f01bf91b22a2e1930d6d5d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAkz0G/cACgkQNQqtfCuFneM4ZQCeLxK33mr8t6JPenzKRvT2Vp5q
-3k4AoIWgQPcx4CSv7n1NeWF0wqFmCKng
-=um4c
+iQIcBAEBAgAGBQJOlcjfAAoJECaGw+YFKA1pFDwP/0aWUhiIDU+VmfLCAp1wHuqP
+18aW+B2/D6NP9IWJlys6+/DNp/WieC9KfEaKGj7onaWoM/mX9GpPHHaRYViJK6Lm
+qsSG0pgXBGPhxmcSaUyKoyJBPu3S80MEqhHqJc3HkvHE0Df8kqw0mf00zTaMZYvO
+NYaLP5FuLE3nMU3ioSkueA4QGEBTMJKaWKUpGqTN1QglRx2NEUZi1klORBmnJnVm
++K6+IGnFfKy0pExMjZyTPVb2hgT78F2uitlocWV6TfdIFpu+qFvZ23sz5Z61FrPx
+lj2ur138GJAEOlmU1egR+SIbGCR//9fkYJlqYRZPWeSzD2RyIR9mwTELfxN0sJ59
+0+nsA5gKdF5N1jREzvlUPphPL+yiZbPOqkIRN0MgblLzrak+R/itA76ONE4ovKyQ
+s9/iUKlYxUaOMaaLqNjcUzfMx2m01J/6UZhxSmaRy4FekRlTtwU8YIX47foPCoKL
++PuMEsvHL0M7pPqkN42Gn7o9xMD9M+CcTaML7AdfkijfvwlxsjDmsik9Skuq64dO
+TTrgDKp6G2fqeY0tPz/JUcpxBvtK4suru8jzQDNaW3dOozgkcjnp1XK0T00C9vPV
+oKydWrJ/Oncl3kVApe6mbNkbsBTyg/bqUfoFfKp5KlU1wP8QDTyfKVCBg4Lgxnrn
+Urz6t4UwZfbnIqN47kE/
+=cxCG
 -----END PGP SIGNATURE-----

diff --git a/app-text/migemo/files/migemo-0.40-r5-without-emacs.patch b/app-text/migemo/files/migemo-0.40-r5-without-emacs.patch
new file mode 100644 (file)
index 0000000..6402d7c
--- /dev/null
+++ b/app-text/migemo/files/migemo-0.40-r5-without-emacs.patch
@@ -0,0 +1,12 @@
+diff -Naurb migemo-0.40.orig/acinclude.m4 migemo-0.40/acinclude.m4
+--- migemo-0.40.orig/acinclude.m4      2001-07-10 13:35:18.000000000 +0900
++++ migemo-0.40/acinclude.m4   2011-10-12 02:03:28.428140601 +0900
+@@ -23,7 +23,7 @@
+     [  --with-emacs=EMACS      compile with EMACS [EMACS=emacs, xemacs...]],
+     [case "${withval}" in
+        yes)   EMACS= ;;
+-       no)    AC_MSG_ERROR([emacs is not available]) ;;
++       no)    EMACS=no ;;
+        *)     EMACS=${withval} ;;
+      esac], EMACS=)
+   if test "x$EMACS" = "xt" -o "x$EMACS" = x; then

diff --git a/app-text/migemo/files/migemo-0.40-ruby-ng.patch b/app-text/migemo/files/migemo-0.40-ruby-ng.patch
new file mode 100644 (file)
index 0000000..381049b
--- /dev/null
+++ b/app-text/migemo/files/migemo-0.40-ruby-ng.patch
@@ -0,0 +1,88 @@
+--- _migemo-0.40/Makefile.am   2003-05-28 21:14:04.000000000 +0900
++++ migemo-0.40/Makefile.am    2011-10-10 18:15:11.119113986 +0900
+@@ -15,17 +15,17 @@
+       sed -e 's!@pkgdatadir@!$(pkgdatadir)!g' migemo.el.in > $@
+ 
+ migemo-dict: # SKK-JISYO.L
+-      ruby -I. migemo-convert.rb SKK-JISYO.L > $@
++      $(RUBY) -I. migemo-convert.rb SKK-JISYO.L > $@
+ 
+ migemo-dict.idx: migemo-dict
+-      ruby -I. migemo-index.rb migemo-dict > migemo-dict.idx
++      $(RUBY) -I. migemo-index.rb migemo-dict > migemo-dict.idx
+ 
+ migemo-dict.cache: frequent-chars migemo-dict migemo-dict.idx
+-      sort frequent-chars | ruby -I. migemo-cache.rb migemo-dict
++      sort frequent-chars | $(RUBY) -I. migemo-cache.rb migemo-dict
+ 
+ frequent-chars: genchars.sh migemo-dict
+-      sh genchars.sh > tmp.list1
+-      cat tmp.list1 | ruby -rromkan -ne 'puts $$_.to_kunrei' > tmp.list2
++      RUBY=$(RUBY) sh genchars.sh > tmp.list1
++      cat tmp.list1 | $(RUBY) -rromkan -ne 'puts $$_.to_kunrei' > tmp.list2
+       cat tmp.list1 tmp.list2 | sort | uniq > frequent-chars
+ 
+ clean-local:
+--- _migemo-0.40/acinclude.m4  2001-07-10 13:35:18.000000000 +0900
++++ migemo-0.40/acinclude.m4   2011-10-10 18:15:11.120113973 +0900
+@@ -123,7 +123,7 @@
+   AC_MSG_CHECKING([where .rb files should go])
+   if test "x$rubydir" = x; then
+     changequote(<<, >>)
+-    rubydir=`ruby -rrbconfig -e 'puts Config::CONFIG["sitedir"]'`
++    rubydir=`$RUBY -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]'`
+     changequote([, ])
+   fi
+   AC_MSG_RESULT($rubydir)
+--- _migemo-0.40/configure.in  2003-05-28 21:18:18.000000000 +0900
++++ migemo-0.40/configure.in   2011-10-10 18:15:11.125113911 +0900
+@@ -10,7 +10,7 @@
+ AM_PATH_RUBYDIR
+ 
+ echo -n "checking Ruby/Bsearch... "
+-if ruby -rbsearch -e 'exit(if Bsearch::VERSION >= "1.2" then 0 else 1 end)'; then
++if $RUBY -rbsearch -e 'exit(if Bsearch::VERSION >= "1.2" then 0 else 1 end)'; then
+    echo found
+ else
+    echo not found
+@@ -19,7 +19,7 @@
+ fi
+ 
+ echo -n "checking Ruby/Romkan... "
+-if ruby -rromkan -e 'exit(if Romkan::VERSION >= "0.3" then 0 else 1 end)'; then
++if $RUBY -rromkan -e 'exit(if Romkan::VERSION >= "0.3" then 0 else 1 end)'; then
+    echo found
+ else
+    echo not found
+--- migemo-0.40/tests/Makefile.am      2001-08-14 02:12:57.000000000 +0900
++++ migemo-0.40.patched/tests/Makefile.am      2011-10-10 19:48:44.078942331 +0900
+@@ -5,13 +5,13 @@
+ 
+ 
+ test-dict.idx: test-dict ../migemo-index.rb
+-      ruby -I.. ../migemo-index.rb test-dict > test-dict.idx
++      $(RUBY) -I.. ../migemo-index.rb test-dict > test-dict.idx
+ 
+ test-dict.cache: test-dict test-dict.idx ../migemo-cache.rb
+-      ruby -rromkan -ne 'puts $$1.to_roma if /^(.+?)  /' test-dict |\
++      $(RUBY) -rromkan -ne 'puts $$1.to_roma if /^(.+?)       /' test-dict |\
+       while read line; do\
+-          echo $$line | ruby -ne 'chomp!;1.upto($$_.length) do |x| puts $$_[0,x] end';\
+-      done | ruby -I.. ../migemo-cache.rb test-dict
++          echo $$line | $(RUBY) -ne 'chomp!;1.upto($$_.length) do |x| puts $$_[0,x] end';\
++      done | $(RUBY) -I.. ../migemo-cache.rb test-dict
+ 
+ clean-local:
+       rm -f tmp.*
+--- _migemo-0.40/genchars.sh   2001-08-13 18:30:48.000000000 +0900
++++ migemo-0.40.patched/genchars.sh    2011-10-10 18:15:11.125113911 +0900
+@@ -1,6 +1,8 @@
+ #! /bin/sh
+ 
+-ruby -rromkan -nle 'head = split[0]; if /^\w+$/ =~ head then puts head else roma = head.to_roma; puts roma, roma.to_kunrei end' migemo-dict |uniq> tmp.ascii.words
++RUBY=${RUBY:-ruby}
++
++${RUBY} -rromkan -nle 'head = split[0]; if /^\w+$/ =~ head then puts head else roma = head.to_roma; puts roma, roma.to_kunrei end' migemo-dict |uniq> tmp.ascii.words
+ 
+ # Get the top 500 frequent ngrams.
+ for i in 1 2 3 4 5 6 7 8; do

diff --git a/app-text/migemo/migemo-0.40-r5.ebuild b/app-text/migemo/migemo-0.40-r5.ebuild
new file mode 100644 (file)
index 0000000..cab8643
--- /dev/null
+++ b/app-text/migemo/migemo-0.40-r5.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/migemo/migemo-0.40-r5.ebuild,v 1.1 2011/10/12 17:05:30 matsuu Exp $
+
+EAPI=4
+# ruby19, jruby: dev-ruby/ruby-romkan not work
+USE_RUBY="ruby18 ree18"
+
+inherit autotools elisp-common eutils ruby-ng
+
+DESCRIPTION="Migemo is Japanese Incremental Search Tool"
+HOMEPAGE="http://0xcc.net/migemo/"
+SRC_URI="http://0xcc.net/migemo/stable/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="emacs"
+
+ruby_add_bdepend "dev-ruby/ruby-romkan dev-ruby/ruby-bsearch"
+
+DEPEND="${DEPEND}
+       app-dicts/migemo-dict[-unicode]
+       emacs? ( virtual/emacs
+               app-emacs/apel )"
+RDEPEND="${DEPEND}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+RUBY_PATCHES=(
+       "${FILESDIR}/${PF}-without-emacs.patch"
+       "${FILESDIR}/${P}-ruby-ng.patch"
+)
+
+all_ruby_prepare() {
+       cp "${EPREFIX}"/usr/share/migemo/migemo-dict .
+       eautoreconf
+}
+
+each_ruby_configure() {
+       RUBY="${RUBY}" econf $(use_with emacs) --with-lispdir="${SITELISP}/${PN}"
+}
+
+each_ruby_install() {
+       emake DESTDIR="${D}" \
+               $(use emacs || echo "lispdir=") install
+}
+
+all_ruby_install() {
+       rm "${ED}"/usr/share/migemo/migemo-dict
+
+       if use emacs; then
+               elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+       fi
+       dodoc AUTHORS ChangeLog INSTALL README
+}
+
+pkg_postinst() {
+       if use emacs; then
+               elisp-site-regen
+               elog "Migemo adviced search is no longer enabled as a site default."
+               elog "Add the following line to your ~/.emacs file to enable it:"
+               elog "  (require 'migemo)"
+       fi
+}
+
+pkg_postrm() {
+       use emacs && elisp-site-regen
+}