Reverted changes to kst patch as 1.1.1 also failed to link on amd64 due to netcdf.

Package-Manager: portage-2.0.53_rc7

3 files changed, 28 insertions, 19 deletions

diff --git a/media-gfx/kst/ChangeLog b/media-gfx/kst/ChangeLog
index 30d3fbfadfd2..ada6c8548bc7 100644
--- a/media-gfx/kst/ChangeLog
+++ b/media-gfx/kst/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/kst
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/kst/ChangeLog,v 1.11 2005/11/10 17:20:23 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kst/ChangeLog,v 1.12 2005/11/15 11:10:54 cryos Exp $
+
+  15 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kst-1.1.1.ebuild:
+  Reverted changes to kst patch as 1.1.1 also failed to link on amd64 due to
+  netcdf.
 
 *kst-1.1.1 (10 Nov 2005)
 
diff --git a/media-gfx/kst/Manifest b/media-gfx/kst/Manifest
index 6cbfcbef6e82..4f3e2c0703fc 100644
--- a/media-gfx/kst/Manifest
+++ b/media-gfx/kst/Manifest
@@ -1,11 +1,21 @@
-MD5 27834100f5137f06a3001217f76e74fa kst-0.97.ebuild 479
-MD5 862e7941cb21c9dd10e8bd6183f21fb0 metadata.xml 173
-MD5 3b3b65d1b21462de3bf689404bbec3b1 kst-1.1.1.ebuild 678
-MD5 d491b040118d49799d7c3aba416f8f06 ChangeLog 2765
-MD5 441ad79778d2e3a21a44dd85f7be64da kst-1.1.0.ebuild 540
-MD5 5d6b71a99a2af171fbb39416e1816f9d kst-1.1.0-r1.ebuild 692
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 cc230ff78650cedc0521a4df3f873db8 ChangeLog 2922
 MD5 19eccdaf16ff3e3301ad96c85fd3417b files/digest-kst-0.97 61
-MD5 4c04a9b00cd2b78b80a7b38eb3d4574a files/digest-kst-1.1.1 62
 MD5 b3c3b4529c7a84a69be4e52b98c71a53 files/digest-kst-1.1.0 63
-MD5 7d7826a4f8fadf0c3c8627577a4f55a9 files/kst-1.1.0-netcdf-fix.patch 2939
 MD5 b3c3b4529c7a84a69be4e52b98c71a53 files/digest-kst-1.1.0-r1 63
+MD5 4c04a9b00cd2b78b80a7b38eb3d4574a files/digest-kst-1.1.1 62
+MD5 7d7826a4f8fadf0c3c8627577a4f55a9 files/kst-1.1.0-netcdf-fix.patch 2939
+MD5 27834100f5137f06a3001217f76e74fa kst-0.97.ebuild 479
+MD5 5d6b71a99a2af171fbb39416e1816f9d kst-1.1.0-r1.ebuild 692
+MD5 441ad79778d2e3a21a44dd85f7be64da kst-1.1.0.ebuild 540
+MD5 d1127db7a7ca1c477d1a87642e89bb6f kst-1.1.1.ebuild 623
+MD5 862e7941cb21c9dd10e8bd6183f21fb0 metadata.xml 173
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDecJKntT9W3vfTuoRAtgCAJ4xGy6rdFJjY0U+NAcZlQg5dQnh4gCePiJw
+Bhbc1ACMwBXN+jW3RmJrIrI=
+=BztN
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/kst/kst-1.1.1.ebuild b/media-gfx/kst/kst-1.1.1.ebuild
index 4e713d76ffbd..2b95d87719f4 100644
--- a/media-gfx/kst/kst-1.1.1.ebuild
+++ b/media-gfx/kst/kst-1.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/kst/kst-1.1.1.ebuild,v 1.1 2005/11/10 17:20:23 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kst/kst-1.1.1.ebuild,v 1.2 2005/11/15 11:10:54 cryos Exp $
 
 inherit kde
 
@@ -17,15 +17,10 @@ DEPEND="sci-libs/gsl"
 
 need-kde 3.1
 
+PATCHES="${FILESDIR}/${PN}-1.1.0-netcdf-fix.patch"
+
 src_unpack(){
 	kde_src_unpack
-
-	epatch "${FILESDIR}/kst-1.1.0-netcdf-fix.patch"
-	make -f admin/Makefile.common || die
-}
-
-src_compile() {
-	local myconf="--disable-netcdf"
-
-	kde_src_compile
+	rm -f configure
+	autoconf || die "autoconf failed"
 }