From 6957f5c65b02bba533954eabc0b62f5de36be206 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 10 Apr 2018 17:26:49 +0100 Subject: gentoo resync : 10.04.2018 --- app-editors/Manifest.gz | Bin 14054 -> 14043 bytes app-editors/emacs/Manifest | 4 +- app-editors/emacs/emacs-26.1_rc1.ebuild | 379 +++++++++++++++++++ app-editors/emacs/metadata.xml | 6 +- app-editors/gvim/Manifest | 5 - app-editors/gvim/gvim-8.0.0386.ebuild | 407 --------------------- app-editors/gvim/gvim-8.0.1188.ebuild | 371 ------------------- app-editors/ne/Manifest | 1 - app-editors/ne/ne-3.0.1.ebuild | 53 --- app-editors/qemacs/Manifest | 6 - .../files/qemacs-0.3.2_pre20070226-tty_utf8.patch | 43 --- .../files/qemacs-0.4.0_pre20080605-Makefile.patch | 35 -- .../qemacs-0.4.0_pre20080605-make_backup.patch | 68 ---- .../files/qemacs-0.4.0_pre20090420-nostrip.patch | 36 -- .../qemacs/qemacs-0.4.0_pre20090420-r1.ebuild | 76 ---- app-editors/vim/Manifest | 5 - app-editors/vim/vim-8.0.0386.ebuild | 348 ------------------ app-editors/vim/vim-8.0.1188.ebuild | 309 ---------------- 18 files changed, 386 insertions(+), 1766 deletions(-) create mode 100644 app-editors/emacs/emacs-26.1_rc1.ebuild delete mode 100644 app-editors/gvim/gvim-8.0.0386.ebuild delete mode 100644 app-editors/gvim/gvim-8.0.1188.ebuild delete mode 100644 app-editors/ne/ne-3.0.1.ebuild delete mode 100644 app-editors/qemacs/files/qemacs-0.3.2_pre20070226-tty_utf8.patch delete mode 100644 app-editors/qemacs/files/qemacs-0.4.0_pre20080605-Makefile.patch delete mode 100644 app-editors/qemacs/files/qemacs-0.4.0_pre20080605-make_backup.patch delete mode 100644 app-editors/qemacs/files/qemacs-0.4.0_pre20090420-nostrip.patch delete mode 100644 app-editors/qemacs/qemacs-0.4.0_pre20090420-r1.ebuild delete mode 100644 app-editors/vim/vim-8.0.0386.ebuild delete mode 100644 app-editors/vim/vim-8.0.1188.ebuild (limited to 'app-editors') diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz index 620374731b83..b658f7d7f85c 100644 Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest index ccb03c864fd3..f320f1a44ac4 100644 --- a/app-editors/emacs/Manifest +++ b/app-editors/emacs/Manifest @@ -7,9 +7,11 @@ DIST emacs-24.5-patches-4.tar.xz 13632 BLAKE2B 99e70f4ee32c1ba3a66b934de692437aa DIST emacs-24.5.tar.xz 39759804 BLAKE2B aec253528038686822d1f8ed9a52dff276789ef7744053fc9b6176fceba4d4d8684fe979cf97e756b3feaf734d2377baef81f5efaa5450930a4e94d9f3bca355 SHA512 89dee4c3aadb6e505c523f84c65b5e40e5bf28a586cc8a4518a59581c22972f942bb6f3c772df0d5b2685c3e78247c545c6bb2576e981d1ef0f9298c18ad1677 DIST emacs-25.3-patches-1.tar.xz 1252 BLAKE2B 33c3c8e32b85f548201d4988d3aaf94e6440ab4727fced17aa26f00fd5665b755d3add254a764f579736bbfbc90716ff800e3ad5b8e7bd5d5c2370d31451e4b1 SHA512 09371a789a7c742b4e18f45a4c4e063a5392d0684899eb8be8c7415af9fe3c306083c62f18abc6a15c4fe76dd6ae3ac5c9b002c962971e59379cc187926a0c15 DIST emacs-25.3.tar.xz 42854740 BLAKE2B 4f4e2572bbef48b75c561497fc22046081e56099b6174725d79b15a5b16d5c886eaf8ff3f75cf561e989ebb092ab9e98ba7503e720a9db7560758b30d5116f23 SHA512 1cce656451b6ca8502ebb229e88bd3ef48b7f9444a10eeac4ea43bd5491b2efacd641dfa35227a33362c3866493d3449cf1df81606563eef44bba0ed668e457f +DIST emacs-26.1-rc1.tar.xz 44010228 BLAKE2B c7d8d19a8488a88f3eea4dbf4c545de75956b6a82735826d15b603568577fde8019d7655e936ab60bc61e397f3db074e26d5a1d58534714fcaef585fa63a7719 SHA512 bf5a9fac61f024406b050037505c14c83db95f24760c2e32aa8f7e53cc8c2781883af0c3ffe820b039a9444a10e7fdcae7635b7e3c383718de22d77e7ceabe83 EBUILD emacs-18.59-r11.ebuild 4358 BLAKE2B d5db4c011da9c728092eeb75f8708c7ab3729497be75fec58553de3df47a12a54e0845c1a4bc5a07c1080a305d0fdf8033370c0c5692ca3ae7caa617637d8fea SHA512 9637184ba4c9f51da3eef13625b5de4a1af283ada88c2a4f6fe6f03447907ac37e05ae69abbef514bd0024f748f1cc458567f4480e0e23fd4db26905bfa0b4f9 EBUILD emacs-23.4-r17.ebuild 11406 BLAKE2B 9f57016f663a7f7e979df4e10a9a91bcfad282ad66e9baa8ba9cea7e58991da6e1ca4454f7eaa36925589cab8036404d8e58962cdcb0e2ddf1a3df0bf855d2a8 SHA512 8cc574a110555c3a42c26de664ef24a938e4ce2f956c28ffeae61a0b4606738a15f8cc3e6e53f8c2af3dec6f28d9e79cccd67addb79e3efb06171ede82202f64 EBUILD emacs-24.5-r5.ebuild 11121 BLAKE2B 08ad42996a160029d5615a703211615f7230adfc46e3331c6a7f3ddbb27396b30f3266b9803fa980b4b4e1a80abb3e5d297de547e5d88be4796bce1390bfde9e SHA512 5c12fbd82c5b319fcc2da602d5b8ebfa68b215e350fff7ba23d33292e280b2603616eccc982751ab736cf1fb9da834ddc21743690af21484c6a85f62e595719d EBUILD emacs-25.3-r1.ebuild 11640 BLAKE2B 16ac50fda38a906936b0abfb294e1f09d929948befbc6087c99f20f5b894b818c625df9fc274ded2d633fd7034fb9cb53a7111fcf38e18f48e43e3ce99a9363e SHA512 ea8f14799e8a87f4f55c8f9d9488e021319d107432d8cb2f8a63c31e9f11f4e44e497d2f42aa5cc0702001d733f94b9811bbca66a7d7af69320ca9b69514a316 EBUILD emacs-25.3-r4.ebuild 11612 BLAKE2B 7018b869ba576f4b76da28476659305319b8d861a83e4b4de8b4c487923b4aca541ba2a5fdd61fff125a5d8ea06d7f6d284cfc611c25eb542901db38e67df5f5 SHA512 a5bfa5b7b6ebf20b7e9152ad7864370c43033f669271048f0c0485ee9491af5359b970217870375e7b3cda2bc3033b0c8667c1386bf42a79bbcaf3ade69c96e6 -MISC metadata.xml 2690 BLAKE2B de4856ab7b667c463fbae71eba01b9c2ba497d25af37ae7f6ed495736de60d9386f93c80a43dbf5d6b606c0bcdde0c747b7ed0b9de604db43982f3c489d3c952 SHA512 7881ff80ea97b28990d9f04a3ae982e4eff16525ea1842825ebc9b8736dec412c526c429fd7634bc98a81815f6d08d9d8003eeb500c6d54ee722c6fcec631634 +EBUILD emacs-26.1_rc1.ebuild 11943 BLAKE2B 359fe916612a4d39299998a79a2c73fb74402f1ae889d2cfea39b625e027dcaf9aeae57a7a7e598b50bb70cc9d74ccebeed02ea0d6602258b3d3a65ed06a25d9 SHA512 5c6f8fcd827ca80b30d5d0962858cd97776be47d81f73c456704631256b98dc73efd51aff64dc46a98344741ea788b6feeccd6f920c7372b1e1b1d92a06dfd59 +MISC metadata.xml 2817 BLAKE2B 75ddf0acfc4520b1426bfd99146df35b36f40cc4cb0df7bb773361b786da3857744415a1a8a94a060aa99762e88caaceaa89d5f069fbc9662fcfcce10880f6c1 SHA512 64c729882bcab6a7cfe36d0d5ba5228b15d15000383aa87b5528763fb291cfedd1cd896c406b6e3783677bb772f362de4a54e54c6f056b959f6efffb65325c90 diff --git a/app-editors/emacs/emacs-26.1_rc1.ebuild b/app-editors/emacs/emacs-26.1_rc1.ebuild new file mode 100644 index 000000000000..36f6fc78f64c --- /dev/null +++ b/app-editors/emacs/emacs-26.1_rc1.ebuild @@ -0,0 +1,379 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit elisp-common flag-o-matic multilib readme.gentoo-r1 + +DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" +HOMEPAGE="https://www.gnu.org/software/emacs/" +SRC_URI="mirror://gnu-alpha/emacs/pretest/emacs-${PV/_/-}.tar.xz" + +LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" +SLOT="26" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el 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 ) + !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/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXinerama + x11-libs/libXrandr + x11-libs/libxcb + 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 + x11-libs/libXrender + cairo? ( >=x11-libs/cairo-1.12.18 ) + m17n-lib? ( + >=dev-libs/libotf-0.9.4 + >=dev-libs/m17n-lib-1.5.1 + ) + ) + gtk? ( + xwidgets? ( + net-libs/webkit-gtk:4= + x11-libs/gtk+:3 + x11-libs/libXcomposite + ) + !xwidgets? ( + gtk3? ( x11-libs/gtk+:3 ) + !gtk3? ( x11-libs/gtk+:2 ) + ) + ) + !gtk? ( + motif? ( + >=x11-libs/motif-2.3:0 + x11-libs/libXpm + x11-libs/libXmu + x11-libs/libXt + ) + !motif? ( + Xaw3d? ( + x11-libs/libXaw3d + x11-libs/libXmu + x11-libs/libXt + ) + !Xaw3d? ( athena? ( + x11-libs/libXaw + x11-libs/libXmu + x11-libs/libXt + ) ) + ) + ) + )" + +DEPEND="${RDEPEND} + virtual/pkgconfig + gzip-el? ( app-arch/gzip ) + pax_kernel? ( sys-apps/attr )" + +RDEPEND="${RDEPEND} + !. + 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 + + 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 \ + --without-hesiod \ + --without-pop \ + --with-file-notification=$(usev inotify || usev gfile || echo no) \ + $(use_enable acl) \ + $(use_with dbus) \ + $(use_with dynamic-loading modules) \ + $(use_with games gameuser ":gamestat") \ + $(use_with gpm) \ + $(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() { + # Disable sandbox when dumping. For the unbelievers, see bug #131505 + emake RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs" +} + +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 /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 || die + 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/emacs/metadata.xml b/app-editors/emacs/metadata.xml index d0265f5fe8f5..afec8cebd2ea 100644 --- a/app-editors/emacs/metadata.xml +++ b/app-editors/emacs/metadata.xml @@ -38,6 +38,8 @@ processing Use dev-libs/libxml2 to parse XML instead of the internal Lisp implementations + Retrieve e-mail using net-mail/mailutils + instead of the internal movemail substitute Enable building under a PaX enabled kernel Install C source files and make them available for find-function @@ -46,7 +48,7 @@ Prefer wide Emacs integers (typically 62-bit). This option has an effect only on architectures where "long" and "long long" types have different size. - + Enable use of GTK widgets in Emacs buffers + (requires GTK3) diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest index b79cd4680c0b..7885ed04f383 100644 --- a/app-editors/gvim/Manifest +++ b/app-editors/gvim/Manifest @@ -1,15 +1,10 @@ AUX gvim-completion 1219 BLAKE2B 8a8d8ac5b42be0103da00ecda3445f24993df0b2762310dcc1a9e1cf892048b57c02b7da2ea19d900c40b782cabeda4c6f7b79b9b7b44b6fb7ad7ae723b46f88 SHA512 08bb32a3c9fcbdd00977b7343dda9cda44b389a13b1717ebddb462e22b6cf9d4db37d5b49ff752b931e305bf57e8f9f4a7d6e32ea25f8acd1b00e5f8320ac132 AUX gvim.svg 4584 BLAKE2B 53d896f90404df6b185d1f4404c22e6bd6035722beb61d2223a6003e7c274cdfd4d97d7274346427d873a8e98a4ad32321c0a3ceab2b436124f90c707045b233 SHA512 78f5fb460281ab5d8b0ff6e28bf24231c1ade5ae46caab2e2d345d82b983ada7d945dd7d603b3e470c77dbd1eb329027852b6ba22afc441d64a1b66a1ee3867a AUX gvimrc-r1 990 BLAKE2B 5fc0b805458aff22485e3e180ca8c32a62f2cfe49572edffa5725d2cfc4ed9a7bded20c1a5cd1f19f41e0849e3ca08be4798ff23edd66a92bcbb31aee16c433a SHA512 f6538550f1ecadcccf74a6bbd5a6a0b71d18a234a854d1a0179144125555c42280000df9523e7c3d5a8b449f421af7bafcca1034951f085279cee0dd1160808a -DIST vim-8.0.0106-gentoo-patches.tar.bz2 2281 BLAKE2B 8e10c0c56ad97cbae0677ec91b0b35359f6e08b5eb542b00028fd0e243a075551adab4e140a90930cbce4549c3c4bc79a40c0e1a6c13aae18f67d6fc55a80e0e SHA512 39edd9f518c230d2b0486b18aa155572a9eada4a5e21108573d6e66e2eef1276f23b77d766648f018c9cf973a7d03712d8861be6ea13255d7b389912d554a47a -DIST vim-8.0.0386.tar.gz 13000882 BLAKE2B c38c1b75334cae916f76562ec5a06d59c4f2df6123d4b27a0a854dd8ecd9ae6f5d008a94137abe6217fc28d233077d636d30f2c26a5a139ff35f50cb52204f79 SHA512 3169ea4dbc836c724f63d99cd345227f870a3a922beba84a6b42011685c0dd209f6bba8c69af0650c9a57bb47fc541e1150ca8cefb21fcada022259bf4c94a66 DIST vim-8.0.0938-gentoo-patches.tar.bz2 2316 BLAKE2B 05a87f32fc5cc65e7f5e4e5a87c654b2040ad39f1555ddde7e0e6f473dc8b520916a795406bb6bbeaf5e7ae8748aacebe7a9679461e48802e69417e945eea827 SHA512 a6062be5e6a5c5b437081312df5742353242b5171bf26da04aa6ca216d2b142b2411a88bc1edd460d28e00a59a210c8e1729e801fac6f1efd86bb2e437a56a2b -DIST vim-8.0.1188.tar.gz 13363260 BLAKE2B 545b2d6e8322b27967c974bb960f4e5ea2c6811d2649ac4c008eb8e6af78fe555a035657704af40026f96f12f83e3cebe435e90d21d7da87980446710424f79f SHA512 9c3733aa894c276de593d6144ee0aaf251092a11f4d0ac603d3d49a282ac6176aa4e88eccfd2527ff53b386bdd0177a85c0942367d68a652b5ca4040390ba49b DIST vim-8.0.1298.tar.gz 13395459 BLAKE2B 4b6e3c4443cd675dc3727e8609b89c422f66c7d32908b5136ee312d48427568a8236214c85135242269b6575e0e1336b0973395a6372664435f8bae4d7bee843 SHA512 7704c493359c1a922f876e4d6f3b4ad265d8ce974a59d51a39e5a4424251105250ffc803bcf6c6750daeb5e6376cbbfd24557b075eacf2b0274d7c432db2f681 DIST vim-8.0.1428.tar.gz 13415243 BLAKE2B 88f86c371d0a644212b9e4dc1a15d61244847037f36262a225c361bfc2799b741c128de21ac92bb3fb4a4955894e46d34dc01baa7cbf58f1371d772b36887103 SHA512 f635c53c7e2ca808dc1cb424e6e4b16d8c41c66a86c3c7584444dab3d2482904795fea7c071d65862ae6ac6b2b66b7ad5ac832e1e30f4624d46f220c6f41e2e9 DIST vim-8.0.1645.tar.gz 13535252 BLAKE2B a5c7463e85eed12825bdf46d15eb7e7513d62831eba76cbb90af875010b33662b7a6ef2c4c5cecddface415d75e97caf0a670e69835ecd3b4a89704f3b18b905 SHA512 367b9e205e776f84fcfbb92725afd5e7aa66898110d46dbea1a33f7b74c239559e829b5104c45360539c8f2b23c375ed59ccea7ee35a5dd10770400d9a7be085 -EBUILD gvim-8.0.0386.ebuild 11569 BLAKE2B 2e9803cd0cad4f6d9ba86f7a4f9242a1850c4017a1b7cc894ab57d9c450f173d9f24f7deb2a2f7c26a4598bfb79d2bfecfc29c777473e0759c6e89fcd99cb5d6 SHA512 93d54860172f0e8caf22d129d55a26276e4ba0d68f91c74dcc969fb2f738f3197ee77de983d65c9533029a04e0cd74fbefabf6802ecba6bb0d4ba0807b68783c -EBUILD gvim-8.0.1188.ebuild 10477 BLAKE2B 764132ab93aa42aeef1f26fdfaf1095630ddcbdf148681d2ff929611a6fc736ab7c325947d39752dbe112c869cdf1ff51fb0419c9316f9e05eb0440a662cc38f SHA512 ca3474ac8e4ffa20bb0d96677f4bee91683cafeceb6db4d2654c4d3f3037adc7a5a78bf57bc019222fbde96d06a5731c4d6474324ac676941115e728dcc085bf EBUILD gvim-8.0.1298.ebuild 10469 BLAKE2B b0f04d4d5a1df2854184d2d0f9b64129524af078e86096704348a86710b8b551b77f3d8b0a2071a56a650cd747b45cf437e58ec7a3259b5b1332c46de1dd7f2e SHA512 27f0671ee4de3ffbbd4d6d56c09550fe4774ec1d9b5b45513f6314719e1f1c6e0ea55215dfe5b88c253d16bd97bbcc7cbf734d7c9049b11df625da300e7c589c EBUILD gvim-8.0.1428.ebuild 10477 BLAKE2B 764132ab93aa42aeef1f26fdfaf1095630ddcbdf148681d2ff929611a6fc736ab7c325947d39752dbe112c869cdf1ff51fb0419c9316f9e05eb0440a662cc38f SHA512 ca3474ac8e4ffa20bb0d96677f4bee91683cafeceb6db4d2654c4d3f3037adc7a5a78bf57bc019222fbde96d06a5731c4d6474324ac676941115e728dcc085bf EBUILD gvim-8.0.1645.ebuild 10502 BLAKE2B 47db270abf2ea71b92173df98377634c0b59d04383059ac557c0c8fcd8aeeb11ff8aaa1a7cb4b40819f386b040952ca356457e500d9b0a9a553e1bea60379a16 SHA512 da4f6c564a06f5f8eb50a56836235eddadd20515afe66a74efd0fce24a3a048db52a0cc0ae8d7e5fbf5fd57f0861e0a50e966a4a31f106059f0952ceccb7b589 diff --git a/app-editors/gvim/gvim-8.0.0386.ebuild b/app-editors/gvim/gvim-8.0.0386.ebuild deleted file mode 100644 index 66c0627eb458..000000000000 --- a/app-editors/gvim/gvim-8.0.0386.ebuild +++ /dev/null @@ -1,407 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -VIM_VERSION="8.0" -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) -PYTHON_REQ_USE=threads -inherit eutils vim-doc flag-o-matic fdo-mime gnome2-utils versionator bash-completion-r1 prefix python-r1 - -if [[ ${PV} == 9999* ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/vim/vim.git" - EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV} -else - SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz - https://dev.gentoo.org/~radhermit/vim/vim-8.0.0106-gentoo-patches.tar.bz2" - KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" -fi - -DESCRIPTION="GUI version of the Vim text editor" -HOMEPAGE="http://www.vim.org/ https://github.com/vim/vim" - -SLOT="0" -LICENSE="vim" -IUSE="acl aqua cscope debug gnome gtk gtk3 lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl" -REQUIRED_USE=" - luajit? ( lua ) - python? ( - || ( $(python_gen_useflags '*') ) - ?? ( $(python_gen_useflags 'python2*') ) - ?? ( $(python_gen_useflags 'python3*') ) - ) -" - -RDEPEND=" - ~app-editors/vim-core-${PV} - >=app-eselect/eselect-vi-1.1 - >=sys-libs/ncurses-5.2-r2:0= - x11-libs/libICE - x11-libs/libSM - x11-libs/libXext - x11-libs/libXt - acl? ( kernel_linux? ( sys-apps/acl ) ) - !aqua? ( - gtk3? ( - x11-libs/gtk+:3 - x11-libs/libXft - ) - !gtk3? ( - gtk? ( - >=x11-libs/gtk+-2.6:2 - x11-libs/libXft - gnome? ( >=gnome-base/libgnomeui-2.6 ) - ) - !gtk? ( - motif? ( >=x11-libs/motif-2.3:0 ) - !motif? ( - neXt? ( x11-libs/neXtaw ) - !neXt? ( x11-libs/libXaw ) - ) - ) - ) - ) - cscope? ( dev-util/cscope ) - lua? ( - luajit? ( dev-lang/luajit:2= ) - !luajit? ( dev-lang/lua:0[deprecated] ) - ) - nls? ( virtual/libintl ) - perl? ( dev-lang/perl:= ) - python? ( ${PYTHON_DEPS} ) - racket? ( dev-scheme/racket ) - ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.1 ) ) - selinux? ( sys-libs/libselinux ) - session? ( x11-libs/libSM ) - tcl? ( dev-lang/tcl:0= ) -" -DEPEND="${RDEPEND} - dev-util/ctags - sys-devel/autoconf - virtual/pkgconfig - nls? ( sys-devel/gettext ) -" - -S=${WORKDIR}/vim-${PV} - -pkg_setup() { - # people with broken alphabets run into trouble. bug 82186. - unset LANG LC_ALL - export LC_COLLATE="C" - - # Gnome sandbox silliness. bug #114475. - mkdir -p "${T}"/home - export HOME="${T}"/home -} - -src_prepare() { - 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" - - # 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 - - # 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/\> "$c" ; 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 - fi - - if version_is_at_least 7.3.122 ; then - cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk - fi - - # 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 - - eapply_user -} - -src_configure() { - local myconf=() - - # Fix bug 37354: Disallow -funroll-all-loops on amd64 - # Bug 57859 suggests that we want to do this for all archs - filter-flags -funroll-all-loops - - # Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for - # everyone since previous flag filtering bugs have turned out to affect - # multiple archs... - replace-flags -O3 -O2 - - # Fix bug 18245: Prevent "make" from the following chain: - # (1) Notice configure.ac is newer than auto/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 - 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 - done - - use debug && append-flags "-DDEBUG" - - myconf=( - --with-features=huge - --disable-gpm - --enable-multibyte - $(use_enable acl) - $(use_enable cscope) - $(use_enable lua luainterp) - $(use_with luajit) - $(use_enable netbeans) - $(use_enable nls) - $(use_enable perl perlinterp) - $(use_enable racket mzschemeinterp) - $(use_enable ruby rubyinterp) - $(use_enable selinux) - $(use_enable session xsmp) - $(use_enable tcl tclinterp) - ) - - if use python ; then - py_add_interp() { - local v - - [[ ${EPYTHON} == python3* ]] && v=3 - myconf+=( - --enable-python${v}interp - vi_cv_path_python${v}="${PYTHON}" - ) - } - - python_foreach_impl py_add_interp - else - myconf+=( - --disable-pythoninterp - --disable-python3interp - ) - fi - - # --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" - fi - - # gvim's GUI preference order is as follows: - # aqua CARBON (not tested) - # -aqua gtk3 GTK3 - # -aqua -gtk3 gnome GNOME2 - # -aqua -gtk3 -gnome gtk GTK2 - # -aqua -gtk -gtk3 motif MOTIF - # -aqua -gtk -gtk3 -motif neXt NEXTAW - # -aqua -gtk -gtk3 -motif -neXt ATHENA - echo ; echo - if use aqua ; then - einfo "Building gvim with the Carbon GUI" - myconf+=( - --enable-darwin - --enable-gui=carbon - ) - elif use gtk3 ; then - myconf+=( --enable-gtk3-check ) - einfo "Building gvim with the gtk+-3 GUI" - myconf+=( --enable-gui=gtk3 ) - elif use gtk ; then - myconf+=( --enable-gtk2-check ) - 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 - einfo "Building gvim with the MOTIF GUI" - myconf+=( --enable-gui=motif ) - elif use neXt ; then - einfo "Building gvim with the neXtaw GUI" - myconf+=( --enable-gui=nextaw ) - else - einfo "Building gvim with the Athena GUI" - myconf+=( --enable-gui=athena ) - fi - echo ; echo - - # let package manager strip binaries - export ac_cv_prog_STRIP="$(type -P true ) faking strip" - - # keep prefix env contained within the EPREFIX - use prefix && myconf+=( --without-local-dir ) - - if [[ ${CHOST} == *-interix* ]]; then - # avoid finding of this function, to avoid having to patch either - # configure or the source, which would be much more hackish. - # after all vim does it right, only interix is badly broken (again) - export ac_cv_func_sigaction=no - fi - - econf \ - --with-modified-by=Gentoo-${PVR} \ - --with-vim-name=gvim \ - --with-x \ - "${myconf[@]}" -} - -src_compile() { - # The following allows emake to be used - emake -j1 -C src auto/osdef.h objects - - emake -} - -src_test() { - echo - 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 - ewarn "If the tests fail, your terminal may be left in a strange" - ewarn "state. Usually, running 'reset' will fix this." - echo - - # Don't let vim talk to X - unset DISPLAY - - # Make gvim not try to connect to X. See :help gui-x11-start in vim for how - # this evil trickery works. - 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 - - # 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" - 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. -} - -src_install() { - local vimfiles=/usr/share/vim/vim${VIM_VERSION/.} - - dobin src/gvim - dosym gvim /usr/bin/gvimdiff - dosym gvim /usr/bin/evim - dosym gvim /usr/bin/eview - dosym gvim /usr/bin/gview - dosym gvim /usr/bin/rgvim - dosym gvim /usr/bin/rgview - - 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 - - insinto /etc/vim - newins "${FILESDIR}"/gvimrc-r1 gvimrc - eprefixify "${ED}"/etc/vim/gvimrc - - doicon -s scalable "${FILESDIR}"/gvim.svg - - # bash completion script, bug #79018. - newbashcomp "${FILESDIR}"/${PN}-completion ${PN} - - # don't install vim desktop file - rm "${ED}"/usr/share/applications/vim.desktop || die "failed to remove vim.desktop" -} - -pkg_postinst() { - # Update documentation tags (from vim-doc.eclass) - update_vim_helptags - - # Update fdo mime stuff, bug #78394 - fdo-mime_desktop_database_update - - # Update icon cache - gnome2_icon_cache_update - - # Make convenience symlinks - update_vim_symlinks -} - -pkg_postrm() { - # Update documentation tags (from vim-doc.eclass) - update_vim_helptags - - # Update fdo mime stuff, bug #78394 - fdo-mime_desktop_database_update - - # Update icon cache - gnome2_icon_cache_update - - # Make convenience symlinks - update_vim_symlinks -} diff --git a/app-editors/gvim/gvim-8.0.1188.ebuild b/app-editors/gvim/gvim-8.0.1188.ebuild deleted file mode 100644 index b19e4d692308..000000000000 --- a/app-editors/gvim/gvim-8.0.1188.ebuild +++ /dev/null @@ -1,371 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -VIM_VERSION="8.0" -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 - inherit git-r3 - EGIT_REPO_URI="https://github.com/vim/vim.git" - EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV} -else - SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz - https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" -fi - -DESCRIPTION="GUI version of the Vim text editor" -HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim" - -SLOT="0" -LICENSE="vim" -IUSE="acl aqua cscope debug gnome gtk gtk3 lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl" -REQUIRED_USE=" - luajit? ( lua ) - python? ( ${PYTHON_REQUIRED_USE} ) -" - -RDEPEND=" - ~app-editors/vim-core-${PV} - >=app-eselect/eselect-vi-1.1 - >=sys-libs/ncurses-5.2-r2:0= - x11-libs/libICE - x11-libs/libSM - x11-libs/libXext - x11-libs/libXt - acl? ( kernel_linux? ( sys-apps/acl ) ) - !aqua? ( - gtk3? ( - x11-libs/gtk+:3 - x11-libs/libXft - ) - !gtk3? ( - gtk? ( - >=x11-libs/gtk+-2.6:2 - x11-libs/libXft - gnome? ( >=gnome-base/libgnomeui-2.6 ) - ) - !gtk? ( - motif? ( >=x11-libs/motif-2.3:0 ) - !motif? ( - neXt? ( x11-libs/neXtaw ) - !neXt? ( x11-libs/libXaw ) - ) - ) - ) - ) - cscope? ( dev-util/cscope ) - lua? ( - luajit? ( dev-lang/luajit:2= ) - !luajit? ( dev-lang/lua:0[deprecated] ) - ) - nls? ( virtual/libintl ) - perl? ( dev-lang/perl:= ) - python? ( ${PYTHON_DEPS} ) - racket? ( dev-scheme/racket ) - ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) ) - selinux? ( sys-libs/libselinux ) - session? ( x11-libs/libSM ) - tcl? ( dev-lang/tcl:0= ) -" -DEPEND="${RDEPEND} - dev-util/ctags - sys-devel/autoconf - virtual/pkgconfig - nls? ( sys-devel/gettext ) -" - -S=${WORKDIR}/vim-${PV} - -pkg_setup() { - # people with broken alphabets run into trouble. bug 82186. - unset LANG LC_ALL - export LC_COLLATE="C" - - # Gnome sandbox silliness. bug #114475. - mkdir -p "${T}"/home || die - export HOME="${T}"/home - - use python && python-single-r1_pkg_setup -} - -src_prepare() { - 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 -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 || 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 -e \ - 's/\> "$c" || die "echo failed" - done - - # Try to avoid sandbox problems. Bug #114475. - 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 - - 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 - sed -i -e \ - "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ - "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' - - eapply_user -} - -src_configure() { - local myconf=() - - # Fix bug 37354: Disallow -funroll-all-loops on amd64 - # Bug 57859 suggests that we want to do this for all archs - filter-flags -funroll-all-loops - - # Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for - # everyone since previous flag filtering bugs have turned out to affect - # multiple archs... - replace-flags -O3 -O2 - - # Fix bug 18245: Prevent "make" from the following chain: - # (1) Notice configure.ac is newer than auto/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 -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. - 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" - - myconf=( - --with-features=huge - --disable-gpm - --enable-multibyte - $(use_enable acl) - $(use_enable cscope) - $(use_enable lua luainterp) - $(use_with luajit) - $(use_enable netbeans) - $(use_enable nls) - $(use_enable perl perlinterp) - $(use_enable python pythoninterp) - $(use_enable python python3interp) - $(use_enable racket mzschemeinterp) - $(use_enable ruby rubyinterp) - $(use_enable selinux) - $(use_enable session xsmp) - $(use_enable tcl tclinterp) - ) - - # --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 -e \ - '/# define FEAT_CSCOPE/d' src/feature.h || die "couldn't disable cscope" - fi - - # gvim's GUI preference order is as follows: - # aqua CARBON (not tested) - # -aqua gtk3 GTK3 - # -aqua -gtk3 gnome GNOME2 - # -aqua -gtk3 -gnome gtk GTK2 - # -aqua -gtk -gtk3 motif MOTIF - # -aqua -gtk -gtk3 -motif neXt NEXTAW - # -aqua -gtk -gtk3 -motif -neXt ATHENA - echo ; echo - if use aqua; then - einfo "Building gvim with the Carbon GUI" - myconf+=( - --enable-darwin - --enable-gui=carbon - ) - elif use gtk3; then - myconf+=( --enable-gtk3-check ) - einfo "Building gvim with the gtk+-3 GUI" - myconf+=( --enable-gui=gtk3 ) - elif use gtk; then - myconf+=( --enable-gtk2-check ) - 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 - einfo "Building gvim with the MOTIF GUI" - myconf+=( --enable-gui=motif ) - elif use neXt; then - einfo "Building gvim with the neXtaw GUI" - myconf+=( --enable-gui=nextaw ) - else - einfo "Building gvim with the Athena GUI" - myconf+=( --enable-gui=athena ) - fi - echo ; echo - - # let package manager strip binaries - export ac_cv_prog_STRIP="$(type -P true ) faking strip" - - # keep prefix env contained within the EPREFIX - use prefix && myconf+=( --without-local-dir ) - - if [[ ${CHOST} == *-interix* ]]; then - # avoid finding of this function, to avoid having to patch either - # configure or the source, which would be much more hackish. - # after all vim does it right, only interix is badly broken (again) - export ac_cv_func_sigaction=no - fi - - econf \ - --with-modified-by=Gentoo-${PVR} \ - --with-vim-name=gvim \ - --with-x \ - "${myconf[@]}" -} - -src_compile() { - # The following allows emake to be used - emake -j1 -C src auto/osdef.h objects - - emake -} - -src_test() { - echo - 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 - ewarn "If the tests fail, your terminal may be left in a strange" - ewarn "state. Usually, running 'reset' will fix this." - echo - - # Don't let vim talk to X - unset DISPLAY - - # Make gvim not try to connect to X. See :help gui-x11-start in vim for how - # this evil trickery works. - ln -s "${S}"/src/gvim "${S}"/src/testvim || die - - # Make sure our VIMPROG is used. - 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 -} - -# Call eselect vi update with --if-unset -# to respect user's choice (bug 187449) -eselect_vi_update() { - einfo "Calling eselect vi update..." - eselect vi update --if-unset - eend $? -} - -src_install() { - local vimfiles=/usr/share/vim/vim${VIM_VERSION/.} - - dobin src/gvim - dosym gvim /usr/bin/gvimdiff - dosym gvim /usr/bin/evim - dosym gvim /usr/bin/eview - dosym gvim /usr/bin/gview - dosym gvim /usr/bin/rgvim - dosym gvim /usr/bin/rgview - - 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 || 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 - eprefixify "${ED}"/etc/vim/gvimrc - - doicon -s scalable "${FILESDIR}"/gvim.svg - - # bash completion script, bug #79018. - newbashcomp "${FILESDIR}"/${PN}-completion ${PN} - - # don't install vim desktop file - rm -v "${ED}"/usr/share/applications/vim.desktop || die "failed to remove vim.desktop" -} - -pkg_postinst() { - # Update documentation tags (from vim-doc.eclass) - update_vim_helptags - - # Update fdo mime stuff, bug #78394 - xdg_desktop_database_update - - # Update icon cache - gnome2_icon_cache_update - - # Call eselect vi update - eselect_vi_update -} - -pkg_postrm() { - # Update documentation tags (from vim-doc.eclass) - update_vim_helptags - - # Update fdo mime stuff, bug #78394 - xdg_desktop_database_update - - # Update icon cache - gnome2_icon_cache_update - - # Call eselect vi update - eselect_vi_update -} diff --git a/app-editors/ne/Manifest b/app-editors/ne/Manifest index 96e9bc5c1bfe..60c4a5c26302 100644 --- a/app-editors/ne/Manifest +++ b/app-editors/ne/Manifest @@ -1,6 +1,5 @@ DIST ne-3.0.1.tar.gz 1193311 BLAKE2B a58afd00660a7266a37fb0626ddd326fa3366eede6d44cfdd3a002fa3c90db3cbfd852a414c9e8f091e1eac0786cb4d296d1b26144d8afd1d5118da29823603f SHA512 3750140a49c7424e92e509137d5f31d305b81d41939a2578f6a26065216ebd1aa444b0e8d7e79dd09cc525e1055cda4d756f21ec810f860063d2eec861ea8273 DIST ne-3.1.1.tar.gz 1219488 BLAKE2B 6d778c1b2e9e18154322a6b327cc4a2711619c353eb82073ad00f3e40b3b8e61f7ee7ce6fee3f0e02b38d001dc26365f44b63f70ddd6089f186a52bdf4c69a17 SHA512 e572ca2a0cd39a59adaea911c80e083872103d90a586117efcabbc3881cf1a48d0c3d06f20eebcd9254177afafef15fd581778cd251b1b25b64ad68a5f8afc37 EBUILD ne-3.0.1-r1.ebuild 1111 BLAKE2B 0792d5d622570bcaca6c63b858ffacf6402ae26dbd26cd2e659f54ac8cf9ef9b0560bf98d50946f18d599f77838de63aaaa8a7f68f87d47dc127ab3f3be20672 SHA512 bfba8a0823cefb302869bc454b83ab1e1deb23d2eff52d779a453d20b3a250327e9e5003aca3c1d75c7048572f2ddbd2869af9687ff12b4667d110bbeb9bb7ec -EBUILD ne-3.0.1.ebuild 1101 BLAKE2B 5f02fc5c2536c1655470e4918176a0d840f8a1717b54089c8ad4e32ea754529629c2fa78651795bceaba8b55c71c88d95cca680c57d0c17a0a65254b4fb65e4f SHA512 13bafaacb212b744bc41aa91e42c56a3ca266f564f98ddf974005eba08924d71aab27364e8777811030884717585bd9952bc7e1402bd02ada7082ec777cfa621 EBUILD ne-3.1.1.ebuild 1111 BLAKE2B 0792d5d622570bcaca6c63b858ffacf6402ae26dbd26cd2e659f54ac8cf9ef9b0560bf98d50946f18d599f77838de63aaaa8a7f68f87d47dc127ab3f3be20672 SHA512 bfba8a0823cefb302869bc454b83ab1e1deb23d2eff52d779a453d20b3a250327e9e5003aca3c1d75c7048572f2ddbd2869af9687ff12b4667d110bbeb9bb7ec MISC metadata.xml 249 BLAKE2B bd3f8cd51cd7f93c68a6ae940a7ac6a572bbd81ce9a4011bede9117025d2ec55636679e49269ca3df422ac132cc7fbfc1c982a707e30a70479b33fa0a21b0350 SHA512 40160ace781dd306147377e882be12701aa73684143080278ac55ba434185e3673aeadad11224743eefa70962ed005db0337e2ef2b5dbe6eb9fdec01bf72283c diff --git a/app-editors/ne/ne-3.0.1.ebuild b/app-editors/ne/ne-3.0.1.ebuild deleted file mode 100644 index 3641ef3cf258..000000000000 --- a/app-editors/ne/ne-3.0.1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils flag-o-matic toolchain-funcs - -DESCRIPTION="the nice editor, easy to use for the beginner and powerful for the wizard" -HOMEPAGE="http://ne.di.unimi.it/" -SRC_URI="${HOMEPAGE}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE=tinfo - -DEPEND=" - >=sys-libs/ncurses-5.2[tinfo?] -" -RDEPEND=" - ${DEPEND} - dev-lang/perl -" - -src_prepare() { - sed -i -e 's/-O3//' src/makefile || die -} - -src_configure() { - if use tinfo; then - sed -i -e 's|-lcurses|-ltinfo|g' src/makefile || die - else - sed -i -e 's|-lcurses|-lncurses|g' src/makefile || die - fi -} - -src_compile() { - append-cflags -std=c11 - emake -C src CC="$(tc-getCC)" \ - NE_GLOBAL_DIR="/usr/share/ne" \ - OPTS="${CFLAGS}" \ - ne || die -} - -src_install() { - dobin src/ne - - insinto /usr/share/ne/syntax - doins syntax/*.jsf - - doman doc/ne.1 - dohtml -r doc/html/. - dodoc CHANGES README.md NEWS doc/*.{txt,pdf,texinfo} doc/default.* -} diff --git a/app-editors/qemacs/Manifest b/app-editors/qemacs/Manifest index e9bd4013990d..bc1416f3d51f 100644 --- a/app-editors/qemacs/Manifest +++ b/app-editors/qemacs/Manifest @@ -1,16 +1,10 @@ -AUX qemacs-0.3.2_pre20070226-tty_utf8.patch 1128 BLAKE2B ac0fdec59a95d42caf986a47cb377e924bd21a927b456bdd58d619a9ed4339844090bd770291ccdb8ad64f3e27ede4036788dbaaa0d2c65991c1cece1fef25bc SHA512 d2476fed6cb9fcd223317c2dc744a41efa1e99426f8240ae7182292ae0a2ef5c3b7114392174f6c28c8da0009d0ac6dcd2885418654499f8eb41d5e94eb88010 -AUX qemacs-0.4.0_pre20080605-Makefile.patch 754 BLAKE2B d2d08f4a8d8fc3f0eb42905ccdbb8ff88adcec9e360d91d70d980854e130113636c8eac20e528ff320578c15183f119d1e4b9b90b4a3d3ce9a7dfb773d9dbde7 SHA512 b6468498d2489dcf46fdba654e6c988e9c9a9cad89d977800d1e00a0b97fba456b7cf613fc919bfc5706eeec1dce578a714abf85a914af99f3fa6c8c6dc673cc -AUX qemacs-0.4.0_pre20080605-make_backup.patch 2151 BLAKE2B 06bca7e8b36559c8ec6061db291ab597c85b49cb7c4079cc2f3cd5a8d414c49b60324d34090ac596f47f5dadae96145ab21b4665624b7f9ca15e9103cdece11e SHA512 e20b59067d344a84193f8de02471cc04d8f2e91601ae70fa11dcda0e85c65aa68ea33c109feca6c62adae098f4d691fcf5c2be205e46cc3023119821a69a4775 -AUX qemacs-0.4.0_pre20090420-nostrip.patch 1155 BLAKE2B fe8f090f84b9d8a35395abb5f397dbbf575542176c9827edacbe83165078bcb95f23d17533911d08add97bfb885eb168e4289ab8f628b24416b660a2aa9d94b6 SHA512 6c6438c8c6a17c5b29bc117a695cbc5e0287ab3a20243f9dbe7d487cd67e9c31d7a63a3828d8c5d3abfd9620582167bb4633c6896b6862d9fe6a9c2ecfeb71da AUX qemacs-0.4.1_pre20150916-Makefile.patch 799 BLAKE2B 1a75b0b1f6ec433bb130fa3fcd142eacfdd2665117e6efdaa28dee0d2bbf394e5c270241be5719d64f49facb115febb8f99de399b4561e6921bc7f1293ff59a0 SHA512 1bb412ffc530b8d00569618b8a7d87d65b2baa9a3aacf83b377c41ea29b976ea0f84161d979f06d79a27b6b5b1192135917772c3af2bab66fb28a58c3006dd18 AUX qemacs-0.4.1_pre20150916-nostrip.patch 1162 BLAKE2B a84d798d0a2d97b6413b10c075daa9f28b952ee655192e01cf6fd788e003785c0ad243bacbda16be071ac2e2a3ff38e7e005a008c88e475483e74d67291f8f4f SHA512 9495ea9799a6b728a2f25545dd2216758247b70985bbf8d1d0cccff1d152ee1f14575e4ca02799cfe105ea0ac799c1865414f30270c3f2373601ac02b1e44770 AUX qemacs-0.4.1_pre20170225-Makefile.patch 954 BLAKE2B 16fce167962370753730dbe61ee5cbfa4d1e7b208bd350e433eeeb1bfe9eef2892a4532e83675b6c40344aed04df38c8236a01a7ff3db5fa6ec5592ec1225c18 SHA512 8146d383e53df6a5c540581925d85c2eff3dafe5cd78a23a784f3fc4fd41e23804f1287dc68597b33582f9beacef57df4a80a1930399b66566c77ff5e17eb227 AUX qemacs-0.4.1_pre20170225-manpage.patch 372 BLAKE2B 68e2d415700e576c5706788036665271cffee46a4b896573de3691c3e8cc96db9972fd0f170033b9d85fb048578c8cf3502a53a5c4ad8b7c9858c0771e195a42 SHA512 1c81e3570a2d00df04fa9a4dfae404be2f1c684b9b86ef67aa3f13a4b6f734d99d768350d41c75dc8c2874ccf853d021e497c87c751d86e2df1015f42fe97889 AUX qemacs-0.4.1_pre20170225-nostrip.patch 1771 BLAKE2B af8ad554ea5dbdcd8e7a3df32a4ff5402e84f56642a74f228b0c5be8166895b82b90e291f043a5e18a757b6e6de69ed50af3950c719f2b40be1e3d1e031c2031 SHA512 9ad3c3cd4a7744894718099ff8df2648e11385c6926a137f3f04ed33ef449d658cfb873476276bc52de7a7cee5ed2a2319893d8f47e7a2413d00d61378123656 -DIST qemacs-0.4.0_pre20090420.tar.bz2 1393436 BLAKE2B 73cc34e711957db31d765e07712b5fb0ec94523c8d3a175beec95ca244929335088c69156a0f9f8c4875868c1add52a1c5f76e74a07f70d89f2c1c5d80917669 SHA512 4595e34d3a83cbd7f25514dd96b7578976b30de80eb19b1391448ecdb9c06d24088880978961e5abb94b3f715057e7563ae0976d704bc5afaaf83e62a67e8dd4 DIST qemacs-0.4.1_pre20150916.tar.xz 1136592 BLAKE2B aff8875b81bd51f77bebcb4dfe60ed0d4396a05af1f42e6b8765e15f9e04e00162924c3514a9ea1e8cb8c0b9ecd2a4112b9d7a46b7d156c032d37d381f2ae0f0 SHA512 e9775ff3dfef6d6b6b263029a620e6575f9f4718b94c0acfcddc8e5da8cd835e57dfbd5fbd948778135b609ae0588924fc9a727b2e763a25148aa27886a9f467 DIST qemacs-0.4.1_pre20170225.tar.xz 1147408 BLAKE2B 369f3c5ff1b1f7b22bbd1f70f0c150e425a5b68828e62db427e4b41c58c8ee9ae0449a83693e9354d88fc482691d7a5f3661360ef602aeaba963776c4725b894 SHA512 a17c8901c917f91401e16b4f857735957ab0d3533d9dcc7a0decf768f453b68023f45e1241225a84d35ba793beb69754e0f2caa857165f8223882d5041d56c99 -EBUILD qemacs-0.4.0_pre20090420-r1.ebuild 1910 BLAKE2B 101e654b4c911d5034418c40b51ed4fd804bca329ac0130beda4eeaa63e3bb7951900561f72408bdbee63adc3d664441439a55ee0ce6a9a8fd4c0ae59bd88142 SHA512 60c8fc230db516b9bc1e80cfac47f2917014db1b36e6f468beb460b5799e4cfba3426400dcf5ae515d007675b55a865c82eb6fdafd91e3b74390e4f7c673254a EBUILD qemacs-0.4.1_pre20150916.ebuild 1664 BLAKE2B 9bb83316a5059a92c0eb04a1c07336ac0976b11778f60b0898bc79ba1a3edc1eb722327b08ba3bf766b67cf5a5f33d3407cfe86329aca377a62234f69b083b8b SHA512 9ca5f4c41d4232051070547d8591235c1ac4d3e5dbba738d58b5668690935f9e106ce1a4921d7004cf4bbc7ef33f717b782a8246d7f402fc9c35a356baa720f9 EBUILD qemacs-0.4.1_pre20170225.ebuild 1493 BLAKE2B 7f05bee8c264e4c3f246eaa4ce35fc443ba42db076a7fa5eb693ec3d75186824c3a0faa2d77d5d841a5c66e6670f6856818ba1fd465564235f89c591f9e7d9de SHA512 6665d0222f86f4bbd658d8ee754276f5bb9c828bb3e73ea0f9a93b30f7e8300074418d36d88036bcbcb8c67dc31e96f3b38c477003c1e617c781645741c723e6 MISC metadata.xml 1937 BLAKE2B 1367de4b5e027102ce6a7720129bf21bd6d9556d748f0770d005ee0b9a4454f5ad0d27d0d25e8c7b97bc3c0bb796a78df636479d33bf6bd5acee36498e8a8a81 SHA512 a26f40107a0616980d3722685b1491eee4c606a685e78bbc23a62de6c9b67cf15ff3ac92cbc935a38d280844a0d15c21f92ee7bdbb28218f8ae664bbc526feac diff --git a/app-editors/qemacs/files/qemacs-0.3.2_pre20070226-tty_utf8.patch b/app-editors/qemacs/files/qemacs-0.3.2_pre20070226-tty_utf8.patch deleted file mode 100644 index 1f51ada5c2b7..000000000000 --- a/app-editors/qemacs/files/qemacs-0.3.2_pre20070226-tty_utf8.patch +++ /dev/null @@ -1,43 +0,0 @@ -utf8 input in tty.c -http://lists.gnu.org/archive/html/qemacs-devel/2004-03/msg00000.html -http://bugs.gentoo.org/62829 - ---- qemacs-orig/tty.c 2007-02-08 00:27:33.000000000 +0100 -+++ qemacs/tty.c 2007-02-26 15:07:41.000000000 +0100 -@@ -78,7 +78,6 @@ - /* input handling */ - enum InputState input_state; - int input_param; -- int utf8_state; - int utf8_index; - unsigned char buf[10]; - char *term_name; -@@ -374,15 +373,19 @@ - - /* charset handling */ - if (s->charset == &charset_utf8) { -- if (ts->utf8_state == 0) { -- const char *p; -- p = (const char *)ts->buf; -- ch = utf8_decode(&p); -- } else { -- ts->utf8_state = utf8_length[ts->buf[0]] - 1; -- ts->utf8_index = 0; -- return; -- } -+ /* Make sure utf8 input works correctly 20040314 */ -+ ts->utf8_index++; -+ -+ if (utf8_length[ts->buf[0]] == ts->utf8_index) {; -+ const char *p; -+ p = (const char *)ts->buf; -+ ch = utf8_decode(&p); -+ ts->utf8_index = 0; -+ } -+ else { -+ return; -+ } -+ - } else { - ch = ts->buf[0]; - } diff --git a/app-editors/qemacs/files/qemacs-0.4.0_pre20080605-Makefile.patch b/app-editors/qemacs/files/qemacs-0.4.0_pre20080605-Makefile.patch deleted file mode 100644 index 73c3f68b13a3..000000000000 --- a/app-editors/qemacs/files/qemacs-0.4.0_pre20080605-Makefile.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- Makefile.orig 2009-03-07 21:27:48.000000000 +0100 -+++ Makefile 2009-03-07 21:28:43.000000000 +0100 -@@ -19,32 +19,6 @@ - - include config.mak - --ifeq ($(CC),gcc) -- CFLAGS := -Wall -g -O2 -funsigned-char -- # do not warn about zero-length formats. -- CFLAGS += -Wno-format-zero-length -- LDFLAGS := -g --endif -- --#include local compiler configuration file ---include cflags.mk -- --ifdef TARGET_GPROF -- CFLAGS += -p -- LDFLAGS += -p --endif -- --TLDFLAGS := $(LDFLAGS) -- --ifdef TARGET_ARCH_X86 -- #CFLAGS+=-fomit-frame-pointer -- ifeq ($(GCC_MAJOR),2) -- CFLAGS+=-m386 -malign-functions=0 -- else -- CFLAGS+=-march=i386 -falign-functions=0 -- endif --endif -- - DEFINES=-DHAVE_QE_CONFIG_H - - ######################################################## diff --git a/app-editors/qemacs/files/qemacs-0.4.0_pre20080605-make_backup.patch b/app-editors/qemacs/files/qemacs-0.4.0_pre20080605-make_backup.patch deleted file mode 100644 index cdfe4c439db8..000000000000 --- a/app-editors/qemacs/files/qemacs-0.4.0_pre20080605-make_backup.patch +++ /dev/null @@ -1,68 +0,0 @@ -Add make-backup-files command for backup toggling, from upstream mailing list: -http://lists.gnu.org/archive/html/qemacs-devel/2004-11/msg00007.html -http://bugs.gentoo.org/75052 - ---- buffer.c.orig 2009-03-07 21:14:02.000000000 +0100 -+++ buffer.c 2009-03-07 21:15:40.000000000 +0100 -@@ -1657,12 +1657,14 @@ - if (stat(filename, &st) == 0) - mode = st.st_mode & 0777; - -- /* backup old file if present */ -- if (strlen(filename) < MAX_FILENAME_SIZE - 1) { -+ /* backup old file if present and make-backup-files is on */ -+ if(mbf == 1) { -+ if (strlen(filename) < MAX_FILENAME_SIZE - 1) { - if (snprintf(buf1, sizeof(buf1), "%s~", filename) < ssizeof(buf1)) { - // should check error code - rename(filename, buf1); - } -+ } - } - - /* CG: should pass mode to buffer_save */ ---- qe.c.orig 2009-03-07 21:14:09.000000000 +0100 -+++ qe.c 2009-03-07 21:17:01.000000000 +0100 -@@ -71,6 +71,7 @@ - static int screen_height = 0; - static int no_init_file; - static const char *user_option; -+mbf = 1; - - /* mode handling */ - -@@ -5316,6 +5317,14 @@ - do_refresh(qs->first_window); - } - -+static void make_backup_files(EditState *s) { -+ if(mbf == 1) { -+ mbf = 0; -+ } else { -+ mbf = 1; -+ } -+} -+ - /* compute default path for find/save buffer */ - static void get_default_path(EditState *s, char *buf, int buf_size) - { ---- qeconfig.h.orig 2009-03-07 21:14:19.000000000 +0100 -+++ qeconfig.h 2009-03-07 21:17:37.000000000 +0100 -@@ -192,6 +192,7 @@ - "downcase-region", do_changecase_region, ESi, -1, "*v") - CMD3( KEY_CTRLX(KEY_CTRL('u')), KEY_NONE, - "upcase-region", do_changecase_region, ESi, 1, "*v") -+ CMD0( KEY_NONE, KEY_NONE, "make-backup-files", make_backup_files) - - /*---------------- Command handling ----------------*/ - ---- qe.h.orig 2009-03-07 21:14:26.000000000 +0100 -+++ qe.h 2009-03-07 21:17:53.000000000 +0100 -@@ -1765,6 +1765,7 @@ - /* image.c */ - void fill_border(EditState *s, int x, int y, int w, int h, int color); - int qe_bitmap_format_to_pix_fmt(int format); -+int mbf; - - /* shell.c */ - EditBuffer *new_shell_buffer(EditBuffer *b0, const char *name, diff --git a/app-editors/qemacs/files/qemacs-0.4.0_pre20090420-nostrip.patch b/app-editors/qemacs/files/qemacs-0.4.0_pre20090420-nostrip.patch deleted file mode 100644 index 120b09c2129d..000000000000 --- a/app-editors/qemacs/files/qemacs-0.4.0_pre20090420-nostrip.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- qemacs-orig/Makefile -+++ qemacs/Makefile -@@ -151,7 +151,6 @@ - qe$(EXE): qe_g$(EXE) Makefile - rm -f $@ - cp $< $@ -- -$(STRIP) $@ - @ls -l $@ - echo `size $@` `wc -c $@` qe $(OPTIONS) \ - | cut -d ' ' -f 7-10,13,15-40 >> STATS -@@ -165,7 +164,6 @@ - tqe$(EXE): tqe_g$(EXE) Makefile - rm -f $@ - cp $< $@ -- -$(STRIP) $@ - @ls -l $@ - echo `size $@` `wc -c $@` tqe $(OPTIONS) \ - | cut -d ' ' -f 7-10,13,15-40 >> STATS -@@ -329,7 +327,7 @@ - $(INSTALL) -m 755 -d $(DESTDIR)$(prefix)/bin - $(INSTALL) -m 755 -d $(DESTDIR)$(prefix)/man/man1 - $(INSTALL) -m 755 -d $(DESTDIR)$(prefix)/share/qe -- $(INSTALL) -m 755 -s qe$(EXE) $(DESTDIR)$(prefix)/bin/qemacs$(EXE) -+ $(INSTALL) -m 755 qe$(EXE) $(DESTDIR)$(prefix)/bin/qemacs$(EXE) - ln -sf qemacs $(DESTDIR)$(prefix)/bin/qe$(EXE) - ifdef CONFIG_FFMPEG - ln -sf qemacs$(EXE) $(DESTDIR)$(prefix)/bin/ffplay$(EXE) -@@ -337,7 +335,7 @@ - $(INSTALL) -m 644 kmaps ligatures $(DESTDIR)$(prefix)/share/qe - $(INSTALL) -m 644 qe.1 $(DESTDIR)$(prefix)/man/man1 - ifdef CONFIG_HTML -- $(INSTALL) -m 755 -s html2png$(EXE) $(DESTDIR)$(prefix)/bin -+ $(INSTALL) -m 755 html2png$(EXE) $(DESTDIR)$(prefix)/bin - endif - - uninstall: diff --git a/app-editors/qemacs/qemacs-0.4.0_pre20090420-r1.ebuild b/app-editors/qemacs/qemacs-0.4.0_pre20090420-r1.ebuild deleted file mode 100644 index 44aa76fbf48a..000000000000 --- a/app-editors/qemacs/qemacs-0.4.0_pre20090420-r1.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils flag-o-matic toolchain-funcs - -DESCRIPTION="QEmacs is a very small but powerful UNIX editor" -HOMEPAGE="https://savannah.nongnu.org/projects/qemacs" -SRC_URI="mirror://gentoo/${P}.tar.bz2" - -LICENSE="LGPL-2.1+ GPL-2+" -SLOT="0" -KEYWORDS="amd64 arm ~ppc x86" -IUSE="X png unicode xv" -RESTRICT="test" - -RDEPEND=" - X? ( x11-libs/libX11 - x11-libs/libXext - xv? ( x11-libs/libXv ) ) - png? ( >=media-libs/libpng-1.2:0= )" - -DEPEND="${RDEPEND} - >=app-text/texi2html-5" - -S="${WORKDIR}/${PN}" - -src_prepare() { - # Removes forced march setting and align-functions on x86, as they - # would override user's CFLAGS.. - epatch "${FILESDIR}/${PN}-0.4.0_pre20080605-Makefile.patch" - # Make backup files optional - epatch "${FILESDIR}/${PN}-0.4.0_pre20080605-make_backup.patch" - # Suppress stripping - epatch "${FILESDIR}/${P}-nostrip.patch" - - use unicode && epatch "${FILESDIR}/${PN}-0.3.2_pre20070226-tty_utf8.patch" - - # Change the manpage to reference a /real/ file instead of just an - # approximation. Purely cosmetic! - sed -i -e "s,^/usr/share/doc/qemacs,&-${PVR}," qe.1 || die - - # Fix compability with >=app-text/texi2html-5 - sed -i -e "/texi2html/s,-number,&-sections," Makefile || die -} - -src_configure() { - # when using any other CFLAGS than -O0, qemacs will segfault on startup, - # see bug 92011 - replace-flags "-O?" -O0 - econf --cc="$(tc-getCC)" \ - $(use_enable X x11) \ - $(use_enable png) \ - $(use_enable xv) -} - -src_compile() { - # Does not support parallel building. - emake -j1 -} - -src_install() { - emake install DESTDIR="${D}" - dodoc Changelog README TODO config.eg - dohtml *.html - - # Fix man page location - mv "${D}"/usr/{,share/}man || die - - # Install headers so users can build their own plugins. - insinto /usr/include/qe - doins *.h - insinto /usr/include/qe/libqhtml - doins libqhtml/*.h -} diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest index 322347e4aa7c..9363a718464a 100644 --- a/app-editors/vim/Manifest +++ b/app-editors/vim/Manifest @@ -1,13 +1,8 @@ AUX vim-completion 1004 BLAKE2B dea4230a8d2a57fd1af18df4037504a44382a97ff672410e987cb287d802c964baa502da4d08f09cb8684307481fec503c1d8cae7f4f6e61500f1cb06033a2c4 SHA512 dccf663a93efdf2ec3be69f49e418a0ef66277e2fae6c12287adde772592e19f5130388a04242121846f1dae39f78b30780c99dc6fe1b847f4f08354bda3cc41 -DIST vim-8.0.0106-gentoo-patches.tar.bz2 2281 BLAKE2B 8e10c0c56ad97cbae0677ec91b0b35359f6e08b5eb542b00028fd0e243a075551adab4e140a90930cbce4549c3c4bc79a40c0e1a6c13aae18f67d6fc55a80e0e SHA512 39edd9f518c230d2b0486b18aa155572a9eada4a5e21108573d6e66e2eef1276f23b77d766648f018c9cf973a7d03712d8861be6ea13255d7b389912d554a47a -DIST vim-8.0.0386.tar.gz 13000882 BLAKE2B c38c1b75334cae916f76562ec5a06d59c4f2df6123d4b27a0a854dd8ecd9ae6f5d008a94137abe6217fc28d233077d636d30f2c26a5a139ff35f50cb52204f79 SHA512 3169ea4dbc836c724f63d99cd345227f870a3a922beba84a6b42011685c0dd209f6bba8c69af0650c9a57bb47fc541e1150ca8cefb21fcada022259bf4c94a66 DIST vim-8.0.0938-gentoo-patches.tar.bz2 2316 BLAKE2B 05a87f32fc5cc65e7f5e4e5a87c654b2040ad39f1555ddde7e0e6f473dc8b520916a795406bb6bbeaf5e7ae8748aacebe7a9679461e48802e69417e945eea827 SHA512 a6062be5e6a5c5b437081312df5742353242b5171bf26da04aa6ca216d2b142b2411a88bc1edd460d28e00a59a210c8e1729e801fac6f1efd86bb2e437a56a2b -DIST vim-8.0.1188.tar.gz 13363260 BLAKE2B 545b2d6e8322b27967c974bb960f4e5ea2c6811d2649ac4c008eb8e6af78fe555a035657704af40026f96f12f83e3cebe435e90d21d7da87980446710424f79f SHA512 9c3733aa894c276de593d6144ee0aaf251092a11f4d0ac603d3d49a282ac6176aa4e88eccfd2527ff53b386bdd0177a85c0942367d68a652b5ca4040390ba49b DIST vim-8.0.1298.tar.gz 13395459 BLAKE2B 4b6e3c4443cd675dc3727e8609b89c422f66c7d32908b5136ee312d48427568a8236214c85135242269b6575e0e1336b0973395a6372664435f8bae4d7bee843 SHA512 7704c493359c1a922f876e4d6f3b4ad265d8ce974a59d51a39e5a4424251105250ffc803bcf6c6750daeb5e6376cbbfd24557b075eacf2b0274d7c432db2f681 DIST vim-8.0.1428.tar.gz 13415243 BLAKE2B 88f86c371d0a644212b9e4dc1a15d61244847037f36262a225c361bfc2799b741c128de21ac92bb3fb4a4955894e46d34dc01baa7cbf58f1371d772b36887103 SHA512 f635c53c7e2ca808dc1cb424e6e4b16d8c41c66a86c3c7584444dab3d2482904795fea7c071d65862ae6ac6b2b66b7ad5ac832e1e30f4624d46f220c6f41e2e9 DIST vim-8.0.1645.tar.gz 13535252 BLAKE2B a5c7463e85eed12825bdf46d15eb7e7513d62831eba76cbb90af875010b33662b7a6ef2c4c5cecddface415d75e97caf0a670e69835ecd3b4a89704f3b18b905 SHA512 367b9e205e776f84fcfbb92725afd5e7aa66898110d46dbea1a33f7b74c239559e829b5104c45360539c8f2b23c375ed59ccea7ee35a5dd10770400d9a7be085 -EBUILD vim-8.0.0386.ebuild 10112 BLAKE2B be488042fead28b68b34d1a69e5243beca8815f298a01502bcf34d43f9845d760cd1f14eb4c2be5d73595fe20a53cad116a6009eab2a99c016f9c25280f45493 SHA512 7dd69bd0129c62720819eb65888c89b0e6670964d6558be11ad3a694a4d1d6c09e3d5c3c1f102d99fde71ac645cc6f026e4b2acfde9192f4b768dbaaf3a52d82 -EBUILD vim-8.0.1188.ebuild 8782 BLAKE2B d503bbec09a4710ecae79ed853f8ff733c89777ec23b08316d104d35fbedb81a1e8557aaaf69f104dab6969d9f09cdd0ea8ba223527a7e308de965ae923899cf SHA512 846b01412281def6ea63f4ec2bb313e8619849d4a8beedf7172f71c982000db7f3afb5e39662394609d95a3a537afd751cefacd49102e431a5a6ffe673dd0065 EBUILD vim-8.0.1298.ebuild 8772 BLAKE2B 53c2fcb911fc27374cd00f4a1c5df9c30245540da78e4e3468d020fcd3149d0a0c57273eb1f4d38bd3f416604c1d29e08e49e8cf5a820f99bc28e82d1e999b6a SHA512 f200661012bc5505b0261aed18d360cfada37e93f84a30b74696c26175d7b369be9f0380c9b2db28324b4a8e0ae5fc888a328ae94a58e18d5112fc15b1d8cc5f EBUILD vim-8.0.1428.ebuild 8782 BLAKE2B d503bbec09a4710ecae79ed853f8ff733c89777ec23b08316d104d35fbedb81a1e8557aaaf69f104dab6969d9f09cdd0ea8ba223527a7e308de965ae923899cf SHA512 846b01412281def6ea63f4ec2bb313e8619849d4a8beedf7172f71c982000db7f3afb5e39662394609d95a3a537afd751cefacd49102e431a5a6ffe673dd0065 EBUILD vim-8.0.1645.ebuild 8800 BLAKE2B 1eb5e4864b0e83c4c820b45e5791c2c22e8667799d9296d83f59b5cf07c263f2873deec04f6586e32bdca9dbd958876a971b67cc73b8f8bf3fd897692e60bcf0 SHA512 60d07415e38176b2ee9f16dc5c4f0d4da821e8505c0723791d1a38342bc1d1ab59ad8348f81950367859392849d69b385514fc16b1741cf95357f75291a84d83 diff --git a/app-editors/vim/vim-8.0.0386.ebuild b/app-editors/vim/vim-8.0.0386.ebuild deleted file mode 100644 index 796d1755732e..000000000000 --- a/app-editors/vim/vim-8.0.0386.ebuild +++ /dev/null @@ -1,348 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -VIM_VERSION="8.0" -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) -PYTHON_REQ_USE=threads -inherit eutils vim-doc flag-o-matic fdo-mime versionator bash-completion-r1 python-r1 - -if [[ ${PV} == 9999* ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/vim/vim.git" -else - SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~radhermit/vim/vim-8.0.0106-gentoo-patches.tar.bz2" - KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi - -DESCRIPTION="Vim, an improved vi-style text editor" -HOMEPAGE="http://www.vim.org/ https://github.com/vim/vim" - -SLOT="0" -LICENSE="vim" -IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl vim-pager" -REQUIRED_USE=" - luajit? ( lua ) - python? ( - || ( $(python_gen_useflags '*') ) - ?? ( $(python_gen_useflags 'python2*') ) - ?? ( $(python_gen_useflags 'python3*') ) - ) -" - -RDEPEND=" - >=app-eselect/eselect-vi-1.1 - >=sys-libs/ncurses-5.2-r2:0= - nls? ( virtual/libintl ) - acl? ( kernel_linux? ( sys-apps/acl ) ) - cscope? ( dev-util/cscope ) - gpm? ( >=sys-libs/gpm-1.19.3 ) - lua? ( - luajit? ( dev-lang/luajit:2= ) - !luajit? ( dev-lang/lua:0[deprecated] ) - ) - !minimal? ( - ~app-editors/vim-core-${PV} - dev-util/ctags - ) - perl? ( dev-lang/perl:= ) - python? ( ${PYTHON_DEPS} ) - racket? ( dev-scheme/racket ) - ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.1 ) ) - selinux? ( sys-libs/libselinux ) - tcl? ( dev-lang/tcl:0= ) - X? ( x11-libs/libXt ) -" -DEPEND="${RDEPEND} - sys-devel/autoconf - nls? ( sys-devel/gettext ) -" - -pkg_setup() { - # people with broken alphabets run into trouble. bug 82186. - unset LANG LC_ALL - export LC_COLLATE="C" - - # Gnome sandbox silliness. bug #114475. - mkdir -p "${T}"/home - export HOME="${T}"/home -} - -src_prepare() { - 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" - - # 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 - - # 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/\> "$c" ; done - - # conditionally make the manpager.sh script - if use vim-pager ; then - cat <<-END > "${S}"/runtime/macros/manpager.sh - #!/bin/sh - sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\ - vim \\ - -c 'let no_plugin_maps = 1' \\ - -c 'set nolist nomod ft=man ts=8' \\ - -c 'let g:showmarks_enable=0' \\ - -c 'runtime! macros/less.vim' - - END - 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 - fi - - if version_is_at_least 7.3.122 ; then - cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk - fi - - # 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 - - eapply_user -} - -src_configure() { - local myconf=() - - # Fix bug 37354: Disallow -funroll-all-loops on amd64 - # Bug 57859 suggests that we want to do this for all archs - filter-flags -funroll-all-loops - - # Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for - # everyone since previous flag filtering bugs have turned out to affect - # multiple archs... - replace-flags -O3 -O2 - - # Fix bug 18245: Prevent "make" from the following chain: - # (1) Notice configure.ac is newer than auto/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 - 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 - done - - if use minimal ; then - myconf=( - --with-features=tiny - --disable-nls - --disable-multibyte - --disable-acl - --enable-gui=no - --without-x - --disable-darwin - --disable-luainterp - --disable-perlinterp - --disable-pythoninterp - --disable-mzschemeinterp - --disable-rubyinterp - --disable-selinux - --disable-tclinterp - --disable-gpm - ) - else - use debug && append-flags "-DDEBUG" - - myconf=( - --with-features=huge - --enable-multibyte - $(use_enable acl) - $(use_enable cscope) - $(use_enable gpm) - $(use_enable lua luainterp) - $(usex lua "--with-lua-prefix=${EPREFIX}/usr" "") - $(use_with luajit) - $(use_enable nls) - $(use_enable perl perlinterp) - $(use_enable racket mzschemeinterp) - $(use_enable ruby rubyinterp) - $(use_enable selinux) - $(use_enable tcl tclinterp) - ) - - if use python ; then - py_add_interp() { - local v - - [[ ${EPYTHON} == python3* ]] && v=3 - myconf+=( - --enable-python${v}interp - vi_cv_path_python${v}="${PYTHON}" - ) - } - - python_foreach_impl py_add_interp - else - myconf+=( - --disable-pythoninterp - --disable-python3interp - ) - fi - - # --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" - fi - - # don't test USE=X here ... see bug #19115 - # but need to provide a way to link against X ... see bug #20093 - myconf+=( - --enable-gui=no - --disable-darwin - $(use_with X x) - ) - fi - - # let package manager strip binaries - export ac_cv_prog_STRIP="$(type -P true ) faking strip" - - # keep prefix env contained within the EPREFIX - use prefix && myconf+=( --without-local-dir ) - - econf \ - --with-modified-by=Gentoo-${PVR} \ - "${myconf[@]}" -} - -src_compile() { - # The following allows emake to be used - emake -j1 -C src auto/osdef.h objects - - emake -} - -src_test() { - echo - 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 - ewarn "If the tests fail, your terminal may be left in a strange" - ewarn "state. Usually, running 'reset' will fix this." - echo - - # Don't let vim talk to X - unset DISPLAY - - 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" - 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. -} - -src_install() { - local vimfiles=/usr/share/vim/vim${VIM_VERSION/.} - - # Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are - # managed by eselect-vi - dobin src/vim - dosym vim /usr/bin/vimdiff - dosym vim /usr/bin/rvim - dosym vim /usr/bin/rview - if use vim-pager ; then - dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager - dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager - insinto ${vimfiles}/macros - doins runtime/macros/manpager.sh - fperms a+x ${vimfiles}/macros/manpager.sh - 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 -} - -pkg_postrm() { - # Update documentation tags (from vim-doc.eclass) - update_vim_helptags - - # Make convenience symlinks - update_vim_symlinks -} diff --git a/app-editors/vim/vim-8.0.1188.ebuild b/app-editors/vim/vim-8.0.1188.ebuild deleted file mode 100644 index 5b4fa3b57665..000000000000 --- a/app-editors/vim/vim-8.0.1188.ebuild +++ /dev/null @@ -1,309 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -VIM_VERSION="8.0" -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) -PYTHON_REQ_USE=threads -inherit vim-doc flag-o-matic versionator bash-completion-r1 python-single-r1 - -if [[ ${PV} == 9999* ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/vim/vim.git" -else - SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi - -DESCRIPTION="Vim, an improved vi-style text editor" -HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim" - -SLOT="0" -LICENSE="vim" -IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl terminal vim-pager" -REQUIRED_USE=" - luajit? ( lua ) - python? ( ${PYTHON_REQUIRED_USE} ) -" - -RDEPEND=" - >=app-eselect/eselect-vi-1.1 - >=sys-libs/ncurses-5.2-r2:0= - nls? ( virtual/libintl ) - acl? ( kernel_linux? ( sys-apps/acl ) ) - cscope? ( dev-util/cscope ) - gpm? ( >=sys-libs/gpm-1.19.3 ) - lua? ( - luajit? ( dev-lang/luajit:2= ) - !luajit? ( dev-lang/lua:0[deprecated] ) - ) - !minimal? ( - ~app-editors/vim-core-${PV} - dev-util/ctags - ) - perl? ( dev-lang/perl:= ) - python? ( ${PYTHON_DEPS} ) - racket? ( dev-scheme/racket ) - ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) ) - selinux? ( sys-libs/libselinux ) - tcl? ( dev-lang/tcl:0= ) - X? ( x11-libs/libXt ) -" - -DEPEND=" - ${RDEPEND} - sys-devel/autoconf - nls? ( sys-devel/gettext ) -" - -pkg_setup() { - # people with broken alphabets run into trouble. bug 82186. - unset LANG LC_ALL - export LC_COLLATE="C" - - # Gnome sandbox silliness. bug #114475. - mkdir -p "${T}"/home || die "mkdir failed" - export HOME="${T}"/home - - use python && python-single-r1_pkg_setup -} - -src_prepare() { - 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 -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 || 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 -e \ - 's/\> "$c" || die "echo failed" - done - - # conditionally make the manpager.sh script - 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 \\ - -c 'let no_plugin_maps = 1' \\ - -c 'set nolist nomod ft=man ts=8' \\ - -c 'let g:showmarks_enable=0' \\ - -c 'runtime! macros/less.vim' - - _EOF_ - fi - - # Try to avoid sandbox problems. Bug #114475. - 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 - - cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed" - - sed -i -e \ - "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ - "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' - - eapply_user -} - -src_configure() { - local myconf=() - - # Fix bug 37354: Disallow -funroll-all-loops on amd64 - # Bug 57859 suggests that we want to do this for all archs - filter-flags -funroll-all-loops - - # Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for - # everyone since previous flag filtering bugs have turned out to affect - # multiple archs... - replace-flags -O3 -O2 - - # Fix bug 18245: Prevent "make" from the following chain: - # (1) Notice configure.ac is newer than auto/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 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 - if [[ -e "${file}" ]]; then - addwrite $file - fi - done - - if use minimal; then - myconf=( - --with-features=tiny - --disable-nls - --disable-multibyte - --disable-acl - --enable-gui=no - --without-x - --disable-darwin - --disable-luainterp - --disable-perlinterp - --disable-pythoninterp - --disable-mzschemeinterp - --disable-rubyinterp - --disable-selinux - --disable-tclinterp - --disable-gpm - ) - else - use debug && append-flags "-DDEBUG" - - myconf=( - --with-features=huge - --enable-multibyte - $(use_enable acl) - $(use_enable cscope) - $(use_enable gpm) - $(use_enable lua luainterp) - $(usex lua "--with-lua-prefix=${EPREFIX}/usr" "") - $(use_with luajit) - $(use_enable nls) - $(use_enable perl perlinterp) - $(use_enable python pythoninterp) - $(use_enable python python3interp) - $(use_enable racket mzschemeinterp) - $(use_enable ruby rubyinterp) - $(use_enable selinux) - $(use_enable tcl tclinterp) - $(use_enable terminal) - ) - - # --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 -e \ - '/# define FEAT_CSCOPE/d' src/feature.h || die "sed failed" - fi - - # don't test USE=X here ... see bug #19115 - # but need to provide a way to link against X ... see bug #20093 - myconf+=( - --enable-gui=no - --disable-darwin - $(use_with X x) - ) - fi - - # let package manager strip binaries - export ac_cv_prog_STRIP="$(type -P true ) faking strip" - - # keep prefix env contained within the EPREFIX - use prefix && myconf+=( --without-local-dir ) - - econf \ - --with-modified-by=Gentoo-${PVR} \ - "${myconf[@]}" -} - -src_compile() { - # The following allows emake to be used - emake -j1 -C src auto/osdef.h objects - - emake -} - -src_test() { - 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." - einfo - ewarn "If the tests fail, your terminal may be left in a strange" - ewarn "state. Usually, running 'reset' will fix this." - einfo - - # Don't let vim talk to X - unset DISPLAY - - emake -j1 -C src/testdir nongui -} - -# Call eselect vi update with --if-unset -# to respect user's choice (bug 187449) -eselect_vi_update() { - einfo "Calling eselect vi update..." - eselect vi update --if-unset - eend $? -} - -src_install() { - local vimfiles=/usr/share/vim/vim${VIM_VERSION/.} - - # Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are - # managed by eselect-vi - dobin src/vim - dosym vim /usr/bin/vimdiff - dosym vim /usr/bin/rvim - dosym vim /usr/bin/rview - if use vim-pager ; then - dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager - dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager - insinto ${vimfiles}/macros - doins runtime/macros/manpager.sh - fperms a+x ${vimfiles}/macros/manpager.sh - fi - - newbashcomp "${FILESDIR}"/${PN}-completion ${PN} - - # keep in sync with 'complete ... -F' list - bashcomp_alias vim ex vi view rvim rview vimdiff -} - -pkg_postinst() { - # Update documentation tags (from vim-doc.eclass) - update_vim_helptags - - # Call eselect vi update - eselect_vi_update -} - -pkg_postrm() { - # Update documentation tags (from vim-doc.eclass) - update_vim_helptags - - # Call eselect vi update - eselect_vi_update -} -- cgit v1.2.3