Gentoo Archives: gentoo-commits

From: Justin Lecher <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: sci-chemistry/wxmacmolplt/, sci-chemistry/wxmacmolplt/files/
Date: Sun, 29 Jan 2017 12:00:04
Message-Id: 1485691164.8f974ded5d27a6a84ae9ff41a35c305b803c23aa.jlec@gentoo
1 commit: 8f974ded5d27a6a84ae9ff41a35c305b803c23aa
2 Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jan 29 11:57:08 2017 +0000
4 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 29 11:59:24 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=8f974ded
7
8 sci-chemistry/wxmacmolplt: QA fixes
9
10 BUMP EAPI to 6
11 Add missing subslot operator
12 Drop old
13
14 Package-Manager: Portage-2.3.3, Repoman-2.3.1
15 Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
16
17 .../files/wxmacmolplt-7.6.1-pkg_config.patch | 90 ----------------------
18 sci-chemistry/wxmacmolplt/wxmacmolplt-7.6.1.ebuild | 49 ------------
19 sci-chemistry/wxmacmolplt/wxmacmolplt-7.6.2.ebuild | 8 +-
20 3 files changed, 4 insertions(+), 143 deletions(-)
21
22 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
23 deleted file mode 100644
24 index d2d79ee..0000000
25 --- a/sci-chemistry/wxmacmolplt/files/wxmacmolplt-7.6.1-pkg_config.patch
26 +++ /dev/null
27 @@ -1,90 +0,0 @@
28 -diff --git a/configure.ac b/configure.ac
29 -index ef3f90f..abec341 100644
30 ---- a/configure.ac
31 -+++ b/configure.ac
32 -@@ -7,24 +7,24 @@ dnl AC_REVISION
33 - AM_MAINTAINER_MODE
34 -
35 - AC_CANONICAL_HOST
36 --LIBGL=
37 -+GLU_LIBS=
38 - HOST=
39 - case "${host}" in
40 - *msvc*)
41 - HOST=MSW
42 -- LIBGL="-lopengl32 -lglu32"
43 -+ GLU_LIBS="-lopengl32 -lglu32"
44 - ;;
45 - *darwin*)
46 - HOST=OSX
47 -- LIBGL="-framework OpenGL"
48 -+ GLU_LIBS="-framework OpenGL"
49 - ;;
50 - *)
51 - HOST=LINUX
52 -- LIBGL="-lGL -lGLU"
53 -+ PKG_CHECK_MODULES([GLU], [glu], [], [GLU_LIBS="-lGL -lGLU"])
54 - ;;
55 - esac
56 - AM_CONDITIONAL(HOST_IS_MSW, [test "x$HOST" == xMSW])
57 --AC_SUBST([LIBGL])
58 -+AC_SUBST([GLU_LIBS])
59 -
60 - #
61 - # There isn't a reliable way to know we should use the Apple OpenGL framework
62 -@@ -53,30 +53,37 @@ AC_ARG_WITH(ming,
63 - using the ming library; (default=yes)]],
64 - [],
65 - [with_ming=yes])
66 --LIBMING=
67 -+
68 -+MING_LIBS=
69 -+
70 - AS_IF([test "x$with_ming" != xno],
71 - [AC_CHECK_LIB([ming], [Ming_init],
72 -- [AC_SUBST([LIBMING], ["-lming"]) AC_DEFINE([HAVE_LIBMING])],
73 -+ [PKG_CHECK_MODULES([MING], [libming], [], [MING_LIBS="-lming"])
74 -+ AC_DEFINE([HAVE_LIBMING])],
75 - [if test "x$with_ming" != xyes ; then
76 - AC_MSG_FAILURE([--with-ming was given, but test for ming failed])
77 - fi], -lpng)])
78 -
79 -+AC_SUBST([MING_LIBS])
80 -+
81 - AC_ARG_WITH(glew,
82 - [[ --with-glew Use the system provided glew library instead of
83 - the built-in version; (default=yes if present)]],
84 - [],
85 - [with_glew=check])
86 -
87 --LIBGLEW=
88 -+GLEW_LIBS=
89 -
90 - AS_IF([test "x$with_glew" != xno],
91 - [AC_CHECK_LIB([GLEW], [glewInit],
92 -- [AC_SUBST([LIBGLEW], ["-lGLEW"]) AC_DEFINE([SYSTEM_GLEW])],
93 -+ [PKG_CHECK_MODULES([GLEW], [glew], [], [GLEW_LIBS="-lGLEW"])
94 -+ AC_DEFINE([SYSTEM_GLEW])],
95 - [if test "x$with_glew" = xyes; then
96 - AC_MSG_FAILURE([--with-glew was given, but test for glew failed])
97 - fi])])
98 -
99 --AM_CONDITIONAL([SYSTEM_GLEW], [test $LIBGLEW = "-lGLEW"])
100 -+AM_CONDITIONAL([SYSTEM_GLEW], [test "x$ac_cv_lib_GLEW_glewInit" = xyes])
101 -+AC_SUBST([GLEW_LIBS])
102 -
103 - WXCONFIG=wx-config
104 - AC_ARG_WITH(wx-config,
105 -diff --git a/src/Makefile.am b/src/Makefile.am
106 -index a666aff..0a88493 100644
107 ---- a/src/Makefile.am
108 -+++ b/src/Makefile.am
109 -@@ -80,7 +80,7 @@ wxmacmolplt_SOURCES += glew.cpp glew.h glxew.h wglew.h
110 - endif
111 -
112 - AM_CXXFLAGS = $(WX_CXXFLAGS)
113 --wxmacmolplt_LDADD = $(WX_LIBS) $(LIBMING) $(LIBGL) $(LIBGLEW)
114 -+wxmacmolplt_LDADD = $(WX_LIBS) $(MING_LIBS) $(GLU_LIBS) $(GLEW_LIBS)
115 - wxmacmolplt_LDFLAGS = $(WX_CXXFLAGS)
116 - EXTRA_DIST = wxMacMolPlt.pjd xpms/arrow.xpm \
117 - xpms/hand.xpm xpms/rect_lasso.xpm xpms/view.xpm
118
119 diff --git a/sci-chemistry/wxmacmolplt/wxmacmolplt-7.6.1.ebuild b/sci-chemistry/wxmacmolplt/wxmacmolplt-7.6.1.ebuild
120 deleted file mode 100644
121 index cf7c2cd..0000000
122 --- a/sci-chemistry/wxmacmolplt/wxmacmolplt-7.6.1.ebuild
123 +++ /dev/null
124 @@ -1,49 +0,0 @@
125 -# Copyright 1999-2016 Gentoo Foundation
126 -# Distributed under the terms of the GNU General Public License v2
127 -# $Id$
128 -
129 -EAPI=5
130 -
131 -WX_GTK_VER=3.0
132 -
133 -inherit autotools eutils wxwidgets
134 -
135 -DESCRIPTION="Chemical 3D graphics program with GAMESS input builder"
136 -HOMEPAGE="http://brettbode.github.io/wxmacmolplt/"
137 -SRC_URI="https://github.com/brettbode/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
138 -
139 -LICENSE="GPL-2"
140 -KEYWORDS="~amd64 ~x86"
141 -SLOT="0"
142 -IUSE="flash"
143 -
144 -RDEPEND="
145 - media-libs/glew
146 - media-libs/mesa
147 - x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
148 - flash? ( media-libs/ming )"
149 -DEPEND="${RDEPEND}
150 - virtual/pkgconfig"
151 -
152 -src_prepare() {
153 - epatch "${FILESDIR}"/${P}-pkg_config.patch
154 -
155 - epatch_user
156 -
157 - sed \
158 - -e "/^dist_doc_DATA/d" \
159 - -i Makefile.am || die "Failed to disable installation of LICENSE file"
160 - eautoreconf
161 -}
162 -
163 -src_configure() {
164 - econf \
165 - --with-glew \
166 - $(use_with flash ming)
167 -}
168 -
169 -src_install() {
170 - default
171 - doicon resources/${PN}.png
172 - make_desktop_entry ${PN} wxMacMolPlt ${PN} "Science;DataVisualization;"
173 -}
174
175 diff --git a/sci-chemistry/wxmacmolplt/wxmacmolplt-7.6.2.ebuild b/sci-chemistry/wxmacmolplt/wxmacmolplt-7.6.2.ebuild
176 index 028ff6f..961ceae 100644
177 --- a/sci-chemistry/wxmacmolplt/wxmacmolplt-7.6.2.ebuild
178 +++ b/sci-chemistry/wxmacmolplt/wxmacmolplt-7.6.2.ebuild
179 @@ -1,8 +1,8 @@
180 -# Copyright 1999-2016 Gentoo Foundation
181 +# Copyright 1999-2017 Gentoo Foundation
182 # Distributed under the terms of the GNU General Public License v2
183 # $Id$
184
185 -EAPI=5
186 +EAPI=6
187
188 WX_GTK_VER=3.0
189
190 @@ -18,7 +18,7 @@ SLOT="0"
191 IUSE="flash"
192
193 RDEPEND="
194 - media-libs/glew
195 + media-libs/glew:0=
196 media-libs/mesa
197 x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
198 flash? ( media-libs/ming )"
199 @@ -26,7 +26,7 @@ DEPEND="${RDEPEND}
200 virtual/pkgconfig"
201
202 src_prepare() {
203 - epatch_user
204 + default
205
206 sed \
207 -e "/^dist_doc_DATA/d" \