From 2d6d083189724f778698d194b66e7e1b0e29cf42 Mon Sep 17 00:00:00 2001 From: Mikle Kolyada Date: Mon, 27 Apr 2020 11:09:26 +0300 Subject: [PATCH] x11-terms/xvt: remove last-rited pkg Closes: https://bugs.gentoo.org/691710 Signed-off-by: Mikle Kolyada --- x11-terms/xvt/Manifest | 2 - x11-terms/xvt/files/xvt-int-main.patch | 23 ------- x11-terms/xvt/files/xvt-makefile.patch | 20 ------- x11-terms/xvt/files/xvt-pts.patch | 12 ---- x11-terms/xvt/files/xvt-ttyinit-svr4pty.diff | 63 -------------------- x11-terms/xvt/metadata.xml | 8 --- x11-terms/xvt/xvt-2.1-r3.ebuild | 49 --------------- 7 files changed, 177 deletions(-) delete mode 100644 x11-terms/xvt/Manifest delete mode 100644 x11-terms/xvt/files/xvt-int-main.patch delete mode 100644 x11-terms/xvt/files/xvt-makefile.patch delete mode 100644 x11-terms/xvt/files/xvt-pts.patch delete mode 100644 x11-terms/xvt/files/xvt-ttyinit-svr4pty.diff delete mode 100644 x11-terms/xvt/metadata.xml delete mode 100644 x11-terms/xvt/xvt-2.1-r3.ebuild diff --git a/x11-terms/xvt/Manifest b/x11-terms/xvt/Manifest deleted file mode 100644 index 540cf45cafe5..000000000000 --- a/x11-terms/xvt/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST xvt-1.0.tar.Z 59445 BLAKE2B 9b50b7c2c9832621960249f9b04eff9b2be04b90766865bc2cd55d67ca348bf41b539906125c8a51a3e08e13d6fc3402a57ef5f31d781e675061910ce53198dc SHA512 671fdc931526821e9228c327d2231e0f241997c632b0f084b2be02b99296ececa64f2de2769e92c3682c0aa2e9cf8dc61ac561ffd1d10136256029d24f872a1b -DIST xvt-2.1.diff.gz 39941 BLAKE2B cbb491f0f65ac6ae8f8a801e68f6f08805c886c16a000d7e54fb24ac08d17133958eb376306b2b30dfc4def447ec62259cebd43854433405c0aee080a79addf7 SHA512 c229cb98ef3de7b4ab76b81ae888fc3a59ff9fcf5807ecdc58f8e5b634f9c2e618d2b3c17b4cd6410903004a712aac1c1d329751a48f05d605a7eb23dd58d612 diff --git a/x11-terms/xvt/files/xvt-int-main.patch b/x11-terms/xvt/files/xvt-int-main.patch deleted file mode 100644 index a0874e45f419..000000000000 --- a/x11-terms/xvt/files/xvt-int-main.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/xvt.c -+++ b/xvt.c -@@ -41,9 +41,9 @@ - #endif /* UKC_LOCATIONS */ - - #ifdef __STDC__ --void main(int,char **); -+int main(int,char **); - #else --void main(); -+int main(); - #endif - - extern int debugging; -@@ -67,7 +67,7 @@ - * master end of the pseudo-teletype pair with the command talking to - * the slave. - */ --void -+int - main(argc,argv) - int argc; - char **argv; diff --git a/x11-terms/xvt/files/xvt-makefile.patch b/x11-terms/xvt/files/xvt-makefile.patch deleted file mode 100644 index b147d9d8c2b9..000000000000 --- a/x11-terms/xvt/files/xvt-makefile.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -27,7 +27,7 @@ - #ARCH=AIX3 - #ARCH=ULTRIX - #ARCH=HPUX --#ARCH=LINUX -+ARCH=LINUX - # - # - # If this line is uncommented then `Make config' will unclude several options -@@ -107,7 +107,7 @@ - OBJ=xvt.o xsetup.o command.o screen.o sbar.o ttyinit.o - SRC=xvt.c xsetup.c command.c screen.c sbar.c ttyinit.c - # --CFLAGS=-O $(INCLUDE) $(OPTIONS) $(DEFS) -D$(ARCH) -+CFLAGS+= $(INCLUDE) $(OPTIONS) $(DEFS) -D$(ARCH) - # - xvt: $(OBJ) - $(CC) $(LDFLAGS) -o xvt $(OBJ) $(LIB) -lX11 diff --git a/x11-terms/xvt/files/xvt-pts.patch b/x11-terms/xvt/files/xvt-pts.patch deleted file mode 100644 index a86504ad29e5..000000000000 --- a/x11-terms/xvt/files/xvt-pts.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/ttyinit.c -+++ b/ttyinit.c -@@ -25,6 +25,9 @@ - - char xvt_ttyinit_c_sccsid[] = "@(#)ttyinit.c 1.3 11/1/94 (UKC)"; - -+#ifdef LINUX -+#define _XOPEN_SOURCE -+#endif - #ifdef __STDC__ - #include - #else diff --git a/x11-terms/xvt/files/xvt-ttyinit-svr4pty.diff b/x11-terms/xvt/files/xvt-ttyinit-svr4pty.diff deleted file mode 100644 index 1cc370b94d7a..000000000000 --- a/x11-terms/xvt/files/xvt-ttyinit-svr4pty.diff +++ /dev/null @@ -1,63 +0,0 @@ ---- a/ttyinit.c -+++ b/ttyinit.c -@@ -46,6 +46,7 @@ - #include - #include - #include -+#include - #include "xvt.h" - #include "token.h" - #include "command.h" -@@ -410,44 +411,6 @@ - get_pseudo_tty(pmaster,pslave) - int *pmaster, *pslave; - { --#ifdef BSD_PTY -- int mfd, sfd; -- char *s3, *s4; -- static char ptyc3[] = "pqrstuvwxyz"; -- static char ptyc4[] = "0123456789abcdef"; -- static char ptynam[] = "/dev/ptyxx"; -- static char ttynam[] = "/dev/ttyxx"; -- -- /* First find a master pty that we can open. -- */ -- mfd = -1; -- for (s3 = ptyc3; *s3 != 0; s3++) { -- for (s4 = ptyc4; *s4 != 0; s4++) { -- ptynam[8] = ttynam[8] = *s3; -- ptynam[9] = ttynam[9] = *s4; -- if ((mfd = open(ptynam,O_RDWR)) >= 0) { -- if (geteuid() == 0 || access(ttynam,R_OK|W_OK) == 0) -- break; -- else { -- close(mfd); -- mfd = -1; -- } -- } -- } -- if (mfd >= 0) -- break; -- } -- if (mfd < 0) { -- error("Can't open a pseudo teletype"); -- return(NULL); -- } -- if ((sfd = open(ttynam,O_RDWR)) < 0) { -- error("could not open slave tty %s",ttynam); -- return(NULL); -- } --#endif /* BSD_PTY */ -- --#ifdef SVR4_PTY - char *ttynam; - int mfd, sfd; - -@@ -464,7 +427,6 @@ - } - ioctl(sfd,I_PUSH,"ptem"); - ioctl(sfd,I_PUSH,"ldterm"); --#endif /* SVR4_PTY */ - - *pslave = sfd; - *pmaster = mfd; diff --git a/x11-terms/xvt/metadata.xml b/x11-terms/xvt/metadata.xml deleted file mode 100644 index 41c6dfc7341b..000000000000 --- a/x11-terms/xvt/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - A tiny vt100 terminal emulator for X. - - diff --git a/x11-terms/xvt/xvt-2.1-r3.ebuild b/x11-terms/xvt/xvt-2.1-r3.ebuild deleted file mode 100644 index 196cc98c56a1..000000000000 --- a/x11-terms/xvt/xvt-2.1-r3.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -DESCRIPTION="A tiny vt100 terminal emulator for X" -HOMEPAGE="ftp://ftp.x.org/R5contrib/xvt-1.0.README" -SRC_URI="ftp://ftp.x.org/R5contrib/xvt-1.0.tar.Z - mirror://gentoo/xvt-2.1.diff.gz" - -LICENSE="xvt" -SLOT="0" -KEYWORDS="~alpha amd64 ppc x86" -IUSE="" - -RDEPEND="x11-libs/libX11" -DEPEND="${RDEPEND} - x11-base/xorg-proto" - -S=${WORKDIR}/${PN}-1.0 - -PATCHES=( - # this brings the distribution upto version 2.1 - "${WORKDIR}"/${P}.diff - - # fix #61393 - "${FILESDIR}/${PN}-ttyinit-svr4pty.diff" - - # CFLAGS, CC #241554 - "${FILESDIR}/${PN}-makefile.patch" - - # int main, not void main - "${FILESDIR}/${PN}-int-main.patch" - - # fix segfault (bug #363883) - "${FILESDIR}/${PN}-pts.patch" -) - -src_configure() { - tc-export CC -} - -src_install() { - dobin xvt - doman xvt.1 - einstalldocs -} -- 2.26.2