Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 439706 - app-i18n/fcitx-4.2.6.1 version bump
Summary: app-i18n/fcitx-4.2.6.1 version bump
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: New packages (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Mu Qiao (RETIRED)
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-10-26 04:31 UTC by YeLee
Modified: 2012-10-27 05:43 UTC (History)
1 user (show)

See Also:
Package list:
Runtime testing required: ---


Attachments
fcitx-4.2.6.1.ebuild (fcitx-4.2.6.1.ebuild,3.37 KB, text/plain)
2012-10-26 04:32 UTC, YeLee
Details

Note You need to log in before you can comment on or make changes to this bug.
Description YeLee 2012-10-26 04:31:28 UTC
fcitx-4.2.6.1 is available at http://fcitx.googlecode.com/files/fcitx-4.2.6.1.tar.xz

Reproducible: Always
Comment 1 YeLee 2012-10-26 04:32:11 UTC
Created attachment 327446 [details]
fcitx-4.2.6.1.ebuild
Comment 2 Jeroen Roovers (RETIRED) gentoo-dev 2012-10-26 16:22:30 UTC
Comment on attachment 327446 [details]
fcitx-4.2.6.1.ebuild

--- fcitx-4.2.5.ebuild  2012-07-19 09:43:11.000000000 +0200  
+++ -   2012-10-26 18:21:24.117022183 +0200                  
@@ -1,6 +1,6 @@                                              
 # 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.5.ebuild,v 1.1 2012/07/19 07:43:11 yngwin Exp $
+# $Header: $                                                
                                                             
 EAPI=4                                                      
                                                             
@@ -10,12 +10,13 @@                                          
 HOMEPAGE="http://www.fcitx.org/"                            
 SRC_URI="http://fcitx.googlecode.com/files/${P}.tar.xz      
                http://fcitx.googlecode.com/files/pinyin.tar.gz
+               https://github.com/downloads/fcitx/fcitx/en_dict-20120815.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"
+KEYWORDS="~x86 ~amd64"                                      
+IUSE="+cairo +pango +xml debug +table +gtk gtk3 qt4 +opencc lua static-libs snooper test introspection +icu"
                                                             
 RDEPEND="                                                   
        cairo? (                                             
@@ -23,6 +24,11 @@                                           
                pango? ( x11-libs/pango[X] )                 
                !pango? ( media-libs/fontconfig )            
        )                                                    
+       xml? (                                               
+               dev-libs/libxml2                             
+               app-text/iso-codes                           
+               x11-libs/libxkbfile                          
+       )                                                    
        gtk? (                                               
                x11-libs/gtk+:2                              
                dev-libs/glib:2                              
@@ -33,28 +39,25 @@                                          
                dev-libs/glib:2                              
                dev-libs/dbus-glib                           
        )                                                    
-       introspection? ( dev-libs/gobject-introspection )    
-       lua? ( dev-lang/lua )                                
-       opencc? ( app-i18n/opencc )                          
        qt4? (                                               
                x11-libs/qt-gui:4                            
                x11-libs/qt-dbus:4                           
        )                                                    
-       sys-apps/dbus                                        
-       x11-libs/libX11"                                     
+       opencc? ( app-i18n/opencc )                          
+       lua? ( dev-lang/lua )                                
+       introspection? ( dev-libs/gobject-introspection )    
+       icu? ( dev-libs/icu )"                               
 DEPEND="${RDEPEND}                                          
        app-arch/xz-utils                                    
        app-text/enchant                                     
-       app-text/iso-codes                                   
-       dev-libs/icu                                         
        dev-util/intltool                                    
+       sys-devel/gettext                                    
+       virtual/libiconv                                     
        virtual/pkgconfig                                    
-       x11-libs/libxkbfile                                  
        x11-proto/xproto"                                    
                                                             
 update_gtk_immodules() {                                    
        local GTK2_CONFDIR="/etc/gtk-2.0"                    
-       # bug #366889                                        
        if has_version '>=x11-libs/gtk+-2.22.1-r1:2' || has_multilib_profile ; then
                GTK2_CONFDIR="${GTK2_CONFDIR}/$(get_abi_CHOST)"
        fi
@@ -72,9 +75,10 @@                                           
 }                                                           
                                                             
 src_prepare() {                                             
-       cp "${DISTDIR}/pinyin.tar.gz" "${S}/data" || die "pinyin.tar.gz is not found"
+       ln -sf "${DISTDIR}/pinyin.tar.gz" "${S}/data" || die "pinyin.tar.gz is not found"
+       ln -sf "${DISTDIR}/en_dict-20120815.tar.gz" "${S}/data" || die "en_dict.tar.gz is not found"
        if use table ; then                                  
-               cp "${DISTDIR}/table.tar.gz" "${S}/data/table" || die "table.tar.gz is not found"
+               ln -sf "${DISTDIR}/table.tar.gz" "${S}/data/table" || die "table.tar.gz is not found"
        fi                                                   
 }                                                           
                                                             
@@ -82,18 +86,20 @@                                          
        local mycmakeargs="                                  
                -DLIB_INSTALL_DIR=/usr/$(get_libdir)         
                $(cmake-utils_use_enable cairo CARIO)        
+               $(cmake-utils_use_enable pango PANGO)        
+               $(cmake-utils_use_enable xml LIBXML2)        
                $(cmake-utils_use_enable debug DEBUG)        
+               $(cmake-utils_use_enable table TABLE)        
                $(cmake-utils_use_enable gtk GTK2_IM_MODULE) 
                $(cmake-utils_use_enable gtk3 GTK3_IM_MODULE)
-               $(cmake-utils_use_enable introspection GIR)  
-               $(cmake-utils_use_enable lua LUA)            
-               $(cmake-utils_use_enable opencc OPENCC)      
-               $(cmake-utils_use_enable pango PANGO)        
                $(cmake-utils_use_enable qt4 QT_IM_MODULE)   
-               $(cmake-utils_use_enable snooper SNOOPER)    
+               $(cmake-utils_use_enable opencc OPENCC)      
+               $(cmake-utils_use_enable lua LUA)            
                $(cmake-utils_use_enable static-libs STATIC) 
-               $(cmake-utils_use_enable table TABLE)        
                $(cmake-utils_use_enable test TEST)"         
+               $(cmake-utils_use_enable snooper SNOOPER)    
+               $(cmake-utils_use_enable introspection GIR)  
+               $(cmake-utils_use_enable icu ICU)            
        cmake-utils_src_configure                            
 }                                                           
                                                             
@@ -101,8 +107,8 @@                                          
        cmake-utils_src_install                              
                                                             
        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                                 
+       dodoc AUTHORS ChangeLog README THANKS TODO doc/pinyin.txt doc/cjkvinput.txt || die
+       dohtml doc/wb_fh.htm || die                          
 }                                                           
                                                             
 pkg_postinst() {
Comment 3 Ben de Groot (RETIRED) gentoo-dev 2012-10-27 05:43:45 UTC
+*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.

In future, please attach a diff (as Jeroen produced), but based on the latest version in portage. Don't move things around needlessly. We try to keep things alphabetically ordered.

I added the English dictionary data file, but we should consider if we want to split that out, with the pinyin data file, into a separate fcitx-data ebuild.