Update EAPI.

Package-Manager: portage-2.2.18/cvs/Linux x86_64

3 files changed, 86 insertions, 2 deletions

diff --git a/app-i18n/x-unikey/ChangeLog b/app-i18n/x-unikey/ChangeLog
index 3d739778ccc1..c1fca6ae19bd 100644
--- a/app-i18n/x-unikey/ChangeLog
+++ b/app-i18n/x-unikey/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-i18n/x-unikey
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/x-unikey/ChangeLog,v 1.26 2015/04/20 20:30:56 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/x-unikey/ChangeLog,v 1.27 2015/04/20 20:34:44 mrueg Exp $
+
+*x-unikey-1.0.4-r2 (20 Apr 2015)
+
+  20 Apr 2015; Manuel Rüger <mrueg@gentoo.org> +x-unikey-1.0.4-r2.ebuild:
+  Update EAPI.
 
   20 Apr 2015; Manuel Rüger <mrueg@gentoo.org> -x-unikey-0.9.2.ebuild:
   Remove old.
diff --git a/app-i18n/x-unikey/Manifest b/app-i18n/x-unikey/Manifest
index 1e8b9b0e311d..4f768318652e 100644
--- a/app-i18n/x-unikey/Manifest
+++ b/app-i18n/x-unikey/Manifest
@@ -4,5 +4,6 @@ AUX x-unikey-1.0.4-gcc44.patch 995 SHA256 ada679a52b6bdf2c4b6be6012db1f9914d824c
 AUX x-unikey-1.0.4-gentoo.patch 614 SHA256 648e3e7df95a51ba7c0e1b9fee30ba104ca0c3705138a30a66b12ca92be0bbd9 SHA512 928f934aa0cc3a5bb41a3df1352ec0c93c7ff49524e696a6f0361f2b916431a6f8bc4d013805c0c92a2ec0cc8b053fdabd8393fbb36d39ace1c52860bed21b14 WHIRLPOOL c3c26efc30d42a5ac515e07e76851ba282637ca1b6f44fe1e41a5e3234304c8fea16c999bd782893c847f5c9e7ddd443104e18f4534d37ce48584098cc04a71b
 DIST x-unikey-1.0.4.tar.bz2 561391 SHA256 aa7dd444853538bcba0f24c4c19692c34d4553a1df213a260c2628a7116b2dd9 SHA512 47abe4087957c4926550a0121d5cdc7b760f39691fae91c8e0562fc0f4577c22a04192667d362c9838b87fd97d2111afef1260fc88d8234bc5656bab248b5b06 WHIRLPOOL 144788e4a43e55c5a30fbb11eba6953d147823d3229550cbec370d583fd1a74e97f68c3e14b1988074788561f4e0adb836829f06ab88b1f725051dd3840256d9
 EBUILD x-unikey-1.0.4-r1.ebuild 2038 SHA256 928a99de8f99d3258e136fe16bbafdf01fbdced395cc39f6f11369a9692ecec5 SHA512 aed853c02d4dc0878e99ec83b3c2769a1a524bfb05357888780b7b7643163cf305b68f0a16494b53bad952fcfaa2b61aba7687fd000fbec004b33302155a6caf WHIRLPOOL 6024bd67a3981525388a00b4d11f4a699f1da781eedc2b9231a9a042302aa6efc55b2ca186a8082d87cb0b6e174bad11a88e5d73df3a880e86623ec4ceae573a
-MISC ChangeLog 3354 SHA256 cfa23ee6588ca22b7599723e9de2a6bf339248ec7a0ed3a4a3af2cd447d2c4d9 SHA512 16e99bb9229ca8af0e420ba1024da74c3b8848cb2d8fcffb8c778e897e552d00c237e27dfe4fe5b1ccbde078ade2477dd6c368773a486d92a69c12e8cc18acc1 WHIRLPOOL d640b898f377db77069bb47e1b486f9fb7c5de6ea0d47a9cbe831e87f7733d3850d40a0f5890b49ff52f7bd1790f100be95e8c54b87c01af32b96647c4c2d8a6
+EBUILD x-unikey-1.0.4-r2.ebuild 1960 SHA256 b590d92f0440c8554344b076f56d17ca467ca91d6c5acec63298b1849c673c78 SHA512 907f6b42d61e998454dbc97d60ebd7c34a0a54060005ae092a3ccc82752a70d0e153f98d42bca84a4bdf4956e36c1f9cec380699d9e636c76b0bf4435b6f03a8 WHIRLPOOL 59d67569f644c1253af45b28b77a63ff25a09fb05cb5a198a459bb25fbc1a45a2b03e2992d45c73c6ed90e2035eef9d00d2e02fdef3f086e083fd28a6f8e050d
+MISC ChangeLog 3479 SHA256 de1c889b80b896820c9a7eded122b2d819f203d54744a6d653dba557cacaff3d SHA512 58df038b621a934288a6f2657af3d54c9b855b7dfd4a7f5fdc2767c9ca9a3ec63572e5e16a870407e33d64da9a5de66d63724d9063b24ba4f17b7af16cd1d223 WHIRLPOOL ec98b731b7ed13a58257718cea8b825486391da0f7c7eb75b731002dd8fc6dc84a64d132d8b33c1c02966a4168e9cdb4684b93603d1811795b1bc258d3ab6ee0
 MISC metadata.xml 158 SHA256 18d71c580f82a389887f4970802b5f40e0a2e4c6019117e64268e008dfb81fc8 SHA512 6198c41a4d69a5ca0029aa9a593cc0ea553dc957fc0bdcd7bcd3bd1af7f84c5feaaf785160b60b8ed75282987818a6367f6092523cacd45f0c35494036043550 WHIRLPOOL 478bed9e1c3fbbcb13f17ffeebc2b9da5f3c48368e8a95c2802a88dbef4773f992fa254e4dc460248d5669021fe4e37b37be522d186da9d97321a58437679662
diff --git a/app-i18n/x-unikey/x-unikey-1.0.4-r2.ebuild b/app-i18n/x-unikey/x-unikey-1.0.4-r2.ebuild
new file mode 100644
index 000000000000..5fbe46a0e3bb
--- /dev/null
+++ b/app-i18n/x-unikey/x-unikey-1.0.4-r2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2015 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-r2.ebuild,v 1.1 2015/04/20 20:34:44 mrueg Exp $
+
+EAPI=5
+
+inherit autotools eutils multilib gnome2-utils
+
+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:2 )
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	dev-libs/glib
+	virtual/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_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc43.patch \
+		"${FILESDIR}"/${P}-gcc44.patch \
+		"${FILESDIR}"/${P}-gentoo.patch
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	# --with-gtk-sysconfdir to prevent sandbox violation only
+	use gtk && myconf="--with-unikey-gtk --with-gtk-sysconfdir=${GTK2_CONFDIR}"
+	econf ${myconf}
+}
+
+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 
+	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
+		gnome2_query_immodules_gtk2
+		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() {
+	use gtk && gnome2_query_immodules_gtk2
+}