version bump wrt #468970

(Portage version: 2.2.0_alpha176/cvs/Linux x86_64, signed Manifest commit with key F8551514)

4 files changed, 108 insertions, 4 deletions

diff --git a/app-i18n/librime/files/librime-dictionary.patch b/app-i18n/librime/files/librime-dictionary.patch
new file mode 100644
index 000000000000..b8ce53f3992e
--- /dev/null
+++ b/app-i18n/librime/files/librime-dictionary.patch
@@ -0,0 +1,13 @@
+diff --git a/data/test/dictionary_test.dict.yaml b/data/test/dictionary_test.dict.yaml
+index c0b6d65..7e362b1 100644
+--- a/data/test/dictionary_test.dict.yaml
++++ b/data/test/dictionary_test.dict.yaml
+@@ -5,7 +5,7 @@
+ # http://android.git.kernel.org/?p=platform/packages/inputmethods/PinyinIME.git
+ 
+ ---
+-name: luna_pinyin
++name: dictionary_test
+ version: "0.1"
+ sort: by_weight  # by_weight / original
+ ...
diff --git a/app-i18n/librime/files/librime-test.patch b/app-i18n/librime/files/librime-test.patch
new file mode 100644
index 000000000000..b890cabfbb33
--- /dev/null
+++ b/app-i18n/librime/files/librime-test.patch
@@ -0,0 +1,42 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 82cd141..bdb5169 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -10,6 +10,7 @@ set(LIBRIME_SOVERSION 0)
+ option(BUILD_SHARED_LIBS "Build Rime as shared library" ON)
+ option(BUILD_STATIC "Build Rime using static libraries" OFF)
+ option(BUILD_DATA "Build data for Rime" OFF)
++option(BUILD_TEST "Build gtest framwork for Rime" OFF)
+ 
+ SET(RIME_DATA_DIR "/share/rime-data" CACHE STRING "Target directory for Rime data")
+ 
+@@ -47,10 +48,14 @@ if(Glog_FOUND)
+ endif(Glog_FOUND)
+ 
+ find_package(Threads)
+-find_package(GTest)
++
++if(BUILD_TEST)
++  find_package(GTest REQUIRED)
+ if(GTEST_FOUND)
++  enable_testing()
+   include_directories(${GTEST_INCLUDE_DIRS})
+ endif(GTEST_FOUND)
++endif(BUILD_TEST)
+ 
+ find_package(YamlCpp REQUIRED)
+ if(YamlCpp_FOUND)
+diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
+index 05db7bd..205b1c9 100644
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -19,8 +19,5 @@ file(COPY ${PROJECT_SOURCE_DIR}/data/test/dictionary_test.dict.yaml
+ 
+ if(NOT MSVC AND NOT XCODE_VERSION)
+ set(RIME_TEST_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/rime_test${EXT})
+-add_custom_command(TARGET rime_test
+-                   POST_BUILD
+-                   COMMAND ${RIME_TEST_EXECUTABLE}
+-                   WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
++add_test(rime_test ${RIME_TEST_EXECUTABLE})
+ endif(NOT MSVC AND NOT XCODE_VERSION)
diff --git a/app-i18n/librime/librime-0.9.8.ebuild b/app-i18n/librime/librime-0.9.8.ebuild
index 07d08fbd50d3..576498ac8363 100644
--- a/app-i18n/librime/librime-0.9.8.ebuild
+++ b/app-i18n/librime/librime-0.9.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/librime/librime-0.9.8.ebuild,v 1.1 2013/02/05 10:25:33 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/librime/librime-0.9.8.ebuild,v 1.2 2013/06/05 00:28:21 naota Exp $
 
 EAPI=5
 
@@ -13,23 +13,29 @@ SRC_URI="http://rimeime.googlecode.com/files/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
+IUSE="static-libs test"
 
 RDEPEND="app-i18n/opencc
 	dev-cpp/glog
-	dev-cpp/yaml-cpp
+	<dev-cpp/yaml-cpp-0.5.0
 	dev-db/kyotocabinet
 	>=dev-libs/boost-1.46.0[threads(+)]
 	sys-libs/zlib
 	x11-proto/xproto"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )"
 
 S=${WORKDIR}/${PN}
 
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-test.patch
+}
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_build static-libs STATIC)
 		-DBUILD_DATA=OFF
+		$(cmake-utils_use_build test TEST)
 		-DLIB_INSTALL_DIR=/usr/$(get_libdir)
 	)
 	cmake-utils_src_configure
diff --git a/app-i18n/librime/librime-0.9.9.ebuild b/app-i18n/librime/librime-0.9.9.ebuild
new file mode 100644
index 000000000000..acb09dc28215
--- /dev/null
+++ b/app-i18n/librime/librime-0.9.9.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/librime/librime-0.9.9.ebuild,v 1.1 2013/06/05 00:28:21 naota Exp $
+
+EAPI=5
+
+inherit cmake-utils multilib
+
+DESCRIPTION="Rime Input Method Engine library"
+HOMEPAGE="http://code.google.com/p/rimeime/"
+SRC_URI="http://rimeime.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs test"
+
+RDEPEND="app-i18n/opencc
+	dev-cpp/glog
+	>=dev-cpp/yaml-cpp-0.5.0
+	dev-db/kyotocabinet
+	>=dev-libs/boost-1.46.0[threads(+)]
+	sys-libs/zlib
+	x11-proto/xproto"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-test.patch
+	epatch "${FILESDIR}"/${PN}-dictionary.patch
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_build static-libs STATIC)
+		-DBUILD_DATA=OFF
+		$(cmake-utils_use_build test TEST)
+		-DLIB_INSTALL_DIR=/usr/$(get_libdir)
+	)
+	cmake-utils_src_configure
+}