Cleaned old

Package-Manager: portage-2.2.0_alpha67/cvs/Linux x86_64

5 files changed, 17 insertions, 147 deletions

diff --git a/sci-visualization/gwyddion/Manifest b/sci-visualization/gwyddion/Manifest
index e8c9da3d2dae..f5c1d93e751e 100644
--- a/sci-visualization/gwyddion/Manifest
+++ b/sci-visualization/gwyddion/Manifest
@@ -1,19 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX gwyddion-2.25-libpng15.patch 158 RMD160 a924a52875702240659b66e9187d08474043a077 SHA1 14978af51d53324f790c5f5be37ddb540d43836f SHA256 e039b79411177aeb4be582888503536984fc08d81f8d1d135298c3605b32e2ad
-DIST gwyddion-2.10.tar.bz2 2425036 RMD160 a4c32fefe9c31c1aee9169cad6399f25ec3bbff6 SHA1 186d0cc03edefd807b33efdbb6d59cc7f98fdad6 SHA256 90bde6f10e38c563886251984c60d32155119601e400f97a0cd59b7378a740eb
-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.24.ebuild 1902 RMD160 05ee2fd611c66818ac1a25707ad22e35172ed325 SHA1 c31e5c7d789e0540b9a4859d712d1a4e91f2032e SHA256 b59038b2a4dda5f4eeda922683499735eeb454ea480f62d21ed5ea0a803a2ffc
-EBUILD gwyddion-2.25.ebuild 1983 RMD160 0fd3b5bb331f4f4d6ff239e8abff793e7ff70e66 SHA1 48530709510e8accace28876ab6db93302547bd3 SHA256 c2e18511258c18058e1eecc8938a7c14a7656a2c319799bdac3a74f86c65bf42
+EBUILD gwyddion-2.25.ebuild 1983 RMD160 3b4519b0ceeba804b212fb1072daf09640978acc SHA1 3fd5529809d3baaf2efed98b39cb6501296e5355 SHA256 6860686528713551983526b5d2a5b5518f9d4b052d0d14a391e4f9df656f8fc3
 MISC ChangeLog 5295 RMD160 655f808187457161baacc8c2266e295e68aaf900 SHA1 95d33f94ea26b82b87dbd7d96238e84cb4f7bb52 SHA256 b38b57afea94881e75a4102d96894c024245d5f3307062ba86b8b408fbc6b258
-MISC metadata.xml 604 RMD160 a62411f2a25b2b5521774028b31a48ad6ddc0ef3 SHA1 c4f9e2daa43b4fc26ad7a3cafc06adf78ee5afe6 SHA256 4b4b3d9287a63a11d4ad1078020ad190589da530e743ed78952e6b91caec392f
+MISC metadata.xml 608 RMD160 8c869829fd3cb7e8fb09bf499f9e965d08d87cf3 SHA1 757edde079d71193b521ca0801af5162944f9a0c SHA256 ac04512448ba0083d06c9d570b989edfcfec59c6d1477ebfc1e7dc35e9a6158e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6aEwcACgkQkKaRLQcq0GLIGgCgshlS+XL5l6eGryRXRSzQ65zH
-kHMAoJzIi3gg48UOmIrIEnx6eX+mKGJt
-=Gmac
+iEYEAREKAAYFAk6cRNwACgkQgAnW8HDreRa1lwCeKtW39jwkKDhguGslnGFV3nR9
+Q4sAnjrdoJ828B31i63VSlSgQCQJiEzB
+=czKt
 -----END PGP SIGNATURE-----
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>