diff options
Diffstat (limited to 'app-editors')
73 files changed, 1217 insertions, 1769 deletions
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz Binary files differindex 6fe8eac04cd3..632a34dda9dc 100644 --- a/app-editors/Manifest.gz +++ b/app-editors/Manifest.gz diff --git a/app-editors/bluefish/Manifest b/app-editors/bluefish/Manifest index a7d0429739c5..dcddd6818ae7 100644 --- a/app-editors/bluefish/Manifest +++ b/app-editors/bluefish/Manifest @@ -1,4 +1,4 @@ AUX bluefish-2.2.9-charmap_configure.patch 728 BLAKE2B fc7231ab28c0d0c4480e48f965d26ee18ae5819e412488ab8a5e30e3cee6925b73daa72fa178cdf204e00d1074121ddc57fd4c5795ccc6335460409a245bca5c SHA512 46482a73b6d374cdd5881e9ed7a79199c85cb436cc700950c09541a94d61fc4f200613a34575e74d013409f0e42a7c1df4ed25ed65880f25cbebd926d47c6889 DIST bluefish-2.2.10.tar.bz2 4159964 BLAKE2B 94210df4f9cf0abb46fa26612e1b64550f5970c72584b683779f5bcaf921a8925c6275c647125f73990e99a0175e3c92c0cc286590fbd08e938c6fd1d8c32cef SHA512 ddfad4c595d371dfd7ca5551c1771c2d82dbffcc90acda31bbd2a048730e24e2d1e37fbe847e5005d96acefdf5f38cb93785d23817e59624ecd7ea10bfbc3aeb -EBUILD bluefish-2.2.10.ebuild 2763 BLAKE2B 2b122e7bc7e3759e37b9e64ff4a618f5fff15d1931bf33ae4408c870758c61c99f28c7303ce0d3ea8f12a658f85bc4fff28422beb499ef764905121dec0a7bbf SHA512 29663a481073d4d158e0c529479464019d4edc5bb0d639f2755d439bb30e86c36d0935a4ae9f9694c737e9b96a326893f55df6358aa47325d19b70a8f644e61d +EBUILD bluefish-2.2.10.ebuild 2763 BLAKE2B 1cfc9bfc9640d5110c7cacbe60f2f676f6a4b5f4333a6dd8270abfc01475b334c998ae4df9c0cf58a99198bb2af20f9b4718f084a8a63430799860abd90c103c SHA512 60eb5caaf1c8b98c4cd6024546bf235c18b84deeebff3849422546c30fe0dfc415e45d91e29df55d087ca924bea85f27bcede3a49167e3bdee039b89afaf8aa0 MISC metadata.xml 462 BLAKE2B 71ac5de5f71ae32c79122cfefd6179047db2fa0cf758a5807b20985133364e798d440707abab3b0a5893227ad9d005dafb474b479e3d798343d9e92f7799d6bd SHA512 f861be3bcb1034ee6154f5b1327406ddc45c17bec3d328d8d1489a9747160bfd349aabf86c3a90ed94c1662494a25014a0ec9730a7f9789014a10754b777ad98 diff --git a/app-editors/bluefish/bluefish-2.2.10.ebuild b/app-editors/bluefish/bluefish-2.2.10.ebuild index 1b0c1d0173a7..9443e11890ad 100644 --- a/app-editors/bluefish/bluefish-2.2.10.ebuild +++ b/app-editors/bluefish/bluefish-2.2.10.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -27,7 +27,7 @@ RDEPEND=" gucharmap? ( gnome-extra/gucharmap:2.90 ) ) python? ( ${PYTHON_DEPS} ) - spell? ( app-text/enchant )" + spell? ( <app-text/enchant-2 )" DEPEND="${RDEPEND} dev-libs/libxml2:2 >=dev-libs/glib-2.24:2 diff --git a/app-editors/efte/Manifest b/app-editors/efte/Manifest deleted file mode 100644 index 95c8b16ee267..000000000000 --- a/app-editors/efte/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -AUX efte-1.1-desktopfile.patch 619 BLAKE2B 54b0c42d032acbd9588005ee83863f08899fd48a012fd232b9a71ea8b80246341b116f49c45db570be3839fcfc4f6b2526a728e60ca9b0c8aed59a36d5457faf SHA512 e48df45d0daa6264503c94a7d2d6c886b6101f5d258fbc3a3825377f25b601b3f8869a4337330ea325a44086db20b2c2906f3556b5e066b1f399afe3aadcdc98 -AUX efte-1.1-flags.patch 657 BLAKE2B 2e38c0635739a6bb1ad679e97e571d04868bad3b950e63bb9770e134016be2c4982860204b8863979fc91374929762c442ebf5dd955dea0f522c13f25e415f49 SHA512 7721010873e2030428f2c855d35b18ce6c6ab2d884c25e1611045e8d3209cb0baf94a7d90661de6ea86d084e9b73cf4b8ac724308f94263adbad12db2507a870 -DIST efte-1.1.tar.bz2 429919 BLAKE2B 67a9d40e0aaebf024f7889324da6eaa96efe2abbc290f7f4397410f1a2975baf70c527eb238bcbc2b9b0bc8ab3dcdd1611c219f3429588f06f9ec220a56426cb SHA512 4dbfcaaadc56996d1b4659db2a82ec5132cf45b6f65ef545274769aa47f44ba27a8af1488ed57e5ffec2d9f5f1d1ef4cb9ee97514414796f176c2272a6bb6661 -EBUILD efte-1.1-r1.ebuild 1041 BLAKE2B d00aa6eee809552f859047054453081f7988a3dda7e6a04a4e85ef8919fc4dd7af0d818ca4a838ed49bce2b9965ed1b5256b7ae6c0b851f6f3511395247c8edc SHA512 9a4dca0de314dd4615e28b50a0fb8bbfad62500c67349092cf2a58b0300bcbf78baa0ec940029dfa506da1d65746102ffb004fa1f8035f6c69cc3f3958b0579e -MISC metadata.xml 241 BLAKE2B 735c46492d75e210ca0d6e814fdb2a7d96fe8901cdadcd168ccbb8720374cde0159e4a5edcfe6ef0ee78ca2b2f0e677e8d1a3a585e4d847f3098b519f61cfc8b SHA512 e2cf99ff1a4a6d577eb0fdd2a097cbfd71e60d860d6294d59ef4ec596eba2c85a50ed4f50944356637e145f0d3b38d0da90d87bcdf1f51eb76e93345cadbee52 diff --git a/app-editors/efte/efte-1.1-r1.ebuild b/app-editors/efte/efte-1.1-r1.ebuild deleted file mode 100644 index b62580bce0a6..000000000000 --- a/app-editors/efte/efte-1.1-r1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils xdg-utils - -DESCRIPTION="A fast text editor supporting folding, syntax highlighting, etc." -HOMEPAGE="https://github.com/lanurmi/efte" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" - -LICENSE="|| ( GPL-2 Artistic )" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="gpm X" - -RDEPEND="sys-libs/ncurses:0= - gpm? ( sys-libs/gpm ) - X? ( - x11-libs/libX11 - x11-libs/libXpm - x11-libs/libXdmcp - x11-libs/libXau - media-fonts/font-misc-misc - )" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${P}-flags.patch - "${FILESDIR}"/${P}-desktopfile.patch -) - -src_configure() { - local mycmakeargs=( - -DUSE_GPM=$(usex gpm) - -DBUILD_X=$(usex X ) - ) - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - rm -f "${D}"/usr/share/doc/${PN}/{COPYING,Artistic} - mv "${D}/usr/share/doc/${PN}" "${D}/usr/share/doc/${PF}" || die -} - -pkg_postinst() { - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_desktop_database_update -} diff --git a/app-editors/efte/files/efte-1.1-desktopfile.patch b/app-editors/efte/files/efte-1.1-desktopfile.patch deleted file mode 100644 index 79cfc1c0ab34..000000000000 --- a/app-editors/efte/files/efte-1.1-desktopfile.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- efte-1.1/packaging/shared/efte.desktop -+++ efte-1.1/packaging/shared/efte.desktop -@@ -1,6 +1,5 @@ - [Desktop Entry] - Name=eFTE --Version=1.1 - GenericName=Text Editor - GenericName[cz]=Textový editor - GenericName[de]=Texteditor -@@ -29,7 +28,7 @@ - Comment[sv]=Snabb, utbyggbar textredigerare för programmerare - MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++; - Exec=efte %f --Icon=efte -+Icon=efte48x48 - Type=Application - Terminal=false - Categories=Development;TextEditor; diff --git a/app-editors/efte/files/efte-1.1-flags.patch b/app-editors/efte/files/efte-1.1-flags.patch deleted file mode 100644 index 10c17cff322c..000000000000 --- a/app-editors/efte/files/efte-1.1-flags.patch +++ /dev/null @@ -1,15 +0,0 @@ -From: Julian Ospald <hasufell@gentoo.org> -Date: Fri Jan 4 20:17:34 UTC 2013 -Subject: respect system CXXFLAGS - ---- efte-1.1/src/CMakeLists.txt -+++ efte-1.1/src/CMakeLists.txt -@@ -86,7 +86,7 @@ - ENDIF( UNIX AND ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" ) - - IF( CMAKE_COMPILER_IS_GNUCC ) -- SET( CMAKE_CXX_FLAGS "-pedantic -Wall -Wno-long-long -Wpointer-arith -Wconversion -Wwrite-strings -Winline -fno-rtti -fno-exceptions" ) -+ SET( CMAKE_CXX_FLAGS "-pedantic -Wall -Wno-long-long -Wpointer-arith -Wconversion -Wwrite-strings -Winline -fno-rtti -fno-exceptions ${CMAKE_CXX_FLAGS}" ) - ENDIF( CMAKE_COMPILER_IS_GNUCC ) - - IF( CMAKE_SYSTEM_NAME MATCHES "HP/UX" ) diff --git a/app-editors/efte/metadata.xml b/app-editors/efte/metadata.xml deleted file mode 100644 index 81d7428b8621..000000000000 --- a/app-editors/efte/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="sourceforge">efte</remote-id> - </upstream> -</pkgmetadata> diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest index 7a7c11c2442c..92c30f72c53f 100644 --- a/app-editors/emacs-vcs/Manifest +++ b/app-editors/emacs-vcs/Manifest @@ -1,11 +1,5 @@ -DIST emacs-26.1.90.tar.xz 43892340 BLAKE2B 8ee12a6f8d6dd1a8084864d53818cd9127a95b7da632db14c831d2f9d4848aa11bb8a9d92bf8bf0348ea4e2fa75de45408d284680255e5a2b9845ada1acbc7fc SHA512 b2e7e9c1015c221e8665426528703bfe336734b7830d731d5f3a7c50ce423b2a8bdada7f934e5f31dbe81b4f06623bddafe48e9da4727cb728564d569ff0b188 -DIST emacs-26.1.91.tar.xz 43892592 BLAKE2B dba455ddacdda6faef66bf3869e21da9f94eef81e0987a280634e5186e8c441ac841ad917059ad8d0b36722d308f166d24c5770505b71219cd6979547f8cea10 SHA512 2c09b8ae0e035d20c8dcebda8ca56167a374c465f7ad8e55f97fc10355cffe709b196efa38474580c5b3584263b676fa5b8d9fa1434d4fc77d7d9cc941260a4b -DIST emacs-26.1.92.tar.xz 44387596 BLAKE2B d0581658f95c7408ba0d3e107a0622212e94f8930c355228a999d591dcea7ba533d4f3b288f63bc2a1ffb2aac197c053ec5c48f80810fe4e1c097ae75e20505d SHA512 c01be13055644f00094e096a9ec39dfaa4fc999718931d6003425ef74741ab0ca638a377e2903fbffc32c3e344fde5e93b2657a48600493fc25daa82a34fc4d2 DIST emacs-27.0.50_pre20180831.tar.xz 28668124 BLAKE2B fae74d9885889b042142f580e971c73c193306dca26b42dd87ac3d3d765312ce6695511d7d31a047d79803982f6345c4c319a3d83cea1313080170da97482fa2 SHA512 43b32d8943dc897dfc0c1fddb4261a196d3a604add5bcf87a93748125f15db2cac762d3550d6593b80e961ae35d543adc4d5937bac77970c658f93dba26f17e4 -EBUILD emacs-vcs-26.1.90.ebuild 13001 BLAKE2B d433baf07357bbd5db2f0704e7effa3c62f4306f5ad95a801949da3fe7d5de15ec6d276324118ffece09fc51c279dacec5fc7943d9d912f2eba2591d0070e5ee SHA512 39634f8ad92db5115a360bf43bbafa230b3e94462d51a311b5a1ef49bf2f762b05fb9c35e36cd378c427d095aba18b446b2fcef668f903972b4ce72bda6acd44 -EBUILD emacs-vcs-26.1.91.ebuild 13001 BLAKE2B 173d3f2f54cd20a02668b4ca4326e1bdd832ff0997990caf9ea03295c3f40312b630390e95c4e35a2995d565868d8399820653acacf9f2c9121f3a0366c8bd11 SHA512 9886de945cd9eb305a0521664e3eb978713abaea7043304b84e4e2774c7f48ff1ed37117c13585eadaca25aa035fdc4cd53187d4c1e162e4023b246832f618d8 -EBUILD emacs-vcs-26.1.92.ebuild 12893 BLAKE2B 94456e2c894fb8fa5d7a15508e9f29056cfef32422dad3c3f52ca2b0dbe939bad23c9c4acd40cc219e109cad2a3fae369e8bd5ae29a4eb992b72f7b2a58093ad SHA512 ff90d0d3d25385eb46403119fb8896d826d7235aed4a302ce9dce17e2291540ec59652aa500ad17a2aa91a02b42a9a27977f3923c84ec318b4eba735899f894f -EBUILD emacs-vcs-26.1.9999.ebuild 12893 BLAKE2B 94456e2c894fb8fa5d7a15508e9f29056cfef32422dad3c3f52ca2b0dbe939bad23c9c4acd40cc219e109cad2a3fae369e8bd5ae29a4eb992b72f7b2a58093ad SHA512 ff90d0d3d25385eb46403119fb8896d826d7235aed4a302ce9dce17e2291540ec59652aa500ad17a2aa91a02b42a9a27977f3923c84ec318b4eba735899f894f +EBUILD emacs-vcs-26.2.9999.ebuild 12947 BLAKE2B 1fbc4e311d6f1bed54eac641ff21973d472023f89ce76678900303a72163493f29e8d257f406d0cab34e07217e6ecd65cf400eb7c9c7ac2108b5220b133f8a54 SHA512 8f5b040f4cd8e7a2e0b797888453dbcca08c2f06b8d4bbf81f7c56fb68e02ed663c5d9ca966b4629ec1dcec5bef9bcc9f63a3fcfc1f24c81ab75b016dc3e8993 EBUILD emacs-vcs-27.0.50_pre20180831.ebuild 13050 BLAKE2B 9c43fc10140cf72d7bf9909775d3b81ecc346e9d8d02e7c4548748f5f808375adc22078ec85d2647d61a9c1dc02c4e34d29b26be739b315c87f5f4d751f24bfd SHA512 f7aee0a0e3d5c5071df9e1da1c8bf15dd94ab2fc7dbf802bbe44b6bc8cd3770fcc27c1b2139f015d9d2952f66906fbf4eb40fb1d366045c81d638c299d4370ad EBUILD emacs-vcs-27.0.9999.ebuild 12997 BLAKE2B 70ff0c9cfe3c3ffd7dd56e3a2f72104e600d4f3d4674816dc73031e308a9be682257eac4e8ccd7a49ab5e76233d0529cace43eb6ff609ed279d5f8b11519c831 SHA512 57246f31f263c58c0cca5967d5d4973b1340bd7a40f17b2d7036b473aeb9412710a03e6ab582ad85efc7b91914799e055e8782ec80957831f63a8fc01c65abb8 MISC metadata.xml 2897 BLAKE2B 9913cc3b37864559eb273338b02dd202b51820d2614fee5e17f1fe8fa98c691374443d68f29cca5172034c15dfa321390e2624087b3cdb4779364b12711c2a8d SHA512 1764fb9b8da95a3c3469c896808fe4e29b6b0bcb8b9986ccfd4756e451005f2f1f47b0fdcd5243dac7e70aa83f67fef25ac5ebfecf20e5fbd3e5c93851ad7eba diff --git a/app-editors/emacs-vcs/emacs-vcs-26.1.90.ebuild b/app-editors/emacs-vcs/emacs-vcs-26.1.90.ebuild deleted file mode 100644 index bd29a0514013..000000000000 --- a/app-editors/emacs-vcs/emacs-vcs-26.1.90.ebuild +++ /dev/null @@ -1,412 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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 ~mips ~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 gtk2 gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif 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 ) - lcms? ( media-libs/lcms:2 ) - 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= - <media-gfx/imagemagick-7: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? ( - gtk2? ( x11-libs/gtk+:2 ) - !gtk2? ( - x11-libs/gtk+:3 - xwidgets? ( - net-libs/webkit-gtk:4= - x11-libs/libXcomposite - ) - ) - ) - !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} - X? ( x11-base/xorg-proto )" - -BDEPEND="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 gtk2; then - myconf+=" --with-x-toolkit=gtk2 --without-xwidgets" - use xwidgets && ewarn \ - "USE flag \"xwidgets\" has no effect if \"gtk2\" is set." - else - myconf+=" --with-x-toolkit=gtk3 $(use_with 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 - if ! use gtk; then - use gtk2 && ewarn \ - "USE flag \"gtk2\" has no effect if \"gtk\" is not set." - use xwidgets && ewarn \ - "USE flag \"xwidgets\" has no effect if \"gtk\" is not set." - fi - 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}" \ - --includedir="${EPREFIX}"/usr/include/${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 lcms lcms2) \ - $(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 <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 || 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-vcs/emacs-vcs-26.1.91.ebuild b/app-editors/emacs-vcs/emacs-vcs-26.1.91.ebuild deleted file mode 100644 index dcb56a930093..000000000000 --- a/app-editors/emacs-vcs/emacs-vcs-26.1.91.ebuild +++ /dev/null @@ -1,412 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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 ~mips ~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 gtk2 gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif 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 ) - lcms? ( media-libs/lcms:2 ) - 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= - <media-gfx/imagemagick-7: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? ( - gtk2? ( x11-libs/gtk+:2 ) - !gtk2? ( - x11-libs/gtk+:3 - xwidgets? ( - net-libs/webkit-gtk:4= - x11-libs/libXcomposite - ) - ) - ) - !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} - X? ( x11-base/xorg-proto )" - -BDEPEND="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 gtk2; then - myconf+=" --with-x-toolkit=gtk2 --without-xwidgets" - use xwidgets && ewarn \ - "USE flag \"xwidgets\" has no effect if \"gtk2\" is set." - else - myconf+=" --with-x-toolkit=gtk3 $(use_with 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 - if ! use gtk; then - use gtk2 && ewarn \ - "USE flag \"gtk2\" has no effect if \"gtk\" is not set." - use xwidgets && ewarn \ - "USE flag \"xwidgets\" has no effect if \"gtk\" is not set." - fi - 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}" \ - --includedir="${EPREFIX}"/usr/include/${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 lcms lcms2) \ - $(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 <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 || 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-vcs/emacs-vcs-26.1.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild deleted file mode 100644 index 4ae3b77727a6..000000000000 --- a/app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild +++ /dev/null @@ -1,408 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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 ~mips ~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 gtk2 gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif 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 ) - lcms? ( media-libs/lcms:2 ) - 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= - <media-gfx/imagemagick-7: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? ( - gtk2? ( x11-libs/gtk+:2 ) - !gtk2? ( - x11-libs/gtk+:3 - xwidgets? ( - net-libs/webkit-gtk:4= - x11-libs/libXcomposite - ) - ) - ) - !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} - X? ( x11-base/xorg-proto )" - -BDEPEND="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 - - 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 gtk2; then - myconf+=" --with-x-toolkit=gtk2 --without-xwidgets" - use xwidgets && ewarn \ - "USE flag \"xwidgets\" has no effect if \"gtk2\" is set." - else - myconf+=" --with-x-toolkit=gtk3 $(use_with 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 - if ! use gtk; then - use gtk2 && ewarn \ - "USE flag \"gtk2\" has no effect if \"gtk\" is not set." - use xwidgets && ewarn \ - "USE flag \"xwidgets\" has no effect if \"gtk\" is not set." - fi - 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}" \ - --includedir="${EPREFIX}"/usr/include/${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 lcms lcms2) \ - $(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 - mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die - mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.appdata.xml || die - - # move info dir to avoid collisions with the dir file generated by portage - mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die - 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 || 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 - 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 - 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-vcs/emacs-vcs-26.1.92.ebuild b/app-editors/emacs-vcs/emacs-vcs-26.2.9999.ebuild index 4ae3b77727a6..9c0c728110ff 100644 --- a/app-editors/emacs-vcs/emacs-vcs-26.1.92.ebuild +++ b/app-editors/emacs-vcs/emacs-vcs-26.2.9999.ebuild @@ -121,6 +121,9 @@ BDEPEND="virtual/pkgconfig if [[ ${PV##*.} = 9999 ]]; then DEPEND="${DEPEND} sys-apps/texinfo" + + RDEPEND="${RDEPEND} + !=app-editors/emacs-${PV%.*}*" fi EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}" diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest index 810993a70c0b..d069376b095e 100644 --- a/app-editors/emacs/Manifest +++ b/app-editors/emacs/Manifest @@ -12,7 +12,7 @@ DIST emacs-25.3.tar.xz 42854740 BLAKE2B 4f4e2572bbef48b75c561497fc22046081e56099 DIST emacs-26.1-patches-1.tar.xz 1296 BLAKE2B 5e3cef3130b35a362d67f853686625d207e9af29ffb27753b6aa00327e30cc06b3cd7ed339b214b12fb00137654521c21e2252ecd83a79258bb9636406ab032c SHA512 6e4b0bdbf98d5130a6cd41fb0a8c3d641bf0b8d46f150d1f10f2d659e0418c14198d8990df13f3266437bb128f5fc7db8456458f5f547f2c12cc59da4fea3c8e DIST emacs-26.1-patches-2.tar.xz 2740 BLAKE2B 43a58137d6096fd6b49688192b65e97446cd31691b18c2e69c8980ff1d93caa66ff670f06456df91411fd74396deaa1899c7afb6c0a4bbc98d4c2d9bd7ed7d40 SHA512 31c1714d130a02692c65dd1371662100f9fbf33a8df30b8bad8fa688ab993e0a596101a4765a7859801d1f66e729c9fca748e70b9919e5b2a777d39fcbe92c21 DIST emacs-26.1.tar.xz 44258932 BLAKE2B 5b5ea6a506228507af18417c3f94c2d6ea482c25d13ec5e0bee9ec6a65e80c52c870162b4671e80a82f8310784c802924609f2f87d504b1a97617c44d859566f SHA512 537c2cfdd281151b360002419dde6280c313e07a937ed96405c67f754b3401ec5541091a3c0aa6690929bc33dd79e8e0d8844e7a6b014b7798c63cb15de210c2 -DIST emacs-26.2-rc1.tar.xz 44405668 BLAKE2B 05d1788b974328f53c654daa9e6fc50138271c5805dfeefae088b74450245368d25f7a721d636a3c771d5abd4bba75b1b05ef312ace7c821b8fd59d2c1f82e30 SHA512 27c5551adb0641dee6bbd962dcefece6465f0ce1c37da1be0ab56966e04c277ad8db35763ce56fd35a4643f60c6576c36aa27cac695f62bd4e4e7501d09654b5 +DIST emacs-26.2.tar.xz 44406808 BLAKE2B 23c23958b177f032082fc5e71ebccc4a88c10b19258ec22608d7bade37dc58d5f8aa4a74e86114c72ea8be8fc299b6c9af5af283f28bd7e965830e587f1bdc93 SHA512 c223ff5c51ca8bdf887bacb2dc37b08a637d39ed6f887cc24f67397e46fe5fdb68f33f21b97300b985c749f32aa09080d33103271637ed4ce5d9f2ea34ce9fe1 EBUILD emacs-18.59-r12.ebuild 4412 BLAKE2B e560829c6de369456f7a77ddba9a6047addace03406ca36aa7778473d470484e7a675cd5eceabc491b86a5a7140ecaafdb86fab9db5974d0fd817f4b55d48a85 SHA512 11144b4d09773faf8ea2fe054695b5a045778c0cfdf0314c9eb8b0af34526eac1e0ac6f245955361e99807eadea9e8c0d40411907e14e2845ce2b91f0d404245 EBUILD emacs-23.4-r18.ebuild 11522 BLAKE2B 3d347eaf936d533d2a28d4d90cd5d1a51639de9983b2de811ea95059ec3e256a3074f6f649d8eb6a042649dd1fd6526aca198a1593f7732d73053fb8a0033279 SHA512 cd5003f62eaf4d6531ac692421bb7634c35d34821c89764d053a3fdbe31cb0b776f3271800bbf19979dff676969197b8c5f04525dbafd317431d4323bdcc24a5 EBUILD emacs-24.5-r5.ebuild 11261 BLAKE2B cee3de84ec6fe6b9a7592d090be1e0902c49d4f460633268e96547ea96f67d8cf590f0584780f057ed8fc0e79502e309bc3ad2105996ae5c7b315a03897cb16b SHA512 b0fba024fd12174d6fa55a87a7b5f3318adb23fff00d18508f3fb7cbbe1f4abb8bc565596b30321554c5619dacb56bc1c2eb13e09b046630852de690e06aa253 @@ -21,5 +21,5 @@ EBUILD emacs-25.3-r4.ebuild 11753 BLAKE2B ab01076daf8c815a4bd7de83d652c8293219d9 EBUILD emacs-25.3-r6.ebuild 11630 BLAKE2B f245573c57fd25aa227e2fa811c2b82ce00df3388c9e5f398f861eafe7b96c5af586384019a109fccac370235d4c88bcf92df2dd706fbc1bf29b212a87bf002c SHA512 5eedcb6a1080d38b63191235d812f8973d06add3abfc16a48bc38ab99cdd75bd60ffa5de6cf62b78d8e3d002c69f80a8b7d76a2f65727b77e311f533196019ac EBUILD emacs-26.1-r1.ebuild 12177 BLAKE2B 8849e102d459b68740e5127372c3ccdd07b64368cf6d364acd27ffcee331347dd2ee48d38204215b839d4682becc0449b104f168a86c1982c0940c1ab4f5389f SHA512 77b4ce147e8e091979d01ee111539111b2854a09caf85f637dddf3d2bac27509224f7437a6ed8f5321566042e1689b3c13d1b1485fdccfba5ef375e82367bdad EBUILD emacs-26.1-r3.ebuild 12276 BLAKE2B d3844cbd9e90c78364005eb1818ab68667e5c7eb29b6de49abddccd9f05f0eeb23fbb5f454bb9e084311f88893d5b6e70745ff893dc6230a2f79fae779a3e504 SHA512 235dd046d22eec3853321d97b8c9a28009fea26d4f38082e737ee6da740d872928044bb7a034fb1bab611e2b565ceca1a8c36a924b049c90b3b6e6cdbf71753a -EBUILD emacs-26.2_rc1.ebuild 12108 BLAKE2B acf6da738e91b87e959e3b2308910e91afd2de29cb70df469d6d6602053d55fd2d14703f3eeede4035641749bb9f099bb34c86917404dfb323925461a4f846e9 SHA512 d57d6b6562218ddfe1592bef1dc39e75beae79aa5c387935f82dd2e1ad1b5ce8bd4454cae0ae6a8fbb4033be572c965177b463de54984e4710da7eb6177bd5be +EBUILD emacs-26.2.ebuild 12083 BLAKE2B 68c02ad6fb545929b6bf21d9037eca471584c116c9a68a138384524b3001bf6e5d26b0e13153411041b0e0129e148d72a8986cebe8de2eaa2a60149066a7f872 SHA512 e79ed1b729f7be58d642d83f2ea6243a845e6910cf5d493e5179d151acd97b6de8ad067c3168f3abd91406cbb3fb942dca4ac93cda19b0f8546be2c4b2347a77 MISC metadata.xml 2849 BLAKE2B 28cad6b703be952825ae288ee9218209a2f38992bc8381ef60a0f6b36f57971bd133ccff284f0bc20d03a15d89c71950c21a2c32b3f47bd80bb793f5e439e1e0 SHA512 0db4dc9edb2a6f9e917b4648b887ec12f016f77d3332e67bf8962a0ba592908e34108610083e76f4abe7cd2f52a07bb75e8b14089b1ca87c138e711c2d31ff9b diff --git a/app-editors/emacs/emacs-26.2_rc1.ebuild b/app-editors/emacs/emacs-26.2.ebuild index a00de4a2303c..2c7db3be3fd1 100644 --- a/app-editors/emacs/emacs-26.2_rc1.ebuild +++ b/app-editors/emacs/emacs-26.2.ebuild @@ -7,7 +7,7 @@ inherit autotools 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" +SRC_URI="mirror://gnu/emacs/${P}.tar.xz" LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" SLOT="26" diff --git a/app-editors/gedit-plugins/Manifest b/app-editors/gedit-plugins/Manifest index 17da3d269675..bc95824c3349 100644 --- a/app-editors/gedit-plugins/Manifest +++ b/app-editors/gedit-plugins/Manifest @@ -1,5 +1,5 @@ DIST gedit-plugins-3.28.1.tar.xz 1350468 BLAKE2B 4fd50ad7358581f5e27f0c3a7e127d4e2c0e7189c039daee1d8d7ddf7062846e1aebb634b3edd998c9a7c11840c71f56fe4eeca78ea2e91ae18db814e4fd79e5 SHA512 6258c627cd3fa2948375c30e87061375c0d09ce2c70301c2d10a403e6075d1df09e928a2d95b72f6d7950a31a720af645fff2f7f59a281d2999948beb56c1dc9 DIST gedit-plugins-3.30.1.tar.xz 1354644 BLAKE2B ee42fb2fe47c9219442e0bbdaf21a14a834b8bc38558713ccf0ad384814812fd71f4d318624b4d2c149b26d304203a2b954ef49c3299877f4d067ae181bfe1d5 SHA512 0e777779288b51015d7ab539bf896a00d5226560f2cc2211daf777da87824eed858255318c421524933a540135e4bfdcc294ba7ed89f680a35aa48f7279cbc94 -EBUILD gedit-plugins-3.28.1.ebuild 2291 BLAKE2B 760bdfb31112d8fa8c620022cdaa5d879fb5ee9ec64fade4c5cf91a85d2b22caff4aaa2a86e0cd612bae6de049ce8b0b2de5c4c4b0b3fe6a6a2229e4f2df5951 SHA512 2cb1b9213a8d00ddd96ada96dae546f48856daec2b6811494b9addec47bc5f9279d494da32872f81eb9d68268ebead14c6f175155e7a93da82a81863a1ddbd53 -EBUILD gedit-plugins-3.30.1.ebuild 2345 BLAKE2B a510912fc6a7c3b03ea568a33611081341565fea303e08b69afe3724bbe454dc0dd047843b0e247c1a86a16f1b34ff78ef947e8796dd82bdcf4c92173be44514 SHA512 8fe30e05058fcce8536dadf96a2d0011f8a0e88870f6f6372a4a1e95dedb2d7f91b95c003cdfe28c960d90d049314f04d1dc3a7c9e4f197405be977af3acef79 +EBUILD gedit-plugins-3.28.1.ebuild 2289 BLAKE2B bc21d5558cfd5c3888463dfe5faf64d7daf85313280110b739d8e2377f4397243191a7b4113660fb4f8b2a3a0d350fe4ac53bcdf4c02f7282cfff45cdbc3c0a7 SHA512 b4527975193e5fbe40348632c9abf2f0a3e563ffbd972a1e6b11288a558e83d070f24e62c690d1c958bc3ab4a3b779494f97c311c8050e90e25c54f4c4a9156d +EBUILD gedit-plugins-3.30.1.ebuild 2343 BLAKE2B 4f8373974ec9a5a7695d8846c3c12a1d38701b37f5de9fbb4de7580337a46e10789eae9f8e3e738ecf38c468040e6abc955ba610717860ef3e20c4bace356a47 SHA512 31a6222448c12fe204fb6c3fec0b5786e4a4a6aba3809c3549981cae5bc45f0edf78fb054e476e25506d7f9b22d03e1ad00394733533ac8fa29bb2ae05e4a42c MISC metadata.xml 542 BLAKE2B 1336fdd161ef76bb2e1445dd074aed82e04be00c9c47885eb5005122c850193dd2bec1aed69dd1da74527c8ee82d7c75d57b73d020cc692e41f6762ba43d8f08 SHA512 1eba6ba724a313d8dd04e838c448cb8de2f3411b891daaacdea615f0d8187d3bbe1f650c9b2ab5457d519ed98dee600d8830e7eea848c872ccb9c52ba58f231a diff --git a/app-editors/gedit-plugins/gedit-plugins-3.28.1.ebuild b/app-editors/gedit-plugins/gedit-plugins-3.28.1.ebuild index 9591c5c7d907..d3883fc34189 100644 --- a/app-editors/gedit-plugins/gedit-plugins-3.28.1.ebuild +++ b/app-editors/gedit-plugins/gedit-plugins-3.28.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" GNOME2_LA_PUNT="yes" # plugins are dlopened -PYTHON_COMPAT=( python3_{4,5,6} ) +PYTHON_COMPAT=( python3_{5,6} ) PYTHON_REQ_USE="xml" VALA_MIN_API_VERSION="0.28" diff --git a/app-editors/gedit-plugins/gedit-plugins-3.30.1.ebuild b/app-editors/gedit-plugins/gedit-plugins-3.30.1.ebuild index ee5dd1d5d9d2..57f0d770a66c 100644 --- a/app-editors/gedit-plugins/gedit-plugins-3.30.1.ebuild +++ b/app-editors/gedit-plugins/gedit-plugins-3.30.1.ebuild @@ -3,7 +3,7 @@ EAPI="6" GNOME2_LA_PUNT="yes" # plugins are dlopened -PYTHON_COMPAT=( python3_{4,5,6} ) +PYTHON_COMPAT=( python3_{5,6} ) PYTHON_REQ_USE="xml" VALA_MIN_API_VERSION="0.28" diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest index f847c4f88080..5cf6eeccaeb1 100644 --- a/app-editors/gedit/Manifest +++ b/app-editors/gedit/Manifest @@ -1,5 +1,7 @@ DIST gedit-3.28.1.tar.xz 3149684 BLAKE2B 6afedcc5de0bd249af3d0fd02339acc2d993aae083dcbfda9212745ab810b81cdb9da655273cb7ccc556644c29d69429d3587fcc9e1faf7aa1c2cee57af09a4b SHA512 f5931ac562cb5005a83eec43048b718ef431e6006b72470fea54ad0e94bd64940ebdec160ee0459ceb5adb235ab111711a2f9fbdc74104d2edd8f287d7474815 DIST gedit-3.30.2.tar.xz 3155628 BLAKE2B 96736adbce987af89b37a712448f42b2a2eeed72d52aa16377d961c9e929fa4e75205eac5987bfc067cc2fecb35aec720d85483c4e2e824a6e8248cc652d2fbe SHA512 58ae7a4c27aeabad670718e39e1860df112d0be00ea622cc8adc185cb5d0e16ac4af65cb3aa45423c7b1b94c88d04d081fe05f3647b054a3e3291abc73c41f6f -EBUILD gedit-3.28.1.ebuild 2325 BLAKE2B d95165b8d5e6744af99595359a22e3070ae327afcd995b211c609cf92c99bc4f6687c3b88ad0f64d4ae8f4caeb519aa6fd1a34e4913c7e18163d2b920e37b2dc SHA512 45a5bc9a8869ab1ee8393796c75664a51b03ffa2e335fdb4645145099440232af1bbbef982c7c8a25d4280eb3a2bac857440014c792731e4b711c9f76ea9581a -EBUILD gedit-3.30.2.ebuild 2327 BLAKE2B c10617646c5f36329e6d63c63b742e283b05b904f0ebb9ac14f7a414f64d284455dd485fb68963f972e38b483b54a1832e7f84abef9d856ad38a8d5c492da948 SHA512 ce97f674541798350e06d3778b077062481ced91674da6041222e1749cc8b6fc0caba20d3ee97147249c44042b694f4edc956b1649f2ddedf0f5beb97f04a170 +DIST gedit-3.32.0.tar.xz 14793216 BLAKE2B b1d9af7882063a622fe27f8e5aa322e2a1724410c4419d538712fdda2cab10aa59014a82cc1a41b35966dceb1b75ce2613d9c5c98400743b31df76b0114e84e8 SHA512 f25ed05f5d3b7ab7711be32c6516479c8b515d6d5983e3bc3a00407740fb8ec42b1e9a3005473671fc144f4437b9e98355a3669210eefb5bf8288f171188f387 +EBUILD gedit-3.28.1.ebuild 2323 BLAKE2B 4fa5600d7163ce9fb6670a89d9151343cc7c256cbb0219f3150f94acdb2ff4b53e85dc116eec708ebf12b0fd5926325fdcd1d725c956b8c7001db89c643ceddc SHA512 a0c3b76b6f6454678d50a6f60bb8dae830023dabc22de5581848bf42932a25db9fa8c32b753e6747c486badcaa7c3f679b58a0874c26f99f69f1c7a2049a217e +EBUILD gedit-3.30.2.ebuild 2325 BLAKE2B ab39c2a96771d4a996a51a9f4e8af7ee4e913d5ec7aeff548afa5732f80237cd367b3035b43230589d77efe37ded2a88e8d75cbf934954d9b83f1c199b2139d7 SHA512 6e49fb42e4715a404380e9fb01e9757f2a39a3372d2d1988672dfa25819bb980770050fc9197c2dec3e4d91d343e7f71b61125463a3412a0af4215d5d739176d +EBUILD gedit-3.32.0-r1.ebuild 1922 BLAKE2B 6dd9b4ad92a3190dd099f9fbd32b72bae48165e1aeb00d10bbf7b573177ed449dbb162cf06e324c85220576cfc7f995324935b41754e7f63d2e8abbe5bfb0eb1 SHA512 6492ed41a81a5ea20b8437e0206e1ea1db9e62787eac906e01131b317768457be0878f9f9b9e0b3cf40f4cbe733e32e7c06222c1ecff3ed483fcc3d55c97c44c MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/app-editors/gedit/gedit-3.28.1.ebuild b/app-editors/gedit/gedit-3.28.1.ebuild index 9e3e55a44a2a..70d241ee4cee 100644 --- a/app-editors/gedit/gedit-3.28.1.ebuild +++ b/app-editors/gedit/gedit-3.28.1.ebuild @@ -3,7 +3,7 @@ EAPI="6" GNOME2_LA_PUNT="yes" # plugins are dlopened -PYTHON_COMPAT=( python3_{4,5,6} ) +PYTHON_COMPAT=( python3_{5,6} ) VALA_MIN_API_VERSION="0.26" VALA_USE_DEPEND="vapigen" diff --git a/app-editors/gedit/gedit-3.30.2.ebuild b/app-editors/gedit/gedit-3.30.2.ebuild index 1296da553dfe..8384d66214d0 100644 --- a/app-editors/gedit/gedit-3.30.2.ebuild +++ b/app-editors/gedit/gedit-3.30.2.ebuild @@ -3,7 +3,7 @@ EAPI="6" GNOME2_LA_PUNT="yes" # plugins are dlopened -PYTHON_COMPAT=( python3_{4,5,6} ) +PYTHON_COMPAT=( python3_{5,6} ) VALA_MIN_API_VERSION="0.26" VALA_USE_DEPEND="vapigen" diff --git a/app-editors/gedit/gedit-3.32.0-r1.ebuild b/app-editors/gedit/gedit-3.32.0-r1.ebuild new file mode 100644 index 000000000000..02db350e3688 --- /dev/null +++ b/app-editors/gedit/gedit-3.32.0-r1.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" +GNOME2_LA_PUNT="yes" # plugins are dlopened +PYTHON_COMPAT=( python3_{5,6} ) +VALA_MIN_API_VERSION="0.26" +VALA_USE_DEPEND="vapigen" + +inherit eutils gnome.org gnome2-utils meson multilib python-single-r1 vala virtualx xdg + +DESCRIPTION="A text editor for the GNOME desktop" +HOMEPAGE="https://wiki.gnome.org/Apps/Gedit" + +LICENSE="GPL-2+ CC-BY-SA-3.0" +SLOT="0" + +IUSE="+introspection +python gtk-doc vala" +REQUIRED_USE="python? ( introspection ${PYTHON_REQUIRED_USE} )" + +KEYWORDS="~amd64" + +# X libs are not needed for OSX (aqua) +COMMON_DEPEND=" + >=dev-libs/libxml2-2.5.0:2 + >=dev-libs/glib-2.44:2[dbus] + >=x11-libs/gtk+-3.22.0:3[introspection?] + >=x11-libs/gtksourceview-4.0.2:4[introspection?] + >=dev-libs/libpeas-1.14.1[gtk] + >=net-libs/libsoup-2.60:2.4 + + gnome-base/gsettings-desktop-schemas + gnome-base/gvfs + + x11-libs/libX11 + + introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) + python? ( + ${PYTHON_DEPS} + dev-python/pycairo[${PYTHON_USEDEP}] + >=dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}] + dev-libs/libpeas[python,${PYTHON_USEDEP}] ) + >=app-text/gspell-0.2.5:0= +" +RDEPEND="${COMMON_DEPEND} + x11-themes/adwaita-icon-theme +" +DEPEND="${COMMON_DEPEND} + ${vala_depend} + app-text/docbook-xml-dtd:4.1.2 + dev-util/glib-utils + gtk-doc? ( >=dev-util/gtk-doc-1 ) + dev-util/itstool + >=sys-devel/gettext-0.18 + virtual/pkgconfig +" + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + vala_src_prepare + xdg_src_prepare +} + +src_configure() { + local emesonargs=( + $(meson_use gtk-doc documentation) + $(meson_use introspection) + $(meson_use python plugins) + $(meson_use vala vapi) + ) + meson_src_configure +} + +src_test() { :; } + +src_install() { + meson_src_install +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest index b2de3d9e6129..7b1db53ab967 100644 --- a/app-editors/gvim/Manifest +++ b/app-editors/gvim/Manifest @@ -7,11 +7,13 @@ DIST vim-8.0.1699.tar.gz 13546105 BLAKE2B cabf29d5a89c55e2fe3bc5e39eb499412f5907 DIST vim-8.1.0034.tar.gz 13652586 BLAKE2B 98dac6b37c04ea8c15f0b0e2e4145d6529138e0532e92751fd07be04a2180519135d386dfc19e7f12c8eb37b3e15ee81ba357680d453afab56d96299b69cb511 SHA512 b2b85035c6c60a09e903d8f6deb500e42ab8bfc2f9a5b959d0055a8e02dab3a91d5460fd5028e6634c5ef6ab034186b7155e341fa25e84b9851290708e892d19 DIST vim-8.1.0412.tar.gz 13857501 BLAKE2B 6925184359b8b36cb546c9fcba4bb01755455aa87171ea7328ece411a5a5ced45096b8bef8561059bbff9a3ade565e0648fd18dd091d6faad0eb8a67321337a5 SHA512 3f458c039a636d7d3e398f8aa9cba4b4ae650c00038618c4776959b6feb0a1e3ac56be2912c3d85cba8e8f301661a62d71acd34a4dd75dc4dc000a94bf1b237e DIST vim-8.1.0648.tar.gz 14061964 BLAKE2B 79bf52d8574167471c93942904dc2b4ad5648ec365561494bbad45c779154b75b0fff1d90229516e938371f1eaa5808659cb2181b150c4c13bf8501bd9987b38 SHA512 d41676a6bb6bc442f4946ca021b2835d7ea0e54fbefe1bfc728241e1bf203cc696b707fcca6f25c877660283a790cefa4259fbd14de88fd4db7390701189c454 -EBUILD gvim-8.0.1298.ebuild 10451 BLAKE2B 964edd3f4b549368e0d0f0f4e46e4951a6d2fedda168dceec958b984e8b62dc3432b49d3b256c677f1456f370a5b7e7f0306cb81ccfb3ba16ad04a4769fec92a SHA512 f5a9dde7d6b9b5d5191dd20c83dfe8c9385287b16e8cb43b8a9cd8d3d18984542155f0f50f794b56aea72599c2e28c7086e42090e6373c707701faf4872190b5 -EBUILD gvim-8.0.1699-r1.ebuild 10441 BLAKE2B 2a57da613526835bace267032a7c8d24375f6c8805c1d2941366864f5869634437609a8a21f1f42668c52970f41e9091094c21e06eac8961e0f3492262ac6c51 SHA512 55551739d531f6036661203ba2bae5cba0f3fa4e49ada5d11c280272e24eabb2dab941cb51a73c5b93175e4ba45e3d09a352fe1ddb624f3abd39e942963ab989 -EBUILD gvim-8.1.0034.ebuild 10440 BLAKE2B feab87a2dda8d2e59c79179f3736963e645da9d6045ad591b8b4141181c9d52dcc417e0569cd4b60e91bedb662b2be84cffa053848108cf23973a150b8878036 SHA512 1f7b34f98fac3c68b0aa866e7c6cdb50a3f2a3cb6be2b24bf1b9006e01131b3d1d88576c6195ddafe5ee3e234c4b39d45c94fc5d81a2b2bb83de9a26e019fa53 -EBUILD gvim-8.1.0412.ebuild 10428 BLAKE2B 69352c472327a455a501766af33297e991f85bb6521e35df2e2e9615bb415c744a5579e7367582fee7d93e637afeb169f68b2de8d595005d5bbd636c3d76364b SHA512 67b6e99586afadefe1b48c93f76526a52f47d619bcfb7e33f3ec93032e976c30209ac9f42ad4000fb3b45c6ea335598bd6e664bbdc09acb4bce56f9f01a9348e -EBUILD gvim-8.1.0648-r1.ebuild 10640 BLAKE2B 148c550d001c825897daa4549c1e2091164cc4012ce074740cfd5311a698dcdfca5a78f045bc50c22c1aa828ea24d8418914e6eb4edd778ea8dfa24e2c32391a SHA512 c3fc6fb62cd2b95e090cbc2e812e7b26031bbc2906bef94ca6fcd0b24a31e5f1b883328934b3d49a5feebc299afd09bac9b1e9a989078688182b0b7a7897beb6 -EBUILD gvim-8.1.0648.ebuild 10482 BLAKE2B b5b81d2888a97a3e285e6afbe3a64f537a54e4dc7efb751a31a1b325c7c7e814b65bc75618d2a4f6ceb83c97665e75ed75a89bd3dd2d3ceb63a9e2ade0c4df77 SHA512 7a2b4e6fa5fec0ac3c0b889eb13dbe995c216507f042365e5174705e717c07a4504d48e9dd1056582765c9f2fee0e69c8f60e05b1c359bc353935e45e2a7273f -EBUILD gvim-9999.ebuild 10552 BLAKE2B 6375e740e1519a6faea6ef8453b91091f51daabc7a156a893d7bc5e8d4093139e1136c6cdb298b9542771b3ccb96af82857718a3ad845de327fc2a05438e81f6 SHA512 f0195aa09f984300325b0b282e600a6dc417eb03711ec047db38d95a43f7640051bdf5ab6b28a113ce4c45537933257b03de2dfb53fd916dffd6d2119e612969 -MISC metadata.xml 633 BLAKE2B adc5dc111999d95087e2ef224b82e931b2baa638eb377a08197bcc1114a83efd6c09bd6ce09e821dc1534fe0dc925116bc48dba74cee4579c414a99da09d8dd6 SHA512 f6388b8d254f166dd5c8a03117f3f0448a7e5ac196577aed5c05081d702cf611733f1ca9ad6e93e026c025e73132066dff5b75e3ada68d83746d6519e99e3036 +DIST vim-8.1.1155.tar.gz 14141750 BLAKE2B f15470768fbdc4e02552b8711626c3ad9647ec5b74ebaa3f82a4f32c050405ef0cf3f29d1e5bdbb4de008bf16262b8cdc81ff153e2694a184523cd913624e8e0 SHA512 0cdc42090958f4c91c13aeeefac0abc4feaa629d8b90c04bd01d5e23efefe21e6316e1b2c3b6015ecf9577573faea9a1b6660de8a2959642e65582dbe9c7f5c6 +EBUILD gvim-8.0.1298.ebuild 10444 BLAKE2B ed698613b90b4780010a79905cbc2b1ad7a8b30f01b5267fddf4709c4c6b82b950574090d91faf541380254c88651aa1d3e10cd15c7fb5d650854608fcd51e0e SHA512 996bbb0fc297b59267277d10998deb42a9bd1ca86799d1c210c1ad960525fcd7f583ff4126c30930291b643891a08b15081ee1a622eb94c6d8d5c2412afcf75a +EBUILD gvim-8.0.1699-r1.ebuild 10434 BLAKE2B 627d0fca80743893576f803da34f2f98eef363a59d701cf30b7d1a355881e83a2f94ab7025cf3f72ce885696312cc53445d4871a1abb3688abdd336e5fad463c SHA512 067c1d7d67e9dc569accf09e192093ce0ae6d147c8183d2ca3b450afbbf4cddfd55f812babd105356f9b19ea57f14a943120a93f768665eb4a38603400f8079e +EBUILD gvim-8.1.0034.ebuild 10433 BLAKE2B fe9544211335687de25c9343c5e3cb8e93531b71b22ac7d7d7b4e78b0d3a8e15c5618f9f5076c33a8e9c399e2f6d5f52afc073e076d51535750cd74bdc7d39c8 SHA512 0cbd399823d7d68167989b1085211ae547b0d47acae63becc03ad2c162065b0c8e7c8fa9f1bd5253f4f89252441d81be475ac8bf44d6359e7b93de09d9fbb3c0 +EBUILD gvim-8.1.0412.ebuild 10421 BLAKE2B 5a4360134c7b5dbb7e259ee00df65fa6e3fce4106865013e341324d590007c16690771b9bfa2f13c672df6236082c4ffdaf11d7c9a517de295b33bea02b2f002 SHA512 3a22f6a3268a0fd4d05dc0ec7c80c6dd6f8ab04b957ba4558ec09c9beee32d4065425c9ed6eb5a478f148e926c5076e72e879df607d5515d22dac0125a7d951f +EBUILD gvim-8.1.0648-r1.ebuild 10634 BLAKE2B 42f688ff29f33c0735ba25c1a52553639a6f8144f138ea0631d54adaaedf35330439d4d6d8ccbdb71fd0bc6d5f5ec60bb5bfdf8f5417299a2a16929638339ac3 SHA512 952a3452db2bdc6a4bfdae62bf077ef7688babb381aa3cf50b04ac01998a249d35fd002bea92d7a58660440c973e26a0cd3f7863818f3186a29851aa163af74e +EBUILD gvim-8.1.0648.ebuild 10478 BLAKE2B 55940a35ad7a05d0f2c72be20ed295512a590922ea6d20112e1d8389395bcb75cd3e423a64cce546bbe8a2232355ddecaea09f9d08074e55f0b75dae75af8501 SHA512 e98878e117997c5723017ffdc88f0bff4a382a9acfb96699a318329def6ed83bfe18286a86dc8fce324fb55fdb844183e18ec65055a2962a7567fa559cd243f3 +EBUILD gvim-8.1.1155.ebuild 10536 BLAKE2B fd459e63131aa9abef29d5a0321e0a8a7fd90da88fd0c3c1dcc88616e1541c074e9b6075de88b7b92aff0b5bb460f4142efd0d17137bb8e59c73d774e63d3a53 SHA512 34eb03c379705026561228ff55d4bc8fac9c2c85baa9ee1547f63d0839009eb5fe1161dd9d94d1bae9b2aadd2332e9b56f69393e9437835512e125411562724e +EBUILD gvim-9999.ebuild 10407 BLAKE2B 1f0865de240b0e88ab55dc27f2f4ea230dc0eed0bf63d6551fd3bc4adb9bdb00e04ac09925e9d5a42dfaf900667a584f44b3cd2fd7fe711833ec96198bacc545 SHA512 c23d892f772dd4db9d612f8ce822192f9f136b41be207fd467ceef9d9997b0dc7154918ce7418257046e58c40f411e3518a6612f5203cecee8068dfa536d223f +MISC metadata.xml 685 BLAKE2B cf087e797855063edceee8dae21691a6ada5783ebb3712ff2f2440813e4bc6c78a0077be9d2f7302ee0b0270f19e32dd5edef661f884ad595fe39b7160101d84 SHA512 074b08bb8f604315f3c69731c1fa4c130ddbd45dd15305c6e09004424c2a914cb18e2c756714967abc6663654cbe03a19f586b1de64ce264c58ed7daec1ecfa2 diff --git a/app-editors/gvim/gvim-8.0.1298.ebuild b/app-editors/gvim/gvim-8.0.1298.ebuild index 937645808889..8514246a3ac7 100644 --- a/app-editors/gvim/gvim-8.0.1298.ebuild +++ b/app-editors/gvim/gvim-8.0.1298.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # 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_COMPAT=( python{2_7,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 diff --git a/app-editors/gvim/gvim-8.0.1699-r1.ebuild b/app-editors/gvim/gvim-8.0.1699-r1.ebuild index 56710eaccd85..ad19563f6259 100644 --- a/app-editors/gvim/gvim-8.0.1699-r1.ebuild +++ b/app-editors/gvim/gvim-8.0.1699-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # 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_COMPAT=( python{2_7,3_5,3_6} ) PYTHON_REQ_USE="threads" USE_RUBY="ruby23 ruby24 ruby25" diff --git a/app-editors/gvim/gvim-8.1.0034.ebuild b/app-editors/gvim/gvim-8.1.0034.ebuild index ec2135b35587..770309a137b4 100644 --- a/app-editors/gvim/gvim-8.1.0034.ebuild +++ b/app-editors/gvim/gvim-8.1.0034.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # 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_COMPAT=( python{2_7,3_5,3_6} ) PYTHON_REQ_USE="threads" USE_RUBY="ruby23 ruby24 ruby25" diff --git a/app-editors/gvim/gvim-8.1.0412.ebuild b/app-editors/gvim/gvim-8.1.0412.ebuild index 372fe57b79d6..dcf0e2d191ad 100644 --- a/app-editors/gvim/gvim-8.1.0412.ebuild +++ b/app-editors/gvim/gvim-8.1.0412.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # 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_COMPAT=( python{2_7,3_5,3_6} ) PYTHON_REQ_USE="threads" USE_RUBY="ruby23 ruby24 ruby25" diff --git a/app-editors/gvim/gvim-8.1.0648-r1.ebuild b/app-editors/gvim/gvim-8.1.0648-r1.ebuild index 49615d73c053..b8a4fdb1c61e 100644 --- a/app-editors/gvim/gvim-8.1.0648-r1.ebuild +++ b/app-editors/gvim/gvim-8.1.0648-r1.ebuild @@ -3,7 +3,7 @@ EAPI=6 VIM_VERSION="8.1" -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} ) +PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} ) PYTHON_REQ_USE="threads(+)" USE_RUBY="ruby23 ruby24 ruby25" @@ -16,7 +16,7 @@ if [[ ${PV} == 9999* ]]; then 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 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" + KEYWORDS="alpha amd64 arm ~arm64 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" diff --git a/app-editors/gvim/gvim-8.1.0648.ebuild b/app-editors/gvim/gvim-8.1.0648.ebuild index 8f7629521817..0b73a8cf4147 100644 --- a/app-editors/gvim/gvim-8.1.0648.ebuild +++ b/app-editors/gvim/gvim-8.1.0648.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 VIM_VERSION="8.1" -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} ) +PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} ) PYTHON_REQ_USE="threads(+)" USE_RUBY="ruby23 ruby24 ruby25" diff --git a/app-editors/gvim/gvim-8.1.1155.ebuild b/app-editors/gvim/gvim-8.1.1155.ebuild new file mode 100644 index 000000000000..35aedc92a30a --- /dev/null +++ b/app-editors/gvim/gvim-8.1.1155.ebuild @@ -0,0 +1,370 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +VIM_VERSION="8.1" +PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} ) +PYTHON_REQ_USE="threads(+)" +USE_RUBY="ruby24 ruby25 ruby26" + +inherit vim-doc flag-o-matic xdg-utils gnome2-utils bash-completion-r1 prefix python-single-r1 ruby-single + +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 ~arm64 ~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 gtk gtk2 lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl" +REQUIRED_USE=" + luajit? ( lua ) + python? ( ${PYTHON_REQUIRED_USE} ) +" + +RDEPEND=" + >=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? ( + gtk? ( + x11-libs/gtk+:3 + x11-libs/libXft + ) + !gtk? ( + gtk2? ( + >=x11-libs/gtk+-2.6:2 + x11-libs/libXft + ) + !gtk2? ( + 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? ( ${RUBY_DEPS} ) + selinux? ( sys-libs/libselinux ) + session? ( x11-libs/libSM ) + tcl? ( dev-lang/tcl:0= ) +" +DEPEND="${RDEPEND} + sys-devel/autoconf + virtual/pkgconfig + nls? ( sys-devel/gettext ) +" +# temporarily use PDEPEND to allow upgrades past icon file collision, bug #673880 +PDEPEND="~app-editors/vim-core-${PV}" + +# various failures (bugs #630042 and #682320) +RESTRICT="test" + +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/\<ctags\("\| [-*.]\)/exuberant-&/g' \ + "${S}"/runtime/doc/syntax.txt \ + "${S}"/runtime/doc/tagsrch.txt \ + "${S}"/runtime/doc/usr_29.txt \ + "${S}"/runtime/menu.vim \ + "${S}"/src/configure.ac || die 'sed failed' + + # 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 -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" || 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 + --with-gnome=no + $(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_with python python-command $(type -P $(eselect python show --python2))) + $(use_with python python3-command $(type -P $(eselect python show --python3))) + $(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 gtk GTK3 + # -aqua -gtk gtk2 GTK2 + # -aqua -gtk -gtk motif MOTIF + # -aqua -gtk -gtk -motif neXt NEXTAW + # -aqua -gtk -gtk -motif -neXt ATHENA + echo ; echo + if use aqua; then + einfo "Building gvim with the Carbon GUI" + myconf+=( + --enable-darwin + --enable-gui=carbon + ) + elif use gtk; then + myconf+=( --enable-gtk3-check ) + einfo "Building gvim with the gtk+-3 GUI" + myconf+=( --enable-gui=gtk3 ) + elif use gtk2; then + myconf+=( --enable-gtk2-check ) + einfo "Building gvim with the gtk+-2 GUI" + myconf+=( --enable-gui=gtk2 ) + 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() { + 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 + + # 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 + + # 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/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-9999.ebuild index 59218d3f5dc5..00fd53abf5c8 100644 --- a/app-editors/gvim/gvim-9999.ebuild +++ b/app-editors/gvim/gvim-9999.ebuild @@ -3,9 +3,9 @@ EAPI=6 VIM_VERSION="8.1" -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} ) +PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} ) PYTHON_REQ_USE="threads(+)" -USE_RUBY="ruby23 ruby24 ruby25" +USE_RUBY="ruby24 ruby25 ruby26" inherit vim-doc flag-o-matic xdg-utils gnome2-utils bash-completion-r1 prefix python-single-r1 ruby-single @@ -24,9 +24,8 @@ 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" +IUSE="acl aqua cscope debug gtk gtk2 lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl" REQUIRED_USE=" - luajit? ( lua ) python? ( ${PYTHON_REQUIRED_USE} ) " @@ -40,16 +39,16 @@ RDEPEND=" x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( - gtk3? ( + gtk? ( x11-libs/gtk+:3 x11-libs/libXft ) - !gtk3? ( - gtk? ( + !gtk? ( + gtk2? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft ) - !gtk? ( + !gtk2? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) @@ -73,12 +72,14 @@ RDEPEND=" tcl? ( dev-lang/tcl:0= ) " DEPEND="${RDEPEND} - dev-util/ctags sys-devel/autoconf virtual/pkgconfig nls? ( sys-devel/gettext ) " +# various failures (bugs #630042 and #682320) +RESTRICT="test" + S=${WORKDIR}/vim-${PV} pkg_setup() { @@ -188,7 +189,7 @@ src_configure() { myconf=( --with-features=huge --disable-gpm - --enable-multibyte + --with-gnome=no $(use_enable acl) $(use_enable cscope) $(use_enable lua luainterp) @@ -215,13 +216,12 @@ src_configure() { 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 + # aqua CARBON (not tested) + # -aqua gtk GTK3 + # -aqua -gtk gtk2 GTK2 + # -aqua -gtk -gtk motif MOTIF + # -aqua -gtk -gtk -motif neXt NEXTAW + # -aqua -gtk -gtk -motif -neXt ATHENA echo ; echo if use aqua; then einfo "Building gvim with the Carbon GUI" @@ -229,19 +229,14 @@ src_configure() { --enable-darwin --enable-gui=carbon ) - elif use gtk3; then + elif use gtk; then myconf+=( --enable-gtk3-check ) einfo "Building gvim with the gtk+-3 GUI" myconf+=( --enable-gui=gtk3 ) - elif use gtk; then + elif use gtk2; 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 + einfo "Building gvim with the gtk+-2 GUI" + myconf+=( --enable-gui=gtk2 ) elif use motif; then einfo "Building gvim with the MOTIF GUI" myconf+=( --enable-gui=motif ) diff --git a/app-editors/gvim/metadata.xml b/app-editors/gvim/metadata.xml index e0d65e43e29b..435a3f0120bc 100644 --- a/app-editors/gvim/metadata.xml +++ b/app-editors/gvim/metadata.xml @@ -7,6 +7,7 @@ </maintainer> <use> <flag name="cscope">Enable cscope interface</flag> + <flag name="gtk2">Enable GTK+2 interface</flag> <flag name="gtk3">Enable GTK+3 interface</flag> <flag name="netbeans">Include netbeans external editor integration support</flag> <flag name="racket">Enable support for Scheme using <pkg>dev-scheme/racket</pkg></flag> diff --git a/app-editors/mousepad/Manifest b/app-editors/mousepad/Manifest index 481aabafccfa..9bee06ab2a4b 100644 --- a/app-editors/mousepad/Manifest +++ b/app-editors/mousepad/Manifest @@ -1,5 +1,3 @@ -DIST mousepad-0.4.0.tar.bz2 578483 BLAKE2B d723ee7dc721703cfc46ad359dbf37c676ba12db4c8f4e874e1578b203a1f35cc077229ccbc9950b82e1784042f191018734cfaa09785b6b602388011db4a7b0 SHA512 5196abd04268d1ace118dc485b72bfcfb7f9175eeaf52bc97c08c1646371d26401403a3bb199d882380bcb998547c65af9bd054f0365afd846c0ad74d3c3b1fe DIST mousepad-0.4.1.tar.bz2 644161 BLAKE2B 656245afb38423cff7eb8a038c8247d9023e10eb85f574f25fd4fad50b0316cbe125630ddff330adb91c49eec9ee3ed67ecd0546b9fecb065c832882b3e42145 SHA512 2ffbb4245a3344437bd41f9f28cc066ae45062f6b6d169aa274e933f033c434f0b10845ccf42ab846dcad25ae7cee36ea6619bfb6889e8cd41c994be87b77be8 -EBUILD mousepad-0.4.0-r1.ebuild 1038 BLAKE2B 13e3b71311815f929ce27f769acbbd6125655c377eecf53837f0dc7db4b40c81cb9df26205ebe559a3117b4fe1981f353cd2ee5b84409897c7a1f7e246a36d28 SHA512 72ee6c2efb7add6ce32834423be4ac131b771ca02ed0dd444b6829add27843b7e3205c2d6dbeb8be532e6fffe199e5d20982dabfe0188320354571cdc87e77c5 EBUILD mousepad-0.4.1.ebuild 997 BLAKE2B b3aa9ff9fd24384dad2219a270187aff5c7e1954acef0bb10cd2a6707092a53b972d1f58bd397f871b28504e7c3e5cb1e73fa554939fa399538ef6e1da53a550 SHA512 be7e8177305687445becc4b2af67612c186f2b4d8d6e0bbbb8b5c58ba2442420da2537cabf64d52f2347cd725a416b763f33576f962866466ecc017f7183948c MISC metadata.xml 320 BLAKE2B cacb0475fb17dcfcb37f6adea12ec9ccdf5e54e2efbe32b373b0a26eeeda3f16bd3e76b0b6fd5027fcd1e7d1d400f87d72f8befca6df302fd6747407c87d2a50 SHA512 b19e2d6452858183bf2b4c11c9f7230fa56aeea86af72584c12c0c5bd21a883ac96f8f409b27e7ba802d2ef109d49a5b7eb652529e6d753483a35f74aac84caa diff --git a/app-editors/mousepad/mousepad-0.4.0-r1.ebuild b/app-editors/mousepad/mousepad-0.4.0-r1.ebuild deleted file mode 100644 index e9ce62e3020a..000000000000 --- a/app-editors/mousepad/mousepad-0.4.0-r1.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit gnome2-utils xdg-utils - -DESCRIPTION="GTK+-based editor for the Xfce Desktop Environment" -HOMEPAGE="https://git.xfce.org/apps/mousepad/about/" -SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="dbus gtk3" - -RDEPEND=">=dev-libs/glib-2.30:2= - dbus? ( >=dev-libs/dbus-glib-0.100:0= ) - !gtk3? ( >=x11-libs/gtk+-2.24:2= - x11-libs/gtksourceview:2.0= ) - gtk3? ( x11-libs/gtk+:3= - x11-libs/gtksourceview:3.0= )" -DEPEND="${RDEPEND} - dev-lang/perl - dev-util/intltool - sys-devel/gettext - virtual/pkgconfig" - -DOCS=( AUTHORS ChangeLog NEWS README TODO ) - -src_configure() { - local myconf=( - $(use_enable dbus) - $(use_enable gtk3) - ) - - econf "${myconf[@]}" -} - -pkg_postinst() { - gnome2_icon_cache_update - gnome2_schemas_update - xdg_desktop_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - gnome2_schemas_update - xdg_desktop_database_update -} diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest index db625834eeb1..c5d56c3ccf29 100644 --- a/app-editors/nano/Manifest +++ b/app-editors/nano/Manifest @@ -1,9 +1,8 @@ -AUX nano-4.0-variable_initialization.patch 1249 BLAKE2B bdcae72c88fd3e76bb5d22d69351977a00125e54deffcf2f4d16c85a00cd661b147db3aca680c905a977e05aeeda9a5a2c0a04303f98990f4d95787e18fce16f SHA512 d2b59bd5614a52d496c1a22bcd7ad9090a833fac2f1c3d46264d2ace37916495fccc04a248f8c255eb23a142335a13992db0f99ca2de27dd8efe984f6ce75876 -DIST nano-2.9.8.tar.gz 2905951 BLAKE2B 95b78c43a052be68956f5b9493c418c23a9db40b56f709b17217bce257333b69e78e8f8bec191b21df8aa408ce2d3c7d68bc82cf2f785df9b31929f4f41b4325 SHA512 dcc7b074b585135e34339648fc725f54964488813d49fac50cf88c11d7cfcb8514907dbc2631ce7664ab0241717e8c42833e3c037070c80c8e7bee68fc280a2d DIST nano-3.2.tar.gz 2944045 BLAKE2B 8d29d574ebf543f82608d4df26f551c0b3c77863b2ac8cfd0d3aea45340954abe6221069c9c72beab256c2c8cc4fcd3de27804404d97a98144c69ad26223de09 SHA512 33b3bbc5b5044b4003347e87926046fb5a0e83edfd6de858085526b7eaa9ea7ee26a598da00060a6b62edbd0366c7cb06b5a9878f6f0149a9501e4ada80b88f3 -DIST nano-4.0.tar.gz 2997716 BLAKE2B b5b7c172119518dc25ad1b77fda4a011225292b36bfeb042ede3191f7b7d576273c9172c9ab32271b4a648d8720c3745496526f0feb871e02d88ae3865cfacd5 SHA512 7548a3cf37aaa5f7ed9e951c18b3d058e8f587bcfbae0e707668f51ab9932aa467b8191117a7d1a76f090124cfe3e0e93ce4e1cccd8aa0bf7fd0d282caede5c1 -EBUILD nano-2.9.8.ebuild 2272 BLAKE2B 5c338053fba942e24c5e0da0073afc6dc6e78a09997ce82539e1ba069f23f6045b1f6299b7623294620839ba7067e5c08a66bf71263d8c52f50069b684d97f6b SHA512 f7b44353b2568c794e91f56177bab887f3e68bc25ab48a124dad3895e9e6a1691c8ec755da31b1c59985ab7f7a879cd1c10b91842bb28fa057839a793991440f -EBUILD nano-3.2.ebuild 2270 BLAKE2B fb1f7add3bdbcd2518df7289d06fd86c90e825926d003307860347e622aa8b5e047d40697f526c810037ead3619bc10e37fc999d9d94ac40736ed6f94c2cd314 SHA512 7ccc714b8e6604f1d64ec7579b418a3b1f78d2e210be7775a3523f1f1398b3ea449bfd2dd211dcda9dadedac0aeefd1d8f0d6c2cf1f03de7355bdf20d8d05591 -EBUILD nano-4.0-r1.ebuild 2231 BLAKE2B f0933acb7077d144406a96035341ce37459cb899b0d79f3fe6693c2a29cfd7f075974688b3dce5bdd63f921e5c1658de5309d926dff38ee3fbf34c691b38d19a SHA512 da8f8eb8d4c844b96a7d752e6fd3a9f0d97b053d74b9645712c166041b9931b4bff436385156754db8223d42674007f82dca4e222017ff4567e734e129255dbf +DIST nano-4.1.tar.gz 2918354 BLAKE2B 6f5438b2e4bb9a6de405a7519d1767697df1504e67aae37a75743b658b82d9bf13e0b561177415445827f8a63456afd4f689b1d34b6a3eb53c940972fa01f93d SHA512 982b845197aa2942eb8a49b2ac1bfd8cc65ec9b6b7f60190059367b4f9156b4f0bb5e56a123f0659b23c6c9d1d85733123350a8f04c433ccb32d4c8ef1135d12 +DIST nano-4.2.tar.gz 2928595 BLAKE2B 42bb0ccbf4961706c6c645eb2310a646a7decd3617117a079ffe9e3718c8054ab823a5aff3e543c06c4c398f83579a679267a9ad6f113ba451b76d67e14b07cc SHA512 a5dd9ce96cd09d12c65108ea6a18b2cf1c2b055929e58d3e84beb0725607b4b5a3f8ae3fda0ab658c853cc4cac70c089fee716e1bb5a700f2506a7a3e1bea1bd +EBUILD nano-3.2.ebuild 2263 BLAKE2B 23649d985976112b666b5ebf1f7c3217d33bfe61073a60c7a657619367ebf46260d769ec188e0e6c5edbac7f7847ee4fcb47907d3ac4f5a5f073fccbc5552ddf SHA512 eac38b715bd01e4a952955a67325c12290f03789545fdc1ad5c0ff77779c0dbcf531f7e2d2b4eec8face8040b640d588baf27bff8781d95d1263bd3d62405502 +EBUILD nano-4.1.ebuild 2168 BLAKE2B 23761d70bd47af380f5b73f7c6489e07629c8bae17a8f76ae6f8117adf19281012a70ad71a2baa0b1a7b112ff0698b30d67db92f466bf043fe83cbfc6cf2bc2c SHA512 4cfa9450c94543ec866a4b1d002401a7accd206cd8083487fa059aad4cb182b754c5f5a461156a2c8862f57d2590e61f2ea4d1649950c9dff3967f5012d86f2b +EBUILD nano-4.2.ebuild 2167 BLAKE2B 080b22cb427c898adae6c8a92d3ff006631cc23af17eb60e81562e3229a13813411c1f92d5fefc32d78ecec915c7e09662b2073c2b578d8088e59b145eed0942 SHA512 42f845600a37f56804f3cbcc02c6c52dc79c23e0e391125edfe9fb449dc5cead82fad043af3086bdbe7e5561223e74630131220ebb36b4ec795f0cb2cc82055d EBUILD nano-9999.ebuild 2167 BLAKE2B 080b22cb427c898adae6c8a92d3ff006631cc23af17eb60e81562e3229a13813411c1f92d5fefc32d78ecec915c7e09662b2073c2b578d8088e59b145eed0942 SHA512 42f845600a37f56804f3cbcc02c6c52dc79c23e0e391125edfe9fb449dc5cead82fad043af3086bdbe7e5561223e74630131220ebb36b4ec795f0cb2cc82055d MISC metadata.xml 1548 BLAKE2B 36d9d02603b824fd0af0f1a487fcdcd7ffe2266acc1459b137612efb7ff6af7b8dfd19d6deb0177dc5120eadb27e277e25ef01288c930c97bdab34cdc15b581b SHA512 97bce71ba1b5b906c48be48c5f0af78092acbef27c62bce92b515b773242e81a6e9b978970eda192df66e244e58832783147f0d35f0fab5350f1f9f0a0d83c82 diff --git a/app-editors/nano/files/nano-4.0-variable_initialization.patch b/app-editors/nano/files/nano-4.0-variable_initialization.patch deleted file mode 100644 index c72122ed7035..000000000000 --- a/app-editors/nano/files/nano-4.0-variable_initialization.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 7ad232d71470cd8c4dc63aeb02f11c9e8df9ecdb Mon Sep 17 00:00:00 2001 -From: Devin Hussey <husseydevin@gmail.com> -Date: Thu, 28 Mar 2019 17:28:47 -0400 -Subject: [PATCH] files: initialize a variable before referencing it - -The lack of initialization caused a nasty bug on some targets (such as -ARMv7) which would make it so that ^S would just say "Cancelled". - -While x86 (both 64 and 32 bits) seems to initialize 'response' to zero or -a positive number, ARM does not, and there is usually a negative value in -its place, which triggers the 'if (response < 0)' check and, as a result, -the code says "Cancelled". - -This fixes https://savannah.gnu.org/bugs/?56023. -Reported-by: Devin Hussey <husseydevin@gmail.com> - -Bug existed since version 4.0, commit 0f9d60a3. - -Signed-off-by: Devin Hussey <husseydevin@gmail.com> ---- - src/files.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/files.c b/src/files.c -index 84e3f684..fd54c168 100644 ---- a/src/files.c -+++ b/src/files.c -@@ -2101,7 +2101,7 @@ int do_writeout(bool exiting, bool withprompt) - - while (TRUE) { - const char *msg; -- int response, choice; -+ int response = 0, choice = 0; - functionptrtype func; - #ifndef NANO_TINY - const char *formatstr, *backupstr; --- -2.20.1 - diff --git a/app-editors/nano/nano-3.2.ebuild b/app-editors/nano/nano-3.2.ebuild index 1e3b8fded42d..ef6555432c21 100644 --- a/app-editors/nano/nano-3.2.ebuild +++ b/app-editors/nano/nano-3.2.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then else MY_P="${PN}-${PV/_}" SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz" - KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~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="GNU GPL'd Pico clone with more functionality" diff --git a/app-editors/nano/nano-4.0-r1.ebuild b/app-editors/nano/nano-4.1.ebuild index 05e4012530b3..c4767d265bd6 100644 --- a/app-editors/nano/nano-4.0-r1.ebuild +++ b/app-editors/nano/nano-4.1.ebuild @@ -33,10 +33,6 @@ BDEPEND=" virtual/pkgconfig " -PATCHES=( - "${FILESDIR}/${P}-variable_initialization.patch" -) - src_prepare() { default if [[ ${PV} == "9999" ]] ; then diff --git a/app-editors/nano/nano-2.9.8.ebuild b/app-editors/nano/nano-4.2.ebuild index a8742cb86825..aa130516a9a2 100644 --- a/app-editors/nano/nano-2.9.8.ebuild +++ b/app-editors/nano/nano-4.2.ebuild @@ -1,16 +1,16 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=7 -inherit eutils flag-o-matic +inherit flag-o-matic if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="git://git.sv.gnu.org/nano.git" inherit git-r3 autotools else MY_P="${PN}-${PV/_}" - SRC_URI="https://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz" - KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~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="GNU GPL'd Pico clone with more functionality" @@ -27,10 +27,11 @@ LIB_DEPEND=">=sys-libs/ncurses-5.9-r1:0=[unicode?] !ncurses? ( slang? ( sys-libs/slang[static-libs(+)] ) )" RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" DEPEND="${RDEPEND} + static? ( ${LIB_DEPEND} )" +BDEPEND=" nls? ( sys-devel/gettext ) virtual/pkgconfig - static? ( ${LIB_DEPEND} )" - +" src_prepare() { default if [[ ${PV} == "9999" ]] ; then @@ -46,7 +47,6 @@ src_configure() { $(use_enable !minimal color) $(use_enable !minimal multibuffer) $(use_enable !minimal nanorc) - --disable-wrapping-as-root $(use_enable magic libmagic) $(use_enable spell speller) $(use_enable justify) @@ -56,16 +56,13 @@ src_configure() { $(use_enable minimal tiny) $(usex ncurses --without-slang $(use_with slang)) ) - case ${CHOST} in - *-gnu*|*-uclibc*) myconf+=( "--with-wordbounds" ) ;; #467848 - esac econf "${myconf[@]}" } src_install() { default # don't use "${ED}" here or things break (#654534) - rm -r "${D%/}"/trash || die + rm -r "${D}"/trash || die dodoc doc/sample.nanorc docinto html @@ -76,7 +73,7 @@ src_install() { # Enable colorization by default. sed -i \ -e '/^# include /s:# *::' \ - "${ED%/}"/etc/nanorc || die + "${ED}"/etc/nanorc || die fi dosym ../../bin/nano /usr/bin/nano diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest index 2486837d9607..6a826368282e 100644 --- a/app-editors/neovim/Manifest +++ b/app-editors/neovim/Manifest @@ -6,7 +6,7 @@ DIST neovim-0.3.4.tar.gz 9231575 BLAKE2B 92e727264442794ae27642451c90381262f9882 EBUILD neovim-0.3.1-r1.ebuild 2007 BLAKE2B d6262beec656c799ce6e4b8288d1eace55300f039a3985ad3db60b3fe3e4dfab45673dafb78ad71f73beedd42504028b42f4d9646ca729208c07d92f95ae6c87 SHA512 d5356d986f204cd21aff004fd6df855cb350e0721b15536fea4f04175f41694b33249c4b660ee02769502767bb921a5af5170cd88e446a1a3dff7be80f40ea09 EBUILD neovim-0.3.2.ebuild 2007 BLAKE2B dd3749e9464be6acfb02dd3359ce9f1ea5e18c9f0164f6fce135f2ee1d2ed0333ea4434d8a07f01e6779bfc038fb3a4769fa1c2cdb9edfa1b4eb75f4cb09ad0f SHA512 d24a4080f31ce6f61a0cc2120cef02c4ccaed5d8527e9089be1c60899040003a42a479f712153dadbcbc7f5c505f2efa04cd590c8ebb7f3a0edadeb8deb1e1e8 EBUILD neovim-0.3.3.ebuild 2007 BLAKE2B dd3749e9464be6acfb02dd3359ce9f1ea5e18c9f0164f6fce135f2ee1d2ed0333ea4434d8a07f01e6779bfc038fb3a4769fa1c2cdb9edfa1b4eb75f4cb09ad0f SHA512 d24a4080f31ce6f61a0cc2120cef02c4ccaed5d8527e9089be1c60899040003a42a479f712153dadbcbc7f5c505f2efa04cd590c8ebb7f3a0edadeb8deb1e1e8 -EBUILD neovim-0.3.4-r1.ebuild 2010 BLAKE2B ab6dd7545f58f942896ec08fb7ac779e3a1773dfee720aa3db07c676ffb6a2bb167fb1591ab6056b0b0e9965a86e670302687f1a82f9481a8b8a252eb8239d09 SHA512 0592c90132749246376e0e92a702aef079d691a5c206a0c6e6aeb0bd565665cde5fc8301bbf6fb95fc39827c606bfd4a42e46930e3436cc811bdd8fbcf15df6c +EBUILD neovim-0.3.4-r1.ebuild 2015 BLAKE2B 4e87d237bb7fcab7d05749b59ea83799a59c0cf57cf2fa5316703b3b93f973fa2e67482d9077a188d3494763f398b759e0d5405d0489fd81225520b31a20f55d SHA512 3a7c3e4ca89a13305d584f5bba7889d041666ede0f54e4f399e76f7f35ad11fa549a4c1e20e7cf8807342a97e6522285fc56f3249a768d0805a636790e910e0a EBUILD neovim-0.3.4.ebuild 1986 BLAKE2B cc5c1ac7fb5a6540035f708068b9a7c0011c74e4a96ae279b26864d87481012763314b85e9b9c93f0582500438b37b1dd6e59000dfdd41b28d2bc0e544f6c620 SHA512 d557deaceffa99fe4ce79a23678ffa2690fb7f5ea5c3be7c7bc80916cf2bf16f8e870a4e59514e9531e9fe60f4c44b2cb973f015775e278ffcd495b6b6fd396c EBUILD neovim-9999.ebuild 1953 BLAKE2B 628bf1d0fd2883e930722178b9530a8b391bd23fe5dd69cafcf4027bf5ebea2ef4085d2ce2e09e27e97f4ab67f8c00baafddf4759a6754c132c3b75c61992fce SHA512 964119b4ac52f276a558fc9cb01edfc585cdf6aee0be64b62344f8382db501196e06f847e34b71b7de8ae0c3510dedcd9efc281b3d7a4e54054fe97a7a8d09ef MISC metadata.xml 638 BLAKE2B 04414f861c324475a2884bfb4d06aee0a81bc4d934702102826c0ee7a2ec4da1a6ee40fd8369031e0d1bb8c4102d7d9ec60cc375ca83e32f895cbd5556bf06e6 SHA512 9c037165687b9a6959cdbbf9583c1ac8974a58ed0ef34b9f6ba2fdb157be895823c1956ee1bc0a6dd8cbba405399847377ce860c2d2740160f7b2475d34323b9 diff --git a/app-editors/neovim/neovim-0.3.4-r1.ebuild b/app-editors/neovim/neovim-0.3.4-r1.ebuild index 0bebd86bae25..c3e917afd7fe 100644 --- a/app-editors/neovim/neovim-0.3.4-r1.ebuild +++ b/app-editors/neovim/neovim-0.3.4-r1.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/neovim/neovim.git" else SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 ~arm ~x86" fi LICENSE="Apache-2.0 vim" diff --git a/app-editors/okteta/Manifest b/app-editors/okteta/Manifest index 404d46b929f6..261e172cc0b4 100644 --- a/app-editors/okteta/Manifest +++ b/app-editors/okteta/Manifest @@ -1,5 +1,5 @@ DIST okteta-0.25.5.tar.xz 953492 BLAKE2B ca8c40df7cf3fe40a4be6f6e2b9d1f787baa658910c3c14ced73f3f3d95c942c00ccfe559562b2e0330726723ffba8e4c7c526369453517e1fd45d3d5ce0336e SHA512 dfe45a2bc3b3fbbce8342e6282981a63a342aee47d0d90cf07449f6974ebdbac53adc7fa9f0b37a7d003370994233f002df277ecebdb6f4c03995ce50d1dbd71 -DIST okteta-0.26.0.tar.xz 969968 BLAKE2B 2041269caf027c6641e53ac5b89f5bea7323639a78d6c340007cb29fc662afc9bf99a918b8fe3ab0fb5b7a2ebd5a6278350fc1d33011dbe0db32761be9268996 SHA512 a9fd4a2481003ea16248ac49faf5061e581977fe5ee532fa67207a071259889282b5d38e84ae2eaaf1a13101774ebe415d6f7861c3f422b8a3553c6ab3b344da +DIST okteta-0.26.1.tar.xz 970532 BLAKE2B c04e0c4a2665f91cde26ee28b95f768f3074a08c8fd30920c75f3ce52fdfa717e3e6cea9acf87c3c5d53c830e5badb51faa2abcebd5b55839ea4ee52874a6d4c SHA512 fa4e841c77ae255e9936b29e30fa0bc1f65594898820652ac8ba78497658ec5ef78cadf8b4d33cab09b2ee8da1d75b84377be28680b2d91c5af2dcdfe5da95e3 EBUILD okteta-0.25.5.ebuild 1601 BLAKE2B 3a9316ba4144b2526299fd4908de872fbac8d2aa689fd92af634a28c50c271065a6b5b2655cef3f35e912cbed881ac18fab5e609086a0f5496014fcaf93fcf98 SHA512 59148b828cb28f46cfd10a84defa661bba899bddfb31fa58d9253b4e1d9f34872aacbf7f77388c478999a303f2bea9181e86dd97f09182a1883ccd9f6e2f7f4a -EBUILD okteta-0.26.0.ebuild 1603 BLAKE2B 2447f14877267e6295e4caa2e0af4ac4d6e5306c31957fddbcc72ee732cc17d75b7c82c5a4ed9595fb185d3b028a0596b24e04fab46d3f41d1b121daf925a8f3 SHA512 d357c46c9aaaffde3a1efa528349707584c2136f784fa183c1288eed44cf08711bc335c877dd2198abfaa0576a662d6d3f8ecd837e32aa304d1771bcda1ef4ba +EBUILD okteta-0.26.1.ebuild 1602 BLAKE2B f6b6258f594399f84c015bcbd133ebdc1a71735a43337ebaaee7baff9316c1529eb7bb77f6f527808817e4bef5dcec5d1b285353382fd207495316a283498f9d SHA512 348956027c43a5b139a765993b33c6bd5da9a09c3aac94151a232bfed61a40b23593810f0d6731eb6e3f3d7a6a77cbb180422f1ff5b2b3871fc508e92d623b6f MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae diff --git a/app-editors/okteta/okteta-0.26.0.ebuild b/app-editors/okteta/okteta-0.26.1.ebuild index 26543662e047..6ffa594faf9f 100644 --- a/app-editors/okteta/okteta-0.26.0.ebuild +++ b/app-editors/okteta/okteta-0.26.1.ebuild @@ -10,7 +10,7 @@ inherit kde5 if [[ ${KDE_BUILD_TYPE} = release ]]; then SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="amd64 ~x86" fi DESCRIPTION="Hex editor by KDE" diff --git a/app-editors/padre/Manifest b/app-editors/padre/Manifest index c36d663adf59..5dff0f6218bb 100644 --- a/app-editors/padre/Manifest +++ b/app-editors/padre/Manifest @@ -1,5 +1,4 @@ AUX padre-1.0.0-DBD-Sqlite.patch 1139 BLAKE2B e46deb29f997585e78f2316796ce2aaeb6f04b0b984f76f502e140873cdf872a42e26548dc7a1c2cbdefecad1be705fcae04b9f697e541476088fb9140a94d95 SHA512 a23818ef3bedf24a11e8e1cdf5aca8b0a3eb67123e796c0014116c51c2b2c7c55bbe50f04bc200650e3e4b34c519929478d4ff4b38b120a360d8d23438c36a4d DIST Padre-1.00.tar.gz 1969274 BLAKE2B 2c0a982b2addaaa8c2cf994c2aeed7985779b3c9663b3022c83a67ebc4a3d0c35fa7f5e6d0f7649cf9e47c51e1a01df42a977e03366f0f2b75c76964b4bf1dde SHA512 8a2630eb54944b85ec77eaf90595fe6bb482b88ae87622b9e54973fbc1cc5f7ccf83d7b2481a9a66886310db9678569d23b18de033f7759db71ac73fd3151856 EBUILD padre-1.0.0-r1.ebuild 2834 BLAKE2B b195570fca53d8f09683a4462d06a138c867c7deb7ffac8de872c3c6de5c7f4d0e9bd88c57d66eb25c7a9ca326f998f7630ac683f143a6d42d45a368983d43ed SHA512 a510626b62b631481aa62b0d8c033d4229a7220d3f179e2f10f91ef50b48a9ba9174b2adca416c4ea153643269a83e172d13ed67d583f8b205f2ae526ef9ad84 -EBUILD padre-1.0.0.ebuild 2852 BLAKE2B 601d6fae4be854c4d2ee3496f790b29e2fa9f06a80142eeadce31e5e1b1210d7a9e59f9427dc145c53458005ad0066056d2620488f553dbfed3296bae19b13f7 SHA512 fb3dd90a40c8331fdd3f066464cb648a84922edf1a69cdc3738c43e52c95ac59bf033bf33fec56dbc8a14f64c0e7407a047ea1a47e4962785b4704e49cfbc174 MISC metadata.xml 329 BLAKE2B 7115d35fa36e4d84896fee53da9a121ffdfb07ca64ad3c440e3a48197330549d6386605f3e28bb56c9b21b04f7a2d68e16dc98009ef9d67173011a9d1112f24e SHA512 303fdbb023bfe2ab534a2b0d17257c6d5e7dcf5d8647d300823f5bb556d1ffc5005c8cf47829b4178b0d3111e0dc71db9a6c620a8ac92bf639680ec2fee37d0d diff --git a/app-editors/padre/padre-1.0.0.ebuild b/app-editors/padre/padre-1.0.0.ebuild deleted file mode 100644 index bc3967a1dbb3..000000000000 --- a/app-editors/padre/padre-1.0.0.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -MY_PN=Padre -MODULE_AUTHOR=PLAVEN -MODULE_VERSION=1.00 -inherit perl-module - -DESCRIPTION="Perl Application Development and Refactoring Environment" -HOMEPAGE="http://padre.perlide.org/" - -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -# Test Deps -TDEPEND=" - >=dev-perl/Test-MockObject-1.09 - >=dev-perl/Test-Script-1.07 - >=dev-perl/Test-Exception-0.27 - >=dev-perl/Test-NoWarnings-0.084 - >=virtual/perl-Test-Simple-0.88 - >=dev-perl/Test-Warn-0.240.0 -" - -# Depend on perl-5.10.1 but it only needs -# a modern EU::MM -# >=virtual/perl-Pod-Perldoc-3.15 -RDEPEND=" - >=dev-lang/perl-5.10.1 - >=dev-perl/Algorithm-Diff-1.190.0 - >=dev-perl/Capture-Tiny-0.06 - >=dev-perl/Class-Adapter-1.05 - >=dev-perl/Class-Inspector-1.22 - >=dev-perl/Class-XSAccessor-1.130.0 - >=dev-perl/DBD-SQLite-1.350.0 - >=dev-perl/DBI-1.58 - >=dev-perl/Devel-Dumpvar-0.04 - >=dev-perl/Debug-Client-0.200.0 - >=dev-perl/Devel-Refactor-0.05 - >=dev-perl/File-Copy-Recursive-0.37 - >=dev-perl/File-Find-Rule-0.30 - >=dev-perl/File-HomeDir-0.91 - >=virtual/perl-File-Path-2.08 - >=dev-perl/File-Remove-1.40 - >=dev-perl/File-ShareDir-1.00 - >=virtual/perl-File-Spec-3.27.01 - >=virtual/perl-File-Temp-0.20 - >=dev-perl/File-Which-1.08 - dev-perl/File-pushd - virtual/perl-Getopt-Long - >=dev-perl/HTML-Parser-3.58 - >=dev-perl/IO-stringy-2.110 - virtual/perl-IO - >=dev-perl/IO-String-1.08 - >=dev-perl/IPC-Run-0.83 - >=dev-perl/JSON-XS-2.2.9 - >=virtual/perl-Scalar-List-Utils-1.18 - >=dev-perl/libwww-perl-5.815 - >=dev-perl/List-MoreUtils-0.22 - >=dev-perl/Locale-Msgfmt-0.15 - >=dev-perl/Module-Manifest-0.07 - >=dev-perl/ORLite-1.960.0 - >=dev-perl/ORLite-Migrate-1.100.0 - >=dev-perl/PAR-0.989 - >=dev-perl/Params-Util-0.33 - >=dev-perl/Parse-ErrorString-Perl-0.14 - >=dev-perl/Parse-ExuberantCTags-1.00 - >=dev-perl/Pod-Abstract-0.16 - >=dev-perl/Pod-POM-0.17 - >=virtual/perl-Pod-Simple-3.07 - >=dev-perl/PPI-1.205 - >=dev-perl/PPIx-EditorTools-0.130.0 - >=dev-perl/PPIx-Regexp-0.011 - dev-perl/Probe-Perl - >=dev-perl/Sort-Versions-1.500.0 - >=virtual/perl-Storable-2.16 - >=dev-perl/Template-Tiny-0.11 - >=virtual/perl-Text-Balanced-0.80 - >=dev-perl/Text-Diff-1.410.0 - >=dev-perl/Text-FindIndent-0.10 - >=dev-perl/Text-Patch-1.800.0 - >=virtual/perl-threads-1.71 - >=virtual/perl-threads-shared-1.33 - >=virtual/perl-Time-HiRes-1.97.18 - >=dev-perl/URI-0 - >=dev-perl/Wx-0.990.100 - >=dev-perl/Wx-Perl-ProcessStream-0.28 - >=dev-perl/Wx-Scintilla-0.340.0 - >=dev-perl/YAML-Tiny-1.32 - >=virtual/perl-version-0.79 -" -DEPEND="${RDEPEND}" -# test? ( -# ${TDEPEND} -# ) -#" - -#SRC_TEST=do - -src_configure() { - unset DISPLAY - perl-module_src_configure -} - -src_prepare() { - sed -i -e 's/use inc::Module::Install/use lib q[.];\n use inc::Module::Install/' Makefile.PL || - die "Can't patch Makefile.PL for 5.26 dot-in-inc" - perl-module_src_prepare -} diff --git a/app-editors/pluma/Manifest b/app-editors/pluma/Manifest index 9bee3808a316..21cac4dc54f6 100644 --- a/app-editors/pluma/Manifest +++ b/app-editors/pluma/Manifest @@ -1,5 +1,3 @@ -DIST pluma-1.18.3.tar.xz 3355188 BLAKE2B d53f381aa9c74cad0df82ccc73aaab9f87347cb8e3886471a2531bdd4d49a84ee97a50f2333b2e375f9bc2a634c25dc69b36659dcb589ace716e523a9d0b4544 SHA512 62ad57a8d7626e34c15610e121869ee9b06a2498acb40ec0a60839ca0273d146bd59682d352c3e98d892460c444c5442d32673c2f63897bb8c3e9e595e771dc1 DIST pluma-1.22.0.tar.xz 3235612 BLAKE2B a0cda23a6ee73e562cb32c3f1430590042248b6a6e7cbf021103db507450b2a594506f3d8283eeed08e2ba5006ff51376eb6db5e94ea5ac9d5707b29e0efc2c4 SHA512 7c74c2ce0a89ec3813c936449d3114957e7b319433875ef567ecc508a28a1d3ddc3d0da418b2eb1278b6dc9dbaa3c75a279524f5a061b5aecb52955edcf28f51 -EBUILD pluma-1.18.3.ebuild 1762 BLAKE2B 5308bc86e3b681a3dd36fff0205dc4f45e4bbb1a490d135e975b38e1a66c400da7d3ee7014e34586d10ee5942e9366402a440d9cda2599e2dcbf256b524c1158 SHA512 8446e2f3c119ea9c1ed81b85265fc012c6d1990c5b12b56c9d3086e683c3b16b91e6e631c00f664b9027d60dfff1953b444e8135c9dc2af0da98eba6f0452b69 -EBUILD pluma-1.22.0.ebuild 1728 BLAKE2B 57c49c3aefc6f5e42258e718b8fe9ec6446750f62008e650a5ab88e0da1757708b99b4ae9c09936433f76fecf6253b1783ca9d12627ee2ab429894afa6acbe4b SHA512 87ab096902be646229adcf401f3edd1050829bdba64bffeeb216443fa7da48504c7272b7bf53ae541efde6027fabf731ade8b167ada9edd6bbf24d37507adca6 +EBUILD pluma-1.22.0.ebuild 1743 BLAKE2B 40c26b28de7ba18f07cb417ebf2b94e02dae42b5a3f81f9954c2c018056424755ec3e3d7233198f258beeb690be86fd96ccca9a30c254e9059c42e2edb812d97 SHA512 596cffd23ece2b64af7afd0d75d416b1a23757ed4a868e3247c8d188f06ab79c6bc7ec7cafd0ac331d650968771100e980471ece1f933c9ed990cf327e586a4a MISC metadata.xml 334 BLAKE2B 2d5ac79ba6879f5486724c826a89ed81cf393bc3fedbdea40764b1fb23962672e7c2a625137080a16ccd8e67a55097a4f497269f89ccd8b256490ef99e15b9cb SHA512 fe30c9986ed7086a894a0835847351d92938c424af5b7da51211a23fc197eebbce53cc205014cdd2c3bcc951a5a449c5d5726bede7991716d81fb7bbfe8a3fca diff --git a/app-editors/pluma/pluma-1.18.3.ebuild b/app-editors/pluma/pluma-1.18.3.ebuild deleted file mode 100644 index 3e8abed509f2..000000000000 --- a/app-editors/pluma/pluma-1.18.3.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MATE_LA_PUNT="yes" - -PYTHON_COMPAT=( python2_7 ) - -inherit mate multilib python-single-r1 virtualx - -if [[ ${PV} != 9999 ]]; then - KEYWORDS="amd64 ~arm ~arm64 x86" -fi - -DESCRIPTION="Pluma text editor for the MATE desktop" -LICENSE="GPL-2" -SLOT="0" - -IUSE="+introspection spell" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -# Tests require gvfs sftp fs mounted and schema's installed. Disable tests. -# https://github.com/mate-desktop/mate-text-editor/issues/33 -RESTRICT="test" - -COMMON_DEPEND="dev-libs/atk:0 - >=dev-libs/glib-2.36:2 - >=dev-libs/libpeas-1.2.0[gtk] - >=dev-libs/libxml2-2.5:2 - x11-libs/cairo:0 - x11-libs/gdk-pixbuf:2 - >=x11-libs/gtk+-3.14.0:3[introspection?] - >=x11-libs/gtksourceview-3.0.0:3.0 - x11-libs/libICE:0 - x11-libs/libX11:0 - >=x11-libs/libSM-1.0 - x11-libs/pango:0 - virtual/libintl:0 - introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) - spell? ( - >=app-text/enchant-1.2:0 - >=app-text/iso-codes-0.35:0 - ) - !!app-editors/mate-text-editor" - -RDEPEND="${PYTHON_DEPS} - ${COMMON_DEPEND} - >=mate-base/mate-desktop-1.9[introspection?]" - -DEPEND="${COMMON_DEPEND} - ~app-text/docbook-xml-dtd-4.1.2 - app-text/rarian:0 - >=app-text/scrollkeeper-dtd-1:1.0 - app-text/yelp-tools:0 - dev-util/gtk-doc - dev-util/gtk-doc-am - >=dev-util/intltool-0.50.1:* - >=sys-devel/libtool-2.2.6:2 - >=sys-devel/gettext-0.17:* - virtual/pkgconfig:*" - -src_configure() { - mate_src_configure \ - $(use_enable introspection) \ - $(use_enable spell) -} - -src_test() { - # FIXME: This should be handled at eclass level. - "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die - - unset DBUS_SESSION_BUS_ADDRESS - - GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check -} diff --git a/app-editors/pluma/pluma-1.22.0.ebuild b/app-editors/pluma/pluma-1.22.0.ebuild index 7033486f3273..cf7016392b87 100644 --- a/app-editors/pluma/pluma-1.22.0.ebuild +++ b/app-editors/pluma/pluma-1.22.0.ebuild @@ -10,7 +10,7 @@ PYTHON_COMPAT=( python2_7 ) inherit mate python-single-r1 virtualx if [[ ${PV} != 9999 ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~x86" + KEYWORDS="amd64 ~arm ~arm64 x86" fi DESCRIPTION="Pluma text editor for the MATE desktop" @@ -54,12 +54,13 @@ DEPEND="${COMMON_DEPEND} app-text/rarian >=app-text/scrollkeeper-dtd-1:1.0 app-text/yelp-tools + dev-util/glib-utils dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.50.1 >=sys-devel/libtool-2.2.6:2 - >=sys-devel/gettext-0.17:* - virtual/pkgconfig:*" + >=sys-devel/gettext-0.17 + virtual/pkgconfig" src_configure() { mate_src_configure \ diff --git a/app-editors/retext/Manifest b/app-editors/retext/Manifest index 7cce4dc51ccc..cf0c828d827a 100644 --- a/app-editors/retext/Manifest +++ b/app-editors/retext/Manifest @@ -2,10 +2,10 @@ DIST ReText-7.0.0.tar.gz 203294 BLAKE2B 613004d9e2aaba52e25dec49270ecaf429f5c9dd DIST ReText-7.0.1.tar.gz 266582 BLAKE2B 9a2bf5ee433550b9df777fc65254bf52097730143e491fa52b2312709473905caf45fc63fe96ac04adb94bdbc9ea8e8840c4e5d65cb0da25727d3cdd198d2f97 SHA512 eb6b1f6df1e490d9058f3431c023119afff05e81917bb5402a35a100538283a157d2853d10c015a415a5d7e78aac4a2489307a0ef60004d48d8b1f9207a07567 DIST ReText-7.0.3.tar.gz 396334 BLAKE2B f40ffb159f94d28f1649561a41f557a5d11c2d00e4a01a99493ecac9795bca41c4675bc364c3c58e557bd78c2803f774793042426921436b4be43129f3c88170 SHA512 67b16dc2d7207cc72a58a5ede7440b191c8afdd08e6d4b21159e781585ca16ddfb4d0d16052fc50d716e2edfd983559e25c22ac80dd408cdb3fdb82a2f6bce57 DIST ReText-7.0.4.tar.gz 402934 BLAKE2B bae66a5fb8e81192d692d1a239706e2feee6ee940685cffdf3498880b2c9bd67cc85c6150e372a383e4bad13da210426fff95c06b2861b58020c2c6d298cf5d2 SHA512 cb12666b15414f4bf83f3b07c94d3bcba13dd3e6c3832c66520bfe8caafeeb87cc083a1e74530d98d6e00a00363add55fdf873e6de385e637876454130deebb3 -EBUILD retext-7.0.0-r2.ebuild 1457 BLAKE2B 4047fa55e80de792a92f4214d3f2cbc0b6c40e61e729d7978e965f38577e9851b2fd205761329377a0ee753086452dd19a510afc3a9b14ef0de819883af811e7 SHA512 5bf8e31a91384b7644d8e85ef43d7a5cd9b74b7cbfafc80f28d2a21a6c6397d1febb3c25b74be2c3d672f21fb852b1acbd137e921977b8a9df84d9969e5117d5 -EBUILD retext-7.0.0.ebuild 1369 BLAKE2B c5d82c6765b7b5d66d44ab3a71221b764be3694207256ee922a08911c34eb6d2ab8e6648ee483da73c171ea66c91c9e8677ce83421a7bdc7361136d5c6bae37c SHA512 6c5bed210a70800b32ae1ae9e57e36c47a622982b505ec195e4120e2dfc5f08863bc6e070c8a3f1978430f3473d2a9ed7f54fed474c6caac50ede0141df8afc4 -EBUILD retext-7.0.1-r2.ebuild 1457 BLAKE2B 4047fa55e80de792a92f4214d3f2cbc0b6c40e61e729d7978e965f38577e9851b2fd205761329377a0ee753086452dd19a510afc3a9b14ef0de819883af811e7 SHA512 5bf8e31a91384b7644d8e85ef43d7a5cd9b74b7cbfafc80f28d2a21a6c6397d1febb3c25b74be2c3d672f21fb852b1acbd137e921977b8a9df84d9969e5117d5 -EBUILD retext-7.0.3.ebuild 1464 BLAKE2B a8339b12f9b95f80dea21c98bdee6f75d6a22764f7c6e0b682bc244c99f7debd94816a01abe4671f90a2429a56da22177b01c9e00ec949c5a08b9329ac8dfb5d SHA512 a678e0ec70572140db56c5a0fa03917dbdecf6dd279a41e2824ceb158398846dd12ffca00adb451d9a5c98e77d96860a29c87748821c24879fd916f8110ec9ad -EBUILD retext-7.0.4.ebuild 1816 BLAKE2B 299e9d6cdab2a606b1ef48053fff9e925c8d648a8a2782c35adff33c4bc9d0264c636716cdc865c9ce6a5efb14b8ba74d86116c24e3cd6a2d3e1eb50bf5f0451 SHA512 d7aaa29d3f26b0aab9bab21d5877bcf5b9f21f94b37dcc3855b7132c6ed56175fe0bc2d3d3b45793ebd520f5c7d2164970c020a8a5f0a0f0ab3fa6148232513c -EBUILD retext-9999.ebuild 1816 BLAKE2B 299e9d6cdab2a606b1ef48053fff9e925c8d648a8a2782c35adff33c4bc9d0264c636716cdc865c9ce6a5efb14b8ba74d86116c24e3cd6a2d3e1eb50bf5f0451 SHA512 d7aaa29d3f26b0aab9bab21d5877bcf5b9f21f94b37dcc3855b7132c6ed56175fe0bc2d3d3b45793ebd520f5c7d2164970c020a8a5f0a0f0ab3fa6148232513c +EBUILD retext-7.0.0-r2.ebuild 1452 BLAKE2B 2166f6a0ddcfc4db1ec772819b479420e6e2c04da8a94cd75933b1f34c21b00d46d83f0cc09558e437b16a73e0dd398ffc1a8cc4126b9d40b4053db134ff1058 SHA512 9ed383aecf7328810d7dd1915389b15d3419d144e10228f0cd4992bdf293ca28f621fc07cc6927019a4679b3c6b1e9a20fe1ce8bd73bd2af3c0f35e9e6808873 +EBUILD retext-7.0.0.ebuild 1364 BLAKE2B 98e671d8fcac8d2d2074acfb5ac45ae377df5d1db8149ab514e7af6fa1c2890d5812b23f841d29eb618a23ae8c32317c07c3387ee60f3135346300eb7e1e956e SHA512 60468a723500702ff1d723e2c3b95a81d375a707b6807fb5c4d3603bc2761012134342630838015932af2d3c3acd4ad2a8d20e5514a6e7468ddc42df671cc1cf +EBUILD retext-7.0.1-r2.ebuild 1452 BLAKE2B 2166f6a0ddcfc4db1ec772819b479420e6e2c04da8a94cd75933b1f34c21b00d46d83f0cc09558e437b16a73e0dd398ffc1a8cc4126b9d40b4053db134ff1058 SHA512 9ed383aecf7328810d7dd1915389b15d3419d144e10228f0cd4992bdf293ca28f621fc07cc6927019a4679b3c6b1e9a20fe1ce8bd73bd2af3c0f35e9e6808873 +EBUILD retext-7.0.3.ebuild 1459 BLAKE2B 558340a8f50de7cb2b8f93039eb36e9db3780bc234cde9215c5591cfe0f4f3e164c79aecf11d1fa1a65bdcb177e6f3eec4ec65e51a476e5cde068627029ec898 SHA512 b6ea0348d90949be4ab5e3b387dea4658664337c71770490e31194c89be3cbd4addfa32c3849e211bf50cc80831058abf7bfe6e4ab975d5aad6e249435720731 +EBUILD retext-7.0.4.ebuild 1814 BLAKE2B 4ad4a8c595d84d63fb10f4abe8e11e84ef502988daef15991c667dfe263900d9d4df17b42d6b5e8a1acfaf322bb9db84c53fedf99fdf770339408d6f75028c36 SHA512 322db19500aa869baac062a6965d8a24c35fa926175840d233c4c51fc1b67fcdd02b308f052b178fbf3ad7f469e1575fa9a3f1d2feee59f6363c478a6a4eeb49 +EBUILD retext-9999.ebuild 1814 BLAKE2B 4ad4a8c595d84d63fb10f4abe8e11e84ef502988daef15991c667dfe263900d9d4df17b42d6b5e8a1acfaf322bb9db84c53fedf99fdf770339408d6f75028c36 SHA512 322db19500aa869baac062a6965d8a24c35fa926175840d233c4c51fc1b67fcdd02b308f052b178fbf3ad7f469e1575fa9a3f1d2feee59f6363c478a6a4eeb49 MISC metadata.xml 496 BLAKE2B ad4453602e60bdaf37553cd2fe8c9ea8abc163a86fded505e69bfa06f40d503b0cc58651068a4c52a6ffd0c8368f855512ec83aefff4a64a696e1b042a129e6a SHA512 0e182c5ddf9ac27dd9b6eb70c9a3ebdf711552e4e00db2d66696bdd992dc7824f51c86acb60f044342534b230c9884d45c55177d05f7ea92be81297994b7f559 diff --git a/app-editors/retext/retext-7.0.0-r2.ebuild b/app-editors/retext/retext-7.0.0-r2.ebuild index b69ab5bac2a4..6a54d0289889 100644 --- a/app-editors/retext/retext-7.0.0-r2.ebuild +++ b/app-editors/retext/retext-7.0.0-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -PYTHON_COMPAT=( python3_{4,5,6} ) +PYTHON_COMPAT=( python3_{5,6} ) PLOCALES="ca cs cy da de es et eu fr hu it ja pl pt pt_BR ru sk sr sr@latin uk zh_TW" diff --git a/app-editors/retext/retext-7.0.0.ebuild b/app-editors/retext/retext-7.0.0.ebuild index 526562e3fad2..b85feedbdb43 100644 --- a/app-editors/retext/retext-7.0.0.ebuild +++ b/app-editors/retext/retext-7.0.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -PYTHON_COMPAT=( python3_{4,5,6} ) +PYTHON_COMPAT=( python3_{5,6} ) PLOCALES="ca cs cy da de es et eu fr hu it ja pl pt pt_BR ru sk sr sr@latin uk zh_TW" diff --git a/app-editors/retext/retext-7.0.1-r2.ebuild b/app-editors/retext/retext-7.0.1-r2.ebuild index b69ab5bac2a4..6a54d0289889 100644 --- a/app-editors/retext/retext-7.0.1-r2.ebuild +++ b/app-editors/retext/retext-7.0.1-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -PYTHON_COMPAT=( python3_{4,5,6} ) +PYTHON_COMPAT=( python3_{5,6} ) PLOCALES="ca cs cy da de es et eu fr hu it ja pl pt pt_BR ru sk sr sr@latin uk zh_TW" diff --git a/app-editors/retext/retext-7.0.3.ebuild b/app-editors/retext/retext-7.0.3.ebuild index 03ad82628835..b5a896da95ac 100644 --- a/app-editors/retext/retext-7.0.3.ebuild +++ b/app-editors/retext/retext-7.0.3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -PYTHON_COMPAT=( python3_{4,5,6} ) +PYTHON_COMPAT=( python3_{5,6} ) PLOCALES="ca cs cy da de es et eu fr hu it ja pl pt pt_BR ru sk sr sr@latin uk zh_TW" diff --git a/app-editors/retext/retext-7.0.4.ebuild b/app-editors/retext/retext-7.0.4.ebuild index 9067cf820ea2..0e48d2b2a8cf 100644 --- a/app-editors/retext/retext-7.0.4.ebuild +++ b/app-editors/retext/retext-7.0.4.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 # no pypy{,3} support as PyQt5 does not support it at 2018-11-18 # https://bitbucket.org/pypy/compatibility/wiki/Home#!gui-library-bindings -PYTHON_COMPAT=( python3_{4,5,6,7} ) +PYTHON_COMPAT=( python3_{5,6,7} ) inherit distutils-r1 gnome2-utils virtualx xdg-utils diff --git a/app-editors/retext/retext-9999.ebuild b/app-editors/retext/retext-9999.ebuild index 9067cf820ea2..0e48d2b2a8cf 100644 --- a/app-editors/retext/retext-9999.ebuild +++ b/app-editors/retext/retext-9999.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 # no pypy{,3} support as PyQt5 does not support it at 2018-11-18 # https://bitbucket.org/pypy/compatibility/wiki/Home#!gui-library-bindings -PYTHON_COMPAT=( python3_{4,5,6,7} ) +PYTHON_COMPAT=( python3_{5,6,7} ) inherit distutils-r1 gnome2-utils virtualx xdg-utils diff --git a/app-editors/sublime-text/Manifest b/app-editors/sublime-text/Manifest index 6ea0da69c38c..3dafe5540396 100644 --- a/app-editors/sublime-text/Manifest +++ b/app-editors/sublime-text/Manifest @@ -2,6 +2,9 @@ DIST sublime_text_3_build_3176_x32.tar.bz2 10352060 BLAKE2B 97d6e7bcc838ecac53ff DIST sublime_text_3_build_3176_x64.tar.bz2 10314226 BLAKE2B 98b0cda71b8a859614a1a6510afa073ca1aae6b9ac5d4b6db259723e8aa057a8b2bf22a0d26f0b6ccce31f39e047293ed84c4a63b8739a6d08c05af5791967bd SHA512 c37bd0d6d7fbbe2757f4244ae2803086d5fe1e25b32a1dd2de4241dc55f66f7c4588f3f9d56059c9d0ef7fe2ae69e76005f16dad60060f38fe10b92fd8eda969 DIST sublime_text_3_build_3200_x32.tar.bz2 13798686 BLAKE2B bed2ec4cfaccaba6a0443207aa794e01ce2fe2d0e8ca43b6d966fb2745ce0b1a7978f3bed7a0a347d1945b7556acf71143e94a5a93c11cc3101ff816d45e2d9f SHA512 ffcd96f0b612356d0fb15d7b19fb6164c28311de88ae5df7845d5c223ea714c398f37ecdc98747d2491d762dea642a7698303d7033e40ecd1a511e97ced478e0 DIST sublime_text_3_build_3200_x64.tar.bz2 13657959 BLAKE2B 88d38014977ce92503583e626a59a57ccf0f5ff243cbc1487478d65ab065fccbe28af65f91db7e63a46a90614c1f5161ce24558c6c2ea4d0c6f7cfffd8bd153e SHA512 9a8c739fe0899286f8026bdebcd69ee80ac8a9194cec4695efffda8340438537a03e203f944c94e35478fb2cda3a28971067eabd7152a3247122937e094361d2 +DIST sublime_text_3_build_3207_x32.tar.bz2 13801015 BLAKE2B 5d2c76b4f0894ad2c171cf7e3726e3684057fb4f7c6fa5bd35b9bc9d0e32781884340cb5c2d2bae15128b41b888337d88a7d917e1841b939607507da9c888d93 SHA512 28859fedb76c6074cbf7724ba5822bce8e1e89393bf3f61c4b277847a8568bb3e92345628754deb73e96c10fe748b0c43000d6e15e59422b20904e042a3d1e61 +DIST sublime_text_3_build_3207_x64.tar.bz2 13672413 BLAKE2B e9e98fe0d6d8f059ec9af2593414cf6c35bce3b70193999922f6ea8fccad5348af549a374f57a2410ed10fd74bf58d6bf895da667af67c454d8ad678b52e52a0 SHA512 48510da4714bddfc129d89d68b277c2a3e9badfd0bd276c746e0dc0e5f14efb091dc7c2b3a1228095ebf70be8f73f4a5004f6f8903fb18d7bcc70366150e6251 EBUILD sublime-text-3_p3176.ebuild 1655 BLAKE2B 9c224d920d1e2928c70c46b6709c579b7e17df4b8f50b06355f4336b730f8341a5a64bcfa31b9be3db94c436aaf6d9f4765241f8f7087774fe970cf3577c812a SHA512 d536fa15fcbad6e804c339f9ab13896020ae92579069fd4e1dddf4337777760fc0b8874f098b73091a5867a3c74ceb5da295df1f893d4b2bf3b0b1ee99269193 EBUILD sublime-text-3_p3200-r1.ebuild 1644 BLAKE2B 4c84f453d075c34acfe7df6537ca262c549bfb2fc83a62c29f4ac4c4d9993afd116be1e585bb08c9c9b2942a533dd64f74bb50d2e9fc6312596fdbe57fac61a1 SHA512 5b0404e0141182b70e180caf4264e9df3e743e7759276620d0151cf7ee5b519ff25e3be8f3b24f3021fcabf809f1d2069f0852cf8dab2e813495e83b212c7b2c +EBUILD sublime-text-3_p3207.ebuild 1644 BLAKE2B 4c84f453d075c34acfe7df6537ca262c549bfb2fc83a62c29f4ac4c4d9993afd116be1e585bb08c9c9b2942a533dd64f74bb50d2e9fc6312596fdbe57fac61a1 SHA512 5b0404e0141182b70e180caf4264e9df3e743e7759276620d0151cf7ee5b519ff25e3be8f3b24f3021fcabf809f1d2069f0852cf8dab2e813495e83b212c7b2c MISC metadata.xml 215 BLAKE2B e5b704d936932650ad333b6ee575d0f6fb54f7b01e62f59912a5d88c8a76bfff888e9de639a9a4d6ec5882a3e9a57874eb89935bb3d1a3c3a79a4b1f58b944fb SHA512 d803656f1527d3fc8a2b3474c0ff52d86170950b70057a65ab412ce1adc926545393fe1cfb71731d573f057de2145edd90d642c644ef26222a2b413cd8922d47 diff --git a/app-editors/sublime-text/sublime-text-3_p3207.ebuild b/app-editors/sublime-text/sublime-text-3_p3207.ebuild new file mode 100644 index 000000000000..d059f42e93d5 --- /dev/null +++ b/app-editors/sublime-text/sublime-text-3_p3207.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit desktop xdg-utils + +# get the major version from PV +MV=${PV:0:1} +MY_PV=${PV#*_p} + +DESCRIPTION="Sophisticated text editor for code, markup and prose" +HOMEPAGE="https://www.sublimetext.com" +SRC_URI=" + amd64? ( https://download.sublimetext.com/sublime_text_${MV}_build_${MY_PV}_x64.tar.bz2 ) + x86? ( https://download.sublimetext.com/sublime_text_${MV}_build_${MY_PV}_x32.tar.bz2 )" + +LICENSE="Sublime" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="dbus" +RESTRICT="bindist mirror strip" + +RDEPEND=" + dev-libs/glib:2 + x11-libs/gtk+:3 + x11-libs/libX11 + dbus? ( sys-apps/dbus )" + +QA_PREBUILT="*" +S="${WORKDIR}/sublime_text_${MV}" + +# Sublime bundles the kitchen sink, which includes python and other assorted +# modules. Do not try to unbundle these because you are guaranteed to fail. + +src_install() { + insinto /opt/${PN}${MV} + doins -r Packages Icon + doins changelog.txt sublime_plugin.py sublime.py python3.3.zip + + exeinto /opt/${PN}${MV} + doexe crash_reporter plugin_host sublime_text + dosym ../../opt/${PN}${MV}/sublime_text /usr/bin/subl + + local size + for size in 16 32 48 128 256; do + dosym ../../../../../../opt/${PN}${MV}/Icon/${size}x${size}/sublime-text.png \ + /usr/share/icons/hicolor/${size}x${size}/apps/subl.png + done + + make_desktop_entry "subl" "Sublime Text ${MV}" "subl" \ + "TextEditor;IDE;Development" "StartupNotify=true" + + # needed to get WM_CLASS lookup right + mv "${ED}"/usr/share/applications/subl{-sublime-text,}.desktop || die +} + +pkg_postrm() { + xdg_icon_cache_update +} + +pkg_postinst() { + xdg_icon_cache_update +} diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest index 59496b01bdd7..ffa02744e881 100644 --- a/app-editors/vim-core/Manifest +++ b/app-editors/vim-core/Manifest @@ -7,10 +7,12 @@ DIST vim-8.0.1699.tar.gz 13546105 BLAKE2B cabf29d5a89c55e2fe3bc5e39eb499412f5907 DIST vim-8.1.0034.tar.gz 13652586 BLAKE2B 98dac6b37c04ea8c15f0b0e2e4145d6529138e0532e92751fd07be04a2180519135d386dfc19e7f12c8eb37b3e15ee81ba357680d453afab56d96299b69cb511 SHA512 b2b85035c6c60a09e903d8f6deb500e42ab8bfc2f9a5b959d0055a8e02dab3a91d5460fd5028e6634c5ef6ab034186b7155e341fa25e84b9851290708e892d19 DIST vim-8.1.0412.tar.gz 13857501 BLAKE2B 6925184359b8b36cb546c9fcba4bb01755455aa87171ea7328ece411a5a5ced45096b8bef8561059bbff9a3ade565e0648fd18dd091d6faad0eb8a67321337a5 SHA512 3f458c039a636d7d3e398f8aa9cba4b4ae650c00038618c4776959b6feb0a1e3ac56be2912c3d85cba8e8f301661a62d71acd34a4dd75dc4dc000a94bf1b237e DIST vim-8.1.0648.tar.gz 14061964 BLAKE2B 79bf52d8574167471c93942904dc2b4ad5648ec365561494bbad45c779154b75b0fff1d90229516e938371f1eaa5808659cb2181b150c4c13bf8501bd9987b38 SHA512 d41676a6bb6bc442f4946ca021b2835d7ea0e54fbefe1bfc728241e1bf203cc696b707fcca6f25c877660283a790cefa4259fbd14de88fd4db7390701189c454 +DIST vim-8.1.1155.tar.gz 14141750 BLAKE2B f15470768fbdc4e02552b8711626c3ad9647ec5b74ebaa3f82a4f32c050405ef0cf3f29d1e5bdbb4de008bf16262b8cdc81ff153e2694a184523cd913624e8e0 SHA512 0cdc42090958f4c91c13aeeefac0abc4feaa629d8b90c04bd01d5e23efefe21e6316e1b2c3b6015ecf9577573faea9a1b6660de8a2959642e65582dbe9c7f5c6 EBUILD vim-core-8.0.1298.ebuild 6637 BLAKE2B 929e33024cfd7e70410c4cd4602b6b6360b6bb5fc0cb55de5a037952a900830c5350e86ff14f136c1e79c16c89cb792f8d20f0dec8830de1ee60ebe6b47ae744 SHA512 93e032f7cf32131090f25850e44ed5c519d7a586133086102c8ab8e5163dbf49d196817129ab3ff8ac103f1de85a603b0823f6ebe970ec1402fbe5ba7f414350 EBUILD vim-core-8.0.1699.ebuild 6648 BLAKE2B 8513f6f21478c099566a70c56ba739abd46174373cb228e170fd4ff701ed153e44eeef181218a09a1d9a5593dbeb66ef77d89b0c6285dca2add63086110ffa41 SHA512 fe73d0fb57acbddb58740e95e919383f02d176169513b5e6f9774b351fa886d572cc7cdc60b787e305819716f544cca8fa3222b40975c8590dd346bddaff7a38 EBUILD vim-core-8.1.0034.ebuild 6648 BLAKE2B 2ac8f5d559cd74e720dacacc8b609d1646882f8efa98fc8320d7c0296095718ca3ed9846cbf04212ee99fa36dd8de610ffa0a757cb36d9f5c879653d01fb42d4 SHA512 02dfb22e3bc4044270d1828b6df5f772b42fd06f8af0ddaac07ca34068651da5718cb13e2c97322d7ad9f2099e34bae7f5a18ca50a1c79a9cc577d6a3eb835de EBUILD vim-core-8.1.0412.ebuild 6636 BLAKE2B 64e3ba609a0406f60155721cf63cdd76728c0af844eae5cfe3791e8f713156ed28aff0e74e6adb00a335c05844aaf3c2d6c7f655cd91ce48388885ed7c71de7c SHA512 408da952f378be9b70bda9373df51d3a1a060e9daae80caae4910453e82fbebd0dd726ddc1b7b5bd417b28018fe0233213d84de86e780076022c3a555488424e -EBUILD vim-core-8.1.0648.ebuild 6937 BLAKE2B 0080ad370cf5a725dcb7e0b5c8e68c2501ad4b999e3576619700d15fe1888e2768be8b32c48d79a5e3ed6f86fd506a012699f7fc344ff4d3d95118c05bdafcab SHA512 006dbbbe88f78bd69e0583dcc60524e3d9c855108f90f67a00a9478508ab6ec5e6eb9d3d822a7f99a311acace952a2e04bc3f3e030d2dc08b1791d19a376dbc9 -EBUILD vim-core-9999.ebuild 6941 BLAKE2B 405441d760363078761bd3278975b38390e67797fc671ce78c8ffc61a15b43467d8c9b4fe2c640b4e792e47b26c2c11801a9bd49df5898c1be28a6be6a7ff8e4 SHA512 36bc2dcd25ca3313a391f20725ad7acb2c6bf074d0a04d9d80267a620edee674d3f3dc939c7de6171ba6cab09d07a73ddedc9c74f4717f064341d703da104482 +EBUILD vim-core-8.1.0648.ebuild 6934 BLAKE2B c687849029c7e73199f71834b774b8778e32ea6dfd14d5ef6f85aa7becdead323e86908ae8eaf7fcc42e2d6fb9380467f995c92f23bb2b49dfc9515b26ea07d0 SHA512 68e92df938d3cf6f345c55560020416e3d900e00fd9e491591ef63cc0ce33192948889a78426d7554fba3f77c00056a7f1ec50d4b06a46044c9f0c8508f6f829 +EBUILD vim-core-8.1.1155.ebuild 6941 BLAKE2B 54128cadb3fb475dd2d023778eb1c96260f7eeb0e7f1618f6602f845cc3f159bba8e3cc208de425e4139bfdc1cb0aeac8f6672874e79b913cfb0d430a7d34a16 SHA512 93855f390bc44197b63ac8e26f0f7efc53ceebc6624b3c2a99af83586defaedda0fb7d634f609a0b7312810ca11e6d388dc94f3ee365c449bf449af2346bbaf1 +EBUILD vim-core-9999.ebuild 6941 BLAKE2B 54128cadb3fb475dd2d023778eb1c96260f7eeb0e7f1618f6602f845cc3f159bba8e3cc208de425e4139bfdc1cb0aeac8f6672874e79b913cfb0d430a7d34a16 SHA512 93855f390bc44197b63ac8e26f0f7efc53ceebc6624b3c2a99af83586defaedda0fb7d634f609a0b7312810ca11e6d388dc94f3ee365c449bf449af2346bbaf1 MISC metadata.xml 321 BLAKE2B 018b535f5c81e8df2ee4f38a61ab95f999fb7fcd07ab67f9d5f7d2459768dc7e771006f50f903e1d0ba6cbf42ba2ae299901c1edb951a6e1dcbe3decaac98c57 SHA512 7d4a40b09c24eb8f08e6c171a4cf0e332d82f06163846602db338a1ad2e51133ed18694f216ce061fd9964fba3380b9991d86b93f111c6f8d0bb62ac5e14f705 diff --git a/app-editors/vim-core/vim-core-8.1.0648.ebuild b/app-editors/vim-core/vim-core-8.1.0648.ebuild index 37ed0610574d..cbce493e6b7b 100644 --- a/app-editors/vim-core/vim-core-8.1.0648.ebuild +++ b/app-editors/vim-core/vim-core-8.1.0648.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]] ; then 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 ~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" + 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 and gvim shared files" diff --git a/app-editors/vim-core/vim-core-8.1.1155.ebuild b/app-editors/vim-core/vim-core-8.1.1155.ebuild new file mode 100644 index 000000000000..c1ea615374c3 --- /dev/null +++ b/app-editors/vim-core/vim-core-8.1.1155.ebuild @@ -0,0 +1,225 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +VIM_VERSION="8.1" +inherit estack vim-doc flag-o-matic bash-completion-r1 prefix desktop gnome2-utils + +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 ~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 and gvim shared files" +HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim" + +SLOT="0" +LICENSE="vim" +IUSE="nls acl minimal" + +DEPEND="sys-devel/autoconf" +# avoid icon file collision bug #673880 +RDEPEND="!!<app-editors/gvim-8.1.0648" +PDEPEND="!minimal? ( app-vim/gentoo-syntax )" + +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 "mkdir -p failed" + 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 \ + -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 + 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/\<ctags\("\| [-*.]\)/exuberant-&/g' \ + "${S}"/runtime/doc/syntax.txt \ + "${S}"/runtime/doc/tagsrch.txt \ + "${S}"/runtime/doc/usr_29.txt \ + "${S}"/runtime/menu.vim \ + "${S}"/src/configure.ac || die 'sed failed' + + # 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' + + # 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" || 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 "sed failed" + 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 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed" + + # 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 + if [[ -e "${file}" ]]; then + addwrite $file + fi + done + + # Let Portage do the stripping. Some people like that. + export ac_cv_prog_STRIP="$(type -P true ) faking strip" + + # Keep Gentoo Prefix env contained within the EPREFIX + use prefix && myconf+=" --without-local-dir" + + econf \ + --with-modified-by=Gentoo-${PVR} \ + --enable-gui=no \ + --without-x \ + --disable-darwin \ + --disable-perlinterp \ + --disable-pythoninterp \ + --disable-rubyinterp \ + --disable-gpm \ + --disable-selinux \ + $(use_enable nls) \ + $(use_enable acl) \ + ${myconf} +} + +src_compile() { + emake -j1 -C src auto/osdef.h objects + emake tools +} + +src_test() { :; } + +src_install() { + local vimfiles=/usr/share/vim/vim${VIM_VERSION/.} + + dodir /usr/{bin,share/{man/man1,vim}} + emake -C src \ + installruntime \ + installmanlinks \ + installmacros \ + installtutor \ + installtutorbin \ + installtools \ + install-languages \ + DESTDIR="${D}" \ + BINDIR="${EPREFIX}"/usr/bin \ + MANDIR="${EPREFIX}"/usr/share/man \ + DATADIR="${EPREFIX}"/usr/share + + keepdir ${vimfiles}/keymap + + # default vimrc is installed by vim-core since it applies to + # both vim and gvim + insinto /etc/vim/ + newins "${FILESDIR}"/vimrc-r5 vimrc + eprefixify "${ED}"/etc/vim/vimrc + + 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 -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 ) + + local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig" + # tinkering with the next line might make bad things happen ... + keep_syntax="${keep_syntax}|syntax|nosyntax|synload" + ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim ) + + eshopts_pop + fi + + newbashcomp "${FILESDIR}"/xxd-completion xxd + + # install gvim icon since both vim/gvim desktop files reference it + doicon -s scalable "${FILESDIR}"/gvim.svg +} + +pkg_postinst() { + # update documentation tags (from vim-doc.eclass) + update_vim_helptags + + # update icon cache + gnome2_icon_cache_update +} + +pkg_postrm() { + # Update documentation tags (from vim-doc.eclass) + update_vim_helptags + + # update icon cache + gnome2_icon_cache_update +} diff --git a/app-editors/vim-core/vim-core-9999.ebuild b/app-editors/vim-core/vim-core-9999.ebuild index 1aeb3a66d543..c1ea615374c3 100644 --- a/app-editors/vim-core/vim-core-9999.ebuild +++ b/app-editors/vim-core/vim-core-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest index 6c0bd591096f..d95e3714d5f6 100644 --- a/app-editors/vim/Manifest +++ b/app-editors/vim/Manifest @@ -5,12 +5,14 @@ DIST vim-8.0.1699.tar.gz 13546105 BLAKE2B cabf29d5a89c55e2fe3bc5e39eb499412f5907 DIST vim-8.1.0034.tar.gz 13652586 BLAKE2B 98dac6b37c04ea8c15f0b0e2e4145d6529138e0532e92751fd07be04a2180519135d386dfc19e7f12c8eb37b3e15ee81ba357680d453afab56d96299b69cb511 SHA512 b2b85035c6c60a09e903d8f6deb500e42ab8bfc2f9a5b959d0055a8e02dab3a91d5460fd5028e6634c5ef6ab034186b7155e341fa25e84b9851290708e892d19 DIST vim-8.1.0412.tar.gz 13857501 BLAKE2B 6925184359b8b36cb546c9fcba4bb01755455aa87171ea7328ece411a5a5ced45096b8bef8561059bbff9a3ade565e0648fd18dd091d6faad0eb8a67321337a5 SHA512 3f458c039a636d7d3e398f8aa9cba4b4ae650c00038618c4776959b6feb0a1e3ac56be2912c3d85cba8e8f301661a62d71acd34a4dd75dc4dc000a94bf1b237e DIST vim-8.1.0648.tar.gz 14061964 BLAKE2B 79bf52d8574167471c93942904dc2b4ad5648ec365561494bbad45c779154b75b0fff1d90229516e938371f1eaa5808659cb2181b150c4c13bf8501bd9987b38 SHA512 d41676a6bb6bc442f4946ca021b2835d7ea0e54fbefe1bfc728241e1bf203cc696b707fcca6f25c877660283a790cefa4259fbd14de88fd4db7390701189c454 -EBUILD vim-8.0.1298.ebuild 8753 BLAKE2B 5c95b03cda0fde94832d50a8a65ec907f7e066a9467f0f58ceb704b84e88298b474cd94600403823a925dbb6ea49f83bc3bf6c6e614551fc11317f739cf6a651 SHA512 cded1fbf2cdee05f45a1030bb209b3a1004ca5adf16876f292c74b50c278c840f9081f08556f276ceccf635073d86931f0ee2d67afeda0f03ea2b83b8e1c0062 -EBUILD vim-8.0.1699.ebuild 8781 BLAKE2B b03fe734f6acb466b5573d4dad7a36f5415c3c8b14ba4f5a033cee8d43e12accb8c8cf3fbdb59fc193ae72803a749fe6745d6106d9fd0542c189414feb17a59c SHA512 e0b6806114a6995f9be2e7a2c10fa4c93df972a0096203f205e907e6257415f47e44dd16c5bbdc3ae2fc457373214e6a92605ab26c1a808ddb653fbfed33e4ae -EBUILD vim-8.1.0034.ebuild 8781 BLAKE2B 8a40f45dc7395141259e1cf7339c815a3526159181f8c3d9e61e451fd743593171bba5ccd58251ef4f57bbae45457c2612bb4d52369bffb3ac672276ce662dea SHA512 7f45c30ad45f9abdd1cfb2186c021c4f203a94ec8f9dda7d5522c7688c6b803c18baab774edae20278ce726e5eb2368cace3dd1ee79fb7e8e534aa9e6e14e6e8 -EBUILD vim-8.1.0412-r1.ebuild 8810 BLAKE2B d3054b24602947f829bf3bae1f10e8b2acbf5a05eb3fb0fd7f3da589177ceeb54aa75124521229c343ad8bd747ac2e8450dbf9d7f22c91cf24f1130e639bfd05 SHA512 691a483673566d53b887159d094113758393b01347362e26601cbda91693ea72906bc2a346fa2d1b7e709b6d47428a95b53550580ef5ab9cea7d43327683c374 -EBUILD vim-8.1.0412.ebuild 8806 BLAKE2B 23bdf54e6bb94d325be60c6512fe7f750bfc2f0073c566d5db499179bf70b8590f9ceb494cf41bf25cd88f6f647f199dfaa8431e6d61dd17860b5b6e06a15d59 SHA512 227b7214e1301312d98ae6400f0a53351e95ab902c46e37aede8496d67f879bed70ba47f403842374aac8e520d2d949e7656706a99734d8cc63f77d53cc54dce -EBUILD vim-8.1.0648-r1.ebuild 9107 BLAKE2B 34b3448bedf515d9d69551fa13fddd9f13c232478d6e4c3703c853909052fa48694bc037e40be2decc3449d81fce88f2f8099deb8b028bc1f874618b5b1e88b5 SHA512 be8f7126c636c376b983adb39ded7bea10d61eed1b99c226e613b7911c156fbb9a6afa14468ff2f962dcf3441a8772cfdced41b44ded78fb7167073bdaaaf551 -EBUILD vim-8.1.0648.ebuild 8948 BLAKE2B 91d49f14f1fd082b005a509c4a10344052dca1e05761c9826430c901cf5b62384b820072f6bc37e1de3d843422e60c464abb075e980fdf009c0806ff3438e916 SHA512 6ab336ae1fc086cee90c867fe803752590965103dcd3b651bb700d4901917e23da9eb1d3b2cac2b2da7fd25424f1f623c72fdfcd7683b9afc80fff7ee226f1c7 -EBUILD vim-9999.ebuild 9111 BLAKE2B ad0e7f1882db6f62bfbba923c824519bf3b55863b06f5d273365794ab3b02a802cd00d6955282c0d2de99f646cdff33997f13ac1f3a3349fbebe352c81893979 SHA512 8373392fce198c65f61e77cefb7a6fff10d21191c98b4451cac703c5430b4780fd6c9c0f341a6b756917b24ae78f99dab36ed3ad1a2947ae3028261a00f61f49 +DIST vim-8.1.1155.tar.gz 14141750 BLAKE2B f15470768fbdc4e02552b8711626c3ad9647ec5b74ebaa3f82a4f32c050405ef0cf3f29d1e5bdbb4de008bf16262b8cdc81ff153e2694a184523cd913624e8e0 SHA512 0cdc42090958f4c91c13aeeefac0abc4feaa629d8b90c04bd01d5e23efefe21e6316e1b2c3b6015ecf9577573faea9a1b6660de8a2959642e65582dbe9c7f5c6 +EBUILD vim-8.0.1298.ebuild 8746 BLAKE2B d512bc2b44dec308484be54897bac6cae8156e7865410537878872b9134a0a609d1747fe1e4cb45fdff6356ebb5886307ceb2fdbd56351ee25ce84b9a7569daf SHA512 ce82d01b9aca3ba3dc83d4671025b65b1cee66afc871c55d4e7ee8d248fcd5373080adebacb9119693daef3f9e316955fb9767554c9d9e80f3273fd524a4c942 +EBUILD vim-8.0.1699.ebuild 8774 BLAKE2B 5b78a98b06bac14fc32663a1d7dba6ec989aeedd19b812ae2579b26d52e002434c2b8328179bbd8c03df9ba0255a933e977a129b97ff077d99151c25b9ece2bf SHA512 bce569183e17b58be9580718f86e96fac861f2edf33f9d5fa1db14268e8027d26ca2f6717d2f05b1910b652cbd5cc482c492036fd3b02c0e8d89458071cc715d +EBUILD vim-8.1.0034.ebuild 8774 BLAKE2B 52b9881612decb1a4be1882a1d1ed3d10de232d117b53dd77371a0841c06a64baf934e250d6dd61d5cace9409835f7095f78d9046d30643798d29a0461e82bb1 SHA512 9241434ec0f489ffb1867fcda61e378e59aef5ed513de70b28746a73985ff9f82803c9798b3d2f95c8de86fa2168b9a9ddc4515aea9fee556cb0f14330a6f658 +EBUILD vim-8.1.0412-r1.ebuild 8806 BLAKE2B f4f3693e8d017862148f55b688155bd9cf85150a8013362f4051f95464f88c956452f6be79d5686f7306186a489c03ccb7ef824ead3f93b6dd7a9c4bf33d9fc6 SHA512 9cd5410aab92f9dcd24ee0d2d639add3b9a88931dedf13ac74c6ba09cbd92859c6ef7093a6400cdb02bbecfce3e3311a2d54a10ddafac5883608fc786b341ee9 +EBUILD vim-8.1.0412.ebuild 8799 BLAKE2B e7e2fcf92942d132707dfbb0ac784ee463160d9bd61c9a400ad5d9679279cca52360e242e86557d48d76a60891acb92ab16623cfff7c0439be6bf047f95a4d6e SHA512 cf0089d1dedce8a8344a66a0f65e64da86ec89e9c35eca96084059c14aa79d7526714eadd930dd83dbc58f70e5cd4c86fc64f76caeb0bd5d4896572b3d427ce1 +EBUILD vim-8.1.0648-r1.ebuild 9100 BLAKE2B aa77faf578c82380f3b38e05d4e4585cd7fcf3aa06ceb613e5839bd52e43a1eb20ae9810f0f8fa9dc0fcfee166e974d28a3b8f05b39ada4551a45fa2bd7ad50b SHA512 aa7f64fa384b856412f07a6e867af783ac71a41283ff70d1d2ed82256f113d8df248d1421c021abfe82d7cff213ed5c3d913e7213d7720365cfbc9e26f5cf3b8 +EBUILD vim-8.1.0648.ebuild 8944 BLAKE2B 0675f5fb1cc79cf241c07042c84daf12fb4f8cfa4ccf52033a72c932fea7f5e568b1e3459d18ee2aaee1e7a66fef239cbace63477ea6b22e599a9b0ca0f1ff30 SHA512 eb4f5e0386783d1098b91025e7df994660ed99e0fd8b77adddb9c2a09b4f0558abb9482e3aef6d0fc749367acc4bcdb856e4f496025ac9e26d75e0ae89edcd78 +EBUILD vim-8.1.1155.ebuild 9134 BLAKE2B 5533bd2b02645d763c9c25bb2e74f85c406569654b9f9575cace34dc4aa3c96094cf16d7c8b0e41de9bbb9d255496476559311b975d3922d7a3279849d9e0e6a SHA512 2dced36772f0b98bd9eb2ac89f2869c3fd40be0e818774fb9fb84485630605156031c8c4c85da09eb749b61447a74c3baaf089091d049f0b4207772237071e3b +EBUILD vim-9999.ebuild 9097 BLAKE2B 071c9a8ad081b255833ff53811acd1f652c625bcc97985bdd5b0b7a463bb204a662515d2d090d711b193c224f0379d2dea3271a5fabbcebe5d997be7b4c55a0b SHA512 b8aa4d0446c910a88e724a7b233a075f5e51d47db4ec9d8a349c8dad5b188ef5774a6ed02ef7a477dd3e69439546f8bae2d2a98bb18aad1b4e5ffb7aa7441b34 MISC metadata.xml 807 BLAKE2B e876f33c06a0bb165a43a7c50ff9bbfa0513e43287f54dbcee396af736034e4cefba8831226b47cc8a334599632a94344623ae2343f0162dbbcd511f749d524a SHA512 a7801a4483b08944c01848593354322c406a929296075617736755c0b62852b76c30467cee2c360ea211521274f2019b495309bffb5a3285d73940aac45e4a53 diff --git a/app-editors/vim/vim-8.0.1298.ebuild b/app-editors/vim/vim-8.0.1298.ebuild index 0b280480a4f6..125373219b5d 100644 --- a/app-editors/vim/vim-8.0.1298.ebuild +++ b/app-editors/vim/vim-8.0.1298.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # 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_COMPAT=( python{2_7,3_5,3_6} ) PYTHON_REQ_USE=threads inherit vim-doc flag-o-matic versionator bash-completion-r1 python-single-r1 diff --git a/app-editors/vim/vim-8.0.1699.ebuild b/app-editors/vim/vim-8.0.1699.ebuild index 4780f97dad96..1b6769d2a695 100644 --- a/app-editors/vim/vim-8.0.1699.ebuild +++ b/app-editors/vim/vim-8.0.1699.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # 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_COMPAT=( python{2_7,3_5,3_6} ) PYTHON_REQ_USE="threads" USE_RUBY="ruby23 ruby24 ruby25" diff --git a/app-editors/vim/vim-8.1.0034.ebuild b/app-editors/vim/vim-8.1.0034.ebuild index da068ff29599..5cab07950251 100644 --- a/app-editors/vim/vim-8.1.0034.ebuild +++ b/app-editors/vim/vim-8.1.0034.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 VIM_VERSION="8.1" -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) +PYTHON_COMPAT=( python{2_7,3_5,3_6} ) PYTHON_REQ_USE="threads" USE_RUBY="ruby23 ruby24 ruby25" diff --git a/app-editors/vim/vim-8.1.0412-r1.ebuild b/app-editors/vim/vim-8.1.0412-r1.ebuild index 0b199842bec1..b59f44453047 100644 --- a/app-editors/vim/vim-8.1.0412-r1.ebuild +++ b/app-editors/vim/vim-8.1.0412-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 VIM_VERSION="8.1" -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} ) +PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} ) PYTHON_REQ_USE="threads(+)" USE_RUBY="ruby23 ruby24 ruby25" diff --git a/app-editors/vim/vim-8.1.0412.ebuild b/app-editors/vim/vim-8.1.0412.ebuild index 542c71f1871f..218a274d8710 100644 --- a/app-editors/vim/vim-8.1.0412.ebuild +++ b/app-editors/vim/vim-8.1.0412.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 VIM_VERSION="8.1" -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) +PYTHON_COMPAT=( python{2_7,3_5,3_6} ) PYTHON_REQ_USE="threads" USE_RUBY="ruby23 ruby24 ruby25" diff --git a/app-editors/vim/vim-8.1.0648-r1.ebuild b/app-editors/vim/vim-8.1.0648-r1.ebuild index 8e47d4ab47b8..9fc3bc1b7fff 100644 --- a/app-editors/vim/vim-8.1.0648-r1.ebuild +++ b/app-editors/vim/vim-8.1.0648-r1.ebuild @@ -3,7 +3,7 @@ EAPI=6 VIM_VERSION="8.1" -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} ) +PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} ) PYTHON_REQ_USE="threads(+)" USE_RUBY="ruby23 ruby24 ruby25" @@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]] ; then 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" + 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" diff --git a/app-editors/vim/vim-8.1.0648.ebuild b/app-editors/vim/vim-8.1.0648.ebuild index 53057996e0d8..f5fef6d56a06 100644 --- a/app-editors/vim/vim-8.1.0648.ebuild +++ b/app-editors/vim/vim-8.1.0648.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 VIM_VERSION="8.1" -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} ) +PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} ) PYTHON_REQ_USE="threads(+)" USE_RUBY="ruby23 ruby24 ruby25" diff --git a/app-editors/vim/vim-8.1.1155.ebuild b/app-editors/vim/vim-8.1.1155.ebuild new file mode 100644 index 000000000000..8701b63c9a19 --- /dev/null +++ b/app-editors/vim/vim-8.1.1155.ebuild @@ -0,0 +1,318 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +VIM_VERSION="8.1" +PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} ) +PYTHON_REQ_USE="threads(+)" +USE_RUBY="ruby24 ruby25 ruby26" + +inherit vim-doc flag-o-matic bash-completion-r1 python-single-r1 ruby-single desktop xdg-utils + +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} ) + vim-pager? ( !minimal ) +" + +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} ) + vim-pager? ( app-editors/vim-core[-minimal] ) + perl? ( dev-lang/perl:= ) + python? ( ${PYTHON_DEPS} ) + racket? ( dev-scheme/racket ) + ruby? ( ${RUBY_DEPS} ) + 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/\<ctags\("\| [-*.]\)/exuberant-&/g' \ + "${S}"/runtime/doc/syntax.txt \ + "${S}"/runtime/doc/tagsrch.txt \ + "${S}"/runtime/doc/usr_29.txt \ + "${S}"/runtime/menu.vim \ + "${S}"/src/configure.ac || die 'sed failed' + + # 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 -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" || 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=( --enable-multibyte ) + + # 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-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 + $(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_with python python-command $(type -P $(eselect python show --python2))) + $(use_with python python3-command $(type -P $(eselect python show --python3))) + $(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 + + domenu runtime/vim.desktop + + 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 + + # update desktop file mime cache + xdg_desktop_database_update +} + +pkg_postrm() { + # Update documentation tags (from vim-doc.eclass) + update_vim_helptags + + # Call eselect vi update + eselect_vi_update + + # update desktop file mime cache + xdg_desktop_database_update +} diff --git a/app-editors/vim/vim-9999.ebuild b/app-editors/vim/vim-9999.ebuild index 7f5fd67a23ef..d4037bd79419 100644 --- a/app-editors/vim/vim-9999.ebuild +++ b/app-editors/vim/vim-9999.ebuild @@ -3,9 +3,9 @@ EAPI=6 VIM_VERSION="8.1" -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} ) +PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} ) PYTHON_REQ_USE="threads(+)" -USE_RUBY="ruby23 ruby24 ruby25" +USE_RUBY="ruby24 ruby25 ruby26" inherit vim-doc flag-o-matic bash-completion-r1 python-single-r1 ruby-single desktop xdg-utils @@ -25,8 +25,8 @@ 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} ) + vim-pager? ( !minimal ) " RDEPEND=" @@ -40,10 +40,8 @@ RDEPEND=" luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) - !minimal? ( - ~app-editors/vim-core-${PV} - dev-util/ctags - ) + !minimal? ( ~app-editors/vim-core-${PV} ) + vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( ${PYTHON_DEPS} ) racket? ( dev-scheme/racket ) @@ -176,7 +174,6 @@ src_configure() { myconf=( --with-features=tiny --disable-nls - --disable-multibyte --disable-acl --enable-gui=no --without-x @@ -195,7 +192,6 @@ src_configure() { myconf=( --with-features=huge - --enable-multibyte $(use_enable acl) $(use_enable cscope) $(use_enable gpm) diff --git a/app-editors/wily/Manifest b/app-editors/wily/Manifest index 56ed013a8944..651bbe04b75b 100644 --- a/app-editors/wily/Manifest +++ b/app-editors/wily/Manifest @@ -1,4 +1,4 @@ DIST wily-9libs.tar.gz 125247 BLAKE2B 94f93d081c90f6543bb26d17f8fe053135be2df983a2280fdd15243c5e448f5f3265666692e0635156217b0e759e0d6f3bbc123cb857f1d7880ee3ee4f913a37 SHA512 3c06ef1d9c6e77a00037570f8b8bdbcdfc7648f691675db679ba83ac0ce092762a4020b0483acd325aa57810e9a386800a94c5e6e2b5002a963b4751a4d30a5b EBUILD wily-1.0-r1.ebuild 809 BLAKE2B d78d084be0cda1dfa32453974846d2721ab700ed6b476e440d8f0d2b3a5401b2d8a2c084666db0267f7517dd10e6bac8c36506967844fd914948a9532d1607a0 SHA512 fb05e0ad34abf3b1a0a7a6949016da6ec0da8e8f52a2947bedc282f5499a70ba4b44e5dd5fe3ffb57941522035d40281aa7889246cb186278e9b48f4d9fc5336 -EBUILD wily-1.0-r2.ebuild 694 BLAKE2B 0bd4505f79254267a4082fc8a369b2ca0280b4f9d00ffead5c2639fa28dc461f0d88a9d6c8b5654c882c4ddbc7faee04c02b39f3c7a6b71afce59a50c8a03fd5 SHA512 d257b0491aeb8d4d815a560856fba1986233c12d20366a86d094b7ff7a892cea957c211bf48d65af85bacea09aebac44546c3510ffed90f8e12c36759ea62949 +EBUILD wily-1.0-r2.ebuild 693 BLAKE2B 295558085cc6e961849bad4f1794918de5188bded40211179e01d3acce067cb4431901638887340926b3e7f7633497a7304a324e16a979002a1cea86d0285f3b SHA512 69288a2cea4139ad683936c8541d0106297d8320076fec49c2818bc3a267287b0c0702e3d789abf50053a489d70c806bae077132566aaba19b0ded56607d7d32 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/app-editors/wily/wily-1.0-r2.ebuild b/app-editors/wily/wily-1.0-r2.ebuild index 2b2d12f280df..18430e835c6b 100644 --- a/app-editors/wily/wily-1.0-r2.ebuild +++ b/app-editors/wily/wily-1.0-r2.ebuild @@ -12,7 +12,7 @@ SRC_URI="${HOMEPAGE}${MY_P}.tar.gz" LICENSE="Artistic" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" DEPEND=" dev-libs/9libs |