[gentoo-commits] proj/sci:master commit in: sci-chemistry/wxmacmolplt/, sci-chemistry/wxmacmolplt/files/
commit: 8f974ded5d27a6a84ae9ff41a35c305b803c23aa Author: Justin Lecher gentoo org> AuthorDate: Sun Jan 29 11:57:08 2017 + Commit: Justin Lecher gentoo org> CommitDate: Sun Jan 29 11:59:24 2017 + 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 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..000 --- 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..000 --- 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 \ -
[gentoo-commits] proj/sci:master commit in: sci-chemistry/wxmacmolplt/, sci-chemistry/wxmacmolplt/files/
commit: c25411aee92305495fac52acf5a0222d1d3f1405 Author: Reinis Danne gmail com> AuthorDate: Wed Jan 13 20:34:49 2016 + Commit: Justin Lecher gentoo org> CommitDate: Wed Jan 13 20:34:49 2016 + 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 000..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 \
[gentoo-commits] proj/sci:master commit in: sci-chemistry/wxmacmolplt/, sci-chemistry/wxmacmolplt/files/
commit: 702a6b6aec4d7af6e39b6a44ccb5b8b5350b671e Author: Reinis Danne gmail com> AuthorDate: Tue Jan 12 14:27:26 2016 + Commit: Reinis Danne gmail com> CommitDate: Tue Jan 12 14:27:26 2016 + 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 000..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.ac2010-12-05 02:48:29.0 +0300 wxmacmolplt-7.4.2/configure.ac 2010-12-06 19:30:24.0 +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 000..cd9831e --- /dev/null +++ b/sci-chemistry/wxmacmolplt/metadata.xml @@ -0,0 +1,11 @@ + +http://www.gentoo.org/dtd/metadata.dtd";> + + sci-chemistry + +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. + + +Add support for flash movie generation using media-libs/ming + + 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 000..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;" +}