Use system libltdl, not the internal copy (should fix building with libtool 2.2 hopefully).

(Portage version: 2.1.5.5)

3 files changed, 188 insertions, 2 deletions

diff --git a/app-i18n/scim/ChangeLog b/app-i18n/scim/ChangeLog
index 105893d0e482..8fa721f41286 100644
--- a/app-i18n/scim/ChangeLog
+++ b/app-i18n/scim/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-i18n/scim
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/ChangeLog,v 1.120 2007/07/22 09:20:28 calchan Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/ChangeLog,v 1.121 2008/06/14 09:40:12 flameeyes Exp $
+
+*scim-1.4.7-r1 (14 Jun 2008)
+
+  14 Jun 2008; Diego Pettenò <flameeyes@gentoo.org>
+  +files/scim-1.4.7-syslibltdl.patch, +scim-1.4.7-r1.ebuild:
+  Use system libltdl, not the internal copy (should fix building with
+  libtool 2.2 hopefully).
 
   22 Jul 2007; Denis Dupeyron <calchan@gentoo.org> scim-1.4.5-r1.ebuild:
   Drop virtual/x11 dependency.
diff --git a/app-i18n/scim/files/scim-1.4.7-syslibltdl.patch b/app-i18n/scim/files/scim-1.4.7-syslibltdl.patch
new file mode 100644
index 000000000000..0e514b3195a8
--- /dev/null
+++ b/app-i18n/scim/files/scim-1.4.7-syslibltdl.patch
@@ -0,0 +1,61 @@
+Index: scim-1.4.7/src/Makefile.am
+===================================================================
+--- scim-1.4.7.orig/src/Makefile.am
++++ scim-1.4.7/src/Makefile.am
+@@ -33,7 +33,7 @@ INCLUDES		= -I$(top_builddir) \
+ 			  -DSCIM_MODULE_PATH=\"@SCIM_MODULE_PATH@\"
+ 
+ 
+-noinst_HEADERS		= ltdl.h \
++noinst_HEADERS		= \
+ 			  scim_private.h \
+ 			  scim_compose_key_data.h \
+ 			  scim_keyboard_layout_data.h \
+@@ -84,11 +84,6 @@ libsciminclude_HEADERS 	= scim.h \
+ 			  scim_utility.h
+ 
+ 
+-noinst_LTLIBRARIES	= libltdlc.la
+-
+-libltdlc_la_SOURCES	= ltdl.cpp
+-libltdlc_la_LIBADD	= $(LIBADD_DL)
+-
+ if SCIM_LD_VERSION_SCRIPT
+ LD_VERSION_SCRIPT_OPTION="-Wl,--version-script=$(srcdir)/libscim.version-script"
+ endif
+@@ -137,7 +132,7 @@ libscim@SCIM_EPOCH@_la_LDFLAGS= -version
+ 			  @LTLIBINTL@ \
+ 			  -lstdc++
+ 
+-libscim@SCIM_EPOCH@_la_LIBADD	= libltdlc.la
++libscim@SCIM_EPOCH@_la_LIBADD	= -lltdl
+ 
+ 
+ bin_PROGRAMS		= scim scim-config-agent
+Index: scim-1.4.7/src/scim_module.cpp
+===================================================================
+--- scim-1.4.7.orig/src/scim_module.cpp
++++ scim-1.4.7/src/scim_module.cpp
+@@ -27,7 +27,9 @@
+ #define Uses_STL_ALGORITHM
+ #include "scim_private.h"
+ #include "scim.h"
+-#include "ltdl.h"
++extern "C" {
++  #include <ltdl.h>
++}
+ #include <dirent.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+Index: scim-1.4.7/configure.ac
+===================================================================
+--- scim-1.4.7.orig/configure.ac
++++ scim-1.4.7/configure.ac
+@@ -71,7 +71,6 @@ AM_GNU_GETTEXT
+ # Init libtool
+ AC_LIBTOOL_DLOPEN
+ AC_PROG_LIBTOOL
+-AC_LIB_LTDL
+ AC_SUBST(LIBTOOL_DEPS)
+ 
+ # libtool option to control which symbols are exported
diff --git a/app-i18n/scim/scim-1.4.7-r1.ebuild b/app-i18n/scim/scim-1.4.7-r1.ebuild
new file mode 100644
index 000000000000..7f0b4bf0eba4
--- /dev/null
+++ b/app-i18n/scim/scim-1.4.7-r1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-1.4.7-r1.ebuild,v 1.1 2008/06/14 09:40:12 flameeyes Exp $
+
+inherit eutils flag-o-matic autotools
+
+DESCRIPTION="Smart Common Input Method (SCIM) is an Input Method (IM) development platform"
+HOMEPAGE="http://www.scim-im.org/"
+SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="doc gtk kde qt3"
+
+RDEPEND="x11-libs/libX11
+	gtk? ( >=x11-libs/gtk+-2
+		>=dev-libs/atk-1
+		>=x11-libs/pango-1
+		>=dev-libs/glib-2 )
+	!app-i18n/scim-cvs
+	sys-devel/libtool"
+DEPEND="${RDEPEND}
+	x11-libs/libXt
+	doc? ( app-doc/doxygen
+		app-text/docbook-xsl-stylesheets )
+	dev-lang/perl
+	dev-util/pkgconfig
+	>=dev-util/intltool-0.33"
+
+PDEPEND="kde? ( app-i18n/skim )
+	qt3? ( || ( app-i18n/scim-qtimm app-i18n/scim-bridge ) )"
+
+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_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+
+	if use doc ; then
+		local xsl=$(ls -1d /usr/share/sgml/docbook/xsl-stylesheets* | head -n 1)
+		sed -i -e "s:/usr/share/sgml/docbook/xsl-stylesheets:${xsl}:" configure.ac || die
+	fi
+
+	epatch "${FILESDIR}/${P}-syslibltdl.patch"
+	rm "${S}"/src/ltdl.{cpp,h}
+	eautoreconf
+}
+
+src_compile() {
+	local myconf
+	# bug #83625
+	filter-flags -fvisibility-inlines-hidden
+	filter-flags -fvisibility=hidden
+
+	# We cannot use "use_enable"
+	if ! use gtk ; then
+		myconf="${myconf} --disable-panel-gtk"
+		myconf="${myconf} --disable-setup-ui"
+		myconf="${myconf} --disable-gtk2-immodule"
+	fi
+
+	econf \
+		$(use_with doc doxygen) \
+		--enable-ld-version-script \
+		${myconf} || die
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc README AUTHORS ChangeLog docs/developers docs/scim.cfg
+	use doc && dohtml -r docs/html/*
+}
+
+pkg_postinst() {
+	elog
+	elog "To use SCIM with both GTK2 and XIM, you should use the following"
+	elog "in your user startup scripts such as .gnomerc or .xinitrc:"
+	elog
+	elog "LANG='your_language' scim -d"
+	elog "export XMODIFIERS=@im=SCIM"
+	elog "export GTK_IM_MODULE=\"scim\""
+	elog "export QT_IM_MODULE=\"scim\""
+	elog
+	elog "where 'your_language' can be zh_CN, zh_TW, ja_JP.eucJP or any other"
+	elog "UTF-8 locale such as en_US.UTF-8 or ja_JP.UTF-8"
+	elog
+	elog "If you prefer KDE/Qt interface, try emerge app-i18n/skim."
+	elog
+	elog "To use Chinese input methods:"
+	elog "	# emerge app-i18n/scim-tables app-i18n/scim-pinyin"
+	elog "To use Korean input methods:"
+	elog "	# emerge app-i18n/scim-hangul"
+	elog "To use Japanese input methods:"
+	elog "	# emerge app-i18n/scim-anthy"
+	elog "To use various input methods (more than 30 languages):"
+	elog "	# emerge app-i18n/scim-m17n"
+	elog
+	ewarn
+	ewarn "If you upgraded from scim-1.2.x or scim-1.0.x, you should remerge all SCIM modules."
+	ewarn
+	epause 10
+
+	[ -x /usr/bin/gtk-query-immodules-2.0 ] && gtk-query-immodules-2.0 > "${ROOT}$(get_gtk_confdir)/gtk.immodules"
+}
+
+pkg_postrm() {
+
+	[ -x /usr/bin/gtk-query-immodules-2.0 ] && gtk-query-immodules-2.0 > "${ROOT}$(get_gtk_confdir)/gtk.immodules"
+}