From 7e44dea8866f8ad9159647e2b6b539908ea1787d Mon Sep 17 00:00:00 2001 From: Tim Harder Date: Thu, 22 Sep 2011 21:52:35 +0000 Subject: [PATCH] Update to EAPI 4. Package-Manager: portage-2.2.0_alpha58/cvs/Linux x86_64 --- app-vim/cream/ChangeLog | 5 ++- app-vim/cream/Manifest | 18 +++++----- app-vim/cream/cream-0.43.ebuild | 58 +++++++++++++++++---------------- 3 files changed, 43 insertions(+), 38 deletions(-) diff --git a/app-vim/cream/ChangeLog b/app-vim/cream/ChangeLog index 960457a6c405..0c8aa0c32b4c 100644 --- a/app-vim/cream/ChangeLog +++ b/app-vim/cream/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-vim/cream # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-vim/cream/ChangeLog,v 1.52 2011/09/22 21:34:47 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-vim/cream/ChangeLog,v 1.53 2011/09/22 21:52:35 radhermit Exp $ + + 22 Sep 2011; Tim Harder cream-0.43.ebuild: + Update to EAPI 4. 22 Sep 2011; Tim Harder cream-0.41-r2.ebuild, cream-0.43.ebuild: diff --git a/app-vim/cream/Manifest b/app-vim/cream/Manifest index 03bf43569df9..cc8479356ad7 100644 --- a/app-vim/cream/Manifest +++ b/app-vim/cream/Manifest @@ -12,17 +12,17 @@ DIST cream-spell-dict-fre_2.1.zip 872841 RMD160 28efaffd7a1325229aeb1e5aa85a4072 DIST cream-spell-dict-ger_2.0.1.zip 894848 RMD160 50321a0d6b22a5761c587c93269bf3b1908b6e48 SHA1 d38ad0e2186dff63b7aa2fd1a0f67766464da8eb SHA256 62fbfa9ab7a42c4c0d8d7723f865be7e8c216b5215a15d7430ed0cfb3c993eae DIST cream-spell-dict-spa_3.0.zip 1710280 RMD160 5418c029358b11bb339ca0b0dc0965e7381333b2 SHA1 00aa9d1dcb0000a34b4f6adfa894fa715251be11 SHA256 b26ac0bbf905508b446cfb4424fad5923d4e5e6afe5cd20a313be67269485602 EBUILD cream-0.41-r2.ebuild 4636 RMD160 c292bd97c951741a45e2dc6d7125b995c1051879 SHA1 9ac0dafb2d673374732f60440dd3c65b5a097c22 SHA256 f6ad71cb7fad54a1f652b17d516c18f72f760368853c4cc24d058581421d4871 -EBUILD cream-0.43.ebuild 4571 RMD160 254d129b3a5fb9ef042c53a6a0026854dc4d13f0 SHA1 282e96e3cb85054d5b4090beb6cae0bbe0f9ea2b SHA256 82fcde2deae5cca27af6e3d1989ee34a24b333a441bb95e22692ec7ab3e385a9 -MISC ChangeLog 7111 RMD160 bd1dd4b7289f82db060f2db049c219c68b192653 SHA1 f1d180508a8fe62ec52277c251486adc34ad0522 SHA256 8a7dfd36d5828319c099a43f00a842676b0670441ca2a3dd01920b14a165d07c +EBUILD cream-0.43.ebuild 4524 RMD160 e0ce512d19a5d32208e3a46ab8fb926779668df8 SHA1 8eadc7d1ef080241b01eaeb87f37fbd5b04de007 SHA256 9bab7ad1893e5b1be8ef1c222a5e3f9346ecdec764ec40dccbbaf8c80c893311 +MISC ChangeLog 7200 RMD160 cd40dc58f478af1589767dd4135a063933941a8e SHA1 bdecfdbd2326c9f3b01a2808cf23b1589092be3d SHA256 a9487d07356d073ebb92a26b230dcb7895168a47a6f37e1097c95398b3ca5418 MISC metadata.xml 431 RMD160 7a1541d4b0a3ee5bb8cc734dd385a317b65e2f41 SHA1 25f7000c98ff591e933456600b4f80f6dd4aae32 SHA256 f8b6ad7fcb3088b1672d216ca4aa5860f588e6fa1bdcc3f7a0bd16a64e074eae -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQEcBAEBCgAGBQJOe6n9AAoJEEqz6FtPBkyj7egIAK4i5/Bm/1vglyOwWnqT2eEf -v6ADMQNeVzrsfkHI9Yvc0O8qVnvpC2bj728DiRA64FfOaLtzVH2vxk4skSMDuAFI -Lp8+RLB50ufCmLPQSIXQ/PKwo+wwyOX09f2HoF0qBN7rDGmlQrBEFMKV4uOEX95p -wMmmqA/i7ANkacAG35rbcTKY90qNE9E3YPEt6xnURQIBfdUJ/AscG0IxrkrpVTEc -xc10hubzn44P0oLQ1BKuE9g4l6kMW7SGsytPEOUl26dnV3YPmQcIMj/b8HwKMvAt -8BxSm74yrbImU/GCJ6xQivJpd8lPmt8JcGYxYngQZ7CTd8p0cyB09M0egjZR+OQ= -=sGYR +iQEcBAEBCgAGBQJOe64pAAoJEEqz6FtPBkyjZWgH/jMVqGuJwBMMSub1AW6fIrpq +EmMBcmNd2jhRnSrax6Wm7dOvhejDSjwG9t9dkV2hUDiBoI8cLIlfd8RjdCEiu0et +QFZEdpfC/beTDP2J+dHvMht3WzzHISGOBB1DvDJIuoaIegxlDefyBWOeZj7ERnx7 +vMwYu3rkZw1urz8EC8tUdUsGz6H//ONBITQ3I/l2bp3vx67ourSjbLWaXvEJ+xbc +btbyTCBOS6C/QU/MK0EAzka5MCzNVyAyLx0FdTWn50RsdzniMbBQ6XHWu90QlmMi +XDsG9ZMJ9etIcRH+xm1NOu0yVzXd3r5YzyfdSl5a+/uHBUHw/p8xtRGtJCyzY4U= +=dsXU -----END PGP SIGNATURE----- diff --git a/app-vim/cream/cream-0.43.ebuild b/app-vim/cream/cream-0.43.ebuild index cc683ca31979..f1e760155aba 100644 --- a/app-vim/cream/cream-0.43.ebuild +++ b/app-vim/cream/cream-0.43.ebuild @@ -1,6 +1,8 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-vim/cream/cream-0.43.ebuild,v 1.2 2011/09/22 21:34:47 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-vim/cream/cream-0.43.ebuild,v 1.3 2011/09/22 21:52:35 radhermit Exp $ + +EAPI=4 inherit vim-plugin eutils fdo-mime @@ -61,6 +63,25 @@ prefix_help_file() { || die "Failed to rename \"${helpfile}\"" } +pkg_setup() { + elog "Cream comes with several dictionaries for spell checking. In" + elog "all cases, at least a small English dictionary will be installed." + elog + elog "To specify which optional dictionaries are installed, set the" + elog "LINGUAS variable in /etc/make.conf. For example, to install full" + elog "English and French dictionaries, use:" + elog " LINGUAS=\"en fr\"" + elog + elog "Available dictionaries are:" + for dict in "English en" "French fr" "German de" "Spanish es" ; do + # portage bug: shouldn't get a QA notice for linguas stuff... + elog " ${dict% *} \t(${dict#* }) $( ( \ + use linguas_${dict#* } &>/dev/null && \ + echo '(Will be installed)' ) || echo '(Will not be installed)' )" + done + elog +} + src_unpack() { mkdir -p "${S}"/spelldicts @@ -75,14 +96,16 @@ src_unpack() { unpack ${my_a} fi done +} +src_prepare() { # change installation path + fix the wrapper command (disable plugins) - cd "${S}" - cat >cream < cream <<-EOF + #!/bin/sh + gvim --servername CREAM --noplugin -U NONE -u "\\\$VIM/cream/creamrc" "\$@" + EOF + + sed -i "/let \$CREAM/s:VIMRUNTIME:VIM:" creamrc || die # make taglist ebuild aware, bug #66052 epatch "${FILESDIR}"/${PN}-0.30-ebuilds.patch @@ -127,27 +150,6 @@ src_install() { dosym ../../doc/${PF}/html /usr/share/vim/cream/docs-html } -pkg_setup() { - elog "Cream comes with several dictionaries for spell checking. In" - elog "all cases, at least a small English dictionary will be installed." - elog - elog "To specify which optional dictionaries are installed, set the" - elog "LINGUAS variable in /etc/make.conf. For example, to install full" - elog "English and French dictionaries, use:" - elog " LINGUAS=\"en fr\"" - elog - elog "Available dictionaries are:" - for dict in "English en" "French fr" "German de" "Spanish es" ; do - # portage bug: shouldn't get a QA notice for linguas stuff... - elog " ${dict% *} \t(${dict#* }) $( ( \ - use linguas_${dict#* } &>/dev/null && \ - echo '(Will be installed)' ) || echo '(Will not be installed)' )" - done - elog - # give the user time to cancel if necessary - epause -} - pkg_postinst() { fdo-mime_desktop_database_update vim-plugin_pkg_postinst -- 2.26.2