Version bump wrt #219349, closing also #159660. Commit for treecleaners to avoid removing; thanks to Peter Alfredsen.

Package-Manager: portage-2.1.5_rc6

5 files changed, 83 insertions, 117 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/Manifest b/app-i18n/xcin/Manifest
index 9b5159556a17..65537b2aa2be 100644
--- a/app-i18n/xcin/Manifest
+++ b/app-i18n/xcin/Manifest
@@ -4,12 +4,10 @@ AUX xcin-2.5.3_pre2-db3.patch 439 RMD160 ca8a4df83b437ea7ccf81206ea1feb0e0143e05
 AUX xcin-2.5.3_pre2-gentoo.patch 468 RMD160 6050ee1a65358a95aa8b6b44efb42b4feb3fb3e7 SHA1 4edc1dce5e4f16c56f00cc2af8a0ad3c559b5f54 SHA256 d5868d9f2b02207a17d551becede3ce43d6bbc1e5d0d032267c238d175e1eb35
 AUX xcin-chewing.diff 14766 RMD160 e5da1e270174c0865159af44ce5e7829ccd1e2ca SHA1 974d719f32c555be39786c7ff60346738a750a35 SHA256 4284a1780d317a55499dd5cd8afc819f426701e87fc47866dd5637d3c6443866
 AUX xcin-db3.patch 439 RMD160 ca8a4df83b437ea7ccf81206ea1feb0e0143e05e SHA1 3bd7bda8019f460297f0cef3b9c81a7f8d0ce90e SHA256 24aac4a7c01912378db2cf4e79c4f17858e3b7116eae3382de55162bc066e363
-DIST chewing-2002Jan07-snapshot.tar.gz 1152865 RMD160 1258ee14812d0accb7f4d3bdc74db5e1b9c0b57b SHA1 98e97da36edf11cbfa3c7d93e0c5bc124d255a5d SHA256 4c601aeee56a8d47264935249acc82ebb3653cf5b28fe6565b92f665ce8a949d
-DIST xcin-2.5.2.3.tar.gz 1081114 RMD160 6fb2ee04b989d90f81d95c92d7bb0b8a377ebd5b SHA1 2642404c80187d5e0941dc58f17a142a6a1532e8 SHA256 2883dfa226b8a34a4279ce390798d73652c55f21c8492ca21eb2161b3f59afc4
-DIST xcin-2.5.3.pre2.tar.gz 1433915 RMD160 f1fb83d1e21a0f5dbb80c5eafdaa6c7f313ea865 SHA1 27e4c47e09c44e92e3a3afc9e08134e1485f6795 SHA256 c55598853fae94fa72cf0517af9ac965dac11fa4d8b269eea4d6581dcd6405a0
 DIST xcin-2.5.3.pre3-20.10.firefly.src.rpm 1731777 RMD160 6df021b1a430831b45c15d186649a7c1edbf24e4 SHA1 8783faabb6f236f21e96797c76f728e56eff5cfc SHA256 45fedca34ae57c8cd38b3c7fb8fb9009fe1fdae3387c3940d61e3b9f798216c1
-EBUILD xcin-2.5.2.3.ebuild 1017 RMD160 17234cba5cc6fe461186491d1d8f760814c75be2 SHA1 f1910ecca0a0a7781e7f4de48f3ab0f4cd0a214e SHA256 9eb930e5fd083dd8293e144c8cc7cbaee7feda44482db147f72a9095a4e9b3b1
-EBUILD xcin-2.5.3_pre2.ebuild 1535 RMD160 7d7c3a387ae7c2f76594ec4d5a2ba095c9dcdfdc SHA1 9c4e5400eddb62d4a10e5b864267f463ef6ac803 SHA256 0c3a370e53b90790b726f18c10a2e8aac6ea39025565b3cca758e7eaf7077983
+DIST xcin_2.5.2.99.pre2+cvs20030224-1.4.diff.gz 1321937 RMD160 5d15bc8d40ade8a09950c78cc13a2c9ba7d69784 SHA1 2973e33d3946562da4c6304ee888705292c07f1c SHA256 0497739e131da49169fe75f9155bb924cdc31c9be6d8ebd3eedb4afc935f71ad
+DIST xcin_2.5.2.99.pre2+cvs20030224.orig.tar.gz 1530591 RMD160 41dd86f6c952b7480e11acd5decce92c6243a766 SHA1 d8c234c36175cbf2bae5dc600d25d612bdddbb8f SHA256 a86f0e5aa877d579731ac514a0072beaf3fecd6f181f068be29f091d6281e9ae
 EBUILD xcin-2.5.3_pre3-r1.ebuild 1709 RMD160 32125fbb167b0c4e5e7c111a2cc8ddba084fd757 SHA1 da60fbf82d1a05964e107646a9625fbe4d6a13cf SHA256 5228c0af3e5f72cec3f1334d1bb23ea15ee63564aa928e926c0fb6ce4316d98c
-MISC ChangeLog 2154 RMD160 c9fcdade165decd32122d2c6d4d0938649f770ca SHA1 ffa2433a891303ebee25f90344b55535f657fd81 SHA256 aaf9284c2480cb050a7f10849aa3f8a6123f601fb01f640481b2c635ecb0de92
+EBUILD xcin-2.5.3_pre3-r2.ebuild 1649 RMD160 759a8bd04dea2047d760197756c8dc7edd40e6a4 SHA1 6cd4622580c4babe4b53f76643060c485677637b SHA256 dd8ef9407ac0bb60fc9dad6e5ae2a226fb937c8865543a54b30f9b5b4fb7ed29
+MISC ChangeLog 2437 RMD160 78c418ecd6b701d50eaad89c8de0a7ea1635da6e SHA1 531fd80e57f404064a2e9865e7d57ad204c43a0b SHA256 02c9972a42be55c042020ba19b143031b3cf8ab5a2122bc50d8c94195dfee75f
 MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
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
+}