Version bumped. Changed LICENSE. Fixed GTK2_CONFDIR handling, bug #366889.

(Portage version: 2.1.9.49/cvs/Linux x86_64)

6 files changed, 157 insertions, 170 deletions

diff --git a/app-i18n/imhangul/ChangeLog b/app-i18n/imhangul/ChangeLog
index fd822b839cf8..fa9590195b6d 100644
--- a/app-i18n/imhangul/ChangeLog
+++ b/app-i18n/imhangul/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-i18n/imhangul
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/imhangul/ChangeLog,v 1.31 2011/03/27 10:49:19 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/imhangul/ChangeLog,v 1.32 2011/05/28 02:40:50 matsuu Exp $
+
+*imhangul-3.0.0 (28 May 2011)
+*imhangul-2.0.0 (28 May 2011)
+
+  28 May 2011; MATSUU Takuto <matsuu@gentoo.org> -imhangul-0.9.13.ebuild,
+  -imhangul-0.9.14.ebuild, -imhangul-0.9.15.ebuild, +imhangul-2.0.0.ebuild,
+  +imhangul-3.0.0.ebuild:
+  Version bumped. Changed LICENSE. Fixed GTK2_CONFDIR handling, bug #366889.
 
   27 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
   imhangul-0.9.12.ebuild, imhangul-0.9.13.ebuild, imhangul-0.9.14.ebuild,
diff --git a/app-i18n/imhangul/imhangul-0.9.13.ebuild b/app-i18n/imhangul/imhangul-0.9.13.ebuild
deleted file mode 100644
index cf9c158af6a0..000000000000
--- a/app-i18n/imhangul/imhangul-0.9.13.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/imhangul/imhangul-0.9.13.ebuild,v 1.6 2011/03/27 10:49:19 nirbheek Exp $
-
-EAPI="1"
-
-DESCRIPTION="Gtk+-2.0 Hangul Input Modules"
-HOMEPAGE="http://imhangul.kldp.net/"
-SRC_URI="http://kldp.net/frs/download.php/2808/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2.2.0:2"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-get_gtk_confdir() {
-	if useq amd64 || ( [ "${CONF_LIBDIR}" == "lib32" ] && useq x86 ) ; then
-		echo "/etc/gtk-2.0/${CHOST}"
-	else
-		echo "/etc/gtk-2.0"
-	fi
-}
-
-src_compile() {
-	sed -i -e "/^moduledir/d" -e "/# moduledir/s/# //" Makefile.* || die
-	econf || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
-}
-
-pkg_postinst() {
-	gtk-query-immodules-2.0 > "${ROOT}$(get_gtk_confdir)/gtk.immodules"
-
-	elog ""
-	elog "If you want to use one of the module as a default input method, "
-	elog ""
-	elog "export GTK_IM_MODULE=hangul2		// 2 input type"
-	elog "export GTK_IM_MODULE=hangul3f	// 3 input type"
-	elog ""
-}
-
-pkg_postrm() {
-	gtk-query-immodules-2.0 > "${ROOT}$(get_gtk_confdir)/gtk.immodules"
-}
diff --git a/app-i18n/imhangul/imhangul-0.9.14.ebuild b/app-i18n/imhangul/imhangul-0.9.14.ebuild
deleted file mode 100644
index 432bffb7bdfe..000000000000
--- a/app-i18n/imhangul/imhangul-0.9.14.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/imhangul/imhangul-0.9.14.ebuild,v 1.2 2011/03/27 10:49:19 nirbheek Exp $
-
-EAPI="1"
-
-inherit multilib
-
-DESCRIPTION="Gtk+-2.0 Hangul Input Modules"
-HOMEPAGE="http://kldp.net/projects/imhangul/"
-SRC_URI="http://kldp.net/frs/download.php/4944/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND=">=app-i18n/libhangul-0.0.9
-	>=x11-libs/gtk+-2.2.0:2"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-get_gtk_confdir() {
-	if has_multilib_profile ; then
-		GTK2_CONFDIR="${GTK2_CONFDIR:=/etc/gtk-2.0/${CHOST}}"
-	else
-		GTK2_CONFDIR="${GTK2_CONFDIR:=/etc/gtk-2.0}"
-	fi
-	echo ${GTK2_CONFDIR}
-}
-
-src_compile() {
-	econf \
-		--with-gtk-im-module-dir=/usr/$(get_libdir)/gtk-2.0/immodules \
-		--with-gtk-im-module-file=$(get_gtk_confdir) || die
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
-
-pkg_postinst() {
-	gtk-query-immodules-2.0 > "${ROOT}$(get_gtk_confdir)/gtk.immodules"
-
-	elog ""
-	elog "If you want to use one of the module as a default input method, "
-	elog ""
-	elog "export GTK_IM_MODULE=hangul2  # 2 input type"
-	elog "export GTK_IM_MODULE=hangul3f # 3 input type"
-	elog ""
-}
-
-pkg_postrm() {
-	gtk-query-immodules-2.0 > "${ROOT}$(get_gtk_confdir)/gtk.immodules"
-}
diff --git a/app-i18n/imhangul/imhangul-0.9.15.ebuild b/app-i18n/imhangul/imhangul-0.9.15.ebuild
deleted file mode 100644
index 7350a6eb2636..000000000000
--- a/app-i18n/imhangul/imhangul-0.9.15.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/imhangul/imhangul-0.9.15.ebuild,v 1.2 2011/03/27 10:49:19 nirbheek Exp $
-
-EAPI="1"
-
-inherit multilib
-
-DESCRIPTION="Gtk+-2.0 Hangul Input Modules"
-HOMEPAGE="http://kldp.net/projects/imhangul/"
-SRC_URI="http://kldp.net/frs/download.php/5418/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND=">=app-i18n/libhangul-0.0.10
-	>=x11-libs/gtk+-2.2.0:2"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-get_gtk_confdir() {
-	if has_multilib_profile ; then
-		GTK2_CONFDIR="${GTK2_CONFDIR:=/etc/gtk-2.0/${CHOST}}"
-	else
-		GTK2_CONFDIR="${GTK2_CONFDIR:=/etc/gtk-2.0}"
-	fi
-	echo ${GTK2_CONFDIR}
-}
-
-src_compile() {
-	econf \
-		--with-gtk-im-module-dir=/usr/$(get_libdir)/gtk-2.0/immodules \
-		--with-gtk-im-module-file=$(get_gtk_confdir) || die
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
-
-pkg_postinst() {
-	gtk-query-immodules-2.0 > "${ROOT}$(get_gtk_confdir)/gtk.immodules"
-
-	elog ""
-	elog "If you want to use one of the module as a default input method, "
-	elog ""
-	elog "export GTK_IM_MODULE=hangul2  # 2 input type"
-	elog "export GTK_IM_MODULE=hangul3f # 3 input type"
-	elog ""
-}
-
-pkg_postrm() {
-	gtk-query-immodules-2.0 > "${ROOT}$(get_gtk_confdir)/gtk.immodules"
-}
diff --git a/app-i18n/imhangul/imhangul-2.0.0.ebuild b/app-i18n/imhangul/imhangul-2.0.0.ebuild
new file mode 100644
index 000000000000..05694bf56a1a
--- /dev/null
+++ b/app-i18n/imhangul/imhangul-2.0.0.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/imhangul/imhangul-2.0.0.ebuild,v 1.1 2011/05/28 02:40:50 matsuu Exp $
+
+EAPI="3"
+inherit multilib
+
+DESCRIPTION="Gtk+-2.0 Hangul Input Modules"
+HOMEPAGE="http://kldp.net/projects/imhangul/"
+SRC_URI="http://kldp.net/frs/download.php/5924/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND=">=app-i18n/libhangul-0.0.12
+	>=x11-libs/gtk+-2.2:2
+	virtual/libintl"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	sys-devel/gettext"
+
+get_gtk_confdir() {
+	# bug #366889
+	if has_version '>=x11-libs/gtk+-2.22.1-r1:2' || has_multilib_profile ; then
+		GTK2_CONFDIR="${GTK2_CONFDIR:=${EPREFIX}/etc/gtk-2.0/$(get_abi_CHOST)}"
+	else
+		GTK2_CONFDIR="${GTK2_CONFDIR:=${EPREFIX}/etc/gtk-2.0}"
+	fi
+	echo ${GTK2_CONFDIR}
+}
+
+update_gtk_immodules() {
+	local GTK2_CONFDIR=$(get_gtk_confdir)
+
+	mkdir -p "${GTK2_CONFDIR}"
+
+	if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-2.0" ] ; then
+		"${EPREFIX}/usr/bin/gtk-query-immodules-2.0" > "${GTK2_CONFDIR}/gtk.immodules"
+	fi
+}
+
+src_configure() {
+	econf \
+		--with-gtk-im-module-dir="${EPREFIX}/usr/$(get_libdir)/gtk-2.0/immodules" \
+		--with-gtk-im-module-file="$(get_gtk_confdir)" || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	find "${ED}" -name "*.la" -type f -delete || die
+
+	insinto /etc/X11/xinit/xinput.d
+	newins "${FILESDIR}/xinput-imhangul2" imhangul2.conf || die
+	newins "${FILESDIR}/xinput-imhangul2y" imhangul2y.conf || die
+	newins "${FILESDIR}/xinput-imhangul32" imhangul32.conf || die
+	newins "${FILESDIR}/xinput-imhangul39" imhangul39.conf || die
+	newins "${FILESDIR}/xinput-imhangul3f" imhangul3f.conf || die
+	newins "${FILESDIR}/xinput-imhangul3s" imhangul3s.conf || die
+	newins "${FILESDIR}/xinput-imhangul3y" imhangul3y.conf || die
+	newins "${FILESDIR}/xinput-imhangulahn" imhangulahn.conf || die
+	newins "${FILESDIR}/xinput-imhangulro" imhangulro.conf || die
+
+	dodoc AUTHORS ChangeLog NEWS README TODO imhangul.conf || die
+}
+
+pkg_postinst() {
+	update_gtk_immodules
+
+	elog ""
+	elog "If you want to use one of the module as a default input method, "
+	elog ""
+	elog "export GTK_IM_MODULE=hangul2  # 2 input type"
+	elog "export GTK_IM_MODULE=hangul3f # 3 input type"
+	elog ""
+}
+
+pkg_postrm() {
+	update_gtk_immodules
+}
diff --git a/app-i18n/imhangul/imhangul-3.0.0.ebuild b/app-i18n/imhangul/imhangul-3.0.0.ebuild
new file mode 100644
index 000000000000..a60fd31c253f
--- /dev/null
+++ b/app-i18n/imhangul/imhangul-3.0.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/imhangul/imhangul-3.0.0.ebuild,v 1.1 2011/05/28 02:40:50 matsuu Exp $
+
+EAPI="3"
+inherit multilib
+
+DESCRIPTION="Gtk+-3.0 Hangul Input Modules"
+HOMEPAGE="http://kldp.net/projects/imhangul/"
+SRC_URI="http://kldp.net/frs/download.php/5925/${P}.tar.bz2"
+
+SLOT="3"
+LICENSE="GPL-3"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND=">=app-i18n/libhangul-0.0.12
+	x11-libs/gtk+:3
+	virtual/libintl"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	sys-devel/gettext"
+
+update_gtk_immodules() {
+	if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-3.0" ] ; then
+		"${EPREFIX}/usr/bin/gtk-query-immodules-3.0" --update-cache
+	fi
+}
+
+src_configure() {
+	econf --with-gtk-im-module-dir="${EPREFIX}/usr/$(get_libdir)/gtk-3.0/$(pkg-config gtk+-3.0 --variable=gtk_binary_version)/immodules" || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	find "${ED}" -name "*.la" -type f -delete || die
+
+	insinto /etc/X11/xinit/xinput.d
+	newins "${FILESDIR}/xinput-imhangul2" imhangul2.conf || die
+	newins "${FILESDIR}/xinput-imhangul2y" imhangul2y.conf || die
+	newins "${FILESDIR}/xinput-imhangul32" imhangul32.conf || die
+	newins "${FILESDIR}/xinput-imhangul39" imhangul39.conf || die
+	newins "${FILESDIR}/xinput-imhangul3f" imhangul3f.conf || die
+	newins "${FILESDIR}/xinput-imhangul3s" imhangul3s.conf || die
+	newins "${FILESDIR}/xinput-imhangul3y" imhangul3y.conf || die
+	newins "${FILESDIR}/xinput-imhangulahn" imhangulahn.conf || die
+	newins "${FILESDIR}/xinput-imhangulro" imhangulro.conf || die
+
+	dodoc AUTHORS ChangeLog NEWS README TODO imhangul.conf || die
+}
+
+pkg_postinst() {
+	update_gtk_immodules
+
+	elog ""
+	elog "If you want to use one of the module as a default input method, "
+	elog ""
+	elog "export GTK_IM_MODULE=hangul2  # 2 input type"
+	elog "export GTK_IM_MODULE=hangul3f # 3 input type"
+	elog ""
+}
+
+pkg_postrm() {
+	update_gtk_immodules
+}