commit: ec9b6020b8390ec3da95bee9945be61aed1c8556 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Mon Feb 3 06:08:30 2020 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Mon Feb 3 06:08:30 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec9b6020
x11-terms/multi-aterm: Remove last-rited pkg Closes: https://bugs.gentoo.org/692228 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> profiles/package.mask | 5 -- x11-terms/multi-aterm/Manifest | 1 - .../multi-aterm/files/0.2.1-initialize-vars.patch | 11 ---- .../multi-aterm-0.2.1-display-security-issue.patch | 23 --------- .../files/multi-aterm-0.2.1-libpng14.patch | 20 -------- x11-terms/multi-aterm/metadata.xml | 5 -- x11-terms/multi-aterm/multi-aterm-0.2.1-r1.ebuild | 58 ---------------------- 7 files changed, 123 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index 2f972d4e4a9..300ba2a1e76 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -784,11 +784,6 @@ games-action/accelerator3d # Removal in 30 days. Bug #693032. games-kids/tuxmathscrabble -# David Seifert <[email protected]> (2019-12-24) -# Unmaintained, uses dead POSIX streams interface, EAPI 4. -# Bug #692228, Removal in 30 days. -x11-terms/multi-aterm - # Tomáš Mózes <[email protected]> (2019-12-19) # Needs more testing. =app-emulation/xen-4.13.0 diff --git a/x11-terms/multi-aterm/Manifest b/x11-terms/multi-aterm/Manifest deleted file mode 100644 index fd0e3c1213d..00000000000 --- a/x11-terms/multi-aterm/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST multi-aterm-0.2.1.tar.gz 237428 BLAKE2B 44c20143ce55b20ba82dc1fec49b63a5c2c7387862203cd9eff0a6f4d1c34b599fe0ff965e50062ec144eab4655f4df1f421f73ecdaee095554024b4b4f4f60c SHA512 f5326314c97514609c84ae997c336afe6baa334d2295b4d4803e72411c07c377475a713473193a8d4260eca9008fbbc31c0ef93805e66024ea0814ab504c8d2a diff --git a/x11-terms/multi-aterm/files/0.2.1-initialize-vars.patch b/x11-terms/multi-aterm/files/0.2.1-initialize-vars.patch deleted file mode 100644 index 58be689bb96..00000000000 --- a/x11-terms/multi-aterm/files/0.2.1-initialize-vars.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/command.c -+++ src/command.c -@@ -1487,7 +1487,7 @@ - static XComposeStatus compose = { NULL, 0 }; - static unsigned char kbuf[KBUFSZ]; - int ctrl, meta, shft, len; -- KeySym keysym; -+ KeySym keysym = 0; - - /* - * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an diff --git a/x11-terms/multi-aterm/files/multi-aterm-0.2.1-display-security-issue.patch b/x11-terms/multi-aterm/files/multi-aterm-0.2.1-display-security-issue.patch deleted file mode 100644 index 93978548403..00000000000 --- a/x11-terms/multi-aterm/files/multi-aterm-0.2.1-display-security-issue.patch +++ /dev/null @@ -1,23 +0,0 @@ -http://bugs.gentoo.org/219754 - ---- src/main.c -+++ src/main.c -@@ -1853,15 +1853,13 @@ - //get_options(argc, argv); - //display_options(); - -- if (display_name == NULL) -- if ((display_name = getenv("DISPLAY")) == NULL) -- display_name = ":0"; -- - Xdisplay = XOpenDisplay(display_name); - - if (!Xdisplay) - { -- print_error("can't open display %s", display_name); -+ print_error("can't open display %s", display_name?display_name: -+ getenv("DISPLAY")?getenv("DISPLAY"): -+ "as no -d given and DISPLAY not set"); - exit(EXIT_FAILURE); - } - diff --git a/x11-terms/multi-aterm/files/multi-aterm-0.2.1-libpng14.patch b/x11-terms/multi-aterm/files/multi-aterm-0.2.1-libpng14.patch deleted file mode 100644 index 6aeadc47780..00000000000 --- a/x11-terms/multi-aterm/files/multi-aterm-0.2.1-libpng14.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- src/png.c -+++ src/png.c -@@ -86,7 +86,7 @@ - display_depth = XDefaultDepth(display,XDefaultScreen(display)); - - fread(sig, 1, 8, ifile); -- if (!png_check_sig(sig, 8)){ -+ if (png_sig_cmp (sig, 0, 8)){ - fclose(ifile); - return -1; - } -@@ -116,7 +116,7 @@ - - if (png_depth < 8){ - if (png_color_type == PNG_COLOR_TYPE_GRAY ){ -- png_set_gray_1_2_4_to_8(png_ptr); -+ png_set_expand_gray_1_2_4_to_8(png_ptr); - png_row_bytes = png_width; - }else{ - png_set_expand(png_ptr); diff --git a/x11-terms/multi-aterm/metadata.xml b/x11-terms/multi-aterm/metadata.xml deleted file mode 100644 index 6f49eba8f49..00000000000 --- a/x11-terms/multi-aterm/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> -<!-- maintainer-needed --> -</pkgmetadata> diff --git a/x11-terms/multi-aterm/multi-aterm-0.2.1-r1.ebuild b/x11-terms/multi-aterm/multi-aterm-0.2.1-r1.ebuild deleted file mode 100644 index da0c8e29163..00000000000 --- a/x11-terms/multi-aterm/multi-aterm-0.2.1-r1.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -inherit eutils - -DESCRIPTION="rxvt compatible terminal emulator with transparency and tab support" -HOMEPAGE="http://www.nongnu.org/materm/materm.html"; -SRC_URI="http://www.nongnu.org/materm/${P}.tar.gz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 hppa ~mips ppc sparc x86" -IUSE="cjk debug jpeg png" - -RDEPEND="x11-libs/libXpm - jpeg? ( virtual/jpeg ) - png? ( media-libs/libpng )" -DEPEND="${RDEPEND} - >=sys-apps/sed-4" - -DOCS=( AUTHORS ChangeLog NEWS TODO ) - -src_prepare() { - epatch "${FILESDIR}"/${PV}-initialize-vars.patch \ - "${FILESDIR}"/${P}-display-security-issue.patch \ - "${FILESDIR}"/${P}-libpng14.patch - - sed -i \ - -e 's:png_check_sig:png_sig_cmp:' \ - configure || die -} - -src_configure() { - econf \ - --enable-transparency \ - --enable-fading \ - --enable-xterm-scroll \ - --enable-half-shadow \ - --enable-graphics \ - --enable-mousewheel \ - --with-x \ - --with-xpm=/usr \ - $(use_enable cjk kanji) \ - $(use_enable debug) \ - $(use_enable jpeg) \ - $(use_enable png) -} - -src_compile() { - emake CFLAGS="${CFLAGS}" -} - -src_install() { - default - newdoc doc/TODO TODO.2 -}
