Added ~amd64. Fixed gcc-4.3 issue, bug #250682. Clean up.

Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.28-gentoo x86_64

7 files changed, 124 insertions, 138 deletions

diff --git a/app-i18n/x-unikey/ChangeLog b/app-i18n/x-unikey/ChangeLog
index 83c963f1d67c..a3d5ed15616c 100644
--- a/app-i18n/x-unikey/ChangeLog
+++ b/app-i18n/x-unikey/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-i18n/x-unikey
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/x-unikey/ChangeLog,v 1.19 2008/08/16 17:05:12 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/x-unikey/ChangeLog,v 1.20 2008/12/31 14:28:43 matsuu Exp $
+
+*x-unikey-1.0.4-r1 (31 Dec 2008)
+
+  31 Dec 2008; MATSUU Takuto <matsuu@gentoo.org>
+  +files/x-unikey-1.0.4-gcc43.patch, +files/x-unikey-1.0.4-gentoo.patch,
+  -x-unikey-1.0.ebuild, -x-unikey-1.0.2.ebuild, +x-unikey-1.0.4-r1.ebuild:
+  Added ~amd64. Fixed gcc-4.3 issue, bug #250682. Clean up. Removed old
+  versions.
 
   16 Aug 2008; Torsten Veller <tove@gentoo.org> metadata.xml:
   Remove pclouds from metadata.xml (#49680)
diff --git a/app-i18n/x-unikey/Manifest b/app-i18n/x-unikey/Manifest
index f77ba9f9087d..36f55c3df600 100644
--- a/app-i18n/x-unikey/Manifest
+++ b/app-i18n/x-unikey/Manifest
@@ -1,23 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 01x-unikey 214 RMD160 25613e5ebe45db8025c94c200eb233e29f857787 SHA1 02965f918c3c0cb037a98b70ac25b61aadbcac0f SHA256 503f1e6e0157ed0764192421a92aea7e4f356f8e733000dd06322ee8e84f0db4
+AUX x-unikey-1.0.4-gcc43.patch 397 RMD160 54bb7a384dde2b8f05f3122c1e91b16bdecf1b16 SHA1 78da822fd32051f4644a8565965abf0456009317 SHA256 e1c98c5eeab86b365174eae9cd2f754f0b0ca7247e7279d0ebe05f6cd8f0e119
+AUX x-unikey-1.0.4-gentoo.patch 614 RMD160 a8c22c35b75b9c6b5be84e8c6f238ba3a59a7d99 SHA1 cb0cb0b27342a16cc0ccffd74ced37de2bad9b11 SHA256 648e3e7df95a51ba7c0e1b9fee30ba104ca0c3705138a30a66b12ca92be0bbd9
 DIST x-unikey-0.9.2.tar.bz2 347785 RMD160 e7bafcc67894156947e52979c5576f6c2b3ed7b9 SHA1 11a7d0d3d497401a20359f6e204bdd504a55ac63 SHA256 54c810c23ed51c31e8ed44702eca38358c5864caba95d84049c782f4c241c250
-DIST x-unikey-1.0.2.tar.bz2 546094 RMD160 273747d91d34b6add1f798a525826712a099ba37 SHA1 cbc88f693b7b6ed45e070ef363e2e9b6632aa4ca SHA256 4c04b42e8f27f0bca61bc94775efbbfeb4a4d3e8aa49c18db2fd6e56d26c9fb6
 DIST x-unikey-1.0.4.tar.bz2 561391 RMD160 151254e9e8d32f1386abc6c5e7009b3f5caf8207 SHA1 07deeaa14bde4395824972cc3b9c94afdda8cc34 SHA256 aa7dd444853538bcba0f24c4c19692c34d4553a1df213a260c2628a7116b2dd9
-DIST x-unikey-1.0.tar.bz2 544835 RMD160 836f226e744eae61283010fb749c45b2263a9fc1 SHA1 6149edb6b340a693f3194f009c847ef393768131 SHA256 905b865703522e969d3a686350ba445843dac098e72f77f4e3ff5efd0ca6c141
 DIST x-unikey-manual.html 18349 RMD160 07418dbb9371d91ba9758286be5c96489c98b5aa SHA1 62f2044e5e831a2d0044e6366752b4d9dd45b71e SHA256 cbba2ca916c29ec199a9b8b1288d15f40566118161e6ee0623357b7e1f4a98ea
 DIST x-unikey-manual.pdf 211007 RMD160 0463694e7fe3dfd2cdf721e27d664a301e59f923 SHA1 4ef2d80beb6e1b834e5fa159c6f76273370ff1b5 SHA256 43f5a547a91c7ef8c9d66c24da0102b9c0ef5b9ef06ed10bc3871920baac8b8e
 EBUILD x-unikey-0.9.2.ebuild 1468 RMD160 8602b44fbdc1ccb176c54b1fd444df9794dd7317 SHA1 d813506efdf13e03dffe0c5398772f0efa25d1f0 SHA256 6fa0f00753726b8fde113dd5cfce7de3b0884089dd5d9a2b22d6485d2d0a8560
-EBUILD x-unikey-1.0.2.ebuild 1721 RMD160 c72ff5b316e62c852bb590be5f8e77a0d6371b93 SHA1 4a92b90ea49891a4e5928a560a05102a4c3e906b SHA256 94985e8e00ba4872b4c389181749ca3699715ab5fda19be072c1857a2a5eb816
+EBUILD x-unikey-1.0.4-r1.ebuild 2050 RMD160 8e50f14d7de2074a134ba5e8e1220c2209bba69b SHA1 80bf268c4341bae107dbe7bc7599495c0efef2d9 SHA256 5c7db5dcdb4e95c16ed9ccd63f10e96d36ca03f320fab3db39b927227b20557d
 EBUILD x-unikey-1.0.4.ebuild 1721 RMD160 9a594c30074b52f498ed1dd7e6377629b6d195e1 SHA1 88d6f8fe6565141a471a934ba4e11e1900caed80 SHA256 cc6f602dcc3f9155bce3029779b39836205cadd78a055005429bc4327569244f
-EBUILD x-unikey-1.0.ebuild 1467 RMD160 5ede4fc77ae71525c5a1b2963cd523806174609b SHA1 8adf038cfff88d4af045b675e6be3e5b5b23df0a SHA256 420bbba6ca9212c842f9a2a519003d16424df913d6a72b5a79d890fa87982666
-MISC ChangeLog 2280 RMD160 0df8903dea8a232051df62e2170ed2f071209866 SHA1 5e719970ce8be8605f1c46a810c7fe2ea7a89fdb SHA256 83cfcffaed1300d1f98e7fa84149e4ac3894ec6aae510174f4250e1a097af013
+MISC ChangeLog 2598 RMD160 448dea9deb30b9d486dce44070f51aaa188de08f SHA1 3da25f961ca9144bdd24d88b395c23c29a5fcc5e SHA256 2daafd18daa15a594071a75e8aa54c81f4422c27ef5b661c44a878f2b7ae2b38
 MISC metadata.xml 158 RMD160 3852afaaf28a37630993c0442eeb16eaee47d0f7 SHA1 2eb582eae6a2477a9ed984ea45f3b5f649954e54 SHA256 18d71c580f82a389887f4970802b5f40e0a2e4c6019117e64268e008dfb81fc8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkinCLwACgkQV3J2n04EauxTDACg0zO7P0UyIT5jbZ8ajYuObeVG
-y+MAoKAVfbnw4pdkXqLzUH7v4Bq68mE3
-=ZXjp
------END PGP SIGNATURE-----
diff --git a/app-i18n/x-unikey/files/x-unikey-1.0.4-gcc43.patch b/app-i18n/x-unikey/files/x-unikey-1.0.4-gcc43.patch
new file mode 100644
index 000000000000..c7e46ff686b8
--- /dev/null
+++ b/app-i18n/x-unikey/files/x-unikey-1.0.4-gcc43.patch
@@ -0,0 +1,12 @@
+diff -Naur x-unikey-1.0.4.orig/src/ukengine/usrkeymap.cpp x-unikey-1.0.4/src/ukengine/usrkeymap.cpp
+--- x-unikey-1.0.4.orig/src/ukengine/usrkeymap.cpp	2008-12-18 00:39:38.000000000 +0900
++++ x-unikey-1.0.4/src/ukengine/usrkeymap.cpp	2008-12-18 00:38:56.000000000 +0900
+@@ -23,6 +23,8 @@
+ 
+ #include "stdafx.h"
+ #include <iostream>
++#include <cstring>
++
+ using namespace std;
+ 
+ #include <ctype.h>
diff --git a/app-i18n/x-unikey/files/x-unikey-1.0.4-gentoo.patch b/app-i18n/x-unikey/files/x-unikey-1.0.4-gentoo.patch
new file mode 100644
index 000000000000..e3bef43b98b2
--- /dev/null
+++ b/app-i18n/x-unikey/files/x-unikey-1.0.4-gentoo.patch
@@ -0,0 +1,20 @@
+--- x-unikey-1.0.4.orig/src/unikey-gtk/Makefile.am	2005-10-16 12:39:15.000000000 +0900
++++ x-unikey-1.0.4/src/unikey-gtk/Makefile.am	2008-12-18 00:48:37.000000000 +0900
+@@ -34,7 +34,7 @@
+ 
+ install-data-hook:
+ 	gtk-query-immodules-2.0 \
+-	> @gtk_sysconfdir@/gtk.immodules
++	> $(DESTDIR)@gtk_sysconfdir@/gtk.immodules
+ 
+ ##	$(moduledir)/im-vn.la \
+ ##	@GTK_PREFIX@/lib/gtk-2.0/@GTK_VERSION@/immodules/*.la \
+@@ -42,7 +42,7 @@
+ 
+ uninstall-hook:
+ 	gtk-query-immodules-2.0 > \
+-	@gtk_sysconfdir@/gtk.immodules
++	$(DESTDIR)@gtk_sysconfdir@/gtk.immodules
+ ##	@GTK_PREFIX@/lib/gtk-2.0/@GTK_VERSION@/immodules/*.la \
+ 
+ 
diff --git a/app-i18n/x-unikey/x-unikey-1.0.2.ebuild b/app-i18n/x-unikey/x-unikey-1.0.2.ebuild
deleted file mode 100644
index a14d69baaaed..000000000000
--- a/app-i18n/x-unikey/x-unikey-1.0.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/x-unikey/x-unikey-1.0.2.ebuild,v 1.6 2007/07/22 09:48:19 calchan Exp $
-
-inherit eutils
-
-DESCRIPTION="Vietnamese X Input Method"
-HOMEPAGE="http://unikey.sourceforge.net/linux.php"
-SRC_URI="mirror://sourceforge/unikey/${P}.tar.bz2
-	doc? ( http://unikey.org/manual/x-unikey-manual.html http://unikey.org/manual/x-unikey-manual.pdf )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc ~x86"
-IUSE="nls gtk doc"
-
-DEPEND="x11-libs/libX11
-	x11-libs/libSM
-	x11-libs/libICE
-	nls? ( sys-devel/gettext )
-	gtk? ( >=x11-libs/gtk+-2.2 )"
-
-src_unpack() {
-	unpack ${P}.tar.bz2 || die "unpack failed"
-	if use doc; then
-		cp ${DISTDIR}/x-unikey-manual.html ${DISTDIR}/x-unikey-manual.pdf ${WORKDIR}/${P}/doc
-	fi
-}
-
-src_compile() {
-	local myconf
-	# --with-gtk-sysconfdir to prevent sandbox violation only
-	use gtk && myconf="--with-unikey-gtk --with-gtk-sysconfdir=${D}/etc/gtk-2.0"
-	econf ${myconf} || die "./configure failed"
-	emake || die
-}
-
-src_install() {
-	if use gtk;then
-		dodir etc/gtk-2.0
-		make DESTDIR=${D} install -C src/unikey-gtk
-	fi
-	dobin src/xim/ukxim src/gui/unikey
-	doenvd ${FILESDIR}/01x-unikey
-	dodoc doc/*
-}
-
-pkg_postinst() {
-	elog ""
-	elog "Go to /etc/env.d/01x-unikey and uncomment appropriate lines"
-	elog "to enable x-unikey"
-	elog ""
-	if use gtk; then
-		gtk-query-immodules-2.0 > ${ROOT}/etc/gtk-2.0/gtk.immodules
-		elog "If you want to use x-unikey as the default gtk+ input method,"
-		elog "change GTK_IM_MODULE in /etc/env.d/01x-unikey to \"unikey\""
-		elog ""
-	fi
-}
-
-pkg_postrm() {
-	if use gtk; then
-		gtk-query-immodules-2.0 > ${ROOT}/etc/gtk-2.0/gtk.immodules
-	fi
-}
diff --git a/app-i18n/x-unikey/x-unikey-1.0.4-r1.ebuild b/app-i18n/x-unikey/x-unikey-1.0.4-r1.ebuild
new file mode 100644
index 000000000000..cfd9938c3ff0
--- /dev/null
+++ b/app-i18n/x-unikey/x-unikey-1.0.4-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/x-unikey/x-unikey-1.0.4-r1.ebuild,v 1.1 2008/12/31 14:28:43 matsuu Exp $
+
+inherit autotools eutils multilib
+
+DESCRIPTION="Vietnamese X Input Method"
+HOMEPAGE="http://www.unikey.org/"
+SRC_URI="mirror://sourceforge/unikey/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="nls gtk"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libSM
+	x11-libs/libICE
+	gtk? ( >=x11-libs/gtk+-2.2 )
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	# An arch specific config directory is used on multilib systems
+	has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
+	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0/}
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-gcc43.patch"
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+	eautoreconf
+}
+
+src_compile() {
+	local myconf
+	# --with-gtk-sysconfdir to prevent sandbox violation only
+	use gtk && myconf="--with-unikey-gtk --with-gtk-sysconfdir=${GTK2_CONFDIR}"
+	econf ${myconf} || die "./configure failed"
+	emake || die
+}
+
+src_install() {
+	if use gtk;then
+		dodir "${GTK2_CONFDIR}"
+#		emake DESTDIR="${D}" install -C src/unikey-gtk || die
+	fi
+#	dobin src/xim/ukxim src/gui/unikey
+	emake DESTDIR="${D}" install || die
+	doenvd "${FILESDIR}/01x-unikey"
+
+	dodoc AUTHORS CREDITS ChangeLog NEWS README TODO
+	cd doc
+	dodoc README1ST keymap-syntax manual options ukmacro \
+		unikey-manual-0.9.pdf unikey.png unikeyrc
+}
+
+pkg_postinst() {
+	elog
+	elog "Go to /etc/env.d/01x-unikey and uncomment appropriate lines"
+	elog "to enable x-unikey"
+	elog
+	if use gtk; then
+		gtk-query-immodules-2.0 > "${ROOT}/${GTK2_CONFDIR}/gtk.immodules"
+		elog "If you want to use x-unikey as the default gtk+ input method,"
+		elog "change GTK_IM_MODULE in /etc/env.d/01x-unikey to \"unikey\""
+		elog
+	fi
+}
+
+pkg_postrm() {
+	if use gtk; then
+		gtk-query-immodules-2.0 > "${ROOT}/${GTK2_CONFDIR}/gtk.immodules"
+	fi
+}
diff --git a/app-i18n/x-unikey/x-unikey-1.0.ebuild b/app-i18n/x-unikey/x-unikey-1.0.ebuild
deleted file mode 100644
index fcfb34de2716..000000000000
--- a/app-i18n/x-unikey/x-unikey-1.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/x-unikey/x-unikey-1.0.ebuild,v 1.5 2007/07/22 09:48:19 calchan Exp $
-
-inherit eutils
-
-DESCRIPTION="Vietnamese X Input Method"
-HOMEPAGE="http://unikey.sourceforge.net/linux.php"
-SRC_URI="mirror://sourceforge/unikey/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="nls gtk"
-
-DEPEND="x11-libs/libX11
-	x11-libs/libSM
-	x11-libs/libICE
-	nls? ( sys-devel/gettext )
-	gtk? ( >=x11-libs/gtk+-2.2 )"
-
-src_compile() {
-	local myconf
-	# --with-gtk-sysconfdir to prevent sandbox violation only
-	use gtk && myconf="--with-unikey-gtk --with-gtk-sysconfdir=${D}/etc/gtk-2.0"
-	econf ${myconf} || die "./configure failed"
-	emake || die
-}
-
-src_install() {
-	if use gtk;then
-		dodir etc/gtk-2.0
-		make DESTDIR=${D} install -C src/unikey-gtk
-	fi
-	dobin src/xim/ukxim src/gui/unikey
-	doenvd ${FILESDIR}/01x-unikey
-	dodoc doc/manual doc/ukmacro doc/unikeyrc
-}
-
-pkg_postinst() {
-	elog ""
-	elog "Go to /etc/env.d/01x-unikey and uncomment appropriate lines"
-	elog "to enable x-unikey"
-	elog ""
-	if use gtk; then
-		gtk-query-immodules-2.0 > ${ROOT}/etc/gtk-2.0/gtk.immodules
-		elog "If you want to use x-unikey as the default gtk+ input method,"
-		elog "change GTK_IM_MODULE in /etc/env.d/01x-unikey to \"unikey\""
-		elog ""
-	fi
-}
-
-pkg_postrm() {
-	if use gtk; then
-		gtk-query-immodules-2.0 > ${ROOT}/etc/gtk-2.0/gtk.immodules
-	fi
-}