[gentoo-commits] repo/gentoo:master commit in: profiles/, media-gfx/pixie/, media-gfx/pixie/files/

[Michał Górny]

commit:     9e823981cd3f27e880cff3725addd02dd2e310e4
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 17 08:42:44 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Sep 17 09:23:24 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e823981

media-gfx/pixie: Remove last-rited pkg

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 media-gfx/pixie/Manifest                           |   2 -
 media-gfx/pixie/files/Makefile.shaders             |  15 ---
 media-gfx/pixie/files/pixie-2.2.6-autotools.patch  |  22 -----
 .../pixie/files/pixie-2.2.6-zlib-1.2.5.2.patch     |  73 --------------
 media-gfx/pixie/metadata.xml                       |  14 ---
 media-gfx/pixie/pixie-2.2.6-r2.ebuild              | 106 ---------------------
 profiles/package.mask                              |   5 -
 7 files changed, 237 deletions(-)

diff --git a/media-gfx/pixie/Manifest b/media-gfx/pixie/Manifest
deleted file mode 100644
index bae7a7eb141..00000000000
--- a/media-gfx/pixie/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST Pixie-src-2.2.6.tgz 9993504 BLAKE2B 59e04cd2294f1a0e8c841fd5c652fff184acf237dcf005207cd7f3d38195cc15b3246ae4ae8250dd245d7a4f7db65722ad8747798ae9c27c40c9411510016cfe SHA512 9b5256f5028d6091da293557e5385e53d8bdb2b3bfc7a89228b436b75424d7bd400d04e95cc04b71526aff026085f2bc2bd49e1ac0c54d3055f827fd5d05cc95
-DIST pixie-2.2.6-gcc6.patch.gz 16661 BLAKE2B 5d6f785e45f046fb9ff7ebbc9de18ccabd5ac566def3c48cc508aaec4387133aecdb48ba5d4b9eba93743c068a9d12a79ef4e13d3d23e2666bdca494ef979d32 SHA512 2cada11c95df1dde44119b97b44ab8550608427a2351540117655055d98a5ca142bc1fc78e8fc5ab25b8bb33385a7914114796a88cf83a232480e5b84bec57fb

diff --git a/media-gfx/pixie/files/Makefile.shaders b/media-gfx/pixie/files/Makefile.shaders
deleted file mode 100644
index fbc261c0c9b..00000000000
--- a/media-gfx/pixie/files/Makefile.shaders
+++ /dev/null
@@ -1,15 +0,0 @@
-SDRC = ../src/sdrc/sdrc
-SDRCFLAGS +=
-
-%.sdr: %.sl
-	$(SDRC) $(SDRCFLAGS) $<
-
-OBJECT1 := $(wildcard *.sl)
-OBJECT := $(OBJECT1:.sl=.sdr)
-
-all: clean $(OBJECT)
-
-clean:
-	rm -f *.sdr
-
-.PHONY: clean

diff --git a/media-gfx/pixie/files/pixie-2.2.6-autotools.patch b/media-gfx/pixie/files/pixie-2.2.6-autotools.patch
deleted file mode 100644
index 7fd9f0ce76b..00000000000
--- a/media-gfx/pixie/files/pixie-2.2.6-autotools.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/ri/Makefile.in	2009-09-23 18:10:13.414866323 +0200
-+++ b/src/ri/Makefile.in	2009-09-23 18:11:15.629864395 +0200
-@@ -214,7 +214,7 @@
- host_os = @host_os@
- host_vendor = @host_vendor@
- htmldir = @htmldir@
--includedir = $(prefix)/include
-+includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
---- a/src/sdr/Makefile.in	2009-09-23 18:14:54.194865868 +0200
-+++ b/src/sdr/Makefile.in	2009-09-23 18:15:18.297863856 +0200
-@@ -199,7 +199,7 @@
- host_os = @host_os@
- host_vendor = @host_vendor@
- htmldir = @htmldir@
--includedir = $(prefix)/include
-+includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@

diff --git a/media-gfx/pixie/files/pixie-2.2.6-zlib-1.2.5.2.patch b/media-gfx/pixie/files/pixie-2.2.6-zlib-1.2.5.2.patch
deleted file mode 100644
index 7e0afe3a7c2..00000000000
--- a/media-gfx/pixie/files/pixie-2.2.6-zlib-1.2.5.2.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-http://bugs.gentoo.org/406899
-
---- a/src/ri/rib.l
-+++ b/src/ri/rib.l
-@@ -17,7 +17,7 @@
- 
- // Overwrite the YYinput so that it uses libz
- #undef YY_INPUT
--#define YY_INPUT(buf, retval, maxlen)	if ( (retval = gzread(ribin,buf,maxlen)) < 0) 			\
-+#define YY_INPUT(buf, retval, maxlen)	if ( (retval = gzread((gzFile)ribin,buf,maxlen)) < 0) 			\
- 											YY_FATAL_ERROR( "input in flex scanner failed" );
- 
- #endif
-@@ -223,7 +223,7 @@
- 															TRibFile	*nextFile	=	ribStack->next;
- 															rib_delete_buffer( YY_CURRENT_BUFFER );
- #ifdef HAVE_ZLIB
--															gzclose(ribin);
-+															gzclose((gzFile)ribin);
- #else
- 															fclose(ribin);
- #endif
-@@ -243,7 +243,7 @@
- 															rib_delete_buffer( YY_CURRENT_BUFFER );
- 															
- #ifdef HAVE_ZLIB
--															gzclose(ribin);
-+															gzclose((gzFile)ribin);
- #else
- 															fclose(ribin);
- #endif
---- a/src/ri/ribOut.cpp
-+++ b/src/ri/ribOut.cpp
-@@ -162,7 +162,7 @@
- 
- #ifdef HAVE_ZLIB
- 			if (outputCompressed) {
--				gzclose(outFile);
-+				gzclose((gzFile)outFile);
- 			} else {
- 				fclose(outFile);
- 			}
---- a/src/ri/ribOut.h
-+++ b/src/ri/ribOut.h
-@@ -237,7 +237,7 @@
- 												const int	l	=	vsprintf(scratch,mes,args);
- 
- 												#ifdef HAVE_ZLIB
--													if (outputCompressed)	gzwrite(outFile,scratch,l);
-+													if (outputCompressed)	gzwrite((gzFile)outFile,scratch,l);
- 													else					fwrite(scratch,1,l,outFile);
- 												#else
- 													fwrite(scratch,1,l,outFile);
-@@ -258,7 +258,7 @@
- 												const int l	=	vsprintf(scratch,mes,args);
- 
- 												#ifdef HAVE_ZLIB
--													if (outputCompressed)	gzwrite(outFile,scratch,l);
-+													if (outputCompressed)	gzwrite((gzFile)outFile,scratch,l);
- 													else					fwrite(scratch,1,l,outFile);
- 												#else
- 													fwrite(scratch,1,l,outFile);
---- a/src/ri/rib.y
-+++ b/src/ri/rib.y
-@@ -2940,7 +2940,7 @@
- 		
- 		if (ribin != NULL) {
- #ifdef HAVE_ZLIB
--			gzclose(ribin);
-+			gzclose((gzFile)ribin);
- #else
- 			fclose(ribin);
- #endif

diff --git a/media-gfx/pixie/metadata.xml b/media-gfx/pixie/metadata.xml
deleted file mode 100644
index 2f6247ed93f..00000000000
--- a/media-gfx/pixie/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->  
-  <longdescription>
-    Pixie is an open source photorealistic renderer that uses a RenderMan-like
-    interface. Features include programmable shading, motion blur, depth of
-    field, raytracing, scan-line rendering, occlusion culling, global
-    illumination, caustics ...
-  </longdescription>
-  <upstream>
-    <remote-id type="sourceforge">pixie</remote-id>
-  </upstream>
-</pkgmetadata>

diff --git a/media-gfx/pixie/pixie-2.2.6-r2.ebuild b/media-gfx/pixie/pixie-2.2.6-r2.ebuild
deleted file mode 100644
index 3766fa36d3d..00000000000
--- a/media-gfx/pixie/pixie-2.2.6-r2.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WANT_AUTOMAKE="1.10"
-
-inherit autotools
-
-MY_PN="Pixie"
-S="${WORKDIR}/${MY_PN}"
-
-DESCRIPTION="RenderMan like photorealistic renderer"
-HOMEPAGE="http://www.okanarikan.com/project/2005/05/24/Pixie.html"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-src-${PV}.tgz https://dev.gentoo.org/~dilfridge/distfiles/pixie-2.2.6-gcc6.patch.gz"
-
-LICENSE="GPL-2+"
-IUSE="X static-libs"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
-
-RDEPEND="media-libs/libpng
-	media-libs/tiff
-	media-libs/openexr
-	sys-libs/zlib
-	virtual/jpeg
-	virtual/opengl
-	x11-libs/fltk:1[opengl]
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXau
-		x11-libs/libxcb
-		x11-libs/libXdmcp
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXmu
-		x11-libs/libXt
-	)"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex"
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}"/${P}-zlib-1.2.5.2.patch
-	# FIX: missing @includedir@
-	# https://sf.net/tracker/?func=detail&aid=2923415&group_id=59462&atid=491094
-	eapply "${FILESDIR}"/${P}-autotools.patch
-	# bug 594354
-	eapply "${WORKDIR}"/${P}-gcc6.patch
-
-	mv configure.{in,ac} || die
-
-	eautoreconf
-
-	# FIX: removing pre-compiled shaders
-	# shaders must be removed before of their compilation or make
-	# parallelism can break the regeneration process, with resulting
-	# missing shaders.
-	rm "${S}"/shaders/*.sdr || die
-
-	# FIX: flex does not translate variable name in custom YY_DECL
-	sed -i -e '/define YY_DECL/ s/yylval/riblval/' src/ri/rib.l || die
-}
-
-src_configure() {
-	# NOTE: the option program-transform-name is used to avoid binary name
-	# conflict with package: mail-client/nmh (see #295996)
-	econf \
-		$(use_with X x) \
-		$(use_enable static-libs static) \
-		--includedir=/usr/include/pixie \
-		--libdir=/usr/$(get_libdir)/pixie \
-		--with-docdir=/usr/share/doc/${PF}/html \
-		--with-shaderdir=/usr/share/Pixie/shaders \
-		--with-ribdir=/usr/share/Pixie/ribs \
-		--with-texturedir=/usr/share/Pixie/textures \
-		--with-displaysdir=/usr/$(get_libdir)/pixie/displays \
-		--with-modulesdir=/usr/$(get_libdir)/pixie/modules \
-		--enable-openexr-threads \
-		--disable-static-fltk \
-		--mandir=/usr/share/man \
-		--bindir=/usr/bin \
-		--program-transform-name="s/show/pixie-show/"
-}
-
-src_compile() {
-	default
-
-	# regenerating Pixie shaders - see upstream bug report:
-	# https://sf.net/tracker/?func=detail&aid=2923407&group_id=59462&atid=491094
-	einfo "Re-building Pixie Shaders for v${PV} format"
-	emake -f "${FILESDIR}/Makefile.shaders" -C "${S}/shaders"
-}
-
-src_install() {
-	default
-
-	insinto /usr/share/Pixie/textures
-	doins "${S}"/textures/*
-
-	# remove useless .la files
-	find "${D}" -name '*.la' -delete || die "removal of libtool archive files failed"
-}

diff --git a/profiles/package.mask b/profiles/package.mask
index 439ef7e7c3e..2f658157e35 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1137,11 +1137,6 @@ net-misc/gnome-remote-desktop
 # Removal in 30 days
 sys-kernel/bliss-initramfs
 
-# Aaron Bauman <bman@g.o> (2019-08-17)
-# Relies on vulnerable automake:{1.9,1.10}
-# Removal in 30 days
-media-gfx/pixie
-
 # Mike Gilbert <floppym@g.o> (2019-08-13)
 # Dev channel releases are only for people who
 # are developers or want more experimental features