summaryrefslogtreecommitdiff
path: root/app-i18n/xsunpinyin
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-08-12 06:32:46 +0100
committerV3n3RiX <venerix@redcorelinux.org>2018-08-12 06:32:46 +0100
commit28e3d252dc8ac8a5635206dfefe1cfe05058d1db (patch)
treee75bce604750fb72e53ed3684059e2e5d2094509 /app-i18n/xsunpinyin
parentf625b9919a60a30f1bd860f7d1b2eac183ced593 (diff)
gentoo resync : 12.08.2018
Diffstat (limited to 'app-i18n/xsunpinyin')
-rw-r--r--app-i18n/xsunpinyin/Manifest10
-rw-r--r--app-i18n/xsunpinyin/files/README.gentoo5
-rw-r--r--app-i18n/xsunpinyin/files/xsunpinyin-2.0.3-force-switch.patch45
-rw-r--r--app-i18n/xsunpinyin/metadata.xml14
-rw-r--r--app-i18n/xsunpinyin/xsunpinyin-2.0.3-r3.ebuild31
-rw-r--r--app-i18n/xsunpinyin/xsunpinyin-2.0.4_pre20130108.ebuild42
-rw-r--r--app-i18n/xsunpinyin/xsunpinyin-3.0.0_rc1.ebuild40
7 files changed, 50 insertions, 137 deletions
diff --git a/app-i18n/xsunpinyin/Manifest b/app-i18n/xsunpinyin/Manifest
index ce47974e0a66..7a715785d9a0 100644
--- a/app-i18n/xsunpinyin/Manifest
+++ b/app-i18n/xsunpinyin/Manifest
@@ -1,7 +1,3 @@
-AUX README.gentoo 164 BLAKE2B 38860db416a64e3acfa7900c3a97c612df73109b414d9b666f5170d306771218b39c81ef34c24c019dcc8baea191febf314101f32e60cfc999028422a98901e9 SHA512 4793b665af505a5b33ed27b99aa236bc9e1ce4e4bfaa12e2fa7fe5e275cde71759e893a30f28fff1c79b2a02e0d4979a0c84319518c487751156b683fab2436e
-AUX xsunpinyin-2.0.3-force-switch.patch 1328 BLAKE2B c61eb697aa9214c1bc603b7a8d210e629e67ba57141fe6c1daa28e27066e8adfb1c3065f520442c163671e2eb4a600e7c083db524aae162adc7b7d872dbfd7c4 SHA512 fcc2110c2b1e0b4dda4995688e360bee7f0e26582bb212875e41e22b208168d0a18d5a2a1a4cdf93935a43bef11bdb0a6fd45a9506675165c1a2a1aeedd2ad5e
-DIST sunpinyin-2.0.4_pre20130108.tar.xz 964764 BLAKE2B 2c9d2e3fc02009ad10784c9408434c6806d1403026fb27629701650fe0e8a69c5580050846cf5c3b870215b8bfd68fe9c52d8bdaf83c41e523224463af9cf530 SHA512 7c1dd7db8b800e9d436746a560a16de2c6777576868f2e7e28f6dcb767b91ccd62b974f9d4ce6bd6ce80d30e1ee83887c3ee03c227e7e9fa59c01db4867465b2
-DIST xsunpinyin-2.0.3.tar.gz 128835 BLAKE2B b8f3dd0b7efd0e40d54ee15085e4f1e7e2fff0d4f22845d7e043012f761e358e97843d1f3a26b85e49303afa86fb4a8263974f6f761d192b44bd88a1a0eef18f SHA512 71bc1677d545ecbd8572c9ba1877d091a2a58154eb326623ed240701f98a70ec29245e98d684a30aad46445e6c461359663ba3778e7f5c42469f0bea6e2bc419
-EBUILD xsunpinyin-2.0.3-r3.ebuild 629 BLAKE2B ba3693a7f3eeb42793333d40f272f02a0a9ad0fa10d592e057075d0562f21a255c37f420125899af207d5c6f7e46e123f3c1689d14771c2b696c94224d14a019 SHA512 0a0916bb06034a2f0585911be41e92007a785d40e9e5c95cce5ce010de15c980f4a14fedbec846570f344484d77e1657e76ec386b683b8c07bc0513f80650db0
-EBUILD xsunpinyin-2.0.4_pre20130108.ebuild 836 BLAKE2B 66d779b1ece649ee371c02e5161b32076b8ce0a55ca55372982682a0dce10d14c97f0d679c026c5c3011ee4512e4dc1a0f30944591b1acf1d8057b3c759f12f5 SHA512 a89e6c8c09595dd5e0ead3435c3618e3e2279e1b403e2abd4f6711025aeca1897560dd17d84381ddd18ae05e23e5bb0ddcf33250f67558dfea71ab798bf58977
-MISC metadata.xml 323 BLAKE2B cb36295be070944db054e52bd199f502dd1136e35d27e7eb9a0caac66798393c12d19fa9b7a421c9e3561023474a01d0788da1a333b34f15fc576862272955ee SHA512 b91630bdda4510f930c9b114a77859e6350c16cfd41c8b585895d4f40a9d8d7ce4a02dd6f46be41ecc7ba6ad2ce6846b143d1745ac9e1385821e403419df9a39
+DIST sunpinyin-3.0.0_rc1.tar.gz 547138 BLAKE2B 682e733241d690d1fef8ce452c497a894c5ab61bf5298c1f292ce3a25a681d594744db43ebd51b3e59274cce0e47a1bce15a793f2c20e2998915c3432f2a7c32 SHA512 c9d4936de5835a7f02e52c5b32bf1a42d76bf7588449aaa813f3df7ab2d72f3ca0f4e18f74a60be4860f0724b5e05cbe567c67e6f3150b0e71b23b3a9002fc5e
+EBUILD xsunpinyin-3.0.0_rc1.ebuild 838 BLAKE2B da1adbb00714726eedd65cd1ccfe144ed469265dce54afb0e64ba2f8ffe72cab2eaa6f99a44375164d28fbabe2315296318a1c8916aff579ecb53d7b48542a37 SHA512 f44f42d1a03aa89d9c2ab128f4a8d40823546029a053910f1b5b28ad3a48a9b951ea83bb15f6301a361ad0c0efa72b83d8f855d2fced666d5588d6fa0f330cf4
+MISC metadata.xml 318 BLAKE2B cd239258d08a95f0d27a760678be36731954a721daae521d147b882fd07eb5206a38ce9ac9938e94e3501611cd95aba5699fb2e5a5176f3652e8e5531e5e4cf8 SHA512 44d76425ce41ba6cb84f584c7dfe3b0552eb65aec93b4ed72f9c2e6c153e5e51a3965bf4248486046d3ca9e39f861c3bcde90424ba35e4a57f2102a24faf0df5
diff --git a/app-i18n/xsunpinyin/files/README.gentoo b/app-i18n/xsunpinyin/files/README.gentoo
deleted file mode 100644
index 7de1985c1f32..000000000000
--- a/app-i18n/xsunpinyin/files/README.gentoo
+++ /dev/null
@@ -1,5 +0,0 @@
-To use sunpinyin with XIM, you should use the following in your user startup
-scripts such as .xinitrc or .xprofile:
-
-XMODIFIERS=@im=xsunpinyin ; export XMODIFIERS
-
diff --git a/app-i18n/xsunpinyin/files/xsunpinyin-2.0.3-force-switch.patch b/app-i18n/xsunpinyin/files/xsunpinyin-2.0.3-force-switch.patch
deleted file mode 100644
index 04f70e2d2aad..000000000000
--- a/app-i18n/xsunpinyin/files/xsunpinyin-2.0.3-force-switch.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --git a/wrapper/xim/SConstruct b/wrapper/xim/SConstruct
-index 9d1cafd..495871d 100644
---- a/wrapper/xim/SConstruct
-+++ b/wrapper/xim/SConstruct
-@@ -32,7 +32,7 @@ imdkit_sources = ['IMdkit/FrameMgr.c',
- 'IMdkit/IMValues.c']
-
-
--cflags='-O2 -g -pipe'
-+cflags='-O2 -g -pipe '
-
- # options
- AddOption('--prefix', dest='prefix', type='string', nargs=1, action='store',
-@@ -52,7 +52,6 @@ def PassVariables(envvar, env):
-
- env = Environment(ENV=os.environ,
- CFLAGS=cflags, CXXFLAGS=cflags,
-- LINKFLAGS=['-export-dynamic'],
- CPPPATH=['.', 'IMdkit'])
- opts.Update(env)
-
-@@ -62,11 +61,6 @@ if GetOption('prefix') is not None:
-
- opts.Save('configure.conf', env)
-
--
--# set rpath
--if GetOption('rpath') is not None:
-- env.Append(LINKFLAGS='-Wl,-R -Wl,%s' % GetOption('rpath'))
--
- envvar = [('CC', 'CC'),
- ('CXX', 'CXX'),
- ('CFLAGS', 'CFLAGS'),
-@@ -83,7 +77,11 @@ extra_cflags += ' -DSUNPINYIN_XIM_SETTING_DIR=\\"%s\\"' % data_dir
-
- env.Append(CFLAGS=extra_cflags)
- env.Append(CXXFLAGS=extra_cflags)
-+env.Append(LINKFLAGS=' -export-dynamic')
-
-+# set rpath
-+if GetOption('rpath') is not None:
-+ env.Append(LINKFLAGS=' -Wl,-R -Wl,%s' % GetOption('rpath'))
-
- #
- #==============================configure================================
diff --git a/app-i18n/xsunpinyin/metadata.xml b/app-i18n/xsunpinyin/metadata.xml
index 11bbcd490ca1..271ef4abaa80 100644
--- a/app-i18n/xsunpinyin/metadata.xml
+++ b/app-i18n/xsunpinyin/metadata.xml
@@ -1,11 +1,11 @@
<?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>
- <upstream>
- <remote-id type="google-code">sunpinyin</remote-id>
- </upstream>
+ <maintainer type="project">
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">sunpinyin/sunpinyin</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-i18n/xsunpinyin/xsunpinyin-2.0.3-r3.ebuild b/app-i18n/xsunpinyin/xsunpinyin-2.0.3-r3.ebuild
deleted file mode 100644
index 44ee7e7f2fbe..000000000000
--- a/app-i18n/xsunpinyin/xsunpinyin-2.0.3-r3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils scons-utils
-
-DESCRIPTION="The SunPinyin IMEngine Wrapper for XIM Framework"
-HOMEPAGE="https://sunpinyin.googlecode.com"
-SRC_URI="${HOMEPAGE}/files/${P}.tar.gz"
-
-LICENSE="LGPL-2.1 CDDL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="~app-i18n/sunpinyin-2.0.3
- x11-libs/gtk+:2
- x11-libs/libX11"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- epatch "${FILESDIR}/${P}-force-switch.patch"
-}
-
-src_compile() {
- escons --prefix="/usr"
-}
-
-src_install() {
- escons --prefix="/usr" --install-sandbox="${D}" install
-}
diff --git a/app-i18n/xsunpinyin/xsunpinyin-2.0.4_pre20130108.ebuild b/app-i18n/xsunpinyin/xsunpinyin-2.0.4_pre20130108.ebuild
deleted file mode 100644
index 108302b49c3b..000000000000
--- a/app-i18n/xsunpinyin/xsunpinyin-2.0.4_pre20130108.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit readme.gentoo scons-utils toolchain-funcs
-
-DESCRIPTION="The SunPinyin IMEngine Wrapper for XIM Framework"
-HOMEPAGE="https://sunpinyin.googlecode.com/"
-SRC_URI="https://dev.gentoo.org/~yngwin/distfiles/sunpinyin-${PV}.tar.xz"
-
-LICENSE="LGPL-2.1 CDDL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="~app-i18n/sunpinyin-${PV}:=
- x11-libs/gtk+:2
- x11-libs/libX11"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
- default
- mv "${WORKDIR}/sunpinyin-${PV}" "${S}" || die
-}
-
-src_configure() {
- tc-export CXX
- myesconsargs=( --prefix="${EPREFIX}/usr" )
-}
-
-src_compile() {
- pushd "${S}"/wrapper/xim
- escons
- popd
-}
-
-src_install() {
- pushd "${S}"/wrapper/xim
- escons --install-sandbox="${D}" install
- popd
- readme.gentoo_create_doc
-}
diff --git a/app-i18n/xsunpinyin/xsunpinyin-3.0.0_rc1.ebuild b/app-i18n/xsunpinyin/xsunpinyin-3.0.0_rc1.ebuild
new file mode 100644
index 000000000000..c87c83f85db7
--- /dev/null
+++ b/app-i18n/xsunpinyin/xsunpinyin-3.0.0_rc1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-any-r1 scons-utils toolchain-funcs vcs-snapshot
+
+MY_P="${P:1}"
+
+DESCRIPTION="A standalone XIM server for SunPinyin"
+HOMEPAGE="https://github.com/sunpinyin/sunpinyin"
+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=""
+
+RDEPEND="~app-i18n/sunpinyin-${PV}:=
+ x11-libs/gtk+:2
+ x11-libs/libX11"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ default
+ tc-export CXX
+}
+
+src_compile() {
+ escons -C wrapper/xim \
+ --prefix="${EPREFIX}"/usr
+}
+
+src_install() {
+ escons -C wrapper/xim --install-sandbox="${D}" install
+ dodoc wrapper/xim/README
+}