commit: 0f890eb5bea01bee2b486a7f35327d95a0a0b254 Author: Mike Pagano <mpagano <AT> gentoo <DOT> org> AuthorDate: Mon Sep 29 12:07:26 2025 +0000 Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org> CommitDate: Mon Sep 29 12:07:26 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f890eb5
media-gfx/zgv: treeclean Closes: https://bugs.gentoo.org/962110 (pkgremoved) Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org> media-gfx/zgv/Manifest | 1 - media-gfx/zgv/files/zgv-5.9-Makefile-QA.patch | 55 ---------------------- media-gfx/zgv/files/zgv-5.9-cmyk-yccl-fix.diff | 64 -------------------------- media-gfx/zgv/files/zgv-5.9-libpng15.patch | 22 --------- media-gfx/zgv/metadata.xml | 5 -- media-gfx/zgv/zgv-5.9-r1.ebuild | 60 ------------------------ 6 files changed, 207 deletions(-) diff --git a/media-gfx/zgv/Manifest b/media-gfx/zgv/Manifest deleted file mode 100644 index fc0b1fb748ca..000000000000 --- a/media-gfx/zgv/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST zgv-5.9.tar.gz 395525 BLAKE2B 2b28802c1e5437778d1e65bac1281caf5b783959af0534a99f733c11c2910189439235a11b38214cd229b42f912dc8cdb71cc2a789a5166b09a7cba2cc6d7e45 SHA512 f78d43c1703559f28961d8ce9ed6fc21cbb28b33885f824cc682591bf659d234b6c641f1677d42c592bcb22843854cbbac32ce0911bd1092f76a7ef5bfe31ddf diff --git a/media-gfx/zgv/files/zgv-5.9-Makefile-QA.patch b/media-gfx/zgv/files/zgv-5.9-Makefile-QA.patch deleted file mode 100644 index 6d3a1341ecb5..000000000000 --- a/media-gfx/zgv/files/zgv-5.9-Makefile-QA.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- a/src/Makefile 2009-09-28 15:31:29.000000000 -0600 -+++ b/src/Makefile 2009-09-28 15:56:26.000000000 -0600 -@@ -45,11 +45,11 @@ - readbmp.o readtga.o readpng.o readpcx.o \ - readxvpic.o readmrf.o readxbm.o readxpm.o \ - modesel.o readpcd.o readtiff.o readprf.o zgv_io.o - - zgv: $(ZGV_OBJS) -- $(CC) $(CFLAGS) -o zgv $(ZGV_OBJS) $(ZGV_LIBS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o zgv $(ZGV_OBJS) $(ZGV_LIBS) - - bdf2h: bdf2h.o - $(CC) $(CFLAGS) -o bdf2h bdf2h.o - - install-info: install-info.c -@@ -59,28 +59,28 @@ - # installation. Not nice to put this in the install target, - # but it's likely to cause problems if I don't. - # - install: all - @if [ "$(BACKEND)" = SVGALIB ]; then \ -- echo $(RM) /usr/bin/zgv; \ -- $(RM) /usr/bin/zgv; \ -- echo install -m 4755 -o root -g root -s zgv $(BINDIR); \ -- install -m 4755 -o root -g root -s zgv $(BINDIR); \ -+ echo echo /usr/bin/zgv; \ -+ echo /usr/bin/zgv; \ -+ echo install -m 0755 -o root -g root zgv $(BINDIR); \ -+ install -m 0755 -o root -g root zgv $(BINDIR); \ - fi - @if [ "$(BACKEND)" = SDL ]; then \ -- echo $(RM) /usr/bin/zgv-sdl; \ -- $(RM) /usr/bin/zgv-sdl; \ -- echo install -m 755 -s zgv $(BINDIR)/zgv-sdl; \ -- install -m 755 -s zgv $(BINDIR)/zgv-sdl; \ -+ echo echo /usr/bin/zgv-sdl; \ -+ echo /usr/bin/zgv-sdl; \ -+ echo install -m 755 zgv $(BINDIR)/zgv-sdl; \ -+ install -m 755 zgv $(BINDIR)/zgv-sdl; \ - fi - - uninstall: -- $(RM) $(BINDIR)/zgv $(BINDIR)/zgv-sdl -+ echo $(BINDIR)/zgv $(BINDIR)/zgv-sdl - - clean: -- $(RM) *.o *~ zgv bdf2h fontbmps.h install-info -- $(RM) rcfile_opt.h rcfile_var.h rcfile_short.h -+ echo *.o *~ zgv bdf2h fontbmps.h install-info -+ echo rcfile_opt.h rcfile_var.h rcfile_short.h - - # Dependancies - 3deffects.o: 3deffects.c 3deffects.h font.h readnbkey.h zgv.h \ - rc_config.h rcfile.h mousecur.h rbmenu.h - bdf2h.o: bdf2h.c diff --git a/media-gfx/zgv/files/zgv-5.9-cmyk-yccl-fix.diff b/media-gfx/zgv/files/zgv-5.9-cmyk-yccl-fix.diff deleted file mode 100644 index 662838c57ee0..000000000000 --- a/media-gfx/zgv/files/zgv-5.9-cmyk-yccl-fix.diff +++ /dev/null @@ -1,64 +0,0 @@ ---- a/src/readjpeg.c Sun Oct 31 14:54:26 2004 -+++ b/src/readjpeg.c Wed Sep 21 21:03:22 2005 -@@ -92,11 +92,13 @@ - int *real_width,int *real_height) - { - static FILE *in; -+static int cmyk; - struct my_error_mgr jerr; - int row_stride; /* physical row width in output buffer */ - int tmp,f; --unsigned char *ptr; -+unsigned char *ptr,*ptr2; - -+cmyk=0; - use_errmsg=0; - theimage=NULL; - howfar=howfarfunc; -@@ -161,6 +163,15 @@ - pal[f]=pal[256+f]=pal[512+f]=f; - } - -+if(cinfo.jpeg_color_space==JCS_CMYK) -+ cmyk=1; -+ -+if(cinfo.jpeg_color_space==JCS_YCCK) -+ { -+ cmyk=1; -+ cinfo.out_color_space=JCS_CMYK; -+ } -+ - width=cinfo.image_width; - height=cinfo.image_height; - -@@ -191,7 +202,7 @@ - } - - if(WH_BAD(width,height) || -- (theimage=(byte *)malloc(pixelsize*width*height))==NULL) -+ (theimage=(byte *)malloc(pixelsize*width*(height+cmyk)))==NULL) - { - jpegerr("Out of memory"); /* XXX misleading if width/height are bad */ - longjmp(jerr.setjmp_buffer,1); -@@ -222,7 +233,20 @@ - while(cinfo.output_scanline<height) - { - jpeg_read_scanlines(&cinfo,&ptr,1); -- for(f=0;f<width;f++) { tmp=*ptr; *ptr=ptr[2]; ptr[2]=tmp; ptr+=3; } -+ if(!cmyk) -+ for(f=0;f<width;f++) { tmp=*ptr; *ptr=ptr[2]; ptr[2]=tmp; ptr+=3; } -+ else -+ { -+ ptr2=ptr; -+ for(f=0;f<width;f++,ptr+=3,ptr2+=4) -+ { -+ tmp=ptr2[3]; -+ ptr[0]=(tmp*ptr2[2])/255; -+ ptr[1]=(tmp*ptr2[1])/255; -+ ptr[2]=(tmp*ptr2[0])/255; -+ } -+ } -+ - if(howfar!=NULL) howfar(cinfo.output_scanline,height); - } - diff --git a/media-gfx/zgv/files/zgv-5.9-libpng15.patch b/media-gfx/zgv/files/zgv-5.9-libpng15.patch deleted file mode 100644 index 3d7e4ecb5df1..000000000000 --- a/media-gfx/zgv/files/zgv-5.9-libpng15.patch +++ /dev/null @@ -1,22 +0,0 @@ -http://bugs.gentoo.org/389591 - ---- a/src/readpng.c -+++ b/src/readpng.c -@@ -63,7 +63,7 @@ - use_errmsg=1; - - /* cleanup is done after jump back, so just do that now... */ --longjmp(png_ptr->jmpbuf,1); -+longjmp(png_jmpbuf(png_ptr), 1); - } - - -@@ -132,7 +132,7 @@ - return(_PICERR_NOMEM); - } - --if(setjmp(png_ptr->jmpbuf)) -+if(setjmp(png_jmpbuf(png_ptr))) - { - /* if we get here, there was an error. */ - /* don't use local variables here, they may have been blasted */ diff --git a/media-gfx/zgv/metadata.xml b/media-gfx/zgv/metadata.xml deleted file mode 100644 index 85e4ed814fa2..000000000000 --- a/media-gfx/zgv/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> -<!-- maintainer-needed --> -</pkgmetadata> diff --git a/media-gfx/zgv/zgv-5.9-r1.ebuild b/media-gfx/zgv/zgv-5.9-r1.ebuild deleted file mode 100644 index 6974b8580492..000000000000 --- a/media-gfx/zgv/zgv-5.9-r1.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="A svgalib console image viewer" -HOMEPAGE="http://www.svgalib.org/rus/zgv/"; -SRC_URI="http://www.svgalib.org/rus/zgv/${P}.tar.gz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="x86" - -RDEPEND=" - media-libs/libpng - >=media-libs/svgalib-1.4.2 - >=media-libs/tiff-3.5.5:= - media-libs/libjpeg-turbo:= - sys-apps/gawk - >=sys-libs/zlib-1.1.4 -" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${P}-Makefile-QA.patch - "${FILESDIR}"/${P}-cmyk-yccl-fix.diff - "${FILESDIR}"/${P}-libpng15.patch -) - -src_prepare() { - sed -i -e "/^CFLAGS=/s:=.*:=${CFLAGS}:" config.mk || die - sed -i -e 's:$(RM):echo:' doc/Makefile || die - default -} - -src_compile() { - emake CC="$(tc-getCC)" -} - -src_install() { - dodir /usr/bin /usr/share/info /usr/share/man/man1 - - emake \ - PREFIX="${ED}"/usr \ - INFODIR="${ED}"/usr/share/info \ - MANDIR="${ED}"/usr/share/man/man1 \ - install - - dodoc AUTHORS ChangeLog INSTALL NEWS README* SECURITY TODO - - # Fix info files - cd "${D}"/usr/share/info - rm dir* || die - mv zgv zgv.info || die - for i in 1 2 3 4 ; do - mv zgv-$i zgv.info-$i || die - done -}
