[sci-chemistry/wxmacmolplt] Version bump

(Portage version: 2.2.0_alpha7_p1/cvs/Linux x86_64)

5 files changed, 25 insertions, 72 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/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() {