commit: 9319f48669ceb3a56b1e64c97c8bb89fa8541628 Author: Akinori Hattori <hattya <AT> gentoo <DOT> org> AuthorDate: Thu Aug 9 14:38:02 2018 +0000 Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> CommitDate: Thu Aug 9 14:38:39 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9319f486
app-i18n/sunpinyin: drop old Closes: https://bugs.gentoo.org/596836 Package-Manager: Portage-2.3.40, Repoman-2.3.9 app-i18n/sunpinyin/Manifest | 3 - .../files/sunpinyin-2.0.3-force-switch.patch | 28 ---------- .../sunpinyin/files/sunpinyin-2.0.3-gcc-4.7.patch | 49 ---------------- app-i18n/sunpinyin/sunpinyin-2.0.3-r2.ebuild | 65 ---------------------- 4 files changed, 145 deletions(-) diff --git a/app-i18n/sunpinyin/Manifest b/app-i18n/sunpinyin/Manifest index 7a824982346..07104dfbfad 100644 --- a/app-i18n/sunpinyin/Manifest +++ b/app-i18n/sunpinyin/Manifest @@ -1,5 +1,2 @@ -DIST dict.utf8.tar.bz2 1598995 BLAKE2B 4cb990b6bbb440218c6af695369bdccf97b820da9aa10d118043a7bda1c602e53d0c63c4a460db2c64530e69ac1d98619e1a2efa2113a292063b422fc1b3d32c SHA512 04ec55e4af4b58d29b1141a824b5c3de5dbaaab0133d88e477d9183db738fc63543b4004bf071e611c6ea0d4b4c161b73849a64ab75f4df5bb5116d7f52d8e34 -DIST lm_sc.t3g.arpa.tar.bz2 25098718 BLAKE2B a7cd87d4e786a7dfe854b33c5c70019075ec99b02fd6cb33f91f89babdd2b255b6d157fff30c22b5372e74908483b814cc9698fd84caa3e56c61e76a59dbea04 SHA512 1e5e577c92df2f230b6b5962298ef7c215f6069b53e8e2dd4c5ad3eb54f999fc239b0924b4ab031af59c3194da15d6317ea2860f158e805b5cf0126666eaad98 -DIST sunpinyin-2.0.3.tar.gz 169394 BLAKE2B d93472c0c208da2a7aab99b1d514fa01acf67e69bdddc2c0e15f40af7a2abaf8860f8e792c2bd286bd1ec3a24124b0284d28295115c8dff1051f5df3c2314bb7 SHA512 25f1fc4b8f550663861f2c7426832924676f83e1f201689fde51b04ca78704b46dbbf2b92736234d5e1a729ba1bb23bd1f3a0394f6b8b54cb0df57b9bb7ece1d DIST sunpinyin-2.0.4_pre20130108.tar.xz 964764 BLAKE2B 2c9d2e3fc02009ad10784c9408434c6806d1403026fb27629701650fe0e8a69c5580050846cf5c3b870215b8bfd68fe9c52d8bdaf83c41e523224463af9cf530 SHA512 7c1dd7db8b800e9d436746a560a16de2c6777576868f2e7e28f6dcb767b91ccd62b974f9d4ce6bd6ce80d30e1ee83887c3ee03c227e7e9fa59c01db4867465b2 DIST sunpinyin-3.0.0_rc1.tar.gz 547138 BLAKE2B 682e733241d690d1fef8ce452c497a894c5ab61bf5298c1f292ce3a25a681d594744db43ebd51b3e59274cce0e47a1bce15a793f2c20e2998915c3432f2a7c32 SHA512 c9d4936de5835a7f02e52c5b32bf1a42d76bf7588449aaa813f3df7ab2d72f3ca0f4e18f74a60be4860f0724b5e05cbe567c67e6f3150b0e71b23b3a9002fc5e diff --git a/app-i18n/sunpinyin/files/sunpinyin-2.0.3-force-switch.patch b/app-i18n/sunpinyin/files/sunpinyin-2.0.3-force-switch.patch deleted file mode 100644 index de85e82c1d5..00000000000 --- a/app-i18n/sunpinyin/files/sunpinyin-2.0.3-force-switch.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/SConstruct -+++ b/SConstruct -@@ -180,12 +180,6 @@ libdir = env['LIBDIR'] - libdatadir = env['LIBDATADIR'] + '/sunpinyin/data' - headersdir = env['PREFIX'] + '/include/sunpinyin-2.0' - --if GetOS() != 'Darwin': -- env.Append(LINKFLAGS=['-Wl,-soname=libsunpinyin.so.%d' % abi_major]) -- --if GetOption('rpath') is not None and GetOS() != 'Darwin': -- env.Append(LINKFLAGS='-Wl,-R -Wl,%s' % GetOption('rpath')) -- - # pass through environmental variables - envvar = [('CC', 'CC'), - ('CXX', 'CXX'), -@@ -202,6 +196,12 @@ extra_cflags=' -DHAVE_CONFIG_H -DSUNPINYIN_DATA_DIR=\'"%s"\'' % libdatadir - env.Append(CFLAGS=extra_cflags) - env.Append(CXXFLAGS=extra_cflags) - -+if GetOS() != 'Darwin': -+ env.Append(LINKFLAGS=' -Wl,-soname=libsunpinyin.so.%d' % abi_major) -+ -+if GetOption('rpath') is not None and GetOS() != 'Darwin': -+ env.Append(LINKFLAGS=' -Wl,-R -Wl,%s' % GetOption('rpath')) -+ - # - #==============================configure================================ - # diff --git a/app-i18n/sunpinyin/files/sunpinyin-2.0.3-gcc-4.7.patch b/app-i18n/sunpinyin/files/sunpinyin-2.0.3-gcc-4.7.patch deleted file mode 100644 index c523449ef51..00000000000 --- a/app-i18n/sunpinyin/files/sunpinyin-2.0.3-gcc-4.7.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 3d35aa0370d9c7bd455098caa9ba22ebe1f82968 Mon Sep 17 00:00:00 2001 -From: Yong Sun <[email protected]> -Date: Wed, 4 Apr 2012 18:41:39 +0800 -Subject: [PATCH] Integrated patch from YunQiang Su, fixed FTBFS with gcc-4.7 - ---- - SConstruct | 3 ++- - src/portability.h | 5 ++--- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/SConstruct b/SConstruct -index 97abf47..354fd19 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -313,7 +313,8 @@ def DoConfigure(): - conf.CheckCHeader('sys/param.h') - conf.CheckCHeader('sys/stat.h') - conf.CheckCHeader('sys/types.h') -- conf.CheckCHeader('unistd.h') -+ if conf.CheckCHeader('unistd.h'): -+ conf.Define('DHAVE_UNISTD_H', 1) - conf.CheckCHeader('wchar.h') - - # add essential package requirements -diff --git a/src/portability.h b/src/portability.h -index 949d4f2..cf43bd0 100644 ---- a/src/portability.h -+++ b/src/portability.h -@@ -44,15 +44,14 @@ - #include <string> - #include <cstring> - --#if defined(sun) -+#if defined(HAVE_UNISTD_H) - #include <unistd.h> - #ifdef __cplusplus - #include <algorithm> - #else - #include <sys/ddi.h> - #endif //__cpluscplus --#endif //defined(sun) -- -+#endif //defined(HAVE_UNISTD_H) - - #ifndef HOST_OS_GNUC_2 - #if defined(DEBUG) && !defined(NDEBUG) --- -1.7.8.5 - diff --git a/app-i18n/sunpinyin/sunpinyin-2.0.3-r2.ebuild b/app-i18n/sunpinyin/sunpinyin-2.0.3-r2.ebuild deleted file mode 100644 index c79fd710b99..00000000000 --- a/app-i18n/sunpinyin/sunpinyin-2.0.3-r2.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# 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 - -DESCRIPTION="A Statistical Language Model based Chinese input method library" -HOMEPAGE="https://github.com/sunpinyin/sunpinyin"; -SRC_URI="${HOMEPAGE}/files/${P}.tar.gz - https://open-gram.googlecode.com/files/dict.utf8.tar.bz2 - https://open-gram.googlecode.com/files/lm_sc.t3g.arpa.tar.bz2"; - -LICENSE="LGPL-2.1 CDDL" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="" - -RDEPEND="dev-db/sqlite:3" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${P}-force-switch.patch - "${FILESDIR}"/${P}-gcc-4.7.patch -) - -src_unpack() { - unpack ${P}.tar.gz - ln -s "${DISTDIR}"/dict.utf8.tar.bz2 "${S}"/raw/ || die "dict file not found" - ln -s "${DISTDIR}"/lm_sc.t3g.arpa.tar.bz2 "${S}"/raw/ || die "dict file not found" -} - -src_prepare() { - default - tc-export CXX -} - -src_compile() { - escons \ - --prefix="${EPREFIX}"/usr \ - --libdir="${EPREFIX}"/usr/$(get_libdir) \ - --libdatadir="${EPREFIX}"/usr/lib -} - -src_install() { - escons --install-sandbox="${D}" install -} - -pkg_postinst() { - elog "" - elog "If you have already installed former version of ${PN}" - elog "and any wrapper, please remerge the wrapper to make it work with" - elog "the new version." - elog "" - elog "To use any wrapper for ${PN}, please merge any of the following" - elog "packages: " - elog "emerge app-i18n/fcitx-sunpinyin" - elog "emerge app-i18n/ibus-sunpinyin" - elog "emerge app-i18n/scim-sunpinyin" - elog "emerge app-i18n/xsunpinyin" - elog "" -}
