diff options
4 files changed, 4 insertions, 144 deletions
diff --git a/sci-chemistry/wxmacmolplt/Manifest b/sci-chemistry/wxmacmolplt/Manifest index 5eb39df38..ad5912348 100644 --- a/sci-chemistry/wxmacmolplt/Manifest +++ b/sci-chemistry/wxmacmolplt/Manifest @@ -1,2 +1 @@ -DIST wxmacmolplt-7.6.1.tar.gz 2353688 SHA256 930e7afd00fe1af68a2b4fdfef15aad1527ab36dd385c85d71bff98edcbbede1 SHA512 d8e3b531150d895f3c746eb9beb27525103e4e90fb1782f2c862cd914d276e65e41cec5d48fda5d579e7bc865092c16b17fa988314b8d7062ebd9ef0aa3bf476 WHIRLPOOL 6ea77b282eea96bf9cd1c4fb92a4d6ea77f0c52c2f99508afa176f5ffc3dc3f5085c0dc17ccfb8e0db3f3ebcd432fd9e56abb20101b204f88f951b5746c04b6d DIST wxmacmolplt-7.6.2.tar.gz 2360572 SHA256 27f08f86b78d446f87483df689f0f972638048aa2cf38e42126468e305587076 SHA512 6b7c36f3833b7fda984c9c05a361185912a9bb447409c74cdd60835df9c68ab8ce1a47596ff365f4dc6f70566b64ab185dc57367975d16bec1ec27159515b711 WHIRLPOOL f79809067fc1dec9f4230a324d16d1435fe42c703c654f03416aa7ea65883e470d484f239af889c011e9dd06baf3ecd05f0258a6e5e05b4d310140f862a71017 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 d2d79ee1e..000000000 --- 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 cf7c2cd11..000000000 --- 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 028ff6f62..961ceae3d 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" \ |