diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-29 11:22:34 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-29 11:22:34 +0000 |
commit | bd7908c6630f38067350d396ac5d18c3cc2434a0 (patch) | |
tree | 3559b3e11424f5529527f2474d8a977a91ee3389 /app-editors | |
parent | 8b2628ad8526c806375e7b157889e4274b70248b (diff) |
gentoo resync : 29.10.2017
Diffstat (limited to 'app-editors')
-rw-r--r-- | app-editors/atom/Manifest | 1 | ||||
-rw-r--r-- | app-editors/atom/files/atom-apm-path.patch | 14 | ||||
-rw-r--r-- | app-editors/editra/Manifest | 2 | ||||
-rw-r--r-- | app-editors/editra/editra-0.7.20-r2.ebuild | 2 | ||||
-rw-r--r-- | app-editors/emacs-vcs/Manifest | 2 | ||||
-rw-r--r-- | app-editors/emacs-vcs/emacs-vcs-26.0.90.ebuild | 386 | ||||
-rw-r--r-- | app-editors/gvim/Manifest | 4 | ||||
-rw-r--r-- | app-editors/gvim/gvim-8.0.1188.ebuild | 129 | ||||
-rw-r--r-- | app-editors/gvim/gvim-9999.ebuild | 129 | ||||
-rw-r--r-- | app-editors/mg/Manifest | 2 | ||||
-rw-r--r-- | app-editors/mg/mg-20170401.ebuild | 2 | ||||
-rw-r--r-- | app-editors/notepadqq/Manifest | 2 | ||||
-rw-r--r-- | app-editors/notepadqq/notepadqq-1.2.0.ebuild | 52 | ||||
-rw-r--r-- | app-editors/vim-core/Manifest | 6 | ||||
-rw-r--r-- | app-editors/vim-core/files/vimrc-r5 | 11 | ||||
-rw-r--r-- | app-editors/vim-core/vim-core-8.0.1188.ebuild | 59 | ||||
-rw-r--r-- | app-editors/vim-core/vim-core-9999.ebuild | 59 | ||||
-rw-r--r-- | app-editors/vim/Manifest | 4 | ||||
-rw-r--r-- | app-editors/vim/vim-8.0.1188.ebuild | 123 | ||||
-rw-r--r-- | app-editors/vim/vim-9999.ebuild | 123 |
20 files changed, 734 insertions, 378 deletions
diff --git a/app-editors/atom/Manifest b/app-editors/atom/Manifest index c27bf64cf8fa..6cabe56b51db 100644 --- a/app-editors/atom/Manifest +++ b/app-editors/atom/Manifest @@ -2,7 +2,6 @@ AUX apm-python.patch 388 SHA256 c43a64592954b476cd38fdc3ab24a1e5b7a76993be5b3abd AUX atom-1.13-apm-path.patch 549 SHA256 44550739a0ded936ab4af2d38d237602b6687c47d4e5c234e2afcc96e422f852 SHA512 050072d0a9db19c44a7a4c3fdbbe2aa5e558ea133176815c5ef796b1d532b1691dc1b3cf9ca5abc119653de380d3636d963da37bb8652ed560b052c1802a5a44 WHIRLPOOL b905517388e4208cc2d4f425cbb31a5977f511d7869d0c5c1f6dec7e2ee101908d125e00bbbab96e2dc1a0720cd24648182f3a9aa471181e5fc40d513bb80d82 AUX atom-apm-path-r1.patch 522 SHA256 c4c9c6be2c00ff0d70471814b051f2766a46a856903a7c1eace14655f6c67327 SHA512 48a1d40cded6c4c2875c03867d98819e27da1af6f9ad171836598d3f7a687eaf47a1621397f186c8ebc122db77b24432b68902445d5ff9e641158d5096fa7892 WHIRLPOOL 67379ec8aadb33c53cdb28b70dfcc68ad044434c129dc13fc08efee12cff7d520e0714cf9f05e4a3bd706e5abd22c5a1bdd1eb596ad98c730c4b2a155e5e521d AUX atom-apm-path-r2.patch 537 SHA256 ce3f4ba3d203e0440ea95241527f58e1f7fe54061b2a233b7ecbc311090d7f11 SHA512 1172c72c94d25538d63e04202f273b87f794431847d9b1138d4eb43d4578d47ca1ecf2636170a8648eef2afaf01a35114752ebecad2b9cd8c7d4ae04dcbc741d WHIRLPOOL dc41d9d0b404d88a342f179cd16a85854d52c67eb94ed6153a02c6aa463e6c6f2e5a005642dcd136de6b088851c8742355c7e1cdd5f9036f71b72af17854c396 -AUX atom-apm-path.patch 441 SHA256 d8d8f973ede9e5d2d543969ccdf51d5195a8f05084ba802130d963c4ad155d9e SHA512 6cb559afa18586ed2dc00cf296e835e9611cbf0c29965b32132532282a47c94baa5e6066b1c6cfe4ad89fd1eb98abf2e4dc2439bfd7fdd3aed0836f411666484 WHIRLPOOL 7948f35f529cb17bc6193b5f72d534caeb36fa76ee2a3f93eb6b703ea1eb38443df75a797cb2d9cfca69de6aac5969a9a9afc5495f19cadf66477c4bc17665a4 AUX atom-fix-app-restart-r1.patch 402 SHA256 b5054435a7657ceeb02e57fc1c1db35b69532091cc37121d44b5cf385ea53016 SHA512 6218175e2513f7afdbd6ed4875037929e375fdfd84683f84430e387bb8302aaf472845d74d46f75a79409b867a79b29f06ecfaea4a95ff48d229d080dc74f68f WHIRLPOOL 5604bf1bd9abd695098638c73752acd873da14f09d2d3a170649aa7a47afdd06613de191157048767a4af6c62348d28cf086d092e0c0cdef4d2511eb99125b0c AUX atom-fix-app-restart.patch 422 SHA256 fa12269160e78f293f8b74997990853e84444299e0bc33bd0b816ab33669b758 SHA512 2222c7aaeec01394286adc34337ab7f38e29e3b956e4c85dafe97654c85c0d68bb8bcf8b0e198faf2ed6329eb8236f7d16359888a439fd0c110f31b3a81cb7e9 WHIRLPOOL b4394b3ed1ed8b8e338cc0722ab5132174adf80dc6f0f4d67bc29376842763258e8936704d6954fc3e828caa6062689489592f392745de9ed5bcaace1f798ae2 AUX atom-license-path-r1.patch 719 SHA256 6417fff5f48b9cb164e072d4052b8863211179a68f93fe08a04eacee3414f66b SHA512 2909f47f37d065afe5ef4fd86b8b1c01a1a4d4f9f03e7c762cfdb0f97b53ebec2eaa803b34273bf3401c5a0e1faf03ef10c3caf6f96000d1786883cd08d7b964 WHIRLPOOL f88d1419d125d3cd121ec28e04f1ba62d7557c2ecdfa5e3f90519f04ca349e31b486bde98c291a2a048072b1a3ef67631e14004bf0a854e832675d67f9d1a677 diff --git a/app-editors/atom/files/atom-apm-path.patch b/app-editors/atom/files/atom-apm-path.patch deleted file mode 100644 index 7ee7cdb4a107..000000000000 --- a/app-editors/atom/files/atom-apm-path.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/build/app/src/config-schema.js -+++ b/build/app/src/config-schema.js -@@ -9,6 +9,11 @@ - core: { - type: 'object', - properties: { -+ apmPath: { -+ type: 'string', -+ "default": '/usr/bin/apm{{ATOM_SUFFIX}}', -+ description: 'Path to apm executable.' -+ }, - ignoredNames: { - type: 'array', - "default": [".git", ".hg", ".svn", ".DS_Store", "._*", "Thumbs.db"], diff --git a/app-editors/editra/Manifest b/app-editors/editra/Manifest index 5909446bd8f3..eb87b8fec2d3 100644 --- a/app-editors/editra/Manifest +++ b/app-editors/editra/Manifest @@ -1,7 +1,7 @@ AUX editra-0.7.20-wx30.patch 2264 SHA256 ee850c1ff4151313b5881b26dcf8feefd978dd04498b4670904680463f7e79f5 SHA512 c0befbe2fb2eead2c4fc066767b48938b0f2b17949dc42fd98128d63556268a12b73fb49f22a8e9abf524e4450bda2b2b4e0b4953bc7f3c7c32b6ba1e7eefe63 WHIRLPOOL 08b108cb07dba01c6ea12a764dcc64e9b44ba5281d89a8634b3896694c28b7db5f10dbe3302349539a0b3c50b58f361c42cdedbaf2c1f779e4974fb38da8ef31 DIST Editra-0.7.20.tar.gz 4072243 SHA256 ed515bca58d87d9a2b3085f322a9fe7c6d1407a3b05db1434f80ea8f7e42ccc0 SHA512 e568ce2a5f04300c33223bf7a0e6fbc52d0a51c3472afb9b613fe21cfbeba0b9b453d87837e52c7c48050fc266ff5ff194a42f797053f21f0a25cd5c4579febe WHIRLPOOL ecfbc9610ba707aaad4995f9832e0f2bf2d79e56a5fadb27ae6c5b671c0f69a166c3d2d37163141789629a30fe56fbeb59c05c0203ae9201e2447ea479f52c55 EBUILD editra-0.7.20-r1.ebuild 1229 SHA256 e089a9c6f2406de4a40c09839bcfe4a01fd71d1406da8e890511ce9856c1b018 SHA512 0d18d21b90528220f2d6dd1ca8cd61ed8c922f1a39307eec94511f1c7e634ec02a26bf1455fcb7c7361d355aaa3dff75d9bb86ecffe3bd82d9fbc362e2f4429e WHIRLPOOL 989606aa054c30a95cde14890f2501664cdf5fcd62eac56bbd50bfe0c789cfb537731aaef221f30538a6222b8fac7f0723ae920162a89c3146041821c5b64f24 -EBUILD editra-0.7.20-r2.ebuild 1263 SHA256 5a4fc633fa98c69651b37e013fe3798b810c833454277c7dad2d6b6c3690a5fc SHA512 5ed7f65ac2fad154890b6f3fc7a4d080eefc6b5ce8ea2c87e6f5a1995c38c80bed31d19a2d7423931acd13a3592db6f09abe68b14fdc05ba285fc7760a1094b6 WHIRLPOOL 11e3a7a7c360abada1b71eae3b9cdefea8a884c2f76ab3aa5d4a9bd2d55eaee8d36f2bd405f76ccb57da37161f09a6ebe09a5ba11847c94d615dc5d330a1697c +EBUILD editra-0.7.20-r2.ebuild 1261 SHA256 644531f120c0bb9ef784a4c33abfb42a8ced86c51e412f83ca221b04697c7438 SHA512 629e25267f89ce9f9688ca1660095f28ab92895beae58a01736565dffaa2c23f31c78793ac3e8fe110b43287c642f339f5d5c7f21653a5777d6de34d5edb2612 WHIRLPOOL 576169dbecf0adb51d1c1c3eba293e31e92380b15d1de8b81727d9dc7a35bb77152df29da14f36804757de1c4858ea77b855a610d405de5a27564b019b28c85b MISC ChangeLog 2954 SHA256 f3401053f2dbbfe4125c21bcbe4765891077ff462d956f5aa4417493ca844bad SHA512 29e4ea1df313ed66fc3d271e9a316109d34916a8708157bf3e4ee2342a9cd52938d3f92443730095c802ddb961b796c8f08bc7eee57b64d9650abf6c9e2fbf1e WHIRLPOOL 4c2769921db652d271c6277d4d4b81c40bd823209d470741bf12aecddba5ada8762860d97eb1abaf56ba54f32a130f809be8c8931a905b1a42ecd60200b97578 MISC ChangeLog-2015 6596 SHA256 45499c3b42ab295cc3dbdfbba40bb87fcc6a20a3ac6e024fd779b14de1d966a9 SHA512 d74ba28b915a1071fcae4ba96c029cd308bbc1908f5ded4ed56c4b72d56e3c15aaa513bf756255398ec79e99f7a1c279ecbf7ad0dc867ac799c24b14cc2a60ab WHIRLPOOL e0f95bae0477624c00a55848f575d224503d1b6ecf759a094e563d0fc7ec03e75b666823b18c7dbff477837b582568280f4a038d037aa90cd5e1429fb5e21756 MISC metadata.xml 261 SHA256 c44cf79e2521fb9e30d1fe5dc005186407fc3a6c45988dd67812566f3f2cdc97 SHA512 f7ad013dd5f01aaedd4528f98ba9a4b4b44d353502df3438a8b513dd2ee7af1e24328c34187e156370efb550c401b81175cccc7a7643ea6a5a83766d68a05221 WHIRLPOOL e52deeefe3ba231f2cad86e533c9584a6f760ebee81e1ae2eed0d5fbd59c8c8e296a6e4bd603a849afd1414ae81b684b902d84a63a1db08d274f7d6f6ac3bc4d diff --git a/app-editors/editra/editra-0.7.20-r2.ebuild b/app-editors/editra/editra-0.7.20-r2.ebuild index 4bd7d9c6f228..a105e915cbef 100644 --- a/app-editors/editra/editra-0.7.20-r2.ebuild +++ b/app-editors/editra/editra-0.7.20-r2.ebuild @@ -14,7 +14,7 @@ SRC_URI="http://editra.org/uploads/src/${MY_PN}-${PV}.tar.gz" LICENSE="wxWinLL-3.1" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="spell" DEPEND=" diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest index 6b1518549278..7a9b992deb3b 100644 --- a/app-editors/emacs-vcs/Manifest +++ b/app-editors/emacs-vcs/Manifest @@ -1,3 +1,5 @@ +DIST emacs-26.0.90.tar.xz 43908428 SHA256 efb27124cb8f3eeba9472f4f5774b5d9bf4f87fd4d6023aae78469fb5667cf2c SHA512 c263d1d1a12d8b21cc43ddcb46a28ce3a54d0ef09e240518f19bfdabf4c4ceebc3c2d1521aae9808cafdd3e731c93dd22b4f1e7e619e38076aa4ffdbaadea93b WHIRLPOOL 383b4e2fb73a9cfc825859a2f3b791dfbc0ef186fe5c25126e1d562aff27900f5bad452725f62dedb3be5492b365dff80e30d64a3cff709e305697662f252ada +EBUILD emacs-vcs-26.0.90.ebuild 12493 SHA256 13ce2acce50c51d192e4ce55e6986c55b5229df9976df309b34ddf0bc3ec41fb SHA512 a1bf9e7d9491a54132e56430fc2bd7e01c04bb0bc9377ad6976e8436343e2232874843ea1722cd49a91a6380cb004509b17e12452be5b2ef74d93daf6cafd9f6 WHIRLPOOL 7551b343f7e04f89fe3ed7a864a427706bef772fb1900b1f23dd1ec2d66dd146e6712346f46e856d72b96e60a652f8391f23ce60f7f880deaaa2cf02ef714d10 EBUILD emacs-vcs-26.0.9999-r1.ebuild 12493 SHA256 13ce2acce50c51d192e4ce55e6986c55b5229df9976df309b34ddf0bc3ec41fb SHA512 a1bf9e7d9491a54132e56430fc2bd7e01c04bb0bc9377ad6976e8436343e2232874843ea1722cd49a91a6380cb004509b17e12452be5b2ef74d93daf6cafd9f6 WHIRLPOOL 7551b343f7e04f89fe3ed7a864a427706bef772fb1900b1f23dd1ec2d66dd146e6712346f46e856d72b96e60a652f8391f23ce60f7f880deaaa2cf02ef714d10 EBUILD emacs-vcs-27.0.9999.ebuild 12491 SHA256 7c5af3fec50a919b8b54e9da7b384a5dc028aa52ad8322c6c105a92c54adfea3 SHA512 e17454202752433ea2a2e5badcea478ea6a735ba5b7f7d836ae1ce0d91a6b43eb55c15adf98040ffe88e48a09f328424d5268b4bc2a321d519ed0122e7e74919 WHIRLPOOL 0ae026c8a8e723fb025de4ad44cd69791ffb23f9b04f91fbc2e4738da096041c762a75777d263122fcd74255761ce5b4b2d6141f260f44fe5b4cdd5ea618effd MISC ChangeLog 10414 SHA256 32cd8f329ea3c934af07ac926bee0c3aa9ecf8ae243feab908a313d5f97dc350 SHA512 0ee17116099eb0c506ec730f1e8564364065fbbac5970f551b7f6339b9f153aa4e293bd99fe952ac8d25a5045b245b11723b206f9594cfccdf46658589df71e3 WHIRLPOOL 5c52e92cf6e1e4cab924922ade9ec2809b4907d541078055d9dd53c2a188c7482d4198ca14f21dccbe022304757228b3cc563dd06171d6d93dffe1490612a637 diff --git a/app-editors/emacs-vcs/emacs-vcs-26.0.90.ebuild b/app-editors/emacs-vcs/emacs-vcs-26.0.90.ebuild new file mode 100644 index 000000000000..3f52621bd902 --- /dev/null +++ b/app-editors/emacs-vcs/emacs-vcs-26.0.90.ebuild @@ -0,0 +1,386 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools elisp-common flag-o-matic multilib readme.gentoo-r1 + +if [[ ${PV##*.} = 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git" + EGIT_BRANCH="emacs-26" + EGIT_CHECKOUT_DIR="${WORKDIR}/emacs" + S="${EGIT_CHECKOUT_DIR}" +else + SRC_URI="https://dev.gentoo.org/~ulm/distfiles/emacs-${PV}.tar.xz + mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" + # FULL_VERSION keeps the full version number, which is needed in + # order to determine some path information correctly for copy/move + # operations later on + FULL_VERSION="${PV%%_*}" + S="${WORKDIR}/emacs-${FULL_VERSION}" + [[ ${FULL_VERSION} != ${PV} ]] && S="${WORKDIR}/emacs" +fi + +DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" +HOMEPAGE="https://www.gnu.org/software/emacs/" + +LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" +SLOT="26" +IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib mailutils motif pax_kernel png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib" +REQUIRED_USE="?? ( aqua X )" + +RDEPEND="sys-libs/ncurses:0= + >=app-eselect/eselect-emacs-1.16 + >=app-emacs/emacs-common-gentoo-1.5[games?,X?] + acl? ( virtual/acl ) + alsa? ( media-libs/alsa-lib ) + dbus? ( sys-apps/dbus ) + gpm? ( sys-libs/gpm ) + hesiod? ( net-dns/hesiod ) + !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) + kerberos? ( virtual/krb5 ) + libxml2? ( >=dev-libs/libxml2-2.2.0 ) + mailutils? ( net-mail/mailutils[clients] ) + !mailutils? ( net-libs/liblockfile ) + selinux? ( sys-libs/libselinux ) + ssl? ( net-libs/gnutls:0= ) + systemd? ( sys-apps/systemd ) + zlib? ( sys-libs/zlib ) + X? ( + x11-libs/libXmu + x11-libs/libXt + x11-misc/xbitmaps + gconf? ( >=gnome-base/gconf-2.26.2 ) + gsettings? ( >=dev-libs/glib-2.28.6 ) + gif? ( media-libs/giflib:0= ) + jpeg? ( virtual/jpeg:0= ) + png? ( >=media-libs/libpng-1.4:0= ) + svg? ( >=gnome-base/librsvg-2.0 ) + tiff? ( media-libs/tiff:0 ) + xpm? ( x11-libs/libXpm ) + imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) + xft? ( + media-libs/fontconfig + media-libs/freetype + x11-libs/libXft + cairo? ( >=x11-libs/cairo-1.12.18 ) + m17n-lib? ( + >=dev-libs/libotf-0.9.4 + >=dev-libs/m17n-lib-1.5.1 + ) + ) + gtk? ( + xwidgets? ( + x11-libs/gtk+:3 + net-libs/webkit-gtk:4= + ) + !xwidgets? ( + gtk3? ( x11-libs/gtk+:3 ) + !gtk3? ( x11-libs/gtk+:2 ) + ) + ) + !gtk? ( + motif? ( >=x11-libs/motif-2.3:0 ) + !motif? ( + Xaw3d? ( x11-libs/libXaw3d ) + !Xaw3d? ( athena? ( x11-libs/libXaw ) ) + ) + ) + )" + +DEPEND="${RDEPEND} + virtual/pkgconfig + gzip-el? ( app-arch/gzip ) + pax_kernel? ( sys-apps/attr )" + +if [[ ${PV##*.} = 9999 ]]; then + DEPEND="${DEPEND} + sys-apps/texinfo" +fi + +EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}" +SITEFILE="20${PN}-${SLOT}-gentoo.el" + +src_prepare() { + if [[ ${PV##*.} = 9999 ]]; then + FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \ + configure.ac) + [[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version" + einfo "Emacs branch: ${EGIT_BRANCH}" + einfo "Commit: ${EGIT_VERSION}" + einfo "Emacs version number: ${FULL_VERSION}" + [[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \ + || die "Upstream version number changed to ${FULL_VERSION}" + fi + + eapply_user + + # Fix filename reference in redirected man page + sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \ + || die "unable to sed ctags.1" + + AT_M4DIR=m4 eautoreconf +} + +src_configure() { + strip-flags + filter-flags -pie #526948 + + if use sh; then + replace-flags "-O[1-9]" -O0 #262359 + elif use ia64; then + replace-flags "-O[2-9]" -O1 #325373 + else + replace-flags "-O[3-9]" -O2 + fi + + local myconf + + if use alsa; then + use sound || ewarn \ + "USE flag \"alsa\" overrides \"-sound\"; enabling sound support." + myconf+=" --with-sound=alsa" + else + myconf+=" --with-sound=$(usex sound oss)" + fi + + if use X; then + myconf+=" --with-x --without-ns" + myconf+=" $(use_with gconf)" + myconf+=" $(use_with gsettings)" + myconf+=" $(use_with toolkit-scroll-bars)" + myconf+=" $(use_with gif)" + myconf+=" $(use_with jpeg)" + myconf+=" $(use_with png)" + myconf+=" $(use_with svg rsvg)" + myconf+=" $(use_with tiff)" + myconf+=" $(use_with xpm)" + myconf+=" $(use_with imagemagick)" + + if use xft; then + myconf+=" --with-xft" + myconf+=" $(use_with cairo)" + myconf+=" $(use_with m17n-lib libotf)" + myconf+=" $(use_with m17n-lib m17n-flt)" + else + myconf+=" --without-xft" + myconf+=" --without-cairo" + myconf+=" --without-libotf --without-m17n-flt" + use cairo && ewarn \ + "USE flag \"cairo\" has no effect if \"xft\" is not set." + use m17n-lib && ewarn \ + "USE flag \"m17n-lib\" has no effect if \"xft\" is not set." + fi + + local f line + if use gtk; then + einfo "Configuring to build with GIMP Toolkit (GTK+)" + while read line; do ewarn "${line}"; done <<-EOF + Your version of GTK+ will have problems with closing open + displays. This is no problem if you just use one display, but + if you use more than one and close one of them Emacs may crash. + See <https://bugzilla.gnome.org/show_bug.cgi?id=85715>. + If you intend to use more than one display, then it is strongly + recommended that you compile Emacs with the Athena/Lucid or the + Motif toolkit instead. + EOF + if use xwidgets; then + myconf+=" --with-x-toolkit=gtk3 --with-xwidgets" + else + myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)" + myconf+=" --without-xwidgets" + fi + for f in motif Xaw3d athena; do + use ${f} && ewarn \ + "USE flag \"${f}\" has no effect if \"gtk\" is set." + done + elif use motif; then + einfo "Configuring to build with Motif toolkit" + myconf+=" --with-x-toolkit=motif" + for f in Xaw3d athena; do + use ${f} && ewarn \ + "USE flag \"${f}\" has no effect if \"motif\" is set." + done + elif use athena || use Xaw3d; then + einfo "Configuring to build with Athena/Lucid toolkit" + myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)" + else + einfo "Configuring to build with no toolkit" + myconf+=" --with-x-toolkit=no" + fi + ! use gtk && use xwidgets && ewarn \ + "USE flag \"xwidgets\" has no effect if \"gtk\" is not set." + elif use aqua; then + einfo "Configuring to build with Nextstep (Cocoa) support" + myconf+=" --with-ns --disable-ns-self-contained" + myconf+=" --without-x" + else + myconf+=" --without-x --without-ns" + fi + + # Save version information in the Emacs binary. It will be available + # in variable "system-configuration-options". + myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}" + + econf \ + --program-suffix="-${EMACS_SUFFIX}" \ + --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \ + --localstatedir="${EPREFIX}"/var \ + --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \ + --without-compress-install \ + --with-file-notification=$(usev inotify || usev gfile || echo no) \ + --without-pop \ + $(use_enable acl) \ + $(use_with dbus) \ + $(use_with dynamic-loading modules) \ + $(use_with games gameuser ":gamestat") \ + $(use_with gpm) \ + $(use_with hesiod) \ + $(use_with kerberos) $(use_with kerberos kerberos5) \ + $(use_with libxml2 xml2) \ + $(use_with mailutils) \ + $(use_with selinux) \ + $(use_with ssl gnutls) \ + $(use_with systemd libsystemd) \ + $(use_with threads) \ + $(use_with wide-int) \ + $(use_with zlib) \ + ${myconf} +} + +src_compile() { + export SANDBOX_ON=0 # for the unbelievers, see Bug #131505 + emake +} + +src_install () { + emake DESTDIR="${D}" NO_BIN_LINK=t install + + mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \ + || die "moving emacs executable failed" + mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \ + || die "moving emacs man page failed" + + # move info dir to avoid collisions with the dir file generated by portage + mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \ + || die "moving info dir failed" + touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir + docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig + + # avoid collision between slots, see bug #169033 e.g. + rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el + rm -rf "${ED}"/usr/share/{appdata,applications,icons} + rm -rf "${ED}/usr/$(get_libdir)" + rm -rf "${ED}"/var + + # remove unused <version>/site-lisp dir + rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp + + # remove COPYING file (except for etc/COPYING used by describe-copying) + rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING + + if use gzip-el; then + # compress .el files when a corresponding .elc exists + find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \ + -name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n + assert "gzip .el failed" + fi + + local cdir + if use source; then + cdir="/usr/share/emacs/${FULL_VERSION}/src" + insinto "${cdir}" + # This is not meant to install all the source -- just the + # C source you might find via find-function + doins src/*.{c,h,m} + elif has installsources ${FEATURES}; then + cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src" + fi + + sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF + X + ;;; ${PN}-${SLOT} site-lisp configuration + X + (when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version) + Y (setq find-function-C-source-directory + Y "${EPREFIX}${cdir}") + X (let ((path (getenv "INFOPATH")) + X (dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}") + X (re "\\\\\`${EPREFIX}/usr/share/info\\\\>")) + X (and path + X ;; move Emacs Info dir before anything else in /usr/share/info + X (let* ((p (cons nil (split-string path ":" t))) (q p)) + X (while (and (cdr q) (not (string-match re (cadr q)))) + X (setq q (cdr q))) + X (setcdr q (cons dir (delete dir (cdr q)))) + X (setq Info-directory-list (prune-directory-list (cdr p))))))) + EOF + elisp-site-file-install "${T}/${SITEFILE}" || die + + dodoc README BUGS CONTRIBUTE + + if use aqua; then + dodir /Applications/Gentoo + rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app + mv nextstep/Emacs.app \ + "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die + fi + + DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs + through the Emacs eselect module, which also redirects man and info + pages. Therefore, several Emacs versions can be installed at the + same time. \"man emacs.eselect\" for details. + \\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is + strongly recommended that you use app-admin/emacs-updater to rebuild + all byte-compiled elisp files of the installed Emacs packages." + use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs. + Installing media-fonts/font-adobe-{75,100}dpi on the X server's + machine would satisfy basic Emacs requirements under X11. + See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs + for how to enable anti-aliased fonts." + use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in + \"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink + it into /Applications by yourself." + readme.gentoo_create_doc +} + +pkg_preinst() { + # move Info dir file to correct name + local infodir=/usr/share/info/${EMACS_SUFFIX} f + if [[ -f ${ED}${infodir}/dir.orig ]]; then + mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed" + elif [[ -d "${ED}"${infodir} ]]; then + # this should not happen in EAPI 4 + ewarn "Regenerating Info directory index in ${infodir} ..." + rm -f "${ED}"${infodir}/dir{,.*} + for f in "${ED}"${infodir}/*; do + if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then + install-info --info-dir="${ED}"${infodir} "${f}" \ + || die "install-info failed" + fi + done + fi +} + +pkg_postinst() { + elisp-site-regen + readme.gentoo_print_elog + + if use livecd; then + # force an update of the emacs symlink for the livecd/dvd, + # because some microemacs packages set it with USE=livecd + eselect emacs update + elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then + # refresh symlinks in case any installed files have changed + eselect emacs set ${EMACS_SUFFIX} + else + eselect emacs update ifunset + fi +} + +pkg_postrm() { + elisp-site-regen + eselect emacs update ifunset +} diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest index 0c77babe19ba..6d616a830e16 100644 --- a/app-editors/gvim/Manifest +++ b/app-editors/gvim/Manifest @@ -15,8 +15,8 @@ EBUILD gvim-8.0.0386.ebuild 11569 SHA256 69e77753590eb348468c401faf7be30133a6855 EBUILD gvim-8.0.0938.ebuild 11285 SHA256 4b694ebbd3757820bab3292265b8cd7f84d31835230e1f731252553e8238c26e SHA512 e734f25ceee65705fcae7354b6e19a80899460315eab3dba1d4258c0915d69df648ddba6a352413e62ea7aa4f552525abe613363fc244a697c0a60cfac46cb78 WHIRLPOOL 8574349e4262adc3cf0942301e00c3898cfb47ededa8385694f19e11ad92777a9d8be8851623b002b70e17cf9e838ccbf1d79bbb1e7cc74608ce62c91d7857f2 EBUILD gvim-8.0.0983.ebuild 11293 SHA256 76692868b4133172fa58ec6fa7c63b0ba384a134aef1d71edb83082a5afff466 SHA512 16db216752f731bd29624504a113654ac8067d915ff42f96bb304815fbd828504c5934e48ec1bf294f4540453bebd65d0f14719ec13e1d24d9afa3c41e8de343 WHIRLPOOL 2fd94c13e0115e97a34c09816fde05336cc51a98dcfcb1a7396580d697d1bb5ca740d0bbda941ccb1b73dcbd407caf95c37e62dd3f347d2a4ad165b9056f1ce4 EBUILD gvim-8.0.1056.ebuild 11293 SHA256 76692868b4133172fa58ec6fa7c63b0ba384a134aef1d71edb83082a5afff466 SHA512 16db216752f731bd29624504a113654ac8067d915ff42f96bb304815fbd828504c5934e48ec1bf294f4540453bebd65d0f14719ec13e1d24d9afa3c41e8de343 WHIRLPOOL 2fd94c13e0115e97a34c09816fde05336cc51a98dcfcb1a7396580d697d1bb5ca740d0bbda941ccb1b73dcbd407caf95c37e62dd3f347d2a4ad165b9056f1ce4 -EBUILD gvim-8.0.1188.ebuild 11275 SHA256 9b0ec93799e9ed994ac3a34c8695ab677d32a0ec34fbe2f7e698fab6ac49484b SHA512 ccac725f57082baf12dadd5e0d6098c8a4c00079a24bcf2ee2f32813efc97a9c782e986f73bbb875fcec46e418437fa07d4e2ba9776af425f7b511732b2f72f5 WHIRLPOOL 07ad0e05189c020af505fa1cfb2cbd4134053789e8a5641dba721dfc43dbabddb35ac5f235e7dc9ac86cab5a9b85f63dc862b34758063f3797ee3a9b3b8cc34a -EBUILD gvim-9999.ebuild 11275 SHA256 9b0ec93799e9ed994ac3a34c8695ab677d32a0ec34fbe2f7e698fab6ac49484b SHA512 ccac725f57082baf12dadd5e0d6098c8a4c00079a24bcf2ee2f32813efc97a9c782e986f73bbb875fcec46e418437fa07d4e2ba9776af425f7b511732b2f72f5 WHIRLPOOL 07ad0e05189c020af505fa1cfb2cbd4134053789e8a5641dba721dfc43dbabddb35ac5f235e7dc9ac86cab5a9b85f63dc862b34758063f3797ee3a9b3b8cc34a +EBUILD gvim-8.0.1188.ebuild 10477 SHA256 98b3e1d57b033c687745ba0aa9b2e784910e76b758eeb478d7a9d78ac286baf6 SHA512 ca3474ac8e4ffa20bb0d96677f4bee91683cafeceb6db4d2654c4d3f3037adc7a5a78bf57bc019222fbde96d06a5731c4d6474324ac676941115e728dcc085bf WHIRLPOOL fb5a7193c2b8ca3355a1292386d8ad544791f29ad52703f4fc6f29253220ae4e2df8083c168b47835069cca09a7aa27bbfc1042fd61b60611e394a7bf326370a +EBUILD gvim-9999.ebuild 10477 SHA256 98b3e1d57b033c687745ba0aa9b2e784910e76b758eeb478d7a9d78ac286baf6 SHA512 ca3474ac8e4ffa20bb0d96677f4bee91683cafeceb6db4d2654c4d3f3037adc7a5a78bf57bc019222fbde96d06a5731c4d6474324ac676941115e728dcc085bf WHIRLPOOL fb5a7193c2b8ca3355a1292386d8ad544791f29ad52703f4fc6f29253220ae4e2df8083c168b47835069cca09a7aa27bbfc1042fd61b60611e394a7bf326370a MISC ChangeLog 7715 SHA256 5666aeab068ae894e72060f7623f040d7ffde343a06696249b565fd245865a8b SHA512 c473588caa73e7d1874be8fcf42878b8d5e3530ee73c073382368208b6b0126ab0586e2f5d7b563152be359f891db97a89931dcb65921857629530df6543fb4d WHIRLPOOL 6fcb0617e6f2bf3f8d937828558d86aa9da4950b6fe31c80134bbcea1d6f91ffbb10a7d5d00cfedb5f121837b34d31d8ce464844af6862d00193a521f312bf58 MISC ChangeLog-2015 64168 SHA256 fd464c76716730dfb6349ce37fef75a93302770ffdceaf00928590215337e659 SHA512 8f0ff5bf344c451d2657c153c82a96e65e5ffac317dd560e08e38ba05ed857aefd0d4bc2e23bde7eb2cfae36de678390c3cbda517f9ee3619ab6b3a3d9821311 WHIRLPOOL 9f83a19841c6c03bf21f58514f7cffea4bc7554aeab23d742348f854a19465727fbedf763f1a70f1db7dc75af0e2490b36c8e7cba83e2780e021dd7af7b633a7 MISC metadata.xml 675 SHA256 14f61375d274e0ef6f46387961533ff04f74f8f82c26ef0ab7555d4b49667939 SHA512 df75c9e935ae47b8961c8b6b984483b8032e39d3833ffcf4784e2630cea870579d45ef5f104b71d6b35f4128ef689394edd72510fce82a76e596749ce69d835d WHIRLPOOL 9962e6a64cc56f1133041a6e7c023800990b5cc38ca296fd9c364c301db19e237e272097ee64a29e43b2b5be0230ce62ef5415215ce5a6f7aefafbcb73d48cb4 diff --git a/app-editors/gvim/gvim-8.0.1188.ebuild b/app-editors/gvim/gvim-8.0.1188.ebuild index a43f58ae6ed1..b19e4d692308 100644 --- a/app-editors/gvim/gvim-8.0.1188.ebuild +++ b/app-editors/gvim/gvim-8.0.1188.ebuild @@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) PYTHON_REQ_USE=threads inherit vim-doc flag-o-matic xdg-utils gnome2-utils versionator bash-completion-r1 prefix python-single-r1 -if [[ ${PV} == 9999* ]] ; then +if [[ ${PV} == 9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/vim/vim.git" EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV} @@ -86,30 +86,34 @@ pkg_setup() { export LC_COLLATE="C" # Gnome sandbox silliness. bug #114475. - mkdir -p "${T}"/home + mkdir -p "${T}"/home || die export HOME="${T}"/home use python && python-single-r1_pkg_setup } src_prepare() { - if [[ ${PV} != 9999* ]] ; then + if [[ ${PV} != 9999* ]]; then # Gentoo patches to fix runtime issues, cross-compile errors, etc eapply "${WORKDIR}"/patches/ fi # Fixup a script to use awk instead of nawk - sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \ - || die "mve.awk sed failed" + sed -i -e \ + '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \ + "${S}"/runtime/tools/mve.awk || die "mve.awk sed failed" # Read vimrc and gvimrc from /etc/vim - echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h - echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h + echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \ + >> "${S}"/src/feature.h || die "echo failed" + echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \ + >> "${S}"/src/feature.h || die "echo failed" # Use exuberant ctags which installs as /usr/bin/exuberant-ctags. # Hopefully this pattern won't break for a while at least. # This fixes bug 29398 (27 Sep 2003 agriffis) - sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \ + sed -i -e \ + 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \ "${S}"/runtime/doc/syntax.txt \ "${S}"/runtime/doc/tagsrch.txt \ "${S}"/runtime/doc/usr_29.txt \ @@ -119,29 +123,30 @@ src_prepare() { # Don't be fooled by /usr/include/libc.h. When found, vim thinks # this is NeXT, but it's actually just a file in dev-libs/9libs # This fixes bug 43885 (20 Mar 2004 agriffis) - sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed' + sed -i -e \ + 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed' # gcc on sparc32 has this, uhm, interesting problem with detecting EOF # correctly. To avoid some really entertaining error messages about stuff # which isn't even in the source file being invalid, we'll do some trickery # to make the error never occur. bug 66162 (02 October 2004 ciaranm) - find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done + find "${S}" -name '*.c' | while read c; do + echo >> "$c" || die "echo failed" + done # Try to avoid sandbox problems. Bug #114475. - if [[ -d "${S}"/src/po ]] ; then - sed -i '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \ - "${S}"/src/po/Makefile + if [[ -d "${S}"/src/po ]]; then + sed -i -e \ + '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \ + "${S}"/src/po/Makefile || die fi - if version_is_at_least 7.3.122 ; then - cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk - fi + cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed" # Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0 - if version_is_at_least 7.3 ; then - sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ - "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' - fi + sed -i -e \ + "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ + "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' eapply_user } @@ -163,14 +168,18 @@ src_configure() { # (2) Rebuild auto/configure # (3) Notice auto/configure is newer than auto/config.mk # (4) Run ./configure (with wrong args) to remake auto/config.mk - sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed" - rm -f src/auto/configure + sed -i -e \ + 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed" + rm -v src/auto/configure || die "rm failed" emake -j1 -C src autoconf # This should fix a sandbox violation (see bug 24447). The hvc # things are for ppc64, see bug 86433. - for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do - [[ -e ${file} ]] && addwrite $file + local file + for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do + if [[ -e ${file} ]]; then + addwrite $file + fi done use debug && append-flags "-DDEBUG" @@ -197,9 +206,9 @@ src_configure() { # --with-features=huge forces on cscope even if we --disable it. We need # to sed this out to avoid screwiness. (1 Sep 2004 ciaranm) - if ! use cscope ; then - sed -i '/# define FEAT_CSCOPE/d' src/feature.h || \ - die "couldn't disable cscope" + if ! use cscope; then + sed -i -e \ + '/# define FEAT_CSCOPE/d' src/feature.h || die "couldn't disable cscope" fi # gvim's GUI preference order is as follows: @@ -211,29 +220,29 @@ src_configure() { # -aqua -gtk -gtk3 -motif neXt NEXTAW # -aqua -gtk -gtk3 -motif -neXt ATHENA echo ; echo - if use aqua ; then + if use aqua; then einfo "Building gvim with the Carbon GUI" myconf+=( --enable-darwin --enable-gui=carbon ) - elif use gtk3 ; then + elif use gtk3; then myconf+=( --enable-gtk3-check ) einfo "Building gvim with the gtk+-3 GUI" myconf+=( --enable-gui=gtk3 ) - elif use gtk ; then + elif use gtk; then myconf+=( --enable-gtk2-check ) - if use gnome ; then + if use gnome; then einfo "Building gvim with the Gnome 2 GUI" myconf+=( --enable-gui=gnome2 ) else einfo "Building gvim with the gtk+-2 GUI" myconf+=( --enable-gui=gtk2 ) fi - elif use motif ; then + elif use motif; then einfo "Building gvim with the MOTIF GUI" myconf+=( --enable-gui=motif ) - elif use neXt ; then + elif use neXt; then einfo "Building gvim with the neXtaw GUI" myconf+=( --enable-gui=nextaw ) else @@ -287,45 +296,18 @@ src_test() { ln -s "${S}"/src/gvim "${S}"/src/testvim || die # Make sure our VIMPROG is used. - sed -i 's:\.\./vim:../testvim:' src/testdir/test49.vim || die + sed -i -e 's:\.\./vim:../testvim:' src/testdir/test49.vim || die # Don't do additional GUI tests. emake -j1 VIMPROG=../testvim -C src/testdir nongui } -# Make convenience symlinks, hopefully without stepping on toes. Some -# of these links are "owned" by the vim ebuild when it is installed, -# but they might be good for gvim as well (see bug 45828) -update_vim_symlinks() { - local f syms - syms="vimdiff rvim rview" +# Call eselect vi update with --if-unset +# to respect user's choice (bug 187449) +eselect_vi_update() { einfo "Calling eselect vi update..." - # Call this with --if-unset to respect user's choice (bug 187449) eselect vi update --if-unset - - # Make or remove convenience symlink, vim -> gvim - if [[ -f "${EROOT}"/usr/bin/gvim ]]; then - ln -s gvim "${EROOT}"/usr/bin/vim 2>/dev/null - elif [[ -L "${EROOT}"/usr/bin/vim && ! -f "${EROOT}"/usr/bin/vim ]]; then - rm "${EROOT}"/usr/bin/vim - fi - - # Make or remove convenience symlinks to vim - if [[ -f "${EROOT}"/usr/bin/vim ]]; then - for f in ${syms}; do - ln -s vim "${EROOT}"/usr/bin/${f} 2>/dev/null - done - else - for f in ${syms}; do - if [[ -L "${EROOT}"/usr/bin/${f} && ! -f "${EROOT}"/usr/bin/${f} ]]; then - rm -f "${EROOT}"/usr/bin/${f} - fi - done - fi - - # This will still break if you merge then remove the vi package, - # but there's only so much you can do, eh? Unfortunately we don't - # have triggers like are done in rpm-land. + eend $? } src_install() { @@ -342,9 +324,10 @@ src_install() { emake -C src DESTDIR="${D}" DATADIR="${EPREFIX}"/usr/share install-icons dodir /usr/share/man/man1 - echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1 - echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1 - echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1 + echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1 || die "echo failed" + echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1 || die "echo failed" + echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1 || \ + die "echo failed" insinto /etc/vim newins "${FILESDIR}"/gvimrc-r1 gvimrc @@ -356,7 +339,7 @@ src_install() { newbashcomp "${FILESDIR}"/${PN}-completion ${PN} # don't install vim desktop file - rm "${ED}"/usr/share/applications/vim.desktop || die "failed to remove vim.desktop" + rm -v "${ED}"/usr/share/applications/vim.desktop || die "failed to remove vim.desktop" } pkg_postinst() { @@ -369,8 +352,8 @@ pkg_postinst() { # Update icon cache gnome2_icon_cache_update - # Make convenience symlinks - update_vim_symlinks + # Call eselect vi update + eselect_vi_update } pkg_postrm() { @@ -383,6 +366,6 @@ pkg_postrm() { # Update icon cache gnome2_icon_cache_update - # Make convenience symlinks - update_vim_symlinks + # Call eselect vi update + eselect_vi_update } diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-9999.ebuild index a43f58ae6ed1..b19e4d692308 100644 --- a/app-editors/gvim/gvim-9999.ebuild +++ b/app-editors/gvim/gvim-9999.ebuild @@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) PYTHON_REQ_USE=threads inherit vim-doc flag-o-matic xdg-utils gnome2-utils versionator bash-completion-r1 prefix python-single-r1 -if [[ ${PV} == 9999* ]] ; then +if [[ ${PV} == 9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/vim/vim.git" EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV} @@ -86,30 +86,34 @@ pkg_setup() { export LC_COLLATE="C" # Gnome sandbox silliness. bug #114475. - mkdir -p "${T}"/home + mkdir -p "${T}"/home || die export HOME="${T}"/home use python && python-single-r1_pkg_setup } src_prepare() { - if [[ ${PV} != 9999* ]] ; then + if [[ ${PV} != 9999* ]]; then # Gentoo patches to fix runtime issues, cross-compile errors, etc eapply "${WORKDIR}"/patches/ fi # Fixup a script to use awk instead of nawk - sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \ - || die "mve.awk sed failed" + sed -i -e \ + '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \ + "${S}"/runtime/tools/mve.awk || die "mve.awk sed failed" # Read vimrc and gvimrc from /etc/vim - echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h - echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h + echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \ + >> "${S}"/src/feature.h || die "echo failed" + echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \ + >> "${S}"/src/feature.h || die "echo failed" # Use exuberant ctags which installs as /usr/bin/exuberant-ctags. # Hopefully this pattern won't break for a while at least. # This fixes bug 29398 (27 Sep 2003 agriffis) - sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \ + sed -i -e \ + 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \ "${S}"/runtime/doc/syntax.txt \ "${S}"/runtime/doc/tagsrch.txt \ "${S}"/runtime/doc/usr_29.txt \ @@ -119,29 +123,30 @@ src_prepare() { # Don't be fooled by /usr/include/libc.h. When found, vim thinks # this is NeXT, but it's actually just a file in dev-libs/9libs # This fixes bug 43885 (20 Mar 2004 agriffis) - sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed' + sed -i -e \ + 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed' # gcc on sparc32 has this, uhm, interesting problem with detecting EOF # correctly. To avoid some really entertaining error messages about stuff # which isn't even in the source file being invalid, we'll do some trickery # to make the error never occur. bug 66162 (02 October 2004 ciaranm) - find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done + find "${S}" -name '*.c' | while read c; do + echo >> "$c" || die "echo failed" + done # Try to avoid sandbox problems. Bug #114475. - if [[ -d "${S}"/src/po ]] ; then - sed -i '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \ - "${S}"/src/po/Makefile + if [[ -d "${S}"/src/po ]]; then + sed -i -e \ + '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \ + "${S}"/src/po/Makefile || die fi - if version_is_at_least 7.3.122 ; then - cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk - fi + cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed" # Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0 - if version_is_at_least 7.3 ; then - sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ - "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' - fi + sed -i -e \ + "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ + "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' eapply_user } @@ -163,14 +168,18 @@ src_configure() { # (2) Rebuild auto/configure # (3) Notice auto/configure is newer than auto/config.mk # (4) Run ./configure (with wrong args) to remake auto/config.mk - sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed" - rm -f src/auto/configure + sed -i -e \ + 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed" + rm -v src/auto/configure || die "rm failed" emake -j1 -C src autoconf # This should fix a sandbox violation (see bug 24447). The hvc # things are for ppc64, see bug 86433. - for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do - [[ -e ${file} ]] && addwrite $file + local file + for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do + if [[ -e ${file} ]]; then + addwrite $file + fi done use debug && append-flags "-DDEBUG" @@ -197,9 +206,9 @@ src_configure() { # --with-features=huge forces on cscope even if we --disable it. We need # to sed this out to avoid screwiness. (1 Sep 2004 ciaranm) - if ! use cscope ; then - sed -i '/# define FEAT_CSCOPE/d' src/feature.h || \ - die "couldn't disable cscope" + if ! use cscope; then + sed -i -e \ + '/# define FEAT_CSCOPE/d' src/feature.h || die "couldn't disable cscope" fi # gvim's GUI preference order is as follows: @@ -211,29 +220,29 @@ src_configure() { # -aqua -gtk -gtk3 -motif neXt NEXTAW # -aqua -gtk -gtk3 -motif -neXt ATHENA echo ; echo - if use aqua ; then + if use aqua; then einfo "Building gvim with the Carbon GUI" myconf+=( --enable-darwin --enable-gui=carbon ) - elif use gtk3 ; then + elif use gtk3; then myconf+=( --enable-gtk3-check ) einfo "Building gvim with the gtk+-3 GUI" myconf+=( --enable-gui=gtk3 ) - elif use gtk ; then + elif use gtk; then myconf+=( --enable-gtk2-check ) - if use gnome ; then + if use gnome; then einfo "Building gvim with the Gnome 2 GUI" myconf+=( --enable-gui=gnome2 ) else einfo "Building gvim with the gtk+-2 GUI" myconf+=( --enable-gui=gtk2 ) fi - elif use motif ; then + elif use motif; then einfo "Building gvim with the MOTIF GUI" myconf+=( --enable-gui=motif ) - elif use neXt ; then + elif use neXt; then einfo "Building gvim with the neXtaw GUI" myconf+=( --enable-gui=nextaw ) else @@ -287,45 +296,18 @@ src_test() { ln -s "${S}"/src/gvim "${S}"/src/testvim || die # Make sure our VIMPROG is used. - sed -i 's:\.\./vim:../testvim:' src/testdir/test49.vim || die + sed -i -e 's:\.\./vim:../testvim:' src/testdir/test49.vim || die # Don't do additional GUI tests. emake -j1 VIMPROG=../testvim -C src/testdir nongui } -# Make convenience symlinks, hopefully without stepping on toes. Some -# of these links are "owned" by the vim ebuild when it is installed, -# but they might be good for gvim as well (see bug 45828) -update_vim_symlinks() { - local f syms - syms="vimdiff rvim rview" +# Call eselect vi update with --if-unset +# to respect user's choice (bug 187449) +eselect_vi_update() { einfo "Calling eselect vi update..." - # Call this with --if-unset to respect user's choice (bug 187449) eselect vi update --if-unset - - # Make or remove convenience symlink, vim -> gvim - if [[ -f "${EROOT}"/usr/bin/gvim ]]; then - ln -s gvim "${EROOT}"/usr/bin/vim 2>/dev/null - elif [[ -L "${EROOT}"/usr/bin/vim && ! -f "${EROOT}"/usr/bin/vim ]]; then - rm "${EROOT}"/usr/bin/vim - fi - - # Make or remove convenience symlinks to vim - if [[ -f "${EROOT}"/usr/bin/vim ]]; then - for f in ${syms}; do - ln -s vim "${EROOT}"/usr/bin/${f} 2>/dev/null - done - else - for f in ${syms}; do - if [[ -L "${EROOT}"/usr/bin/${f} && ! -f "${EROOT}"/usr/bin/${f} ]]; then - rm -f "${EROOT}"/usr/bin/${f} - fi - done - fi - - # This will still break if you merge then remove the vi package, - # but there's only so much you can do, eh? Unfortunately we don't - # have triggers like are done in rpm-land. + eend $? } src_install() { @@ -342,9 +324,10 @@ src_install() { emake -C src DESTDIR="${D}" DATADIR="${EPREFIX}"/usr/share install-icons dodir /usr/share/man/man1 - echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1 - echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1 - echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1 + echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1 || die "echo failed" + echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1 || die "echo failed" + echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1 || \ + die "echo failed" insinto /etc/vim newins "${FILESDIR}"/gvimrc-r1 gvimrc @@ -356,7 +339,7 @@ src_install() { newbashcomp "${FILESDIR}"/${PN}-completion ${PN} # don't install vim desktop file - rm "${ED}"/usr/share/applications/vim.desktop || die "failed to remove vim.desktop" + rm -v "${ED}"/usr/share/applications/vim.desktop || die "failed to remove vim.desktop" } pkg_postinst() { @@ -369,8 +352,8 @@ pkg_postinst() { # Update icon cache gnome2_icon_cache_update - # Make convenience symlinks - update_vim_symlinks + # Call eselect vi update + eselect_vi_update } pkg_postrm() { @@ -383,6 +366,6 @@ pkg_postrm() { # Update icon cache gnome2_icon_cache_update - # Make convenience symlinks - update_vim_symlinks + # Call eselect vi update + eselect_vi_update } diff --git a/app-editors/mg/Manifest b/app-editors/mg/Manifest index b0b5d6666d8a..0078a47e1ee7 100644 --- a/app-editors/mg/Manifest +++ b/app-editors/mg/Manifest @@ -2,7 +2,7 @@ DIST mg-20161005.tar.gz 140797 SHA256 b7fcb5136a6783ca24c8463ab0852fc1f26bdb2bb1 DIST mg-20170401.tar.gz 140895 SHA256 0a3608b17c153960cb1d954ca3b62445a77c0c1a18aa5c8c58aba9f6b8d62aab SHA512 729b2d9ba7eb236cc8bcbcf3ac7604494980cbf2fd21dc5a3856011bc830eee75be29a246b0bf3dfa6c7a03fcf69a902ae50d05ea371ac4d0225a4da6089d7ce WHIRLPOOL ecdd49bcf8a220dc7a8c57de322c354437b646db231177e3640ae0840ea49ddd9bfc8d9ecaff6e4c9c3ca140e173b14bc52411bebfe586cac144f412d07b59ca DIST mg-20170828.tar.gz 141028 SHA256 1f8886ab62e9abfeed7fafbb5ea71685450a34c5d0a243461bd2c5425161368d SHA512 1ea16b1dd5e9e08abf9fcf0889130b4f39d36872bb64df85470a9ced1db87c0eecb18cc6e8c3c5a04f9049d58ef4492d5a88cf3502ec3351abccb7bddfb90c14 WHIRLPOOL ebe1559c385788f53c4e49a22713fec5bdf22837b854310543995bf2988d0c946ba1386f33eb84a44b10e9811dacc176079dc930562060ecaaec9b3232a781f5 EBUILD mg-20161005.ebuild 1045 SHA256 0d0e91a456c6dc48be22bff2e653369eb23873765a691244b7a3e62faa5db872 SHA512 dd63f9da0f28961aac1f02d09d021f661d5bf2bfb8baf3509aabf1855bae9d41efd09847d1cdd8c84985146083192b7b3212038180ebe3b2e1256ffed0fa43fb WHIRLPOOL 713b4cc0468427bed55a5d1b6a84b0199b4fd50b91975f919fca7d7933a06727acf970b1c5e10e60fd97f461af935a6deb050a4a10019823afabccaabe01063b -EBUILD mg-20170401.ebuild 1048 SHA256 e7d8f399044d28bec089282bd9162edfe394357bd65f5efa520fd643a28b7fad SHA512 df13b2ebd4b494962c4515e16f32bbc74a71fe1faae3125dc462d1770d939df68c14d42a6caf2ab010a2900539ad4e3744a699e6302088f1b06de095cb084a9f WHIRLPOOL 85aab9989d77554cb0c81b06d21082e9100f3e6d586a8156166f7b185cb2bb0a094641b83f351f23308c269ce7f52c9c12c28ab800b3f3a510ad49718ac1d91c +EBUILD mg-20170401.ebuild 1047 SHA256 937348d118eea8ed6615677612bd464950d4ff8f9a41ef0fac010dba75c6f580 SHA512 3b69b1822d2ade70e93a51083eead3bc465b2d8faa883ea88cc362037c0b6d5bbb842a1ee5218ada124d5f8d81ca3c7e2e75b0f3b808660aaeca3c11f21761f9 WHIRLPOOL 61fc9d5bc8ec1eb10fd0f7ad8665962814fe372e2610fcf41f173a7b8993b3bb9ad45ed150f83f25863bb53a1c1b9fd42a37044a737408d34c56c3b8d14a2922 EBUILD mg-20170828.ebuild 1052 SHA256 3cd84d77e46a82d28179567e11892e133e2eca73406d8d7de26a42243d38981b SHA512 793e3e975a2a74f6160c7ecd1a9f0536b097671a32e772706aaae34865e14c5678cfad9625fa66ca9a987220316502bdbc7ae6d226d1e483342de7a5c04c3fe6 WHIRLPOOL df1f0b2745c4d7f819500e37dac76defded865e8d049c3b0f912762580a96c7f415d8fae889b3144dd3351e79e933d0bc37345798c1b5437f92708b0655f0682 MISC ChangeLog 5076 SHA256 ae4dafbcb6e834d3d4e0c8954c3991b3fb7572d76c1a349436c65bdc7e56ef53 SHA512 60a6c18aa4a0b5d86362a917d4a866273c13349e8fb8f2e213403b3821771535a28d65f8bb65a51da860f889e283b375eea79d80b7a79e0dce5c25eae5db69cb WHIRLPOOL 1ece1c1f5714be68251471a7f86a48171e4b651ff57a288968851ef192f24dd230be70c8ef4b3dab417e676b32c7dfcb00fa365399675c8d7e42955320f46c53 MISC ChangeLog-2015 13105 SHA256 cace27ac64a502179a77766381bf98b078859762af50daa67b9d131d2d75d4f7 SHA512 057a9507201db1602e4fd0df06332ea74582c318102efafcc8a2750aa6f17157ce82288cb0e03b5cb62c04f812dd55e0e5158598d7dce98c37e04d891385662e WHIRLPOOL dbb8b7881a97248ed45ac6ab4fcbf09df44bd5dd91ba630dd2b883ea82ec62614c2ce979cd5de329e8a76b7b1d6a52661b2f4a0583b11830984f41b5730f0b79 diff --git a/app-editors/mg/mg-20170401.ebuild b/app-editors/mg/mg-20170401.ebuild index 1ee1c688f452..a7be354758b0 100644 --- a/app-editors/mg/mg-20170401.ebuild +++ b/app-editors/mg/mg-20170401.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://homepage.boetes.org/software/mg/${P}.tar.gz" LICENSE="public-domain" SLOT="0" -KEYWORDS="alpha ~amd64 arm hppa ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" +KEYWORDS="alpha ~amd64 arm hppa ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd" IUSE="livecd" RDEPEND="sys-libs/ncurses:0 diff --git a/app-editors/notepadqq/Manifest b/app-editors/notepadqq/Manifest index d2346fdca051..4432aa519070 100644 --- a/app-editors/notepadqq/Manifest +++ b/app-editors/notepadqq/Manifest @@ -1,4 +1,6 @@ DIST CodeMirror-5.18.2.tar.gz 923001 SHA256 edfccf28e609a08476e9da4f592d7aa23b7e73af3954d90605e0c650abd20a1a SHA512 c979c1ef02bb222b08e64847e5caab9c8a525c96d0eef656a00730d6710b0144144ac656eddef05d50c30c7d33da7dffe1a7580b9d47a5d958af9d6484ea705f WHIRLPOOL 9baaada10513eaad75bb6e8f2d73fd076b85f8a85adec1dc235857ae1f9160d6f463859356d5fce69c882ca4b3a2efc802a62453eb2435f868d9691cb435d73f DIST notepadqq-1.0.1.tar.gz 1056249 SHA256 552f274b9c9d3d48e2e55462f33aea8df8ebd0f421b0d7a23b78a46693fbed34 SHA512 781ddf9960227c4ad21fb7e763180cfed7f1c5c0237277335577932678a42a4c2f303f61922d93ec850dbc86df36c292ff10ae053a6e00d7127a48c7ac4e359c WHIRLPOOL 53f47ce9af83e57121e8ad261aece0eda53bbe42d02edebdfd8ffeb3874146c6ab7d63e2347755ac6a447413f46254c6db7ac7aed8809c4ad1baf5a7e0e586fb +DIST notepadqq-1.2.0.tar.gz 2082931 SHA256 423d224724deb5298837327ce7efa0d71dbe73693c783241eeb7bb2327ee97d4 SHA512 4b6b3e646add4dc21b4d4ddecacefa59785e6525d52ecc17ca418ba14f38ef9024f48af6db3538d195327942971eb9ccf0b5567da58ba15facad332b47742717 WHIRLPOOL 472e7579f49328f9323b9b8c7432372cad7d64627e78f4dc2690aabd2d7f9e0506d4b8f5e7a287f58fcf5bc102a5125387b465a78f9dfdf983e48b9510d478ce EBUILD notepadqq-1.0.1.ebuild 1147 SHA256 b2d401eb2b5a7454e407d518a0ea9c8a4cf90d35447b2579929f95c403ae926b SHA512 44c0b195927c434fccc2b5ba7170167321723a846fc513fde27866a0891736559e2343c88553ae0f1763342b40e32a0af0053fea0d8fe028587e4783cddfc063 WHIRLPOOL 557e4b44db0931defb268e320ca5143e4c812df1064187c1c939d8944cc9402be61d62a18c0da3f1e31bf56aa80de28ac231e2e3d248224644d907f94a04df90 +EBUILD notepadqq-1.2.0.ebuild 887 SHA256 3b5491841b3990995304e603bd664ed164a65dfebabb2a33b22436b6472d92d0 SHA512 b5cf204d51dea2771f10fc81e24252bc66db68ce92419fc6e0cab724c071c6cbaba87520cbc4d82fbb1606696aa41a00d2b6c0b267fa36d356a5a0fe3a83c115 WHIRLPOOL 53ab989af4519c43f4d244a6d7e1a146dc52f00824a15fd1d4f0224d1c811ea18db7559789126f51182d8b2daf2f2bfea3931b95668b2b94da67c9a0fe93ed96 MISC metadata.xml 345 SHA256 a4edd2bf46b2a030179ba2e6ee8c84d4584df79914f1e93623c6eea6e674c443 SHA512 90d1d18d81da9f0870d7e41a4c421fb58872861358fa4f095c5b040c6465752898867e47b866750f19f316fdb8fed42bc878e84ced27ddb2503ec142d035f033 WHIRLPOOL 7abc10f05b045f8ec67e92c65fe84f4118bf49a672a5a9d74c01eb360d1cc705783ad2a1ffaff20e83e6bde21aedd10c5a242f1e74c40a47eb84c194aba02144 diff --git a/app-editors/notepadqq/notepadqq-1.2.0.ebuild b/app-editors/notepadqq/notepadqq-1.2.0.ebuild new file mode 100644 index 000000000000..7710405ccb60 --- /dev/null +++ b/app-editors/notepadqq/notepadqq-1.2.0.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit qmake-utils xdg-utils + +CM_PV="5.18.2" + +DESCRIPTION="Notepad++-like editor for Linux" +HOMEPAGE="http://notepadqq.altervista.org" +SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=" + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtprintsupport:5 + dev-qt/qtwebkit:5 + dev-qt/qtwidgets:5 +" +DEPEND="${RDEPEND}" + +src_prepare() { + default + + # Silence a QA warning + sed '/^OnlyShowIn/d' \ + -i support_files/shortcuts/notepadqq.desktop \ + || die +} + +src_configure() { + eqmake5 PREFIX="${EPREFIX}/usr" ${PN}.pro +} + +src_install() { + emake INSTALL_ROOT="${D}" install +} + +pkg_postinst() { + xdg_desktop_database_update +} + +pkg_postrm() { + xdg_desktop_database_update +} diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest index 404e11acea1c..f4df3d155b92 100644 --- a/app-editors/vim-core/Manifest +++ b/app-editors/vim-core/Manifest @@ -1,4 +1,4 @@ -AUX vimrc-r5 6926 SHA256 19019ab68e724ed0aa2129959f12d6cbdc042de0a102f719bf757079c444c2c5 SHA512 ff99b53d542f6f85adb2062a0cb3605ddd6e447c1b2427e7e4ce58aea843a99cde13473ec53d89ddb380da0358e32a45aa7f857269baf5504751b9eb259418ba WHIRLPOOL 4aaa9a8a1ee817c73d6b93f1595201fdcf1e65beea637f666b30bbb826098cb6719e663985ddd88b54639f4bda4c1941a798cf9b3c93aca8746943d40cb5ef36 +AUX vimrc-r5 7337 SHA256 6b9290c6f71a19e5ab749599e1d3f3d2e118a9d8fa00489dd9553b52df2401e0 SHA512 b9cc07386b97e6042166b11cd6270d4c3134eb816ff396ad544cfb14b349d79b32b5a07b5995580aea607b7936eef0dfd5ab1dc7e158dea26afc0c944fae8e3c WHIRLPOOL a005f2ca3c49afdb903d93fcb1d690856b5d5176468b9cca39fcc3d83fe6d00d481e46e23133cf011bd45351abbc260914ec194e0591d56c766aa2c1a5b3a425 AUX xxd-completion 461 SHA256 580064ca4db3ac149fd89c743bd9946241220c211721f978f7a3ef97b3c171df SHA512 fc92426ea657e86ff765aa5a60736cdc70db938156dd8946db0a30c54d3f557bd8af421f1713bd750e779ccacd73f8f290a12a5e71ed48259fe1e6dece2de19c WHIRLPOOL 65324afb44612f1dd8f8850b7caa8524cff055d83aaad74c5b5030787463d0a95dbe0ce1b91c1a7b7f3e6954db3c0608ac2a2e1e75572af94e83758237b18447 DIST vim-8.0.0106-gentoo-patches.tar.bz2 2281 SHA256 9823a91b050eb4b001cc50f508d2ad03c7c256ed49183c1af7582318667f48d4 SHA512 39edd9f518c230d2b0486b18aa155572a9eada4a5e21108573d6e66e2eef1276f23b77d766648f018c9cf973a7d03712d8861be6ea13255d7b389912d554a47a WHIRLPOOL d6d01e3944d56762a2a999ee631f89e212360aa030ddd16ea96e32d518ec171e04d8565dcb89e804248d53e4c6e06b19be239ad2316ea88bb57364815b85d26b DIST vim-8.0.0386.tar.gz 13000882 SHA256 25b28f6ef55a8d0b3f255f0fbed90ad1450bde7f7b231cc09d86c5119adc95bc SHA512 3169ea4dbc836c724f63d99cd345227f870a3a922beba84a6b42011685c0dd209f6bba8c69af0650c9a57bb47fc541e1150ca8cefb21fcada022259bf4c94a66 WHIRLPOOL 99a5582e0db0dc53fd8385cddf1fbf13d2fe1dd5c8e33c9959288c19d4b85f50139791269edd4ec3d5cbed6548cc3d9c7962ec1706eb422a4ef83c207aac009b @@ -11,8 +11,8 @@ EBUILD vim-core-8.0.0386.ebuild 6754 SHA256 8f75d89c4ec220644790a21dcc4abf31764a EBUILD vim-core-8.0.0938.ebuild 6764 SHA256 1dc003559e492075c9577d13514860bff86440a114b16149c58569ef5ca7ec83 SHA512 ae48d1c1afd8a62f8f32afe6c6d9c6a9b52352eb594a6c973efae7f42ac480575c1e1f95b1527f346e04a6ad52f649c966daf98a97c684d6419fd9952a4e8e61 WHIRLPOOL 0136e67cd20a20e3d55e33ef92aef3af347eede30079180dcc62b93da218b7cc8f304d1a849c434f3c1f47980822bb67dfb7fcec97f2be689aa59a5d136e2943 EBUILD vim-core-8.0.0983.ebuild 6772 SHA256 c72b168d4f25da2dfb4fad846855eaecd334b63103269809bec652508751a8f3 SHA512 60fa7940b9ed64b828fa59fcfa11b90b81e63e89d41e2f44c2e2281da620f0325673831cbb2d47c923078e16effdc6b588487f3636f75ae9fdb83ba3c0c0bb5a WHIRLPOOL 578a4dcea44d4116b3e015a06ff0dd48bd49da4d15a83744d94ba4289c1e4ad5e9f4624b6b505045a2551b57bc93ebeeae199c999ec932cca779e888d5113560 EBUILD vim-core-8.0.1056.ebuild 6772 SHA256 c72b168d4f25da2dfb4fad846855eaecd334b63103269809bec652508751a8f3 SHA512 60fa7940b9ed64b828fa59fcfa11b90b81e63e89d41e2f44c2e2281da620f0325673831cbb2d47c923078e16effdc6b588487f3636f75ae9fdb83ba3c0c0bb5a WHIRLPOOL 578a4dcea44d4116b3e015a06ff0dd48bd49da4d15a83744d94ba4289c1e4ad5e9f4624b6b505045a2551b57bc93ebeeae199c999ec932cca779e888d5113560 -EBUILD vim-core-8.0.1188.ebuild 6772 SHA256 c72b168d4f25da2dfb4fad846855eaecd334b63103269809bec652508751a8f3 SHA512 60fa7940b9ed64b828fa59fcfa11b90b81e63e89d41e2f44c2e2281da620f0325673831cbb2d47c923078e16effdc6b588487f3636f75ae9fdb83ba3c0c0bb5a WHIRLPOOL 578a4dcea44d4116b3e015a06ff0dd48bd49da4d15a83744d94ba4289c1e4ad5e9f4624b6b505045a2551b57bc93ebeeae199c999ec932cca779e888d5113560 -EBUILD vim-core-9999.ebuild 6772 SHA256 c72b168d4f25da2dfb4fad846855eaecd334b63103269809bec652508751a8f3 SHA512 60fa7940b9ed64b828fa59fcfa11b90b81e63e89d41e2f44c2e2281da620f0325673831cbb2d47c923078e16effdc6b588487f3636f75ae9fdb83ba3c0c0bb5a WHIRLPOOL 578a4dcea44d4116b3e015a06ff0dd48bd49da4d15a83744d94ba4289c1e4ad5e9f4624b6b505045a2551b57bc93ebeeae199c999ec932cca779e888d5113560 +EBUILD vim-core-8.0.1188.ebuild 6660 SHA256 1da55a9ab94ed96d4ba8c0d6bfaa5754f71a85223825f7981df1eb176734e3d0 SHA512 920903e21d36555b3276f15fb95c59a26cc0355f6327ba1caf625a0d3e2e2d3be877d4244437a68e29ad71ddc3c7c85bf0ae58228b2f7fab17416abfbfc9d368 WHIRLPOOL 0012fe87cb6d3e428bcaacce70f3ac60b6fdee91584db99cc0af003cc365617bbb0910121f4ad339a6bf36c41f414fa037b655bd69e2ac432952312c40329c7e +EBUILD vim-core-9999.ebuild 6660 SHA256 1da55a9ab94ed96d4ba8c0d6bfaa5754f71a85223825f7981df1eb176734e3d0 SHA512 920903e21d36555b3276f15fb95c59a26cc0355f6327ba1caf625a0d3e2e2d3be877d4244437a68e29ad71ddc3c7c85bf0ae58228b2f7fab17416abfbfc9d368 WHIRLPOOL 0012fe87cb6d3e428bcaacce70f3ac60b6fdee91584db99cc0af003cc365617bbb0910121f4ad339a6bf36c41f414fa037b655bd69e2ac432952312c40329c7e MISC ChangeLog 8466 SHA256 568fecc9d283b1c6af99b67c5a0ba20fa02cbdfa3cdf7c869054c9ae13af394b SHA512 fc31c71c500181b09cfa36f324531392057e5b28c4990346435e9b7002083e15238fa16661178081122bdf58a5adc8ffd2f10b9527e6ddfcba79263ed58cdd83 WHIRLPOOL ddc6b0a57525d743a7e79dc67354b87f4a3ee054023d29aa976cd475373bf7d24501d51686d48257dc8cf67249dd7bb18b418e650d78ce706298c1647b8d6ba6 MISC ChangeLog-2015 63585 SHA256 fcbf2e79dabadcfea37e13f90bd1a0da5060f06fa4676551bb5ae5c15b140d3b SHA512 f5431dc90fecae587bfe51915711f2cd117505a034dfa821d412e29898d2046feb7afa98762878b9554d602c4a24dce8807b75613ba7b01fb5747ebc5911fe54 WHIRLPOOL 2410b2440a6eecee31ac1f8b2ccfc0ebc5ffbaf043e95fb4734fd1e22fd4b29093296d1a6b63a8e6e66c5d845a3b300f7655c31e2397eddb2a582033796b680c MISC metadata.xml 321 SHA256 f9326975290ccd756ea9e8aed462a63d5281409d82e6cf70c1cda86b1783c118 SHA512 7d4a40b09c24eb8f08e6c171a4cf0e332d82f06163846602db338a1ad2e51133ed18694f216ce061fd9964fba3380b9991d86b93f111c6f8d0bb62ac5e14f705 WHIRLPOOL df4da6e95b9dda591cf35853baebf9ebff792a7ba5f03c7060e41d319fcf40e31f5874b31c9841b27ed860e5a8d3346e3afb7cf80e93eb2b297c5975288e5b1a diff --git a/app-editors/vim-core/files/vimrc-r5 b/app-editors/vim-core/files/vimrc-r5 index 3386b6c54ba0..2409822e628c 100644 --- a/app-editors/vim-core/files/vimrc-r5 +++ b/app-editors/vim-core/files/vimrc-r5 @@ -193,6 +193,17 @@ endif " has("autocmd") " instead: let g:skip_defaults_vim = 1 +" Enable Omni completion when opening a file only if a specific plugin does +" not already exist for that filetype. This allows Omni completion +" (Ctrl-x/Ctrl-o) to work with any programming language if and only if a syntax +" file exists for the said language. +if exists("+omnifunc") + autocmd Filetype * + \ if &omnifunc == "" | + \ setlocal omnifunc=syntaxcomplete#Complete | + \ endif +endif + " {{{ vimrc.local if filereadable("@GENTOO_PORTAGE_EPREFIX@/etc/vim/vimrc.local") source @GENTOO_PORTAGE_EPREFIX@/etc/vim/vimrc.local diff --git a/app-editors/vim-core/vim-core-8.0.1188.ebuild b/app-editors/vim-core/vim-core-8.0.1188.ebuild index a009ebab1f38..e383fc5b1c03 100644 --- a/app-editors/vim-core/vim-core-8.0.1188.ebuild +++ b/app-editors/vim-core/vim-core-8.0.1188.ebuild @@ -33,7 +33,7 @@ pkg_setup() { export LC_COLLATE="C" # Gnome sandbox silliness. bug #114475. - mkdir -p "${T}"/home + mkdir -p "${T}"/home || die "mkdir -p failed" export HOME="${T}"/home } @@ -44,8 +44,12 @@ src_prepare() { fi # Fixup a script to use awk instead of nawk - sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \ - || die "mve.awk sed failed" + sed -i \ + -e '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \ + "${S}"/runtime/tools/mve.awk || die "sed failed" + + # See #77841. We remove this file after the tarball extraction. + rm -v "${S}"/runtime/tools/vimspell.sh || die "rm failed" # Read vimrc and gvimrc from /etc/vim echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h @@ -70,24 +74,23 @@ src_prepare() { # correctly. To avoid some really entertaining error messages about stuff # which isn't even in the source file being invalid, we'll do some trickery # to make the error never occur. bug 66162 (02 October 2004 ciaranm) - find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done + find "${S}" -name '*.c' | while read c; do + echo >> "$c" || die "echo failed" + done # Try to avoid sandbox problems. Bug #114475. - if [[ -d "${S}"/src/po ]] ; then + if [[ -d "${S}"/src/po ]]; then sed -i -e \ '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \ - "${S}"/src/po/Makefile + "${S}"/src/po/Makefile || die "sed failed" fi - if version_is_at_least 7.3.122 ; then - cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk - fi + cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed" # Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0 - if version_is_at_least 7.3 ; then - sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ - "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' - fi + sed -i -e \ + "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ + "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' eapply_user } @@ -110,13 +113,18 @@ src_configure() { # (3) Notice auto/configure is newer than auto/config.mk # (4) Run ./configure (with wrong args) to remake auto/config.mk sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed" - rm -f src/auto/configure + + # Remove src/auto/configure file. + rm -v src/auto/configure || die "rm configure failed" + emake -j1 -C src autoconf # This should fix a sandbox violation (see bug 24447). The hvc # things are for ppc64, see bug 86433. - for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do - [[ -e ${file} ]] && addwrite $file + for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do + if [[ -e "${file}" ]]; then + addwrite $file + fi done # Let Portage do the stripping. Some people like that. @@ -141,9 +149,7 @@ src_configure() { } src_compile() { - # The following allows emake to be used emake -j1 -C src auto/osdef.h objects - emake tools } @@ -174,14 +180,14 @@ src_install() { newins "${FILESDIR}"/vimrc-r5 vimrc eprefixify "${ED}"/etc/vim/vimrc - if use minimal ; then + if use minimal; then # To save space, install only a subset of the files. # Helps minimalize the livecd, bug 65144. eshopts_push -s extglob - rm -fr "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} - rm -fr "${ED}${vimfiles}"/{macros,print,tools,tutor} - rm "${ED}"/usr/bin/vimtutor + rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die "rm failed" + rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed" + rm -v "${ED}"/usr/bin/vimtutor || die "rm failed" local keep_colors="default" ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim ) @@ -194,16 +200,7 @@ src_install() { eshopts_pop fi - # These files might have slight security issues, so we won't - # install them. See bug #77841. We don't mind if these don't - # exist. - rm "${ED}${vimfiles}"/tools/{vimspell.sh,tcltags} 2>/dev/null - newbashcomp "${FILESDIR}"/xxd-completion xxd - - # We shouldn't be installing the ex or view man page symlinks, as they - # are managed by eselect-vi - rm -f "${ED}"/usr/share/man/man1/{ex,view}.1 } pkg_postinst() { diff --git a/app-editors/vim-core/vim-core-9999.ebuild b/app-editors/vim-core/vim-core-9999.ebuild index a009ebab1f38..e383fc5b1c03 100644 --- a/app-editors/vim-core/vim-core-9999.ebuild +++ b/app-editors/vim-core/vim-core-9999.ebuild @@ -33,7 +33,7 @@ pkg_setup() { export LC_COLLATE="C" # Gnome sandbox silliness. bug #114475. - mkdir -p "${T}"/home + mkdir -p "${T}"/home || die "mkdir -p failed" export HOME="${T}"/home } @@ -44,8 +44,12 @@ src_prepare() { fi # Fixup a script to use awk instead of nawk - sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \ - || die "mve.awk sed failed" + sed -i \ + -e '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \ + "${S}"/runtime/tools/mve.awk || die "sed failed" + + # See #77841. We remove this file after the tarball extraction. + rm -v "${S}"/runtime/tools/vimspell.sh || die "rm failed" # Read vimrc and gvimrc from /etc/vim echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h @@ -70,24 +74,23 @@ src_prepare() { # correctly. To avoid some really entertaining error messages about stuff # which isn't even in the source file being invalid, we'll do some trickery # to make the error never occur. bug 66162 (02 October 2004 ciaranm) - find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done + find "${S}" -name '*.c' | while read c; do + echo >> "$c" || die "echo failed" + done # Try to avoid sandbox problems. Bug #114475. - if [[ -d "${S}"/src/po ]] ; then + if [[ -d "${S}"/src/po ]]; then sed -i -e \ '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \ - "${S}"/src/po/Makefile + "${S}"/src/po/Makefile || die "sed failed" fi - if version_is_at_least 7.3.122 ; then - cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk - fi + cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed" # Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0 - if version_is_at_least 7.3 ; then - sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ - "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' - fi + sed -i -e \ + "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ + "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' eapply_user } @@ -110,13 +113,18 @@ src_configure() { # (3) Notice auto/configure is newer than auto/config.mk # (4) Run ./configure (with wrong args) to remake auto/config.mk sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed" - rm -f src/auto/configure + + # Remove src/auto/configure file. + rm -v src/auto/configure || die "rm configure failed" + emake -j1 -C src autoconf # This should fix a sandbox violation (see bug 24447). The hvc # things are for ppc64, see bug 86433. - for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do - [[ -e ${file} ]] && addwrite $file + for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do + if [[ -e "${file}" ]]; then + addwrite $file + fi done # Let Portage do the stripping. Some people like that. @@ -141,9 +149,7 @@ src_configure() { } src_compile() { - # The following allows emake to be used emake -j1 -C src auto/osdef.h objects - emake tools } @@ -174,14 +180,14 @@ src_install() { newins "${FILESDIR}"/vimrc-r5 vimrc eprefixify "${ED}"/etc/vim/vimrc - if use minimal ; then + if use minimal; then # To save space, install only a subset of the files. # Helps minimalize the livecd, bug 65144. eshopts_push -s extglob - rm -fr "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} - rm -fr "${ED}${vimfiles}"/{macros,print,tools,tutor} - rm "${ED}"/usr/bin/vimtutor + rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die "rm failed" + rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed" + rm -v "${ED}"/usr/bin/vimtutor || die "rm failed" local keep_colors="default" ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim ) @@ -194,16 +200,7 @@ src_install() { eshopts_pop fi - # These files might have slight security issues, so we won't - # install them. See bug #77841. We don't mind if these don't - # exist. - rm "${ED}${vimfiles}"/tools/{vimspell.sh,tcltags} 2>/dev/null - newbashcomp "${FILESDIR}"/xxd-completion xxd - - # We shouldn't be installing the ex or view man page symlinks, as they - # are managed by eselect-vi - rm -f "${ED}"/usr/share/man/man1/{ex,view}.1 } pkg_postinst() { diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest index bb155df67fd7..306d58df69d1 100644 --- a/app-editors/vim/Manifest +++ b/app-editors/vim/Manifest @@ -11,8 +11,8 @@ EBUILD vim-8.0.0386.ebuild 10124 SHA256 bf05c7d3c48a49c8ee2ab91799e2258681d3d8cc EBUILD vim-8.0.0938.ebuild 9862 SHA256 5f9c53f531439dfe1736f8ac12524c8c4595d9b89ad6facb259837a098f908a6 SHA512 bde375f135b25a2cdbb2fd6c267f6fdb8510c7d1dd263e86b5a8afa1f72d58da7cad91c73309e29e4ba0ca7fbd866b6c18da1d70aa479623d5671b0c96cd3f06 WHIRLPOOL 2991cb67ad280b04c37ed8255003f4e4fcf8fff15dcb8a7efdd3cf0db34bd7faf4c7710f78b00787da4ae345f7dd76ea95936499db394e02dd65197baa82b3a3 EBUILD vim-8.0.0983.ebuild 9870 SHA256 36d1bea04e71cc0e7f0b978d2254c1543f78199349fcc1697f4fdf906a6fd34d SHA512 a35b7c35b67c493879f19db7aa1d4c401b3673798e4a4bb474ee4c9395d87d53fddde7f384631efeb1497fd17d6f5ac0177091f133a396a81b41098a9ccd8c8e WHIRLPOOL 54e8274dd5ec8ec511641c476020d3c0d940dcd2f7afafc53ec86771df1fd8fbc789ea13819b70458952ae372c8ab6dea1d6ce430ec109c1d5c99712cb53f86f EBUILD vim-8.0.1056.ebuild 9870 SHA256 36d1bea04e71cc0e7f0b978d2254c1543f78199349fcc1697f4fdf906a6fd34d SHA512 a35b7c35b67c493879f19db7aa1d4c401b3673798e4a4bb474ee4c9395d87d53fddde7f384631efeb1497fd17d6f5ac0177091f133a396a81b41098a9ccd8c8e WHIRLPOOL 54e8274dd5ec8ec511641c476020d3c0d940dcd2f7afafc53ec86771df1fd8fbc789ea13819b70458952ae372c8ab6dea1d6ce430ec109c1d5c99712cb53f86f -EBUILD vim-8.0.1188.ebuild 9852 SHA256 b2698b1f10dfab02e758184b408b0784032de7cb196829fb33e7a48862cb00d2 SHA512 553222b37211dafcbf874c7418cb25e2c9729951bd30afc9ca05b6fba74a0af3dbaa86d61811e249eaeaa7e71db468492c33e55cf1f00e08cf75a679e0f1f352 WHIRLPOOL 53c7bae5aaa659c1f502eb57a2671f8434047aaf426f4d66802b39a8707fb2c338bf2e83c7b822e4963917eec1f261824551190e2930997eb484662be9845006 -EBUILD vim-9999.ebuild 9852 SHA256 b2698b1f10dfab02e758184b408b0784032de7cb196829fb33e7a48862cb00d2 SHA512 553222b37211dafcbf874c7418cb25e2c9729951bd30afc9ca05b6fba74a0af3dbaa86d61811e249eaeaa7e71db468492c33e55cf1f00e08cf75a679e0f1f352 WHIRLPOOL 53c7bae5aaa659c1f502eb57a2671f8434047aaf426f4d66802b39a8707fb2c338bf2e83c7b822e4963917eec1f261824551190e2930997eb484662be9845006 +EBUILD vim-8.0.1188.ebuild 8794 SHA256 f10b697e5d0677d5bcfcfa1bbe1c203d86576d9734dab5476febdbea1ade2d9d SHA512 d19b8648013cc4ee343ef86b7f60115c52b8b77decda206d15bc2530667b48dd69cb92c1db06ddac2c29a21b528e0c08059a7711bdfd0e8ca89eb046f34be516 WHIRLPOOL 6698d79202640a12f7c1425acaa279ecfcd5ec10fab097596397ae26b50985a8e3ef46ae69037ac941d0011aae0001afd8d449a50bb78abc338a351678d0205e +EBUILD vim-9999.ebuild 8794 SHA256 f10b697e5d0677d5bcfcfa1bbe1c203d86576d9734dab5476febdbea1ade2d9d SHA512 d19b8648013cc4ee343ef86b7f60115c52b8b77decda206d15bc2530667b48dd69cb92c1db06ddac2c29a21b528e0c08059a7711bdfd0e8ca89eb046f34be516 WHIRLPOOL 6698d79202640a12f7c1425acaa279ecfcd5ec10fab097596397ae26b50985a8e3ef46ae69037ac941d0011aae0001afd8d449a50bb78abc338a351678d0205e MISC ChangeLog 7848 SHA256 6fc0792ca6d0bc4bf25efefac019e1938db855deffd2a47a02de28f848e29c48 SHA512 de0459f63bb4caad161089ec6e662cb6f5aba4fc8413de18f205ed5e5ec3b1576fe6d3ad9c5799c333bd3435857801a80eb63d77a9ac3e30c1e9ea44580076d8 WHIRLPOOL d8df884c001bb4572d0c50a0b69ce2cdad81abefc95a66769cde7c34eb50a52db31bb192de1015f8927d123102e0c9c4e1222e02b5955f8aea88d1cca19410f7 MISC ChangeLog-2015 67669 SHA256 86ac1b2a4e92a9eab943636dde488ccb9351b509b3775e8e11f30e5367d48732 SHA512 f84c582b834fdb2907730b9f409f243e10d98777083a8b9a5b689a803d974f2181a93c7de6d197f4482e6b054992f1324d5e0e9d580f7cc89d6d48947a3e9ed7 WHIRLPOOL 047df580ce408d600fd30222ecd55b24414ee3aaea8cd156728a371a878ee0da86ec18843699bc961a911429c57bbf578bd2d4569c2d116f8cf1bac110ee79b4 MISC metadata.xml 849 SHA256 ae82c0df451d25d22197d773eb096ca82cf1f01c839f7abc2543f22feb476553 SHA512 a4369827eaaa72339f17b1c673aa5f71625b657afad9d2f6079ffc6fd23775aa8f6c52aca0cb193b4815bc6ca9918617c251767343f7044ab79b83b69038c58b WHIRLPOOL e185dee8e1424534b777c9aab3f39659c97bf24e401e83ebacfc6c2cebd35d7bae4e3d6ce2be7162edb9fc91e84036a51909fa3bd9c149c60eadb1f2d4e1d11a diff --git a/app-editors/vim/vim-8.0.1188.ebuild b/app-editors/vim/vim-8.0.1188.ebuild index 288ed95e5ccb..be9a4fdae498 100644 --- a/app-editors/vim/vim-8.0.1188.ebuild +++ b/app-editors/vim/vim-8.0.1188.ebuild @@ -50,7 +50,9 @@ RDEPEND=" tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt ) " -DEPEND="${RDEPEND} + +DEPEND=" + ${RDEPEND} sys-devel/autoconf nls? ( sys-devel/gettext ) " @@ -61,7 +63,7 @@ pkg_setup() { export LC_COLLATE="C" # Gnome sandbox silliness. bug #114475. - mkdir -p "${T}"/home + mkdir -p "${T}"/home || die "mkdir failed" export HOME="${T}"/home use python && python-single-r1_pkg_setup @@ -74,17 +76,21 @@ src_prepare() { fi # Fixup a script to use awk instead of nawk - sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \ - || die "mve.awk sed failed" + sed -i -e \ + '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \ + "${S}"/runtime/tools/mve.awk || die "mve.awk sed failed" # Read vimrc and gvimrc from /etc/vim - echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h - echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h + echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \ + >> "${S}"/src/feature.h || die "echo failed" + echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \ + >> "${S}"/src/feature.h || die "echo failed" # Use exuberant ctags which installs as /usr/bin/exuberant-ctags. # Hopefully this pattern won't break for a while at least. # This fixes bug 29398 (27 Sep 2003 agriffis) - sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \ + sed -i -e \ + 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \ "${S}"/runtime/doc/syntax.txt \ "${S}"/runtime/doc/tagsrch.txt \ "${S}"/runtime/doc/usr_29.txt \ @@ -94,17 +100,21 @@ src_prepare() { # Don't be fooled by /usr/include/libc.h. When found, vim thinks # this is NeXT, but it's actually just a file in dev-libs/9libs # This fixes bug 43885 (20 Mar 2004 agriffis) - sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed' + sed -i -e \ + 's/ libc\.h / /' \ + "${S}"/src/configure.ac || die 'sed failed' # gcc on sparc32 has this, uhm, interesting problem with detecting EOF # correctly. To avoid some really entertaining error messages about stuff # which isn't even in the source file being invalid, we'll do some trickery # to make the error never occur. bug 66162 (02 October 2004 ciaranm) - find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done + find "${S}" -name '*.c' | while read c; do + echo >> "$c" || die "echo failed" + done # conditionally make the manpager.sh script - if use vim-pager ; then - cat <<-END > "${S}"/runtime/macros/manpager.sh + if use vim-pager; then + cat > "${S}"/runtime/macros/manpager.sh <<-_EOF_ || die "cat EOF failed" #!/bin/sh sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\ vim \\ @@ -112,24 +122,21 @@ src_prepare() { -c 'set nolist nomod ft=man ts=8' \\ -c 'let g:showmarks_enable=0' \\ -c 'runtime! macros/less.vim' - - END + _EOF_ fi # Try to avoid sandbox problems. Bug #114475. - if [[ -d "${S}"/src/po ]] ; then - sed -i '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \ - "${S}"/src/po/Makefile + if [[ -d "${S}"/src/po ]]; then + sed -i -e \ + '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \ + "${S}"/src/po/Makefile || die "sed failed" fi - if version_is_at_least 7.3.122 ; then - cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk - fi + cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed" - # Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0 - if version_is_at_least 7.3 ; then - sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ - "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' - fi + sed -i -e \ + "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ + "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' eapply_user } @@ -152,16 +159,18 @@ src_configure() { # (3) Notice auto/configure is newer than auto/config.mk # (4) Run ./configure (with wrong args) to remake auto/config.mk sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed" - rm -f src/auto/configure + rm src/auto/configure || die "rm failed" emake -j1 -C src autoconf # This should fix a sandbox violation (see bug 24447). The hvc # things are for ppc64, see bug 86433. - for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do - [[ -e ${file} ]] && addwrite $file + for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do + if [[ -e "${file}" ]]; then + addwrite $file + fi done - if use minimal ; then + if use minimal; then myconf=( --with-features=tiny --disable-nls @@ -204,9 +213,9 @@ src_configure() { # --with-features=huge forces on cscope even if we --disable it. We need # to sed this out to avoid screwiness. (1 Sep 2004 ciaranm) - if ! use cscope ; then - sed -i '/# define FEAT_CSCOPE/d' src/feature.h || \ - die "couldn't disable cscope" + if ! use cscope; then + sed -i -e \ + '/# define FEAT_CSCOPE/d' src/feature.h || die "sed failed" fi # don't test USE=X here ... see bug #19115 @@ -237,14 +246,14 @@ src_compile() { } src_test() { - echo + einfo einfo "Starting vim tests. Several error messages will be shown" einfo "while the tests run. This is normal behaviour and does not" einfo "indicate a fault." - echo + einfo ewarn "If the tests fail, your terminal may be left in a strange" ewarn "state. Usually, running 'reset' will fix this." - echo + einfo # Don't let vim talk to X unset DISPLAY @@ -252,39 +261,12 @@ src_test() { emake -j1 -C src/testdir nongui } -# Make convenience symlinks, hopefully without stepping on toes. Some -# of these links are "owned" by the vim ebuild when it is installed, -# but they might be good for gvim as well (see bug 45828) -update_vim_symlinks() { - local f syms - syms="vimdiff rvim rview" +# Call eselect vi update with --if-unset +# to respect user's choice (bug 187449) +eselect_vi_update() { einfo "Calling eselect vi update..." - # Call this with --if-unset to respect user's choice (bug 187449) eselect vi update --if-unset - - # Make or remove convenience symlink, vim -> gvim - if [[ -f "${EROOT}"/usr/bin/gvim ]]; then - ln -s gvim "${EROOT}"/usr/bin/vim 2>/dev/null - elif [[ -L "${EROOT}"/usr/bin/vim && ! -f "${EROOT}"/usr/bin/vim ]]; then - rm "${EROOT}"/usr/bin/vim - fi - - # Make or remove convenience symlinks to vim - if [[ -f "${EROOT}"/usr/bin/vim ]]; then - for f in ${syms}; do - ln -s vim "${EROOT}"/usr/bin/${f} 2>/dev/null - done - else - for f in ${syms}; do - if [[ -L "${EROOT}"/usr/bin/${f} && ! -f "${EROOT}"/usr/bin/${f} ]]; then - rm -f "${EROOT}"/usr/bin/${f} - fi - done - fi - - # This will still break if you merge then remove the vi package, - # but there's only so much you can do, eh? Unfortunately we don't - # have triggers like are done in rpm-land. + eend $? } src_install() { @@ -305,26 +287,23 @@ src_install() { fi newbashcomp "${FILESDIR}"/${PN}-completion ${PN} + # keep in sync with 'complete ... -F' list bashcomp_alias vim ex vi view rvim rview vimdiff - - # We shouldn't be installing the ex or view man page symlinks, as they - # are managed by eselect-vi - rm -f "${ED}"/usr/share/man/man1/{ex,view}.1 } pkg_postinst() { # Update documentation tags (from vim-doc.eclass) update_vim_helptags - # Make convenience symlinks - update_vim_symlinks + # Call eselect vi update + eselect_vi_update } pkg_postrm() { # Update documentation tags (from vim-doc.eclass) update_vim_helptags - # Make convenience symlinks - update_vim_symlinks + # Call eselect vi update + eselect_vi_update } diff --git a/app-editors/vim/vim-9999.ebuild b/app-editors/vim/vim-9999.ebuild index 288ed95e5ccb..be9a4fdae498 100644 --- a/app-editors/vim/vim-9999.ebuild +++ b/app-editors/vim/vim-9999.ebuild @@ -50,7 +50,9 @@ RDEPEND=" tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt ) " -DEPEND="${RDEPEND} + +DEPEND=" + ${RDEPEND} sys-devel/autoconf nls? ( sys-devel/gettext ) " @@ -61,7 +63,7 @@ pkg_setup() { export LC_COLLATE="C" # Gnome sandbox silliness. bug #114475. - mkdir -p "${T}"/home + mkdir -p "${T}"/home || die "mkdir failed" export HOME="${T}"/home use python && python-single-r1_pkg_setup @@ -74,17 +76,21 @@ src_prepare() { fi # Fixup a script to use awk instead of nawk - sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \ - || die "mve.awk sed failed" + sed -i -e \ + '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \ + "${S}"/runtime/tools/mve.awk || die "mve.awk sed failed" # Read vimrc and gvimrc from /etc/vim - echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h - echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h + echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \ + >> "${S}"/src/feature.h || die "echo failed" + echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \ + >> "${S}"/src/feature.h || die "echo failed" # Use exuberant ctags which installs as /usr/bin/exuberant-ctags. # Hopefully this pattern won't break for a while at least. # This fixes bug 29398 (27 Sep 2003 agriffis) - sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \ + sed -i -e \ + 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \ "${S}"/runtime/doc/syntax.txt \ "${S}"/runtime/doc/tagsrch.txt \ "${S}"/runtime/doc/usr_29.txt \ @@ -94,17 +100,21 @@ src_prepare() { # Don't be fooled by /usr/include/libc.h. When found, vim thinks # this is NeXT, but it's actually just a file in dev-libs/9libs # This fixes bug 43885 (20 Mar 2004 agriffis) - sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed' + sed -i -e \ + 's/ libc\.h / /' \ + "${S}"/src/configure.ac || die 'sed failed' # gcc on sparc32 has this, uhm, interesting problem with detecting EOF # correctly. To avoid some really entertaining error messages about stuff # which isn't even in the source file being invalid, we'll do some trickery # to make the error never occur. bug 66162 (02 October 2004 ciaranm) - find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done + find "${S}" -name '*.c' | while read c; do + echo >> "$c" || die "echo failed" + done # conditionally make the manpager.sh script - if use vim-pager ; then - cat <<-END > "${S}"/runtime/macros/manpager.sh + if use vim-pager; then + cat > "${S}"/runtime/macros/manpager.sh <<-_EOF_ || die "cat EOF failed" #!/bin/sh sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\ vim \\ @@ -112,24 +122,21 @@ src_prepare() { -c 'set nolist nomod ft=man ts=8' \\ -c 'let g:showmarks_enable=0' \\ -c 'runtime! macros/less.vim' - - END + _EOF_ fi # Try to avoid sandbox problems. Bug #114475. - if [[ -d "${S}"/src/po ]] ; then - sed -i '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \ - "${S}"/src/po/Makefile + if [[ -d "${S}"/src/po ]]; then + sed -i -e \ + '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \ + "${S}"/src/po/Makefile || die "sed failed" fi - if version_is_at_least 7.3.122 ; then - cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk - fi + cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed" - # Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0 - if version_is_at_least 7.3 ; then - sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ - "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' - fi + sed -i -e \ + "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ + "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' eapply_user } @@ -152,16 +159,18 @@ src_configure() { # (3) Notice auto/configure is newer than auto/config.mk # (4) Run ./configure (with wrong args) to remake auto/config.mk sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed" - rm -f src/auto/configure + rm src/auto/configure || die "rm failed" emake -j1 -C src autoconf # This should fix a sandbox violation (see bug 24447). The hvc # things are for ppc64, see bug 86433. - for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do - [[ -e ${file} ]] && addwrite $file + for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do + if [[ -e "${file}" ]]; then + addwrite $file + fi done - if use minimal ; then + if use minimal; then myconf=( --with-features=tiny --disable-nls @@ -204,9 +213,9 @@ src_configure() { # --with-features=huge forces on cscope even if we --disable it. We need # to sed this out to avoid screwiness. (1 Sep 2004 ciaranm) - if ! use cscope ; then - sed -i '/# define FEAT_CSCOPE/d' src/feature.h || \ - die "couldn't disable cscope" + if ! use cscope; then + sed -i -e \ + '/# define FEAT_CSCOPE/d' src/feature.h || die "sed failed" fi # don't test USE=X here ... see bug #19115 @@ -237,14 +246,14 @@ src_compile() { } src_test() { - echo + einfo einfo "Starting vim tests. Several error messages will be shown" einfo "while the tests run. This is normal behaviour and does not" einfo "indicate a fault." - echo + einfo ewarn "If the tests fail, your terminal may be left in a strange" ewarn "state. Usually, running 'reset' will fix this." - echo + einfo # Don't let vim talk to X unset DISPLAY @@ -252,39 +261,12 @@ src_test() { emake -j1 -C src/testdir nongui } -# Make convenience symlinks, hopefully without stepping on toes. Some -# of these links are "owned" by the vim ebuild when it is installed, -# but they might be good for gvim as well (see bug 45828) -update_vim_symlinks() { - local f syms - syms="vimdiff rvim rview" +# Call eselect vi update with --if-unset +# to respect user's choice (bug 187449) +eselect_vi_update() { einfo "Calling eselect vi update..." - # Call this with --if-unset to respect user's choice (bug 187449) eselect vi update --if-unset - - # Make or remove convenience symlink, vim -> gvim - if [[ -f "${EROOT}"/usr/bin/gvim ]]; then - ln -s gvim "${EROOT}"/usr/bin/vim 2>/dev/null - elif [[ -L "${EROOT}"/usr/bin/vim && ! -f "${EROOT}"/usr/bin/vim ]]; then - rm "${EROOT}"/usr/bin/vim - fi - - # Make or remove convenience symlinks to vim - if [[ -f "${EROOT}"/usr/bin/vim ]]; then - for f in ${syms}; do - ln -s vim "${EROOT}"/usr/bin/${f} 2>/dev/null - done - else - for f in ${syms}; do - if [[ -L "${EROOT}"/usr/bin/${f} && ! -f "${EROOT}"/usr/bin/${f} ]]; then - rm -f "${EROOT}"/usr/bin/${f} - fi - done - fi - - # This will still break if you merge then remove the vi package, - # but there's only so much you can do, eh? Unfortunately we don't - # have triggers like are done in rpm-land. + eend $? } src_install() { @@ -305,26 +287,23 @@ src_install() { fi newbashcomp "${FILESDIR}"/${PN}-completion ${PN} + # keep in sync with 'complete ... -F' list bashcomp_alias vim ex vi view rvim rview vimdiff - - # We shouldn't be installing the ex or view man page symlinks, as they - # are managed by eselect-vi - rm -f "${ED}"/usr/share/man/man1/{ex,view}.1 } pkg_postinst() { # Update documentation tags (from vim-doc.eclass) update_vim_helptags - # Make convenience symlinks - update_vim_symlinks + # Call eselect vi update + eselect_vi_update } pkg_postrm() { # Update documentation tags (from vim-doc.eclass) update_vim_helptags - # Make convenience symlinks - update_vim_symlinks + # Call eselect vi update + eselect_vi_update } |