Version bump

(Portage version: 2.1.10.7/cvs/Linux x86_64)

4 files changed, 9 insertions, 169 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/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