Cleaned old

(Portage version: 2.2.0_alpha67/cvs/Linux x86_64)

4 files changed, 10 insertions, 136 deletions

diff --git a/sci-visualization/gwyddion/gwyddion-2.10.ebuild b/sci-visualization/gwyddion/gwyddion-2.10.ebuild
deleted file mode 100644
index 06558c835caf..000000000000
--- a/sci-visualization/gwyddion/gwyddion-2.10.ebuild
+++ /dev/null
@@ -1,47 +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.10.ebuild,v 1.7 2011/04/05 05:36:05 ulm Exp $
-
-EAPI="1"
-
-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="python perl ruby nls tiff fftw"
-
-RDEPEND="
-	virtual/opengl
-	python? ( dev-lang/python )
-	perl? ( dev-lang/perl )
-	ruby? ( =dev-lang/ruby-1.8* )
-	tiff? ( media-libs/tiff )
-	fftw? ( >=sci-libs/fftw-3 )
-	x11-libs/gtk+:2
-	x11-libs/pango
-	x11-libs/cairo
-	x11-libs/gtkglext"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_compile() {
-	econf \
-		$(use_enable python) \
-		$(use_enable perl) \
-		$(use_enable ruby) \
-		$(use_enable nls) \
-		$(use_with fftw fftw3) \
-		$(use_with tiff) \
-		--disable-pascal \
-		--disable-desktop-file-update \
-		--enable-library-bloat
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-}
diff --git a/sci-visualization/gwyddion/gwyddion-2.24.ebuild b/sci-visualization/gwyddion/gwyddion-2.24.ebuild
deleted file mode 100644
index bc7be1c1fe6e..000000000000
--- a/sci-visualization/gwyddion/gwyddion-2.24.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.24.ebuild,v 1.1 2011/05/03 05:40:15 bicatali 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.25.ebuild b/sci-visualization/gwyddion/gwyddion-2.25.ebuild
index a023763bd57b..9e5d9c29d8eb 100644
--- a/sci-visualization/gwyddion/gwyddion-2.25.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.25.ebuild,v 1.5 2011/10/15 23:09:53 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gwyddion/gwyddion-2.25.ebuild,v 1.6 2011/10/17 15:08:06 jlec Exp $
 
 EAPI=2
 
@@ -17,11 +17,12 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="doc fftw gnome kde nls opengl perl python ruby sourceview xml X"
 
-RDEPEND="x11-libs/gtk+:2
+RDEPEND="
+	media-libs/libpng
 	x11-libs/cairo
-	x11-libs/pango
+	x11-libs/gtk+:2
 	x11-libs/libXmu
-	media-libs/libpng
+	x11-libs/pango
 	fftw? ( >=sci-libs/fftw-3 )
 	gnome? ( gnome-base/gconf:2 )
 	kde? ( >=kde-base/kdelibs-4 )
diff --git a/sci-visualization/gwyddion/metadata.xml b/sci-visualization/gwyddion/metadata.xml
index 7f50b5273a31..6c5e0e08ed66 100644
--- a/sci-visualization/gwyddion/metadata.xml
+++ b/sci-visualization/gwyddion/metadata.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<longdescription lang="en">
+	<herd>sci</herd>
+	<longdescription lang="en">
   Gwyddion is a modular program for SPM data analysis. Primarily it is
   supposed to be used for analysis of height fields obtained by means of
   scanning probe microscopy techniques (AFM, MFM, STM, NSOM), but
   generally it can be used for any other height field analysis or
   image analysis.
 </longdescription>
-<use>
-  <flag name="sourceview">
+	<use>
+		<flag name="sourceview">
     Enable support for <pkg>x11-libs/gtksourceview</pkg>
   </flag>
-</use>
+	</use>
 </pkgmetadata>