Gentoo Archives: gentoo-commits

From: Jan Psota <jasiupsota@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/user/bleeding-edge:master commit in: app-portage/portage-utils/, media-gfx/openscad/files/, media-gfx/openscad/, ...
Date: Fri, 06 Apr 2018 15:06:28
Message-Id: 1523027068.708803cd29b48e6fcfb05969c56bb12e9aad2016.jasiupsota@gentoo
1 commit: 708803cd29b48e6fcfb05969c56bb12e9aad2016
2 Author: Jan Psota <jasiupsota <AT> gmail <DOT> com>
3 AuthorDate: Fri Apr 6 15:04:28 2018 +0000
4 Commit: Jan Psota <jasiupsota <AT> gmail <DOT> com>
5 CommitDate: Fri Apr 6 15:04:28 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/user/bleeding-edge.git/commit/?id=708803cd
7
8 newer app-portage/portage-utils-0.70, cleanup media-gfx/openscad and app-i18n/poedit
9
10 app-i18n/poedit/Manifest | 1 -
11 app-i18n/poedit/metadata.xml | 12 ----
12 app-i18n/poedit/poedit-2.0.4.ebuild | 63 ------------------
13 app-portage/portage-utils/Manifest | 2 +-
14 ...0.65-r1.ebuild => portage-utils-0.70-r1.ebuild} | 4 +-
15 media-gfx/opencsg/Manifest | 1 -
16 media-gfx/opencsg/opencsg-1.4.2.ebuild | 41 ------------
17 media-gfx/openscad/files/50openscad-gentoo.el | 3 -
18 media-gfx/openscad/metadata.xml | 11 ----
19 media-gfx/openscad/openscad-9999.ebuild | 77 ----------------------
20 metadata/layout.conf | 1 +
21 11 files changed, 4 insertions(+), 212 deletions(-)
22
23 diff --git a/app-i18n/poedit/Manifest b/app-i18n/poedit/Manifest
24 deleted file mode 100644
25 index 3b3bae2..0000000
26 --- a/app-i18n/poedit/Manifest
27 +++ /dev/null
28 @@ -1 +0,0 @@
29 -DIST poedit-2.0.4.tar.gz 2495814 SHA256 3887ab76dfa4607f77be00073277a8c5f060006a014b97d8fe05ebd99aadc61d SHA512 18133cd9f19ced71e3184a58123111478f6597aecda189b1dc647f67313fb140b109b4da91c83e03ca6c8fb93712627dbeb74ea2aa16ce7b340ef30474eeffa2 WHIRLPOOL 978e996eb84dc3fe9ec2294bb40ea0870b365697f60017bb55f02d17385e8284409ef2852b92c2ecf4cebbc7b746492381842c9c3a21a3ead57d442c68f473e5
30
31 diff --git a/app-i18n/poedit/metadata.xml b/app-i18n/poedit/metadata.xml
32 deleted file mode 100644
33 index ce23bed..0000000
34 --- a/app-i18n/poedit/metadata.xml
35 +++ /dev/null
36 @@ -1,12 +0,0 @@
37 -<?xml version="1.0" encoding="UTF-8"?>
38 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
39 -<pkgmetadata>
40 - <maintainer type="project">
41 - <email>wxwidgets@g.o</email>
42 - <name>Gentoo wxWidgets Project</name>
43 - </maintainer>
44 - <upstream>
45 - <remote-id type="github">vslavik/poedit</remote-id>
46 - <remote-id type="sourceforge">poedit</remote-id>
47 - </upstream>
48 -</pkgmetadata>
49
50 diff --git a/app-i18n/poedit/poedit-2.0.4.ebuild b/app-i18n/poedit/poedit-2.0.4.ebuild
51 deleted file mode 100644
52 index 1fe152b..0000000
53 --- a/app-i18n/poedit/poedit-2.0.4.ebuild
54 +++ /dev/null
55 @@ -1,63 +0,0 @@
56 -# Copyright 1999-2017 Gentoo Foundation
57 -# Distributed under the terms of the GNU General Public License v2
58 -
59 -EAPI=6
60 -WX_GTK_VER=3.0-gtk3
61 -
62 -PLOCALES="an ar az be be@latin bg bs ca ckb co cs da de el en_GB es et eu fa fi fr ga gl he hr hu hy id is it ja ka kab kk ko lt lv ms nb nl oc pa pl pt_BR pt_PT ro ru sk sl sq sr sv tg th tr uk uz vi zh_CN zh_TW"
63 -
64 -inherit fdo-mime l10n wxwidgets
65 -
66 -DESCRIPTION="GUI editor for gettext translations files"
67 -HOMEPAGE="https://poedit.net"
68 -SRC_URI="https://github.com/vslavik/${PN}/releases/download/v${PV}-oss/${P}.tar.gz"
69 -
70 -LICENSE="MIT"
71 -SLOT="0"
72 -KEYWORDS="~amd64 ~hppa ~ppc64 ~x86"
73 -IUSE=""
74 -
75 -# db/expat req for legacytm (backwards support for pre 1.6)
76 -# we currently have 1.5.5 in stable so this is enabled
77 -RDEPEND="
78 - app-text/gtkspell:3
79 - dev-cpp/lucene++
80 - dev-libs/boost:=[nls]
81 - dev-libs/expat
82 - dev-libs/icu:=
83 - sys-libs/db[cxx]
84 - x11-libs/gtk+:3
85 - x11-libs/wxGTK:${WX_GTK_VER}[X]
86 - "
87 -
88 -DEPEND="${RDEPEND}
89 - virtual/pkgconfig"
90 -
91 -src_prepare() {
92 - my_rm_loc() {
93 - sed -i -e "/^POEDIT_LINGUAS = /s: ${1}::" locales/Makefile.in || die
94 - rm "locales/${1}.mo" || die
95 - }
96 - l10n_find_plocales_changes 'locales' '' '.mo'
97 - l10n_for_each_disabled_locale_do my_rm_loc
98 -
99 - setup-wxwidgets
100 - default
101 -}
102 -
103 -src_configure() {
104 - econf --without-cpprest --without-cld2
105 -}
106 -
107 -src_install() {
108 - emake DESTDIR="${D}" install
109 - dodoc AUTHORS NEWS README
110 -}
111 -
112 -pkg_postinst() {
113 - fdo-mime_desktop_database_update
114 -}
115 -
116 -pkg_postrm() {
117 - fdo-mime_desktop_database_update
118 -}
119
120 diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
121 index 793fa7c..11158db 100644
122 --- a/app-portage/portage-utils/Manifest
123 +++ b/app-portage/portage-utils/Manifest
124 @@ -1 +1 @@
125 -DIST portage-utils-0.65.tar.xz 542804 SHA256 ad8ae8b78efad421489bc203a6ac610e0d6f45db46281a5a21d4d5f8e1228928 SHA512 a76be4d86b07ba39fa577efe477973f888062094d6f3a98b873e10998e10e3d0d08137444e11d14489ff8f465d984e8929b5ee91c26944bad7a245683ee4d056 WHIRLPOOL de7f8ffc332350f46a17613871405816d6ff618d429f536612479059b785df278d8786e7576651ff8dc61b5bdd7f153b7e64b20c76eb62cdb8e3bea316e5139f
126 +DIST portage-utils-0.70.tar.xz 551192 BLAKE2B ca15637ee6532eebd3a064559bb933aad3042c19994e5dcb8234249312dac139288e4ed38f9c2b46ce1921d97398485bb7276ccf285b2f97df3889a2c91f4d9f SHA512 de3d0813a2e71ca93722828b9b8ee8211e7d5383b81a8ae343624e98618522c0d56945422ae6fadbe0694c4b0f381aa0047eb28bfa7e63e0d95c468e3e2934ab
127
128 diff --git a/app-portage/portage-utils/portage-utils-0.65-r1.ebuild b/app-portage/portage-utils/portage-utils-0.70-r1.ebuild
129 similarity index 84%
130 rename from app-portage/portage-utils/portage-utils-0.65-r1.ebuild
131 rename to app-portage/portage-utils/portage-utils-0.70-r1.ebuild
132 index 7705a85..2797439 100644
133 --- a/app-portage/portage-utils/portage-utils-0.65-r1.ebuild
134 +++ b/app-portage/portage-utils/portage-utils-0.70-r1.ebuild
135 @@ -1,4 +1,4 @@
136 -# Copyright 1999-2017 Gentoo Foundation
137 +# Copyright 1999-2018 Gentoo Foundation
138 # Distributed under the terms of the GNU General Public License v2
139
140 EAPI="6"
141 @@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
142
143 LICENSE="GPL-2"
144 SLOT="0"
145 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
146 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
147 IUSE="nls static"
148
149 RDEPEND="dev-libs/iniparser:0"
150
151 diff --git a/media-gfx/opencsg/Manifest b/media-gfx/opencsg/Manifest
152 deleted file mode 100644
153 index 9f66c08..0000000
154 --- a/media-gfx/opencsg/Manifest
155 +++ /dev/null
156 @@ -1 +0,0 @@
157 -DIST OpenCSG-1.4.2.tar.gz 933135 SHA256 d952ec5d3a2e46a30019c210963fcddff66813efc9c29603b72f9553adff4afb SHA512 fbe6f925982717ecca7bd0eacc4fc5b362c80c7663b1ff0d9a228f2b5e1d3625d3e6d324d9e634665c74e9c0fc37d10290ece293e59a3eba67035b6b700b7778 WHIRLPOOL 6b8666021549e93de0de6ebe3a16a93c3719fec9630623165791ae3761553c339bb19833f73802067cdeabb2f07017db363bee75f49a03eef6a6819349e0e9ee
158
159 diff --git a/media-gfx/opencsg/opencsg-1.4.2.ebuild b/media-gfx/opencsg/opencsg-1.4.2.ebuild
160 deleted file mode 100644
161 index a1a9524..0000000
162 --- a/media-gfx/opencsg/opencsg-1.4.2.ebuild
163 +++ /dev/null
164 @@ -1,41 +0,0 @@
165 -# Copyright 1999-2017 Gentoo Foundation
166 -# Distributed under the terms of the GNU General Public License v2
167 -# $Id$
168 -
169 -EAPI=6
170 -
171 -inherit qmake-utils
172 -
173 -MY_P="OpenCSG-${PV}"
174 -DESCRIPTION="The Constructive Solid Geometry rendering library"
175 -HOMEPAGE="http://www.opencsg.org"
176 -SRC_URI="http://www.opencsg.org/${MY_P}.tar.gz"
177 -
178 -LICENSE="GPL-2"
179 -SLOT="0"
180 -KEYWORDS="~amd64 ~x86"
181 -IUSE=""
182 -
183 -COMMON_DEPEND="media-libs/glew:0 dev-qt/qtcore:4"
184 -DEPEND="${COMMON_DEPEND}"
185 -RDEPEND="${COMMON_DEPEND}"
186 -
187 -S="${WORKDIR}/${MY_P}/src"
188 -
189 -src_prepare() {
190 - default
191 -
192 - # removes duplicated headers
193 - rm -r ../glew || die "failed to remove bundled glew"
194 -
195 - sed -i -e "s:^target.path.*:target.path = \$\$INSTALLDIR/$(get_libdir):" src.pro \
196 - || die 'failed to fix target.path in src.pro'
197 -}
198 -
199 -src_configure() {
200 - eqmake4 src.pro INSTALLDIR=/usr
201 -}
202 -
203 -src_install() {
204 - emake INSTALL_ROOT="${D}" install
205 -}
206
207 diff --git a/media-gfx/openscad/files/50openscad-gentoo.el b/media-gfx/openscad/files/50openscad-gentoo.el
208 deleted file mode 100644
209 index 3cc7c1a..0000000
210 --- a/media-gfx/openscad/files/50openscad-gentoo.el
211 +++ /dev/null
212 @@ -1,3 +0,0 @@
213 -(add-to-list 'load-path "@SITELISP@")
214 -(autoload 'scad-mode "scad-mode" "Major mode for editing SCAD code." t)
215 -(add-to-list 'auto-mode-alist '("\\.scad$" . scad-mode))
216
217 diff --git a/media-gfx/openscad/metadata.xml b/media-gfx/openscad/metadata.xml
218 deleted file mode 100644
219 index 9e07fd9..0000000
220 --- a/media-gfx/openscad/metadata.xml
221 +++ /dev/null
222 @@ -1,11 +0,0 @@
223 -<?xml version="1.0" encoding="UTF-8"?>
224 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
225 -<pkgmetadata>
226 - <maintainer type="person">
227 - <email>xmw@g.o</email>
228 - <name>michael weber</name>
229 - </maintainer>
230 - <longdescription>
231 -OpenSCAD is a software for creating solid 3D CAD objects. Unlike most free software for creating 3D models (such as the famous application Blender) it does not focus on the artistic aspects of 3D modelling but instead on the CAD aspects. Thus it might be the application you are looking for when you are planning to create 3D models of machine parts but pretty sure is not what you are looking for when you are more interested in creating computer-animated movies. OpenSCAD is free software and available for Linux/UNIX, MS Windows and Mac OS X.
232 - </longdescription>
233 -</pkgmetadata>
234
235 diff --git a/media-gfx/openscad/openscad-9999.ebuild b/media-gfx/openscad/openscad-9999.ebuild
236 deleted file mode 100644
237 index 6c96c9c..0000000
238 --- a/media-gfx/openscad/openscad-9999.ebuild
239 +++ /dev/null
240 @@ -1,77 +0,0 @@
241 -# Copyright 1999-2017 Gentoo Foundation
242 -# Distributed under the terms of the GNU General Public License v2
243 -
244 -EAPI=6
245 -
246 -inherit elisp-common eutils git-r3 qmake-utils
247 -
248 -SITEFILE="50${PN}-gentoo.el"
249 -
250 -DESCRIPTION="The Programmers Solid 3D CAD Modeller"
251 -HOMEPAGE="http://www.openscad.org/"
252 -EGIT_REPO_URI="https://github.com/openscad/openscad.git"
253 -
254 -LICENSE="GPL-2"
255 -SLOT="0"
256 -KEYWORDS=""
257 -IUSE="emacs qt4 +qt5"
258 -
259 -DEPEND="media-gfx/opencsg
260 - sci-mathematics/cgal
261 - qt5? (
262 - dev-qt/qtcore:5
263 - dev-qt/qtgui:5[-gles2]
264 - dev-qt/qtopengl:5
265 - )
266 - qt4? (
267 - dev-qt/qtcore:4
268 - dev-qt/qtgui:4[-egl]
269 - dev-qt/qtopengl:4[-egl]
270 - )
271 - dev-cpp/eigen:3
272 - dev-libs/glib:2
273 - dev-libs/gmp:0=
274 - dev-libs/mpfr:0=
275 - dev-libs/boost:=
276 - media-libs/fontconfig:1.0
277 - media-libs/freetype:2
278 - media-libs/glew:*
279 - media-libs/harfbuzz
280 - x11-libs/qscintilla:=[qt4=,qt5=]
281 - emacs? ( virtual/emacs )"
282 -RDEPEND="${DEPEND}"
283 -
284 -REQUIRED_USE="^^ ( qt4 qt5 )"
285 -
286 -src_prepare() {
287 - sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro || die
288 -
289 - default
290 -}
291 -
292 -src_configure() {
293 - if use qt5; then
294 - eqmake5 "${PN}.pro"
295 - else
296 - eqmake4 "${PN}.pro"
297 - fi
298 -}
299 -
300 -src_compile() {
301 - default
302 -
303 - if use emacs ; then
304 - elisp-compile contrib/*.el
305 - fi
306 -}
307 -
308 -src_install() {
309 - emake install INSTALL_ROOT="${D}"
310 -
311 - if use emacs; then
312 - elisp-site-file-install "${FILESDIR}/${SITEFILE}"
313 - elisp-install ${PN} contrib/*.el contrib/*.elc
314 - fi
315 -
316 - einstalldocs
317 -}
318
319 diff --git a/metadata/layout.conf b/metadata/layout.conf
320 index ca9fee1..329f7e8 100644
321 --- a/metadata/layout.conf
322 +++ b/metadata/layout.conf
323 @@ -1,2 +1,3 @@
324 masters = gentoo
325 thin-manifests = true
326 +manifest-hashes = BLAKE2B SHA512