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

(Portage version: 2.1.6.4/cvs/Linux 2.6.28-gentoo x86_64)

6 files changed, 120 insertions, 123 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/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
-}