diff options
| -rw-r--r-- | app-i18n/scim/ChangeLog | 11 | ||||
| -rw-r--r-- | app-i18n/scim/Manifest | 14 | ||||
| -rw-r--r-- | app-i18n/scim/files/scim-1.4.7-syslibltdl.patch | 61 | ||||
| -rw-r--r-- | app-i18n/scim/scim-1.4.7-r1.ebuild | 118 |
4 files changed, 201 insertions, 3 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/Manifest b/app-i18n/scim/Manifest index daf748685365..7989b126cc91 100644 --- a/app-i18n/scim/Manifest +++ b/app-i18n/scim/Manifest @@ -1,10 +1,22 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX scim-1.4.5-fbsd.patch 395 RMD160 1ce0f0cc90a8981bcc89ed0d59056e1ae17a528c SHA1 bcb1871085a2788d69ae32dff01cc1f38b51136d SHA256 a02290b079a131c393366400fdc9adf3b65c6b3a9523bd419e16e8e21ea4d7a6 AUX scim-1.4.5-imengine.patch 869 RMD160 609baff78ef99ab6895e17a18a20dfc9a4c21a08 SHA1 ecedf7b09467829d63d905a950cebeddd3cab40c SHA256 bb4eb7e0e0a06dc2ed9d99703b5d7f63b1356a2ffd59a4736caa3c6a75bf11b6 +AUX scim-1.4.7-syslibltdl.patch 1676 RMD160 a6ad514f5beb1bbcbaa7a07083eecba44866ee70 SHA1 f1c485ab9c47251322fa8686d63aaeb931a5f364 SHA256 ee807b34d95df48af40abc1a4d285d7929548481be44aba1bab407e22f406d88 DIST scim-1.4.5.tar.gz 3157124 RMD160 c4ea3c3bb06cdedb29ec32f8cabb0d32330dd6f6 SHA1 b9dd07a49abdba6d86385c92f8103ebf6df7f341 SHA256 3565ecbe7f093254179d8fd216e6a54644859b59a5e5daf48a6c9cff3d5be481 DIST scim-1.4.6.tar.gz 3112494 RMD160 2af7ec3a23ac0c3c553c98a1517b96a66cb2465f SHA1 3b8d26ff5a4ebab1ca90928d0363d2d2b0028ccf SHA256 578e605b9549c9a2f44ca31508ad00f1cc6456ab929b89df1593350618c2263f DIST scim-1.4.7.tar.gz 3075769 RMD160 0b24e24f547ce39469811076420bfcd41d1e906c SHA1 54ab2ab0ef28a84c24fbc32d37e996ecae416d50 SHA256 a0883bc5938476b33247194fe61ab5ce224eb4fb68bd7f8befc4baa8aaa8160b EBUILD scim-1.4.5-r1.ebuild 3304 RMD160 c86643b776df07e31f2aedb2365ad181742e7b75 SHA1 407ce9bb6c00f7186f2ed63b3f45ab821018908a SHA256 fbe921acab3bc65d77ddc9784bae9742f8e14e013733838279960f4d7aeb9643 EBUILD scim-1.4.6.ebuild 3179 RMD160 f7062c2c9676a97bf1497b1d5397eeff27d330de SHA1 439b818aac44445938e80a74bb791b9183700024 SHA256 99a16d3c946827052e221626be4974e4dd03fb74459e3e7770e43a31bb0ab31c +EBUILD scim-1.4.7-r1.ebuild 3234 RMD160 f1599518ac16441580e5e2e4f65fe076da6d8919 SHA1 b9fe64f44a2acebbc5bd9ed46630e80c06da8b2f SHA256 2e4a95b9af02e4306c4a1527ea685cafc1fa06f252a4cc2c61b42952fcfac4cb EBUILD scim-1.4.7.ebuild 3179 RMD160 d0f863b76c96c8b641fbec9112d3c4cfb8c945cc SHA1 afeef8af3da41303b7fb7e1608b42f44722d131e SHA256 2a31ef2b79d50a8a9986f038aa9f99d9e0a0d49a38cb9221fe8a4e22e8c65bae -MISC ChangeLog 16128 RMD160 1a4ebb9ae0ab307b87a9b64c4748946e1084dd44 SHA1 3e6fd15d18f6c2289717143e05706d13269ee4c7 SHA256 6ecdb713feb52baf9cb1b5ca6a073e0feac76c577a43d2b06048fe2b23e95304 +MISC ChangeLog 16371 RMD160 5fa951a68347f3292d142d768ca5dd0ab8ec3df5 SHA1 2f716bc7fe032e5f30447939ffa1679e2be2f618 SHA256 94a91d47eb98cec8f35a9f28b7d319bc1e8b517d3d813838ace4fb578238f592 MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.9 (GNU/Linux) + +iEYEARECAAYFAkhTkgUACgkQAiZjviIA2Xj1IACfWpxLNbp71lDsF/SDOg+aZ7v0 +xhYAn0RJek9CrHBUpOeTTZYKiYF7zKa4 +=XHFy +-----END PGP SIGNATURE----- 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" +} |