Removed old, fixes for gl handling and flash support

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

7 files changed, 95 insertions, 92 deletions

diff --git a/sci-chemistry/wxmacmolplt/ChangeLog b/sci-chemistry/wxmacmolplt/ChangeLog
index 34f74256cd24..f1a9b9d70e51 100644
--- a/sci-chemistry/wxmacmolplt/ChangeLog
+++ b/sci-chemistry/wxmacmolplt/ChangeLog
@@ -1,6 +1,14 @@
 # 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.6 2010/06/25 09:57:43 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/wxmacmolplt/ChangeLog,v 1.7 2010/06/25 17:21:42 jlec Exp $
+
+*wxmacmolplt-7.4-r1 (25 Jun 2010)
+
+  25 Jun 2010; Justin Lecher <jlec@gentoo.org> -wxmacmolplt-7.3.ebuild,
+  -wxmacmolplt-7.3-r1.ebuild, -wxmacmolplt-7.4.ebuild,
+  +wxmacmolplt-7.4-r1.ebuild, +files/wxmacmolplt-7.4-flash.patch,
+  +files/wxmacmolplt-7.4-glew.patch:
+  Removed old, fixes for gl handling and flash support
 
   25 Jun 2010; Justin Lecher <jlec@gentoo.org> wxmacmolplt-7.4.ebuild:
   Restrict ming to <0.4
diff --git a/sci-chemistry/wxmacmolplt/Manifest b/sci-chemistry/wxmacmolplt/Manifest
index 892c632ae1c9..3fc891350eea 100644
--- a/sci-chemistry/wxmacmolplt/Manifest
+++ b/sci-chemistry/wxmacmolplt/Manifest
@@ -1,17 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST wxmacmolplt-7.3.tar.gz 1814874 RMD160 3d8bf1979da8564dd46db7c082100390c394d92e SHA1 8ec07110806892e87ec7ce5a3b91810ad3a45bed SHA256 bc93c02947132c39597fda666dbdb08ec6a8e0752f63e7e1989ca538054f18c0
+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.3-r1.ebuild 988 RMD160 9c72b26da87766afbbdd138824d9f40d0b35240b SHA1 297419582b8bc1323a69944d23011bedf564eddf SHA256 1353e8ab6ea2d3f0313cc78b5110a5609f875e0c734f44eb4558da0b0c38a3b3
-EBUILD wxmacmolplt-7.3.ebuild 840 RMD160 e115d6e00331d2249d1a87d2064da0efdbed9986 SHA1 82c369d4313bd96deae2d480478e23789124317f SHA256 08cc0a57d5f314f9f58bcac6303cc046414c94a6d1e5c1797007d6bd784a5f5f
-EBUILD wxmacmolplt-7.4.ebuild 990 RMD160 b54fa7945cdd8c1c929ec847f1ab5f4e3e244260 SHA1 5d7a1f73544076f2d15a874cfe3584cc6c5dfdcd SHA256 e993a9b776148a66f613c46dd058cb7dd60661c31918ca840cc86efef14409a3
-MISC ChangeLog 1280 RMD160 0ec96aaf56df8f2c786b99d10b5f378c842f323e SHA1 d93ffff8b3309ab257128e7bf0ab9c62f8c34972 SHA256 df9c61fafdcad31624e9650a49c762c2936535faa18592e9b44b0db03cc159f8
+EBUILD wxmacmolplt-7.4-r1.ebuild 1138 RMD160 887ef10025c4412f4e0a18a4c5b818175f58b9b5 SHA1 729fc61d69b79f442ff863b2e16b4cbf78e127c1 SHA256 f65d7b88066b43bf572cc605d8a0b646fe4fb78d462ea1343eebca072b17e052
+MISC ChangeLog 1601 RMD160 5ebcbd26b96b38b5cdf072ad5300c210939da1be SHA1 b6e3d60fa7693f96b0a3e73a2a17fcdce621c3c5 SHA256 8d6566321730b607583210a71d9713a686c283a6cb9936d0bde11e9499e28cb1
 MISC metadata.xml 641 RMD160 b5028617e4513c47302f8df91ee308b4fa7168a1 SHA1 fb6f03b5c5915fe3aab1a1090422857e9db4191d SHA256 388eee0801d6959353a9f4739b916085a3df57fe365a91d61fc28bf27316d4f0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwkfZwACgkQgAnW8HDreRZVzwCeKY8knI9Y2EgTGJilBiFjOs5N
-ilEAoI+CJRaO1XkJPTH3WPmDrMIYqQlt
-=35/l
+iEYEARECAAYFAkwk5asACgkQgAnW8HDreRapmwCgjWcffQUmHi8w0tDQ3OmYX6cd
+5I4AoJwF6Og8Lfb1slVKe2fn53p5Vy6P
+=lZPp
 -----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
new file mode 100644
index 000000000000..954a47fb4fd9
--- /dev/null
+++ b/sci-chemistry/wxmacmolplt/files/wxmacmolplt-7.4-flash.patch
@@ -0,0 +1,28 @@
+--- 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
new file mode 100644
index 000000000000..95ae3da3eed4
--- /dev/null
+++ b/sci-chemistry/wxmacmolplt/files/wxmacmolplt-7.4-glew.patch
@@ -0,0 +1,39 @@
+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/wxmacmolplt-7.3.ebuild b/sci-chemistry/wxmacmolplt/wxmacmolplt-7.3.ebuild
deleted file mode 100644
index d58b4e53de1f..000000000000
--- a/sci-chemistry/wxmacmolplt/wxmacmolplt-7.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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.3.ebuild,v 1.4 2010/03/09 11:39:54 abcd Exp $
-
-EAPI="2"
-WX_GTK_VER=2.8
-
-inherit base eutils wxwidgets
-
-DESCRIPTION="Chemical 3D graphics program with GAMESS input builder"
-HOMEPAGE="http://www.scl.ameslab.gov/MacMolPlt/"
-
-SRC_URI="http://www.scl.ameslab.gov/MacMolPlt/download/${P}.tar.gz"
-LICENSE="GPL-2"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-
-IUSE="flash"
-
-DEPEND="x11-libs/wxGTK:2.8[X,opengl]
-		flash? ( media-libs/ming )"
-
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf $(use_with flash ming)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	doicon resources/${PN}.png
-	make_desktop_entry ${PN} wxMacMolPlt ${PN} "Science;Education"
-}
diff --git a/sci-chemistry/wxmacmolplt/wxmacmolplt-7.3-r1.ebuild b/sci-chemistry/wxmacmolplt/wxmacmolplt-7.4-r1.ebuild
index ee589e27e9db..2b603d9ba716 100644
--- a/sci-chemistry/wxmacmolplt/wxmacmolplt-7.3-r1.ebuild
+++ b/sci-chemistry/wxmacmolplt/wxmacmolplt-7.4-r1.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-chemistry/wxmacmolplt/wxmacmolplt-7.3-r1.ebuild,v 1.3 2010/03/09 11:39:54 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/wxmacmolplt/wxmacmolplt-7.4-r1.ebuild,v 1.1 2010/06/25 17:21:42 jlec Exp $
 
 EAPI="2"
 WX_GTK_VER=2.8
@@ -9,21 +9,24 @@ inherit base eutils autotools wxwidgets
 
 DESCRIPTION="Chemical 3D graphics program with GAMESS input builder"
 HOMEPAGE="http://www.scl.ameslab.gov/MacMolPlt/"
-
 SRC_URI="http://www.scl.ameslab.gov/MacMolPlt/download/${P}.tar.gz"
-LICENSE="GPL-2"
 
+LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
-
 IUSE="flash"
 
-DEPEND="x11-libs/wxGTK:2.8[X,opengl]
-		flash? ( media-libs/ming )"
-
-RDEPEND="${DEPEND}"
+RDEPEND="
+	>=media-libs/glew-1.5.3
+	media-libs/mesa
+	x11-libs/wxGTK:2.8[X,opengl]
+	flash? ( <media-libs/ming-0.4 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
 
 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
@@ -35,6 +38,6 @@ src_configure() {
 
 src_install() {
 	emake DESTDIR="${D}" install || die "install failed"
-	doicon resources/${PN}.png
+	doicon resources/${PN}.png || die
 	make_desktop_entry ${PN} wxMacMolPlt ${PN} "Science;Education"
 }
diff --git a/sci-chemistry/wxmacmolplt/wxmacmolplt-7.4.ebuild b/sci-chemistry/wxmacmolplt/wxmacmolplt-7.4.ebuild
deleted file mode 100644
index bb9d1213ac86..000000000000
--- a/sci-chemistry/wxmacmolplt/wxmacmolplt-7.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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.ebuild,v 1.4 2010/06/25 09:57:43 jlec Exp $
-
-EAPI="2"
-WX_GTK_VER=2.8
-
-inherit base eutils autotools wxwidgets
-
-DESCRIPTION="Chemical 3D graphics program with GAMESS input builder"
-HOMEPAGE="http://www.scl.ameslab.gov/MacMolPlt/"
-
-SRC_URI="http://www.scl.ameslab.gov/MacMolPlt/download/${P}.tar.gz"
-LICENSE="GPL-2"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-
-IUSE="flash"
-
-DEPEND="x11-libs/wxGTK:2.8[X,opengl]
-		flash? ( <media-libs/ming-0.4 )"
-
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	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)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	doicon resources/${PN}.png
-	make_desktop_entry ${PN} wxMacMolPlt ${PN} "Science;Education"
-}