From 28e3d252dc8ac8a5635206dfefe1cfe05058d1db Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Aug 2018 06:32:46 +0100 Subject: gentoo resync : 12.08.2018 --- app-i18n/scim-sunpinyin/Manifest | 7 ++-- .../files/scim-sunpinyin-2.0.3-force-switch.patch | 34 ------------------ app-i18n/scim-sunpinyin/metadata.xml | 5 ++- .../scim-sunpinyin/scim-sunpinyin-2.0.3-r2.ebuild | 31 ---------------- .../scim-sunpinyin/scim-sunpinyin-3.0.0_rc1.ebuild | 41 ++++++++++++++++++++++ 5 files changed, 48 insertions(+), 70 deletions(-) delete mode 100644 app-i18n/scim-sunpinyin/files/scim-sunpinyin-2.0.3-force-switch.patch delete mode 100644 app-i18n/scim-sunpinyin/scim-sunpinyin-2.0.3-r2.ebuild create mode 100644 app-i18n/scim-sunpinyin/scim-sunpinyin-3.0.0_rc1.ebuild (limited to 'app-i18n/scim-sunpinyin') diff --git a/app-i18n/scim-sunpinyin/Manifest b/app-i18n/scim-sunpinyin/Manifest index dd92a2ab18c2..4846e3017f17 100644 --- a/app-i18n/scim-sunpinyin/Manifest +++ b/app-i18n/scim-sunpinyin/Manifest @@ -1,4 +1,3 @@ -AUX scim-sunpinyin-2.0.3-force-switch.patch 947 BLAKE2B 0abc3eaa4f217ad33af87a7b2fa3d0c2bab90ea8540d61faa915fd0c673dbf49905d661da1128330aef16b84925fb9da2a25f75342c233fd364151625da09501 SHA512 8a3600507534dda5854465569127a7863fcbcd318542d319e814634e8fea10f7105469717e7141f831385c5e64a910aee0d442d7eb663e0cb46e9c6b9464ca7f -DIST scim-sunpinyin-2.0.3.tar.gz 33072 BLAKE2B 06d9bff2eb35b06a49f6be60c8cd5d257f6ca724f03acc01b29b01fd32c2d95bab87c4737448a448a42a58d070f6b254bcf52e6d0c8b98ff10718d2265e43509 SHA512 f983d40972c5792a4a27fdf699cffc7f6882c84060cfe3e260cdc3f587743b0f71339ccdb7067b393f88a69b74d999fba70c4d9bc8016b9b217b3c11667a2986 -EBUILD scim-sunpinyin-2.0.3-r2.ebuild 639 BLAKE2B 8641ce645f95d0ccf073d47edcd0a182295676f614d905b7b3233ea8ec093621a621b6b55b59649755d017c1fe684a96cd0df3577b585e1036d83e1ed8dfd933 SHA512 868c215144512f3e91b05fb94d23bf9b81163fed23b79e9f0c782e3e50c8c0f5f22a7468206006c093a5677f65a4b01f86b74da7d4f3b4d96359110b83a910f8 -MISC metadata.xml 313 BLAKE2B e3d71fcea434a51c92b8194791283c33981d3c4b44bda0df1e70b561517c228daebdc713327171192e1523b7ac2f91116a030bb729eb143606810e6ef5522ce4 SHA512 61d943d4f8b8ab912ced89b69be51ad2792ba67672e969f4e32fba373f7133181c1080ba9a2603e3f7623ebac42e32eb3e0e429d66846ab4c7e13afbc0b05974 +DIST sunpinyin-3.0.0_rc1.tar.gz 547138 BLAKE2B 682e733241d690d1fef8ce452c497a894c5ab61bf5298c1f292ce3a25a681d594744db43ebd51b3e59274cce0e47a1bce15a793f2c20e2998915c3432f2a7c32 SHA512 c9d4936de5835a7f02e52c5b32bf1a42d76bf7588449aaa813f3df7ab2d72f3ca0f4e18f74a60be4860f0724b5e05cbe567c67e6f3150b0e71b23b3a9002fc5e +EBUILD scim-sunpinyin-3.0.0_rc1.ebuild 910 BLAKE2B 455568a0c21627c509a562ef3a97608d0e78cce4ea38dbf2c72a0b170236cdb6a291a741af155f614636e534a501378c6b6ffb059b3961c64fdc7eea3f9f53ac SHA512 04cd0eb615f9411c2558537f8c10bdf869b50d36081979364f047cd509d76f6607f5cfeca213766166185e5dd557b4ce3432315f0aefd8a0f8bf4c3254d2e33f +MISC metadata.xml 406 BLAKE2B 55aef3d62cc43c2efd86bf7d304a43fa5e5f71cc59e61f1c056e4c18a262c7e1ab8c81adb145ca0e278cb305ca226bee14d6be8704daf1acac04a558a848bd9b SHA512 b3b071ec496cd0a107862810a3b65f31838111dc8be01d2050428043ac11ff5e4fb5950e8ac7fe7d7036879146c14ec182d685451f73b4d2dbbb49386cb82db1 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 a0089ac11502..000000000000 --- a/app-i18n/scim-sunpinyin/files/scim-sunpinyin-2.0.3-force-switch.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/wrapper/scim/SConstruct b/wrapper/scim/SConstruct -index 7739300..ef7c69b 100644 ---- a/wrapper/scim/SConstruct -+++ b/wrapper/scim/SConstruct -@@ -3,7 +3,7 @@ import SCons.Tool.textfile - - locales = [] - --cflags = '-O2 -g -pipe' -+cflags = '-O2 -g -pipe ' - version = '2.0.3' - - AddOption('--prefix', dest='prefix', metavar='DIR', -@@ -51,9 +51,6 @@ if GetOption('datadir') is not None: - - 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 @@ extra_cflags += ' -Isrc' - 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 583f6476f8be..20533d05e2c3 100644 --- a/app-i18n/scim-sunpinyin/metadata.xml +++ b/app-i18n/scim-sunpinyin/metadata.xml @@ -5,7 +5,10 @@ cjk@gentoo.org Cjk + + Enable support for x11-libs/gtk+:3 + - sunpinyin + sunpinyin/sunpinyin diff --git a/app-i18n/scim-sunpinyin/scim-sunpinyin-2.0.3-r2.ebuild b/app-i18n/scim-sunpinyin/scim-sunpinyin-2.0.3-r2.ebuild deleted file mode 100644 index 0f2475440219..000000000000 --- a/app-i18n/scim-sunpinyin/scim-sunpinyin-2.0.3-r2.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 for Smart Common Input Method (SCIM)" -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/scim - ~app-i18n/sunpinyin-2.0.3 - x11-libs/gtk+:2 " -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/scim-sunpinyin/scim-sunpinyin-3.0.0_rc1.ebuild b/app-i18n/scim-sunpinyin/scim-sunpinyin-3.0.0_rc1.ebuild new file mode 100644 index 000000000000..ed668fa02f72 --- /dev/null +++ b/app-i18n/scim-sunpinyin/scim-sunpinyin-3.0.0_rc1.ebuild @@ -0,0 +1,41 @@ +# 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#*-}" + +DESCRIPTION="SunPinyin IMEngine for SCIM" +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="gtk3" + +RDEPEND="app-i18n/scim[gtk3=] + ~app-i18n/sunpinyin-${PV}:=" +DEPEND="${RDEPEND} + virtual/pkgconfig" +S="${WORKDIR}/${MY_P}" + +src_prepare() { + default + tc-export CXX +} + +src_compile() { + escons -C wrapper/scim \ + --prefix="${EPREFIX}"/usr \ + --libdir="${EPREFIX}"/usr/$(get_libdir) \ + --libexecdir="${EPREFIX}"/usr/libexec +} + +src_install() { + escons -C wrapper/scim --install-sandbox="${D}" install + dodoc wrapper/scim/README +} -- cgit v1.2.3