Version bump (bug #439706). Remove some old versions.

(Portage version: 2.2.0_alpha123/cvs/Linux x86_64)

4 files changed, 36 insertions, 141 deletions

diff --git a/app-i18n/fcitx/ChangeLog b/app-i18n/fcitx/ChangeLog
index 5524e9ae8fee..d322a76d1064 100644
--- a/app-i18n/fcitx/ChangeLog
+++ b/app-i18n/fcitx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/fcitx
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/ChangeLog,v 1.51 2012/08/19 08:47:40 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/ChangeLog,v 1.52 2012/10/27 05:40:38 yngwin Exp $
+
+*fcitx-4.2.6.1 (27 Oct 2012)
+
+  27 Oct 2012; Ben de Groot <yngwin@gentoo.org> +fcitx-4.2.6.1.ebuild,
+  -fcitx-3.6.3.ebuild, -fcitx-4.0.0.ebuild, -fcitx-4.2.4.ebuild:
+  Version bump (bug #439706). Remove some old versions.
 
   19 Aug 2012; Tomáš Chvátal <scarabeus@gentoo.org> fcitx-4.2.1.ebuild:
   ppc stable wrt bug#431902. Fix automagic fetching during build (already fixed
diff --git a/app-i18n/fcitx/fcitx-3.6.3.ebuild b/app-i18n/fcitx/fcitx-3.6.3.ebuild
deleted file mode 100644
index 39c1be39a91b..000000000000
--- a/app-i18n/fcitx/fcitx-3.6.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/fcitx-3.6.3.ebuild,v 1.2 2012/05/03 19:24:26 jdhore Exp $
-
-EAPI=2
-inherit autotools eutils
-
-DESCRIPTION="Free Chinese Input Toy for X. Another Chinese XIM Input Method"
-HOMEPAGE="http://www.fcitx.org/"
-SRC_URI="http://www.fcitx.org/download/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="dbus"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXpm
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/libXtst
-	x11-libs/libXext
-	x11-libs/libXft
-	dbus? ( >=sys-apps/dbus-0.2 )"
-DEPEND="${RDEPEND}
-	x11-proto/xproto
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-asneeded.patch
-	eautoreconf
-}
-
-src_configure() {
-	# --disable-xft doesn't work
-	# econf $(use_enable xft) || die
-	econf $(use_enable dbus) || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog README THANKS TODO || die
-
-	rm -rf "${D}"/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.0.0.ebuild b/app-i18n/fcitx/fcitx-4.0.0.ebuild
deleted file mode 100644
index 07c2fe300c28..000000000000
--- a/app-i18n/fcitx/fcitx-4.0.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/fcitx-4.0.0.ebuild,v 1.4 2012/05/18 14:21:32 josejx Exp $
-
-EAPI="3"
-
-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.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="dbus pango"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXrender
-	x11-libs/cairo[X]
-	media-libs/fontconfig
-	pango? ( x11-libs/pango )
-	dbus? ( >=sys-apps/dbus-0.2 )"
-DEPEND="${RDEPEND}
-	x11-proto/xproto
-	virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		$(use_enable dbus) \
-		$(use_enable pango) || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	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.2.4.ebuild b/app-i18n/fcitx/fcitx-4.2.6.1.ebuild
index a913445b165c..3149ef2f9d18 100644
--- a/app-i18n/fcitx/fcitx-4.2.4.ebuild
+++ b/app-i18n/fcitx/fcitx-4.2.6.1.ebuild
@@ -1,23 +1,27 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/fcitx-4.2.4.ebuild,v 1.2 2012/06/10 09:15:46 qiaomuf Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/fcitx-4.2.6.1.ebuild,v 1.1 2012/10/27 05:40:38 yngwin Exp $
 
-EAPI="3"
+EAPI=4
 
 inherit multilib cmake-utils eutils
 
-DESCRIPTION="Free Chinese Input Toy for X. Another Chinese XIM Input Method"
+_en_dict_version=20121020  # see https://code.google.com/p/fcitx/downloads/list
+
+DESCRIPTION="An input method framework with extension support"
 HOMEPAGE="http://www.fcitx.org/"
 SRC_URI="http://fcitx.googlecode.com/files/${P}.tar.xz
 		http://fcitx.googlecode.com/files/pinyin.tar.gz
+		http://fcitx.googlecode.com/files/en_dict-${_en_dict_version}.tar.gz
 		table? ( http://fcitx.googlecode.com/files/table.tar.gz )"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="+cairo debug gtk gtk3 introspection lua opencc +pango qt4 snooper static-libs +table test"
+IUSE="+cairo debug gtk gtk3 icu introspection lua opencc +pango qt4 snooper static-libs +table test +xml"
 
-RDEPEND="
+RDEPEND="sys-apps/dbus
+	x11-libs/libX11
 	cairo? (
 		x11-libs/cairo[X]
 		pango? ( x11-libs/pango[X] )
@@ -33,6 +37,7 @@ RDEPEND="
 		dev-libs/glib:2
 		dev-libs/dbus-glib
 	)
+	icu? ( dev-libs/icu )
 	introspection? ( dev-libs/gobject-introspection )
 	lua? ( dev-lang/lua )
 	opencc? ( app-i18n/opencc )
@@ -40,16 +45,16 @@ RDEPEND="
 		x11-libs/qt-gui:4
 		x11-libs/qt-dbus:4
 	)
-	sys-apps/dbus
-	x11-libs/libX11"
+	xml? (
+		app-text/iso-codes
+		dev-libs/libxml2
+		x11-libs/libxkbfile
+	)"
 DEPEND="${RDEPEND}
 	app-arch/xz-utils
 	app-text/enchant
-	app-text/iso-codes
-	dev-libs/icu
 	dev-util/intltool
 	virtual/pkgconfig
-	x11-libs/libxkbfile
 	x11-proto/xproto"
 
 update_gtk_immodules() {
@@ -72,9 +77,11 @@ update_gtk3_immodules() {
 }
 
 src_prepare() {
-	cp "${DISTDIR}/pinyin.tar.gz" "${S}/data" || die "pinyin.tar.gz is not found"
+	cp "${DISTDIR}/pinyin.tar.gz" "${S}/data" || die "pinyin data file is not found"
+	cp "${DISTDIR}/en_dict-${_en_dict_version}.tar.gz" "${S}/data" \
+		|| die "en_dict-${_en_dict_version} data file is not found"
 	if use table ; then
-		cp "${DISTDIR}/table.tar.gz" "${S}/data/table" || die "table.tar.gz is not found"
+		cp "${DISTDIR}/table.tar.gz" "${S}/data/table" || die "table data file is not found"
 	fi
 }
 
@@ -85,6 +92,7 @@ src_configure() {
 		$(cmake-utils_use_enable debug DEBUG)
 		$(cmake-utils_use_enable gtk GTK2_IM_MODULE)
 		$(cmake-utils_use_enable gtk3 GTK3_IM_MODULE)
+		$(cmake-utils_use_enable icu ICU)
 		$(cmake-utils_use_enable introspection GIR)
 		$(cmake-utils_use_enable lua LUA)
 		$(cmake-utils_use_enable opencc OPENCC)
@@ -93,28 +101,27 @@ src_configure() {
 		$(cmake-utils_use_enable snooper SNOOPER)
 		$(cmake-utils_use_enable static-libs STATIC)
 		$(cmake-utils_use_enable table TABLE)
-		$(cmake-utils_use_enable test TEST)"
+		$(cmake-utils_use_enable test TEST)
+		$(cmake-utils_use_enable xml LIBXML2)"
 	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
+	rm -rf "${ED}"/usr/share/doc/${PN} || die
+	dodoc AUTHORS ChangeLog README THANKS TODO doc/pinyin.txt doc/cjkvinput.txt
+	dohtml doc/wb_fh.htm
 }
 
 pkg_postinst() {
 	use gtk && update_gtk_immodules
 	use gtk3 && update_gtk3_immodules
 	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 "You should export the following variables to use fcitx:"
+	elog "  export XMODIFIERS=\"@im=fcitx\""
+	elog "  export XIM=fcitx"
+	elog "  export XIM_PROGRAM=fcitx"
 	elog
 }