3 files changed, 124 insertions, 4 deletions
diff --git a/app-i18n/tomoe/ChangeLog b/app-i18n/tomoe/ChangeLog
index b7e3f849955c..d4fde169ac66 100644
--- a/app-i18n/tomoe/ChangeLog
+++ b/app-i18n/tomoe/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-i18n/tomoe
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/tomoe/ChangeLog,v 1.17 2012/06/22 02:13:29 naota Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/tomoe/ChangeLog,v 1.18 2014/12/27 13:24:13 mgorny Exp $
+
+*tomoe-0.6.0-r2 (27 Dec 2014)
+
+  27 Dec 2014; Michał Górny <mgorny@gentoo.org> +tomoe-0.6.0-r2.ebuild:
+  Convert to python-single-r1.
 
   22 Jun 2012; Naohiro Aota <naota@gentoo.org> +files/tomoe-0.6.0-glib232.patch,
   tomoe-0.6.0-r1.ebuild:
@@ -72,4 +77,3 @@
 
   12 Aug 2006; MATSUU Takuto <matsuu@gentoo.org> +tomoe-0.2.1.ebuild:
   Initial ebuild submitted by Olof <olofshopping@hotmail.com>. bug 140117.
-
diff --git a/app-i18n/tomoe/Manifest b/app-i18n/tomoe/Manifest
index 2b3851713dfa..b4ad477f0e5c 100644
--- a/app-i18n/tomoe/Manifest
+++ b/app-i18n/tomoe/Manifest
@@ -1,8 +1,31 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX tomoe-0.6.0-export-symbols.patch 8483 SHA256 7d7c6462e0998fb96828da8358a8d35f0082f875ff6ff6f47a05105aa6ef3308 SHA512 32caa46e10d2c1885e7d850f7ecb3ac79a4754156100e4db68e87f1614b0d9db71fde6af9d8520f337143bf2a3e6f3fe1f6e7e83f1c066552238a2a2c3d3bba5 WHIRLPOOL 837751133e8b96c73ebc8bb35e8a96cc8649805242777dabdb2ffa72895b2829182007c07f827d48249b5bffbde79705599dce76b045d8d23303d372ca37f1bf
 AUX tomoe-0.6.0-glib232.patch 935 SHA256 fab62803fceffdd843971d261004d53ae483d7ab1d709e25f948d74067ae02a0 SHA512 f79f6ccbf9e6701c56222ceae7a60071c11b98f0bc2a256657700c0a7d783f7057e761d3cd73b6bb9b1b59235af06a25955c17ebff5f25d092bf92b59c09b13e WHIRLPOOL b95c91dd31c46b87ca9cda5208bc5c9d0db5ff8b962bddb853bb5fead545af07cb9b25f312326d07382dd0e573819761293810df6bf4a58171befb0f6589fab4
 AUX tomoe-0.6.0-ldflags.patch 977 SHA256 088ebcb0b7d870d463ca4da0d3f46d242af448da806c405623272507dc54255f SHA512 7a7738feba438ecd5731f1d39b136ccfb32ab7a45759a8e1e2808e632c1b16f424b968a4d44da03ae65d3861b72d9ff5ab2059c3e327c316949f29331ece4578 WHIRLPOOL 1979b1bccc064232602951c803491173274bbf007b519f82a603f2be26585578720110e0b283eb646a790befc38d3aab1a09888725fda0288d6a3558be949d4e
 DIST tomoe-0.6.0.tar.gz 4918949 SHA256 ee600f97fa434c13f6c41a1db9e03eccd551151ed48ece9c56cd9e828228ea1e SHA512 eab618d7b28fc9613c175fab6f80fc7d6acc34af3a47f20c11b42a32acd87143ae10caca67fa1a5e2e75441d431799a5725a5d507604f8bd7447bbc1826f0bb8 WHIRLPOOL f3cfb9bf09ab7228913a001348a73ea32d8f4cb25c941c5dd4829c237d0043f92293e2f914257902c1a5faf93d61fa82dfbea269d6b6d60cad49638cc6ca0141
 EBUILD tomoe-0.6.0-r1.ebuild 2027 SHA256 559499538f935aeff2ba691a57ab7208bef52f59ed812c069e78f511d9a2f105 SHA512 4cc234d149ede7d0d89c99359d495235a573627525e2f7a959312e7e6f03bb38856cb140a6fec8495aff46a79d4cd3ed823a9e729455b9b84b6097a8e29d53fc WHIRLPOOL 4ff5df3a5a0f4621a43bf83f5c23447364c91a258c7fe3a9be2a4bfd49b508450c9a25f92a4fb07ede3ff15cbc3ff7ab42103510a45afdcba4effc331214c7a2
+EBUILD tomoe-0.6.0-r2.ebuild 2152 SHA256 b2b4cae4a207efc1c85078d2bc91c05aac105b28ad1bd0c53d3aa916bdf5a68a SHA512 70fd19137ec237072166287fc9864e0bf528c8df3c7e8c9d5cf1ad0d0889edb084d972bea83cc7879889f872680574f4427c486924e29c4f2346213496a042cd WHIRLPOOL 1e5fe5fa7de1ea92ca93abe5b21cef85027451ed9670a5a9f9520c703fbcb7caaeeee9b4314e9162a1fca06e7f2769b61c720666c8834c738213c6f82a7b2b09
 EBUILD tomoe-0.6.0.ebuild 1030 SHA256 b99a3f4254739c57f8a5fd34d4c1cc56aa0503f1eb09fe9baf5d1b26a5f2f1c5 SHA512 2a791790da6d415d0138d3cbff8573cd4f5fc5b2fd4d32fa5edf7ccfa1a895b6bf4e1126ffbed36a05d2854ddf8cfa3ab17513fd0d276ba18ef7b2b47db762fd WHIRLPOOL a588cfb6cb54f85f3d7a6dd952e42075309ba1e80a033a571881d93e7d5985b219c74b36c011cfe8df6c40f6f6cff182c4fa949344f98eba8189aa9dec6a371d
-MISC ChangeLog 2525 SHA256 fe45f4c1caac92261a3c4e52c8403d98a8a6f788afb30d668d856e8d1168516f SHA512 beecd5c04535ddaea33c2d4792423755f2e3bf6208c7762352c3ce968bcb7de6e5ab32ebaf325891876cbb33cb0e4fd2b7fe4cb021e08fd48d9b29ea1e7b47cd WHIRLPOOL bba39930f4e342c8f3282c38855916d08c72cceabe6674d2e51ae8c64be1e22d692ece842eaa75295f199fedd2426867e5099b8fd090bb1a0d4c56a48d9f81b8
+MISC ChangeLog 2662 SHA256 e63e46b164b1d4fd32aa63ef60fbd28ca132a197372dcae120f6d95eb8999ca8 SHA512 bfd86492bbce7812e9a6bf2763964851d37dc1835527bf58229444699f4af8ed9a8f0b0d40704d2fb30363c8cfe9ebb8ba3eb348119eb331833de431e102c72e WHIRLPOOL 2490007947696ed4fc80135cfea6707d7687d19c407c3ca57c85f13eeeeb6e5d691592bf2bdff926f8daeefd8e01fbb0d9bd5be92f4092fd27a81ac33a27946e
 MISC metadata.xml 262 SHA256 636fb99d93f0677bcea4b14829bbba99a7301cff0b373c6b742ffdce02534e9c SHA512 6f348e6e282ddb8374a315e136dd77138542737259eefd52fe30763c996225c946e51c4d00c5cbf6ffa3b756245f7245c046e1b6c176a9d8c5c11f0530b0eca5 WHIRLPOOL 41dd5b39769227da022d0b1bb93f57c596aa778acea5c01e2beea1c221e64cde13733fd09f1415a531f909ce8dd4ffa423878472b5d3fe344d25ac45a0c209cf
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQJ8BAEBCABmBQJUnrL+XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOZYgQAMdZcE+tIjxInR5eXMD/Aq39
+IPm3PGu/O13iBgb1L+7kGauRum3m040dvkBAvQYSaUMhJ5LXrCESfDIZfycDMuKm
+skZGCTHjgLp6C0b+ptE9Be1NC1vsN/FW7TqE+XgmbVEkYESec9jE/uY/bbwaD2fk
+QA995rNvbXCNybjs5E9a2n6glmh3UZ/81XW+7DdHdepGRJf9BEMBHS9PrZhaXupX
+6WqrNoLCp4BoRVC6z5xyvQyQ/yuqUeaDmByqGDj4VjrN342i9sQswB0fPvPP7lBo
+CwAhHFcyBAs7gGGFWBJZFQpGdazcJHjGCHOBz92jyFX2dbSZSi6CWrbg1DqvZnDY
+zRQin7V//sJpJQ5f1gFN27Fk2R1CgLKcOTIN7sYb4KyuW4udnYTgzHxj78hdt53M
+ZkCmfUJv5jMc0y/aIHywNTb7v8TmvKLBxdFobEH/VE2+H6L7q6/o3aEYcyaiWFRn
+MLgDVcc1KpcppNIuFsarHfcoUIokb34igbEmH4j7aTFVAquzElKu91m8vw+6xIR9
+g7SnyKwf8lGoPGZwGqxSDldJDwzEqXfHRebjRy9QwHqB04d/Dge2THtBkKBdpZjw
+Q7BDUSxBJ3l84nqgu7TCqXAFjb0aSPOKeEthuvft+FY2kS+5e6sA+CqGvU8rYdEg
+M/xOyPH1c2m0nPsRokpI
+=cmRO
+-----END PGP SIGNATURE-----
diff --git a/app-i18n/tomoe/tomoe-0.6.0-r2.ebuild b/app-i18n/tomoe/tomoe-0.6.0-r2.ebuild
new file mode 100644
index 000000000000..f4d1c434dcc3
--- /dev/null
+++ b/app-i18n/tomoe/tomoe-0.6.0-r2.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/tomoe/tomoe-0.6.0-r2.ebuild,v 1.1 2014/12/27 13:24:13 mgorny Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit autotools eutils multilib python-single-r1
+
+DESCRIPTION="Japanese handwriting recognition engine"
+HOMEPAGE="http://tomoe.sourceforge.jp/"
+SRC_URI="mirror://sourceforge/tomoe/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc hyperestraier mysql ruby python static-libs subversion"
+
+RDEPEND=">=dev-libs/glib-2.4
+	ruby? ( dev-ruby/ruby-glib2 )
+	hyperestraier? ( app-text/hyperestraier )
+	subversion? (
+		>=dev-libs/apr-1
+		dev-vcs/subversion
+	)
+	mysql? ( dev-db/mysql )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pygobject:2[${PYTHON_USEDEP}]
+		dev-python/pygtk:2[${PYTHON_USEDEP}]
+	)"
+#	test? ( app-dicts/uconv )
+
+DEPEND="${DEPEND}
+	dev-util/gtk-doc-am
+	dev-util/intltool
+	virtual/pkgconfig
+	doc? ( dev-util/gtk-doc )"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RESTRICT="test"
+
+pkg_setup() {
+	if use python ; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/${P}-export-symbols.patch" \
+		"${FILESDIR}/${P}-ldflags.patch" \
+		"${FILESDIR}/${P}-glib232.patch"
+
+	if ! use hyperestraier ; then
+		sed -i -e "s/use_est=yes/use_est=no/" configure.ac || die
+	fi
+	if ! use mysql ; then
+		sed -i -e "s/use_mysql=yes/use_mysql=no/" configure.ac || die
+	fi
+	if ! use subversion ; then
+		sed -i -e "s/use_svn=yes/use_svn=no/" macros/svn.m4 || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	# --with-python b0rked hard
+	local -x PYTHON
+	use python || myconf="${myconf} --without-python"
+
+	econf \
+		$(use_enable doc gtk-doc) \
+		$(use_with ruby) \
+		$(use_enable static-libs static) \
+		$(use_enable ruby dict-ruby) \
+		${myconf} || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	find "${ED}/usr/$(get_libdir)/tomoe" \( -name '*.la' -o -name '*.a' \) -type f -delete || die
+	if ! use static-libs ; then
+		find "${ED}" -name '*.la' -type f -delete || die
+	fi
+
+	dodoc AUTHORS ChangeLog NEWS TODO || die
+}