gentoo resync : 28.04.2019

4 files changed, 38 insertions, 34 deletions

diff --git a/media-gfx/openscad/Manifest b/media-gfx/openscad/Manifest
index 7dfcf9e72d4f..90199d16e73a 100644
--- a/media-gfx/openscad/Manifest
+++ b/media-gfx/openscad/Manifest
@@ -1,6 +1,6 @@
 AUX 50openscad-gentoo.el 167 BLAKE2B 36292439057e2b9a5993c73cf5d46e5b6b0b56695f46307114fcfffa79990be0b0622ec3a6918726d4a5f7e4343525b9e67f785996ec4eb7abb938b6df1cb2f7 SHA512 ce669eba45ab90e9dbcd770a7470ca9ed7088b1acabbc876fe4d31dc7a6edd36076063e4bd417d348c3e073113e3ad2bc2dd0ac89e02d3d8aeca7627ad7d2a1e
 AUX openscad-2015.03_p2_uic_tr_fix.patch 345 BLAKE2B 46f19ba25f9a19b2b6841493877d14a0c6c3c8dcf7d8e5ec65d4d0d8fc5c79b15467b71dd29bfeb38decd4f100d06e9fe185c1670f336672998ef02e9e59794c SHA512 9f4bd1deb85a52e1ab8fd35b384552f902b03d1f06b58144013e722d906604b96c17abf4e4074042487c945419c51432e639120ddecda143a6cb9a2b902548e2
 DIST openscad-2015.03-3.src.tar.gz 13309147 BLAKE2B 77f4e934474882e454dad683d9da6a2c9fe699a84c86ed5ebe1755de037f6930870ffb432dedeef3bea7a76cbc98d0f0d0694e5d0f7b469830370ca3548a650c SHA512 b2cee90563bdf2cb9f7b5a0d637b2266f5fcd62add6147c9326b843a5b0975b8ec900d13a2aa86485fce4a5e7e53a08cf4171a3d1d66355e813d01ca9096faee
-EBUILD openscad-2015.03_p3.ebuild 1584 BLAKE2B b283c7b93ac0797ec7a7884047568e07773c6714ca0ea787ad8c4003fe85cfc7219bcca0dbcb1149063580109d2e6c419ce4a9a6f2ef0cbbb8a87d33907637e5 SHA512 e5ce533fce3fe8bdcdcd86b62a7aa77073a2acf572f1c386e4fded6d023bc3571757f8513c1ab538d59f70ee1e3a11c63b951e93224abbfd2baf09dec7430419
-EBUILD openscad-9999.ebuild 1463 BLAKE2B afe4a5aa2b53e6667626605fe869a76318d9f74933cb0e1f6f8e1ad7d7e17e42bdd93cb306689fac49622fb8f62659911512cacc762406e488068fd738ec3a97 SHA512 04900830eef04f18fcb64ad35a7e60ef00247acfcdfbe63f3a685ddd39bc699198f4addf2a47141018c5c4cf551f01f60d7b3ee48088f9aaf9cbe4ae216d987b
-MISC metadata.xml 754 BLAKE2B d8247b4210f8e5470a0e2bbbb21c4b0755b7aa0beac0f75845bdda5135eb86a9214888cca436a02b7e566520865aae7714a9942bb5871c8e8fd54240b933abb4 SHA512 23905b2fb9ff937bdaee469086c9eefc3404de22e72be73f470ee51b9d078da20c856918d320c7156221708c11855a7e12ff6f277f4d5cfad671dcb4d9911c40
+EBUILD openscad-2015.03_p3-r1.ebuild 1552 BLAKE2B 99950ff5682870f6068b2c5b22d89980df3328924603eb87316038d1b32b11591c08c153809b390188a24232762f177687b71879f385b96774529e2f6de6577c SHA512 30775ffdb75080c69eea9aa1d8d7b4c093c33760f490b5f695ef9bba30dab412d8fe001cdff66b69623169eb0d6b3399bf469cce023b4b79e53b7ddd7ee41c21
+EBUILD openscad-9999.ebuild 1365 BLAKE2B 2d00f343fd981e771b5215146d26017949dfa2c29f358a5430ce353a5bfc11e481b04b270e89a7f5717c1a535d3c93ae5b794fd2cad5834f86294927708ec3ca SHA512 d3dc21a02a29fca95aa8df5e8b650eae61f31b3fd1ab61a0dbe4c303b974f5bd27a75f92b873b3f4c0e56699afbf37ee0bf53f44fc62c59c099e1caf9cf84977
+MISC metadata.xml 1025 BLAKE2B f1d33e8f6f5f045c0993882d461e9bd8457fc33ee5c32b115540abe18e66b8020ae2ba0f6a593b3e7feb3e48c1d85554bb8340ee0606541964770a40dafc76b6 SHA512 951f3c8d8f68fa60d56f2c01014ab757fc4a72a7d1c98518c3d4c80db55878740a8c267b87e734cc29284fe2bd05e0b54a13c0b09eb9fd8f10fb67a051b687be
diff --git a/media-gfx/openscad/metadata.xml b/media-gfx/openscad/metadata.xml
index a11c32d6c96b..7b83ba148002 100644
--- a/media-gfx/openscad/metadata.xml
+++ b/media-gfx/openscad/metadata.xml
@@ -1,8 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription>
-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.
-	</longdescription>
+<maintainer type="person">
+	<email>waebbl@gmail.com</email>
+	<name>Bernd Waibel</name>
+</maintainer>
+<maintainer type="project">
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
+<longdescription>
+	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.
+</longdescription>
+<upstream>
+	<remote-id type="github">openscad/openscad</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/media-gfx/openscad/openscad-2015.03_p3.ebuild b/media-gfx/openscad/openscad-2015.03_p3-r1.ebuild
index aee0a681df2e..1b34fa207c5e 100644
--- a/media-gfx/openscad/openscad-2015.03_p3.ebuild
+++ b/media-gfx/openscad/openscad-2015.03_p3-r1.ebuild
@@ -1,11 +1,14 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit elisp-common qmake-utils xdg-utils
+inherit elisp-common qmake-utils xdg
 
-MY_PV="2015.03-3"
+# 2015.03-3
+MY_VER=$(ver_cut 1-2) # version component
+MY_REL=$(ver_cut 4) # release component, 'p' being the third component
+MY_PV=${MY_VER}-${MY_REL}
 SITEFILE="50${PN}-gentoo.el"
 
 DESCRIPTION="The Programmers Solid 3D CAD Modeller"
@@ -72,13 +75,3 @@ src_install() {
 
 	einstalldocs
 }
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/openscad/openscad-9999.ebuild b/media-gfx/openscad/openscad-9999.ebuild
index 4dd3247d891b..e885fba11965 100644
--- a/media-gfx/openscad/openscad-9999.ebuild
+++ b/media-gfx/openscad/openscad-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit elisp-common git-r3 qmake-utils xdg-utils
+inherit elisp-common git-r3 qmake-utils xdg
 
 SITEFILE="50${PN}-gentoo.el"
 
@@ -21,10 +21,13 @@ DEPEND="
 	dev-libs/boost:=
 	dev-libs/glib:2
 	dev-libs/gmp:0=
+	dev-libs/libzip:=
 	dev-libs/mpfr:0=
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
 	dev-qt/qtgui:5[-gles2]
+	dev-qt/qtmultimedia:5[-gles2]
 	dev-qt/qtopengl:5
 	media-gfx/opencsg
 	media-libs/fontconfig:1.0
@@ -68,13 +71,3 @@ src_install() {
 
 	einstalldocs
 }
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}