Version bump. Tentative fix for random failure which might be due to python-3 set (bug #412805)

Package-Manager: portage-2.1.10.56/cvs/Linux x86_64

3 files changed, 32 insertions, 24 deletions

diff --git a/sci-visualization/fityk/ChangeLog b/sci-visualization/fityk/ChangeLog
index 3f455ce1d2d3..1b8e3065123d 100644
--- a/sci-visualization/fityk/ChangeLog
+++ b/sci-visualization/fityk/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-visualization/fityk
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/fityk/ChangeLog,v 1.18 2012/04/23 17:29:33 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/fityk/ChangeLog,v 1.19 2012/04/25 03:15:56 bicatali Exp $
+
+*fityk-0.9.8 (25 Apr 2012)
+
+  25 Apr 2012; Sébastien Fabbro <bicatali@gentoo.org> -fityk-0.9.6.ebuild,
+  +fityk-0.9.8.ebuild:
+  Version bump. Tentative fix for random failure which might be due to python-3
+  set (bug #412805)
 
   23 Apr 2012; Michał Górny <mgorny@gentoo.org> fityk-0.9.6.ebuild,
   fityk-0.9.7.ebuild:
diff --git a/sci-visualization/fityk/Manifest b/sci-visualization/fityk/Manifest
index e7d1630912fd..be16f7245c9d 100644
--- a/sci-visualization/fityk/Manifest
+++ b/sci-visualization/fityk/Manifest
@@ -1,20 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
-DIST fityk-0.9.6.tar.bz2 1142379 RMD160 4066434330d1401d5df69215370d8777a3beb733 SHA1 869daaf898c565aff8e1c6e5cdc1b0b7e21c52d1 SHA256 f6af40ec8883310729d25069bbd373b8ed1c6c0eb2495fa169ba148e70091132
 DIST fityk-0.9.7.tar.bz2 1146628 RMD160 bd403037157b32ec7c7c6972f17116e403d099bc SHA1 bb4d11b529c6c87c68c6f7359075915caf95a996 SHA256 3bd9a3bad4d4a10e1c25619d632e3cbee0b8fad09d00d63d1d0faaa61019b532
+DIST fityk-0.9.8.tar.bz2 1050468 RMD160 c0e01b3ae6b6fbe42adba2ab1b4ce6a2af1de48e SHA1 33278905b2300d3a31ee38948f0b512503f5774b SHA256 ac9c38979e06b1e848beb02c563c3307cbbd832eca951e05402f777c91bad77c
 DIST fityk-1.1.1.tar.gz 804251 RMD160 0bfe87aab0ce586959b4555c616679b326842809 SHA1 df44cf35d0f726a124ddb5ca7a4f0b3aa9119fff SHA256 a70402fd99a48df8c4c0078c544d4901fab01c9005b52850bbb46712ad5f45e4
-EBUILD fityk-0.9.6.ebuild 2382 RMD160 c9e1187ca5f619e9d51d12ac81fee0b8e472ed6f SHA1 10e4ad01704ab8f2ce21f943bd9f4dea303da277 SHA256 6858edd1b6b3c507bdc6aaa414f16e71cb859f1a645ef9041800580f6976c9b4
 EBUILD fityk-0.9.7.ebuild 2382 RMD160 5ac17e7656e3ac751556fe4c0a48e9313e36a955 SHA1 e385bceafe28c0670fcdcad34431c9148982410a SHA256 b9bf0cf5bcf85d396fad18e739d6fcb20b0e89b9964c18a00c341dbf0409bba9
+EBUILD fityk-0.9.8.ebuild 2471 RMD160 1a42ed96e46cd80d781264294d282eec88f8ccf5 SHA1 5de2c7e73181a7bf8dfe99bb5c6b1a615b76c10e SHA256 26fad5f50d639d530ed7f4dc33c9d054f3236b231aee05c126d5563704b136bd
 EBUILD fityk-1.1.1.ebuild 2495 RMD160 70bff2df4289d9928d9c231619aae1d328c95f4d SHA1 ceefd750c3637c3a6889950e681eba421a50902a SHA256 3692213c1f743836737252517511873f2b87b55437f835fa47926b64351832ca
-MISC ChangeLog 3295 RMD160 85eda14a72d0105b1e88ff504cc897f7979ae4fd SHA1 a35454820f201f463690caf19eb72e88259d0e6b SHA256 d9488724ed5644ea0297d7d36bf04f74fdb48545ad69aaed190609a84bc5cdf7
+MISC ChangeLog 3525 RMD160 4d729108ab13e173d91fc2ce2d9d617ddf329265 SHA1 5cb23a77352efc6de64349a8798feec716b094d2 SHA256 23539a2d683bb178566d82e818888e8f14dca8da704384b3eeb325b2f05aa33d
 MISC metadata.xml 1094 RMD160 051cca0088806156c3f4e786b9b4bd36541874a0 SHA1 6f394f9c92462dd283ca49be6f285232fd5e1ea6 SHA256 271840e4016f655cc85c7627b659b98837092381a4c1fcc873f195cb04c74d26
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk+VkaYACgkQfXuS5UK5QB3juAP/dyJKDFbn37QfNcPRI+OoeJVw
-++c/OlttNcWHbk8BxeOfmHAkPljvyQygNwqQ7A2C3KvaDgAu3RWnWRW9aq/8rvU7
-9+w0pHvGJ7fcDHMDUW9WNnJQ/RRghRFCp+fe0qdcvVQlW3Vz5cSMgNn8cxhP7o95
-YWxP5WTapT/G31RR2DU=
-=Z+Qk
+iEYEARECAAYFAk+XbHsACgkQ1ycZbhPLE2C7LgCgky4VTgfjJchGRkkkI6OycQgf
+77wAn0cFHjSrOaKPeespkQzdKVoPn5V7
+=ex69
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/fityk/fityk-0.9.6.ebuild b/sci-visualization/fityk/fityk-0.9.8.ebuild
index 9935ee4bd64d..9f7099b1c7b0 100644
--- a/sci-visualization/fityk/fityk-0.9.6.ebuild
+++ b/sci-visualization/fityk/fityk-0.9.8.ebuild
@@ -1,13 +1,15 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/fityk/fityk-0.9.6.ebuild,v 1.3 2012/04/23 17:29:33 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/fityk/fityk-0.9.8.ebuild,v 1.1 2012/04/25 03:15:56 bicatali Exp $
 
-EAPI="3"
+EAPI=4
 
 WX_GTK_VER="2.8"
 
+# python eclass cruft
 PYTHON_DEPEND="python? 2"
 SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
 
 inherit python wxwidgets
 
@@ -23,7 +25,7 @@ IUSE="doc examples gnuplot lua readline python static-libs wxwidgets"
 CDEPEND=">=sci-libs/xylib-0.8
 	lua? ( dev-lang/lua )
 	readline? ( sys-libs/readline )
-	wxwidgets? ( x11-libs/wxGTK:2.8 )"
+	wxwidgets? ( x11-libs/wxGTK:2.8[X] )"
 
 DEPEND="${CDEPEND}
 	dev-libs/boost
@@ -32,15 +34,15 @@ DEPEND="${CDEPEND}
 RDEPEND="${CDEPEND}
 	gnuplot? ( sci-visualization/gnuplot )"
 
-RESTRICT_PYTHON_ABIS="3.*"
-
 src_prepare() {
 	has_version "<dev-libs/boost-1.37" && \
 		sed -i -e 's:impl/directives.hpp:directives.ipp:g' \
-		"${S}/src/optional_suffix.h"
+		src/optional_suffix.h
 
-	sed '/^LTLIBRARIES/s:$(pyexec_LTLIBRARIES)::g' \
-		-i swig/Makefile.in
+	sed -i \
+		-e '/^LTLIBRARIES/s:$(pyexec_LTLIBRARIES)::g' \
+		-e '/install-exec-am/s:install-pyexecLTLIBRARIES::' \
+		swig/Makefile.in || die
 	if use python; then
 		echo '#!/bin/sh' > config/py-compile
 	fi
@@ -55,7 +57,6 @@ src_configure() {
 		$(use_enable static-libs static) \
 		$(use_enable wxwidgets GUI) \
 		$(use_with doc) \
-		$(use_with examples samples) \
 		$(use_with readline)
 }
 
@@ -77,20 +78,22 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
+	default
 	if use python; then
 		installation() {
 			emake \
 				DESTDIR="${D}" \
 				pyexecdir="$(python_get_sitedir)" \
 				pythondir="$(python_get_sitedir)" \
-				install
+				install install-pyexecLTLIBRARIES
 		}
 		python_execute_function -s --source-dir swig installation
 		python_clean_installation_image
 	fi
-	dodoc NEWS README TODO
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins samples/*
+	fi
 }
 
 pkg_postinst() {