Upstream tarball has changed, gle-4.2.2-ncurses.patch is no longer needed (bug #300149)

Package-Manager: portage-2.2_rc61/cvs/Linux i686

4 files changed, 10 insertions, 44 deletions

diff --git a/sci-visualization/gle/ChangeLog b/sci-visualization/gle/ChangeLog
index f12027cc478a..1e40db1b997b 100644
--- a/sci-visualization/gle/ChangeLog
+++ b/sci-visualization/gle/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-visualization/gle
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gle/ChangeLog,v 1.9 2010/01/07 17:38:04 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gle/ChangeLog,v 1.10 2010/01/08 15:48:04 grozin Exp $
+
+  08 Jan 2010; Andrey Grozin <grozin@gentoo.org> gle-4.2.2.ebuild,
+  -files/gle-4.2.2-ncurses.patch:
+  Upstream tarball has changed, gle-4.2.2-ncurses.patch is no longer needed
+  (bug #300149)
 
 *gle-4.2.2 (07 Jan 2010)
 
diff --git a/sci-visualization/gle/Manifest b/sci-visualization/gle/Manifest
index a7e4c83f397b..544dac2a03df 100644
--- a/sci-visualization/gle/Manifest
+++ b/sci-visualization/gle/Manifest
@@ -1,22 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 64gle-gentoo.el 161 RMD160 3bb0a12b3db10d0331c272c9386ffc1a3757db58 SHA1 cb2a4da6d13088fe869480efa2ae35c9babe0ea7 SHA256 a14ce47df108c25318471f1ae3ccc6c9984b7e1a2728e16b57cef0a848156a55
-AUX gle-4.2.2-ncurses.patch 892 RMD160 bc742a579c108ba118a95920f6ffebb9d7b41b5f SHA1 aa601835e7631531821cb6156a847aa31753146a SHA256 205f0434d47e2fdce3e8b9db8533af701d4e751a848938a8a31569b81f218eea
 AUX gle-4.2.2-parallel.patch 464 RMD160 61711adb213a073f0f8ff3b02bef39d4ec48e814 SHA1 70f9f5c644629eb20003bd6b39ac4d4da9086a0e SHA256 ac8ecbb9ea3198dfcb57c7cffe22dfbb5fc88f53fa4e68744078fa4f693ed8f0
 DIST GLEusersguide.pdf 2244780 RMD160 6f2b8814f100e3971737ad45d017144e5912fd4e SHA1 2039e6b255da68200b5f881f2554bbdd6e82034a SHA256 02c13fe038f8b4b7726ac3e6a74410e299f50cdccb2b040d7ed1fbc99b9cfbef
 DIST gle-graphics-4.2.1f-src.tar.gz 2044787 RMD160 adcd5c56a04a0ba152340ff86e1bb06b585f36a1 SHA1 bcb451e3dac70be5628bcdfb001d53b25e4fe5cb SHA256 2299076808cdfc1d12f76e428f3fec680eabd44d4f352c93e9544cfda19eb2b5
-DIST gle-graphics-4.2.2f-src.tar.gz 2047324 RMD160 83e9a7d1dc31cb5bc4673a527f676573de5d1545 SHA1 e829f3a5289e87e16e8e5de9ac2339d12c8ac7df SHA256 28a4a2ef29b08d25a8495d779033ded12d1aae9528d4be375d207a74562d9e19
+DIST gle-graphics-4.2.2f-src.tar.gz 2047324 RMD160 018bcc744ad142ad829b3bda5c86b6da2fa709c0 SHA1 038bbda0bd4dfd8bd8da1f628d912f7da8c86676 SHA256 10bdd10b3428726d21641f7b7e792fbf0685bbb12e245ee5f91e0fd19a1af952
 DIST gle-manual-4.2.0.pdf 2529384 RMD160 e24bde8586aa15bf478a5972394261886033fd3d SHA1 699784b0cc6137aee32bba7bcaf34975e6394464 SHA256 646176697850d2e22d58cb99c8f2e806d1b348b1e616939d8a62bfb97a559a20
 DIST gle-manual-4.2.2.pdf 2238766 RMD160 23befacc8b51375ef8832ab39db21c5e497b9cdd SHA1 2b07238a62ca7099648aa9660fd934a88c966a5e SHA256 fbc4ba2613882d2d4ae3f8484c77aa27a257fc1b0ec02a46085c3651a2ace58e
 EBUILD gle-4.2.1.ebuild 2557 RMD160 29f016d4b0a499535c1ee0ef9a294e7d71d3dfbc SHA1 046bd4224dad58c9fb60dc8c954660e23edeaae3 SHA256 97de0947ca7d9e0a1c8de31df0f54664f4e6a6c35721e39afde2935aa6f1bf2f
-EBUILD gle-4.2.2.ebuild 2823 RMD160 d4d4e12df1661a84ff62220fd18a5578d0174765 SHA1 d78ab558d57bb986574a070abbd81339d2937327 SHA256 d02f77265aaaa4a433ff2858cc6601c023a337ad02138ac39ec6d22efb5a5814
-MISC ChangeLog 1990 RMD160 eed9a828276390fc7373ccb673eb8af176476915 SHA1 8f62039a46a9df42cd29e8e997247c387cc9491d SHA256 cdafcdca62115e0e1fabd0d690f24cd0eaa3a496062ffb2728a8c183b0ef96d4
+EBUILD gle-4.2.2.ebuild 2780 RMD160 47e7b767f4b9b74f983af4dc1d89b5188d6b8b27 SHA1 5638b9297f79f9d2ca07a5010a860b6c8614ece7 SHA256 b9c7489a6114dec3d22923f3178e2fbc2cd5c3dd8ac505dc58e246dbd4c677ae
+MISC ChangeLog 2183 RMD160 583275453e05256f3d4249a7703efcb669888ccf SHA1 ad9618271b13a4dca5ab61c6a2afce5f7a035c4f SHA256 fc8fa97482b8f5e71c2028d92e50f39994d1de8a7e6a76ef94b359a3814f80b4
 MISC metadata.xml 515 RMD160 a04a55d1a6c8f1e947200d546e5e8e22be5d144d SHA1 f9a02c835f68b9d91bda0578045e0631084b607b SHA256 a75689c90bb13cf073d34c175453181823b0f6cc9a824baa69bd56e1308d5c95
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAktGJLIACgkQ1ycZbhPLE2Ae0gCfXAe5An6+vudootWlRUYnG10z
-Fl0AoIQ087URVk1KdC8osD6CHb+0TMmn
-=23IM
------END PGP SIGNATURE-----
diff --git a/sci-visualization/gle/files/gle-4.2.2-ncurses.patch b/sci-visualization/gle/files/gle-4.2.2-ncurses.patch
deleted file mode 100644
index e8add0967527..000000000000
--- a/sci-visualization/gle/files/gle-4.2.2-ncurses.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- configure.ac.orig	2010-01-07 04:37:57.000000000 +0000
-+++ configure.ac	2010-01-07 04:42:01.000000000 +0000
-@@ -621,12 +621,12 @@
-    LIBS=$SIMPLE_LIBS
-    LDFLAGS=$SIMPLE_LDFLAGS
- 
--   AC_SEARCH_LIBS(wbkgdset,ncurses curses,
-+   AC_SEARCH_LIBS(wbkgdset,ncurses,
-    [
-       MAKE_MANIP=1
-    ],
--   [],[-ltinfo])
--   AC_SEARCH_LIBS(keypad,tinfo,[],[],[])
-+   [],[-lncurses])
-+   AC_SEARCH_LIBS(keypad,ncurses,[],[],[])
-    AC_CHECK_HEADER([ncurses.h],
-    [
-       HAVE_NCURSES_H=1
-@@ -649,7 +649,7 @@
-    MANIP_LIBS=$LIBS
-    MANIP_LDFLAGS=$LDFLAGS
-    if test "x$with_staticlink" = "xyes"; then
--      MANIP_LIBS="$SIMPLE_LIBS -Wl,-Bstatic -lncurses -ltinfo -lm -Wl,-Bdynamic -ldl"
-+      MANIP_LIBS="$SIMPLE_LIBS -Wl,-Bstatic -lncurses -lm -Wl,-Bdynamic -ldl"
-       #MANIP_LIBS="$SIMPLE_LIBS -Wl,-Bstatic -lncurses -lm -Wl,-Bdynamic -ldl"
-    else
-       MANIP_LIBS="$MANIP_LIBS -lm"
diff --git a/sci-visualization/gle/gle-4.2.2.ebuild b/sci-visualization/gle/gle-4.2.2.ebuild
index d61eafd20ff2..78f5ee73eb56 100644
--- a/sci-visualization/gle/gle-4.2.2.ebuild
+++ b/sci-visualization/gle/gle-4.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gle/gle-4.2.2.ebuild,v 1.1 2010/01/07 17:38:04 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gle/gle-4.2.2.ebuild,v 1.2 2010/01/08 15:48:04 grozin Exp $
 
 EAPI=2
 inherit eutils elisp-common qt4 flag-o-matic autotools
@@ -34,7 +34,6 @@ S="${WORKDIR}"/${MY_P}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-parallel.patch
-	epatch "${FILESDIR}"/${P}-ncurses.patch
 	eaclocal
 	eautoconf
 }