Version bump

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

5 files changed, 15 insertions, 179 deletions

diff --git a/sci-visualization/gwyddion/ChangeLog b/sci-visualization/gwyddion/ChangeLog
index 8cb8a2552b53..ef59f3f319eb 100644
--- a/sci-visualization/gwyddion/ChangeLog
+++ b/sci-visualization/gwyddion/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-visualization/gwyddion
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gwyddion/ChangeLog,v 1.28 2011/07/20 16:06:25 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gwyddion/ChangeLog,v 1.29 2011/07/27 23:24:33 bicatali Exp $
+
+*gwyddion-2.25 (27 Jul 2011)
+
+  27 Jul 2011; Sébastien Fabbro <bicatali@gentoo.org> -gwyddion-2.18.ebuild,
+  -gwyddion-2.19.ebuild, -gwyddion-2.21.ebuild, +gwyddion-2.25.ebuild:
+  Version bump
 
   20 Jul 2011; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Drop maintainer due retirement, bug #70723
diff --git a/sci-visualization/gwyddion/Manifest b/sci-visualization/gwyddion/Manifest
index 630516a14106..01a7a4fe9d2a 100644
--- a/sci-visualization/gwyddion/Manifest
+++ b/sci-visualization/gwyddion/Manifest
@@ -2,21 +2,17 @@
 Hash: SHA1
 
 DIST gwyddion-2.10.tar.bz2 2425036 RMD160 a4c32fefe9c31c1aee9169cad6399f25ec3bbff6 SHA1 186d0cc03edefd807b33efdbb6d59cc7f98fdad6 SHA256 90bde6f10e38c563886251984c60d32155119601e400f97a0cd59b7378a740eb
-DIST gwyddion-2.18.tar.bz2 3213859 RMD160 d6d7d38faf3c461ec500a679491f9630eb0f804b SHA1 4f692579090eada0aab47fcdd775d350f8e25f07 SHA256 8bd9ebb62cdae3c200c504893c52840135bb7c7d61d397e163bcda622aed01ec
-DIST gwyddion-2.19.tar.bz2 3250383 RMD160 b28886d386bab03c5d72556680ac01dbdd5031f3 SHA1 a0761c807590e437a92b4160f3bbeb016f4d3f7e SHA256 87efdc05dccfe53f01764b16766077c14ad64a756885545940b50d5f6dbf442e
-DIST gwyddion-2.21.tar.bz2 3278455 RMD160 de6c50d14d835276b7d3e357db3668fa7f212b5d SHA1 ef063211a39c29616cefb2b18798e799964631d2 SHA256 017e60a4901a3fca71cfe8dd70aa2b6765ad0b18e0abbb61ec19704d95ff4486
 DIST gwyddion-2.24.tar.bz2 3426597 RMD160 95217be39c89f52fa15cfa47f3c4e5f4716bcd24 SHA1 cf4201e16653daa4aee7ba9fe1cf3a2a5061859f SHA256 deaf9ffb05d3d75dc513e8ca6bbdfc6e7d6e0864b8c7ff8ab7683263a5255aa6
+DIST gwyddion-2.25.tar.bz2 3504567 RMD160 89bc35e208d3c380e872c361a7e79c00212a98d0 SHA1 a4346f550fd1aae00b861ac18fbcbebcb7a54679 SHA256 ca38e2ab722930a52a56df222a1cac325de6aed3a0e4d9ad09ba8de1712341ea
 EBUILD gwyddion-2.10.ebuild 1153 RMD160 f388128eb472218079dd52a94cd850ccb817fb9e SHA1 4da2c08160a14e95563271c03d73767c05e71c33 SHA256 55b245ffd1efaa4d070802760c29f4489bff7dd64edafe6033b042eade6d79f0
-EBUILD gwyddion-2.18.ebuild 1898 RMD160 1e3f2267cde964034237493c2743693278eab47a SHA1 804d94b8ff49143c3b5bf6d0049064f8b54af0ac SHA256 f5148d27f68556d3728f5d3be84783a832def603bdd33e30dfb3061744aa73bc
-EBUILD gwyddion-2.19.ebuild 1898 RMD160 f70d1801cdc0770e9d6053f1fc1435c078a3d5b6 SHA1 936acac4addc397ca3c2f4e9676d81c4a960fef4 SHA256 90fc8f8ee1ed7a83f0917b05676dbc955ffc5cce5717ef877b9b1af5cd13b7b6
-EBUILD gwyddion-2.21.ebuild 2007 RMD160 04bb69e727eecb3888855474971bbae2911dcb49 SHA1 0b9e89daec1be5237d81b04a0d7c3443765ac515 SHA256 601f9a519bb735ee87c260de2343d12fb20c92347b9e1db3a2e9a2e0621db641
 EBUILD gwyddion-2.24.ebuild 1902 RMD160 05ee2fd611c66818ac1a25707ad22e35172ed325 SHA1 c31e5c7d789e0540b9a4859d712d1a4e91f2032e SHA256 b59038b2a4dda5f4eeda922683499735eeb454ea480f62d21ed5ea0a803a2ffc
-MISC ChangeLog 4569 RMD160 d6568f1c52cabd5baf9e0a8990dcbff6257e166c SHA1 7529ea00159722cf607c0a5f1aeec8587244162f SHA256 4672122190ee4d930c5b64fbfad1c7228bb1f2f01ae4121ed274b316ba929099
+EBUILD gwyddion-2.25.ebuild 1900 RMD160 58023946601f93bbc49bf143b4f32fa3ad5c8d4d SHA1 3a01103511c10b765b0fa92695c9702fe83b716c SHA256 32d5b933ba6b6ef957bafaa6e450b5ef27c8afa5cf130e4c08b0daf27eed82ef
+MISC ChangeLog 4767 RMD160 d0d25311a80c704332d2c05548ff4c7325707134 SHA1 e574074f0c34bf0d1cb09781f00a949a4aa62baa SHA256 fb57c78a8d118a81f87e3085c7cb31a63022d5b30c6a1467c4b4f420f37fdc9f
 MISC metadata.xml 604 RMD160 a62411f2a25b2b5521774028b31a48ad6ddc0ef3 SHA1 c4f9e2daa43b4fc26ad7a3cafc06adf78ee5afe6 SHA256 4b4b3d9287a63a11d4ad1078020ad190589da530e743ed78952e6b91caec392f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4m/QYACgkQCaWpQKGI+9RK2QCeMNS3u9G9L/ZYqwBtygipi8Rv
-awoAn19eF3oh77c1DupJLIJQidsxEHPG
-=Xvw0
+iEYEARECAAYFAk4wnjsACgkQ1ycZbhPLE2C3fwCfa6yFPCwEHXMaujZAYHOzqWyH
+mO4AoK7QHtLoTng31+q16e7xPc9W7TpP
+=9CNm
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/gwyddion/gwyddion-2.19.ebuild b/sci-visualization/gwyddion/gwyddion-2.19.ebuild
deleted file mode 100644
index 6d02e26408dd..000000000000
--- a/sci-visualization/gwyddion/gwyddion-2.19.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gwyddion/gwyddion-2.19.ebuild,v 1.3 2011/03/02 13:42:52 jlec Exp $
-
-EAPI=2
-
-PYTHON_DEPEND="python? 2"
-
-inherit fdo-mime gnome2-utils python
-
-DESCRIPTION="A software framework for SPM data analysis"
-HOMEPAGE="http://gwyddion.net/"
-SRC_URI="http://gwyddion.net/download/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc fftw gnome kde nls opengl perl python ruby sourceview xml X"
-
-RDEPEND="
-	x11-libs/gtk+:2
-	x11-libs/cairo
-	x11-libs/pango
-	x11-libs/libXmu
-	fftw? ( >=sci-libs/fftw-3 )
-	gnome? ( gnome-base/gconf:2 )
-	kde? ( >=kde-base/kdelibs-4 )
-	opengl? ( virtual/opengl x11-libs/gtkglext )
-	perl? ( dev-lang/perl )
-	python? ( dev-python/pygtk:2 )
-	ruby? ( dev-ruby/narray )
-	sourceview? ( x11-libs/gtksourceview:2.0 )
-	xml? ( dev-libs/libxml2:2 )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? ( dev-util/gtk-doc )"
-
-pkg_setup() {
-	use python && python_set_active_version 2
-}
-
-src_configure() {
-	econf \
-		--disable-desktop-file-update \
-		--disable-rpath \
-		--enable-library-bloat \
-		--enable-plugin-proxy \
-		$(use_enable doc gtk-doc) \
-		$(use_enable nls) \
-		$(use_enable python pygwy) \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with ruby) \
-		$(use_with fftw fftw3) \
-		$(use_with opengl gl) \
-		$(use_with sourceview gtksourceview) \
-		$(use_with xml spml) \
-		$(use_with X x) \
-		$(use_with kde kde4-thumbnailer)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-	use python && dodoc modules/pygwy/README.pygwy
-}
-
-pkg_postinst() {
-	use gnome && gnome2_gconf_install
-	fdo-mime_desktop_database_update
-}
-
-pkg_prerm() {
-	use gnome && gnome2_gconf_uninstall
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/sci-visualization/gwyddion/gwyddion-2.21.ebuild b/sci-visualization/gwyddion/gwyddion-2.21.ebuild
deleted file mode 100644
index 391126052745..000000000000
--- a/sci-visualization/gwyddion/gwyddion-2.21.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gwyddion/gwyddion-2.21.ebuild,v 1.2 2011/03/02 13:42:52 jlec Exp $
-
-EAPI=2
-
-PYTHON_DEPEND="python? 2"
-
-inherit fdo-mime gnome2-utils python autotools
-
-DESCRIPTION="A software framework for SPM data analysis"
-HOMEPAGE="http://gwyddion.net/"
-SRC_URI="http://gwyddion.net/download/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc fftw gnome kde nls opengl perl python ruby sourceview xml X"
-
-RDEPEND="
-	x11-libs/gtk+:2
-	x11-libs/cairo
-	x11-libs/pango
-	x11-libs/libXmu
-	fftw? ( >=sci-libs/fftw-3 )
-	gnome? ( gnome-base/gconf:2 )
-	kde? ( >=kde-base/kdelibs-4 )
-	opengl? ( virtual/opengl x11-libs/gtkglext )
-	perl? ( dev-lang/perl )
-	python? ( dev-python/pygtk:2 )
-	ruby? ( dev-ruby/narray )
-	sourceview? ( x11-libs/gtksourceview:2.0 )
-	xml? ( dev-libs/libxml2:2 )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? ( dev-util/gtk-doc )"
-
-pkg_setup() {
-	use python && python_set_active_version 2
-}
-
-src_prepare() {
-	sed -i -e '/x_includes/d' -e '/x_libraries/d' configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-desktop-file-update \
-		--disable-rpath \
-		--enable-library-bloat \
-		--enable-plugin-proxy \
-		$(use_enable doc gtk-doc) \
-		$(use_enable nls) \
-		$(use_enable python pygwy) \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with ruby) \
-		$(use_with fftw fftw3) \
-		$(use_with opengl gl) \
-		$(use_with sourceview gtksourceview) \
-		$(use_with xml spml) \
-		$(use_with X x) \
-		$(use_with kde kde4-thumbnailer)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-	use python && dodoc modules/pygwy/README.pygwy
-}
-
-pkg_postinst() {
-	use gnome && gnome2_gconf_install
-	fdo-mime_desktop_database_update
-}
-
-pkg_prerm() {
-	use gnome && gnome2_gconf_uninstall
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/sci-visualization/gwyddion/gwyddion-2.18.ebuild b/sci-visualization/gwyddion/gwyddion-2.25.ebuild
index 9483e71d3f47..e6178c56d035 100644
--- a/sci-visualization/gwyddion/gwyddion-2.18.ebuild
+++ b/sci-visualization/gwyddion/gwyddion-2.25.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/gwyddion/gwyddion-2.18.ebuild,v 1.3 2011/03/02 13:42:52 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gwyddion/gwyddion-2.25.ebuild,v 1.1 2011/07/27 23:24:33 bicatali Exp $
 
 EAPI=2
 
@@ -17,8 +17,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc fftw gnome kde nls opengl perl python ruby sourceview xml X"
 
-RDEPEND="
-	x11-libs/gtk+:2
+RDEPEND="x11-libs/gtk+:2
 	x11-libs/cairo
 	x11-libs/pango
 	x11-libs/libXmu