4 files changed, 79 insertions, 111 deletions
diff --git a/app-i18n/xcin/ChangeLog b/app-i18n/xcin/ChangeLog
index 47e535839172..2b70fd88d501 100644
--- a/app-i18n/xcin/ChangeLog
+++ b/app-i18n/xcin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-i18n/xcin
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/xcin/ChangeLog,v 1.16 2007/02/21 22:15:36 peper Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/xcin/ChangeLog,v 1.17 2008/04/30 13:20:32 drac Exp $
+
+*xcin-2.5.3_pre3-r2 (30 Apr 2008)
+
+  30 Apr 2008; Samuli Suominen <drac@gentoo.org> -xcin-2.5.2.3.ebuild,
+  -xcin-2.5.3_pre2.ebuild, +xcin-2.5.3_pre3-r2.ebuild:
+  Version bump wrt #219349, closing also #159660. Commit for treecleaners to
+  avoid removing; thanks to Peter Alfredsen.
 
   21 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/app-i18n/xcin/xcin-2.5.2.3.ebuild b/app-i18n/xcin/xcin-2.5.2.3.ebuild
deleted file mode 100644
index c2230af9eb1a..000000000000
--- a/app-i18n/xcin/xcin-2.5.2.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/xcin/xcin-2.5.2.3.ebuild,v 1.10 2005/01/01 14:43:44 eradicator Exp $
-
-inherit eutils
-
-DESCRIPTION="Chinese X Input Method"
-HOMEPAGE="http://xcin.linux.org.tw/"
-SRC_URI="ftp://xcin.linux.org.tw/pub/xcin/xcin/${P}.tar.gz"
-
-LICENSE="XCIN"
-SLOT="0"
-KEYWORDS="x86 ppc"
-IUSE="nls"
-
-DEPEND="nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/po
-	epatch ${FILESDIR}/${P}-gentoo.patch
-}
-
-src_compile() {
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--disable-bimsphone \
-		--with-xcin-rcdir=/etc \
-		--mandir=/usr/share/man || die "./configure failed"
-	make || die
-}
-
-src_install () {
-	make \
-		prefix=${D}/usr \
-		xcin_rcp=${D}/etc \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		install || die
-	# Again, verify the Makefiles!  We don't want anything falling
-	# outside of ${D}.
-}
diff --git a/app-i18n/xcin/xcin-2.5.3_pre2.ebuild b/app-i18n/xcin/xcin-2.5.3_pre2.ebuild
deleted file mode 100644
index 3d43778d3eb8..000000000000
--- a/app-i18n/xcin/xcin-2.5.3_pre2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2005 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_pre2.ebuild,v 1.12 2005/01/01 14:43:44 eradicator Exp $
-
-inherit eutils
-
-XCIN="${P/_/.}.tar.gz"
-CHEWING="chewing-2002Jan07-snapshot.tar.gz"
-
-DESCRIPTION="Chinese X Input Method"
-HOMEPAGE="http://xcin.linux.org.tw/"
-SRC_URI="ftp://xcin.linux.org.tw/pub/xcin/xcin/devel/${XCIN}
-	http://chewing.good-man.org/snapshot/${CHEWING}"
-
-LICENSE="XCIN"
-SLOT="0"
-KEYWORDS="x86 ~ppc"
-IUSE="nls"
-
-DEPEND="nls? ( sys-devel/gettext )
-	>=app-i18n/libtabe-0.2.5"
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${XCIN}
-	# patch for chewing support
-	cd ${S}/src/Cinput
-	unpack ${CHEWING}
-	cd chewing
-	./patch_chewing
-
-	# gcc3.2 changed the way we deal with -I. So until the configure script
-	# is updated we need this hack as a work around.
-	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${P}-gentoo.patch
-	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-db3.patch
-}
-
-src_compile() {
-	econf \
-		--with-xcin-rcdir=/etc \
-		--with-xcin-dir=/usr/lib/X11/xcin25 \
-		--with-db-lib=/usr/lib \
-		--with-tabe-inc=/usr/include/tabe \
-		--with-tabe-lib=/usr/lib  ||  die "./configure failed"
-	emake || die
-}
-
-src_install() {
-	make \
-		prefix=${D}/usr \
-		program_prefix=${D} \
-		install || die
-	dodir /etc
-	insinto /etc
-	newins ${FILESDIR}/gentoo-xcinrc xcinrc
-
-	dodoc doc/*
-	for docdir in doc/En doc/En/internal doc/history doc/internal doc/modules; do
-		docinto ${docdir#doc/}
-		dodoc ${docdir}/*
-	done
-}
diff --git a/app-i18n/xcin/xcin-2.5.3_pre3-r2.ebuild b/app-i18n/xcin/xcin-2.5.3_pre3-r2.ebuild
new file mode 100644
index 000000000000..29fc0527bf14
--- /dev/null
+++ b/app-i18n/xcin/xcin-2.5.3_pre3-r2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2008 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-r2.ebuild,v 1.1 2008/04/30 13:20:32 drac Exp $
+
+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="~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_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${WORKDIR}"/${MY_P}-1.4.diff
+	rm -f configure
+	cd script
+	elibtoolize
+	eautoreconf
+	mv configure ../
+	cd ..
+}
+
+src_compile() {
+	myconf="--with-xcin-rcdir=/etc
+		--with-xcin-dir=/usr/$(get_libdir)/xcin25
+		--with-db-lib=/usr/$(get_libdir)
+		--with-tabe-inc=/usr/include/tabe
+		--with-tabe-lib=/usr/$(get_libdir)
+		$(use_enable debug)"
+
+	econf ${myconf}
+	emake -j1 || die "emake failed."
+}
+
+src_install() {
+	emake \
+		prefix="${D}/usr" \
+		program_prefix="${D}" \
+		install || die
+
+	for docdir in doc doc/En doc/En/internal doc/history doc/internal doc/modules; do
+		docinto ${docdir#doc/}
+		if use unicode; then
+			for doc in $(find ${docdir} -maxdepth '1' -type 'f'); do
+				iconv -f BIG5 -t UTF-8 --output=${doc}.UTF-8 ${doc}
+				mv ${doc}.UTF-8 ${doc}
+			done
+		fi
+		dodoc ${docdir}/*
+	done
+}