From 6e429567fc5b4fba3d5274fd121b9cefd875f836 Mon Sep 17 00:00:00 2001 From: Akinori Hattori Date: Tue, 2 Jan 2007 10:00:26 +0000 Subject: update to 1.4. svn path=/; revision=2 --- app-i18n/uim-svn/Manifest | 18 ++- app-i18n/uim-svn/files/digest-uim-svn-1.4 | 1 + app-i18n/uim-svn/files/digest-uim-svn-20060320 | 1 - app-i18n/uim-svn/uim-svn-1.4.ebuild | 178 +++++++++++++++++++++++++ app-i18n/uim-svn/uim-svn-20060320.ebuild | 148 -------------------- eclass/subversion.eclass | 13 +- 6 files changed, 200 insertions(+), 159 deletions(-) create mode 100644 app-i18n/uim-svn/files/digest-uim-svn-1.4 delete mode 100644 app-i18n/uim-svn/files/digest-uim-svn-20060320 create mode 100644 app-i18n/uim-svn/uim-svn-1.4.ebuild delete mode 100644 app-i18n/uim-svn/uim-svn-20060320.ebuild diff --git a/app-i18n/uim-svn/Manifest b/app-i18n/uim-svn/Manifest index af9080b..957aecd 100644 --- a/app-i18n/uim-svn/Manifest +++ b/app-i18n/uim-svn/Manifest @@ -2,10 +2,14 @@ AUX 50uim-gentoo.el 120 RMD160 de7359e37bde67449be61e99e1a271088c99a785 SHA1 c22 MD5 bb1358d0c54a9f19ec23bd58b8b52ef3 files/50uim-gentoo.el 120 RMD160 de7359e37bde67449be61e99e1a271088c99a785 files/50uim-gentoo.el 120 SHA256 151b731d5940fc029fd5428275fe670f85d9af501adb8e2b0e5ee5277b301ee3 files/50uim-gentoo.el 120 -EBUILD uim-svn-20060320.ebuild 2913 RMD160 7db407f1ec8e6f937c485d24456be2854f70cce0 SHA1 2b87247bc8f0ba53cae08b8bcf9464139b4d6e4e SHA256 856408a26c09cf5b5fcf0618e8216debdfa558799a4b0faa2f2fc0462a0d0ff3 -MD5 6fc4894616eaa539c5d5df16e01171d2 uim-svn-20060320.ebuild 2913 -RMD160 7db407f1ec8e6f937c485d24456be2854f70cce0 uim-svn-20060320.ebuild 2913 -SHA256 856408a26c09cf5b5fcf0618e8216debdfa558799a4b0faa2f2fc0462a0d0ff3 uim-svn-20060320.ebuild 2913 -MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-uim-svn-20060320 1 -RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-uim-svn-20060320 1 -SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-uim-svn-20060320 1 +EBUILD uim-svn-1.4.ebuild 3519 RMD160 99dfc9170d454a1df5377762b206cf481d242c0c SHA1 c6b0f3872a6b35d7237dc7879a970e1d8067d5f9 SHA256 de85f8ba02b6620bd1e1b958ac2a8608b06a07d6fcc1b9dab840bb4e2a909b07 +MD5 005a523093db6a00e283dcb9575b0430 uim-svn-1.4.ebuild 3519 +RMD160 99dfc9170d454a1df5377762b206cf481d242c0c uim-svn-1.4.ebuild 3519 +SHA256 de85f8ba02b6620bd1e1b958ac2a8608b06a07d6fcc1b9dab840bb4e2a909b07 uim-svn-1.4.ebuild 3519 +MISC metadata.xml 228 RMD160 d00ebe7b3e1735ca3ca559d39b754b06cf4a8d4b SHA1 2d51ec59cf9b5fdec09b26e402f14d6a8caf4aec SHA256 15500f2c0c8e55fe82f937103a2741db6182f259dec5a9d334016781ba928c5f +MD5 144bface8ba60a1da8734f201abd268f metadata.xml 228 +RMD160 d00ebe7b3e1735ca3ca559d39b754b06cf4a8d4b metadata.xml 228 +SHA256 15500f2c0c8e55fe82f937103a2741db6182f259dec5a9d334016781ba928c5f metadata.xml 228 +MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-uim-svn-1.4 1 +RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-uim-svn-1.4 1 +SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-uim-svn-1.4 1 diff --git a/app-i18n/uim-svn/files/digest-uim-svn-1.4 b/app-i18n/uim-svn/files/digest-uim-svn-1.4 new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/app-i18n/uim-svn/files/digest-uim-svn-1.4 @@ -0,0 +1 @@ + diff --git a/app-i18n/uim-svn/files/digest-uim-svn-20060320 b/app-i18n/uim-svn/files/digest-uim-svn-20060320 deleted file mode 100644 index 8b13789..0000000 --- a/app-i18n/uim-svn/files/digest-uim-svn-20060320 +++ /dev/null @@ -1 +0,0 @@ - diff --git a/app-i18n/uim-svn/uim-svn-1.4.ebuild b/app-i18n/uim-svn/uim-svn-1.4.ebuild new file mode 100644 index 0000000..a65e35e --- /dev/null +++ b/app-i18n/uim-svn/uim-svn-1.4.ebuild @@ -0,0 +1,178 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit elisp-common flag-o-matic kde-functions multilib subversion + +IUSE="X anthy canna dict eb emacs fep gtk immqt libedit m17n-lib nls qt3" + +DESCRIPTION="a multilingual input method library" +HOMEPAGE="http://uim.freedesktop.org/" +SRC_URI="" + +LICENSE="BSD GPL-2 LGPL-2.1" +KEYWORDS="~x86" +SLOT="0" + +DEPEND="${RDEPEND} + >=sys-devel/autoconf-2.60b + >=sys-devel/automake-1.10 + >=dev-util/intltool-0.35.2 + gnome-base/librsvg + dev-lang/perl + dev-lang/ruby + app-text/asciidoc + X? ( || ( ( + x11-proto/xextproto + x11-proto/xproto + ) + virtual/x11 ) ) + nls? ( virtual/libintl )" +RDEPEND="!app-i18n/uim + X? ( || ( ( + x11-libs/libX11 + x11-libs/libXft + x11-libs/libXt + x11-libs/libICE + x11-libs/libSM + x11-libs/libXext + x11-libs/libXrender + ) + virtual/x11 ) ) + anthy? ( || ( app-i18n/anthy app-i18n/anthy-ss ) ) + canna? ( app-i18n/canna ) + eb? ( dev-libs/eb ) + emacs? ( virtual/emacs ) + gtk? ( >=x11-libs/gtk+-2 ) + immqt? ( $(qt_min_version 3.3.4) ) + libedit? ( dev-libs/libedit ) + qt3? ( $(qt_min_version 3.3.4) ) + m17n-lib? ( dev-libs/m17n-lib )" + +src_unpack() { + + local repo_root="http://anonsvn.freedesktop.org/svn/uim" + + subversion_fetch ${repo_root}/trunk + subversion_fetch ${repo_root}/sigscheme-trunk sigscheme + subversion_fetch ${repo_root}/libgcroots-trunk sigscheme/libgcroots + + cd "${S}" + sed -i -e "22d" -e "21,22s:^#::" Makefile.am + + cd sigscheme/libgcroots + + local i + + for ((i = 0; i < 3; i++)); do + ./autogen.sh + cd .. + done + +} + +src_compile() { + + local myconf="--enable-maintainer-mode" + + if use dict && (use anthy || use canna); then + myconf="${myconf} --enable-dict" + + else + ewarn "dict use flag should use with anthy or canna use flag. disabled." + myconf="${myconf} --disable-dict" + + fi + + if use qt3 || use immqt; then + set-qtdir 3 + fi + + econf \ + $(use_enable emacs) \ + $(use_enable fep) \ + $(use_enable nls) \ + $(use_with X x) \ + $(use_with anthy) \ + $(use_with canna) \ + $(use_with eb) \ + $(use_with immqt qt-immodule) \ + $(use_with libedit) \ + $(use_with qt3 qt) \ + $(use_with gtk gtk2) \ + $(use_with m17n-lib m17nlib) \ + ${myconf} \ + || die + emake all ChangeLog || die + +} + +src_install() { + + emake DESTDIR="${D}" install || die + + dodoc AUTHORS ChangeLog* NEWS README* + + rm doc/Makefile* + docinto doc + dodoc doc/* + + local u + + for u in emacs fep; do + if use ${u}; then + cd ${u} + docinto ${u} + dodoc README* + cd - + fi + done + + if use emacs; then + local im + + if has_version app-i18n/anthy || has_version app-i18n/anthy-ss; then + im="anthy" + + elif has_version app-i18n/prime; then + im="prime" + + else + im="skk" + + fi + + elisp-site-file-install "${FILESDIR}"/50uim-gentoo.el + dosed "s:@IM@:${im}:" ${SITELISP}/50uim-gentoo.el + fi + + # move sigscheme documents into ${P} + mv ${D}/usr/share/doc/{sigscheme,${P}/} + + # remove sigscheme headers and a pkgconfig file + rm -rf ${D}/usr/include/sigscheme + rm -f ${D}/usr/lib/pkgconfig/sigscheme.pc + +} + +pkg_postinst() { + + local chost + + has_multilib_profile && chost=${CHOST} + use gtk && gtk-query-immodules-2.0 > "${ROOT}"/etc/gtk-2.0/${chost}/gtk.immodules + use emacs && elisp-site-regen + +} + +pkg_postrm() { + + local chost + + has_multilib_profile && chost=${CHOST} + use gtk && gtk-query-immodules-2.0 > "${ROOT}"/etc/gtk-2.0/${chost}/gtk.immodules + has_version virtual/emacs && elisp-site-regen + +} + +# $Id$ diff --git a/app-i18n/uim-svn/uim-svn-20060320.ebuild b/app-i18n/uim-svn/uim-svn-20060320.ebuild deleted file mode 100644 index d35a6a4..0000000 --- a/app-i18n/uim-svn/uim-svn-20060320.ebuild +++ /dev/null @@ -1,148 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit elisp-common flag-o-matic kde-functions multilib subversion - -IUSE="X anthy canna dict eb emacs fep gtk immqt libedit m17n-lib nls qt3" - -ESVN_REPO_URI="http://anonsvn.freedesktop.org/svn/uim/trunk" -ESVN_BOOTSTRAP="./autogen.sh" -#ESVN_PATCHES="*.diff" - -DESCRIPTION="a multilingual input method library" -HOMEPAGE="http://uim.freedesktop.org/" -SRC_URI="" - -LICENSE="BSD GPL-2 LGPL-2.1" -KEYWORDS="~x86" -SLOT="0" - -DEPEND="${RDEPEND} - >=dev-util/intltool-0.31 - gnome-base/librsvg - X? ( || ( ( - x11-proto/xextproto - x11-proto/xproto - ) - virtual/x11 ) ) - nls? ( virtual/libintl )" -RDEPEND="!app-i18n/uim - X? ( || ( ( - x11-libs/libX11 - x11-libs/libXft - x11-libs/libXt - x11-libs/libICE - x11-libs/libSM - x11-libs/libXext - x11-libs/libXrender - ) - virtual/x11 ) ) - anthy? ( || ( app-i18n/anthy app-i18n/anthy-ss ) ) - canna? ( app-i18n/canna ) - eb? ( dev-libs/eb ) - emacs? ( virtual/emacs ) - gtk? ( >=x11-libs/gtk+-2 ) - immqt? ( $(qt_min_version 3.3.4) ) - libedit? ( dev-libs/libedit ) - qt3? ( $(qt_min_version 3.3.4) ) - m17n-lib? ( dev-libs/m17n-lib )" - -src_compile() { - - local myconf="--enable-maintainer-mode" - - if use dict && (use anthy || use canna); then - myconf="${myconf} --enable-dict" - - else - ewarn "dict use flag should use with anthy or canna use flag. disabled." - myconf="${myconf} --disable-dict" - - fi - - if use qt3 || use immqt; then - set-qtdir 3 - fi - - econf \ - $(use_enable emacs) \ - $(use_enable fep) \ - $(use_enable nls) \ - $(use_with X x) \ - $(use_with anthy) \ - $(use_with canna) \ - $(use_with eb) \ - $(use_with immqt qt-immodule) \ - $(use_with libedit) \ - $(use_with qt3 qt) \ - $(use_with gtk gtk2) \ - $(use_with m17n-lib m17nlib) \ - ${myconf} \ - || die - emake || die - -} - -src_install() { - - emake DESTDIR="${D}" install || die - - dodoc AUTHORS ChangeLog* NEWS README* - - rm doc/Makefile* - docinto doc - dodoc doc/* - - local u - - for u in emacs fep; do - if use ${u}; then - cd ${u} - docinto ${u} - dodoc README* - cd - - fi - done - - if use emacs; then - local im - - if has_version app-i18n/anthy || has_version app-i18n/anthy-ss; then - im="anthy" - - elif has_version app-i18n/prime; then - im="prime" - - else - im="skk" - - fi - - elisp-site-file-install "${FILESDIR}"/50uim-gentoo.el - dosed "s:@IM@:${im}:" ${SITELISP}/50uim-gentoo.el - fi - -} - -pkg_postinst() { - - local chost - - has_multilib_profile && chost=${CHOST} - use gtk && gtk-query-immodules-2.0 > "${ROOT}"/etc/gtk-2.0/${chost}/gtk.immodules - use emacs && elisp-site-regen - -} - -pkg_postrm() { - - local chost - - has_multilib_profile && chost=${CHOST} - use gtk && gtk-query-immodules-2.0 > "${ROOT}"/etc/gtk-2.0/${chost}/gtk.immodules - has_version virtual/emacs && elisp-site-regen - -} - -# $Id$ diff --git a/eclass/subversion.eclass b/eclass/subversion.eclass index cead495..d24504c 100644 --- a/eclass/subversion.eclass +++ b/eclass/subversion.eclass @@ -124,7 +124,8 @@ ESVN_UPDATE_CMD="svn update" # function subversion_fetch() { - local repo_uri="$(subversion__get_repository_uri "${@}")" + local repo_uri="$(subversion__get_repository_uri "${1}")" + local S_dest="${2}" # check for the protocol local protocol="${repo_uri%%:*}" @@ -157,9 +158,10 @@ function subversion_fetch() { cd "${ESVN_STORE_DIR}" || die "${ESVN}: can't chdir to ${ESVN_STORE_DIR}" - local wc_path="$(subversion__get_wc_path "${repo_url}")" + local wc_path="$(subversion__get_wc_path "${repo_uri}")" local options="${ESVN_OPTIONS} --config-dir ${ESVN_STORE_DIR}/.subversion" + debug-print "${FUNCNAME}: wc_path = \"${wc_path}\"" debug-print "${FUNCNAME}: ESVN_OPTIONS = \"${ESVN_OPTIONS}\"" debug-print "${FUNCNAME}: options = \"${options}\"" @@ -197,6 +199,8 @@ function subversion_fetch() { if ! has "export" ${ESVN_RESTRICT}; then cd "${wc_path}" || die "${ESVN}: can't chdir to ${wc_path}" + local S="${S}/${S_dest}" + # export to the ${WORKDIR} #* "svn export" has a bug. see http://bugs.gentoo.org/119236 #* svn export . "${S}" || die "${ESVN}: can't export to ${S}." @@ -279,9 +283,12 @@ function subversion_src_unpack() { # function subversion_wc_info() { - local repo_uri="$(subversion__get_repository_uri "${@}")" + local repo_uri="$(subversion__get_repository_uri "${1}")" local wc_path="$(subversion__get_wc_path "${repo_uri}")" + debug-print "${FUNCNAME}: repo_uri = ${repo_uri}" + debug-print "${FUNCNAME}: wc_path = ${wc_path}" + if [[ ! -e "${wc_path}" ]]; then return 1 fi -- cgit v1.2.3-65-gdbad