summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManuel Rüger <mrueg@gentoo.org>2014-04-18 17:25:29 +0000
committerManuel Rüger <mrueg@gentoo.org>2014-04-18 17:25:29 +0000
commit8852370e4110db9b82f82e4b9b227f99e30ef4d3 (patch)
treec9aa8d015638b9cc395a3fd06536c7c0462c0230 /app-text/migemo
parentRemove stray comments from middle of multilib mask, update note on unmasking. (diff)
downloadhistorical-8852370e4110db9b82f82e4b9b227f99e30ef4d3.tar.gz
historical-8852370e4110db9b82f82e4b9b227f99e30ef4d3.tar.bz2
historical-8852370e4110db9b82f82e4b9b227f99e30ef4d3.zip
Cleanup pmasked ruby18-only versions. See bug #434064
Package-Manager: portage-2.2.10/cvs/Linux x86_64
Diffstat (limited to 'app-text/migemo')
-rw-r--r--app-text/migemo/ChangeLog7
-rw-r--r--app-text/migemo/Manifest21
-rw-r--r--app-text/migemo/files/migemo-0.40-ruby-ng.patch88
-rw-r--r--app-text/migemo/files/migemo-0.40-without-emacs.patch11
-rw-r--r--app-text/migemo/migemo-0.40-r4.ebuild64
-rw-r--r--app-text/migemo/migemo-0.40-r5.ebuild69
6 files changed, 7 insertions, 253 deletions
diff --git a/app-text/migemo/ChangeLog b/app-text/migemo/ChangeLog
index df653980814a..dccd8f648cc9 100644
--- a/app-text/migemo/ChangeLog
+++ b/app-text/migemo/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for app-text/migemo
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/migemo/ChangeLog,v 1.47 2014/03/11 23:11:39 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/migemo/ChangeLog,v 1.48 2014/04/18 17:25:26 mrueg Exp $
+
+ 18 Apr 2014; Manuel Rüger <mrueg@gentoo.org> -files/migemo-0.40-ruby-ng.patch,
+ -files/migemo-0.40-without-emacs.patch, -migemo-0.40-r4.ebuild,
+ -migemo-0.40-r5.ebuild:
+ Cleanup pmasked ruby18-only versions. See bug #434064
11 Mar 2014; Chema Alonso <nimiux@gentoo.org> migemo-0.40_p2.ebuild:
Stable for amd64 wrt bug #493028
diff --git a/app-text/migemo/Manifest b/app-text/migemo/Manifest
index 6e38fbd45d54..c3750977fdb9 100644
--- a/app-text/migemo/Manifest
+++ b/app-text/migemo/Manifest
@@ -1,26 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
AUX 50migemo-gentoo.el 38 SHA256 f34ea07a3270a25cce3430e4781df47d9903052c9f3a4ea24efb64b1e63bd115 SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5 WHIRLPOOL cc5e2fd5081f5fb0018e1fa461c0802c7c90891accc55c02c2935dd3d413c5f8941e918af9341040526b037be4c34dab26008dfca91c153c11fca41338f77c14
AUX migemo-0.40-r5-without-emacs.patch 529 SHA256 0db5ac9d4f9da5ca77e480f4ef47be3281b8db4382c76c1116eded819675c165 SHA512 0bdd19be142a670cb3447c14e62ef82a521f7e3b7d4e3b7b89cab34b54730b150b5abf059320478edcce5d5b6d8c6e2b901e52f69dd7f1de380655ad3f8a9f1b WHIRLPOOL ebd8c5f9856c83e392f135b207915e18c58016c5747c43f5c8668dfb390bc42e697595f7ff3db8a7d3071ded529a468d58e17b8330116ed9b2495056dbcde315
-AUX migemo-0.40-ruby-ng.patch 3655 SHA256 656258ccda15019005b191327aa11ec839bc24fdc299f6351d7fa2738f5382da SHA512 1b1b5f5131db480aa572b34c3b8939c664f65e23f30df93aa813d33c6b38a0d76633be93352023e4e3c75b5b2792b64f3fd212d3757c13013810d1e187f7d8f1 WHIRLPOOL 376eb9aff4fe4b90d8dc98b6cdbc096b8428faf4cd6c7cab507707f22d11b3dc1d78b4095cbc0848a629acfb2a627f56d6f35181b5b4defd5f544d0e9a347133
-AUX migemo-0.40-without-emacs.patch 374 SHA256 013da8dd7f65754199f29619e7306504c72d8ce252b00952b0db3957c7ba1bc7 SHA512 b50446d3c43c987af1d043d0f180d58e70f6559772b2bc1ce2a03b484936ed55a4b678d43ea1871bbb629921a1b4de4e8faa5064dc9746f6fd71422838b4a56f WHIRLPOOL 26fcc102cbc0814f610131f1952b8fb2f291e0afa6018319944a1fa44d4bff7566680342661ffcb2dd7bff993570c746a642b45082aa376c9a9599d14d76b62d
AUX migemo-0.40_p2-ruby-ng.patch 3625 SHA256 dbd99bc24d9d50b824661511bd98e82d3c16409b300db81af1af7ba2af7eece3 SHA512 cba98b17d9cf3cdbe34d358fd4b74d0766f3090a918854d41c388bcb1eb115448d46f62c71e43fa89972b920533eab6a48f3dcfdae362646d6d8061e361a9b00 WHIRLPOOL 942959b5fedc45bd572e600cc29ac0d7ea0c14ff32f8eb913a52a7526cf3d167bcda29ba726c585549ba9628315a576b064663089ba8394666e5a0457bc5c873
DIST 0.40p2.tar.gz 1739558 SHA256 c599d94c3889efffebd482d9dcd0d2cd11abf810dee78a2d2318e5f32911b398 SHA512 97cc770bcdf39c286da6bdd6b939a87855de791a43805c9f0dbc44bb8f03a16ca549b8bb96f5e0dfd065f29bd38ffaf7f7928366015a60d92fb43462db36db15 WHIRLPOOL 5fe2ff8b8ae6af60bcfb60fe64d3013f1ab724721b786cc169c7736c2f734a863fafa53c583b03cb59a1552b6763f251427cf407957f79e5325d6edb7aba03ef
-DIST migemo-0.40.tar.gz 1674941 SHA256 89c2125e903edf6f6fe035137eceef79382fce43783e5da240fc4a34b0878934 SHA512 8ba4960361035fc570bef533724c82b20fbc2384aa69469bf79791c00732643423aa6725717e4e518e461f9313101f0f2c49ad93dd007984699ad94cb92959ea WHIRLPOOL e9d0a9e67f01a896e8d773e5b813ade22df8272805915383875a953bf18b93102387c17d204a60e77c7bb3ec3a373ec302cb55cf8331149776b3673ef5fe500c
-EBUILD migemo-0.40-r4.ebuild 1455 SHA256 cb3f2c6fe8f20f0cdf256ad953f4f91af89c45804ad80ba476749783768da799 SHA512 6a69aa037562bff0b049670a16f4cf775892a12cfbda5477df983cb27fb9cf12211b88783cdd6d45abd37514adc82909709c41ae0490a49c88f25ca8332f3c3d WHIRLPOOL 3a45b6bfbe82a64a0143b8e90c03fca434dcb87b0ff488365630542258bf88dd5b2f865ce990535b0075b85d980b91b49f4444b4451c7a1488240d02bb1c5ac0
-EBUILD migemo-0.40-r5.ebuild 1622 SHA256 707fc68f1433a9183b74c27dc71b02532ef234cac2471016178002a18c500ce4 SHA512 169a08384171b8239847419704434ed59c69c0054bc8c57e61c9e4255072868bd022a1cce8b5382ca9d59b6d6fb4905f5e12342df81031e957422c97a44ff7a8 WHIRLPOOL 0cbf2dcc38517af7a40d8604f019c2557dde9b6fdc2c10b20f7e1535225616f28d67addbd6e4884946322ea92a514aafa9c91e98dbdcb302d6fd96609f72dd6f
EBUILD migemo-0.40_p2.ebuild 1703 SHA256 f55d53b03c5cffa58a99b2757e762c4215092bd39a15c330beaa1dec2de91ea6 SHA512 a08e519ff4c8be56010b60970f4a872eeb0dfd33051eae42db43c5fcd717226d9ddfebee0d7b1f6176276288e3f239706d58f83df753cf599d9646ba5ed79d74 WHIRLPOOL 16cc8fafb1d6abb5062e186e12bb825b5fce78891d646dc0e382fd9ebfa4e2b6a7787aac9134a3ad0f55aa657f99ff9a3a6d90c717fdf5c25205e5f91c909c62
-MISC ChangeLog 6063 SHA256 9b4816c0a6698b67fb2b421b74bf7a55212e784164990ca1c51581ef3774cf11 SHA512 6e5e8619fbf28e97fc3de18d3efac904fa48f8bc4601356c600fe3988c299084d459ef448541c35bb2aa6cb163f87d7dda721eab8ca4c934d87d4a7fe99fffee WHIRLPOOL 118853a13c8750f8acf418b941ea2779ca9bdb302aee9d757be3b32f475027410fd8356723078351f0e7120af4a15202e72d82140e79becd0f558bbb34478427
+MISC ChangeLog 6293 SHA256 feb845adf363fb0c97e7f45dc73fa2926dcb6ad81c5e1dac1b64195a5e7e6d8b SHA512 a2233da7de9cec40b6a559912335cf5024e97cab21e5cbc9dca927b21d37dd23f5348aa7616d64048d760cbdb50cf3b5444256090c2c921b0f574c074dd24c8c WHIRLPOOL fce960d7ac53c946bd3875075b9e1f858a8af190ba95eb1254daf939254c3d1540e02e56a0c4aff2455975d1cdaaa8962143d62be27f22142fa1c09d59a03762
MISC metadata.xml 157 SHA256 c3c089740b31ec0f4d7fbc3bf2d6bb8460ccfd0694f01bf91b22a2e1930d6d5d SHA512 eaa4f0b5e4f9173245bcb2158d56335c959e2b15571f9992efdcd89ab2375a771f6d06a8bde9aba369489bfe15c123abc2745ed93b7c3fd04af29b7262367040 WHIRLPOOL a5d0d7ac8ce5fe93f1a64440cb3cdb943c30d8deaa5a19e90d24917411bcb69c89d6f56bf5c84bb2604b42d9fd4211905c5c0d1f1710b936b41443b302cbff2c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQEcBAEBCAAGBQJTH5hiAAoJEA2sAkrWKOU2+0QH/Ar+/476uJd1Rzbs5jqwN3CB
-KY+qj7+8/EhU1jT2B1a3+9G/LzsFJuqv6gRH0YlkQQ0CZNF4WWyM0GWexBSC8Hk8
-WNRIchJaoB1n3MdFepYTMDAiuj5xHBQtF+11ZN3ev1NjR7ECPCd6Fo0uhb3Styaq
-IqVkIbWGiUn2wSENjaRGls3QsAS0HiBndPbVJCy+FnJEL7Gm2CAQHtQoiTUzrox1
-iTKtUytk5Vb2Y1vZ9+D2i223KDmn8Bvd3dpDXgMRg/gZqboNPc5VH8uooS/UGoX0
-cNyX8Y8+i3zGvEHOY2rOo4LHbUV/nsvuwcA8SCc75JN1pt/eMcplNATN/AaWExQ=
-=gX0Q
------END PGP SIGNATURE-----
diff --git a/app-text/migemo/files/migemo-0.40-ruby-ng.patch b/app-text/migemo/files/migemo-0.40-ruby-ng.patch
deleted file mode 100644
index c242493dcd97..000000000000
--- a/app-text/migemo/files/migemo-0.40-ruby-ng.patch
+++ /dev/null
@@ -1,88 +0,0 @@
---- _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) -Eeuc-jp -I. migemo-convert.rb SKK-JISYO.L > $@
-
- migemo-dict.idx: migemo-dict
-- ruby -I. migemo-index.rb migemo-dict > migemo-dict.idx
-+ $(RUBY) -Eeuc-jp -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) -Eeuc-jp -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) -Eeuc-jp -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 -e 'require "bsearch"; exit(if Bsearch::VERSION::STRING >= "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) -Eeuc-jp -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) -Eeuc-jp -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) -Eeuc-jp -ne 'chomp!;1.upto($$_.length) do |x| puts $$_[0,x] end';\
-+ done | $(RUBY) -Eeuc-jp -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/files/migemo-0.40-without-emacs.patch b/app-text/migemo/files/migemo-0.40-without-emacs.patch
deleted file mode 100644
index 39e965c62307..000000000000
--- a/app-text/migemo/files/migemo-0.40-without-emacs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- migemo-0.40-orig/configure 2003-05-28 14:19:38.000000000 +0200
-+++ migemo-0.40/configure 2007-12-21 07:38:21.000000000 +0100
-@@ -825,7 +825,7 @@
- withval="$with_emacs"
- case "${withval}" in
- yes) EMACS= ;;
-- no) { echo "configure: error: emacs is not available" 1>&2; exit 1; } ;;
-+ no) EMACS=no ;;
- *) EMACS=${withval} ;;
- esac
- else
diff --git a/app-text/migemo/migemo-0.40-r4.ebuild b/app-text/migemo/migemo-0.40-r4.ebuild
deleted file mode 100644
index 5a28705b6154..000000000000
--- a/app-text/migemo/migemo-0.40-r4.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/migemo/migemo-0.40-r4.ebuild,v 1.9 2012/12/11 15:53:35 jer Exp $
-
-EAPI=2
-
-inherit elisp-common eutils
-
-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"
-
-DEPEND="dev-lang/ruby
- dev-ruby/ruby-romkan
- dev-ruby/bsearch
- app-dicts/migemo-dict[-unicode]
- emacs? ( virtual/emacs
- app-emacs/apel )"
-RDEPEND="${DEPEND}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_prepare() {
- cp "${ROOT}"/usr/share/migemo/migemo-dict .
- epatch "${FILESDIR}/${P}-without-emacs.patch"
-}
-
-src_configure() {
- econf $(use_with emacs) --with-lispdir="${SITELISP}/${PN}"
-}
-
-src_compile() {
- emake -j1 || die
-}
-
-src_install() {
- emake -j1 DESTDIR="${D}" \
- $(use emacs || echo "lispdir=") install || die
-
- rm "${D}"/usr/share/migemo/migemo-dict
-
- if use emacs; then
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
- 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
-}
diff --git a/app-text/migemo/migemo-0.40-r5.ebuild b/app-text/migemo/migemo-0.40-r5.ebuild
deleted file mode 100644
index 4e0aea7fde2c..000000000000
--- a/app-text/migemo/migemo-0.40-r5.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2013 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.11 2013/02/21 13:19:44 ago 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/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
-}