Use gnome2.eclass, readme.gentoo, drop support for old gnome-panel and fix underlinking (#510784, #510786, #510790, #510792), drop old

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

4 files changed, 71 insertions, 115 deletions

diff --git a/app-i18n/im-ja/ChangeLog b/app-i18n/im-ja/ChangeLog
index 48059ac053aa..fc378b46e547 100644
--- a/app-i18n/im-ja/ChangeLog
+++ b/app-i18n/im-ja/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-i18n/im-ja
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/im-ja/ChangeLog,v 1.70 2013/10/09 02:04:16 naota Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/im-ja/ChangeLog,v 1.71 2014/06/01 18:18:14 pacho Exp $
+
+*im-ja-1.5-r3 (01 Jun 2014)
+
+  01 Jun 2014; Pacho Ramos <pacho@gentoo.org>
+  +files/im-ja-1.5-underlinking.patch, +im-ja-1.5-r3.ebuild,
+  -im-ja-1.5-r1.ebuild, -im-ja-1.5.ebuild:
+  Use gnome2.eclass, readme.gentoo, drop support for old gnome-panel and fix
+  underlinking (#510784, #510786, #510790, #510792), drop old
 
   09 Oct 2013; Naohiro Aota <naota@gentoo.org> im-ja-1.5-r2.ebuild:
   sed AM_CONFIG_HEADER with AC_CONFIG_HEADERS. #467568
diff --git a/app-i18n/im-ja/files/im-ja-1.5-underlinking.patch b/app-i18n/im-ja/files/im-ja-1.5-underlinking.patch
new file mode 100644
index 000000000000..adbc2144d23b
--- /dev/null
+++ b/app-i18n/im-ja/files/im-ja-1.5-underlinking.patch
@@ -0,0 +1,18 @@
+--- src/xim/Makefile.am.old	2014-06-01 20:06:19.209885674 +0200
++++ src/xim/Makefile.am	2014-06-01 20:06:27.020040088 +0200
+@@ -88,4 +88,4 @@
+     @DISABLE_SKK_FLAG@       \
+     @X_CFLAGS@
+ im_ja_xim_server_LDADD = IMdkit/libXimd.a
+-im_ja_xim_server_LDFLAGS = @GTK_LIBS@ @GCONF_LIBS@ @X_LIBS@ @X_PRE_LIBS@ -lX11 @CANNA_LIBS@ @WNN_LIBS@ @ANTHY_LIBS@
++im_ja_xim_server_LDFLAGS = @GTK_LIBS@ @GCONF_LIBS@ @X_LIBS@ @X_PRE_LIBS@ -lX11 -lm @CANNA_LIBS@ @WNN_LIBS@ @ANTHY_LIBS@
+--- src/helper/Makefile.am.old	2014-06-01 20:09:11.592293279 +0200
++++ src/helper/Makefile.am	2014-06-01 20:09:24.454547489 +0200
+@@ -23,6 +23,6 @@
+     @DISABLE_SKK_FLAG@       		\
+     @DISABLE_WNN_FLAG@ 
+ 
+-im_ja_helper_LDADD = @GTK_LIBS@ @GCONF_LIBS@
++im_ja_helper_LDADD = @GTK_LIBS@ @GCONF_LIBS@ -lX11
+ 
+ 
diff --git a/app-i18n/im-ja/im-ja-1.5-r1.ebuild b/app-i18n/im-ja/im-ja-1.5-r3.ebuild
index 130a6bd22ddf..e2201d482e98 100644
--- a/app-i18n/im-ja/im-ja-1.5-r1.ebuild
+++ b/app-i18n/im-ja/im-ja-1.5-r3.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/im-ja/im-ja-1.5-r1.ebuild,v 1.5 2013/04/21 10:24:27 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/im-ja/im-ja-1.5-r3.ebuild,v 1.1 2014/06/01 18:18:14 pacho Exp $
 
-EAPI="1"
+EAPI="5"
+GNOME2_LA_PUNT="yes"
+GCONF_DEBUG="no"
 
-inherit autotools gnome2 gnome2-utils eutils multilib
+inherit autotools gnome2 eutils multilib readme.gentoo
 
 DESCRIPTION="A Japanese input module for GTK2 and XIM"
 HOMEPAGE="http://im-ja.sourceforge.net/"
@@ -14,69 +16,79 @@ SRC_URI="http://im-ja.sourceforge.net/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="gnome canna freewnn skk anthy"
+IUSE="canna freewnn skk anthy"
 # --enable-debug causes build failure with gtk+-2.4
 #IUSE="${IUSE} debug"
 
-RDEPEND=">=dev-libs/glib-2.4:2
+RDEPEND="
+	>=dev-libs/glib-2.4:2
 	>=dev-libs/atk-1.6
 	>=x11-libs/gtk+-2.4:2
 	>=x11-libs/pango-1.2.1
 	>=gnome-base/gconf-2.4:2
 	>=gnome-base/libglade-2.4:2.0
 	>=gnome-base/libgnomeui-2.4
-	gnome? ( >=gnome-base/gnome-panel-2.0 )
 	freewnn? ( app-i18n/freewnn )
 	canna? ( app-i18n/canna )
 	skk? ( virtual/skkserv )
-	anthy? ( app-i18n/anthy )"
+	anthy? ( app-i18n/anthy )
+"
 DEPEND="${RDEPEND}
 	dev-lang/perl
+	dev-util/intltool
 	dev-perl/URI
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
-DOCS="AUTHORS README ChangeLog TODO"
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="This version of im-ja comes with experimental XIM support.
+If you'd like to try it out, run im-ja-xim-server and set
+environment variable XMODIFIERS to @im=im-ja-xim-server
+e.g.)
+$ export XMODIFIERS=@im=im-ja-xim-server (sh)
+> setenv XMODIFIERS @im=im-ja-xim-server (csh)"
 
-pkg_config() {
-	has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-	GTK2_CONFDIR="${GTK2_CONFDIR:=/etc/gtk-2.0}"
-}
+src_prepare() {
+	epatch "${FILESDIR}/${P}-gentoo.patch" \
+		"${FILESDIR}"/${P}-pofiles.patch \
+		"${FILESDIR}/${P}-underlinking.patch"
+
+	sed -ie 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.in || die
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-gentoo.patch"
 	eautoreconf
+	gnome2_src_prepare
 }
 
-src_compile() {
+src_configure() {
 	local myconf
 	# You cannot use `use_enable ...` here. im-ja's configure script
 	# doesn't distinguish --enable-canna from --disable-canna, so
 	# --enable-canna stands for --disable-canna in the script ;-(
-	use gnome || myconf="$myconf --disable-gnome"
 	use canna || myconf="$myconf --disable-canna"
 	use freewnn || myconf="$myconf --disable-wnn"
 	use anthy || myconf="$myconf --disable-anthy"
 	use skk || myconf="$myconf --disable-skk"
 	#use debug && myconf="$myconf --enable-debug"
 
-	# gnome2_src_compile automatically sets debug IUSE flag
-	econf $myconf || die "econf im-ja failed"
-	emake || die "emake im-ja failed"
+	gnome2_src_configure \
+		--disable-gnome \
+		$myconf
+}
+
+src_install() {
+	gnome2_src_install
+
+	sed -e "s:@EPREFIX@:${EPREFIX}:" "${FILESDIR}/xinput-${PN}" > "${T}/${PN}.conf" || die
+	insinto /etc/X11/xinit/xinput.d
+	doins "${T}/${PN}.conf"
+
+	readme.gentoo_create_doc
 }
 
 pkg_postinst() {
 	gnome2_query_immodules_gtk2
 	gnome2_pkg_postinst
-	elog
-	elog "This version of im-ja comes with experimental XIM support."
-	elog "If you'd like to try it out, run im-ja-xim-server and set"
-	elog "environment variable XMODIFIERS to @im=im-ja-xim-server"
-	elog "e.g.)"
-	elog "\t$ export XMODIFIERS=@im=im-ja-xim-server (sh)"
-	elog "\t> setenv XMODIFIERS @im=im-ja-xim-server (csh)"
-	elog
+	readme.gentoo_print_elog
 }
 
 pkg_postrm() {
diff --git a/app-i18n/im-ja/im-ja-1.5.ebuild b/app-i18n/im-ja/im-ja-1.5.ebuild
deleted file mode 100644
index eb4724be3bdb..000000000000
--- a/app-i18n/im-ja/im-ja-1.5.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/im-ja/im-ja-1.5.ebuild,v 1.15 2013/04/21 10:24:27 lxnay Exp $
-
-EAPI="1"
-
-inherit gnome2 gnome2-utils eutils
-
-DESCRIPTION="A Japanese input module for GTK2 and XIM"
-HOMEPAGE="http://im-ja.sourceforge.net/"
-SRC_URI="http://im-ja.sourceforge.net/${P}.tar.gz
-	http://im-ja.sourceforge.net/old/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="gnome canna freewnn skk anthy"
-# --enable-debug causes build failure with gtk+-2.4
-#IUSE="${IUSE} debug"
-
-RDEPEND=">=dev-libs/glib-2.4:2
-	>=dev-libs/atk-1.6
-	>=x11-libs/gtk+-2.4:2
-	>=x11-libs/pango-1.2.1
-	>=gnome-base/gconf-2.4:2
-	>=gnome-base/libglade-2.4:2.0
-	gnome? ( >=gnome-base/gnome-panel-2.0 )
-	freewnn? ( app-i18n/freewnn )
-	canna? ( app-i18n/canna )
-	skk? ( virtual/skkserv )
-	anthy? ( || ( app-i18n/anthy app-i18n/anthy-ss ) )"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	dev-perl/URI
-	>=sys-devel/autoconf-2.50
-	>=sys-devel/automake-1.7
-	virtual/pkgconfig"
-
-DOCS="AUTHORS README ChangeLog TODO"
-
-get_gtk_confdir() {
-	if use amd64 || ( [ "${CONF_LIBDIR}" == "lib32" ] && use x86 ) ; then
-		echo "/etc/gtk-2.0/${CHOST}"
-	else
-		echo "/etc/gtk-2.0"
-	fi
-}
-
-src_compile() {
-	local myconf
-	# You cannot use `use_enable ...` here. im-ja's configure script
-	# doesn't distinguish --enable-canna from --disable-canna, so
-	# --enable-canna stands for --disable-canna in the script ;-(
-	use gnome || myconf="$myconf --disable-gnome"
-	use canna || myconf="$myconf --disable-canna"
-	use freewnn || myconf="$myconf --disable-wnn"
-	use anthy || myconf="$myconf --disable-anthy"
-	use skk || myconf="$myconf --disable-skk"
-	#use debug && myconf="$myconf --enable-debug"
-
-	# gnome2_src_compile automatically sets debug IUSE flag
-	econf $myconf || die "econf im-ja failed"
-	emake || die "emake im-ja failed"
-}
-
-pkg_postinst() {
-	gnome2_query_immodules_gtk2
-	gnome2_pkg_postinst
-	elog
-	elog "This version of im-ja comes with experimental XIM support."
-	elog "If you'd like to try it out, run im-ja-xim-server and set"
-	elog "environment variable XMODIFIERS to @im=im-ja-xim-server"
-	elog "e.g.)"
-	elog "\t$ export XMODIFIERS=@im=im-ja-xim-server (sh)"
-	elog "\t> setenv XMODIFIERS @im=im-ja-xim-server (csh)"
-	elog
-}
-
-pkg_postrm() {
-	gnome2_query_immodules_gtk2
-	gnome2_pkg_postrm
-}