[sci-chemistry/wxmacmolplt] Version bump

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

6 files changed, 44 insertions, 84 deletions

diff --git a/sci-chemistry/wxmacmolplt/ChangeLog b/sci-chemistry/wxmacmolplt/ChangeLog
index 6755210f910f..0ad6cd077253 100644
--- a/sci-chemistry/wxmacmolplt/ChangeLog
+++ b/sci-chemistry/wxmacmolplt/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-chemistry/wxmacmolplt
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/wxmacmolplt/ChangeLog,v 1.8 2010/06/25 17:34:27 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/wxmacmolplt/ChangeLog,v 1.9 2010/12/06 16:45:00 alexxy Exp $
+
+*wxmacmolplt-7.4.2 (06 Dec 2010)
+
+  06 Dec 2010; Alexey Shvetsov <alexxy@gentoo.org> -wxmacmolplt-7.4-r1.ebuild,
+  +wxmacmolplt-7.4.2.ebuild, +files/wxmacmolplt-7.4.2-glew.patch,
+  -files/wxmacmolplt-7.4-flash.patch, -files/wxmacmolplt-7.4-glew.patch:
+  Version bump
 
   25 Jun 2010; Kacper Kowalik <xarthisius@gentoo.org>
   wxmacmolplt-7.4-r1.ebuild:
diff --git a/sci-chemistry/wxmacmolplt/Manifest b/sci-chemistry/wxmacmolplt/Manifest
index d692185f4131..e68c5c82c532 100644
--- a/sci-chemistry/wxmacmolplt/Manifest
+++ b/sci-chemistry/wxmacmolplt/Manifest
@@ -1,18 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX wxmacmolplt-7.4-flash.patch 649 RMD160 32480a5728cd9ca6c0fa65dc125430c14327ae09 SHA1 e1745ea0c6922ffb8426193f7300c2e7e6efbfd5 SHA256 60d3621e9dd680fe1e0d577e31b17694024b63bbdfb7f7dbd7cb1c1b760446e6
-AUX wxmacmolplt-7.4-glew.patch 1245 RMD160 2adba65f93d01365ee948c60bdc406d4bafda551 SHA1 8f20a90c80f0bb398409bc76e4d659ded60ea844 SHA256 9c7689fee8e680e585df377b07ff9f239f4f0443584302ed0cbee7eab541fcb1
-DIST wxmacmolplt-7.4.tar.gz 1824207 RMD160 87252b23a09e6807311783a84f55848f6286cc21 SHA1 5707e672a37cef5c9e935bf4dc065350c1f5f9af SHA256 add57ac8a5de7c1f80b32287c2c3ced094719edb4697c9e628f3b005788a0d40
-EBUILD wxmacmolplt-7.4-r1.ebuild 1139 RMD160 54d83b82918e722d28793059721e7d117a139cc5 SHA1 820398b7cf5a7d50a7660f80fe3f9583f6c498ad SHA256 238daca9abb4759613825e8630da2dfae136702eb3e710e8b0aeabc21566613e
-MISC ChangeLog 1731 RMD160 5b7113084701f07e06fb30d02d6767bc70a34df8 SHA1 5679a9ae5108e631bbd23def2611ff51cb315957 SHA256 10ed7debc12a235ddcef9b069bd90ca63d9fb856e6c90b48d21067c9c8f481e2
+AUX wxmacmolplt-7.4.2-glew.patch 415 RMD160 f603b2d85ccb00d30b3a999883107728cd9f955c SHA1 111fb61d7fd267f1a97adc1912507d4e1cb2ab38 SHA256 3c9f186bcc26a8ad055303be34d407d842b2ca51fec604989af11c1c560c068e
+DIST wxmacmolplt-7.4.2.tar.gz 1860528 RMD160 51b145b0a803d2096d446f46400f3e2709e6cd3f SHA1 d3409fe06d3b523ba795d16994b322ae5e64c5d3 SHA256 0e17295c8082af353311d3d13600bdda20d337d82f5ff8da1be8c2223bb54f76
+EBUILD wxmacmolplt-7.4.2.ebuild 1115 RMD160 f48da7f21d545bcf986dd9d62a3b529938d9a307 SHA1 f116a9bb0a17e246b7e86144bc6a986aa109e9f0 SHA256 c35cda3ee97eef15fe714d458f490426c02e03211357b9703b76d207d79ea384
+MISC ChangeLog 1995 RMD160 bfc271bb94621b8521bbb1cd68c09c925a9e7f08 SHA1 4c7b381debd981d332bb427d06cacb7f794d2bb3 SHA256 132fd83af54b2aa878c585e12c2ad22348b8f6c93ceb2de681ee81158a768f33
 MISC metadata.xml 641 RMD160 b5028617e4513c47302f8df91ee308b4fa7168a1 SHA1 fb6f03b5c5915fe3aab1a1090422857e9db4191d SHA256 388eee0801d6959353a9f4739b916085a3df57fe365a91d61fc28bf27316d4f0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iJwEAQECAAYFAkwk6LAACgkQIiMqcbOVdxT3rwP/Z2V4q1kM/kIWq7ZyB+kOrhmx
-Kqc6gJ+XgaAm/E+5OPhv4Ii1bw2wrfFmEAq8GUaGqU6I4tvaouWHcXkTtk32NYbK
-0T2wO2fiycCEIexXiLV1Ijp1Y7GbArNu6scw5H3E9Ubd5MPp51qap4myqFTIYj4H
-EEuxkWqOXFFHwS6IxSo=
-=lIXa
+iQIcBAEBCAAGBQJM/RJmAAoJEOf+E+/4L5LmqtMQAJAqqa7aS0iZxbikHdtc8Uf7
+RdefUA7OxyGUDNNxxirYJk+lpBRjwVHFmbusMGmh/90acNwUOtG4H2J6G2jStRKq
+K2DUspE21T0iO7ZrFjEFzvL2QDQPQozT1aPc7Ty8t8/ePUmVClvJIw9PpttNuvG4
+oU5qt3whDQB4FTldjVeR9NFkvpQKuo7f2ZaMj0JX/jQ0KeDvhKTArZL4z4oIqr+I
+3xr9KL67CMzjL7Zy8zxX3INIV9NlJRd3y2orQ3ZeuO+v5TYrqNs1gNRWAEDrt+4P
+SvtGSUFPj/UkAQhk1RODkY9i7xW42N7jYzSwP5/QIY8/RVMyi94lHZF+Hd3XTsVk
+8TQp2NEjN4MmzEcLN8uAoy5Ph1XQmikcg4/OZIeXVg9cj5pXsmyIYseR3M3C+k7/
+P6aRsIKAh6DpDrhbOSGzw22Jntd6ILoC3Ads2IHgl/vplq3jELmz6L57GO79fny0
+dUszLLhrvBcxq6VIRaUmLW3o5VE3KBQzkB0WsKqMcPOxbG366zmLoKVI0QFRz84v
+CYy41xo6T7VoYK49WJS71YPNL+Tj1X1GE3gbm99EfImS6AD2rl55vFOGAh9iKWxO
+39zpy8uQPGAYE6ZeXM9r2q6MK/N4MYRRQp56ugrYWFQ0g5OQLn2cAO2P41qmh3tn
+RJspIRKSwstZHRDz1sAh
+=DNw9
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/wxmacmolplt/files/wxmacmolplt-7.4-flash.patch b/sci-chemistry/wxmacmolplt/files/wxmacmolplt-7.4-flash.patch
deleted file mode 100644
index 954a47fb4fd9..000000000000
--- a/sci-chemistry/wxmacmolplt/files/wxmacmolplt-7.4-flash.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- src/swfexport.cpp.orig	2008-12-09 03:29:53.000000000 +0100
-+++ src/swfexport.cpp	2010-06-25 14:29:41.788052169 +0200
-@@ -204,11 +204,11 @@
- 		movie->nextFrame();
- 		movie->remove(di);
- 		movie->remove(textDI);
--		delete di;
--		delete textDI;
-+		//delete di;
-+		//delete textDI;
- 		if(includeEP) {
- 			movie->remove(di2);
--			delete di2;
-+		//	delete di2;
- 		}
- 	}
- 
-@@ -366,8 +366,8 @@
- 		movie->nextFrame();
- 		movie->remove(di);
- 		movie->remove(textDI);
--		delete di;
--		delete textDI;
-+		//delete di;
-+		//delete textDI;
- 
- 		for (iatm=0; iatm<(lFrame->NumAtoms); iatm++) {
- 			lAtoms[iatm].Position.x += offsetFactor * (ModeOffset[iatm].x);
\ No newline at end of file
diff --git a/sci-chemistry/wxmacmolplt/files/wxmacmolplt-7.4-glew.patch b/sci-chemistry/wxmacmolplt/files/wxmacmolplt-7.4-glew.patch
deleted file mode 100644
index 95ae3da3eed4..000000000000
--- a/sci-chemistry/wxmacmolplt/files/wxmacmolplt-7.4-glew.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 5e88d06..311abfe 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,7 +20,7 @@ case "${host}" in
-       ;;
-    *)
-       HOST=LINUX
--      LIBGL="-lGL -lGLU"
-+      LIBGL=`pkg-config --libs glu glew`
-       ;;
- esac
- AM_CONDITIONAL(HOST_IS_MSW, [test "x$HOST" == xMSW])
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 4d47ea3..3cb6614 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -24,8 +24,6 @@ wxmacmolplt_SOURCES =                                  \
-     frequenciesdialog.cpp      frequenciesdialog.h     \
-     GaussHermite.cpp           GaussHermite.h          \
-     Geometries.cpp             Geometries.h            \
--    glew.cpp                   glew.h                  \
--	 glxew.h                    wglew.h                 \
-     glf.cpp                    glf.h                   \
-                                GlobalExceptions.h      \
-                                Globals.h               \
-diff --git a/src/mmp_gl.h b/src/mmp_gl.h
-index daa1eb7..1345b90 100644
---- a/src/mmp_gl.h
-+++ b/src/mmp_gl.h
-@@ -1,7 +1,7 @@
- #ifndef MMP_GL_H
- #define MMP_GL_H
- 
--#include "glew.h"
-+#include <GL/glew.h>
- #include <wx/wx.h>
- #include <wx/glcanvas.h>
- #include <string>
diff --git a/sci-chemistry/wxmacmolplt/files/wxmacmolplt-7.4.2-glew.patch b/sci-chemistry/wxmacmolplt/files/wxmacmolplt-7.4.2-glew.patch
new file mode 100644
index 000000000000..08986db5bff2
--- /dev/null
+++ b/sci-chemistry/wxmacmolplt/files/wxmacmolplt-7.4.2-glew.patch
@@ -0,0 +1,12 @@
+diff -urN wxmacmolplt-7.4.2.orig/configure.ac wxmacmolplt-7.4.2/configure.ac
+--- wxmacmolplt-7.4.2.orig/configure.ac	2010-12-05 02:48:29.000000000 +0300
++++ wxmacmolplt-7.4.2/configure.ac	2010-12-06 19:30:24.000000000 +0300
+@@ -20,7 +20,7 @@
+       ;;
+    *)
+       HOST=LINUX
+-      LIBGL="-lGL -lGLU"
++      LIBGL=`pkg-config --libs glu glew`
+       ;;
+ esac
+ AM_CONDITIONAL(HOST_IS_MSW, [test "x$HOST" == xMSW])
diff --git a/sci-chemistry/wxmacmolplt/wxmacmolplt-7.4-r1.ebuild b/sci-chemistry/wxmacmolplt/wxmacmolplt-7.4.2.ebuild
index 386ce4ecf3e5..07083d7552fd 100644
--- a/sci-chemistry/wxmacmolplt/wxmacmolplt-7.4-r1.ebuild
+++ b/sci-chemistry/wxmacmolplt/wxmacmolplt-7.4.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/wxmacmolplt/wxmacmolplt-7.4-r1.ebuild,v 1.2 2010/06/25 17:34:27 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/wxmacmolplt/wxmacmolplt-7.4.2.ebuild,v 1.1 2010/12/06 16:45:00 alexxy Exp $
 
-EAPI="2"
+EAPI="3"
 WX_GTK_VER=2.8
 
 inherit base eutils autotools wxwidgets
@@ -26,14 +26,15 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-glew.patch
-	epatch "${FILESDIR}"/${P}-flash.patch
 	sed -i -e "/^dist_doc_DATA/d" Makefile.am \
 		|| die "Failed to disable installation of LICENSE file"
 	eautoreconf
 }
 
 src_configure() {
-	econf $(use_with flash ming)
+	econf \
+		--with-glew \
+		$(use_with flash ming)
 }
 
 src_install() {