commit: bb17fcbf64480d9f2c081ebb207fd04113d696c5
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 9 14:29:40 2018 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Thu Aug 9 14:31:18 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb17fcbf
app-i18n/scim-sunpinyin: new upstream release
Package-Manager: Portage-2.3.40, Repoman-2.3.9
app-i18n/scim-sunpinyin/Manifest | 2 +-
.../files/scim-sunpinyin-2.0.3-force-switch.patch | 32 ----------------------
app-i18n/scim-sunpinyin/metadata.xml | 3 ++
...3-r2.ebuild => scim-sunpinyin-3.0.0_rc1.ebuild} | 22 +++++++--------
4 files changed, 15 insertions(+), 44 deletions(-)
diff --git a/app-i18n/scim-sunpinyin/Manifest b/app-i18n/scim-sunpinyin/Manifest
index bc1cf9c6ece..016fef2a715 100644
--- a/app-i18n/scim-sunpinyin/Manifest
+++ b/app-i18n/scim-sunpinyin/Manifest
@@ -1 +1 @@
-DIST scim-sunpinyin-2.0.3.tar.gz 33072 BLAKE2B
06d9bff2eb35b06a49f6be60c8cd5d257f6ca724f03acc01b29b01fd32c2d95bab87c4737448a448a42a58d070f6b254bcf52e6d0c8b98ff10718d2265e43509
SHA512
f983d40972c5792a4a27fdf699cffc7f6882c84060cfe3e260cdc3f587743b0f71339ccdb7067b393f88a69b74d999fba70c4d9bc8016b9b217b3c11667a2986
+DIST sunpinyin-3.0.0_rc1.tar.gz 547138 BLAKE2B
682e733241d690d1fef8ce452c497a894c5ab61bf5298c1f292ce3a25a681d594744db43ebd51b3e59274cce0e47a1bce15a793f2c20e2998915c3432f2a7c32
SHA512
c9d4936de5835a7f02e52c5b32bf1a42d76bf7588449aaa813f3df7ab2d72f3ca0f4e18f74a60be4860f0724b5e05cbe567c67e6f3150b0e71b23b3a9002fc5e
diff --git
a/app-i18n/scim-sunpinyin/files/scim-sunpinyin-2.0.3-force-switch.patch
b/app-i18n/scim-sunpinyin/files/scim-sunpinyin-2.0.3-force-switch.patch
deleted file mode 100644
index f397f47ea24..00000000000
--- a/app-i18n/scim-sunpinyin/files/scim-sunpinyin-2.0.3-force-switch.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/SConstruct
-+++ b/SConstruct
-@@ -3,7 +3,7 @@
-
- locales = []
-
--cflags = '-O2 -g -pipe'
-+cflags = '-O2 -g -pipe '
- version = '2.0.3'
-
- AddOption('--prefix', dest='prefix', metavar='DIR',
-@@ -51,9 +51,6 @@
-
- opts.Save('configure.conf', env)
-
--if GetOption('rpath') is not None:
-- env.Append(LINKFLAGS='-Wl,-R -Wl,%s' % GetOption('rpath'))
--
- envvar = [('CC', 'CC'),
- ('CXX', 'CXX'),
- ('CFLAGS', 'CFLAGS'),
-@@ -75,6 +72,10 @@
- env.Append(CFLAGS=extra_cflags)
- env.Append(CXXFLAGS=extra_cflags)
- env.Replace(SHLIBPREFIX = '')
-+
-+if GetOption('rpath') is not None:
-+ env.Append(LINKFLAGS=' -Wl,-R -Wl,%s' % GetOption('rpath'))
-+
- #
- #==============================configure================================
- #
diff --git a/app-i18n/scim-sunpinyin/metadata.xml
b/app-i18n/scim-sunpinyin/metadata.xml
index 271ef4abaa8..20533d05e2c 100644
--- a/app-i18n/scim-sunpinyin/metadata.xml
+++ b/app-i18n/scim-sunpinyin/metadata.xml
@@ -5,6 +5,9 @@
<email>[email protected]</email>
<name>Cjk</name>
</maintainer>
+ <use>
+ <flag name="gtk3">Enable support for
<pkg>x11-libs/gtk+</pkg>:3</flag>
+ </use>
<upstream>
<remote-id type="github">sunpinyin/sunpinyin</remote-id>
</upstream>
diff --git a/app-i18n/scim-sunpinyin/scim-sunpinyin-2.0.3-r2.ebuild
b/app-i18n/scim-sunpinyin/scim-sunpinyin-3.0.0_rc1.ebuild
similarity index 58%
rename from app-i18n/scim-sunpinyin/scim-sunpinyin-2.0.3-r2.ebuild
rename to app-i18n/scim-sunpinyin/scim-sunpinyin-3.0.0_rc1.ebuild
index d5415f9d08f..ed668fa02f7 100644
--- a/app-i18n/scim-sunpinyin/scim-sunpinyin-2.0.3-r2.ebuild
+++ b/app-i18n/scim-sunpinyin/scim-sunpinyin-3.0.0_rc1.ebuild
@@ -4,24 +4,24 @@
EAPI="6"
PYTHON_COMPAT=( python2_7 )
-inherit python-any-r1 scons-utils toolchain-funcs
+inherit python-any-r1 scons-utils toolchain-funcs vcs-snapshot
+
+MY_P="${P#*-}"
DESCRIPTION="SunPinyin IMEngine for SCIM"
HOMEPAGE="https://github.com/sunpinyin/sunpinyin";
-SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN#*-}/${P}.tar.gz";
+SRC_URI="https://github.com/${PN#*-}/${PN#*-}/archive/v${PV/_rc/-rc}.tar.gz ->
${MY_P}.tar.gz"
LICENSE="LGPL-2.1 CDDL"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="gtk3"
-RDEPEND="app-i18n/scim
- ~app-i18n/sunpinyin-${PV}:=
- x11-libs/gtk+:2"
+RDEPEND="app-i18n/scim[gtk3=]
+ ~app-i18n/sunpinyin-${PV}:="
DEPEND="${RDEPEND}
virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${P}-force-switch.patch )
+S="${WORKDIR}/${MY_P}"
src_prepare() {
default
@@ -29,13 +29,13 @@ src_prepare() {
}
src_compile() {
- escons \
+ escons -C wrapper/scim \
--prefix="${EPREFIX}"/usr \
--libdir="${EPREFIX}"/usr/$(get_libdir) \
--libexecdir="${EPREFIX}"/usr/libexec
}
src_install() {
- escons --install-sandbox="${D}" install
- einstalldocs
+ escons -C wrapper/scim --install-sandbox="${D}" install
+ dodoc wrapper/scim/README
}
