public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/sci:master commit in: sci-chemistry/wxmacmolplt/, sci-chemistry/wxmacmolplt/files/
@ 2012-10-22  8:38 Reinis Danne
  0 siblings, 0 replies; 5+ messages in thread
From: Reinis Danne @ 2012-10-22  8:38 UTC (permalink / raw
  To: gentoo-commits

commit:     1b506b21a255d13e7e2c31e2298ede54284ff462
Author:     Reinis Danne <rei4dan <AT> gmail <DOT> com>
AuthorDate: Mon Oct 22 08:36:25 2012 +0000
Commit:     Reinis Danne <rei4dan <AT> gmail <DOT> com>
CommitDate: Mon Oct 22 08:36:25 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=1b506b21

wxmacmolplt: Version bump to 7.4.3

---
 sci-chemistry/wxmacmolplt/ChangeLog                |   10 ++++
 .../wxmacmolplt/files/wxmacmolplt-7.4.3-glew.patch |   12 +++++
 sci-chemistry/wxmacmolplt/metadata.xml             |   11 +++++
 sci-chemistry/wxmacmolplt/wxmacmolplt-7.4.3.ebuild |   44 ++++++++++++++++++++
 4 files changed, 77 insertions(+), 0 deletions(-)

diff --git a/sci-chemistry/wxmacmolplt/ChangeLog b/sci-chemistry/wxmacmolplt/ChangeLog
new file mode 100644
index 0000000..c858c58
--- /dev/null
+++ b/sci-chemistry/wxmacmolplt/ChangeLog
@@ -0,0 +1,10 @@
+# ChangeLog for sci-chemistry/wxmacmolplt
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*wxmacmolplt-7.4.3 (22 Oct 2012)
+
+  22 Oct 2012; Reinis Danne <rei4dan@gmail.com> +wxmacmolplt-7.4.3.ebuild,
+  +files/wxmacmolplt-7.4.3-glew.patch, +metadata.xml:
+  Bump to 7.4.3.
+

diff --git a/sci-chemistry/wxmacmolplt/files/wxmacmolplt-7.4.3-glew.patch b/sci-chemistry/wxmacmolplt/files/wxmacmolplt-7.4.3-glew.patch
new file mode 100644
index 0000000..08986db
--- /dev/null
+++ b/sci-chemistry/wxmacmolplt/files/wxmacmolplt-7.4.3-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/metadata.xml b/sci-chemistry/wxmacmolplt/metadata.xml
new file mode 100644
index 0000000..fb69a7d
--- /dev/null
+++ b/sci-chemistry/wxmacmolplt/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sci-chemistry</herd>
+<longdescription>
+wxMacMolPlt is a program for plotting 3D molecular structures and normal modes (vibrations), various orbitals and electron density maps. It reads a variety of file formats including any GAMESS input, log or IRC file directly to create animations. It has a simple GAMESS input (.inp) builder and a primitive molecule builder.
+</longdescription>
+<use>
+  <flag name='flash'>Add support for flash movie generation using <pkg>media-libs/ming</pkg></flag>
+</use>
+</pkgmetadata>

diff --git a/sci-chemistry/wxmacmolplt/wxmacmolplt-7.4.3.ebuild b/sci-chemistry/wxmacmolplt/wxmacmolplt-7.4.3.ebuild
new file mode 100644
index 0000000..8b300c9
--- /dev/null
+++ b/sci-chemistry/wxmacmolplt/wxmacmolplt-7.4.3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+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"
+
+RDEPEND="
+	>=media-libs/glew-1.5.3
+	media-libs/mesa
+	x11-libs/wxGTK:2.8[X,opengl]
+	flash? ( media-libs/ming )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-glew.patch
+	sed -i -e "/^dist_doc_DATA/d" Makefile.am \
+		|| die "Failed to disable installation of LICENSE file"
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-glew \
+		$(use_with flash ming)
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install || die "install failed"
+	doicon resources/${PN}.png || die
+	make_desktop_entry ${PN} wxMacMolPlt ${PN} "Science;Education"
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-chemistry/wxmacmolplt/, sci-chemistry/wxmacmolplt/files/
@ 2014-01-06 18:33 Justin Lecher
  0 siblings, 0 replies; 5+ messages in thread
From: Justin Lecher @ 2014-01-06 18:33 UTC (permalink / raw
  To: gentoo-commits

commit:     0869992e8feeb40fb14929cd25fb620915926d0c
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  6 17:47:17 2014 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Jan  6 17:47:17 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=0869992e

moved to tree

Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

---
 sci-chemistry/wxmacmolplt/ChangeLog                | 19 ----------
 .../wxmacmolplt/files/wxmacmolplt-7.4.3-glew.patch | 12 ------
 sci-chemistry/wxmacmolplt/metadata.xml             | 11 ------
 sci-chemistry/wxmacmolplt/wxmacmolplt-7.4.3.ebuild | 44 ----------------------
 sci-chemistry/wxmacmolplt/wxmacmolplt-7.5.ebuild   | 44 ----------------------
 5 files changed, 130 deletions(-)

diff --git a/sci-chemistry/wxmacmolplt/ChangeLog b/sci-chemistry/wxmacmolplt/ChangeLog
deleted file mode 100644
index a7f4695..0000000
--- a/sci-chemistry/wxmacmolplt/ChangeLog
+++ /dev/null
@@ -1,19 +0,0 @@
-# ChangeLog for sci-chemistry/wxmacmolplt
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-*wxmacmolplt-7.5 (14 Nov 2013)
-
-  14 Nov 2013; Reinis Danne <rei4dan@gmail.com> +wxmacmolplt-7.5.ebuild:
-  Bump to version 7.5, switch to using wxwidgets 2.9.
-
-  28 Oct 2012; Justin Lecher <jlec@gentoo.org> wxmacmolplt-7.4.3.ebuild,
-  metadata.xml:
-  Fix prefix awareness; correct desktop file creation
-
-*wxmacmolplt-7.4.3 (22 Oct 2012)
-
-  22 Oct 2012; Reinis Danne <rei4dan@gmail.com> +wxmacmolplt-7.4.3.ebuild,
-  +files/wxmacmolplt-7.4.3-glew.patch, +metadata.xml:
-  Bump to 7.4.3.
-

diff --git a/sci-chemistry/wxmacmolplt/files/wxmacmolplt-7.4.3-glew.patch b/sci-chemistry/wxmacmolplt/files/wxmacmolplt-7.4.3-glew.patch
deleted file mode 100644
index 08986db..0000000
--- a/sci-chemistry/wxmacmolplt/files/wxmacmolplt-7.4.3-glew.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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/metadata.xml b/sci-chemistry/wxmacmolplt/metadata.xml
deleted file mode 100644
index 37abac1..0000000
--- a/sci-chemistry/wxmacmolplt/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>sci-chemistry</herd>
-	<longdescription>
-wxMacMolPlt is a program for plotting 3D molecular structures and normal modes (vibrations), various orbitals and electron density maps. It reads a variety of file formats including any GAMESS input, log or IRC file directly to create animations. It has a simple GAMESS input (.inp) builder and a primitive molecule builder.
-</longdescription>
-	<use>
-		<flag name="flash">Add support for flash movie generation using <pkg>media-libs/ming</pkg></flag>
-	</use>
-</pkgmetadata>

diff --git a/sci-chemistry/wxmacmolplt/wxmacmolplt-7.4.3.ebuild b/sci-chemistry/wxmacmolplt/wxmacmolplt-7.4.3.ebuild
deleted file mode 100644
index 233dac1..0000000
--- a/sci-chemistry/wxmacmolplt/wxmacmolplt-7.4.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-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"
-
-RDEPEND="
-	media-libs/glew
-	media-libs/mesa
-	x11-libs/wxGTK:2.8[X,opengl]
-	flash? ( media-libs/ming )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-glew.patch
-	sed -i -e "/^dist_doc_DATA/d" Makefile.am \
-		|| die "Failed to disable installation of LICENSE file"
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-glew \
-		$(use_with flash ming)
-}
-
-src_install() {
-	default
-	doicon resources/${PN}.png
-	make_desktop_entry ${PN} wxMacMolPlt ${PN} "Science;DataVisualization;"
-}

diff --git a/sci-chemistry/wxmacmolplt/wxmacmolplt-7.5.ebuild b/sci-chemistry/wxmacmolplt/wxmacmolplt-7.5.ebuild
deleted file mode 100644
index ccbdf22..0000000
--- a/sci-chemistry/wxmacmolplt/wxmacmolplt-7.5.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-WX_GTK_VER=2.9
-
-inherit base eutils autotools wxwidgets
-
-DESCRIPTION="Chemical 3D graphics program with GAMESS input builder"
-HOMEPAGE="http://www.scl.ameslab.gov/MacMolPlt/"
-SRC_URI="http://wxmacmolplt.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="flash"
-
-RDEPEND="
-	media-libs/glew
-	media-libs/mesa
-	x11-libs/wxGTK:2.9[X,opengl]
-	flash? ( media-libs/ming )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-7.4.3-glew.patch
-	sed -i -e "/^dist_doc_DATA/d" Makefile.am \
-		|| die "Failed to disable installation of LICENSE file"
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-glew \
-		$(use_with flash ming)
-}
-
-src_install() {
-	default
-	doicon resources/${PN}.png
-	make_desktop_entry ${PN} wxMacMolPlt ${PN} "Science;DataVisualization;"
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-chemistry/wxmacmolplt/, sci-chemistry/wxmacmolplt/files/
@ 2016-01-12 14:34 Reinis Danne
  0 siblings, 0 replies; 5+ messages in thread
From: Reinis Danne @ 2016-01-12 14:34 UTC (permalink / raw
  To: gentoo-commits

commit:     702a6b6aec4d7af6e39b6a44ccb5b8b5350b671e
Author:     Reinis Danne <rei4dan <AT> gmail <DOT> com>
AuthorDate: Tue Jan 12 14:27:26 2016 +0000
Commit:     Reinis Danne <rei4dan <AT> gmail <DOT> com>
CommitDate: Tue Jan 12 14:27:26 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=702a6b6a

sci-chemistry/wxmacmolplt: Version bump

Upstream has moved to GitHub.

 .../wxmacmolplt/files/wxmacmolplt-7.5-glew.patch   | 12 ++++++
 sci-chemistry/wxmacmolplt/metadata.xml             | 11 +++++
 sci-chemistry/wxmacmolplt/wxmacmolplt-7.6.1.ebuild | 47 ++++++++++++++++++++++
 3 files changed, 70 insertions(+)

diff --git a/sci-chemistry/wxmacmolplt/files/wxmacmolplt-7.5-glew.patch b/sci-chemistry/wxmacmolplt/files/wxmacmolplt-7.5-glew.patch
new file mode 100644
index 0000000..08986db
--- /dev/null
+++ b/sci-chemistry/wxmacmolplt/files/wxmacmolplt-7.5-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/metadata.xml b/sci-chemistry/wxmacmolplt/metadata.xml
new file mode 100644
index 0000000..cd9831e
--- /dev/null
+++ b/sci-chemistry/wxmacmolplt/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sci-chemistry</herd>
+  <longdescription>
+wxMacMolPlt is a program for plotting 3D molecular structures and normal modes (vibrations), various orbitals and electron density maps. It reads a variety of file formats including any GAMESS input, log or IRC file directly to create animations. It has a simple GAMESS input (.inp) builder and a primitive molecule builder.
+</longdescription>
+  <use>
+    <flag name="flash">Add support for flash movie generation using <pkg>media-libs/ming</pkg></flag>
+  </use>
+</pkgmetadata>

diff --git a/sci-chemistry/wxmacmolplt/wxmacmolplt-7.6.1.ebuild b/sci-chemistry/wxmacmolplt/wxmacmolplt-7.6.1.ebuild
new file mode 100644
index 0000000..62a1a4c
--- /dev/null
+++ b/sci-chemistry/wxmacmolplt/wxmacmolplt-7.6.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WX_GTK_VER=3.0
+
+inherit autotools eutils wxwidgets
+
+DESCRIPTION="Chemical 3D graphics program with GAMESS input builder"
+HOMEPAGE="http://brettbode.github.io/wxmacmolplt/"
+SRC_URI="https://github.com/brettbode/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="flash"
+
+RDEPEND="
+	media-libs/glew
+	media-libs/mesa
+	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
+	flash? ( media-libs/ming )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	need-wxwidgets unicode
+	epatch "${FILESDIR}"/${PN}-7.5-glew.patch
+	sed \
+		-e "/^dist_doc_DATA/d" \
+		-i Makefile.am || die "Failed to disable installation of LICENSE file"
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-glew \
+		$(use_with flash ming)
+}
+
+src_install() {
+	default
+	doicon resources/${PN}.png
+	make_desktop_entry ${PN} wxMacMolPlt ${PN} "Science;DataVisualization;"
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-chemistry/wxmacmolplt/, sci-chemistry/wxmacmolplt/files/
@ 2016-01-14  9:54 Justin Lecher
  0 siblings, 0 replies; 5+ messages in thread
From: Justin Lecher @ 2016-01-14  9:54 UTC (permalink / raw
  To: gentoo-commits

commit:     c25411aee92305495fac52acf5a0222d1d3f1405
Author:     Reinis Danne <rei4dan <AT> gmail <DOT> com>
AuthorDate: Wed Jan 13 20:34:49 2016 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Jan 13 20:34:49 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=c25411ae

sci-chemistry/wxmacmolplt: Use pkg-config to get link flags

 .../files/wxmacmolplt-7.6.1-pkg_config.patch       | 90 ++++++++++++++++++++++
 sci-chemistry/wxmacmolplt/wxmacmolplt-7.6.1.ebuild |  2 +
 2 files changed, 92 insertions(+)

diff --git a/sci-chemistry/wxmacmolplt/files/wxmacmolplt-7.6.1-pkg_config.patch b/sci-chemistry/wxmacmolplt/files/wxmacmolplt-7.6.1-pkg_config.patch
new file mode 100644
index 0000000..d2d79ee
--- /dev/null
+++ b/sci-chemistry/wxmacmolplt/files/wxmacmolplt-7.6.1-pkg_config.patch
@@ -0,0 +1,90 @@
+diff --git a/configure.ac b/configure.ac
+index ef3f90f..abec341 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -7,24 +7,24 @@ dnl AC_REVISION
+ AM_MAINTAINER_MODE
+ 
+ AC_CANONICAL_HOST
+-LIBGL=
++GLU_LIBS=
+ HOST=
+ case "${host}" in
+    *msvc*)
+       HOST=MSW 
+-      LIBGL="-lopengl32 -lglu32"
++      GLU_LIBS="-lopengl32 -lglu32"
+       ;;
+    *darwin*)
+       HOST=OSX 
+-      LIBGL="-framework OpenGL"
++      GLU_LIBS="-framework OpenGL"
+       ;;
+    *)
+       HOST=LINUX
+-      LIBGL="-lGL -lGLU"
++      PKG_CHECK_MODULES([GLU], [glu], [], [GLU_LIBS="-lGL -lGLU"])
+       ;;
+ esac
+ AM_CONDITIONAL(HOST_IS_MSW, [test "x$HOST" == xMSW])
+-AC_SUBST([LIBGL])
++AC_SUBST([GLU_LIBS])
+ 
+ #
+ # There isn't a reliable way to know we should use the Apple OpenGL framework
+@@ -53,30 +53,37 @@ AC_ARG_WITH(ming,
+                           using the ming library; (default=yes)]],
+ [],
+ [with_ming=yes])
+-LIBMING=
++
++MING_LIBS=
++
+ AS_IF([test "x$with_ming" != xno],
+ [AC_CHECK_LIB([ming], [Ming_init],
+-    [AC_SUBST([LIBMING], ["-lming"]) AC_DEFINE([HAVE_LIBMING])],
++    [PKG_CHECK_MODULES([MING], [libming], [], [MING_LIBS="-lming"])
++     AC_DEFINE([HAVE_LIBMING])],
+     [if test "x$with_ming" != xyes ; then
+         AC_MSG_FAILURE([--with-ming was given, but test for ming failed])
+     fi], -lpng)])
+ 
++AC_SUBST([MING_LIBS])
++
+ AC_ARG_WITH(glew,
+ [[  --with-glew             Use the system provided glew library instead of 
+                           the built-in version; (default=yes if present)]],
+ [],
+ [with_glew=check])
+ 
+-LIBGLEW=
++GLEW_LIBS=
+ 
+ AS_IF([test "x$with_glew" != xno],
+       [AC_CHECK_LIB([GLEW], [glewInit],
+-    [AC_SUBST([LIBGLEW], ["-lGLEW"]) AC_DEFINE([SYSTEM_GLEW])],
++    [PKG_CHECK_MODULES([GLEW], [glew], [], [GLEW_LIBS="-lGLEW"])
++     AC_DEFINE([SYSTEM_GLEW])],
+     [if test "x$with_glew" = xyes; then
+         AC_MSG_FAILURE([--with-glew was given, but test for glew failed])
+     fi])])
+ 
+-AM_CONDITIONAL([SYSTEM_GLEW], [test $LIBGLEW = "-lGLEW"])
++AM_CONDITIONAL([SYSTEM_GLEW], [test "x$ac_cv_lib_GLEW_glewInit" = xyes])
++AC_SUBST([GLEW_LIBS])
+ 
+ WXCONFIG=wx-config
+ AC_ARG_WITH(wx-config,
+diff --git a/src/Makefile.am b/src/Makefile.am
+index a666aff..0a88493 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -80,7 +80,7 @@ wxmacmolplt_SOURCES += glew.cpp glew.h glxew.h wglew.h
+ endif
+ 
+ AM_CXXFLAGS = $(WX_CXXFLAGS)
+-wxmacmolplt_LDADD = $(WX_LIBS) $(LIBMING) $(LIBGL) $(LIBGLEW)
++wxmacmolplt_LDADD = $(WX_LIBS) $(MING_LIBS) $(GLU_LIBS) $(GLEW_LIBS)
+ wxmacmolplt_LDFLAGS = $(WX_CXXFLAGS)
+ EXTRA_DIST = wxMacMolPlt.pjd xpms/arrow.xpm \
+ 	xpms/hand.xpm xpms/rect_lasso.xpm xpms/view.xpm

diff --git a/sci-chemistry/wxmacmolplt/wxmacmolplt-7.6.1.ebuild b/sci-chemistry/wxmacmolplt/wxmacmolplt-7.6.1.ebuild
index 028ff6f..cf7c2cd 100644
--- a/sci-chemistry/wxmacmolplt/wxmacmolplt-7.6.1.ebuild
+++ b/sci-chemistry/wxmacmolplt/wxmacmolplt-7.6.1.ebuild
@@ -26,6 +26,8 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-pkg_config.patch
+
 	epatch_user
 
 	sed \


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-chemistry/wxmacmolplt/, sci-chemistry/wxmacmolplt/files/
@ 2017-01-29 11:59 Justin Lecher
  0 siblings, 0 replies; 5+ messages in thread
From: Justin Lecher @ 2017-01-29 11:59 UTC (permalink / raw
  To: gentoo-commits

commit:     8f974ded5d27a6a84ae9ff41a35c305b803c23aa
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 29 11:57:08 2017 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Jan 29 11:59:24 2017 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=8f974ded

sci-chemistry/wxmacmolplt: QA fixes

BUMP EAPI to 6
Add missing subslot operator
Drop old

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 .../files/wxmacmolplt-7.6.1-pkg_config.patch       | 90 ----------------------
 sci-chemistry/wxmacmolplt/wxmacmolplt-7.6.1.ebuild | 49 ------------
 sci-chemistry/wxmacmolplt/wxmacmolplt-7.6.2.ebuild |  8 +-
 3 files changed, 4 insertions(+), 143 deletions(-)

diff --git a/sci-chemistry/wxmacmolplt/files/wxmacmolplt-7.6.1-pkg_config.patch b/sci-chemistry/wxmacmolplt/files/wxmacmolplt-7.6.1-pkg_config.patch
deleted file mode 100644
index d2d79ee..0000000
--- a/sci-chemistry/wxmacmolplt/files/wxmacmolplt-7.6.1-pkg_config.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index ef3f90f..abec341 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -7,24 +7,24 @@ dnl AC_REVISION
- AM_MAINTAINER_MODE
- 
- AC_CANONICAL_HOST
--LIBGL=
-+GLU_LIBS=
- HOST=
- case "${host}" in
-    *msvc*)
-       HOST=MSW 
--      LIBGL="-lopengl32 -lglu32"
-+      GLU_LIBS="-lopengl32 -lglu32"
-       ;;
-    *darwin*)
-       HOST=OSX 
--      LIBGL="-framework OpenGL"
-+      GLU_LIBS="-framework OpenGL"
-       ;;
-    *)
-       HOST=LINUX
--      LIBGL="-lGL -lGLU"
-+      PKG_CHECK_MODULES([GLU], [glu], [], [GLU_LIBS="-lGL -lGLU"])
-       ;;
- esac
- AM_CONDITIONAL(HOST_IS_MSW, [test "x$HOST" == xMSW])
--AC_SUBST([LIBGL])
-+AC_SUBST([GLU_LIBS])
- 
- #
- # There isn't a reliable way to know we should use the Apple OpenGL framework
-@@ -53,30 +53,37 @@ AC_ARG_WITH(ming,
-                           using the ming library; (default=yes)]],
- [],
- [with_ming=yes])
--LIBMING=
-+
-+MING_LIBS=
-+
- AS_IF([test "x$with_ming" != xno],
- [AC_CHECK_LIB([ming], [Ming_init],
--    [AC_SUBST([LIBMING], ["-lming"]) AC_DEFINE([HAVE_LIBMING])],
-+    [PKG_CHECK_MODULES([MING], [libming], [], [MING_LIBS="-lming"])
-+     AC_DEFINE([HAVE_LIBMING])],
-     [if test "x$with_ming" != xyes ; then
-         AC_MSG_FAILURE([--with-ming was given, but test for ming failed])
-     fi], -lpng)])
- 
-+AC_SUBST([MING_LIBS])
-+
- AC_ARG_WITH(glew,
- [[  --with-glew             Use the system provided glew library instead of 
-                           the built-in version; (default=yes if present)]],
- [],
- [with_glew=check])
- 
--LIBGLEW=
-+GLEW_LIBS=
- 
- AS_IF([test "x$with_glew" != xno],
-       [AC_CHECK_LIB([GLEW], [glewInit],
--    [AC_SUBST([LIBGLEW], ["-lGLEW"]) AC_DEFINE([SYSTEM_GLEW])],
-+    [PKG_CHECK_MODULES([GLEW], [glew], [], [GLEW_LIBS="-lGLEW"])
-+     AC_DEFINE([SYSTEM_GLEW])],
-     [if test "x$with_glew" = xyes; then
-         AC_MSG_FAILURE([--with-glew was given, but test for glew failed])
-     fi])])
- 
--AM_CONDITIONAL([SYSTEM_GLEW], [test $LIBGLEW = "-lGLEW"])
-+AM_CONDITIONAL([SYSTEM_GLEW], [test "x$ac_cv_lib_GLEW_glewInit" = xyes])
-+AC_SUBST([GLEW_LIBS])
- 
- WXCONFIG=wx-config
- AC_ARG_WITH(wx-config,
-diff --git a/src/Makefile.am b/src/Makefile.am
-index a666aff..0a88493 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -80,7 +80,7 @@ wxmacmolplt_SOURCES += glew.cpp glew.h glxew.h wglew.h
- endif
- 
- AM_CXXFLAGS = $(WX_CXXFLAGS)
--wxmacmolplt_LDADD = $(WX_LIBS) $(LIBMING) $(LIBGL) $(LIBGLEW)
-+wxmacmolplt_LDADD = $(WX_LIBS) $(MING_LIBS) $(GLU_LIBS) $(GLEW_LIBS)
- wxmacmolplt_LDFLAGS = $(WX_CXXFLAGS)
- EXTRA_DIST = wxMacMolPlt.pjd xpms/arrow.xpm \
- 	xpms/hand.xpm xpms/rect_lasso.xpm xpms/view.xpm

diff --git a/sci-chemistry/wxmacmolplt/wxmacmolplt-7.6.1.ebuild b/sci-chemistry/wxmacmolplt/wxmacmolplt-7.6.1.ebuild
deleted file mode 100644
index cf7c2cd..0000000
--- a/sci-chemistry/wxmacmolplt/wxmacmolplt-7.6.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-WX_GTK_VER=3.0
-
-inherit autotools eutils wxwidgets
-
-DESCRIPTION="Chemical 3D graphics program with GAMESS input builder"
-HOMEPAGE="http://brettbode.github.io/wxmacmolplt/"
-SRC_URI="https://github.com/brettbode/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="flash"
-
-RDEPEND="
-	media-libs/glew
-	media-libs/mesa
-	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
-	flash? ( media-libs/ming )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-pkg_config.patch
-
-	epatch_user
-
-	sed \
-		-e "/^dist_doc_DATA/d" \
-		-i Makefile.am || die "Failed to disable installation of LICENSE file"
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-glew \
-		$(use_with flash ming)
-}
-
-src_install() {
-	default
-	doicon resources/${PN}.png
-	make_desktop_entry ${PN} wxMacMolPlt ${PN} "Science;DataVisualization;"
-}

diff --git a/sci-chemistry/wxmacmolplt/wxmacmolplt-7.6.2.ebuild b/sci-chemistry/wxmacmolplt/wxmacmolplt-7.6.2.ebuild
index 028ff6f..961ceae 100644
--- a/sci-chemistry/wxmacmolplt/wxmacmolplt-7.6.2.ebuild
+++ b/sci-chemistry/wxmacmolplt/wxmacmolplt-7.6.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 WX_GTK_VER=3.0
 
@@ -18,7 +18,7 @@ SLOT="0"
 IUSE="flash"
 
 RDEPEND="
-	media-libs/glew
+	media-libs/glew:0=
 	media-libs/mesa
 	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
 	flash? ( media-libs/ming )"
@@ -26,7 +26,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 src_prepare() {
-	epatch_user
+	default
 
 	sed \
 		-e "/^dist_doc_DATA/d" \


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2017-01-29 12:00 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-29 11:59 [gentoo-commits] proj/sci:master commit in: sci-chemistry/wxmacmolplt/, sci-chemistry/wxmacmolplt/files/ Justin Lecher
  -- strict thread matches above, loose matches on Subject: below --
2016-01-14  9:54 Justin Lecher
2016-01-12 14:34 Reinis Danne
2014-01-06 18:33 Justin Lecher
2012-10-22  8:38 Reinis Danne

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox