gentoo resync : 19.03.2019

3 files changed, 111 insertions, 4 deletions

diff --git a/media-gfx/pixie/Manifest b/media-gfx/pixie/Manifest
index 606b298640fa..38798945b38b 100644
--- a/media-gfx/pixie/Manifest
+++ b/media-gfx/pixie/Manifest
@@ -3,5 +3,6 @@ AUX pixie-2.2.6-autotools.patch 680 BLAKE2B a4cb4e3e4db1e5c2cb8f83c42761fd2069a5
 AUX pixie-2.2.6-zlib-1.2.5.2.patch 2064 BLAKE2B ab891b633ff3c8d964e3bd73e32d46cb008f06d88bd8358cecfcee961a0a84f22f497b48ecdd8dc77219e7ec61555137b58082c4c359a4e30b82ae17b5e35b9b SHA512 f0cc7956117dc09cae574d5042a897c0f5ef9b26040c75d4c7b2ceef317c89431cceb7d32f61b5b5151efdc043e8968ac9129e1d1d6a7ac9720f9056e6db05d3
 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
-EBUILD pixie-2.2.6-r1.ebuild 2872 BLAKE2B 1852b7875d91ad5a14358913fa55a16b6388653ba98ce6ac05ab6f366e6eb1e276b1d0976bf90fb0856fb53eb69bc01361fd128deca71bb7f5554c2f20355208 SHA512 a7498b2c86f34763d8905bfc79866b1aac48d16314cc3ea94dea72edbedc0c277c65305da8cfe960dadede701a477e1eadb9487d335c44707413b3d39c6fb48d
+EBUILD pixie-2.2.6-r1.ebuild 2896 BLAKE2B 2fd66808d3df415b6a91c1a00c4b7d75e3143f4f973fb6921a03bc3bb2b2985505b1cdccdf66fccdfecd48d1348eba35f4598c0d7208a2706bf190d700b4d2f4 SHA512 ecf1d7b3eed32bae79bfa88c63f5df5adb4da9eb7d697a920cdf10b4e167e7b8b894859e0c705150663cc8183004d6fb9ba0daadbc3bda8ef9b94401f3f6bda9
+EBUILD pixie-2.2.6-r2.ebuild 2785 BLAKE2B b0033e953b2f98fecdb546f79ecbc31345948e1aac6e24668487ebeba021fcfd9e95e6a08f60f28209d977fa2638f02b9c3e5580ba89e769befffa86235da917 SHA512 fca68562e0be29a013769e91d271e19fc9efb32c8447bcff016cb3bc4f142ff972a20c4cfabffbd8718d103b7c1c2a4f2f76cf61a7ed348678bfe1a4e91f1878
 MISC metadata.xml 544 BLAKE2B dc06ba2d4e26190f38a162a227970bf47c87320a17ef4cad43e8349311441dcc8852e14d34ab9ae2bc3b9caa35bf84f04a42b10a1621d1b82c7966e7d7473e8f SHA512 961588ff38565e8a709b30f704d099676d73f0d1cbe5b266cc26542d511648a740ca430ef845b290c4ad0bc2ffdbe15706534b1f6421d975e66eedf6b6853c89
diff --git a/media-gfx/pixie/pixie-2.2.6-r1.ebuild b/media-gfx/pixie/pixie-2.2.6-r1.ebuild
index 5a71b52b4754..f8863d0b8183 100644
--- a/media-gfx/pixie/pixie-2.2.6-r1.ebuild
+++ b/media-gfx/pixie/pixie-2.2.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="2"
@@ -11,10 +11,10 @@ MY_PN="Pixie"
 S="${WORKDIR}/${MY_PN}"
 
 DESCRIPTION="RenderMan like photorealistic renderer"
-HOMEPAGE="http://pixie.sourceforge.net/"
+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"
+LICENSE="GPL-2+"
 IUSE="X static-libs"
 SLOT="0"
 KEYWORDS="amd64 ~ppc sparc x86"
diff --git a/media-gfx/pixie/pixie-2.2.6-r2.ebuild b/media-gfx/pixie/pixie-2.2.6-r2.ebuild
new file mode 100644
index 000000000000..c0fd04d6ab9b
--- /dev/null
+++ b/media-gfx/pixie/pixie-2.2.6-r2.ebuild
@@ -0,0 +1,106 @@
+# 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"
+}