From deba8115d2c2af26df42966b91ef04ff4dd79cde Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 14 May 2020 11:09:11 +0100 Subject: gentoo resync : 14.05.2020 --- app-editors/aee/Manifest | 6 +- app-editors/aee/aee-2.2.15b.ebuild | 63 --------------- app-editors/aee/aee-2.2.21.ebuild | 7 +- .../aee/files/aee-2.2.15b-ae-location.patch | 89 ---------------------- app-editors/aee/files/aee-gcc-10.patch | 44 +++++++++++ 5 files changed, 50 insertions(+), 159 deletions(-) delete mode 100644 app-editors/aee/aee-2.2.15b.ebuild delete mode 100644 app-editors/aee/files/aee-2.2.15b-ae-location.patch create mode 100644 app-editors/aee/files/aee-gcc-10.patch (limited to 'app-editors/aee') diff --git a/app-editors/aee/Manifest b/app-editors/aee/Manifest index 4e159b21105e..eefbd974f521 100644 --- a/app-editors/aee/Manifest +++ b/app-editors/aee/Manifest @@ -1,8 +1,6 @@ -AUX aee-2.2.15b-ae-location.patch 2656 BLAKE2B 249d858c5ca410b422d73f5932b13cc9a9ea007e1099e6a8e9f81e7f8a0ef6cb835ada70f14b1ae6178e761a661d783f42d77b2168be328635b51bfe61a9dc32 SHA512 1de3fa054e64f24cf45bf89dba133c60f24a79b8ce6abce7ad4ede595110cfda22121fa636f8d2c48866e68175008505299fc5e020d834e413eb34859711b313 AUX aee-Wformat-security.patch 225 BLAKE2B 0e3846a9e616ed9cef7a9f2b01bf6f71f080d8817010e6befb89cbbda28fa3f8c85f47f9f6f3c06236da64d0110dd8d3426ee7c6fb646398467b493564d50fae SHA512 bc2647b6e29ed039dd683c15001f7ee992091221ee9851bd302c066ce7c49ca6bcf01ef5eb111b6d998804074855eea497284a579835e3d335d7bfe422dad190 AUX aee-ae-location.patch 2755 BLAKE2B 8b75ee712b5f717c82a073c0e35ceccdc0ed27d6b9c8f64841d6c246cd6761b5d42d121e78374029b0c0252c479ca56ab072c7612d0ef758641cefb1d32459f9 SHA512 48ded083b407d1fb94764967358dc6c858421a3586e56fca1803980912b90404dcbfcadfc5a041b0959e2e10b3a5224751671ec067687b2e361eb2e27eb86cfa -DIST aee-2.2.15b.tar.gz 184218 BLAKE2B f249c0974a971aa6a1bb38afb8675a3ace671d244c717add4ea2f724ac1d07bf1c57c5d27fb6f9f40f27b3055ba94cf959dd4b855181a83f4522c44124c0b994 SHA512 2810cd8f5148edb352fdaefbc823d417b9a83c8083644c8729be8595013ca8ba660bd72120db1e15915e454f5185d2d030c2f0c853b37eb83c213c1d581a640f +AUX aee-gcc-10.patch 706 BLAKE2B e969db928f0327a070ceaa9808cdae3cdafb3588e94fd8414fbca7b27e0c17bb12e542531f162c2de135a88bc09168bd77c9a2ee2368499a39ce7760f99aa0f8 SHA512 bd560e541af9323feeda9f9138bf28c21af6d0099fda7f014ae82dd988f3fd6f9d2abf1c4883610a20b3708d48d8392bc3e60a01c3798604e6c6dd60f8f838f9 DIST aee-2.2.21.tar.gz 186304 BLAKE2B 2d41678e07f6590023f428e042686c92377200826f86ebb28fe93ec1e5f07290de6eef765dbae91efcef01d32896127c044f20c204b50ed50894fd743cb1fc19 SHA512 c052ef97b18fa9900e9bf0c5894e05cbbf775d7de4ad4c14cb9e3e7758983c84e4768995a98398c05e30173464e6f7994e7f476522a314bc25dac5a84831155a -EBUILD aee-2.2.15b.ebuild 1224 BLAKE2B 245976628269fd328d3923a0e302d42a2fc93168efc4c308749d4b95b6005dceec491d587aea9ab182b95cfd096470a8d1852f8096165e6da7526ac9b1742b1a SHA512 0a8047efc8c58561e49c186b96035c9c8b340194c7332efdc52fe6ba578f9960161d2500abb0a898176ad685b4267f0f8d287374307e5505794edfb13fc32247 -EBUILD aee-2.2.21.ebuild 1227 BLAKE2B 097ed3e56e30e7b73782dad3c195ce182c13acd3a4e765f6816d31b9dd4f0d47984edcb0c6c55f229e15d2ad4a036ff0bd41a4dd9cfbadd61633b60c582f394f SHA512 8d7f1abfaa36cc1cbd4e7bb170e1fd9e938956e050fb03b0452dc04e9aded3052c5db92b674f5f78ac990756ceda6ef42c9a675414543ffecff74a52b3f3d9fb +EBUILD aee-2.2.21.ebuild 1256 BLAKE2B fb4407c3e59663529373561ff7cba079cce97c347203d2c876db6511d18bc08181b8c3008edb163153f7d2d8092c57204bffb12eee196368c3cc5679c102476a SHA512 d73bfe90989391372e3a5b968110feb2a8a9ccd9405d814a681c432965606169ec15a257137ff9fb47db3b906c720d1f3fc18b65dc95dad0f2f265dcf979417b MISC metadata.xml 221 BLAKE2B 6fb71e3c82061054a0c2d88c1ce8e591d5742628fe53032c9efd2c371ce1e8b0135b00ac91fa1905df39a507d5faa5871fb3a30d167dd46cec581682ba17c8ff SHA512 a11e9bbbabc9ac96985c5dc247e601b065fa762f12bce74224896c27aee34eb908187622bfc849c39c6c722a8ef8ee72b248afc84da1b0eb72f1ff5eeb13bbf0 diff --git a/app-editors/aee/aee-2.2.15b.ebuild b/app-editors/aee/aee-2.2.15b.ebuild deleted file mode 100644 index bbd9266d8086..000000000000 --- a/app-editors/aee/aee-2.2.15b.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit toolchain-funcs - -DESCRIPTION="An easy to use text editor" -#HOMEPAGE="http://mahon.cwx.net/ http://www.users.uswest.net/~hmahon/" -HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" -SRC_URI="mirror://gentoo/${P}.tar.gz" - -LICENSE="Artistic" -SLOT="0" -KEYWORDS="amd64 x86 ~amd64-linux" -IUSE="X" - -RDEPEND="X? ( x11-libs/libX11 )" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${P}-ae-location.patch - "${FILESDIR}"/${PN}-Wformat-security.patch -) -DOCS=( Changes README.${PN} ${PN}.i18n.guide ${PN}.msg ) - -src_prepare() { - sed -i \ - -e "s/make -/\$(MAKE) -/g" \ - -e "/^buildaee/s/$/ localaee/" \ - -e "/^buildxae/s/$/ localxae/" \ - Makefile - - sed -i \ - -e "s/\([\t ]\)cc /\1\\\\\$(CC) /" \ - -e "/CFLAGS =/s/\" >/ \\\\\$(LDFLAGS)\" >/" \ - -e "/other_cflag/s/ \${strip_option}//" \ - create.mk.{aee,xae} - - default -} - -src_compile() { - local target="aee" - use X && target="both" - - emake CC="$(tc-getCC)" ${target} -} - -src_install() { - dobin ${PN} - dosym ${PN} /usr/bin/rae - doman ${PN}.1 - einstalldocs - - insinto /usr/share/${PN} - doins help.ae - - if use X; then - dobin xae - dosym xae /usr/bin/rxae - fi -} diff --git a/app-editors/aee/aee-2.2.21.ebuild b/app-editors/aee/aee-2.2.21.ebuild index 763b9cf91901..69453af195f6 100644 --- a/app-editors/aee/aee-2.2.21.ebuild +++ b/app-editors/aee/aee-2.2.21.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI="7" inherit toolchain-funcs @@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz" LICENSE="Artistic" SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux" +KEYWORDS="amd64 x86 ~amd64-linux" IUSE="X" RDEPEND="X? ( x11-libs/libX11 )" @@ -21,6 +21,7 @@ DEPEND="${RDEPEND}" PATCHES=( "${FILESDIR}"/${PN}-ae-location.patch "${FILESDIR}"/${PN}-Wformat-security.patch + "${FILESDIR}"/${PN}-gcc-10.patch ) DOCS=( Changes README.${PN} ${PN}.i18n.guide ${PN}.msg ) diff --git a/app-editors/aee/files/aee-2.2.15b-ae-location.patch b/app-editors/aee/files/aee-2.2.15b-ae-location.patch deleted file mode 100644 index 4a17642b915d..000000000000 --- a/app-editors/aee/files/aee-2.2.15b-ae-location.patch +++ /dev/null @@ -1,89 +0,0 @@ ---- a/aee.1 -+++ b/aee.1 -@@ -678,7 +678,7 @@ - .\" - .SS Initializing aee From A File - .PP --\fIaee\fR checks for a file named \fIinit.ae\fR in \fI/usr/local/lib\fR, -+\fIaee\fR checks for a file named \fIinit.ae\fR in \fI/usr/share/aee\fR, - .I .init.ae - in the user's home directory, then for \fI.init.ae\fR in the - current directory. (This file may be created manually or by using the -@@ -960,7 +960,7 @@ - .PP - On-line help is provided through the 'help' command or menu item. This - command uses a file with help information. By default the help file is --located in \fB/usr/local/lib/help.ae\fR, but this file may be located -+located in \fB/usr/share/aee/help.ae\fR, but this file may be located - in the user's home directory with the name \fB.help.ae\fR, or in the - current directory with the name \fBhelp.ae\fR. - .\" -@@ -1017,7 +1017,7 @@ - .\" - .SH FILES - .PP --.I /usr/local/lib/init.ae -+.I /usr/share/aee/init.ae - .br - .I $HOME/.aeeinfo - .br ---- a/aee.c -+++ b/aee.c -@@ -2612,7 +2612,7 @@ - - char *init_name[4] = { - "/usr/local/aee/init.ae", -- "/usr/local/lib/init.ae", -+ "/usr/share/aee/init.ae", - NULL, - ".init.ae" - }; ---- a/aee.msg -+++ b/aee.msg -@@ -2,7 +2,7 @@ - $ - $set 1 - $quote " --1 "/usr/local/lib/help.ae" -+1 "/usr/share/aee/help.ae" - 2 "main" - 3 "modes menu" - 4 "tabs to spaces " ---- a/help.ae -+++ b/help.ae -@@ -1058,11 +1058,11 @@ - - The file 'init.ae' may be used to set parameters and define keys to - perform certain functions within ae. This file may reside in three --locations: /usr/local/lib/init.ae, .init.ae in your home directory, and -+locations: /usr/share/aee/init.ae, .init.ae in your home directory, and - .init.ae in the current working directory. - - First, aee checks for a system level initialization file, located in --/usr/local/lib. Next the user's home directory is checked for a file named -+/usr/share/aee. Next the user's home directory is checked for a file named - .init.ae, then the current directory. The settings from each file are read, - so that the directives from the most recently read file will take precedence - over previously read files. This allows, for example, the .init.ae file in ---- a/help.c -+++ b/help.c -@@ -12,7 +12,7 @@ - - char *help_file_list[4] = { - "/usr/local/aee/help.ae", -- "/usr/local/lib/help.ae", -+ "/usr/share/aee/help.ae", - "~/.help.ae", - "help.ae" - }; ---- a/localize.c -+++ b/localize.c -@@ -64,7 +64,7 @@ - catalog = catopen("aee", 0); - #endif /* NO_CATGETS */ - -- ae_help_file = catgetlocal( 1, "/usr/local/lib/help.ae"); -+ ae_help_file = catgetlocal( 1, "/usr/share/aee/help.ae"); - main_buffer_name = catgetlocal( 2, "main"); - - diff --git a/app-editors/aee/files/aee-gcc-10.patch b/app-editors/aee/files/aee-gcc-10.patch new file mode 100644 index 000000000000..c8747099e588 --- /dev/null +++ b/app-editors/aee/files/aee-gcc-10.patch @@ -0,0 +1,44 @@ +--- a/Xcurse.c ++++ b/Xcurse.c +@@ -37,6 +37,8 @@ + + extern int eightbit; + ++struct _line *top_of_win; ++ + static WINDOW *virtual_scr; + WINDOW *curscr; + WINDOW *stdscr; +--- a/Xcurse.h ++++ b/Xcurse.h +@@ -132,7 +132,7 @@ + int number; + }; + +-struct _line *top_of_win; ++extern struct _line *top_of_win; + + typedef struct WIND { + int SR; /* starting row */ +--- a/new_curse.c ++++ b/new_curse.c +@@ -85,6 +85,8 @@ + #endif + + ++struct _line *top_of_win; ++ + WINDOW *curscr; + static WINDOW *virtual_scr; + WINDOW *stdscr; +--- a/new_curse.h ++++ b/new_curse.h +@@ -161,7 +161,7 @@ + int number; + }; + +-struct _line *top_of_win; ++extern struct _line *top_of_win; + + typedef struct WIND { + int SR; /* starting row */ -- cgit v1.2.3