From a0e4cb58d6460fde9337f8074672904135e76f29 Mon Sep 17 00:00:00 2001 From: Mu Qiao Date: Fri, 9 Sep 2011 14:42:36 +0800 Subject: fcitx: version bump (Portage version: 2.1.10.14/git/Linux x86_64, signed Manifest commit with key 17B157E9) --- app-i18n/fcitx/Manifest | 19 +++--- app-i18n/fcitx/fcitx-4.1.0.ebuild | 71 ---------------------- app-i18n/fcitx/fcitx-4.1.1.ebuild | 67 ++++++++++++++++++++ app-i18n/fcitx/files/fcitx-4.1.0-fix-ldflags.patch | 18 ------ 4 files changed, 76 insertions(+), 99 deletions(-) delete mode 100644 app-i18n/fcitx/fcitx-4.1.0.ebuild create mode 100644 app-i18n/fcitx/fcitx-4.1.1.ebuild delete mode 100644 app-i18n/fcitx/files/fcitx-4.1.0-fix-ldflags.patch diff --git a/app-i18n/fcitx/Manifest b/app-i18n/fcitx/Manifest index 014010a..a49937e 100644 --- a/app-i18n/fcitx/Manifest +++ b/app-i18n/fcitx/Manifest @@ -1,19 +1,18 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX fcitx-4.1.0-fix-ldflags.patch 1155 RMD160 62e20dd2999667b49bcb2a84a81fb3119dc7b7d3 SHA1 42b44972c3e8404516612a15f9f03fd30ecfc3e1 SHA256 673f82427b2650c8821607b6c2654711070ae217b9091b2d2e1afb24802c679d -DIST fcitx-4.1.0_all.tar.bz2 6553478 RMD160 9bc1165c346d3a58d63439df58c61a01fa2c5c38 SHA1 1a78bd170cb8ab0bbbb9e15117fcc8225ee7a4c9 SHA256 21ed00b81cda9234948c42c8adb03a1858f13836ed7ec233e0d75e5b43d9cbd8 -EBUILD fcitx-4.1.0.ebuild 1907 RMD160 bfcd4c2b7c42922868b73d5af06ae3de226ae4a8 SHA1 d8cecf938f5e4cecc1fd32a1f24bcde45763260b SHA256 ff0b416563f59be9d04b3c95a93c4b1f2aad9ca435fdae4cce81992f06e0ed9f +DIST fcitx-4.1.1_all.tar.bz2 6547617 RMD160 a520787fadcd65a3d9f810fa78633f9a0c60c361 SHA1 8924b14b5488a3f2e8b5d745507e319b70c4848c SHA256 ca7aa74ef3b1e80f2b1b882fdbc977b2bdd0a3eb75dd470fb159c703e0da9a75 +EBUILD fcitx-4.1.1.ebuild 1843 RMD160 67c279e608828a850f8b9d030fc055c9d332d654 SHA1 1fbe1e82691696715bc7e2fc4fa3b24d6f443044 SHA256 6cde1fa18be1b0912424cf1695b399bd3ef93ba0f6d5b62a985282cffb0691c6 MISC ChangeLog 5270 RMD160 9c653114a72df618809e3dd9d6ebd70891739456 SHA1 51ab8c3ae8293b1d86999fc121e9e063194b4b80 SHA256 2dc0b650f697431871426e830a6527869217c7d3982763df73da2bfee9736b3f MISC metadata.xml 448 RMD160 22554cba014d588f3536765426c3414166120d62 SHA1 12732807d9e43918ba3a8243f4eaadfc59d9a603 SHA256 27f577d53217c8613ac4ae8ac4e99de2f95fc940affd77f64c204cb39e4535c4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iQEcBAEBAgAGBQJOYfiFAAoJEDCzDeQXsVfpr18IAMS+IoFx2ttQ+NyoatOrf+ua -9AB3n5WALD0SEFWaSqnX9ohWWC9vk+kRbw1Dw37io3TkkCbP+EdawUU9aVD2Oax8 -rWZUWUJ1aJlgqoJ9J/jb2qaIGYoU8E2BLHTBG6lDFiFjYcrTH5/9jS3ucvwK7YVa -QrkQlOfC7v+gAjyh2WUfQ+OzQ1HnlKFuP/63tmMN/yFMyvQLIRjz8pPTI/7Tkt01 -Y8dDqiuDwFDi1LJz7MyaMiIGAcsdRxtwQjV1yido/b+FuC0xlHT8vT4+K873MoFz -YyR/OlfWJn2pBW6NihtnCpKY8kkIvhtoMvO4Gj5tlT63NpvppYEMOOzIXTfz8SA= -=t5rR +iQEcBAEBAgAGBQJOabVcAAoJEDCzDeQXsVfpok8IAJNrz5zYai/5rrszD2hhVtyp +z6IZSdJer6pJ+nrwkf/hX94BwxMAgjdE6wa0bxmaPxKtiHDUE3g2bJEHwKbZyFZ1 +lTleHhr34u5XKUqIp4XAP9PjfgzM0xoBsQaJV+shDzhCP537TMpTqttzG5V6jpxY +Ri8fOT/e+aqWUUQV/skBoG/LgAb3WLV0srE8Fua4Y1VdafoUfZghdLoYIEbFiZ1k +RaHaT/HgJckfQsQd3XjOHNFSUDXOGsmf0FLZNW4yAZqU5b2UUpvFhjYHhVQhkWjs +H7C+MDV1rPS3MM2gPX2fWngDwpRBQTZX9YEIcw7dT5n4DUv+uyDZ5dHenieCmNo= +=nKl0 -----END PGP SIGNATURE----- diff --git a/app-i18n/fcitx/fcitx-4.1.0.ebuild b/app-i18n/fcitx/fcitx-4.1.0.ebuild deleted file mode 100644 index 649865f..0000000 --- a/app-i18n/fcitx/fcitx-4.1.0.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/fcitx-4.0.1.ebuild,v 1.2 2010/12/19 02:48:24 qiaomuf Exp $ - -EAPI="3" - -inherit cmake-utils eutils - -DESCRIPTION="Free Chinese Input Toy for X. Another Chinese XIM Input Method" -HOMEPAGE="http://www.fcitx.org/" -SRC_URI="http://fcitx.googlecode.com/files/${P}_all.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="cairo dbus debug gtk gtk3 opencc pango" - -RDEPEND="=app-i18n/fcitx-configtool-0.3.0 - x11-libs/libX11 - x11-libs/libXrender - media-libs/fontconfig - pango? ( x11-libs/pango ) - opencc? ( app-i18n/opencc ) - gtk? ( x11-libs/gtk+:2 ) - gtk3? ( x11-libs/gtk+:3 ) - cairo? ( x11-libs/cairo[X] ) - dbus? ( sys-apps/dbus )" -DEPEND="${RDEPEND} - x11-proto/xproto - dev-util/pkgconfig" - -src_prepare() { - epatch "${FILESDIR}/${P}-fix-ldflags.patch" -} - -src_configure() { - local mycmakeargs=" - $(cmake-utils_use_enable cairo) - $(cmake-utils_use_enable dbus) - $(cmake-utils_use_enable debug) - $(cmake-utils_use_enable gtk gtk2_im_module) - $(cmake-utils_use_enable gtk3 gtk3_im_module) - $(cmake-utils_use_enable opencc) - $(cmake-utils_use_enable pango)" - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - - dodoc AUTHORS ChangeLog README THANKS TODO || die - - rm -rf "${ED}"/usr/share/fcitx/doc/ || die - dodoc doc/pinyin.txt doc/cjkvinput.txt || die - dohtml doc/wb_fh.htm || die -} - -pkg_postinst() { - elog - elog "You should export the following variables to use fcitx" - elog " export XMODIFIERS=\"@im=fcitx\"" - elog " export XIM=fcitx" - elog " export XIM_PROGRAM=fcitx" - elog - elog "If you want to use WuBi ,ErBi or something else." - elog " mkdir -p ~/.fcitx" - elog " cp /usr/share/fcitx/data/wbx.mb ~/.fcitx" - elog " cp /usr/share/fcitx/data/erbi.mb ~/.fcitx" - elog " cp /usr/share/fcitx/data/tables.conf ~/.fcitx" - elog -} diff --git a/app-i18n/fcitx/fcitx-4.1.1.ebuild b/app-i18n/fcitx/fcitx-4.1.1.ebuild new file mode 100644 index 0000000..3ed2106 --- /dev/null +++ b/app-i18n/fcitx/fcitx-4.1.1.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/fcitx-4.0.1.ebuild,v 1.2 2010/12/19 02:48:24 qiaomuf Exp $ + +EAPI="3" + +inherit cmake-utils eutils + +DESCRIPTION="Free Chinese Input Toy for X. Another Chinese XIM Input Method" +HOMEPAGE="http://www.fcitx.org/" +SRC_URI="http://fcitx.googlecode.com/files/${P}_all.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="cairo dbus debug gtk gtk3 opencc pango" + +RDEPEND="=app-i18n/fcitx-configtool-0.3.0 + x11-libs/libX11 + x11-libs/libXrender + media-libs/fontconfig + pango? ( x11-libs/pango ) + opencc? ( app-i18n/opencc ) + gtk? ( x11-libs/gtk+:2 ) + gtk3? ( x11-libs/gtk+:3 ) + cairo? ( x11-libs/cairo[X] ) + dbus? ( sys-apps/dbus )" +DEPEND="${RDEPEND} + x11-proto/xproto + dev-util/pkgconfig" + +src_configure() { + local mycmakeargs=" + $(cmake-utils_use_enable cairo) + $(cmake-utils_use_enable dbus) + $(cmake-utils_use_enable debug) + $(cmake-utils_use_enable gtk gtk2_im_module) + $(cmake-utils_use_enable gtk3 gtk3_im_module) + $(cmake-utils_use_enable opencc) + $(cmake-utils_use_enable pango)" + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + + dodoc AUTHORS ChangeLog README THANKS TODO || die + + rm -rf "${ED}"/usr/share/fcitx/doc/ || die + dodoc doc/pinyin.txt doc/cjkvinput.txt || die + dohtml doc/wb_fh.htm || die +} + +pkg_postinst() { + elog + elog "You should export the following variables to use fcitx" + elog " export XMODIFIERS=\"@im=fcitx\"" + elog " export XIM=fcitx" + elog " export XIM_PROGRAM=fcitx" + elog + elog "If you want to use WuBi ,ErBi or something else." + elog " mkdir -p ~/.fcitx" + elog " cp /usr/share/fcitx/data/wbx.mb ~/.fcitx" + elog " cp /usr/share/fcitx/data/erbi.mb ~/.fcitx" + elog " cp /usr/share/fcitx/data/tables.conf ~/.fcitx" + elog +} diff --git a/app-i18n/fcitx/files/fcitx-4.1.0-fix-ldflags.patch b/app-i18n/fcitx/files/fcitx-4.1.0-fix-ldflags.patch deleted file mode 100644 index 0ca5097..0000000 --- a/app-i18n/fcitx/files/fcitx-4.1.0-fix-ldflags.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -r f6cd2db5d10f -r faf8d566e65f CMakeLists.txt ---- a/CMakeLists.txt Sat Sep 03 13:01:35 2011 +0800 -+++ b/CMakeLists.txt Sat Sep 03 17:20:16 2011 +0800 -@@ -126,10 +126,10 @@ - set(FCITX4_ADDON_CONFIG_INSTALL_DIR ${addonconfigdir}) - set(FCITX4_PACKAGE_NAME ${package}) - --set(CMAKE_C_FLAGS "-Wall -Wextra -Wno-sign-compare -Wno-unused-parameter -fvisibility=hidden") --set(CMAKE_CXX_FLAGS "-Wall -Wextra -Wno-sign-compare -Wno-unused-parameter -fvisibility=hidden") --set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined,--as-needed") --set(CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined,--as-needed") -+set(CMAKE_C_FLAGS "-Wall -Wextra -Wno-sign-compare -Wno-unused-parameter -fvisibility=hidden ${CMAKE_C_FLAGS}") -+set(CMAKE_CXX_FLAGS "-Wall -Wextra -Wno-sign-compare -Wno-unused-parameter -fvisibility=hidden ${CMAKE_CXX_FLAGS}") -+set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined,--as-needed ${CMAKE_SHARED_LINKER_FLAGS}") -+set(CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined,--as-needed ${CMAKE_MODULE_LINKER_FLAGS}") - add_definitions("-D_GNU_SOURCE -DFCITX_HAVE_CONFIG_H") - - configure_file(${PROJECT_SOURCE_DIR}/config.h.in ${PROJECT_BINARY_DIR}/config.h) -- cgit v1.2.3-65-gdbad