Merged zlib fixes from sci-visualization/qtiplot, #395139

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

diff --git a/sci-visualization/scidavis/ChangeLog b/sci-visualization/scidavis/ChangeLog
index 5fe34cfb13bc9ee1e6e5429224cc11cf246ff0cd..44fbcfa9181d3b5ab9db5942a75769e1abac603e 100644 (file)
--- a/sci-visualization/scidavis/ChangeLog
+++ b/sci-visualization/scidavis/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-visualization/scidavis
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/scidavis/ChangeLog,v 1.17 2011/03/06 09:10:57 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/scidavis/ChangeLog,v 1.18 2011/12/19 22:58:58 jlec Exp $
+
+  19 Dec 2011; Justin Lecher <jlec@gentoo.org> scidavis-0.2.4.ebuild:
+  Merged zlib fixes from sci-visualization/qtiplot, #395139
 
   06 Mar 2011; Justin Lecher <jlec@gentoo.org> scidavis-0.2.3.ebuild,
   scidavis-0.2.4.ebuild:

diff --git a/sci-visualization/scidavis/Manifest b/sci-visualization/scidavis/Manifest
index b965854c9dc3c0b813a2f2b05847be7b53a7bfb0..ed32f0ce76f836b73fef8747f7a50828d317993c 100644 (file)
--- a/sci-visualization/scidavis/Manifest
+++ b/sci-visualization/scidavis/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX scidavis-0.2.3-profile.patch 3384 RMD160 15e40da628f2e59c40c520c9082f567e28928a25 SHA1 ad9e323d29c4ae90ae63738556a63482c3963ebe SHA256 2df4ea4ac663c0b2ed180bacdf76ba454650381b1e0c77a8238c4aa9584c792f
 AUX scidavis-0.2.3-sip49.patch 1079 RMD160 bfd6ee4495c64b1f8e4f2c3acafedb44f5f8a808 SHA1 b31e9d15397fa90ac1417e805b6a317461a49df6 SHA256 8e08c71a3d91c8871f6675623a3e3f9ac0d8c30d9e6420d2d02d8704b6d58fdf
@@ -7,13 +7,13 @@ AUX scidavis-0.2.4-profile.patch 3722 RMD160 66c8a23d240a7c85cbf82bd0ae3340be2df
 DIST scidavis-0.2.3.tar.bz2 1309491 RMD160 ca3c3232af443bcf3c0a254ad2c1aea4cb1b1c2a SHA1 410e84d894c6cecca0b2c657709f81320eae022b SHA256 812e965709072ca3d583c5844c2ba85e5a3614605806754ec0ec86dc14f5df20
 DIST scidavis-0.2.4.tar.bz2 1426695 RMD160 a265a8fea2e26ca26e0ba08dd3069389bb5f4735 SHA1 f8e0eeac08f0e06fe12cb55bb6b008c3963cb3de SHA256 81381c3a9c2e66c25945cbdfb4e6270f94f0adb0832b6947ba05fa79f0f439f6
 EBUILD scidavis-0.2.3.ebuild 1916 RMD160 a48d1fac31306ca6f367ee7ece15bbb5a3b4ea6c SHA1 cf7713144733d70ddea5c4dc370d09886a3c3ec4 SHA256 9a791a8bcc2108d12ac029d0fa5644165e738814c24345456c29395e7e237d18
-EBUILD scidavis-0.2.4.ebuild 1861 RMD160 ba5f4ad93490c44c1b46b80bdf9e7197c489a818 SHA1 7f17ebe45b78f3d960b1141b88fd022fa3940522 SHA256 c86fe313a3d14e3080ef9b960346dbc9634d068ed6aa1fb731679ef7f963850a
-MISC ChangeLog 3439 RMD160 e6932193ee4f3aef212585513722dd1acc0f1faa SHA1 f2e82b35774eba37449ee3e28c286fd552f28e51 SHA256 e13e9bf9594909ae7bff71e4bff5e9e8c8a1bbcc26c9b25232a9d3fe0908539e
+EBUILD scidavis-0.2.4.ebuild 2020 RMD160 43df7c722361c1006038148041ca5408ef1aedb4 SHA1 8a5159a61b67a4c061baadaf7740b5664d229a82 SHA256 a48f5654f5aea4dfef1b9975bc3cee3ecad1f9243646d83d2f92a822da7d71f7
+MISC ChangeLog 3570 RMD160 980f52eadc78b40d468ebc71583b28beef52bc25 SHA1 9ccded885317ab61489e675f27493fc94b0d3e4d SHA256 501e1d905e20400a56a46bdc838834f9d6b4af8e2b5f2bf2855602dcffdd5ca3
 MISC metadata.xml 394 RMD160 1d6b5ccbd9c2820b9744c46afb90677f1e55bfb1 SHA1 8afc8ac6dda2ffbff823a343fb50a28fd75e29b6 SHA256 bfe78b4c2ef8ac7942bbd94c5a65f0408dc9f663aa9446dd99dbc09a3675cb6a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk1zT64ACgkQgAnW8HDreRb4pQCfc0JI4GqGlKoKTDDbEY1J8VUc
-xLoAn0KTqIgWCD8aMtlRLApHkYCya4tW
-=i4iV
+iEYEAREKAAYFAk7vwcAACgkQgAnW8HDreRYwbwCgymQxoa1lVij5GBIS69k3J2zi
+9cAAoKQYgQ+5IoPZnh/JNy5DlK4s8OsP
+=XA2O
 -----END PGP SIGNATURE-----

diff --git a/sci-visualization/scidavis/scidavis-0.2.4.ebuild b/sci-visualization/scidavis/scidavis-0.2.4.ebuild
index 550b959cb5be5233dad1f73c06db35d013d76dcb..7e056f31d11e4db87aa34ed350f2932f9ce9836c 100644 (file)
--- a/sci-visualization/scidavis/scidavis-0.2.4.ebuild
+++ b/sci-visualization/scidavis/scidavis-0.2.4.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-visualization/scidavis/scidavis-0.2.4.ebuild,v 1.4 2011/03/06 09:10:57 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/scidavis/scidavis-0.2.4.ebuild,v 1.5 2011/12/19 22:58:58 jlec Exp $
 
 EAPI="3"
 
@@ -20,13 +20,14 @@ for l in ${LANGS}; do
        IUSE="${IUSE} linguas_${l}"
 done
 
-CDEPEND="sys-libs/zlib
+CDEPEND="
+       dev-cpp/muParser
+       sci-libs/gsl
+       sys-libs/zlib
        x11-libs/qwt:5[svg]
        >=x11-libs/qwtplot3d-0.2.7
        || ( >=x11-libs/qt-assistant-4.7.0:4[compat] <x11-libs/qt-assistant-4.7.0:4 )
-       x11-libs/qt-qt3support:4
-       >=dev-cpp/muParser-1.30
-       >=sci-libs/gsl-1.8"
+       x11-libs/qt-qt3support:4"
 # remove because unsupported for now
 #      sci-libs/liborigin:2"
 
@@ -56,6 +57,12 @@ src_prepare() {
        sed -i \
                -e '/^include( python.pri )$/d' \
                ${PN}/${PN}.pro || die "sed python failed"
+       sed \
+               -e '1i#define OF(x) x' \
+               -i 3rdparty/minigzip/minigzip.c || die
+#      sed \
+#              -e "/minigzip.c/s:^.*$:LIBS += -lminizip:g" \
+#              -i scidavis/sourcefiles.pri || die
 }
 
 src_install() {