diff options
Diffstat (limited to 'app-editors')
-rw-r--r-- | app-editors/Manifest.gz | bin | 13235 -> 13244 bytes | |||
-rw-r--r-- | app-editors/le/Manifest | 2 | ||||
-rw-r--r-- | app-editors/le/le-1.14.3.ebuild | 22 | ||||
-rw-r--r-- | app-editors/neovim/Manifest | 9 | ||||
-rw-r--r-- | app-editors/neovim/files/neovim-0.4.3-gcc-10-fix.patch | 225 | ||||
-rw-r--r-- | app-editors/neovim/metadata.xml | 1 | ||||
-rw-r--r-- | app-editors/neovim/neovim-0.4.3.ebuild | 4 | ||||
-rw-r--r-- | app-editors/neovim/neovim-0.4.4.ebuild | 99 | ||||
-rw-r--r-- | app-editors/neovim/neovim-9999.ebuild | 22 | ||||
-rw-r--r-- | app-editors/pluma/Manifest | 2 | ||||
-rw-r--r-- | app-editors/pluma/pluma-1.24.1.ebuild | 81 | ||||
-rw-r--r-- | app-editors/sandy/Manifest | 1 | ||||
-rw-r--r-- | app-editors/sandy/sandy-0.4.ebuild | 30 | ||||
-rw-r--r-- | app-editors/xemacs/Manifest | 2 | ||||
-rw-r--r-- | app-editors/xemacs/xemacs-21.4.24-r1.ebuild | 243 | ||||
-rw-r--r-- | app-editors/xemacs/xemacs-21.4.24.ebuild | 245 |
16 files changed, 431 insertions, 557 deletions
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz Binary files differindex b6d6c6fb92a4..4e71302a8eaf 100644 --- a/app-editors/Manifest.gz +++ b/app-editors/Manifest.gz diff --git a/app-editors/le/Manifest b/app-editors/le/Manifest index 1945cab5cb9b..79be705ef07d 100644 --- a/app-editors/le/Manifest +++ b/app-editors/le/Manifest @@ -1,8 +1,6 @@ -DIST le-1.14.3.tar.lzma 392205 BLAKE2B 81dca0bbfa2b23a7bc66103dae3aaecdb50651ab9305d812ad3e838953a60494b4b562219d2fb4a03c9737f96f5f75277c8d0e96ff01448b739c12e44e62a0e8 SHA512 5f09680ba365d80a71dcb09975d2347c0dcb725b8db6c08588fadd82a3a844bd370c3de597b644c57ecfed1c4557d22544a6e9aee6323b1e43f6d8c423843339 DIST le-1.16.1.tar.gz 977143 BLAKE2B 4dcba27bd3c0add2ced4209da618070e201bedfe333fa99951720144048c5a26d3d691ff244b64d3e8dfa4f42a598767b78ff601a7f2f0ce0e069a316d6ee0e0 SHA512 77dda0a3c9cf98d9775937373eed2489f22b641ed870f3152cd59dacff373844f5d8d85f4df864c396b812995625bcdb8f5444de93336495ecb1ea7df27e464e DIST le-1.16.3.tar.gz 985541 BLAKE2B 9b205f14fae619a7ef355eeacd91a3fd3e093f2f53db607b0b71b16805536780fce4f932173987332924c1e392eba6e5e338d986459502c7eaa0223a70a63db3 SHA512 b1ee5440fb71f4214170bc0a1654b68671bac5f08b38e62fdeeaeab2710365aff7cb7c3d13aecbc052b8596c95d7caadd6b3347f9bcb8cc5272a4639856ae46d DIST le-1.16.5.tar.gz 1012934 BLAKE2B c3e037f701e5e8916258fd55a02550f0bae42f56a0a464c7e45e5365e89475bd76ee74aae48cbdb7f5c8d7a665279a63a885007a88a556e86bec875584438f0a SHA512 2c74267f9d02944e0c72f109d9be024d1ec1de84dd6f381f7f8667be1d68b8ebd107ac970f1901f2c77e3150897562d42b9b10ec321356ca1e1ee45728941660 -EBUILD le-1.14.3.ebuild 523 BLAKE2B f57bd51998eaea4f15b420f69f12c3fa3260db82e92387aa94a81eabe84a712cf2423aac325c437f0fe9068d8e6e0bb7b6f3fc13ef45894cf025b2afcb3cfa8f SHA512 9d04c3765306fd5e1b021b57943d58a998909f7858c3f270b5dfe9e6c83d5e51b9527b41c90fcb309c3ed60c6337dca2f59ba8049b42798e9eeb1c110752877b EBUILD le-1.16.1.ebuild 482 BLAKE2B 83482fbf242c9301f48e26895be69296bdef286db5c52f661864c68539291deb87d404b3b45cd563aa2a7cba8717a7af59165011750b954573156410629fc20a SHA512 6de4d2214385b6d7cb42ff8c6ce6dbb1a976be5d211125d75ee2f758f546b3c14a206ff70925cc1e214797ebece6f6911a8a484276ad8c2a17b83222be44fbf0 EBUILD le-1.16.3.ebuild 460 BLAKE2B fba82f3d371ef0005574250a1f4c0682b1301f766c507f1daeda45a078e3c248b0552beac2e2ccaea75b241f2e3232b8e3ea294963fd5157324d99254d2d777a SHA512 7c7acc1c43316f8d139ecc7dfa6894fba025e3627df71682b005e7764577e8fd5bcfeabeedac3982c190eb0002beaae05c6749e026c3beec24874e9a75d4a7c6 EBUILD le-1.16.5.ebuild 487 BLAKE2B d74dbb00f183b185ad355feb03b90194688f99b29343ba6f2455586854f932921659fe59c7fad329510abbf1b778eee222022087c678c1d250071c67a51ebc94 SHA512 ab0971f255f42d9f58fa5167c43d626bdf1ad38273aa1fcb953ef08384e10df9d00bbc1b14cfbc7b614a06dce8540a62fd3af59e0e1f075b33067ee495b08dac diff --git a/app-editors/le/le-1.14.3.ebuild b/app-editors/le/le-1.14.3.ebuild deleted file mode 100644 index 534fd98f98f9..000000000000 --- a/app-editors/le/le-1.14.3.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DESCRIPTION="Terminal text editor" -HOMEPAGE="https://www.gnu.org/directory/text/editors/le-editor.html" -SRC_URI="ftp://ftp.yars.free.net/pub/source/le/le-${PV}.tar.lzma" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="" - -RDEPEND="sys-libs/ncurses:0=" -DEPEND="${RDEPEND} - app-arch/xz-utils" - -src_install() { - emake DESTDIR="${D}" install - dodoc ChangeLog FEATURES HISTORY INSTALL NEWS README TODO -} diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest index d3c3c2d1d381..91afaca295a3 100644 --- a/app-editors/neovim/Manifest +++ b/app-editors/neovim/Manifest @@ -1,5 +1,8 @@ +AUX neovim-0.4.3-gcc-10-fix.patch 7417 BLAKE2B 5632a2427337e7b4d1b793381a074d2d7f0822aecb99a83123e8ec4fa4a35a975816a4854d2b596ae1aa63ecb876399c843454b6bd12b759889384d49fb8f0bf SHA512 e29c65e8075972e44ab056fd721208c62d77591a91cc12987bc07339bb2f6373cbf308719d9fa3f7919ec064112475993af64572fad851152da2fc8f0f39d2a4 AUX sysinit.vim 3408 BLAKE2B 50da5ecb83fb38af20d484dbc5f3e417efc083cde339070b07ff4c2fa4ebd080189f975478d82fa977bc763d5e8d7f29c7703a515ecf6fff62772be4ef160170 SHA512 79b574ef42fbdd9c7fe26cffb1fadea3c31becf22f4be441acbdc75068a00f809a23f3a886e1cb6e30bb92c780bd04aea7b94f655f5c9f0d10c547fb10dd6e8a DIST neovim-0.4.3.tar.gz 9556199 BLAKE2B 831f4d4950f4fa2cd9c7393824bbb5eb571ae5759d13af9f320e0fa351fa155413a5be580f010f2c7ab43ca7bc10c569ccf6e3ba29efc7f5a035576b030b216d SHA512 e13853fa296eda8618f389c71b6cbbd6f01d561615e80cc92959131dd10e395b1c6732a7d9ef6dbb9fe3ea9da4c11485b464547e2d46b22e59b8a20214e861f5 -EBUILD neovim-0.4.3.ebuild 1848 BLAKE2B 5d34e6c00564c40ebbf638d94e4cecc79ec7f5d715b8e1509fbecc6b93abd3dfd9dd3b84f76b18cee7ecd61c45e0ac4a43b1bc3121b6ddf67770c63aaeb2f8c6 SHA512 fa4c6705036b50d096fb61ad685c5fe5fd8d6f74ff56887f1bfc94bebc5015fff4736232770ee973723b7f49434635335d3b1ca0839d0309f0ead800b4866c9f -EBUILD neovim-9999.ebuild 1865 BLAKE2B 7a179dcb2aada0a8e059c4db391b15c3b23ef177506bfcb7d8ec42524100a33087e79895d6ff9eef2fba9e28df32245eb4b5309b2a753db89ecea21cae796b9a SHA512 8e782617caa8d3ee930eb2580e14317c30121967a83ade08b102a2be809dffdc016513a3fc0421d7c5759c2341e95b5be594cd1fb2edf9701ae9a38dd2c40d9c -MISC metadata.xml 469 BLAKE2B d0ddf9873870f4578e59c5473cb4cbd1a1aa105d704dabe52f29ff4db51eb988174a3d258b9575a876669716de46f217fb23978a9c4bbe1adfd8a84d4e082399 SHA512 11ee9fc96bcbc2cf131737a4f274d4dae5620d8ff9a27cf9fc6765b7dada8750e220e79ac305161313496c3d1cd499c34d28aaa5f63d6b4776cb8aa4f8af8c1a +DIST neovim-0.4.4.tar.gz 9558246 BLAKE2B b1d44898bb1e1ab40a7e1d7fb4448076c991ebe1a0956674548de82fe7a931d9eaffbf35ba03cf9c88466dcd628a55f1d7bf9e7a13f3dad74424d6d653ded60c SHA512 ca5c2fe1784ac7b0d2117948ba2e9ae5d94e36d22ff9e0967047e1e03e605537672d85543897af335103215ad462c86962f25267d352a77d61bc3d1cafb3c183 +EBUILD neovim-0.4.3.ebuild 1895 BLAKE2B ceb2d111b6d52d10592ab2da6dd507ac5050420b56443a57356d18e5220a081204d5a0331ce788187bb2494ad8f68cae95fc24e36eb57bdf7a892ab93e64d195 SHA512 074b04fa5ae321a293382f1ba21677374352788cb2b166fea99dd9369d07a3af62ded6b7b6f9bb735d9573d95e2bf870d15c9a4acaaba750fe3c1f37f8d99c6a +EBUILD neovim-0.4.4.ebuild 2348 BLAKE2B 58b011421a7cae8fd3c09d214a4bba0acd3eda43d5a08353170bc3c7268da080ae6fd8f891b36be77cadc1430506282e13d3e50dd4d6119014c0d1b43265f6ef SHA512 8106a227003985d3c35eca795abf2b587cd8e27b115e2e50c064a45e406605c6fa21eaee35eb85e3de5422ddd91a62745f6907f6b92904788c3c24b742890955 +EBUILD neovim-9999.ebuild 2372 BLAKE2B eefb333a5041d8bd4cc131c92aad6292a3928ecccb6c1afae5ac67608697085016af5c7928944d877a73fc26fdce5ac2fe14cbde397611a3e7e8b94f6e728a99 SHA512 109c49c8b12258d7e4cb7cde1b4ece99c8fb0faf362fab0df719609f9693c250241f30cf54764a7406ad6f5df2f0c471a13332447f6a6b1ee2659a52eaf535f3 +MISC metadata.xml 535 BLAKE2B 7cebdc1b7adafafdcc2fe266f8696ad0dff927e8a9383ee34ac66e2c8910d3863d1f7603f2a82dec75f586ab22814d7268475ae3ce02fc3dca12a665e1e8ce5e SHA512 71fcf593a1b9587e6af0e30e851fb17e8552568a4e8bd38341c150ada7dbf72f962250f3306403c0be2d334932f63fe183850efe1c67d515ba79577cdf7aa561 diff --git a/app-editors/neovim/files/neovim-0.4.3-gcc-10-fix.patch b/app-editors/neovim/files/neovim-0.4.3-gcc-10-fix.patch new file mode 100644 index 000000000000..5826d62ce6c1 --- /dev/null +++ b/app-editors/neovim/files/neovim-0.4.3-gcc-10-fix.patch @@ -0,0 +1,225 @@ +From ebcde1de42588e697e0f4eaed9f6f0ea6a77a2cd Mon Sep 17 00:00:00 2001 +From: Andreas Schneider <asn@cryptomilk.org> +Date: Mon, 17 Feb 2020 16:33:55 +0100 +Subject: [PATCH 1/6] nvim:eval: Fix enum declaration for ListLenSpecials + +Instead of declaring an enum, this creates a global variable. As gcc10 +uses -fno-common by default, global variables declared with the same +name more than once is not allowed anymore revealing this issue. + +Each time this header is included, we define the enum name as a global +variable. + +See also https://bugzilla.redhat.com/show_bug.cgi?id=1799680 +--- + src/nvim/eval/typval.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/nvim/eval/typval.h b/src/nvim/eval/typval.h +index 008453b87f2f..5afdedff751b 100644 +--- a/src/nvim/eval/typval.h ++++ b/src/nvim/eval/typval.h +@@ -33,7 +33,7 @@ typedef double float_T; + enum { DO_NOT_FREE_CNT = (INT_MAX / 2) }; + + /// Additional values for tv_list_alloc() len argument +-enum { ++enum ListLenSpecials { + /// List length is not known in advance + /// + /// To be used when there is neither a way to know how many elements will be +@@ -49,7 +49,7 @@ enum { + /// + /// To be used when it looks impractical to determine list length. + kListLenMayKnow = -3, +-} ListLenSpecials; ++}; + + /// Maximal possible value of varnumber_T variable + #define VARNUMBER_MAX INT64_MAX + +From b87b4a61476bb65e9200bd2ee93b8a98ca4db84e Mon Sep 17 00:00:00 2001 +From: Andreas Schneider <asn@cryptomilk.org> +Date: Mon, 17 Feb 2020 17:17:37 +0100 +Subject: [PATCH 2/6] nvim:viml: Fix enum declaration of ExprParserFlags + +Instead of declaring an enum, this creates a global variable. As gcc10 +uses -fno-common by default, global variables declared with the same +name more than once is not allowed anymore revealing this issue. + +Each time this header is included, we define the enum name as a global +variable. + +See also https://bugzilla.redhat.com/show_bug.cgi?id=1799680 +--- + src/nvim/viml/parser/expressions.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/nvim/viml/parser/expressions.h b/src/nvim/viml/parser/expressions.h +index 23e172da75b2..838a74227182 100644 +--- a/src/nvim/viml/parser/expressions.h ++++ b/src/nvim/viml/parser/expressions.h +@@ -326,7 +326,7 @@ struct expr_ast_node { + } data; + }; + +-enum { ++enum ExprParserFlags { + /// Allow multiple expressions in a row: e.g. for :echo + /// + /// Parser will still parse only one of them though. +@@ -345,7 +345,7 @@ enum { + // viml_expressions_parser.c, nvim_parse_expression() flags parsing + // alongside with its documentation and flag sets in check_parsing() + // function in expressions parser functional and unit tests. +-} ExprParserFlags; ++}; + + /// AST error definition + typedef struct { + +From 986db1adb491b5cb5936d2369816236847af26da Mon Sep 17 00:00:00 2001 +From: Andreas Schneider <asn@cryptomilk.org> +Date: Mon, 17 Feb 2020 16:36:21 +0100 +Subject: [PATCH 3/6] nvim: Fix enum declaration of RemapValues + +Instead of declaring an enum, this creates a global variable. As gcc10 +uses -fno-common by default, global variables declared with the same +name more than once is not allowed anymore revealing this issue. + +Each time this header is included, we define the enum name as a global +variable. + +See also https://bugzilla.redhat.com/show_bug.cgi?id=1799680 +--- + src/nvim/getchar.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/nvim/getchar.h b/src/nvim/getchar.h +index 01f60ccf4945..f0b52079aad1 100644 +--- a/src/nvim/getchar.h ++++ b/src/nvim/getchar.h +@@ -10,12 +10,12 @@ + /// Values for "noremap" argument of ins_typebuf() + /// + /// Also used for map->m_noremap and menu->noremap[]. +-enum { ++enum RemapValues { + REMAP_YES = 0, ///< Allow remapping. + REMAP_NONE = -1, ///< No remapping. + REMAP_SCRIPT = -2, ///< Remap script-local mappings only. + REMAP_SKIP = -3, ///< No remapping for first char. +-} RemapValues; ++}; + + // Argument for flush_buffers(). + typedef enum { + +From 517bf15603aba37014b62553eb008e26f2a1db48 Mon Sep 17 00:00:00 2001 +From: Andreas Schneider <asn@cryptomilk.org> +Date: Mon, 17 Feb 2020 16:40:37 +0100 +Subject: [PATCH 4/6] nvim:msgpack: Correctly set up global + ch_before_blocking_events + +gcc10 builds with -fno-common by default. This mean you can't define +a global variable with the same name twice. + +See also https://bugzilla.redhat.com/show_bug.cgi?id=1799680 +--- + src/nvim/msgpack_rpc/channel.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/nvim/msgpack_rpc/channel.h b/src/nvim/msgpack_rpc/channel.h +index 9ff5abdc5f55..90e1c7d48b4c 100644 +--- a/src/nvim/msgpack_rpc/channel.h ++++ b/src/nvim/msgpack_rpc/channel.h +@@ -15,7 +15,7 @@ + /// HACK: os/input.c drains this queue immediately before blocking for input. + /// Events on this queue are async-safe, but they need the resolved state + /// of os_inchar(), so they are processed "just-in-time". +-MultiQueue *ch_before_blocking_events; ++EXTERN MultiQueue *ch_before_blocking_events INIT(= NULL); + + + #ifdef INCLUDE_GENERATED_DECLARATIONS + +From 823b2104c3e579e8c3db8baab263dca0aa9d48bc Mon Sep 17 00:00:00 2001 +From: Andreas Schneider <asn@cryptomilk.org> +Date: Mon, 17 Feb 2020 17:29:12 +0100 +Subject: [PATCH 5/6] nvim: Correctly setup global channels + +As gcc10 uses -fno-common by default, global variables declared with the +same name more than once is not allowed anymore revealing this issue. + +We need to define it as extern to access it. + +See also https://bugzilla.redhat.com/show_bug.cgi?id=1799680 +--- + src/nvim/channel.c | 1 - + src/nvim/channel.h | 2 +- + src/nvim/main.c | 1 + + 3 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/nvim/channel.c b/src/nvim/channel.c +index c66a0682e351..5eb29a7290c2 100644 +--- a/src/nvim/channel.c ++++ b/src/nvim/channel.c +@@ -19,7 +19,6 @@ + #include "nvim/ascii.h" + + static bool did_stdio = false; +-PMap(uint64_t) *channels = NULL; + + /// next free id for a job or rpc channel + /// 1 is reserved for stdio channel +diff --git a/src/nvim/channel.h b/src/nvim/channel.h +index c733e276bef2..9d26852ce532 100644 +--- a/src/nvim/channel.h ++++ b/src/nvim/channel.h +@@ -85,7 +85,7 @@ struct Channel { + bool callback_scheduled; + }; + +-EXTERN PMap(uint64_t) *channels; ++EXTERN PMap(uint64_t) *channels INIT(= NULL); + + #ifdef INCLUDE_GENERATED_DECLARATIONS + # include "channel.h.generated.h" +diff --git a/src/nvim/main.c b/src/nvim/main.c +index 56d9030a7f42..4a9f2371a298 100644 +--- a/src/nvim/main.c ++++ b/src/nvim/main.c +@@ -10,6 +10,7 @@ + #include <msgpack.h> + + #include "nvim/ascii.h" ++#include "nvim/channel.h" + #include "nvim/vim.h" + #include "nvim/main.h" + #include "nvim/aucmd.h" + +From 0504f2f88dac9a4cf1fe1052a1e00ab203e9cf8e Mon Sep 17 00:00:00 2001 +From: Andreas Schneider <asn@cryptomilk.org> +Date: Mon, 17 Feb 2020 18:04:01 +0100 +Subject: [PATCH 6/6] cmake: Check for -fno-common and use it if available + +--- + CMakeLists.txt | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index de530bb4f7da..74e161d98907 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -308,6 +308,11 @@ if(UNIX) + endif() + endif() + ++check_c_compiler_flag(-fno-common HAVE_FNO_COMMON) ++if (HAVE_FNO_COMMON) ++ add_compile_options(-fno-common) ++endif() ++ + check_c_compiler_flag(-fdiagnostics-color=auto HAS_DIAG_COLOR_FLAG) + if(HAS_DIAG_COLOR_FLAG) + if(CMAKE_GENERATOR MATCHES "Ninja") diff --git a/app-editors/neovim/metadata.xml b/app-editors/neovim/metadata.xml index 73806d95e8a1..b263ac237703 100644 --- a/app-editors/neovim/metadata.xml +++ b/app-editors/neovim/metadata.xml @@ -6,6 +6,7 @@ <name>Gentoo Vim Project</name> </maintainer> <use> + <flag name="lto">Build with Link Time Optimization (LTO)</flag> <flag name="nvimpager">Install nvimpager symlink to less.sh macro</flag> <flag name="tui">Build the neovim unix tui</flag> </use> diff --git a/app-editors/neovim/neovim-0.4.3.ebuild b/app-editors/neovim/neovim-0.4.3.ebuild index 34583324d168..b6a404f65c14 100644 --- a/app-editors/neovim/neovim-0.4.3.ebuild +++ b/app-editors/neovim/neovim-0.4.3.ebuild @@ -26,7 +26,6 @@ BDEPEND=" virtual/libintl virtual/pkgconfig " - DEPEND=" dev-libs/libuv:0= >=dev-libs/libvterm-0.1.2 @@ -45,7 +44,6 @@ DEPEND=" >=dev-libs/unibilium-2.0.0:0= ) " - RDEPEND=" ${DEPEND} app-eselect/eselect-vi @@ -53,6 +51,8 @@ RDEPEND=" CMAKE_BUILD_TYPE=Release +PATCHES=( "${FILESDIR}"/${P}-gcc-10-fix.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-0.4.4.ebuild b/app-editors/neovim/neovim-0.4.4.ebuild new file mode 100644 index 000000000000..d10522f3c6b7 --- /dev/null +++ b/app-editors/neovim/neovim-0.4.4.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake optfeature xdg + +DESCRIPTION="Vim-fork focused on extensibility and agility." +HOMEPAGE="https://neovim.io" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + 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 ~arm ~arm64 ~x86" +fi + +LICENSE="Apache-2.0 vim" +SLOT="0" +IUSE="+lto +luajit +nvimpager +tui" +# Upstream say the test library needs LuaJIT +# https://github.com/neovim/neovim/blob/91109ffda23d0ce61cec245b1f4ffb99e7591b62/CMakeLists.txt#L377 +#REQUIRED_USE="test? ( luajit )" +#RESTRICT="!test? ( test )" + +BDEPEND=" + dev-util/gperf + virtual/libiconv + virtual/libintl + virtual/pkgconfig +" +# Once dev-lua/busted has luajit support, we can add tests. +# bug #584694 +DEPEND=" + dev-libs/libuv:0= + >=dev-libs/libvterm-0.1.2 + dev-libs/msgpack:0= + dev-lua/lpeg[luajit=] + dev-lua/luv[luajit=] + dev-lua/mpack[luajit=] + net-libs/libnsl + luajit? ( dev-lang/luajit:2 ) + !luajit? ( + dev-lang/lua:= + dev-lua/LuaBitOp + ) + tui? ( + dev-libs/libtermkey + >=dev-libs/unibilium-2.0.0:0= + ) +" +RDEPEND=" + ${DEPEND} + app-eselect/eselect-vi +" + +src_prepare() { + # use our system vim dir + sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \ + -i src/nvim/globals.h || die + + cmake_src_prepare +} + +src_configure() { + # Upstream default to LTO on non-debug builds + # Let's expose it as a USE flag because upstream + # have preferences for how we should use LTO + # if we want it on (not just -flto) + # ... but allow turning it off. + local mycmakeargs=( + -DENABLE_LTO=$(usex lto) + -DFEAT_TUI=$(usex tui) + -DPREFER_LUA=$(usex luajit no yes) + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + + # install a default configuration file + insinto /etc/vim + doins "${FILESDIR}"/sysinit.vim + + # conditionally install a symlink for nvimpager + if use nvimpager; then + dosym ../share/nvim/runtime/macros/less.sh /usr/bin/nvimpager + fi +} + +pkg_postinst() { + xdg_pkg_postinst + optfeature "clipboard support" x11-misc/xsel x11-misc/xclip gui-apps/wl-clipboard + optfeature "Python plugin support" dev-python/pynvim + optfeature "Ruby plugin support" dev-ruby/neovim-ruby-client + optfeature "remote/nvr support" dev-python/neovim-remote +} diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-9999.ebuild index 6944c0791a40..ae758e6e27bd 100644 --- a/app-editors/neovim/neovim-9999.ebuild +++ b/app-editors/neovim/neovim-9999.ebuild @@ -13,12 +13,16 @@ 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 ~arm ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" fi LICENSE="Apache-2.0 vim" SLOT="0" -IUSE="+luajit +nvimpager +tui" +IUSE="+lto +luajit +nvimpager +tui" +# Upstream say the test library needs LuaJIT +# https://github.com/neovim/neovim/blob/91109ffda23d0ce61cec245b1f4ffb99e7591b62/CMakeLists.txt#L377 +#REQUIRED_USE="test? ( luajit )" +#RESTRICT="!test? ( test )" BDEPEND=" dev-util/gperf @@ -26,11 +30,12 @@ BDEPEND=" virtual/libintl virtual/pkgconfig " - +# Once dev-lua/busted has luajit support, we can add tests. +# bug #584694 DEPEND=" dev-libs/libutf8proc:= dev-libs/libuv:0= - >=dev-libs/libvterm-0.1 + >=dev-libs/libvterm-0.1.2 dev-libs/msgpack:0= dev-lua/lpeg[luajit=] dev-lua/luv[luajit=] @@ -46,14 +51,11 @@ DEPEND=" >=dev-libs/unibilium-2.0.0:0= ) " - RDEPEND=" ${DEPEND} app-eselect/eselect-vi " -CMAKE_BUILD_TYPE=Release - src_prepare() { # use our system vim dir sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \ @@ -63,7 +65,13 @@ src_prepare() { } src_configure() { + # Upstream default to LTO on non-debug builds + # Let's expose it as a USE flag because upstream + # have preferences for how we should use LTO + # if we want it on (not just -flto) + # ... but allow turning it off. local mycmakeargs=( + -DENABLE_LTO=$(usex lto) -DFEAT_TUI=$(usex tui) -DPREFER_LUA=$(usex luajit no yes) ) diff --git a/app-editors/pluma/Manifest b/app-editors/pluma/Manifest index 1c6d3e6fa9b5..912b4205f7cc 100644 --- a/app-editors/pluma/Manifest +++ b/app-editors/pluma/Manifest @@ -1,3 +1,5 @@ DIST pluma-1.24.0.tar.xz 3717544 BLAKE2B fd9375fd05566c11c24d5bdf55ab0d4619143127a5e48c4e91d18421f50340775d58c3e2264382aa3bbd8aad0569c559e87381a9ece07ce1592d1bc1a5315db1 SHA512 390bf2949549baa0e3dc706526217fbc1513e2f9778917710da806e58cdfb0b7a36e95ed2186442490996cf76783acd4e0f4b8f1fedacee9ba356c0d466510be +DIST pluma-1.24.1.tar.xz 3679636 BLAKE2B e792433b93862c8b0c47145255311c3a3386c1b99ec1ac87ed91608d839ece4430205f83fcc3c0f5145f986105d4c5d8803393035fcaaea08155197bbcf15d03 SHA512 0cfd6a035fc95993dce3e556c49641e799888f20159b29f2c0712c54ee772aa6df1ce755f329414c94efdb2cb3819ce633b92e6559b0c8cb064dab3c74729ab3 EBUILD pluma-1.24.0.ebuild 1780 BLAKE2B d845bbd202c228b0b8f11c1a74b6791081fabe9fdfe80e08e4e62b40e3e3e27b626caa9263f906b7c4eb9ad056412b0f18305a4a107d85ec14d7a39149d73e77 SHA512 1f81f212c6ad19b923e4f8a8aa5b935bb4ca05bba3059553583ecb178bc65bc562e939f690033d62e4737ba76e0d5b008076649dbabb06e87f632120fdfaabe2 +EBUILD pluma-1.24.1.ebuild 1786 BLAKE2B b857ee4a4f1d10b7867958238bcd8cf96cd1ad8cb2f710b9da51c01f1d175bc8dd98c41d82b05fc417f4af7fef597abfba30df96dd123358b08f8ef1c6e21b2f SHA512 96e61cac21d4f94b3efbea4c502e86a3b7c408b54bc79559acfdf599f4eebf6793413df33cf036770593c8bdf5a5390b5ae5bf8220c4cab8a9bd1e1e2d5fc39d MISC metadata.xml 334 BLAKE2B 2d5ac79ba6879f5486724c826a89ed81cf393bc3fedbdea40764b1fb23962672e7c2a625137080a16ccd8e67a55097a4f497269f89ccd8b256490ef99e15b9cb SHA512 fe30c9986ed7086a894a0835847351d92938c424af5b7da51211a23fc197eebbce53cc205014cdd2c3bcc951a5a449c5d5726bede7991716d81fb7bbfe8a3fca diff --git a/app-editors/pluma/pluma-1.24.1.ebuild b/app-editors/pluma/pluma-1.24.1.ebuild new file mode 100644 index 000000000000..9d5382fbcd64 --- /dev/null +++ b/app-editors/pluma/pluma-1.24.1.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +MATE_LA_PUNT="yes" + +PYTHON_COMPAT=( python{3_6,3_7,3_8} ) + +inherit mate python-single-r1 virtualx + +if [[ ${PV} != 9999 ]]; then + KEYWORDS="~amd64 ~arm ~arm64 ~x86" +fi + +DESCRIPTION="Pluma text editor for the MATE desktop" +LICENSE="FDL-1.1+ GPL-2+ LGPL-2+" +SLOT="0" + +IUSE="+introspection spell test" + +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 + >=dev-libs/glib-2.50:2 + >=dev-libs/libpeas-1.2.0[gtk] + >=dev-libs/libxml2-2.5:2 + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + >=x11-libs/gtk+-3.22:3[introspection?] + >=x11-libs/gtksourceview-3.0.0:3.0 + x11-libs/libICE + x11-libs/libX11 + >=x11-libs/libSM-1.0 + x11-libs/pango + introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) + spell? ( + >=app-text/enchant-1.6:= + >=app-text/iso-codes-0.35 + ) + !!app-editors/mate-text-editor +" + +RDEPEND="${PYTHON_DEPS} + ${COMMON_DEPEND} + >=mate-base/mate-desktop-1.9[introspection?] + virtual/libintl +" + +DEPEND="${COMMON_DEPEND} + ~app-text/docbook-xml-dtd-4.1.2 + 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 + >=sys-devel/libtool-2.2.6:2 + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig +" + +src_configure() { + mate_src_configure \ + $(use_enable introspection) \ + $(use_enable spell) \ + $(use_enable test tests) +} + +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/sandy/Manifest b/app-editors/sandy/Manifest index 89d1cfe75ccc..f48cfca12517 100644 --- a/app-editors/sandy/Manifest +++ b/app-editors/sandy/Manifest @@ -1,5 +1,4 @@ AUX sandy-0.4-gentoo.patch 1019 BLAKE2B 8aafad7b55d55fee1e48105f77b321929e306341cb318a89cc500089249988de33fba50a67a24a7868f1d6737a3130717cd38b40a132a28f36da1e1248da4053 SHA512 06e3e4dd2979e3589f9f1205eee13c56006ea4f2d8d8ead61faadebcdc9b590c82b645dc93b6ed6693cd15cd8d7e45491812fa3fb0819cfd088e5e231da7f7ab DIST sandy-0.4.tar.bz2 18409 BLAKE2B bb10bc7def440d436ffa0304c8f009d722b23159fdd8f2b559f768476391ba2ddda9083ef6fd7e0cec32b231d3c6fa9578214e5027b8a4cd490d338b384ea83a SHA512 6f28588e15ccdc467dd9d0de8b221508333defefe5866005d82292583db9f296284f233271af5e85b648c194dff117f94752cc364ed6c1409dae5c3af755b530 EBUILD sandy-0.4-r1.ebuild 749 BLAKE2B c7b400388121ba9e0fe189c77acda73b56f6fae519a39ae39f494bc6082c37bad46b2c10e240e7ee4d4e4967e1a50cfb03c87ece7e7240b9456040f0de17e8f5 SHA512 950c9417523e97699628ed114d8273e8ff52517f760dc4eefe920f52165dbfd61b99f5d5e38877aa236797353ed3276b4517c0727291d2a73aaf2076217af7af -EBUILD sandy-0.4.ebuild 680 BLAKE2B d7133d25632aa6f321dbf51970b2bb8c629e9be3b0fbeedacf7e11d93e065b1b11f2896251676d34e31acfc334e7577236036297a76cdf8621581f50693a8056 SHA512 1bd2f870bca21d66e7d53ede12c92bea99fcec61c970b7ba885f438f9e43584bbe340ee780e0e0410d2c9e5701088db9db06331e65156bc925c8a680ef709695 MISC metadata.xml 210 BLAKE2B bb9591af5406abbf589664053ab6e5cb38933fe6ef97c11609405392b050b26cff8e94e04e85e5798124abd46283bee67b2a74923a5041616df15aaa9cff6da9 SHA512 f7cbe57a24b67a28696f91061ad8bd61d7d4cf3d59d20c3dcc6a4921e29672d00ecf3ece70a8813399d2467ebd626f8f829300e81fc722e9aaa527e213a5fb54 diff --git a/app-editors/sandy/sandy-0.4.ebuild b/app-editors/sandy/sandy-0.4.ebuild deleted file mode 100644 index d401639ce641..000000000000 --- a/app-editors/sandy/sandy-0.4.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils flag-o-matic toolchain-funcs - -DESCRIPTION="an ncurses text editor with an easy-to-read, hackable C source" -HOMEPAGE="https://tools.suckless.org/sandy" -SRC_URI="https://git.suckless.org/${PN}/snapshot/${P}.tar.bz2" - -LICENSE="MIT-with-advertising" -SLOT="0" -KEYWORDS="~amd64" - -DEPEND="sys-libs/ncurses:0=" -RDEPEND="${DEPEND}" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-0.4-gentoo.patch -} - -src_compile() { - tc-export CC PKG_CONFIG - append-cflags -D_DEFAULT_SOURCE - emake PREFIX=/usr ${PN} -} - -src_install() { - emake PREFIX=/usr DESTDIR="${D}" install -} diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest index c1f8751b01b8..c008355475a3 100644 --- a/app-editors/xemacs/Manifest +++ b/app-editors/xemacs/Manifest @@ -15,9 +15,7 @@ AUX xemacs.desktop 1061 BLAKE2B 47941fc8b380e08aad13e44fc1899ee73ef502dbbf5d8be4 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-r1.ebuild 6739 BLAKE2B 2008106ac11ca5535f39f7616f76027e3a0fed4b7fbba798b1746e177a727f5f82b69b897971995ed5fd40665224597f373ac244ad3f24e79966575464e65ca3 SHA512 0b66741feed43ec4d01f33fb557b5fb5e8d20a6b06d7be28271dd2492731c71ae54029929271dcdd26eea733db6420b843283dbf279c9433734c6688d2200f88 EBUILD xemacs-21.4.24-r2.ebuild 7132 BLAKE2B 9be4cd45796c4a902cc0af0c42a9b1b63b8de00f7f25534b9e8fe0fe5dc1f81710eba92cece392c9f3dc63d65c6bee55c18e7b6b921f1f429856e2dae41198b3 SHA512 f45f7723262cc308d8caaff4c62edc436f008b0f0f11f5e107cab849d99cd868a9f88d1193d38b975fab597d01d2a4a9406078442872e1f93a334707946908ba -EBUILD xemacs-21.4.24.ebuild 6781 BLAKE2B 69cd6a5b314a8a578e20ca7e4e7128d2f6077187594508b29de679d6f47087b8b01a83d3665f64cf56a8c6bb5eded514a6cd7acf14ed97e3794f005a6a3ce5d1 SHA512 fb58d55a58c80135465835e10937bfb618b6f1e6fd57eb4673608cbe186840577f02e746369ee7723bb17f3117aff8d87aa3b94f213635fb3cbf1b6a7671d186 EBUILD xemacs-21.5.34-r4.ebuild 7214 BLAKE2B 80d3dc85284f4d5da88cbcf6b1ca3a9b1eca2a062398992a5354d479a3ab9115ef20b6134bbfefcbc1d178c645738ec257e9c90caf2213baea64b4e2a7eb482d SHA512 cce030edc1eeedd97a2da7eb91f59aa0d23d8145f69082170f2743dc29d77ec11f0138341dd274615a854d42e75dae08d2c8e12235d8c9ce0395d38a1b761d44 EBUILD xemacs-21.5.34-r5.ebuild 7390 BLAKE2B 89344346e872dc22a2888e39dc5bab80b5a216600914ce13d3567508b4a8f6ae6ae7f8ea520e5731777d0817f96a12acd0aca22f20d3295102e3a6f2625824c9 SHA512 a0600d8b93ada5f905341295b9f23f212312ec8c3998cc2e4cb676184f7140b8d10cce4b9e2e08e323fd94996283f84cc2e5cc50a625659126e044231d25df4d MISC metadata.xml 682 BLAKE2B e6b1655f31d4e58fb4c0d35f8b410af6a17d590fac336c4e17091619629d948d9a9aeba4e579ed4a793c79506afdc9aa77f43db8ece9e5e04dc98fc90291e27d SHA512 51c021269b2f5f9483ff5a743ba5c7a20d60f5e59fd063bee7355468d69528da0d77c1e3b25f320be024beaf4d94130afa16b5a8f151043895371a16cae3fcf7 diff --git a/app-editors/xemacs/xemacs-21.4.24-r1.ebuild b/app-editors/xemacs/xemacs-21.4.24-r1.ebuild deleted file mode 100644 index 032b668af1e9..000000000000 --- a/app-editors/xemacs/xemacs-21.4.24-r1.ebuild +++ /dev/null @@ -1,243 +0,0 @@ -# Copyright 1999-2020 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" - -WANT_AUTOCONF="2.1" -inherit autotools eutils flag-o-matic toolchain-funcs 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.4/${P}.tar.gz - http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~alpha amd64 arm64 ~hppa ppc ppc64 sparc ~x86" -IUSE="eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn canna 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:= ) - gdbm? ( >=sys-libs/gdbm-1.8.3[berkdb] ) - >=sys-libs/zlib-1.1.4 - >=dev-libs/openssl-0.9.6:0 - >=media-libs/audiofile-0.2.3 - gpm? ( >=sys-libs/gpm-1.19.6 ) - postgres? ( dev-db/postgresql:= ) - ldap? ( net-nds/openldap ) - nas? ( media-libs/nas ) - X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) ) - dnd? ( x11-libs/dnd ) - motif? ( >=x11-libs/motif-2.3:0 ) - athena? ( x11-libs/libXaw ) - Xaw3d? ( x11-libs/libXaw3d ) - 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 ) - !amd64? ( freewnn? ( app-i18n/freewnn ) ) - >=sys-libs/ncurses-5.2:= - >=app-eselect/eselect-emacs-1.15" - -DEPEND="${RDEPEND} - >=sys-apps/texinfo-5" - -PDEPEND="app-xemacs/xemacs-base - mule? ( app-xemacs/mule-base )" - -src_unpack() { - unpack ${P}.tar.gz - use neXt && unpack NeXT_XEmacs.tar.gz -} - -src_prepare() { - # see bug 58350, 102540 and 143580 - epatch "${FILESDIR}"/xemacs-21.4.19-db.patch - # see bug 576512 - epatch "${FILESDIR}"/xemacs-21.4.24-gcc5.patch - epatch "${FILESDIR}"/xemacs-21.4.24-glibc-macro.patch - # see bug 615544 - epatch "${FILESDIR}"/xemacs-21.4.24-ncurses-tinfo.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 - - # Run autoconf. XEmacs tries to be smart by providing a stub - # configure.ac file for autoconf 2.59 but this throws our - # autotools eclass so it must be removed first. - rm "${S}"/configure.ac || die - eautoconf - - use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* "${S}"/etc/toolbar/ -} - -src_configure() { - local myconf="" - - # Can't build with pie. See bug #75028 - 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 ; 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 ) $(use_with png )" - myconf="${myconf} $(use_with jpeg ) $(use_with xface )" - else - myconf="${myconf} - --without-x - --without-xpm - --without-dragndrop - --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 ) $(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" - - 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 - - # Enabling modules will cause segfaults outside the XEmacs build directory - use ia64 && myconf="${myconf} --without-modules" - - einfo "${myconf}" - - # see bug 576512 - append-cflags -fgnu89-inline - - # Don't use econf because it uses options which this configure - # script does not understand (like --host). - ./configure ${myconf} ${EXTRA_ECONF} \ - $(use_with gif ) \ - $(use_with gpm ) \ - $(use_with postgres postgresql ) \ - $(use_with ldap ) \ - $(use_with eolconv file-coding ) \ - $(use_with pop ) \ - --compiler=$(tc-getCC) \ - --prefix=/usr \ - --with-ncurses \ - --with-system-malloc \ - --with-msw=no \ - --mail-locking=flock \ - --with-site-lisp=yes \ - --with-site-modules=yes \ - || die "The configure script failed to run properly" -} - -src_install() { - emake prefix="${D}"/usr \ - mandir="${D}"/usr/share/man/man1 \ - infodir="${D}"/usr/share/info \ - install gzip-el || die "emake install failed" - - # 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 rcs-checkin 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 BUGS CHANGES-* ChangeLog GETTING* INSTALL PROBLEMS README* - dodoc "${FILESDIR}"/README.Gentoo - - 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 -} - -pkg_postrm() { - eselect emacs update ifunset - eselect gnuclient update ifunset - xdg_desktop_database_update -} diff --git a/app-editors/xemacs/xemacs-21.4.24.ebuild b/app-editors/xemacs/xemacs-21.4.24.ebuild deleted file mode 100644 index 7b39f0f4f265..000000000000 --- a/app-editors/xemacs/xemacs-21.4.24.ebuild +++ /dev/null @@ -1,245 +0,0 @@ -# Copyright 1999-2020 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" - -WANT_AUTOCONF="2.1" -inherit autotools eutils flag-o-matic toolchain-funcs 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.4/${P}.tar.gz - http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86" -IUSE="eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn canna 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:= ) - gdbm? ( >=sys-libs/gdbm-1.8.3 ) - >=sys-libs/zlib-1.1.4 - >=dev-libs/openssl-0.9.6:0 - >=media-libs/audiofile-0.2.3 - gpm? ( >=sys-libs/gpm-1.19.6 ) - postgres? ( dev-db/postgresql:= ) - ldap? ( net-nds/openldap ) - nas? ( media-libs/nas ) - X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) ) - dnd? ( x11-libs/dnd ) - motif? ( >=x11-libs/motif-2.3:0 ) - athena? ( x11-libs/libXaw ) - Xaw3d? ( x11-libs/libXaw3d ) - 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 ) - !amd64? ( freewnn? ( app-i18n/freewnn ) ) - >=sys-libs/ncurses-5.2:= - >=app-eselect/eselect-emacs-1.15" - -DEPEND="${RDEPEND} - >=sys-apps/texinfo-5" - -PDEPEND="app-xemacs/xemacs-base - mule? ( app-xemacs/mule-base )" - -src_unpack() { - unpack ${P}.tar.gz - use neXt && unpack NeXT_XEmacs.tar.gz -} - -src_prepare() { - # see bug 58350, 102540 and 143580 - epatch "${FILESDIR}"/xemacs-21.4.19-db.patch - # see bug 576512 - epatch "${FILESDIR}"/xemacs-21.4.24-gcc5.patch - # see bug 615544 - epatch "${FILESDIR}"/xemacs-21.4.24-ncurses-tinfo.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 - - # Run autoconf. XEmacs tries to be smart by providing a stub - # configure.ac file for autoconf 2.59 but this throws our - # autotools eclass so it must be removed first. - rm "${S}"/configure.ac || die - eautoconf - - use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* "${S}"/etc/toolbar/ -} - -src_configure() { - local myconf="" - - # Can't build with pie. See bug #75028 - 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 ; 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 ) $(use_with png )" - myconf="${myconf} $(use_with jpeg ) $(use_with xface )" - else - myconf="${myconf} - --without-x - --without-xpm - --without-dragndrop - --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 ) $(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" - - 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 - - # Enabling modules will cause segfaults outside the XEmacs build directory - use ia64 && myconf="${myconf} --without-modules" - - # fixes #552044, deprecation warnings fools header detection in configure - myconf="${myconf} --cppflags=-Wno-cpp" - - einfo "${myconf}" - - # see bug 576512 - append-cflags -std=gnu89 - - # Don't use econf because it uses options which this configure - # script does not understand (like --host). - ./configure ${myconf} ${EXTRA_ECONF} \ - $(use_with gif ) \ - $(use_with gpm ) \ - $(use_with postgres postgresql ) \ - $(use_with ldap ) \ - $(use_with eolconv file-coding ) \ - $(use_with pop ) \ - --compiler=$(tc-getCC) \ - --prefix=/usr \ - --with-ncurses \ - --with-system-malloc \ - --with-msw=no \ - --mail-locking=flock \ - --with-site-lisp=yes \ - --with-site-modules=yes \ - || die "The configure script failed to run properly" -} - -src_install() { - emake prefix="${D}"/usr \ - mandir="${D}"/usr/share/man/man1 \ - infodir="${D}"/usr/share/info \ - install gzip-el || die "emake install failed" - - # 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 rcs-checkin 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 BUGS CHANGES-* ChangeLog GETTING* INSTALL PROBLEMS README* - dodoc "${FILESDIR}"/README.Gentoo - - 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 -} - -pkg_postrm() { - eselect emacs update ifunset - eselect gnuclient update ifunset - xdg_desktop_database_update -} |