Fix further problems with the pixie ebuild, thanks to Mauro Toffanin in bug #299593.

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

3 files changed, 34 insertions, 14 deletions

diff --git a/media-gfx/pixie/ChangeLog b/media-gfx/pixie/ChangeLog
index 547bec765b42..05d84e625289 100644
--- a/media-gfx/pixie/ChangeLog
+++ b/media-gfx/pixie/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/pixie
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pixie/ChangeLog,v 1.49 2009/12/28 20:58:08 flameeyes Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pixie/ChangeLog,v 1.50 2010/01/04 14:15:28 flameeyes Exp $
+
+*pixie-2.2.6-r1 (04 Jan 2010)
+
+  04 Jan 2010; Diego E. Pettenò <flameeyes@gentoo.org> -pixie-2.2.6.ebuild,
+  +pixie-2.2.6-r1.ebuild:
+  Fix further problems with the pixie ebuild, thanks to Mauro Toffanin in
+  bug #299593.
 
 *pixie-2.2.6 (28 Dec 2009)
 
diff --git a/media-gfx/pixie/Manifest b/media-gfx/pixie/Manifest
index 8ee10bea1085..8ed14839aa5c 100644
--- a/media-gfx/pixie/Manifest
+++ b/media-gfx/pixie/Manifest
@@ -7,13 +7,13 @@ AUX pixie-2.2.6-autotools.patch 672 RMD160 c4121721eb6e9826456ced0dbc340287bd932
 DIST Pixie-src-2.2.2.tgz 9501446 RMD160 0d30b5dd417e8ac5e8486f75ce6f84b4d0ecb83f SHA1 dfaa0671361058bdcbafb2d804fb80e0e8221680 SHA256 8dce667e751bb1baa13803ad2d467fee90b53553a9089b51ceb1c58fd86742fc
 DIST Pixie-src-2.2.6.tgz 9993504 RMD160 d930f23ff5621174ff3f274b28306e988a6d7fdf SHA1 651d3a76460f19cbbedb7d3d26ee9160182964d3 SHA256 ffbbc404265aff3d4c0303ec91549708ffba8edefc0368ac119ae2e588f35037
 EBUILD pixie-2.2.2.ebuild 1551 RMD160 ea23288b1f092a7a4926070592c7ae6f8070fec6 SHA1 4f79e6da69c02e658c2e0e5bbb88f12506a63edb SHA256 2e2784c6217ae3bec5eb26d2dcd035aa7e95a8970f86d33a5b39da4c36fd9bf5
-EBUILD pixie-2.2.6.ebuild 1952 RMD160 304cf15b24e9ffab17a747bfc97c70f41914e5ea SHA1 ed6cd2fceef4282592ec03ea4607d988cd076a76 SHA256 3b30988700ed70f26cea9dd958b7b89ce15e20aafa52d1daa97fe8390770cc83
-MISC ChangeLog 8867 RMD160 971e137baf64e1f75ce1112f52579ed93fc5ebe4 SHA1 b26c680b19c41cfe07ab665fc2e3d423317f5061 SHA256 08fb322ee41c05ac0a0f89362d29a07733a2fd207932d78f0b1ca5c10b328024
+EBUILD pixie-2.2.6-r1.ebuild 2614 RMD160 8b7e8108c19e9cd677126c1effddc8c0da8c852b SHA1 2e470aa4f9d3e1e783c96e20f5c3d2e819721eb8 SHA256 f9151bb76231a39e453393571033e0f6be26bff77a07dc0a1f4b51c9fd0481c6
+MISC ChangeLog 9091 RMD160 010330e52f680c745a17ed2c1e9dfda208f21e6d SHA1 0c91fa22df98e74d8856a971f8436fd40cf03f15 SHA256 4c691d35b5cc806b56f60564bfe1659fe546581a9f40e07e932a0b0d40aa909b
 MISC metadata.xml 783 RMD160 927feccc3ad5a92ecd7cc23bc025c8715760f46f SHA1 9103d672b772f7bc7888529ca860a8442c1b0041 SHA256 d982723bb3d519f14366947e99f298ac9c77c0100675b16d6fed93115ced275a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAks5G+IACgkQAiZjviIA2XicGACfSrNP6ws70NdQdkjGH8dUshBI
-gFAAoJe1qYUwcvsqSSL9hGu18R+QmKvp
-=Mdtv
+iEYEARECAAYFAktB9/8ACgkQAiZjviIA2XgqoQCg3NkSh+2EMwC+RJTbi6S0ROk9
+ja4An0x7A+2PsPXyGzMg1031nzg8IpXF
+=yM2d
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/pixie/pixie-2.2.6.ebuild b/media-gfx/pixie/pixie-2.2.6-r1.ebuild
index 54b30762170e..bbc0c4745d7d 100644
--- a/media-gfx/pixie/pixie-2.2.6.ebuild
+++ b/media-gfx/pixie/pixie-2.2.6-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pixie/pixie-2.2.6.ebuild,v 1.1 2009/12/28 20:58:08 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pixie/pixie-2.2.6-r1.ebuild,v 1.1 2010/01/04 14:15:28 flameeyes Exp $
 
 EAPI="2"
 inherit eutils multilib autotools
@@ -17,8 +17,7 @@ IUSE="X static-libs"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
-RDEPEND="!mail-client/nmh
-	media-libs/jpeg
+RDEPEND="media-libs/jpeg
 	media-libs/tiff
 	media-libs/libpng
 	x11-libs/fltk:1.1[opengl]
@@ -43,11 +42,20 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	# FIX: missing @includedir@
+	# https://sf.net/tracker/?func=detail&aid=2923415&group_id=59462&atid=491094
 	epatch "${FILESDIR}/${P}-autotools.patch"
 	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
 }
 
 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) \
@@ -61,13 +69,15 @@ src_configure() {
 		--with-modulesdir=/usr/$(get_libdir)/pixie/modules \
 		--enable-openexr-threads \
 		--mandir=/usr/share/man \
-		--bindir=/usr/bin
+		--bindir=/usr/bin \
+		--program-transform-name="s/show/pixie-show/"
 }
 
 src_compile() {
 	emake || die "emake failed"
 
-	# regenerating Pixie shaders
+	# 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"
 }
@@ -75,8 +85,11 @@ src_compile() {
 src_install() {
 	emake DESTDIR="${D}" install || die "installation failed."
 
+	insinto /usr/share/Pixie/textures
+	doins "${S}"/textures/*
+
 	# remove useless .la files
-	find "${D}" -name '*.la' -delete || die
+	find "${D}" -name '*.la' -delete || die "removal of libtool archive files failed"
 
 	dodoc README AUTHORS ChangeLog || die
 }