Fix building with libpng15 wrt #378737 by Diego Elio Pettenò. Fix missing dependencies; freeglut, giflib, libpng, zlib, glu, jpeg, opengl and libX11.

Package-Manager: portage-2.2.0_alpha55/cvs/Linux x86_64

4 files changed, 57 insertions, 18 deletions

diff --git a/sci-chemistry/povscript+/ChangeLog b/sci-chemistry/povscript+/ChangeLog
index e7679e590a3f..0173ff209d87 100644
--- a/sci-chemistry/povscript+/ChangeLog
+++ b/sci-chemistry/povscript+/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-chemistry/povscript+
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/povscript+/ChangeLog,v 1.4 2011/03/02 17:51:59 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/povscript+/ChangeLog,v 1.5 2011/09/14 19:49:57 ssuominen Exp $
+
+  14 Sep 2011; Samuli Suominen <ssuominen@gentoo.org>
+  povscript+-2.1.2.2.19.ebuild, +files/povscript+-2.1.2.2.19-libpng15.patch:
+  Fix building with libpng15 wrt #378737 by Diego Elio Pettenò. Fix missing
+  dependencies; freeglut, giflib, libpng, zlib, glu, jpeg, opengl and libX11.
 
   02 Mar 2011; Justin Lecher <jlec@gentoo.org> povscript+-2.1.2.2.18.ebuild,
   povscript+-2.1.2.2.19.ebuild:
diff --git a/sci-chemistry/povscript+/Manifest b/sci-chemistry/povscript+/Manifest
index a7da72e153ce..b80996ac0e18 100644
--- a/sci-chemistry/povscript+/Manifest
+++ b/sci-chemistry/povscript+/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
+AUX povscript+-2.1.2.2.19-libpng15.patch 542 RMD160 619a3e7609fae6c38ffe7c8eae88057893dbf476 SHA1 35e0255a2c21b01f03c97539564d2c1900aab0b6 SHA256 13cebc2b3d96e9fc650e38a95d7ff21b5fd25db7ae00110aa26e91e7601f4214
 DIST molscript-2.1.2pov2.18.tar.gz 847572 RMD160 c3ae8c4a4c34591c9db96a2e90e584ac0a4d19f1 SHA1 e5c521794d085c2a7dc01589ccfdfe1d8e038542 SHA256 2839984df5c5a85598dedbcb42583d9d4b5d8128fc6728ed23db7c541608e161
 DIST molscript-2.1.2pov2.19.tar.gz 845101 RMD160 d5675fd7dd308e3d18f6258fd8f24324ec3ab8a2 SHA1 ff29242413584879e7333f75f91179a5d6937fc0 SHA256 4d35ed30898508df85c1db6e18385b56f8aed1f79db65195be6fdb23d3c49b68
 EBUILD povscript+-2.1.2.2.18.ebuild 1168 RMD160 b75934b43f8840384b8ed83fc7e76c32a2f6eacf SHA1 e7170242a29ca5ada0ec8db29aec392ded3f8dd8 SHA256 01757a89fdfcbccb4728a3976a1b18d4d82086c512b253cec48d32324221b41d
-EBUILD povscript+-2.1.2.2.19.ebuild 1175 RMD160 c5f3f6f597f627dc122967baaeb549fddab6624c SHA1 e35597fe7111bc3f676738265947e669087286ee SHA256 3ee52778536008216e0b1cab9707a8c4271865c043b4333e689b128ce2bc5711
-MISC ChangeLog 875 RMD160 75563a19218313e0a4e0819fce9589071aae1149 SHA1 2b9279f6b0a78b05b61991f19efed452e5f3e9e7 SHA256 f85389847894dcae7efbea4fe4e28ab9ff85bb9df1edadaa7f2d4c845047ba79
+EBUILD povscript+-2.1.2.2.19.ebuild 1353 RMD160 e2c1f29f89d2dac5b73ca058ac708fc1212d2e27 SHA1 0e5696fc309363e54a6eebc02522edb07b23c478 SHA256 3deca883fee382be5e89e0194802342c1259d2b4e2d5557bfbb6e725aef90096
+MISC ChangeLog 1167 RMD160 aa1de02fba8f5959adb467c4d6478fcf7b7ba0f7 SHA1 33f13e472a1d116b0c7b57b7ec8b3819b407836e SHA256 92872bcbc11b657bae7bfa60196166bcd11accf98c0651f27c60c6991322826a
 MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk1ug8UACgkQgAnW8HDreRbsHACbBqG+5TXh/axPL0mUNl6UolIM
-k5wAn2JQbP6GkGXaqZR0/xo7gwY8X6HG
-=A1VV
+iF4EAREIAAYFAk5xBZ0ACgkQXkR9YqOcLPF4/wD/V2KDqPemi6FRwRczFk/du6sm
+Cd36ZzxS+CNxABgA8wsA/itn885vL3KdUYZBofFoHy172GzoK/nNNAYVVciPuv88
+=fNx1
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/povscript+/files/povscript+-2.1.2.2.19-libpng15.patch b/sci-chemistry/povscript+/files/povscript+-2.1.2.2.19-libpng15.patch
new file mode 100644
index 000000000000..054967d6555c
--- /dev/null
+++ b/sci-chemistry/povscript+/files/povscript+-2.1.2.2.19-libpng15.patch
@@ -0,0 +1,19 @@
+--- src/png_img.c
++++ src/png_img.c
+@@ -18,6 +18,7 @@
+ 
+ #include MS_GL_H
+ 
++#include <zlib.h>
+ #include <png.h>
+ 
+ #include "clib/str_utils.h"
+@@ -69,7 +70,7 @@
+   info_ptr = png_create_info_struct (png_ptr);
+   if (info_ptr == NULL)
+     yyerror ("png_img: could not create PNG info structure");
+-  if (setjmp (png_ptr->jmpbuf)) yyerror ("png_img: could not setjmp");
++  if (setjmp (png_jmpbuf(png_ptr))) yyerror ("png_img: could not setjmp");
+ 
+   png_init_io (png_ptr, outfile);
+   png_set_compression_level (png_ptr, compression_level);
diff --git a/sci-chemistry/povscript+/povscript+-2.1.2.2.19.ebuild b/sci-chemistry/povscript+/povscript+-2.1.2.2.19.ebuild
index f0f42396fc32..9da8aa72b8db 100644
--- a/sci-chemistry/povscript+/povscript+-2.1.2.2.19.ebuild
+++ b/sci-chemistry/povscript+/povscript+-2.1.2.2.19.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/povscript+/povscript+-2.1.2.2.19.ebuild,v 1.2 2011/03/02 17:51:59 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/povscript+/povscript+-2.1.2.2.19.ebuild,v 1.3 2011/09/14 19:49:57 ssuominen Exp $
 
-EAPI="1"
-
-inherit versionator
+EAPI=4
+inherit eutils versionator
 
 V1=$(get_version_component_range 1 ${PV})
 V2=$(get_version_component_range 2 ${PV})
@@ -12,22 +11,37 @@ V3=$(get_version_component_range 3 ${PV})
 V4=$(get_version_component_range 4 ${PV})
 V5=$(get_version_component_range 5 ${PV})
 
-MY_P="molscript-${V1}.${V2}.${V3}pov${V4}.${V5}"
+MY_P=molscript-${V1}.${V2}.${V3}pov${V4}.${V5}
+
 DESCRIPTION="Modified molscript that uses POV-Ray, does thermal ellipsoids, and more"
 HOMEPAGE="http://www.stanford.edu/~fenn/povscript/"
 SRC_URI="http://www.stanford.edu/~fenn/packs/${MY_P}.tar.gz"
+
 LICENSE="glut molscript"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
-RDEPEND="
-	dev-libs/glib:2
-	sci-libs/gts"
+
+RDEPEND="dev-libs/glib:2
+	media-libs/freeglut
+	media-libs/giflib
+	>=media-libs/libpng-1.4
+	sci-libs/gts
+	sys-libs/zlib
+	virtual/glu
+	virtual/jpeg
+	virtual/opengl
+	x11-libs/libX11"
 DEPEND="${RDEPEND}"
-S="${WORKDIR}/${MY_P}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libpng15.patch
+}
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	emake DESTDIR="${D}" install
 	cd "${D}"/usr/bin
 	mv molscript povscript+
 	mv molauto povauto+