[gentoo-commits] repo/gentoo:master commit in: app-i18n/opencc/, app-i18n/opencc/files/

["Akinori Hattori" <hattya@gentoo.org>]

commit:     c9b20734472173803e155d644ff03d042bc7f52d
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 23 14:16:16 2017 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Wed Aug 23 14:25:33 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9b20734

app-i18n/opencc: tidy

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 .../opencc/files/opencc-1.0.4-cmake-libdir.patch   |  4 +--
 app-i18n/opencc/metadata.xml                       | 21 +++++++-------
 app-i18n/opencc/opencc-1.0.4.ebuild                | 16 ++++-------
 app-i18n/opencc/opencc-1.0.5.ebuild                | 32 ++++++++--------------
 app-i18n/opencc/opencc-9999.ebuild                 | 32 ++++++++--------------
 5 files changed, 39 insertions(+), 66 deletions(-)

diff --git a/app-i18n/opencc/files/opencc-1.0.4-cmake-libdir.patch b/app-i18n/opencc/files/opencc-1.0.4-cmake-libdir.patch
index c09f32757ed..dc8859d8e28 100644
--- a/app-i18n/opencc/files/opencc-1.0.4-cmake-libdir.patch
+++ b/app-i18n/opencc/files/opencc-1.0.4-cmake-libdir.patch
@@ -1,8 +1,6 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e3eb3a1..5370866 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -83,6 +83,10 @@ if (DEFINED SYSCONF_INSTALL_DIR)
+@@ -83,6 +83,10 @@
    set (DIR_ETC ${SYSCONF_INSTALL_DIR})
  endif (DEFINED SYSCONF_INSTALL_DIR)
  

diff --git a/app-i18n/opencc/metadata.xml b/app-i18n/opencc/metadata.xml
index 69091bd9d69..377bdc587a2 100644
--- a/app-i18n/opencc/metadata.xml
+++ b/app-i18n/opencc/metadata.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>cjk@gentoo.org</email>
-		<name>Cjk</name>
-	</maintainer>
-	<longdescription lang="en">OpenCC is a library for converting characters and phrases between
-Traditional Chinese and Simplified Chinese.</longdescription>
-	<upstream>
-		<remote-id type="google-code">open-chinese-convert</remote-id>
-		<remote-id type="github">BYVoid/OpenCC</remote-id>
-	</upstream>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <longdescription lang="en">
+    OpenCC is a library for converting characters and phrases between
+    Traditional Chinese and Simplified Chinese.
+  </longdescription>
+  <upstream>
+    <remote-id type="github">BYVoid/OpenCC</remote-id>
+  </upstream>
 </pkgmetadata>

diff --git a/app-i18n/opencc/opencc-1.0.4.ebuild b/app-i18n/opencc/opencc-1.0.4.ebuild
index 799136e052e..6a9d4d598c0 100644
--- a/app-i18n/opencc/opencc-1.0.4.ebuild
+++ b/app-i18n/opencc/opencc-1.0.4.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI="6"
 
-inherit cmake-utils multilib eutils vcs-snapshot
+inherit cmake-utils vcs-snapshot
 
 DESCRIPTION="Libraries for conversion between Traditional and Simplified Chinese"
 HOMEPAGE="https://github.com/BYVoid/OpenCC"
-SRC_URI="https://github.com/BYVoid/OpenCC/archive/ver.${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/BYVoid/${PN^^[oc]}/archive/ver.${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0/2"
@@ -15,22 +15,16 @@ KEYWORDS="amd64 hppa ppc ppc64 x86"
 IUSE="doc static-libs"
 
 DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND=""
 
-DOCS="AUTHORS NEWS.md README.md"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-cmake-libdir.patch
-)
+DOCS="AUTHORS *.md"
+PATCHES=( "${FILESDIR}"/${P}-cmake-libdir.patch )
 
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_DOCUMENTATION=$(usex doc)
 		-DBUILD_SHARED_LIBS=ON
 		-DENABLE_GTEST=OFF
-		-DCMAKE_INSTALL_LIBDIR="${EPREFIX}"/usr/$(get_libdir)
 	)
-
 	cmake-utils_src_configure
 }
 

diff --git a/app-i18n/opencc/opencc-1.0.5.ebuild b/app-i18n/opencc/opencc-1.0.5.ebuild
index 50bab76e2c0..93e6c7c9ffe 100644
--- a/app-i18n/opencc/opencc-1.0.5.ebuild
+++ b/app-i18n/opencc/opencc-1.0.5.ebuild
@@ -9,15 +9,14 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 
 	EGIT_REPO_URI="https://github.com/BYVoid/OpenCC"
+else
+	inherit vcs-snapshot
+
+	SRC_URI="https://github.com/BYVoid/${PN^^[oc]}/archive/ver.${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
-DESCRIPTION="Project for conversion between Traditional and Simplified Chinese"
+DESCRIPTION="Libraries for conversion between Traditional and Simplified Chinese"
 HOMEPAGE="https://github.com/BYVoid/OpenCC"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/BYVoid/OpenCC/archive/ver.${PV}.tar.gz -> ${P}.tar.gz"
-fi
 
 LICENSE="Apache-2.0"
 SLOT="0/2"
@@ -25,13 +24,14 @@ KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE="doc"
 
 DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND=""
 
-if [[ "${PV}" != "9999" ]]; then
-	S="${WORKDIR}/OpenCC-ver.${PV}"
-fi
+DOCS="AUTHORS *.md"
 
-DOCS=(AUTHORS NEWS.md README.md)
+src_prepare() {
+	sed -i "s|\${DIR_SHARE_OPENCC}/doc|share/doc/${PF}|" doc/CMakeLists.txt
+
+	cmake-utils_src_prepare
+}
 
 src_configure() {
 	local mycmakeargs=(
@@ -39,15 +39,5 @@ src_configure() {
 		-DBUILD_SHARED_LIBS=ON
 		-DENABLE_GTEST=OFF
 	)
-
 	cmake-utils_src_configure
 }
-
-src_install() {
-	cmake-utils_src_install
-
-	if use doc; then
-		mv "${ED}usr/share/opencc/doc/html" "${ED}usr/share/doc/${P}/html" || die
-		rmdir "${ED}usr/share/opencc/doc" || die
-	fi
-}

diff --git a/app-i18n/opencc/opencc-9999.ebuild b/app-i18n/opencc/opencc-9999.ebuild
index 8664a59261c..f98b8945135 100644
--- a/app-i18n/opencc/opencc-9999.ebuild
+++ b/app-i18n/opencc/opencc-9999.ebuild
@@ -9,15 +9,14 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 
 	EGIT_REPO_URI="https://github.com/BYVoid/OpenCC"
+else
+	inherit vcs-snapshot
+
+	SRC_URI="https://github.com/BYVoid/${PN^^[oc]}/archive/ver.${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
-DESCRIPTION="Project for conversion between Traditional and Simplified Chinese"
+DESCRIPTION="Libraries for conversion between Traditional and Simplified Chinese"
 HOMEPAGE="https://github.com/BYVoid/OpenCC"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/BYVoid/OpenCC/archive/ver.${PV}.tar.gz -> ${P}.tar.gz"
-fi
 
 LICENSE="Apache-2.0"
 SLOT="0/2"
@@ -25,13 +24,14 @@ KEYWORDS=""
 IUSE="doc"
 
 DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND=""
 
-if [[ "${PV}" != "9999" ]]; then
-	S="${WORKDIR}/OpenCC-ver.${PV}"
-fi
+DOCS="AUTHORS *.md"
 
-DOCS=(AUTHORS NEWS.md README.md)
+src_prepare() {
+	sed -i "s|\${DIR_SHARE_OPENCC}/doc|share/doc/${PF}|" doc/CMakeLists.txt
+
+	cmake-utils_src_prepare
+}
 
 src_configure() {
 	local mycmakeargs=(
@@ -39,15 +39,5 @@ src_configure() {
 		-DBUILD_SHARED_LIBS=ON
 		-DENABLE_GTEST=OFF
 	)
-
 	cmake-utils_src_configure
 }
-
-src_install() {
-	cmake-utils_src_install
-
-	if use doc; then
-		mv "${ED}usr/share/opencc/doc/html" "${ED}usr/share/doc/${P}/html" || die
-		rmdir "${ED}usr/share/opencc/doc" || die
-	fi
-}