diff options
Diffstat (limited to 'app-editors')
31 files changed, 267 insertions, 319 deletions
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz Binary files differindex 41c5fd73e438..fdb36520c925 100644 --- a/app-editors/Manifest.gz +++ b/app-editors/Manifest.gz diff --git a/app-editors/lpe/Manifest b/app-editors/lpe/Manifest index 31cfaa17705b..872568a776eb 100644 --- a/app-editors/lpe/Manifest +++ b/app-editors/lpe/Manifest @@ -1,4 +1,5 @@ -AUX lpe-1.2.6.13-make-382.patch 794 BLAKE2B 87248819ab6b670a752c394070bca60aaf916deabc0b9ee8e5a8a43a8aa2b8d2bac6b623edbecf1a3937263f2adde3db058c36e49544137cc330746ff05ba8af SHA512 1f40434c9f545fca31461f0fa5bf801478d9c3c96a1a24905425b5471d88ad03178ff72d9a8f9459f3ceb2000a3d857f0d9d38cd2fd745952707991101d8283f +AUX lpe-1.2.6.13-fno-common.patch 603 BLAKE2B 1c78bf5d7e049d101c890dda5d22833de0489a381ec071760745c53bf8ef72a552010fa1340ba02b262fe67af38d4f858ae472d34e3ff8a55b6325dbfb55beb4 SHA512 6a2ddbc03ca09cbd499f6b471c2eb76db4a78294467e9e73365fd99a3f4a5af3d6d539cf2fbc77261cb57a9aa6751199e6ef19a252e6caf12502a9ad9f136876 +AUX lpe-1.2.6.13-make-382.patch 797 BLAKE2B 548091708e01e3baf9d52eaa7f8638d870f10060b858162ea19d8bb70062ca7883fa16c431c839e939dcfc1917c8b7c675180aaff47424dde326f74866885649 SHA512 442b5dbfb11b002f86d2a67cef1c4f57a5ac6e3965cc0618f0bd7058d14ea79ed4f108c40f25cf94ff6edefa8655d5a46c2bcc2552c60c66322e194117e5ca11 DIST lpe_1.2.6.13-0.1.tar.gz 600523 BLAKE2B 8866aff63276d5e39ed48b4d9e8b9a23d541c13e196815c29586df83f8c6b5895a8dde8fb16b0929bffc49416907d74d48fdbc5ce736a855f2d2daad6472fb96 SHA512 f02769baca396285fe8f98c934f6274185d2bf8b08f3b007cbfa4e6aadb455abfb7cab13d53a3d1fa71ea0c29c4222784dcbc9a7508501c7d1839671503758ed -EBUILD lpe-1.2.6.13.ebuild 1229 BLAKE2B 6468643a3833b96a6e2b17fc3f484ef3d9bae46d730d38384c1213f36d610ff8f159d63020fb4f652510afae824a38cb81c7bd75aeeb7d5fb406a100938b623a SHA512 13fed9c9ef2d4cce3d9fc6e322539a1128b3f81057b8b94da504b3b2ff65cfcd844693e04dc8b8fed962c706d99dcae70cd1c6d167a4f1b98b22f01c594d9e71 +EBUILD lpe-1.2.6.13.ebuild 1269 BLAKE2B 4f7a1a3d6518c184ba76f39b4dc427430eb8450feb3a91e736f81448afdfab2e59b6dd3c8f0bff2c7f08b1d4c76c42046e6fba0a5e72865d9314afc8c53c3ea7 SHA512 261ffa5abdecf4d522cfb25eb83333af1770a6d919ec9d99717dbf440bf600500c5b9653ccb18a373f29f3cb4c737f20e464fb6b3be17536c56209a1de910ba7 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/app-editors/lpe/files/lpe-1.2.6.13-fno-common.patch b/app-editors/lpe/files/lpe-1.2.6.13-fno-common.patch new file mode 100644 index 000000000000..2cc68157ed53 --- /dev/null +++ b/app-editors/lpe/files/lpe-1.2.6.13-fno-common.patch @@ -0,0 +1,31 @@ +https://bugs.gentoo.org/707188 +--- a/src/cfg.c ++++ b/src/cfg.c +@@ -22,6 +22,7 @@ + #include <string.h> + #endif + ++extern char *LPE_CONFIG_FILE; + int cfg_errno; + + void +--- a/src/lpe.c ++++ b/src/lpe.c +@@ -25,6 +25,7 @@ + #include "strfuncs.h" + #include "exports.h" + ++char *LPE_CONFIG_FILE; + /* A flag indicating a desire to quit the editor. This is set whenever a + * command should cause an exit. + */ +--- a/src/options.h ++++ b/src/options.h +@@ -38,6 +38,6 @@ + /* + * Other things that are used in some places... + */ +-char *LPE_CONFIG_FILE; ++extern char *LPE_CONFIG_FILE; + + #endif /* LPE_OPTIONS_H */ diff --git a/app-editors/lpe/files/lpe-1.2.6.13-make-382.patch b/app-editors/lpe/files/lpe-1.2.6.13-make-382.patch index f8d96ef087e9..2e93042570aa 100644 --- a/app-editors/lpe/files/lpe-1.2.6.13-make-382.patch +++ b/app-editors/lpe/files/lpe-1.2.6.13-make-382.patch @@ -1,7 +1,6 @@ http://bugs.gentoo.org/335324 - ---- intl/Makefile.in -+++ intl/Makefile.in +--- a/intl/Makefile.in ++++ b/intl/Makefile.in @@ -202,12 +202,12 @@ # The dependency for intlh.inst is different in gettext and all other # packages. Because we cannot you GNU make features we have to solve diff --git a/app-editors/lpe/lpe-1.2.6.13.ebuild b/app-editors/lpe/lpe-1.2.6.13.ebuild index 463f48e14e24..4a9bb25d8011 100644 --- a/app-editors/lpe/lpe-1.2.6.13.ebuild +++ b/app-editors/lpe/lpe-1.2.6.13.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils ltprune multilib toolchain-funcs +EAPI=7 + +inherit toolchain-funcs DESCRIPTION="a lightweight programmers editor" HOMEPAGE="https://packages.qa.debian.org/l/lpe.html" @@ -13,14 +14,21 @@ SLOT="0" KEYWORDS="amd64 ppc sparc x86 ~x86-linux" IUSE="nls" -RDEPEND=">=sys-libs/slang-2.2.4 - >=sys-libs/ncurses-5.7-r7:0=" -DEPEND="${RDEPEND} +RDEPEND=" + sys-libs/ncurses:0= + sys-libs/slang" +DEPEND="${RDEPEND}" +BDEPEND=" virtual/pkgconfig nls? ( sys-devel/gettext )" +PATCHES=( + "${FILESDIR}"/${P}-make-382.patch + "${FILESDIR}"/${P}-fno-common.patch +) + src_prepare() { - epatch "${FILESDIR}"/${P}-make-382.patch + default # You should add PKG_CHECK_MODULES(NCURSES, ncurses) to configure.in and # replace -lncurses in src/Makefile.am with $(NCURSES_LIBS) @@ -45,5 +53,5 @@ src_install() { exdir="${ED}/usr/share/doc/${PF}/examples" \ install - prune_libtool_files --all + find "${ED}" -name '*.la' -delete || die } diff --git a/app-editors/moe/Manifest b/app-editors/moe/Manifest index 9e79622faa75..cd6ef76da295 100644 --- a/app-editors/moe/Manifest +++ b/app-editors/moe/Manifest @@ -1,6 +1,8 @@ AUX moe-1.6-tinfo.patch 379 BLAKE2B 4b2b0b895181d98b742c5abe5bab3690a9f37d987e0b63123d2b0288ec0f0980df3bb9cc654e5cfcabcaeee69714aec7e3e99974bab4a8fbc36105c071b2a988 SHA512 8fa0661bce445d585aa37d845a4b41a0d1ed08aeab4117f6f1c6bdac346d7d774dfe38253dc11f0be7bd68c136eaac5aa889e174e0556f036fbdaf2e8b06373f DIST moe-1.10.tar.lz 84050 BLAKE2B 2e49aba27cdd603fbc9a4eb0fef5e086a527087d72f30f68beb4e3389de0ccdd85fec5bf753b3187d64cd6549ac5738c89e94c543c141f88896c580e7c33ad42 SHA512 3908d7906aa7dcb8bd4a5d340fe94b06fc91814098c20e8939906c2b0e03e1a8a3c95847b5f8111a5d9f37636a2fafa52f9105e0e8fa0ad8b16c2f9e9dede748 +DIST moe-1.11.tar.lz 89532 BLAKE2B 8479c8bb0504e614b4ad87e47ae89d1f0eb23141ff71ef3e46eb316424dfe87150f2d9474e1dbd3510fa9b1da517bd6afe47b2cd36f1aa70630b371f0f6bec3a SHA512 147f3500909739371290fc2f703ef5fab286d2ca385f6808ee3e0cb1cbae2ed58a0b5046d30ad5d24215dc28d77f0bba4efacb144c116209d89d023e731e8a39 DIST moe-1.9.tar.lz 82046 BLAKE2B 9144dfc4ce17bc04f3ad9aa9ec271f173df6c581705e5d922a346f94c086a97af9429478c016d7081c1fd38787055666504f04d25a8b9f5c1020dc147aaafdb0 SHA512 277700e4a796e1a7aee42de55ba4599a350a612f95a1a2eca5078d85f6f9a7db190fb5611eb2f286c98580af847a2934bf38a4bce10176db4c5cddc2d257f929 -EBUILD moe-1.10.ebuild 702 BLAKE2B bc4973d8d9ada4dafce1980c59f1c6ab4e3a941339e3624a4129d0a18a936dcc80e6ca1738165d77144b4570c45bc48ef7dd85a225bf63d31791f02b0a61bfc2 SHA512 6d337ecda8493522f1aed0c1581e8e5024893eba31115e0b4ec82211110f5b0acaa6c81da2869e7394b37b7f93987b200f72120e6c4fad1a68f62867669eeef3 +EBUILD moe-1.10.ebuild 698 BLAKE2B 181da72a9e3b4af805e8682b3fe6ecdf4eba42fb6ed0bc6bcf381dafda7624ccf0d86c1ac67d509470dedc25c6d2e9b9d348721fb34e8f0417e651faad70ee8f SHA512 5f53a824ce1e7e26e937327ae07182d820ba32817d5c3d1681aaf3ae65d03f0ae93fa117a5b41c7de6a27de5b295a337f096a8765a38d6e716580af1ef1a6df9 +EBUILD moe-1.11.ebuild 702 BLAKE2B 5ab0ae5efc2d53174fde0e418c3ecb7d0b92d1ee9acb57dc388b76528baf2038baa33e030459b20bde5f58d4effdf4ad8a1823c2c8fde9bd764e2c5ae3d2f560 SHA512 8485b0f31fda3407ef3569c7aba5b3f6b0c1452373651ae05901bbadfcf6b54c92165dfb0aa1616bb345ec8eafe6014aea59f78be40cad41a73472a72990f3d2 EBUILD moe-1.9.ebuild 702 BLAKE2B f8afc91d99ae88a4bf8c5b02393d10124466cddb6179eaf9c12300076d791a28ac0f3ad6dca5162cf58cfc5157cad7ede7af7c37cd201d216922d8fe44740aa8 SHA512 9e0153471f02bb31d039e6ec986352bb20bb0386296b5c1fd610c9b6140d32fe996765a5e85b362d310f64ebc7827f069519d6fee73a69f11df4c01d5cb5d10d MISC metadata.xml 247 BLAKE2B 94608f4bda5b60a090b18717a5d81d90defbb5e482043059dcb7a41d39a21b9192e6f58a1ebdb83cc8cfaa9fe85ced13c40e6e43c110e0e21b2cb6a36f6dc852 SHA512 1196d40f8c6a3b2e5d0c0590c2f56b53ead40ec8d9eb2c125094eb961b092558c51baa89f237fda24cf1050e85c78dd7419e1d217c2feceb32c6296990ac54c3 diff --git a/app-editors/moe/moe-1.10.ebuild b/app-editors/moe/moe-1.10.ebuild index f530b53537f9..6d9028d722c4 100644 --- a/app-editors/moe/moe-1.10.ebuild +++ b/app-editors/moe/moe-1.10.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.lz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 arm x86 amd64-linux ~x86-linux" RDEPEND=" sys-libs/ncurses:0= diff --git a/app-editors/moe/moe-1.11.ebuild b/app-editors/moe/moe-1.11.ebuild new file mode 100644 index 000000000000..690bdeff4576 --- /dev/null +++ b/app-editors/moe/moe-1.11.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit toolchain-funcs unpacker + +DESCRIPTION="A powerful and user-friendly console text editor" +HOMEPAGE="https://www.gnu.org/software/moe/" +SRC_URI="mirror://gnu/${PN}/${P}.tar.lz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux" + +RDEPEND=" + sys-libs/ncurses:0= +" +DEPEND=" + $(unpacker_src_uri_depends) + ${RDEPEND} + virtual/pkgconfig +" + +src_prepare() { + tc-export CXX PKG_CONFIG + sed -i \ + -e "/^CXXFLAGS=/d" \ + -e "/^LDFLAGS=/d" \ + -e "/^CXX=/d" \ + configure || die "sed on configure failed" + + eapply_user + + eapply "${FILESDIR}/${PN}-1.6-tinfo.patch" +} diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest index fc86be47b249..6e31f6464afa 100644 --- a/app-editors/nano/Manifest +++ b/app-editors/nano/Manifest @@ -3,8 +3,10 @@ AUX nano-4.9.3-minimal_build_fix.patch 1357 BLAKE2B d204314118779f7e433cea11ea07 DIST nano-4.9.3.tar.gz 2999198 BLAKE2B a96f707936934a965a9a41dfe13ac1ebbe1a5e38db714df6d219b2c6539f24924d4c4f0451508718f66259854806032b84dc89850a7fd55d157f28ae23531d0e SHA512 233e6ed103441bd2c85ed21c50547f85dc0838cc750a5e9b16ecfb393e3b7b978e971af4a4164062c7c267c98895ecb696c02cbd2e4c2eb1ceee657fd026c30a DIST nano-5.3.tar.gz 2874796 BLAKE2B d266018f2508153369e10c6f9cf4c53eaeafdf0efe88da6de19efd76ef13fedebe4b9339ae594b751a12cf18a8c4dcd57466ceedfabf61406f63b69c75fceff1 SHA512 019b58779f5a7d9a9472b415715876d0daac313a02b794900339469ee0b5a27ce202e397c00ad6396b7e26a7c303e52c28d981fff85cf774c79a5a8a9835836d DIST nano-5.4.tar.gz 2898561 BLAKE2B 7e5e48f1e85253a7a4a9be2be2b7663e8798655d9e9e2505df1d1752512058734062af953652c1d11dca464ca06d7c90faf2e54cdb65ba01d0f76cfca0282c18 SHA512 711b1a890649e3a2b62c778e6d54813ed98a8261c47a92aa6d7baa690f86d8563813a764f5dffcc6c259fe9b05f8fe76cf48a3178b09666ba55ee035c91cbe28 +DIST nano-5.5.tar.gz 2943973 BLAKE2B cecc4b3bb74c6ca35a249052cc58df618b6a0445781813d1b06164afb3d119bedf49bdb0a04c327d4db968eeb5b0f1087b84184b83d4b92548c3146a4400389d SHA512 968eac59db2889ba1cb75bc83a30fd0c0ae370a05c668da0f3a20768158f3be0962034737924ea49f06e696e68625bc6841f41aae86aebbe8ba7c00b2627c056 EBUILD nano-4.9.3.ebuild 2303 BLAKE2B ae1b5d040e6c7be9d49ca11fbf8dd63d93b6ae74093ac9795e8e9c0f61532b4dae83ba4ecd1179469edda487babacb0c4fafcb23155039d2ba052bb01d1026e4 SHA512 7afddc9908b55b2a397915a2a1716c775ac09666eacee600873a19bf0103c49202daa5880a9f19115b6a1488f42dcab16e235cec2c3f8b285254e51a6183fbeb EBUILD nano-5.3-r1.ebuild 2417 BLAKE2B 67f81d38936522e480337cdedd8156835e01c92cfe80f4126787015e822ecaec935bcb008a6e02808af155f0dc15b14d3cb209e4583818f1a0a45607004b4bae SHA512 a4b0af913ea15fcdf05e2a6d76eabedcd7833d2a01f879223c1a39a8b670c46c7230b36cfffc57f35b971c875552d21ca184dc108bcc044c87551bd4067f5312 EBUILD nano-5.4.ebuild 2426 BLAKE2B 5f2c77741c935c09a85bcf7741617c535cf2ea248e7f5cb486699190f4106f59b96567b66ae9498dbfba46eb30a9afd40ef2fe4fe30db49758968bf195c6725f SHA512 29f11d409df9fb2193cb915e59e96174f9079ecc1bec981749b79d5946556ceb2c07219ba46e817fa88a24593498d0c3efbe452566b871f5ca916885612397af -EBUILD nano-9999.ebuild 2426 BLAKE2B 5f2c77741c935c09a85bcf7741617c535cf2ea248e7f5cb486699190f4106f59b96567b66ae9498dbfba46eb30a9afd40ef2fe4fe30db49758968bf195c6725f SHA512 29f11d409df9fb2193cb915e59e96174f9079ecc1bec981749b79d5946556ceb2c07219ba46e817fa88a24593498d0c3efbe452566b871f5ca916885612397af +EBUILD nano-5.5.ebuild 2277 BLAKE2B 966340463238b8bf4b42c5c2f8de3e0b02b3807ccc5d7bcbe995f6e453a3ad8522b4f3ca649de2378bc3af2f8727911a6c2a1be97c7fbc095720e8a2fcbed086 SHA512 acf553fac40d5f51ddf9324156bcda8170e18da51badb79f7a5283b36e8a5f1505e9a832c172d5b91f934b665af6f068e34411472eb37d5b5fdddee33f39a2b9 +EBUILD nano-9999.ebuild 2277 BLAKE2B 966340463238b8bf4b42c5c2f8de3e0b02b3807ccc5d7bcbe995f6e453a3ad8522b4f3ca649de2378bc3af2f8727911a6c2a1be97c7fbc095720e8a2fcbed086 SHA512 acf553fac40d5f51ddf9324156bcda8170e18da51badb79f7a5283b36e8a5f1505e9a832c172d5b91f934b665af6f068e34411472eb37d5b5fdddee33f39a2b9 MISC metadata.xml 1642 BLAKE2B bd201f1a56bd864dbf7ce5e8dd8b9e0f1a34c236543d8bffa096da1f53460e824171ec629fa84a0a31919fa128e248397671129b8c0a23dfdda9d685e789bf87 SHA512 1b9eac65c24ddc6b917a8bbd1849a7dfd7f29cfa6430eb5945b1a09ec036e68023159882c632fe3dfe04038673cac68ecc74fb128a8bbdf1a2b0aa6cfd3a398c diff --git a/app-editors/nano/nano-5.5.ebuild b/app-editors/nano/nano-5.5.ebuild new file mode 100644 index 000000000000..64c74e70f9b1 --- /dev/null +++ b/app-editors/nano/nano-5.5.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +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:1}/${MY_P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi + +DESCRIPTION="GNU GPL'd Pico clone with more functionality" +HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide" + +LICENSE="GPL-3" +SLOT="0" +IUSE="debug justify magic minimal ncurses nls +spell +split-usr static unicode" + +LIB_DEPEND=">=sys-libs/ncurses-5.9-r1:0=[unicode?] + sys-libs/ncurses:0=[static-libs(+)] + magic? ( sys-apps/file[static-libs(+)] ) + nls? ( virtual/libintl )" +RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" +DEPEND="${RDEPEND} + static? ( ${LIB_DEPEND} )" +BDEPEND=" + nls? ( sys-devel/gettext ) + virtual/pkgconfig +" + +REQUIRED_USE=" + magic? ( !minimal ) +" + +src_prepare() { + default + if [[ ${PV} == "9999" ]] ; then + eautoreconf + fi +} + +src_configure() { + use static && append-ldflags -static + local myconf=( + --bindir="${EPREFIX}"/bin + --htmldir=/trash + $(use_enable !minimal color) + $(use_enable !minimal multibuffer) + $(use_enable !minimal nanorc) + $(use_enable magic libmagic) + $(use_enable spell speller) + $(use_enable justify) + $(use_enable debug) + $(use_enable nls) + $(use_enable unicode utf8) + $(use_enable minimal tiny) + ) + econf "${myconf[@]}" +} + +src_install() { + default + # don't use "${ED}" here or things break (#654534) + rm -r "${D}"/trash || die + + dodoc doc/sample.nanorc + docinto html + dodoc doc/faq.html + insinto /etc + newins doc/sample.nanorc nanorc + if ! use minimal ; then + # Enable colorization by default. + sed -i \ + -e '/^# include /s:# *::' \ + "${ED}"/etc/nanorc || die + + # Since nano-5.0 these are no longer being "enabled" by default + # (bug #736848) + local rcdir="/usr/share/nano" + mv "${ED}"${rcdir}/extra/* "${ED}"/${rcdir}/ || die + rmdir "${ED}"${rcdir}/extra || die + fi + + use split-usr && dosym ../../bin/nano /usr/bin/nano +} diff --git a/app-editors/nano/nano-9999.ebuild b/app-editors/nano/nano-9999.ebuild index 92473ae856c8..64c74e70f9b1 100644 --- a/app-editors/nano/nano-9999.ebuild +++ b/app-editors/nano/nano-9999.ebuild @@ -18,13 +18,12 @@ HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_ LICENSE="GPL-3" SLOT="0" -IUSE="debug justify magic minimal ncurses nls slang +spell +split-usr static unicode" +IUSE="debug justify magic minimal ncurses nls +spell +split-usr static unicode" LIB_DEPEND=">=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0=[static-libs(+)] magic? ( sys-apps/file[static-libs(+)] ) - nls? ( virtual/libintl ) - !ncurses? ( slang? ( sys-libs/slang[static-libs(+)] ) )" + nls? ( virtual/libintl )" RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" DEPEND="${RDEPEND} static? ( ${LIB_DEPEND} )" @@ -34,7 +33,6 @@ BDEPEND=" " REQUIRED_USE=" - !ncurses? ( slang? ( minimal ) ) magic? ( !minimal ) " @@ -60,7 +58,6 @@ src_configure() { $(use_enable nls) $(use_enable unicode utf8) $(use_enable minimal tiny) - $(usex ncurses --without-slang $(use_with slang)) ) econf "${myconf[@]}" } diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest index 80e46bf1a58c..2c768a9692f1 100644 --- a/app-editors/neovim/Manifest +++ b/app-editors/neovim/Manifest @@ -1,10 +1,11 @@ AUX neovim-0.4.3-gcc-10-fix.patch 7417 BLAKE2B 5632a2427337e7b4d1b793381a074d2d7f0822aecb99a83123e8ec4fa4a35a975816a4854d2b596ae1aa63ecb876399c843454b6bd12b759889384d49fb8f0bf SHA512 e29c65e8075972e44ab056fd721208c62d77591a91cc12987bc07339bb2f6373cbf308719d9fa3f7919ec064112475993af64572fad851152da2fc8f0f39d2a4 +AUX neovim-0.4.4-cmake-release-type.patch 627 BLAKE2B 87c6e6fd487b923ec4146f2cb38a9a30be00ffa7b9d0a41b43f17d4f79860e4f097b76e093af474dfe20538332a7c6f233ebd57d845a74d7a8aead9cae2fec76 SHA512 b236c0b703ec2763a1179149715fa241573803a27dcb05324e2f766f49aaf53dfe0efc62f1c10aa6d58333ce115835e852608778d9582689550fb537103f361a AUX neovim-0.4.4-cmake_lua_version.patch 419 BLAKE2B 73477d7fdc2705f2e93cd6dd355ea01fbfc232306e86a13097a1c069ea3248972be9d4da7b175c8c3c7e0fde7581d4ed9b431d73c119e9f8a63a7a15007aba31 SHA512 a1be27ebd18be34fede632f695bacf65699e9dd1a8b219120372b5e0c48691f595ba42725c4f795456b8018d668f471e3a042622a5f541af50c84a089d53c83c AUX sysinit.vim 3408 BLAKE2B 50da5ecb83fb38af20d484dbc5f3e417efc083cde339070b07ff4c2fa4ebd080189f975478d82fa977bc763d5e8d7f29c7703a515ecf6fff62772be4ef160170 SHA512 79b574ef42fbdd9c7fe26cffb1fadea3c31becf22f4be441acbdc75068a00f809a23f3a886e1cb6e30bb92c780bd04aea7b94f655f5c9f0d10c547fb10dd6e8a DIST neovim-0.4.3.tar.gz 9556199 BLAKE2B 831f4d4950f4fa2cd9c7393824bbb5eb571ae5759d13af9f320e0fa351fa155413a5be580f010f2c7ab43ca7bc10c569ccf6e3ba29efc7f5a035576b030b216d SHA512 e13853fa296eda8618f389c71b6cbbd6f01d561615e80cc92959131dd10e395b1c6732a7d9ef6dbb9fe3ea9da4c11485b464547e2d46b22e59b8a20214e861f5 DIST neovim-0.4.4.tar.gz 9558246 BLAKE2B b1d44898bb1e1ab40a7e1d7fb4448076c991ebe1a0956674548de82fe7a931d9eaffbf35ba03cf9c88466dcd628a55f1d7bf9e7a13f3dad74424d6d653ded60c SHA512 ca5c2fe1784ac7b0d2117948ba2e9ae5d94e36d22ff9e0967047e1e03e605537672d85543897af335103215ad462c86962f25267d352a77d61bc3d1cafb3c183 EBUILD neovim-0.4.3.ebuild 1896 BLAKE2B ba5466ec3e33e1e13da42edaf4c13003f62ca0ccb7495d1e76cd716c28619444bfe4c6fa61f49aef1982296553e04c504c33cb93ff7366702728438768ca9853 SHA512 c6d6ec282f937beab1171f57bcf55a3efb97f8d0676a57c43a477f44586c2ee7fa9c59967fee332ddb3164ba754be5f26af9be2f249a31968fada653235432d1 -EBUILD neovim-0.4.4-r100.ebuild 2679 BLAKE2B 279e5e67204abb5c6cba110bc4f4804beea30cbdc06a125bdd0cd687dc6a9f4799ae9094d23131aa40d1471d990458348a6bbaf82fc4a04ea2e6c9acf9212255 SHA512 d1c0a5f59d4c9bdb3aee23434696d16e62b144bf105c873eaec7cc9b271b2eb66009f3b30f14d85d9deb18e75f69e224d1a8ebf0ebbe4dd7487f16709531a4cc -EBUILD neovim-0.4.4.ebuild 2347 BLAKE2B 9684c3b66c5f8c69c495f7a14fe4222def4c8b574866e5e1d5575d953659e7e08a8dc6c7d6a56b7754a44eae1be9d108b3daedb49f35a13e360c065f7741d7c5 SHA512 bae47cc54f45ef5e1ed7d394bdf8f04e7b226265956b534fcd39509c50a4be91ba997c0c75bdf429a85bbcc1073113f2bae29482668f0440c1b6eb25d16a51b8 -EBUILD neovim-9999.ebuild 2727 BLAKE2B 2493704ce40bc751c4e6b1c27540943fcae117fb9386237684ff8dfd0376ed5975b17ecb847f97af8c0440f9b53498ea54e3fc1b272ad88968691c2d9378c801 SHA512 972ebef3d1cb7843b9f6252e8e011084c68d71a6cf94f3ced165dea16835a03f17a925b86e24ed66eb83bcb1f35847c37d839ea8d43a0d1022fb95d29e5f1ff6 +EBUILD neovim-0.4.4-r100.ebuild 2731 BLAKE2B 4c77f2e8204ceff784448cce89645c8711e29b79ea3941a17610a7deab9ac40a4b2107749305e3bef45181954345ea0eb9395b63fc4212db677f6ecd41a66c39 SHA512 392c56339bfef9d744ba9c6447fe9f456b109c4ddbe28726132afd4da19d9dbd9fd17026ff1396a7d59f65f4ee17ef78c1c605a38db92bcaf9ebf1a72a576686 +EBUILD neovim-0.4.4.ebuild 2412 BLAKE2B aec8572ee84bc68d99cbe3d1885f5998ac1198e92f4fb06c3eaeed6ad24fe134d1a0b47ab383f1b8b765e146525189fd63a7f5ab191365c1f39d4b462ed00f1b SHA512 f22853bb06156c3d096587736856a8a121c2bcf6359b8e7e0a74269805b6c0ed6fe7c73d7ed13e76f4310142b7724a7c2607a30500b65c745dd4d656a0d66ad9 +EBUILD neovim-9999.ebuild 2779 BLAKE2B a629bad5945a0054fc56eb28c759e80c39ff44735bc0ef48edf50238fa6a891789324303c8fb27709efe71056763b987a12c907c62736b197b59c9fd55afb2fb SHA512 87f6afbf6d9ca151a8019761f53d9bd9137ecc0943adc7a875ed019134dc772794f64419fd959198ecbb1ea81a978368e92d20f4015d96be7c24fc030a5f25bd MISC metadata.xml 535 BLAKE2B 7cebdc1b7adafafdcc2fe266f8696ad0dff927e8a9383ee34ac66e2c8910d3863d1f7603f2a82dec75f586ab22814d7268475ae3ce02fc3dca12a665e1e8ce5e SHA512 71fcf593a1b9587e6af0e30e851fb17e8552568a4e8bd38341c150ada7dbf72f962250f3306403c0be2d334932f63fe183850efe1c67d515ba79577cdf7aa561 diff --git a/app-editors/neovim/files/neovim-0.4.4-cmake-release-type.patch b/app-editors/neovim/files/neovim-0.4.4-cmake-release-type.patch new file mode 100644 index 000000000000..2c9c80a7a690 --- /dev/null +++ b/app-editors/neovim/files/neovim-0.4.4-cmake-release-type.patch @@ -0,0 +1,13 @@ +Ensure that :checkhealth is happy with the Gentoo build type. +https://bugs.gentoo.org/757744 +--- a/runtime/autoload/health/nvim.vim ++++ b/runtime/autoload/health/nvim.vim +@@ -118,7 +118,7 @@ function! s:check_performance() abort + let buildtype = matchstr(execute('version'), '\v\cbuild type:?\s*[^\n\r\t ]+') + if empty(buildtype) + call health#report_error('failed to get build type from :version') +- elseif buildtype =~# '\v(MinSizeRel|Release|RelWithDebInfo)' ++ elseif buildtype =~# '\v(MinSizeRel|Release|RelWithDebInfo|Gentoo)' + call health#report_ok(buildtype) + else + call health#report_info(buildtype) diff --git a/app-editors/neovim/neovim-0.4.4-r100.ebuild b/app-editors/neovim/neovim-0.4.4-r100.ebuild index 8cd8499a6fa2..2fdf25560fce 100644 --- a/app-editors/neovim/neovim-0.4.4-r100.ebuild +++ b/app-editors/neovim/neovim-0.4.4-r100.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -61,7 +61,8 @@ RDEPEND=" " PATCHES=( - "${FILESDIR}"/${PN}-0.4.4-cmake_lua_version.patch + "${FILESDIR}/${PN}-0.4.4-cmake_lua_version.patch" + "${FILESDIR}/${PN}-0.4.4-cmake-release-type.patch" ) src_prepare() { diff --git a/app-editors/neovim/neovim-0.4.4.ebuild b/app-editors/neovim/neovim-0.4.4.ebuild index 2b8b289784e9..b9f0be5d76b6 100644 --- a/app-editors/neovim/neovim-0.4.4.ebuild +++ b/app-editors/neovim/neovim-0.4.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -55,6 +55,10 @@ RDEPEND=" app-eselect/eselect-vi " +PATCHES=( + "${FILESDIR}/${PN}-0.4.4-cmake-release-type.patch" +) + src_prepare() { # use our system vim dir sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \ diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-9999.ebuild index d10ac87a1704..0663ee9e4715 100644 --- a/app-editors/neovim/neovim-9999.ebuild +++ b/app-editors/neovim/neovim-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -63,7 +63,8 @@ RDEPEND=" " PATCHES=( - "${FILESDIR}"/${PN}-0.4.4-cmake_lua_version.patch + "${FILESDIR}/${PN}-0.4.4-cmake_lua_version.patch" + "${FILESDIR}/${PN}-0.4.4-cmake-release-type.patch" ) src_prepare() { diff --git a/app-editors/ng/Manifest b/app-editors/ng/Manifest index c114a46dcaa6..e29213bad9a4 100644 --- a/app-editors/ng/Manifest +++ b/app-editors/ng/Manifest @@ -1,5 +1,5 @@ AUX ng-1.5beta1-configure.patch 658 BLAKE2B c76c062312f36e59c4f31f6d24ab992b7722ea3f8d323954b4a3981acc708e751b869e5ce3aafd47869e3893effc3d5705cde7648bb948d7acb7d79d906953e0 SHA512 afea99d16b06308feed87512ccfe084b3f3c222afdb9a3f430ec02882d99cf81d7506dd329601a58ab62d8def05e48f3ff502d0d76ecada8cca2c42931bdca1b -AUX ng-1.5beta1-ncurses.patch 551 BLAKE2B a0c3df0b923d67600686c1d7240099dac5fd3276dbad809b7988e9e3467f23addfc73c691407a47d96966880814f0d3e9ec2e552fddefacc9670b0e431e1074a SHA512 14d457f782e8441866763a0fc82dd727a9fd7e7ab9dbc92da313b0eb739fd3f415d89633d7f553f9937b7d6a97164d8eda6caa45602edea22a8036cc50d2b91d +AUX ng-1.5beta1-ncurses.patch 556 BLAKE2B 87321f8f920609a64cf356a45517b3f3328a204dd65c3fb02faf891c748d4b0dd9fb61814b13d6e99f75255b6b3f544e12f757ac393fdd31ff74a889e0fa619e SHA512 0c53ac22f5452af1ce59dfd6e2bd35868e824a922bbd4742ed20d9e2e24752c2fab52504b1365736dde04ba212c458ace9335a8399509d1043b686d997bfbfbf DIST ng-1.5beta1.tar.gz 662557 BLAKE2B 02f1f5277aaba279226d732351eb604205e8bfc030678551a5f2439bde61651bf5aa4e02e06f3283fdab710cc5a1ed9a3eae1e42fd4fa8a8145699b425c4e61e SHA512 eaf3ee067cd98aebc757def9880c5a324975e9f5d0f1db030b11853e86631bca892bf344358ca21b778f5e10ae0d2ed97553221a368326f7a4d9d41f6867abcd EBUILD ng-1.5_beta1-r2.ebuild 1210 BLAKE2B d35be1984b0551ded8200846ae9202ff3b2420cdd48e89c1376702737fffe96eb4be8038efe8986955ad2e6b5992b6ab8b9ac10e035e5fe92f47114ee6ad83e0 SHA512 94ef226b7adcd8133f7d245c0b457ae0d43b024d504db7da5a7ab1941de07df03f4387546c46fbfdf6f6ac32578f545e44a11d523830db3b95dfff21718fd26e MISC metadata.xml 230 BLAKE2B 42b2921aa8f0a7ac96ff31ef846311f023469d38da4186c49a365cb7c4a1c63769e54718fb9ab6e8cfd2b532f249b0214cc54929e93d1a9960a6b5be3238b55d SHA512 74065bee639a38ecdef7c32280ed43a8f1627362cd8e97e714a09bcf116ae8bc4c61b2ab13c31bd02a22ae8a5a201263981ee519a0b6ba9df81a4d5f3cd94eb1 diff --git a/app-editors/ng/files/ng-1.5beta1-ncurses.patch b/app-editors/ng/files/ng-1.5beta1-ncurses.patch index 6808d911152b..a31ddccd6614 100644 --- a/app-editors/ng/files/ng-1.5beta1-ncurses.patch +++ b/app-editors/ng/files/ng-1.5beta1-ncurses.patch @@ -1,12 +1,16 @@ ---- a/configure 2004-05-12 09:26:44.000000000 +0900 -+++ b/configure 2004-05-12 09:27:06.000000000 +0900 -@@ -1077,3+1077,3 @@ - rm -f conftest* --test "$ac_cv_search_tgetstr" = "no" && for i in curses ncurses termlib; do -+test "$ac_cv_search_tgetstr" = "no" && for i in ncurses termlib; do - LIBS="-l$i $ac_func_search_save_LIBS" -@@ -1140,3 +1140,3 @@ - rm -f conftest* --test "$ac_cv_search_tgetstr" = "no" && for i in termcap curses ncurses; do -+test "$ac_cv_search_tgetstr" = "no" && for i in termcap ncurses; do - LIBS="-l$i $ac_func_search_save_LIBS" +--- ng-1.5beta1/sys/unix/configure.in ++++ ng-1.5beta1/sys/unix/configure.in +@@ -33,9 +33,11 @@ + [ --with-termcap Build with termcap library. (default)], + [ts_with_terminfo="no"]) + if test "$ts_with_terminfo" = "yes"; then +- AC_SEARCH_LIBS(tgetstr, curses ncurses termlib) ++ AC_SEARCH_LIBS(tgetstr, ncurses termlib) ++ AC_SEARCH_LIBS(tputs, tinfo ncurses termlib) + else +- AC_SEARCH_LIBS(tgetstr, termcap curses ncurses) ++ AC_SEARCH_LIBS(tgetstr, termcap ncurses) ++ AC_SEARCH_LIBS(tputs, termcap tinfo ncurses) + fi + + dnl Checks for header files. diff --git a/app-editors/notepadqq/Manifest b/app-editors/notepadqq/Manifest index 7d898884d5db..a68a8384803d 100644 --- a/app-editors/notepadqq/Manifest +++ b/app-editors/notepadqq/Manifest @@ -1,4 +1,4 @@ DIST notepadqq-2.0.0_beta.tar.gz 4516680 BLAKE2B 9a16ab64134ab0d33a68cc528db6a50b8860c391130667a9213e3aa941e115b1e3acae5833ce4b8b52fc81aa8997c5389f5920cde86171cf5d960a7f58dbea99 SHA512 b2ae3493da1512f5f2e42ffc90529f3acfe81d75b7dd6e476f41b94e9b39e02c6fe355ea5ad40460d644ed76bca695d451721e19738c251c8ecb8acc0c0fb061 -EBUILD notepadqq-2.0.0_beta.ebuild 1035 BLAKE2B b6634b1b60db0995b920059b9a4f0802e294f3da7aee2acd03341d303cd08206f9b705642af135378ce4137eeb93f120b632e3e309f9973d5385ea01b9cc946a SHA512 29396a26e43a79aa9f4a96a9b16e1ebcb9d12dcb8f5f314d0dcf30a5da6474f6bd70fdab5d98ff8f2548e5134296505041c6efe9297d0b9176417b3f6233f08c -EBUILD notepadqq-9999.ebuild 1035 BLAKE2B b6634b1b60db0995b920059b9a4f0802e294f3da7aee2acd03341d303cd08206f9b705642af135378ce4137eeb93f120b632e3e309f9973d5385ea01b9cc946a SHA512 29396a26e43a79aa9f4a96a9b16e1ebcb9d12dcb8f5f314d0dcf30a5da6474f6bd70fdab5d98ff8f2548e5134296505041c6efe9297d0b9176417b3f6233f08c +EBUILD notepadqq-2.0.0_beta.ebuild 1121 BLAKE2B 521e4f052a7b1cc0c10804e25598e7234e1db2e73379b5e31f36501dc68c4aecd6a054b0d5377afe2b44f964fde4d786007339b682ffeaf25ae6418750d9d973 SHA512 2bd26abf0fd206e0ee721a7cec6d423a0f22c85c55007b32be3dea90a28d8050d4fa1c57abf3d64ac9e6bdbac0578d16417977fa32685ad18b199e8607c91114 +EBUILD notepadqq-9999.ebuild 1121 BLAKE2B 521e4f052a7b1cc0c10804e25598e7234e1db2e73379b5e31f36501dc68c4aecd6a054b0d5377afe2b44f964fde4d786007339b682ffeaf25ae6418750d9d973 SHA512 2bd26abf0fd206e0ee721a7cec6d423a0f22c85c55007b32be3dea90a28d8050d4fa1c57abf3d64ac9e6bdbac0578d16417977fa32685ad18b199e8607c91114 MISC metadata.xml 345 BLAKE2B ae751443c2fd3565e979b52de96cb3804aa010a346fe4d404c2bf69f602a14d70e59af441caa25b5c8a2ed17fdc564539ee196366dc9ff290f7b756ec8121ddc SHA512 90d1d18d81da9f0870d7e41a4c421fb58872861358fa4f095c5b040c6465752898867e47b866750f19f316fdb8fed42bc878e84ced27ddb2503ec142d035f033 diff --git a/app-editors/notepadqq/notepadqq-2.0.0_beta.ebuild b/app-editors/notepadqq/notepadqq-2.0.0_beta.ebuild index 55064b0e2564..ca0db1807aa3 100644 --- a/app-editors/notepadqq/notepadqq-2.0.0_beta.ebuild +++ b/app-editors/notepadqq/notepadqq-2.0.0_beta.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -48,7 +48,11 @@ src_prepare() { } src_configure() { - eqmake5 PREFIX="${EPREFIX}/usr" ${PN}.pro + eqmake5 \ + LRELEASE="$(qt5_get_bindir)/lrelease" \ + QMAKE="$(qt5_get_bindir)/qmake" \ + PREFIX="${EPREFIX}/usr" \ + ${PN}.pro } src_install() { diff --git a/app-editors/notepadqq/notepadqq-9999.ebuild b/app-editors/notepadqq/notepadqq-9999.ebuild index 55064b0e2564..ca0db1807aa3 100644 --- a/app-editors/notepadqq/notepadqq-9999.ebuild +++ b/app-editors/notepadqq/notepadqq-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -48,7 +48,11 @@ src_prepare() { } src_configure() { - eqmake5 PREFIX="${EPREFIX}/usr" ${PN}.pro + eqmake5 \ + LRELEASE="$(qt5_get_bindir)/lrelease" \ + QMAKE="$(qt5_get_bindir)/qmake" \ + PREFIX="${EPREFIX}/usr" \ + ${PN}.pro } src_install() { diff --git a/app-editors/pyvim/Manifest b/app-editors/pyvim/Manifest index 59cde71f0e8d..bbdd38098637 100644 --- a/app-editors/pyvim/Manifest +++ b/app-editors/pyvim/Manifest @@ -1,3 +1,3 @@ DIST pyvim-3.0.2.tar.gz 35227 BLAKE2B 8edc2218b3a0f2ba922531b75f65a5273ad9a2697f72ecf994cf7d2406c6311c3f28b22b6adb1243150a90db74962256ceaa7cf47ec99c2388299742451d6efb SHA512 da961342ba52e5beca44a607cbb923953388e8674409db9ca2b152017eeedce84f92e42a9f6d0e5019c5c4d88d82f4a987cb378f311cf84a169cefa54dc5efce -EBUILD pyvim-3.0.2.ebuild 843 BLAKE2B 797269dcef0f96efc18709ee4d7e6e0c5a95eab904022c6b9ea348460574c134678c6afba1bc00f9c1915c6839c064ce84d5b5d5859212bf8a0b70974c2fe35d SHA512 b5e388b2e74d78fffe5f7414f6d2608ab6b0a0ef6d001dbf918c41b055938b9878e3940e92a8686beafb2945e5bfe76d7b98a6bf120cb166166c54399d9b90bf +EBUILD pyvim-3.0.2.ebuild 841 BLAKE2B a89ff0e37418d8074590bdc466043814495da8ff8a9afa098d41d81d481b775455ace75ed545fcfa2f8d7d65410a548c5ee362fe7a40e610a10548f50b19c2d3 SHA512 1a951ab19f8eea020cf65a27bf2916b0aa77c0350be1f71c5145f07d48c18d539bf9cef68cdb354afb9450f882c5c4ab844016866a6a1a96cf261885d52ec2bc MISC metadata.xml 489 BLAKE2B c68a02d61b1c1e6f577c4fa415ce88e93cb4fad16418800dbdb5121baba72f521f18c1d253089835b7b99ff94e6f095051974dfadc5c55b6dc33a52ac6b25b58 SHA512 8ad8692c0a2e47b5135497d49c4a5676607e429a5281b7bfc3f9f0ba6e77195020218f1a444cfd587deee7a7cd2cd6f56ff28d66392f14b5b48203097b08680a diff --git a/app-editors/pyvim/pyvim-3.0.2.ebuild b/app-editors/pyvim/pyvim-3.0.2.ebuild index f0ba40a9fbc0..fdc003c833ad 100644 --- a/app-editors/pyvim/pyvim-3.0.2.ebuild +++ b/app-editors/pyvim/pyvim-3.0.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz" SLOT="0" LICENSE="BSD" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" RDEPEND=" app-eselect/eselect-vi diff --git a/app-editors/qhexedit2/Manifest b/app-editors/qhexedit2/Manifest index 79719b046f18..74628e6ef59e 100644 --- a/app-editors/qhexedit2/Manifest +++ b/app-editors/qhexedit2/Manifest @@ -1,4 +1,4 @@ AUX qhexedit2-0.8.4-setup.py.patch 596 BLAKE2B 15a801d87d9f690aa354162cb4966b1b691da95f7d64926f1b2ab66bd7d1db29b208cfab0f0bbe0f8fb272d67328f1a5ffd84ceb9d7af3d457ed6cd2a7d27ec0 SHA512 2cabb09c9c6e819a43d434a813ce9eb9614c72a3687758a35f338067d9e02add657ed1feee614486c9dbcbca823a848aedc69f9ab42aabd9ebe414b645b0d67e DIST qhexedit2-0.8.6_p20190316.tar.gz 355512 BLAKE2B a7edc8d05a7788f3a3f2202762ca3dc436cafbde1b1216ff1bb342055600a2e9d53c27fe324380331b8182904545c698106129238065cd2416d244fdfa176446 SHA512 4ef288c8a220c308d38c41fee83fe962e213cdfa448445ef73c3d2fe1952b68f2096732e78d2aa0a87eddd3cf2f47bed3e77807e12d2b7616c1447b3bf1b0e7d EBUILD qhexedit2-0.8.6_p20190316.ebuild 1872 BLAKE2B eee318093b6e657f9a1d32178333b20bd007a1358e213ce2121ff95d82fc4f8045f7bcc9952a8312aea419f0d9988ea61ecdf2634f1f87141392abe5ebbe57c5 SHA512 037c3ee4e84414cf891f655ee1e1e604f5c511d829c647544131424a288f00577461e379dcf7992f5a123ac449021974ba37fc65f7b950173619040b31ba60c4 -MISC metadata.xml 991 BLAKE2B 7faabbd43f1bdebee332845029ceef0824e380b70b7abe2adc9840391bba736941851433d58324886d4821f55ac83c67ff604b32d648acfd4c7e420662c5e155 SHA512 b079492a11df201b941d91991aef6161971ef15f80e7ca3ea71df2a0dbf2f193bc2514502e179321c7f688eb4f129401775bca9d9b657e3eec45e13c4c0948bb +MISC metadata.xml 863 BLAKE2B 30caf38917dfa0d50ec89879717ecb223a6dabc1a17b75d8c55af7fc02ffd702838389d97c9e86ca3641b9d7425b6f4b70ac807b9003e1bfd4d0db678252cf94 SHA512 a1ab5265136999a14b673653c1bc146b8d3a4514d7b2866dbdf3267aa586cd0bdf58cb2aeb116a76546ff3bffb5cac0dbca5d36d7335920dfdf50901ef9e0b81 diff --git a/app-editors/qhexedit2/metadata.xml b/app-editors/qhexedit2/metadata.xml index e3782cf655af..527d2f7dc820 100644 --- a/app-editors/qhexedit2/metadata.xml +++ b/app-editors/qhexedit2/metadata.xml @@ -5,10 +5,6 @@ <email>ktrace@yandex.ru</email> <name>Victor Kustov</name> </maintainer> - <maintainer type="person"> - <email>maksbotan@gentoo.org</email> - <name>Maxim Koltsov</name> - </maintainer> <maintainer type="project"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest index c008355475a3..e8e4305acc95 100644 --- a/app-editors/xemacs/Manifest +++ b/app-editors/xemacs/Manifest @@ -10,12 +10,12 @@ AUX xemacs-21.5.34-configure-libc-version.patch 957 BLAKE2B ae69bc6a5d3858571fec AUX xemacs-21.5.34-gcc5.patch 1194 BLAKE2B 1b042f7a7034fa7066279e91d96e6f1c2f962273b4aa26ca3a6bfb5cf737572d97c1d7f11dc87a15e44a2516e9112cb8f4ba8d916feb856bab15beeecce6cbe9 SHA512 276f3e10334c3809f625e69ea0d56585fd429e9aced65331bd1ca0ced467bcf526cee43925b4c4dc381723883348877782e1c234db00e60c3d74a78021a2330b AUX xemacs-21.5.34-glibc-macro.patch 1369 BLAKE2B cd03d4c6d3629ab186c60a869cd99483dec1192dddecb91466e72c83b3f2969a0f02ae34953da3511edc80bd17ed880168b98f661fab1a0642d4e2944cc0411c SHA512 6397267d99649f62a20a0a1f2bc380360ed7689691adde515421286b3bcad55dbb0cea246427e03f904fd829624060ad7ae66a67c63f16f3b3c1f88803022176 AUX xemacs-21.5.34-ncurses-tinfo.patch 699 BLAKE2B 0978b118040b1399bb042efbdfa54968a701b37a5b2f505f4dd1af9971b38c0a52cbe8fb9272ecc19c030bfa79fe28d56df358484116eadf3db9396b7ce09d17 SHA512 814b01388e7eb5963307dd5cd136725dd6d0d206b1a4e8ffc2ca8dabdd0070a58122fb4faa943efead1fe70f6309819177870630e05e5c02b51dc5e2aa0bd765 +AUX xemacs-21.5.34-process-test-qa.patch 501 BLAKE2B 11130d14b564181e35820acd99266e2fb8ba18b742f993ac6161d6b6cc04b8a14f92f4ddd8f21912e1521db88b8b6df0efa47df5dfd2cb1fe0bc20338d9553fa SHA512 03676ffa352871e278cf1cffb8bdc1e1c9052b49517d4009079734b5ff1de647e9808fb4c8a620ab9a8ec5dcbe02a454df0e11ef1f9e7867014c8fec830c90f5 AUX xemacs-21.5.34-strsignal.patch 4675 BLAKE2B 09297a6e4979fdcf36fa7807072236ceebff1cfbee01c6d5034b93c0725833fbfe1da0488eb4e9d588ed0c49356835310989cdd2bfa819f5ad94a5a13378e4d2 SHA512 c5eb3a7e25b4ede9046b00b8d949fbdc07a430bec1095906888c3361a4b354ab6625353c168f3544a65c77226ae6f7762f07850a97087a0ac75b2556b1b661b2 AUX xemacs.desktop 1061 BLAKE2B 47941fc8b380e08aad13e44fc1899ee73ef502dbbf5d8be4eaa23c301b5d25a8c334971a1d89f8cfa551dce909891edaac6a7df956c912396fc8cfb88a720a6b SHA512 6542fc7777af888ae711d386918e712e1d106635f70e65af77d1e809156baba9831fc4c8bd2cb7e7c6f9ab0ab18ddfb92709ac2909aa613471101454599bdb69 DIST NeXT_XEmacs.tar.gz 39571 BLAKE2B 7abf17627ec34e6b0d0edde444028c46dca6d703cfa208a8a1eaf30e2fc2543b953c9a9582c3d55bd5b37e746f45c03ebfc408a0d965606e45d5f4adb9148dea SHA512 611ddbbf5be3d2274e7f76be7f8200c6c7f3cba917efcc24e73685aa5f61c94237e6e48ce66f2d59ee4b74862e686f3ea7a29cf006717d5d0674db24d243d566 DIST xemacs-21.4.24.tar.gz 8543879 BLAKE2B d7e60e4e053a10bfc4591a5d691c849ef5e5436f6951c801f5a169592b160669d0f6b9dc8f10b6b79889a3210de977ed78a5cea826c02e425495364745ef9e10 SHA512 b7a88d5a4a9f74f74c2067ed60f7ea87ac8ccad5d9c2c1033ecf07f540250191f8fa5f9e6d23d9fedd0f2ab1eb5ea6c29a7665a310ec512d85e2e4f337447213 DIST xemacs-21.5.34.tar.gz 15816932 BLAKE2B e3be282717b91308c94d3d4bee74527d0b31ea5019e8ac38a62385d2ffd6f684c9e4eaf37c025db5e48a4c8f82d165fcc5258e49934c094cb66e0655d27c3e7d SHA512 b61d88fe530a77b88c2ed0cecd6597ed3c265450bc61f7c6823920f774b2d566ef6fc18a6c33928d846d08d465617d4ccd3c4656606ec8634127a683abbc929a EBUILD xemacs-21.4.24-r2.ebuild 7132 BLAKE2B 9be4cd45796c4a902cc0af0c42a9b1b63b8de00f7f25534b9e8fe0fe5dc1f81710eba92cece392c9f3dc63d65c6bee55c18e7b6b921f1f429856e2dae41198b3 SHA512 f45f7723262cc308d8caaff4c62edc436f008b0f0f11f5e107cab849d99cd868a9f88d1193d38b975fab597d01d2a4a9406078442872e1f93a334707946908ba -EBUILD xemacs-21.5.34-r4.ebuild 7214 BLAKE2B 80d3dc85284f4d5da88cbcf6b1ca3a9b1eca2a062398992a5354d479a3ab9115ef20b6134bbfefcbc1d178c645738ec257e9c90caf2213baea64b4e2a7eb482d SHA512 cce030edc1eeedd97a2da7eb91f59aa0d23d8145f69082170f2743dc29d77ec11f0138341dd274615a854d42e75dae08d2c8e12235d8c9ce0395d38a1b761d44 -EBUILD xemacs-21.5.34-r5.ebuild 7390 BLAKE2B 89344346e872dc22a2888e39dc5bab80b5a216600914ce13d3567508b4a8f6ae6ae7f8ea520e5731777d0817f96a12acd0aca22f20d3295102e3a6f2625824c9 SHA512 a0600d8b93ada5f905341295b9f23f212312ec8c3998cc2e4cb676184f7140b8d10cce4b9e2e08e323fd94996283f84cc2e5cc50a625659126e044231d25df4d +EBUILD xemacs-21.5.34-r5.ebuild 7439 BLAKE2B 8a08013b02e953e0de1b7806bd964bdcabe8eac599476eec4bb8001b4a412ef7357f5ddbf489843d2d69db2cbe1677e4e01efc22392413da0cfbb6eb5c124ee6 SHA512 321265fcb6426883567157a7711a0dc81a263f2174ace7909165bceab641f55c013437f1a04c45987168f934d505a468a3d9f1de2347d9766cfc575eef6349d1 MISC metadata.xml 682 BLAKE2B e6b1655f31d4e58fb4c0d35f8b410af6a17d590fac336c4e17091619629d948d9a9aeba4e579ed4a793c79506afdc9aa77f43db8ece9e5e04dc98fc90291e27d SHA512 51c021269b2f5f9483ff5a743ba5c7a20d60f5e59fd063bee7355468d69528da0d77c1e3b25f320be024beaf4d94130afa16b5a8f151043895371a16cae3fcf7 diff --git a/app-editors/xemacs/files/xemacs-21.5.34-process-test-qa.patch b/app-editors/xemacs/files/xemacs-21.5.34-process-test-qa.patch new file mode 100644 index 000000000000..ff17f6b62411 --- /dev/null +++ b/app-editors/xemacs/files/xemacs-21.5.34-process-test-qa.patch @@ -0,0 +1,11 @@ +--- a/tests/automated/process-tests.el 2021-01-16 15:42:20.195864978 +0100 ++++ b/tests/automated/process-tests.el 2021-01-16 15:43:27.840426754 +0100 +@@ -49,7 +49,7 @@ + (goto-char (point-min)) + (Assert (looking-at "foo"))): + +- (Assert (= 127 (shell-command "unknown_command"))) ++ (Assert (= 127 (shell-command "unknown_command > /dev/null 2>&1"))) + (Assert (= 2 (shell-command "exit 2"))) + (Assert (equal "(Shell command failed with code 2 and no output)" (message-displayed-p t))) + diff --git a/app-editors/xemacs/xemacs-21.5.34-r4.ebuild b/app-editors/xemacs/xemacs-21.5.34-r4.ebuild deleted file mode 100644 index 8cf979775cf2..000000000000 --- a/app-editors/xemacs/xemacs-21.5.34-r4.ebuild +++ /dev/null @@ -1,256 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Note: xemacs currently does not work with position independent code -# so the build forces the use of the -no-pie option - -EAPI=5 - -inherit eutils flag-o-matic multilib xdg-utils - -DESCRIPTION="highly customizable open source text editor and application development system" -HOMEPAGE="http://www.xemacs.org/" -SRC_URI="http://ftp.xemacs.org/xemacs-21.5/${P}.tar.gz - http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" -IUSE="alsa debug eolconv gif gpm pop postgres ldap libressl xface nas dnd X jpeg tiff png mule motif freewnn canna xft xim athena neXt Xaw3d gdbm berkdb" - -X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps" - -RDEPEND=" - berkdb? ( >=sys-libs/db-4:= !!<sys-libs/db-4 ) - gdbm? ( >=sys-libs/gdbm-1.8.3[berkdb(+)] ) - >=sys-libs/zlib-1.1.4 - !libressl? ( >=dev-libs/openssl-0.9.6:0 ) - libressl? ( dev-libs/libressl ) - >=media-libs/audiofile-0.2.3 - gpm? ( >=sys-libs/gpm-1.19.6 ) - postgres? ( dev-db/postgresql:= ) - ldap? ( net-nds/openldap ) - alsa? ( media-libs/alsa-lib ) - nas? ( media-libs/nas ) - X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) ) - dnd? ( x11-libs/dnd ) - motif? ( >=x11-libs/motif-2.3:0[xft=] ) - athena? ( x11-libs/libXaw ) - Xaw3d? ( x11-libs/libXaw3d ) - xft? ( media-libs/freetype:2 x11-libs/libXft x11-libs/libXrender >=media-libs/fontconfig-2.5.0 ) - neXt? ( x11-libs/neXtaw ) - xface? ( media-libs/compface ) - tiff? ( media-libs/tiff:0 ) - png? ( >=media-libs/libpng-1.2:0 ) - jpeg? ( virtual/jpeg:0 ) - canna? ( app-i18n/canna ) - freewnn? ( app-i18n/freewnn ) - >=sys-libs/ncurses-5.2:= - >=app-eselect/eselect-emacs-1.15" - -DEPEND="${RDEPEND} - virtual/pkgconfig" - -PDEPEND="app-xemacs/xemacs-base - mule? ( app-xemacs/mule-base )" - -src_unpack() { - default_src_unpack - - use neXt && unpack NeXT_XEmacs.tar.gz -} - -src_prepare() { - use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* "${S}"/etc/toolbar/ - find "${S}"/lisp -name '*.elc' -exec rm {} \; || die - epatch "${FILESDIR}/${P}-ncurses-tinfo.patch" - epatch "${FILESDIR}/${P}-gcc5.patch" - epatch "${FILESDIR}/${P}-glibc-macro.patch" - epatch "${FILESDIR}/${P}-as-needed.patch" - - # Some binaries and man pages are installed under suffixed names - # to avoid collions with their GNU Emacs counterparts (see below). - # Fix internal filename references. - sed -i -e 's/exec gnuclient/&-xemacs/' lib-src/gnudoit || die - sed -i -e '/^\.so/s/etags/&-xemacs/' etc/ctags.1 || die - sed -i -e '/^\.so/s/gnuserv/&-xemacs/' etc/gnu{client,doit,attach}.1 || die -} - -src_configure() { - local myconf="" - - # bug #639642 - test-flags -no-pie >/dev/null && append-flags -no-pie - filter-flags -pie - - if use X; then - - myconf="${myconf} --with-widgets=athena" - myconf="${myconf} --with-dialogs=athena" - myconf="${myconf} --with-menubars=lucid" - myconf="${myconf} --with-scrollbars=lucid" - if use motif ; then - myconf="--with-widgets=motif" - myconf="${myconf} --with-dialogs=motif" - myconf="${myconf} --with-scrollbars=motif" - myconf="${myconf} --with-menubars=lucid" - fi - if use athena or use Xaw3d ; then - myconf="--with-scrollbars=athena" - fi - - if use Xaw3d; then - myconf="${myconf} --with-athena=3d" - elif use neXt; then - myconf="${myconf} --with-athena=next" - else - myconf="${myconf} --with-athena=xaw" - fi - - use dnd && myconf="${myconf} --with-dragndrop --with-offix" - - myconf="${myconf} $(use_with tiff )" - myconf="${myconf} $(use_with png )" - myconf="${myconf} $(use_with jpeg )" - myconf="${myconf} $(use_with xface )" - - use xft && myconf="${myconf} --with-xft=emacs,tabs,menubars,gauges" || - myconf="${myconf} --with-xft=no" - - else - myconf="${myconf} - --without-x - --without-xpm - --without-dragndrop - --with-xft=no - --with-gif=no" - fi - - if use mule ; then - myconf="${myconf} --with-mule" - - if use xim ; then - if use motif ; then - myconf="${myconf} --with-xim=motif" - else - myconf="${myconf} --with-xim=xlib" - fi - else - myconf="${myconf} --with-xim=no" - fi - - myconf="${myconf} $(use_with canna )" - myconf="${myconf} $(use_with freewnn wnn )" - fi - - # This determines the type of sounds we are playing - local soundconf="native" - - # This determines how these sounds should be played - use nas && soundconf="${soundconf},nas" - use alsa && soundconf="${soundconf},alsa" - - myconf="${myconf} --with-sound=${soundconf}" - - if use gdbm || use berkdb ; then - use gdbm && mydb="gdbm" - use berkdb && mydb="${mydb},berkdb" - - myconf="${myconf} --with-database=${mydb}" - else - myconf="${myconf} --without-database" - fi - - use debug && myconf="${myconf} --with-debug" || - myconf="${myconf} --with-optimization" - - econf ${myconf} \ - $(use_with gif ) \ - $(use_with gpm ) \ - $(use_with postgres postgresql ) \ - $(use_with ldap ) \ - $(use_with eolconv file-coding ) \ - $(use_with pop ) \ - --prefix=/usr \ - --with-ncurses \ - --with-msw=no \ - --with-mail-locking=flock \ - --with-site-lisp=yes \ - --with-site-modules=yes \ - --with-newgc \ - --with-system-malloc \ - --enable-option-checking=no \ - --with-last-packages=/usr/lib/xemacs -} - -src_compile() { - emake EMACSLOADPATH="${S}"/lisp -} - -src_install() { - emake prefix="${D}"/usr \ - mandir="${D}"/usr/share/man/man1 \ - infodir="${D}"/usr/share/info \ - libdir="${D}"/usr/$(get_libdir) \ - datadir="${D}"/usr/share \ - install - - # Rename some applications installed in bin so that it is clear - # which application installed them and so that conflicting - # packages (emacs) can't clobber the actual applications. - # Addresses bug #62991. - for i in b2m ctags etags gnuclient gnudoit gnuattach; do - mv "${D}"/usr/bin/${i} "${D}"/usr/bin/${i}-xemacs || die "mv ${i} failed" - done - - # rename man pages - for i in ctags etags gnuserv gnuclient gnudoit gnuattach; do - mv "${D}"/usr/share/man/man1/${i}{,-xemacs}.1 || die "mv ${i}.1 failed" - done - - # install base packages directories - dodir /usr/lib/xemacs/xemacs-packages/ - dodir /usr/lib/xemacs/site-packages/ - dodir /usr/lib/xemacs/site-modules/ - dodir /usr/lib/xemacs/site-lisp/ - - if use mule; - then - dodir /usr/lib/xemacs/mule-packages - fi - - # remove extraneous info files - cd "${D}"/usr/share/info - rm -f dir info.info texinfo* termcap* standards* - - cd "${S}" - dodoc CHANGES-* ChangeLog INSTALL Installation PROBLEMS README* - - newicon "${S}"/etc/${PN}-icon.xpm ${PN}.xpm - - domenu "${FILESDIR}"/${PN}.desktop -} - -pkg_postinst() { - eselect emacs update ifunset - eselect gnuclient update ifunset - xdg_desktop_database_update - - einfo "If you are upgrading from XEmacs 21.4 you should note the following" - einfo "incompatibilities:" - einfo "- Mule-UCS is no longer supported due to proper UTF-8 support in XEmacs 21.5" - einfo "- The X resource class has changed from Emacs to XEmacs," - einfo " settings in your .Xdefaults file should be updated accordingly." - - if use xft; - then - einfo "You have enabled Xft font support. Xft requires font names to be provided" - einfo "in a different way, so you may need to adjust your .Xdefaults accordingly." - fi -} - -pkg_postrm() { - eselect emacs update ifunset - eselect gnuclient update ifunset - xdg_desktop_database_update -} diff --git a/app-editors/xemacs/xemacs-21.5.34-r5.ebuild b/app-editors/xemacs/xemacs-21.5.34-r5.ebuild index accb1cfdff36..91fe80f8bfe7 100644 --- a/app-editors/xemacs/xemacs-21.5.34-r5.ebuild +++ b/app-editors/xemacs/xemacs-21.5.34-r5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Note: xemacs currently does not work with position independent code @@ -70,6 +70,7 @@ src_prepare() { eapply "${FILESDIR}/${P}-configure-libc-version.patch" eapply "${FILESDIR}/${P}-ar.patch" eapply "${FILESDIR}/${P}-strsignal.patch" + eapply "${FILESDIR}/${P}-process-test-qa.patch" eapply_user diff --git a/app-editors/xmlcopyeditor/Manifest b/app-editors/xmlcopyeditor/Manifest index 6a4f0141b036..875e7e159f03 100644 --- a/app-editors/xmlcopyeditor/Manifest +++ b/app-editors/xmlcopyeditor/Manifest @@ -1,4 +1,4 @@ AUX xmlcopyeditor-1.2.1.3-no-automagic-enchant.patch 597 BLAKE2B fe33a2ca16954fbfad90b19edb6c9e161fda4fc26650a4cccbe717bc23143dc54fe5689b83e135f16d1e3fc57c8794eb01e2760db927917fd1f858140d712d5b SHA512 e859277afe276a2e358a011a7c1a9d61e554463ebbe79985bcc159b49495eec076f24595b3b43ae3a3210797f59a92b9944f1a59754556a8322a9ec1d0d5d7d3 DIST xmlcopyeditor-1.2.1.3.tar.gz 4266907 BLAKE2B 52e8c27a37edbcc0da46b52443f5b6754252a62f1abb7746e724270dd5cd9a2db4de60e68d495008ef55a18e9c25149825c9b26c5fd6e20d8e3937931de64e74 SHA512 1adda58bc262cd22898ba22eed3cad9f4a51f199e779172af2d51c5d7bf6dac072b9015b90906236de83d7acebe29d0aae6ae73998ec9d9b3c58b02f081e0b4d -EBUILD xmlcopyeditor-1.2.1.3-r1.ebuild 939 BLAKE2B 5e934e0f17669e683316bbe9534e28b33e747f3db4ea9f0d84b1fb96eb2d2c663022f42c4a68539c5827796ad5cf1dfe6eff8bf22ba4a5f023d924f2ae5a435f SHA512 4c8c6e13755ba3064063aae517368f5016061b2f56d65f0fc59a97bc1b8549253c46fec1462c2c4dafe4125fc8829e10fc72a6aa7725c4624e2a0855211e89db +EBUILD xmlcopyeditor-1.2.1.3-r1.ebuild 882 BLAKE2B 352b538f0637fbdec5efd8c34029b25f9c74b05c6ca20363e5a03a48ab80ba7042c037bf3dd291708157d4426249932e3e3243d4fe409009db8f25423537a025 SHA512 94ece0feba37eb20e255e9305de6925b615b340e1d98c9cc071590a81e85b53e9a0d178aff2350ad7fab52c59bbf64c1c57dd4a2b403b9f9fd9f3b3dfba2e192 MISC metadata.xml 250 BLAKE2B 113a0d77e4ddd91ae5487bc89371d2973202f242a3c9a8899725295e62b51c0a64437ab158b40ba410c671f92fe3efb896b1446f7301e1f1e923baece1cb7e04 SHA512 20703a39d4150e2a8984fdaeb997da464e98e6abc363e5e07fee46954d5af19c861e40648fb238b763420349e3ebeaa4bf61a621ccff3ff77d6e629c61095bb0 diff --git a/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.1.3-r1.ebuild b/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.1.3-r1.ebuild index df844c1b0b70..08f5b2c7e7a9 100644 --- a/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.1.3-r1.ebuild +++ b/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.1.3-r1.ebuild @@ -21,8 +21,7 @@ RDEPEND=" dev-libs/libxslt dev-libs/xerces-c[icu] dev-libs/libpcre - !aqua? ( x11-libs/wxGTK:${WX_GTK_VER}[X] ) - aqua? ( x11-libs/wxGTK:${WX_GTK_VER}[aqua] ) + x11-libs/wxGTK:${WX_GTK_VER}[X] " DEPEND="${RDEPEND} dev-libs/boost |