7 files changed, 29 insertions, 69 deletions
diff --git a/sci-visualization/gwyddion/ChangeLog b/sci-visualization/gwyddion/ChangeLog
index d21506845600..d4b2aceefaf9 100644
--- a/sci-visualization/gwyddion/ChangeLog
+++ b/sci-visualization/gwyddion/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-visualization/gwyddion
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gwyddion/ChangeLog,v 1.6 2006/12/27 16:32:00 cryos Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gwyddion/ChangeLog,v 1.7 2007/04/08 20:14:58 cryos Exp $
+
+*gwyddion-2.5 (08 Apr 2007)
+
+  08 Apr 2007; Marcus D. Hanwell <cryos@gentoo.org> -gwyddion-1.16.ebuild,
+  -gwyddion-2.0.ebuild, +gwyddion-2.5.ebuild:
+  Version bump, closes bug 170318.
 
 *gwyddion-2.2 (27 Dec 2006)
 
diff --git a/sci-visualization/gwyddion/Manifest b/sci-visualization/gwyddion/Manifest
index 200a02ede976..0b1cbda39972 100644
--- a/sci-visualization/gwyddion/Manifest
+++ b/sci-visualization/gwyddion/Manifest
@@ -1,42 +1,34 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST gwyddion-1.16.tar.bz2 1551340 RMD160 1293d1199360b3d0258d240de2ec9ac1c7a23d78 SHA1 3c7c6f87c358263c6367f9a4cc31e126549d2666 SHA256 bb82ebdb4dad0f52e7b5c246587f89110e04e624d179a13aab59cd7f581c9de0
-DIST gwyddion-2.0.tar.bz2 2132755 RMD160 eeb6e2d99956a10e198fdfc95f27681a5f2d8029 SHA1 0876c940396f8001ce159f2309dd5686443a8fa8 SHA256 5741156141ec27729f21b7a35b049e025c4219b6e5533a80dfbbc20069e1c0a9
 DIST gwyddion-2.2.tar.bz2 2016874 RMD160 e91d1c086aeae91b2f131f400e18ae265ce39820 SHA1 3b7d821d5709048d53a5852a48186d57e5251984 SHA256 9ff1db8c8093ac80e432cf83b2493af4544e0f9f63faa1cddbb0c4ffe1e7421e
-EBUILD gwyddion-1.16.ebuild 930 RMD160 f35aa527890e56619b20a8c71a47994ff1239efd SHA1 ec2ff9a517f79c5dc539c212c5d9ffe9e7b587a4 SHA256 988acfbfc2d6f73118792e6ebe5279b1ef115e81699fc7bdef71344b451a9e88
-MD5 3682f4d6bb188ed9d862ff0d62a2ef29 gwyddion-1.16.ebuild 930
-RMD160 f35aa527890e56619b20a8c71a47994ff1239efd gwyddion-1.16.ebuild 930
-SHA256 988acfbfc2d6f73118792e6ebe5279b1ef115e81699fc7bdef71344b451a9e88 gwyddion-1.16.ebuild 930
-EBUILD gwyddion-2.0.ebuild 929 RMD160 a1a49bd254e420d4f99ae7108f8d0010f6c2bbdd SHA1 ea0a3d9fa8497d76e4187baf17a11d992b3645f7 SHA256 7d6a453671a5ce3518ae8c260fa89ce7f701d82248f6143392d5ac758282640d
-MD5 60155310e9eecedf16ba3a12c1742b64 gwyddion-2.0.ebuild 929
-RMD160 a1a49bd254e420d4f99ae7108f8d0010f6c2bbdd gwyddion-2.0.ebuild 929
-SHA256 7d6a453671a5ce3518ae8c260fa89ce7f701d82248f6143392d5ac758282640d gwyddion-2.0.ebuild 929
+DIST gwyddion-2.5.tar.bz2 2085657 RMD160 8be42bb051997f15e8c4c86c59742059783102ba SHA1 c575797512afbcc00590d0253ae904500343e364 SHA256 22c9f616a44e0328d577e506aef81d90b20b9838a6ffc4bc880d0784d3283ae1
 EBUILD gwyddion-2.2.ebuild 929 RMD160 500b45526c12ea028f7326ec52d4c45d0d1f04f3 SHA1 e6184c4be44bd72bea0d90458a01b065054acb7e SHA256 19c9bcff933a7ac9a91441b4688848b0b13c18831ba7306ea8564b493417ca32
 MD5 954b0bb2d9da8dd4460c68955c80b305 gwyddion-2.2.ebuild 929
 RMD160 500b45526c12ea028f7326ec52d4c45d0d1f04f3 gwyddion-2.2.ebuild 929
 SHA256 19c9bcff933a7ac9a91441b4688848b0b13c18831ba7306ea8564b493417ca32 gwyddion-2.2.ebuild 929
-MISC ChangeLog 1527 RMD160 81282a9bb311815de387dc332d047ce351678219 SHA1 c5ebde35d5c78b235f60a993ba5b02e459da9a96 SHA256 d77196db937d3bfbc2b8c993ab8e7964622ca21fc2fa7ccfaccb5f7a4805fcda
-MD5 38caf1c1c70eebb9a1be70e99d816b58 ChangeLog 1527
-RMD160 81282a9bb311815de387dc332d047ce351678219 ChangeLog 1527
-SHA256 d77196db937d3bfbc2b8c993ab8e7964622ca21fc2fa7ccfaccb5f7a4805fcda ChangeLog 1527
+EBUILD gwyddion-2.5.ebuild 929 RMD160 4b256b1c719fdfe5ee94c02bebc1e70576f14bbc SHA1 9603ee3bdcb89bd11de791c474140ff66f4c8773 SHA256 ef84c7e16d99d67b9fd807d996f4906781ce697dc778c8174c8f8a20f6e2f3e9
+MD5 50dcafb5f0f488e2dbfb120d20e870f0 gwyddion-2.5.ebuild 929
+RMD160 4b256b1c719fdfe5ee94c02bebc1e70576f14bbc gwyddion-2.5.ebuild 929
+SHA256 ef84c7e16d99d67b9fd807d996f4906781ce697dc778c8174c8f8a20f6e2f3e9 gwyddion-2.5.ebuild 929
+MISC ChangeLog 1713 RMD160 97dc6ae87ec0696a375655aa12cc70733bd85e7c SHA1 7d34674fe2ababde8f6501cd52e8dfde1defe435 SHA256 5ce16f12a0b95419bc62a687e458b6eb26cc76756bd20fe8ec55cd19f6a93b45
+MD5 1e14bad9d7b1c8a2cc065860e3acb7df ChangeLog 1713
+RMD160 97dc6ae87ec0696a375655aa12cc70733bd85e7c ChangeLog 1713
+SHA256 5ce16f12a0b95419bc62a687e458b6eb26cc76756bd20fe8ec55cd19f6a93b45 ChangeLog 1713
 MISC metadata.xml 557 RMD160 275cbb6542e6af1d71e051c87c8080e2ade0a3a9 SHA1 325d6404aa11a93a377402e42a156edde187183b SHA256 baf6898f6825a6a2ef6bd47265f8c34b52f5b3a5c48e10c8f995e20a729f9259
 MD5 8b540c5fcae8b4718136d43ae501f9fd metadata.xml 557
 RMD160 275cbb6542e6af1d71e051c87c8080e2ade0a3a9 metadata.xml 557
 SHA256 baf6898f6825a6a2ef6bd47265f8c34b52f5b3a5c48e10c8f995e20a729f9259 metadata.xml 557
-MD5 4f7349c86b7780116c98423f5cf7c081 files/digest-gwyddion-1.16 247
-RMD160 9ea5d5528db9eb6209976c67e17ece37c00c0e1d files/digest-gwyddion-1.16 247
-SHA256 785c004799dd88190a21718e8087c9764720deb493c8f9588460a26152d6bb48 files/digest-gwyddion-1.16 247
-MD5 b8640c4eee0aebf5185a3aa64296f282 files/digest-gwyddion-2.0 244
-RMD160 092ff5501b3523bbb6aba3933b82b4153eba7f83 files/digest-gwyddion-2.0 244
-SHA256 267d38a96c90dfe5e85edffac30fc847c89cefd10903219f075281273a5c3be0 files/digest-gwyddion-2.0 244
 MD5 718f3949a9796a9dc3a0506845dc3c54 files/digest-gwyddion-2.2 244
 RMD160 f16d4f9bd7bcdf7280aec0ccdb8241f3d4949e3e files/digest-gwyddion-2.2 244
 SHA256 bc7050946c68bbf7a37d52a86eec339018dd8e4950743ea512f17f979090982c files/digest-gwyddion-2.2 244
+MD5 7ae6d3d7dddc7caea1d93d23750bf21a files/digest-gwyddion-2.5 244
+RMD160 edb528ccca548db236cedca5959ab094d8f60b53 files/digest-gwyddion-2.5 244
+SHA256 9a2265396212414b11281a2d711d7042b5b28b30f4cbac1a913d127f45f2873e files/digest-gwyddion-2.5 244
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFFkqALntT9W3vfTuoRAnvcAKCkg9wxgRY5XVk9jBx56JJJenWiiACgr0wy
-neMfo9FoG4+s2YD4bxoXYOg=
-=ZfOX
+iD8DBQFGGU1HntT9W3vfTuoRApNTAJwNPSiFU8eARoJqxyv9RbkN6Fu0sACdE8li
+0lkUK7IiW3r3I360gm/zh5o=
+=MqSz
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/gwyddion/files/digest-gwyddion-1.16 b/sci-visualization/gwyddion/files/digest-gwyddion-1.16
deleted file mode 100644
index 46c22ec95694..000000000000
--- a/sci-visualization/gwyddion/files/digest-gwyddion-1.16
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c8f8edf23d599d5464040ee572726946 gwyddion-1.16.tar.bz2 1551340
-RMD160 1293d1199360b3d0258d240de2ec9ac1c7a23d78 gwyddion-1.16.tar.bz2 1551340
-SHA256 bb82ebdb4dad0f52e7b5c246587f89110e04e624d179a13aab59cd7f581c9de0 gwyddion-1.16.tar.bz2 1551340
diff --git a/sci-visualization/gwyddion/files/digest-gwyddion-2.0 b/sci-visualization/gwyddion/files/digest-gwyddion-2.0
deleted file mode 100644
index d2f27361f2a8..000000000000
--- a/sci-visualization/gwyddion/files/digest-gwyddion-2.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 eb944ddac1413c2eb4cef8e9a0f624a9 gwyddion-2.0.tar.bz2 2132755
-RMD160 eeb6e2d99956a10e198fdfc95f27681a5f2d8029 gwyddion-2.0.tar.bz2 2132755
-SHA256 5741156141ec27729f21b7a35b049e025c4219b6e5533a80dfbbc20069e1c0a9 gwyddion-2.0.tar.bz2 2132755
diff --git a/sci-visualization/gwyddion/files/digest-gwyddion-2.5 b/sci-visualization/gwyddion/files/digest-gwyddion-2.5
new file mode 100644
index 000000000000..5cdcad7ea4c2
--- /dev/null
+++ b/sci-visualization/gwyddion/files/digest-gwyddion-2.5
@@ -0,0 +1,3 @@
+MD5 fe2befbac527d54a2b5bad36800321a7 gwyddion-2.5.tar.bz2 2085657
+RMD160 8be42bb051997f15e8c4c86c59742059783102ba gwyddion-2.5.tar.bz2 2085657
+SHA256 22c9f616a44e0328d577e506aef81d90b20b9838a6ffc4bc880d0784d3283ae1 gwyddion-2.5.tar.bz2 2085657
diff --git a/sci-visualization/gwyddion/gwyddion-1.16.ebuild b/sci-visualization/gwyddion/gwyddion-1.16.ebuild
deleted file mode 100644
index 23e4fedac73a..000000000000
--- a/sci-visualization/gwyddion/gwyddion-1.16.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gwyddion/gwyddion-1.16.ebuild,v 1.1 2006/07/15 22:06:48 cryos Exp $
-
-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"
-
-DEPEND="virtual/opengl
-	python? ( virtual/python )
-	perl? ( dev-lang/perl )
-	ruby? ( virtual/ruby )
-	>=x11-libs/gtk+-2.6
-	x11-libs/gtkglext"
-
-src_compile() {
-	econf \
-		$(use_enable python) \
-		$(use_enable perl) \
-		$(use_enable ruby) \
-		$(use_enable nls) \
-		--disable-desktop-file-update \
-		|| die "econf failed."
-	emake || die "emake failed."
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed."
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-}
diff --git a/sci-visualization/gwyddion/gwyddion-2.0.ebuild b/sci-visualization/gwyddion/gwyddion-2.5.ebuild
index dbc7bc1f183a..97bf9eb5293d 100644
--- a/sci-visualization/gwyddion/gwyddion-2.0.ebuild
+++ b/sci-visualization/gwyddion/gwyddion-2.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gwyddion/gwyddion-2.0.ebuild,v 1.1 2006/11/01 09:51:06 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gwyddion/gwyddion-2.5.ebuild,v 1.1 2007/04/08 20:14:58 cryos Exp $
 
 DESCRIPTION="A software framework for SPM data analysis"
 HOMEPAGE="http://gwyddion.net/"