Version bump and fixing libtool related problems... Closes bug #75186.

7 files changed, 106 insertions, 26 deletions

diff --git a/media-gfx/pixie/ChangeLog b/media-gfx/pixie/ChangeLog
index bcc7c8e5d898..f487825d3109 100644
--- a/media-gfx/pixie/ChangeLog
+++ b/media-gfx/pixie/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/pixie
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pixie/ChangeLog,v 1.10 2004/10/22 21:47:10 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pixie/ChangeLog,v 1.11 2004/12/28 08:18:02 eradicator Exp $
+
+*pixie-1.3.25 (28 Dec 2004)
+
+  28 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  pixie-1.3.13.ebuild, pixie-1.3.20.ebuild, pixie-1.3.22.ebuild,
+  +pixie-1.3.25.ebuild:
+  Version bump and fixing libtool related problems...  Closes bug #75186.
 
 *pixie-1.3.22 (22 Oct 2004)
 
diff --git a/media-gfx/pixie/Manifest b/media-gfx/pixie/Manifest
index c1b8ebe419f0..437a62f83b46 100644
--- a/media-gfx/pixie/Manifest
+++ b/media-gfx/pixie/Manifest
@@ -2,12 +2,14 @@
 Hash: SHA1
 
 MD5 c1e212329f9083e2405b16dd382d6632 metadata.xml 259
-MD5 4d847749da9258904bb1b32241f0a2ff pixie-1.3.22.ebuild 1434
-MD5 3f9bc6b40ff2418c9ab278d61826d777 ChangeLog 1884
-MD5 862abcf5bb659af32f0128d940b3fa8e pixie-1.3.20.ebuild 1434
-MD5 8c10b46a19766805b1ea389be8cbc182 pixie-1.3.13.ebuild 1339
+MD5 7b17e6894ede24c8706a4de323b02499 pixie-1.3.22.ebuild 1364
+MD5 b3077f43a949ad159fb198fda6bd17a8 ChangeLog 2134
+MD5 5e6768cae4e8cb821a3b8db499b1d622 pixie-1.3.25.ebuild 1364
+MD5 8a4b9b59a8dfccf5c1054cf79c2a4f4a pixie-1.3.20.ebuild 1364
+MD5 ae6ec1610bfe57e8505ab863cee3d136 pixie-1.3.13.ebuild 1269
 MD5 cb8ed959bdd211afc4edb2b0607b5f66 files/50pixie 41
 MD5 0c40b28972eb3746027bc5d842c8fc36 files/digest-pixie-1.3.22 66
+MD5 cba609fd7007536313603a2b6e721b07 files/digest-pixie-1.3.25 66
 MD5 69efa93b4d0b4b3c99bab05baeca8c3d files/digest-pixie-1.3.20 66
 MD5 44355ed7501f8b6bb524b9c6aa348dc7 files/pixie-1.3.11-gentoo.patch 417
 MD5 6cc5b77de73a722c5e850636bf750a32 files/pixie-1.3.11-math.patch 365
@@ -15,7 +17,7 @@ MD5 0dfa6fd77d94a955564026aa73d37a78 files/digest-pixie-1.3.13 66
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBeX/rArHZZzCEUG0RAoPdAJ9RsSUllTlIx4UW5yJnliZC9oT/IACfbUfK
-JRe+FEQsqQv8/Y8rlW87mdg=
-=Hs8g
+iD8DBQFB0RbKArHZZzCEUG0RAm0uAJ4v28RWpMCUWlo6uZD4YsQbJsDQaACfaovw
+ADBebNFrXrWo4KnmokTIpkA=
+=2fyU
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/pixie/files/digest-pixie-1.3.25 b/media-gfx/pixie/files/digest-pixie-1.3.25
new file mode 100644
index 000000000000..a4953c91c40e
--- /dev/null
+++ b/media-gfx/pixie/files/digest-pixie-1.3.25
@@ -0,0 +1 @@
+MD5 f0a726a007f7f35f6d13d56bbb4ebd29 Pixie-src-1.3.25.tgz 4973521
diff --git a/media-gfx/pixie/pixie-1.3.13.ebuild b/media-gfx/pixie/pixie-1.3.13.ebuild
index 4cf96f018223..8f873f5ced34 100644
--- a/media-gfx/pixie/pixie-1.3.13.ebuild
+++ b/media-gfx/pixie/pixie-1.3.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pixie/pixie-1.3.13.ebuild,v 1.2 2004/09/01 08:41:47 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pixie/pixie-1.3.13.ebuild,v 1.3 2004/12/28 08:18:02 eradicator Exp $
 
 inherit eutils
 
@@ -24,6 +24,7 @@ RDEPEND="media-libs/jpeg
 	 X? ( virtual/x11 )"
 
 DEPEND="${RDEPEND}
+	sys-devel/libtool
 	>=sys-devel/automake-1.8"
 
 src_unpack() {
@@ -36,11 +37,12 @@ src_unpack() {
 	# Gentoo-specific stuff
 	epatch ${FILESDIR}/${PN}-1.3.11-gentoo.patch
 
-	# redirecting aclocal to /dev/null because there are alot of warnings
-	# output for deprecated stuff in 1.8.5
-	WANT_AUTOMAKE=1.8 aclocal >& /dev/null
-	WANT_AUTOMAKE=1.8 automake
-	WANT_AUTOCONF=2.5 autoconf
+	export WANT_AUTOMAKE=1.8 
+	export WANT_AUTOCONF=2.5
+	aclocal
+	libtoolize --force --copy
+	automake -a -f -c
+	autoconf
 }
 
 src_compile() {
diff --git a/media-gfx/pixie/pixie-1.3.20.ebuild b/media-gfx/pixie/pixie-1.3.20.ebuild
index 327a82f89a08..4cbb8c54454b 100644
--- a/media-gfx/pixie/pixie-1.3.20.ebuild
+++ b/media-gfx/pixie/pixie-1.3.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pixie/pixie-1.3.20.ebuild,v 1.1 2004/09/22 07:41:29 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pixie/pixie-1.3.20.ebuild,v 1.2 2004/12/28 08:18:02 eradicator Exp $
 
 inherit eutils
 
@@ -24,6 +24,7 @@ RDEPEND="media-libs/jpeg
 	 X? ( virtual/x11 )"
 
 DEPEND="${RDEPEND}
+	sys-devel/libtool
 	>=sys-devel/automake-1.8"
 
 src_unpack() {
@@ -37,11 +38,12 @@ src_unpack() {
 	# Gentoo-specific stuff to fix the build/install process
 	epatch ${FILESDIR}/${PN}-1.3.11-gentoo.patch
 
-	# redirecting aclocal to /dev/null because there are alot of warnings
-	# output for deprecated stuff in 1.8.5
-	WANT_AUTOMAKE=1.8 aclocal >& /dev/null
-	WANT_AUTOMAKE=1.8 automake
-	WANT_AUTOCONF=2.5 autoconf
+	export WANT_AUTOMAKE=1.8 
+	export WANT_AUTOCONF=2.5
+	aclocal
+	libtoolize --force --copy
+	automake -a -f -c
+	autoconf
 }
 
 src_compile() {
diff --git a/media-gfx/pixie/pixie-1.3.22.ebuild b/media-gfx/pixie/pixie-1.3.22.ebuild
index aaa436a2921a..c62beefe5755 100644
--- a/media-gfx/pixie/pixie-1.3.22.ebuild
+++ b/media-gfx/pixie/pixie-1.3.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pixie/pixie-1.3.22.ebuild,v 1.1 2004/10/22 21:47:10 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pixie/pixie-1.3.22.ebuild,v 1.2 2004/12/28 08:18:02 eradicator Exp $
 
 inherit eutils
 
@@ -24,6 +24,7 @@ RDEPEND="media-libs/jpeg
 	 X? ( virtual/x11 )"
 
 DEPEND="${RDEPEND}
+	sys-devel/libtool
 	>=sys-devel/automake-1.8"
 
 src_unpack() {
@@ -37,11 +38,12 @@ src_unpack() {
 	# Gentoo-specific stuff to fix the build/install process
 	epatch ${FILESDIR}/${PN}-1.3.11-gentoo.patch
 
-	# redirecting aclocal to /dev/null because there are alot of warnings
-	# output for deprecated stuff in 1.8.5
-	WANT_AUTOMAKE=1.8 aclocal >& /dev/null
-	WANT_AUTOMAKE=1.8 automake
-	WANT_AUTOCONF=2.5 autoconf
+	export WANT_AUTOMAKE=1.8 
+	export WANT_AUTOCONF=2.5
+	aclocal
+	libtoolize --force --copy
+	automake -a -f -c
+	autoconf
 }
 
 src_compile() {
diff --git a/media-gfx/pixie/pixie-1.3.25.ebuild b/media-gfx/pixie/pixie-1.3.25.ebuild
new file mode 100644
index 000000000000..1a756c32678e
--- /dev/null
+++ b/media-gfx/pixie/pixie-1.3.25.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pixie/pixie-1.3.25.ebuild,v 1.1 2004/12/28 08:18:02 eradicator Exp $
+
+inherit eutils
+
+IUSE="X"
+
+MY_PN="Pixie"
+S="${WORKDIR}/${MY_PN}"
+
+DESCRIPTION="RenderMan like photorealistic renderer."
+HOMEPAGE="http://pixie.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-src-${PV}.tgz"
+
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc -amd64"
+
+RDEPEND="media-libs/jpeg
+	 sys-libs/zlib
+	 media-libs/tiff
+	 X? ( virtual/x11 )"
+
+DEPEND="${RDEPEND}
+	sys-devel/libtool
+	>=sys-devel/automake-1.8"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	# These have been sent upstream, and rejected, but this is the
+	# "right way" -- eradicator
+	epatch ${FILESDIR}/${PN}-1.3.11-math.patch
+
+	# Gentoo-specific stuff to fix the build/install process
+	epatch ${FILESDIR}/${PN}-1.3.11-gentoo.patch
+
+	export WANT_AUTOMAKE=1.8 
+	export WANT_AUTOCONF=2.5
+	aclocal
+	libtoolize --force --copy
+	automake -a -f -c
+	autoconf
+}
+
+src_compile() {
+	./configure --prefix=/opt/pixie || die
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+	dodoc AUTHORS ChangeLog DEVNOTES NEWS README
+
+	insinto /etc/env.d
+	doins ${FILESDIR}/50pixie
+
+	edos2unix ${D}/opt/pixie/shaders/*
+
+	mv ${D}/opt/pixie/doc ${D}/usr/share/doc/${PF}/html
+}