Fixed dodoc issue, bug #374811. Respect LDFLAGS, bug #334849. Clean up.
authorMatsuu Takuto <matsuu@gentoo.org>
Sun, 20 Nov 2011 23:40:31 +0000 (23:40 +0000)
committerMatsuu Takuto <matsuu@gentoo.org>
Sun, 20 Nov 2011 23:40:31 +0000 (23:40 +0000)
Package-Manager: portage-2.1.10.29/cvs/Linux x86_64

app-i18n/xcin/ChangeLog
app-i18n/xcin/files/xcin-2.5.3_pre3-ldflags.patch [new file with mode: 0644]
app-i18n/xcin/files/xcin-2.5.3_pre3-make.patch [new file with mode: 0644]
app-i18n/xcin/xcin-2.5.3_pre3-r3.ebuild [new file with mode: 0644]

index c511f67ceefea6bc13d96ed57c79be609b67609f..acd2a50529047916714b0941bacc811027ab5203 100644 (file)
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/xcin
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/xcin/ChangeLog,v 1.20 2009/12/29 16:10:05 ssuominen Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/xcin/ChangeLog,v 1.21 2011/11/20 23:40:31 matsuu Exp $
+
+*xcin-2.5.3_pre3-r3 (20 Nov 2011)
+
+  20 Nov 2011; MATSUU Takuto <matsuu@gentoo.org> +xcin-2.5.3_pre3-r3.ebuild,
+  +files/xcin-2.5.3_pre3-ldflags.patch, +files/xcin-2.5.3_pre3-make.patch:
+  Fixed dodoc issue, bug #374811. Respect LDFLAGS, bug #334849. Clean up.
 
   29 Dec 2009; Samuli Suominen <ssuominen@gentoo.org>
   xcin-2.5.3_pre3-r2.ebuild, +files/xcin-2.5.3_pre3-glibc-2.10.patch:
diff --git a/app-i18n/xcin/files/xcin-2.5.3_pre3-ldflags.patch b/app-i18n/xcin/files/xcin-2.5.3_pre3-ldflags.patch
new file mode 100644 (file)
index 0000000..3744908
--- /dev/null
@@ -0,0 +1,96 @@
+diff -Naur xcin-2.5.2.99.pre2+cvs20030224.orig/src/Cinput/bimsphone/Makefile.in xcin-2.5.2.99.pre2+cvs20030224/src/Cinput/bimsphone/Makefile.in
+--- xcin-2.5.2.99.pre2+cvs20030224.orig/src/Cinput/bimsphone/Makefile.in       2001-11-11 21:50:46.000000000 +0900
++++ xcin-2.5.2.99.pre2+cvs20030224/src/Cinput/bimsphone/Makefile.in    2011-11-21 01:08:21.736965412 +0900
+@@ -15,7 +15,7 @@
+ 
+ $(TARGET): $(OBJ)
+       $(LIBTOOL) --mode=link $(CC) -module -avoid-version -o $(TARGET) \
+-              $(OBJ) $(LIB) -rpath $(moddir)
++              $(OBJ) $(LDFLAGS) $(LIB) -rpath $(moddir)
+ include .depend
+ 
+ depend:
+diff -Naur xcin-2.5.2.99.pre2+cvs20030224.orig/src/Cinput/chewing/Makefile.in xcin-2.5.2.99.pre2+cvs20030224/src/Cinput/chewing/Makefile.in
+--- xcin-2.5.2.99.pre2+cvs20030224.orig/src/Cinput/chewing/Makefile.in 2011-11-21 01:07:12.878761904 +0900
++++ xcin-2.5.2.99.pre2+cvs20030224/src/Cinput/chewing/Makefile.in      2011-11-21 08:32:24.024474064 +0900
+@@ -21,7 +21,7 @@
+ 
+ $(TARGET): $(OBJ)
+       $(LIBTOOL) --mode=link $(CC) -module -avoid-version -o $(TARGET) \
+-              $(OBJ) $(LIB) -rpath $(moddir)
++              $(OBJ) $(LDFLAGS) $(LIB) -rpath $(moddir)
+ include .depend
+ 
+ sort_word: sort_word.c key2pho.c
+diff -Naur xcin-2.5.2.99.pre2+cvs20030224.orig/src/Cinput/gen_inp/Makefile.in xcin-2.5.2.99.pre2+cvs20030224/src/Cinput/gen_inp/Makefile.in
+--- xcin-2.5.2.99.pre2+cvs20030224.orig/src/Cinput/gen_inp/Makefile.in 2001-11-11 21:50:46.000000000 +0900
++++ xcin-2.5.2.99.pre2+cvs20030224/src/Cinput/gen_inp/Makefile.in      2011-11-21 01:08:21.736965412 +0900
+@@ -15,7 +15,7 @@
+ 
+ $(TARGET): $(OBJ)
+       $(LIBTOOL) --mode=link $(CC) -module -avoid-version -o $(TARGET) \
+-              $(OBJ) $(LIB) -rpath $(moddir)
++              $(OBJ) $(LDFLAGS) $(LIB) -rpath $(moddir)
+ include .depend
+ 
+ depend:
+diff -Naur xcin-2.5.2.99.pre2+cvs20030224.orig/src/Cinput/zh_hex/Makefile.in xcin-2.5.2.99.pre2+cvs20030224/src/Cinput/zh_hex/Makefile.in
+--- xcin-2.5.2.99.pre2+cvs20030224.orig/src/Cinput/zh_hex/Makefile.in  2001-11-11 21:50:47.000000000 +0900
++++ xcin-2.5.2.99.pre2+cvs20030224/src/Cinput/zh_hex/Makefile.in       2011-11-21 01:08:21.736965412 +0900
+@@ -14,7 +14,7 @@
+ 
+ $(TARGET): $(OBJ)
+       $(LIBTOOL) --mode=link $(CC) -module -avoid-version -o $(TARGET) \
+-              $(OBJ) -rpath $(moddir)
++              $(OBJ) $(LDFLAGS) -rpath $(moddir)
+ include .depend
+ 
+ depend:
+diff -Naur xcin-2.5.2.99.pre2+cvs20030224.orig/src/Makefile.in xcin-2.5.2.99.pre2+cvs20030224/src/Makefile.in
+--- xcin-2.5.2.99.pre2+cvs20030224.orig/src/Makefile.in        2001-11-05 01:47:26.000000000 +0900
++++ xcin-2.5.2.99.pre2+cvs20030224/src/Makefile.in     2011-11-21 01:08:53.576059606 +0900
+@@ -26,7 +26,7 @@
+ 
+ $(BIN): subsys $(OBJ)
+       @$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -export-dynamic \
+-              $(INC) $(DEFS) -o $(BIN) $(OBJ) $(LIB)
++              $(INC) $(DEFS) -o $(BIN) $(OBJ) $(LDFLAGS) $(LIB)
+ include .depend
+ 
+ subsys:
+diff -Naur xcin-2.5.2.99.pre2+cvs20030224.orig/src/lib/Makefile.in xcin-2.5.2.99.pre2+cvs20030224/src/lib/Makefile.in
+--- xcin-2.5.2.99.pre2+cvs20030224.orig/src/lib/Makefile.in    2001-09-21 02:00:57.000000000 +0900
++++ xcin-2.5.2.99.pre2+cvs20030224/src/lib/Makefile.in 2011-11-21 01:08:21.736965412 +0900
+@@ -23,7 +23,7 @@
+ 
+ $(LXCIN_NAME): make_subdir
+       ( OBJS=`ls $(LXCIN_OBJ)`; \
+-        $(LIBTOOL) --mode=link $(CC) -o $@ $$OBJS $(LIB) -rpath $(libdir) \
++        $(LIBTOOL) --mode=link $(CC) -o $@ $$OBJS $(LDFLAGS) $(LIB) -rpath $(libdir) \
+               -version-info $(CURRENT_VER):$(REVISION_VER):$(AGE_VER) )
+ 
+ make_subdir:
+diff -Naur xcin-2.5.2.99.pre2+cvs20030224.orig/src/util/cin2tab/Makefile.in xcin-2.5.2.99.pre2+cvs20030224/src/util/cin2tab/Makefile.in
+--- xcin-2.5.2.99.pre2+cvs20030224.orig/src/util/cin2tab/Makefile.in   2001-11-05 01:47:29.000000000 +0900
++++ xcin-2.5.2.99.pre2+cvs20030224/src/util/cin2tab/Makefile.in        2011-11-21 01:08:21.736965412 +0900
+@@ -14,7 +14,7 @@
+ all: $(BIN)
+ 
+ $(BIN): $(OBJ)
+-      $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(INC) $(DEFS) -o $(BIN) $(OBJ) $(LIB)
++      $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(INC) $(DEFS) -o $(BIN) $(OBJ) $(LDFLAGS) $(LIB)
+ include .depend
+ 
+ depend:
+diff -Naur xcin-2.5.2.99.pre2+cvs20030224.orig/src/util/testprog/Makefile.in xcin-2.5.2.99.pre2+cvs20030224/src/util/testprog/Makefile.in
+--- xcin-2.5.2.99.pre2+cvs20030224.orig/src/util/testprog/Makefile.in  2002-01-01 22:49:17.000000000 +0900
++++ xcin-2.5.2.99.pre2+cvs20030224/src/util/testprog/Makefile.in       2011-11-21 08:33:44.547672718 +0900
+@@ -15,7 +15,7 @@
+ all: $(BIN)
+ 
+ $(BIN): $(OBJ)
+-      $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJ) $(LIB)
++      $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJ) $(LDFLAGS) $(LIB)
+ include .depend
+ 
+ depend:
diff --git a/app-i18n/xcin/files/xcin-2.5.3_pre3-make.patch b/app-i18n/xcin/files/xcin-2.5.3_pre3-make.patch
new file mode 100644 (file)
index 0000000..d5967c3
--- /dev/null
@@ -0,0 +1,118 @@
+diff -ur xcin-2.5.2.99.pre2+cvs20030224.orig/cin/big5/Makefile.in xcin-2.5.2.99.pre2+cvs20030224/cin/big5/Makefile.in
+--- xcin-2.5.2.99.pre2+cvs20030224.orig/cin/big5/Makefile.in   2001-09-07 00:41:32.000000000 +0900
++++ xcin-2.5.2.99.pre2+cvs20030224/cin/big5/Makefile.in        2011-11-21 00:44:20.979695505 +0900
+@@ -9,43 +9,43 @@
+ all: all-$(OS_TYPE)
+ 
+ all-LINUX:
+-      ( BIG5ENC=big5 BIG5HKENC=big5hkscs make -f Rules make-big5 make-big5hkscs )
++      ( BIG5ENC=big5 BIG5HKENC=big5hkscs $(MAKE) -f Rules make-big5 make-big5hkscs )
+ 
+ all-FREEBSD:
+-      ( BIG5ENC=big5 make -f Rules make-big5 )
++      ( BIG5ENC=big5 $(MAKE) -f Rules make-big5 )
+ 
+ all-OPENBSD:
+-      ( BIG5ENC=big5 make -f Rules make-big5 )
++      ( BIG5ENC=big5 $(MAKE) -f Rules make-big5 )
+ 
+ all-NETBSD:
+-      ( BIG5ENC=big5 make -f Rules make-big5 )
++      ( BIG5ENC=big5 $(MAKE) -f Rules make-big5 )
+ 
+ all-HPUX:
+-      ( BIG5ENC=big5 BIG5HKENC=hkbig5 make -f Rules make-big5 make-big5hkscs )
++      ( BIG5ENC=big5 BIG5HKENC=hkbig5 $(MAKE) -f Rules make-big5 make-big5hkscs )
+ 
+ all-SOLARIS:
+-      ( BIG5ENC=big5 make -f Rules make-big5 )
++      ( BIG5ENC=big5 $(MAKE) -f Rules make-big5 )
+ 
+ 
+ install: all install-$(OS_TYPE)
+ 
+ install-LINUX:
+-      ( BIG5ENC=big5 BIG5HKENC=big5hkscs make -f Rules install_big5 install_big5hkscs )
++      ( BIG5ENC=big5 BIG5HKENC=big5hkscs $(MAKE) -f Rules install_big5 install_big5hkscs )
+ 
+ install-FREEBSD:
+-      ( BIG5ENC=big5 make -f Rules install_big5 )
++      ( BIG5ENC=big5 $(MAKE) -f Rules install_big5 )
+ 
+ install-OPENBSD:
+-      ( BIG5ENC=big5 make -f Rules install_big5 )
++      ( BIG5ENC=big5 $(MAKE) -f Rules install_big5 )
+ 
+ install-NETBSD:
+-      ( BIG5ENC=big5 make -f Rules install_big5 )
++      ( BIG5ENC=big5 $(MAKE) -f Rules install_big5 )
+ 
+ install-HPUX:
+-      ( BIG5ENC=big5 BIG5HKENC=hkbig5 make -f Rules install_big5 install_big5hkscs )
++      ( BIG5ENC=big5 BIG5HKENC=hkbig5 $(MAKE) -f Rules install_big5 install_big5hkscs )
+ 
+ install-SOLARIS:
+-      ( BIG5ENC=big5 make -f Rules install_big5 )
++      ( BIG5ENC=big5 $(MAKE) -f Rules install_big5 )
+ 
+ 
+ clean:
+diff -ur xcin-2.5.2.99.pre2+cvs20030224.orig/cin/gb/Makefile.in xcin-2.5.2.99.pre2+cvs20030224/cin/gb/Makefile.in
+--- xcin-2.5.2.99.pre2+cvs20030224.orig/cin/gb/Makefile.in     2001-09-07 00:41:33.000000000 +0900
++++ xcin-2.5.2.99.pre2+cvs20030224/cin/gb/Makefile.in  2011-11-21 00:44:07.491653510 +0900
+@@ -9,43 +9,43 @@
+ all: all-$(OS_TYPE)
+ 
+ all-LINUX:
+-      ( GB2312ENC=gb2312 GBKENC=gbk make -f Rules make-gb2312 make-gbk )
++      ( GB2312ENC=gb2312 GBKENC=gbk $(MAKE) -f Rules make-gb2312 make-gbk )
+ 
+ all-FREEBSD:
+-      ( GB2312ENC=euc make -f Rules make-gb2312 )
++      ( GB2312ENC=euc $(MAKE) -f Rules make-gb2312 )
+ 
+ all-OPENBSD:
+-      ( GB2312ENC=euc make -f Rules make-gb2312 )
++      ( GB2312ENC=euc $(MAKE) -f Rules make-gb2312 )
+ 
+ all-NETBSD:
+-      ( GB2312ENC=euccn make -f Rules make-gb2312 )
++      ( GB2312ENC=euccn $(MAKE) -f Rules make-gb2312 )
+ 
+ all-HPUX:
+-      ( GB2312ENC=hp15cn make -f Rules make-gb2312 )
++      ( GB2312ENC=hp15cn $(MAKE) -f Rules make-gb2312 )
+ 
+ all-SOLARIS:
+-      ( GB2312ENC=euc make -f Rules make-gb2312 )
++      ( GB2312ENC=euc $(MAKE) -f Rules make-gb2312 )
+ 
+ 
+ install: all install-$(OS_TYPE)
+ 
+ install-LINUX:
+-      ( GB2312ENC=gb2312 GBKENC=gbk make -f Rules install_gb2312 install_gbk )
++      ( GB2312ENC=gb2312 GBKENC=gbk $(MAKE) -f Rules install_gb2312 install_gbk )
+ 
+ install-FREEBSD:
+-      ( GB2312ENC=euc make -f Rules install_gb2312 )
++      ( GB2312ENC=euc $(MAKE) -f Rules install_gb2312 )
+ 
+ install-OPENBSD:
+-      ( GB2312ENC=euc make -f Rules install_gb2312 )
++      ( GB2312ENC=euc $(MAKE) -f Rules install_gb2312 )
+ 
+ install-NETBSD:
+-      ( GB2312ENC=euccn make -f Rules install_gb2312 )
++      ( GB2312ENC=euccn $(MAKE) -f Rules install_gb2312 )
+ 
+ install-HPUX:
+-      ( GB2312ENC=hp15cn make -f Rules install_gb2312 )
++      ( GB2312ENC=hp15cn $(MAKE) -f Rules install_gb2312 )
+ 
+ install-SOLARIS:
+-      ( GB2312ENC=euc make -f Rules install_gb2312 )
++      ( GB2312ENC=euc $(MAKE) -f Rules install_gb2312 )
+ 
+ clean:
+       rm -f *.tab* core
diff --git a/app-i18n/xcin/xcin-2.5.3_pre3-r3.ebuild b/app-i18n/xcin/xcin-2.5.3_pre3-r3.ebuild
new file mode 100644 (file)
index 0000000..2059208
--- /dev/null
@@ -0,0 +1,77 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/xcin/xcin-2.5.3_pre3-r3.ebuild,v 1.1 2011/11/20 23:40:31 matsuu Exp $
+
+EAPI="4"
+inherit multilib eutils autotools libtool
+
+MY_P=${PN}_2.5.2.99.pre2+cvs20030224
+
+DESCRIPTION="Chinese X Input Method"
+HOMEPAGE="http://cle.linux.org.tw/xcin/"
+SRC_URI="mirror://debian/pool/main/x/${PN}/${MY_P}.orig.tar.gz
+       mirror://debian/pool/main/x/${PN}/${MY_P}-1.4.diff.gz"
+
+LICENSE="XCIN GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug nls unicode"
+
+RDEPEND=">=sys-libs/db-4.5
+       >=app-i18n/libtabe-0.2.6
+       unicode? ( media-fonts/hkscs-ming
+               media-fonts/arphicfonts )
+       dev-libs/libchewing
+       x11-libs/libX11"
+DEPEND="${RDEPEND}
+       nls? ( sys-devel/gettext )"
+
+S="${WORKDIR}/${MY_P/_/-}"
+
+src_prepare() {
+       epatch \
+               "${WORKDIR}"/${MY_P}-1.4.diff \
+               "${FILESDIR}"/${P}-glibc-2.10.patch \
+               "${FILESDIR}"/${P}-make.patch \
+               "${FILESDIR}"/${P}-ldflags.patch
+       rm -f configure
+       cd script
+       elibtoolize
+       eautoreconf
+       mv configure ../
+}
+
+src_configure() {
+       econf \
+               --disable-static \
+               --with-xcin-rcdir="${EPREFIX}/etc" \
+               --with-xcin-dir="${EPREFIX}/usr/$(get_libdir)/xcin25" \
+               --with-db-lib="${EPREFIX}/usr/$(get_libdir)" \
+               --with-tabe-inc="${EPREFIX}/usr/include/tabe" \
+               --with-tabe-lib="${EPREFIX}/usr/$(get_libdir)" \
+               $(use_enable debug)
+}
+
+src_compile() {
+       emake -j1 || die "emake failed."
+}
+
+src_install() {
+       emake \
+               prefix="${ED}/usr" \
+               program_prefix="${D}" \
+               install || die
+
+       find "${ED}" -name "*.la" -type f -delete || die
+
+       for docdir in doc doc/En doc/En/internal doc/history doc/internal doc/modules; do
+               docinto ${docdir#doc/}
+               for doc in $(find ${docdir} -maxdepth '1' -type 'f'); do
+                       if use unicode; then
+                                       iconv -f BIG5 -t UTF-8 --output=${doc}.UTF-8 ${doc}
+                                       mv ${doc}.UTF-8 ${doc}
+                       fi
+                       dodoc ${doc}
+               done
+       done
+}