Missing -lz since for example, gzopen is used. Missing zlib.h include wrt #378255 by Diego Elio Pettenò

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

4 files changed, 46 insertions, 5 deletions

diff --git a/sci-libs/mathgl/ChangeLog b/sci-libs/mathgl/ChangeLog
index 54323ccefc95..d01d7712b2b8 100644
--- a/sci-libs/mathgl/ChangeLog
+++ b/sci-libs/mathgl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/mathgl
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/mathgl/ChangeLog,v 1.24 2011/06/04 18:05:45 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mathgl/ChangeLog,v 1.25 2011/08/09 08:49:44 ssuominen Exp $
+
+  09 Aug 2011; Samuli Suominen <ssuominen@gentoo.org> mathgl-1.11.2.ebuild,
+  +files/mathgl-1.11.2-zlib.patch:
+  Missing -lz since for example, gzopen is used. Missing zlib.h include wrt
+  #378255 by Diego Elio Pettenò
 
 *mathgl-1.11.2 (04 Jun 2011)
 
diff --git a/sci-libs/mathgl/Manifest b/sci-libs/mathgl/Manifest
index a57501ffb3b0..1b1e9f66d261 100644
--- a/sci-libs/mathgl/Manifest
+++ b/sci-libs/mathgl/Manifest
@@ -1,9 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX mathgl-1.10.2-gcc43.patch 345 RMD160 81d76baed06d779853dd96ce169f5bef620629b2 SHA1 e50c8e600cb243c809d3a6648344bbe29146666d SHA256 2165125d4677b882548530dc21a0368bf7ed27cab516ee6f78604f98b3b60ac9
+AUX mathgl-1.11.2-zlib.patch 687 RMD160 88205ba7316cc37d4ba170e9202e5faf965f2a96 SHA1 36acb0818d54d43be8a97f06613332e06a0c0f5c SHA256 417da2322b380ce538a1fc3abaa14f68130761e7a9c1221190142d55e926a007
 AUX mathgl-octave-3.4.patch 396 RMD160 620581ff85c8025d25819ef23af6e4885e1d26e9 SHA1 02e61712be707e2f9e116304b41245da47b3b949 SHA256 a6262a8e67a280cc19b8a0ab501c17400d46a91e0eb8b46967c5354f120380b6
 DIST STIX_font.tgz 2450541 RMD160 7595c2b99c5982d72b1ef551ab8f9d65237e5466 SHA1 3cbc4f5090cd37d1b35d594150357550d2639f81 SHA256 6408290fd4a5267637a88507344a8f07b908ce72f46ef93d09e068fedb67e8fe
 DIST mathgl-1.11.1.1.tar.gz 4590143 RMD160 058ee41aefa6821cd5fa45651406041cee6e0f0c SHA1 06eaad16de16c37b800b0bf538c2379af90cff39 SHA256 10f44bfdd7a03b9654088994b8bc7ebcb8b65d23d0c06327c30a8adc017389d2
 DIST mathgl-1.11.2.tar.gz 4641427 RMD160 d7e59015304041b3a582e58bc3f60f51bd36e094 SHA1 16b9ab58e654c5b91374f8a35eafc33630d7f5c0 SHA256 1602244136f42bf4b47a4880cb1ff599f6cce9dfb455f8accdbca668ed680e96
 EBUILD mathgl-1.11.1.1.ebuild 3508 RMD160 845e181664780b697e5508c1515251ed9e87bc84 SHA1 6ef1e9cf2e4e6a58a911bcf72422de78697fd3cb SHA256 4636ae10e307d1077e3647efeb950a85573bd822670cbc66cd86f7381801250e
-EBUILD mathgl-1.11.2.ebuild 3506 RMD160 c2543084fafd0d85ccb2b5e5cd1e61575c4048a7 SHA1 490314c19579816c539d91e0a6c4001bb5ed50ee SHA256 a8d95d517d54facf05f5118d71151a6b7d3eb536a3053a7a053e853564cda58e
-MISC ChangeLog 4772 RMD160 e611653c9a3ca89565f0b66c9f741115a427948b SHA1 b2ab9827680f5533e0e31cff1cd3a7b20d0828e1 SHA256 89ab540e48ddb3a37c686097d58d2322a524dec7e2c7caf17a75e0fb5bdfaee4
+EBUILD mathgl-1.11.2.ebuild 3593 RMD160 0a996b8f95b6c71b3247eb6643112cb55220fb94 SHA1 af109d3950d579af69e41e1649e564b56364c639 SHA256 0320b08d5106a49f0295e48c8fa2a7b0203d472e441ae18526635a4b29155a69
+MISC ChangeLog 4996 RMD160 f81e85b38d8252539a91889965991e31e14e99e1 SHA1 dd46c0d3899a9f86a492f8439bc3a21f20ac768f SHA256 5cb9b875c4d62ad3037133bc65bacb863e5adf8061ae520127b5876323ab7617
 MISC metadata.xml 403 RMD160 58842b16ab72ab3b23b8d29eaf00dd2c05da11c9 SHA1 de3dde83893663018de696e3e07010a276db0fff SHA256 2e033d0243bbbafcb9397978f74e7bf0edcb03cfb6f2d2d5ff9e22cdf5e77a42
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk5A9KQACgkQXkR9YqOcLPFscAD/db1aQy7UqtOLY6UlT3JQ/1cP
+HKwuyRFgWjMg4Ba9rJgA/jSEreyD69l28zUEIBWWE5k8tKu6V+BTSvbCUbv05kLs
+=pvW4
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/mathgl/files/mathgl-1.11.2-zlib.patch b/sci-libs/mathgl/files/mathgl-1.11.2-zlib.patch
new file mode 100644
index 000000000000..401f5b0d9fcf
--- /dev/null
+++ b/sci-libs/mathgl/files/mathgl-1.11.2-zlib.patch
@@ -0,0 +1,21 @@
+--- mgl/Makefile.am
++++ mgl/Makefile.am
+@@ -16,7 +16,7 @@
+ WIDGETS += -DWITH_GLUT
+ endif
+ 
+-libmgl_la_LIBADD = $(PNG_LIBS) $(GL_LIBS) $(LOPENMP)
++libmgl_la_LIBADD = $(PNG_LIBS) -lz $(GL_LIBS) $(LOPENMP)
+ libmgl_la_LDFLAGS = -no-undefined -version-info $(MGL_CURRENT):$(MGL_REVISION):$(MGL_AGE)
+ 
+ libmgl_la_CXXFLAGS = $(WIDGETS) -DMGL_FONT_PATH=\"$(datadir)/$(PACKAGE)/fonts/\" \
+--- mgl/mgl_data_png.cpp
++++ mgl/mgl_data_png.cpp
+@@ -18,6 +18,7 @@
+  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+  ***************************************************************************/
+ #include <stdlib.h>
++#include <zlib.h>
+ #ifndef NO_PNG
+ #include <png.h>
+ #endif
diff --git a/sci-libs/mathgl/mathgl-1.11.2.ebuild b/sci-libs/mathgl/mathgl-1.11.2.ebuild
index 850ddb281907..a6208f615719 100644
--- a/sci-libs/mathgl/mathgl-1.11.2.ebuild
+++ b/sci-libs/mathgl/mathgl-1.11.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/mathgl/mathgl-1.11.2.ebuild,v 1.1 2011/06/04 18:05:45 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mathgl/mathgl-1.11.2.ebuild,v 1.2 2011/08/09 08:49:44 ssuominen Exp $
 
 EAPI=3
 
@@ -9,7 +9,7 @@ PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.*"
 
-inherit autotools wxwidgets python versionator toolchain-funcs
+inherit autotools eutils wxwidgets python versionator toolchain-funcs
 
 DESCRIPTION="Math Graphics Library"
 HOMEPAGE="http://mathgl.sourceforge.net/"
@@ -21,6 +21,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="doc fltk gif glut gsl hdf5 jpeg octave python qt4 wxwidgets"
 
 RDEPEND="media-libs/libpng
+	sys-libs/zlib
 	virtual/opengl
 	python? ( dev-python/numpy )
 	glut? ( media-libs/freeglut )
@@ -65,6 +66,9 @@ src_prepare() {
 	# bug #358245
 	epatch "${FILESDIR}"/${PN}-octave-3.4.patch
 
+	# bug #378255
+	epatch "${FILESDIR}"/${PN}-1.11.2-zlib.patch
+
 	# correct location of numpy/arrayobject.h
 	if use python; then
 		sed \