From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-968628-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 668661396D0
for <garchives@archives.gentoo.org>; Wed, 23 Aug 2017 14:25:53 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id B5BC1E0D29;
Wed, 23 Aug 2017 14:25:52 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 81A5EE0D29
for <gentoo-commits@lists.gentoo.org>; Wed, 23 Aug 2017 14:25:52 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 3453D341861
for <gentoo-commits@lists.gentoo.org>; Wed, 23 Aug 2017 14:25:51 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id CEE957FD9
for <gentoo-commits@lists.gentoo.org>; Wed, 23 Aug 2017 14:25:49 +0000 (UTC)
From: "Akinori Hattori" <hattya@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Akinori Hattori" <hattya@gentoo.org>
Message-ID: <1503498333.c9b20734472173803e155d644ff03d042bc7f52d.hattya@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-i18n/opencc/, app-i18n/opencc/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-i18n/opencc/files/opencc-1.0.4-cmake-libdir.patch app-i18n/opencc/metadata.xml app-i18n/opencc/opencc-1.0.4.ebuild app-i18n/opencc/opencc-1.0.5.ebuild app-i18n/opencc/opencc-9999.ebuild
X-VCS-Directories: app-i18n/opencc/ app-i18n/opencc/files/
X-VCS-Committer: hattya
X-VCS-Committer-Name: Akinori Hattori
X-VCS-Revision: c9b20734472173803e155d644ff03d042bc7f52d
X-VCS-Branch: master
Date: Wed, 23 Aug 2017 14:25:49 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 80f5641b-9ccf-430a-9c49-cc96d3a3e80a
X-Archives-Hash: c98a1ca493ae194d3b9d217e6da0a2d7
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
-}