Version bump, thanks Dominik Kriegner

Package-Manager: portage-2.2.01.20796-prefix/cvs/Linux x86_64

3 files changed, 48 insertions, 41 deletions

diff --git a/sci-visualization/fityk/ChangeLog b/sci-visualization/fityk/ChangeLog
index 1b8e3065123d..0492fdda2aa9 100644
--- a/sci-visualization/fityk/ChangeLog
+++ b/sci-visualization/fityk/ChangeLog
@@ -1,6 +1,12 @@
 # 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.19 2012/04/25 03:15:56 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/fityk/ChangeLog,v 1.20 2012/08/06 23:39:41 bicatali Exp $
+
+*fityk-1.2.0 (06 Aug 2012)
+
+  06 Aug 2012; Sébastien Fabbro <bicatali@gentoo.org> +fityk-1.2.0.ebuild,
+  -fityk-0.9.7.ebuild:
+  Version bump, thanks Dominik Kriegner
 
 *fityk-0.9.8 (25 Apr 2012)
 
@@ -101,4 +107,3 @@
   +files/fityk-0.8.4-as-needed.patch, +metadata.xml, +fityk-0.8.4.ebuild:
   Initial import. Thanks Honza Macháček and Michelangelo Scopelliti for
   their work. Closing bug #126810.
-
diff --git a/sci-visualization/fityk/Manifest b/sci-visualization/fityk/Manifest
index be16f7245c9d..fc67ddd20fca 100644
--- a/sci-visualization/fityk/Manifest
+++ b/sci-visualization/fityk/Manifest
@@ -1,18 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-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.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 3525 RMD160 4d729108ab13e173d91fc2ce2d9d617ddf329265 SHA1 5cb23a77352efc6de64349a8798feec716b094d2 SHA256 23539a2d683bb178566d82e818888e8f14dca8da704384b3eeb325b2f05aa33d
-MISC metadata.xml 1094 RMD160 051cca0088806156c3f4e786b9b4bd36541874a0 SHA1 6f394f9c92462dd283ca49be6f285232fd5e1ea6 SHA256 271840e4016f655cc85c7627b659b98837092381a4c1fcc873f195cb04c74d26
+DIST fityk-0.9.8.tar.bz2 1050468 SHA256 ac9c38979e06b1e848beb02c563c3307cbbd832eca951e05402f777c91bad77c
+DIST fityk-1.1.1.tar.gz 804251 SHA256 a70402fd99a48df8c4c0078c544d4901fab01c9005b52850bbb46712ad5f45e4 SHA512 b170a96deea34b3df9ca729aea4462410e8b178cd7c3be22a1bc6d99ca9cffa019241200cebe422110150d41b1fbd5e126032c79e07dd5b3568e9e4d1745048f WHIRLPOOL 48b33e0af748f80b7fe943a221e07bcd26bbe46d78c72271131d7a32b277141fd2c0b1fcb7a8d1888895ef56d4bb9422641b8045f7ba4cf9ecece1e2171f319f
+DIST fityk-1.2.0.tar.bz2 1199643 SHA256 ea2fa0c8ed6afabae4026e748b91b150ed5832af32af7517adcabb4b6516845b SHA512 073dec7db6a5b36ef83373ec7fc53282a30aaaf5e94a2559ecad7ed1c25a9d77e8eb95d15a4c3499ae55b31ee30b6b638e329a8b8c5bf685436258e822131666 WHIRLPOOL 60c65cec0c1d93145fed303f43a1fa3c46c78128da1edbccc7a0a731f284a41dd046c3593f81d6e475c86ba6490466a3e4bedcff967573012f3dde8c21e51ac8
+EBUILD fityk-0.9.8.ebuild 2471 SHA256 26fad5f50d639d530ed7f4dc33c9d054f3236b231aee05c126d5563704b136bd SHA512 fe19c37c55add4bcf152356514c3842bce184c41cc98ec4c54d374a5295a6274b55053cce8c219cfd4c8d8df601a9a4ba5b424d6c06135d1782c6dfad771676e WHIRLPOOL 5877f7a8d57c6a0ac51eee73001caa534a9efeb5eb841d3f6a335f03f783bd6336dddc0bcb5bf5b8f0ba0a7cf122e7576987d4d1e7c88eef006e24c2274cce2c
+EBUILD fityk-1.1.1.ebuild 2495 SHA256 3692213c1f743836737252517511873f2b87b55437f835fa47926b64351832ca SHA512 1c171e0fe979eafc482a61e57118ebcda7c8fe2d47daba616f08196a6b3bce333e8dcb53e8df936d738d9f4dc7f0288a21229ac3fa9d4af9d3faa241af34590b WHIRLPOOL a6c8144f34ce24e1e2ec01bf295db8dc28b4e73494ad10bbce70bf5406cb17db8afc4c4f2942825b800f4eaaf0c7c5924bfdea9e4f2be55d20d54b704ece47ee
+EBUILD fityk-1.2.0.ebuild 2489 SHA256 c118fc62e4632c8679df8932deed5d6366ef76e49ea595ba34f6aea867ba7fa8 SHA512 881ae5cd9388ad8a8ed337d9c0bc3882ab6006538f186acca2fd02a1d9476f7fc0265974576ed2df1137ddae30e0ef980faefe2fee654f9762c65aad192f993b WHIRLPOOL ea2fdda53ae595950d4c1aad9f42d6eaaf1799fdeb6a10aaa2f8d4cd037067fb878d49cf3845080eac4138aa811a84babdd2c7c891539b9e109f3ec26e3e7fcc
+MISC ChangeLog 3692 SHA256 37d105bad61a96b6ab2aa50fa419c1e0a2f58f3b846834634f11701eb8f00111 SHA512 52fb5f3b71404c6e04102f22d1250e8c1484400b03e523aa0c7e6b9d73d03f690ddf55bb1a7ec4c61d8b731e901fc4ac8162b3a41d32317615753a8843e64897 WHIRLPOOL 2beba5d03981112f7130012105e052dc94a9cb7ff208e97549e767b4835f33f9d840340fb7b5a9e90c4126382d2822e933ec8ec4812669df296a065765fd3ab4
+MISC metadata.xml 1094 SHA256 271840e4016f655cc85c7627b659b98837092381a4c1fcc873f195cb04c74d26 SHA512 7b5605c0fdc9660e28b5b07824c22fe73889f3a2395e06ce82cae54fcc4f63b86d2bd43cfa9b68aa9b84306003c91b489b824242f0f38a39c6a78acb6756e7ca WHIRLPOOL 037bd3f7fe652097bce78f11e9c5fce9a5a16e328c20efc7e9e188df0bd8061342950d5cec2fd4f5e3dd79655692c8e4bf77d7f4333aa608e2d5f70639be968a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+XbHsACgkQ1ycZbhPLE2C7LgCgky4VTgfjJchGRkkkI6OycQgf
-77wAn0cFHjSrOaKPeespkQzdKVoPn5V7
-=ex69
+iEYEAREIAAYFAlAgVcUACgkQ1ycZbhPLE2AYvgCfXa/KXUbemQAu4OJ4ZCvg0hY9
+pMcAnR8hxeKTUOwB9X3gsgI0nwFt91M9
+=fNOP
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/fityk/fityk-0.9.7.ebuild b/sci-visualization/fityk/fityk-1.2.0.ebuild
index 20aebcf7b5a5..08c60886af50 100644
--- a/sci-visualization/fityk/fityk-0.9.7.ebuild
+++ b/sci-visualization/fityk/fityk-1.2.0.ebuild
@@ -1,29 +1,30 @@
 # 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.7.ebuild,v 1.2 2012/04/23 17:29:33 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/fityk/fityk-1.2.0.ebuild,v 1.1 2012/08/06 23:39:41 bicatali Exp $
 
-EAPI="3"
+EAPI=4
 
-WX_GTK_VER="2.8"
+WX_GTK_VER="2.9"
 
 PYTHON_DEPEND="python? 2"
 SUPPORT_PYTHON_ABIS="1"
+GITHUB_USER="wojdyr"
 
-inherit python wxwidgets
+inherit python wxwidgets autotools fdo-mime
 
 DESCRIPTION="General-purpose nonlinear curve fitting and data analysis"
 HOMEPAGE="http://fityk.nieto.pl/"
-SRC_URI="mirror://github/wojdyr/${PN}/${P}.tar.bz2"
+SRC_URI="http://github.com/downloads/${GITHUB_USER}/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples gnuplot lua readline python static-libs wxwidgets"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="gnuplot readline python static-libs wxwidgets"
 
 CDEPEND=">=sci-libs/xylib-0.8
-	lua? ( dev-lang/lua )
+	>=dev-lang/lua-5.1
 	readline? ( sys-libs/readline )
-	wxwidgets? ( x11-libs/wxGTK:2.8 )"
+	wxwidgets? ( >=x11-libs/wxGTK-2.9.2 )"
 
 DEPEND="${CDEPEND}
 	dev-libs/boost
@@ -34,15 +35,19 @@ RDEPEND="${CDEPEND}
 
 RESTRICT_PYTHON_ABIS="3.*"
 
+pkg_setup() {
+	use python && python_pkg_setup
+}
+
 src_prepare() {
 	has_version "<dev-libs/boost-1.37" && \
 		sed -i -e 's:impl/directives.hpp:directives.ipp:g' \
 		"${S}/src/optional_suffix.h"
 
 	sed '/^LTLIBRARIES/s:$(pyexec_LTLIBRARIES)::g' \
-		-i swig/Makefile.in
+		-i ${PN}/Makefile.in
 	if use python; then
-		echo '#!/bin/sh' > config/py-compile
+		echo '#!/bin/sh' > build-aux/py-compile
 	fi
 }
 
@@ -50,53 +55,50 @@ src_configure() {
 	econf  \
 		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		--disable-xyconvert \
-		$(use_enable lua) \
 		$(use_enable python) \
 		$(use_enable static-libs static) \
 		$(use_enable wxwidgets GUI) \
-		$(use_with doc) \
-		$(use_with examples samples) \
 		$(use_with readline)
 }
 
 src_compile() {
-	use python && python_copy_sources swig
 	default
+	use python && python_copy_sources ${PN}
 	if use python; then
 		compilation() {
 			emake \
 				PYTHON_CPPFLAGS="-I$(python_get_includedir)" \
 				PYTHON_LDFLAGS="$(python_get_library -l)" \
-				PYTHON_SITE_PKG="$(python_get_sitedir)" \
+				PYTHON_SITE_PKG="${EPREFIX}$(python_get_sitedir)" \
 				PYTHON_VERSION="$(python_get_version)" \
-				pyexecdir="$(python_get_sitedir)" \
-				_fityk.la
+				pyexecdir="${EPREFIX}/$(python_get_sitedir)" \
+				swig/_fityk.la
 		}
-		python_execute_function -s --source-dir swig compilation
+		python_execute_function -s --source-dir ${PN} compilation
 	fi
 }
 
 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
+				pyexecdir="${EPREFIX}/$(python_get_sitedir)" \
+				pythondir="${EPREFIX}/$(python_get_sitedir)" \
+				install-pyexecLTLIBRARIES
 		}
-		python_execute_function -s --source-dir swig installation
+		python_execute_function -s --source-dir ${PN} installation
 		python_clean_installation_image
 	fi
-	dodoc NEWS README TODO
 }
 
 pkg_postinst() {
 	use python && python_mod_optimize ${PN}.py
+	fdo-mime_desktop_database_update
 }
 
 pkg_postrm() {
 	use python && python_mod_cleanup ${PN}.py
+	fdo-mime_desktop_database_update
 }