gentoo resync : 29.10.2017

5 files changed, 67 insertions, 80 deletions

diff --git a/media-gfx/openscad/Manifest b/media-gfx/openscad/Manifest
index f82de386c787..71d62c67bcd2 100644
--- a/media-gfx/openscad/Manifest
+++ b/media-gfx/openscad/Manifest
@@ -1,8 +1,8 @@
 AUX 50openscad-gentoo.el 167 SHA256 45ed16a3c90a663d3ad95cef44dfd5c653deb5a3e60d978c03d63c2875c6141b SHA512 ce669eba45ab90e9dbcd770a7470ca9ed7088b1acabbc876fe4d31dc7a6edd36076063e4bd417d348c3e073113e3ad2bc2dd0ac89e02d3d8aeca7627ad7d2a1e WHIRLPOOL 0840035c763c131962132c894ba0b32102e815eb0810ee98c8541fef5e09d673313f491399d3196eb3dd089079ab3fd2154c4703c7bb1cf0c4247e80fc16e0e5
+AUX openscad-2015.03_p2_uic_tr_fix.patch 345 SHA256 c1efe3fae4ce1e2ab23d2b5072f6c19adea8ae295c6ae14913f70a76ad1bca48 SHA512 9f4bd1deb85a52e1ab8fd35b384552f902b03d1f06b58144013e722d906604b96c17abf4e4074042487c945419c51432e639120ddecda143a6cb9a2b902548e2 WHIRLPOOL e187c01aa30577f41eac30b2744133eb7f346d9dde96c8b2bc0f8fad1c388c5e8b64fa74da2fe1cb9d2c4b123baae21b5a4cd7d0bd965a58cc99f672805a451a
 DIST openscad-2015.03-2.src.tar.gz 13307974 SHA256 a2535bb9e27d96e10e1e19268a596155164c7129d410a0c7f96edc2d09400083 SHA512 66e93715987a5211ce15c10ea39a9fec3296b606ace0aba1cda019635d5b26021457c8e49f389daa90a0da02e41007eab662e1ed6608cb51c24de00253b9783f WHIRLPOOL 1454a22464f5dcf9726d5bb4fa5f7c080e419e44a3877a5ac43590e2b0552ecb169a9d2a9e15868c8020ffcfb894fc84f0269460f032f516ec9286f27155ca73
-EBUILD openscad-2015.03_p2-r1.ebuild 1066 SHA256 9465089bcc969fe54a16dd7009beec94c7b7b81d82c342f2b448e8479c7f655f SHA512 483d549608f9d1627922023c45ce185b653cbdaf812c63a8da01108c2148dbc7e716e74d7e0c1df061c6ccb9b4d99f1eb177ea09ce733f329b765ff1b288dbb4 WHIRLPOOL 7abd4385079ed046f54f01f06cee57e9ab012508d3f4ec9fed6941fd57cfcbdee31650e3af21985b6cc669499f4074bd5a784b080164ad52d4e97182baf15a6d
-EBUILD openscad-2015.03_p2-r2.ebuild 1328 SHA256 11602631d73cb370e2a5ae3072f62d7a542d437dc3904e316d25f2a3669b9070 SHA512 dd31cc128432763c3f02678363e5bba28798831aa589e0e613fccbd4cb3113947ca4b28a231dd9ab1c01730403829b4cc0dfd6f40b59c476a8b22f45129bc521 WHIRLPOOL 7efee2e250170c8a7ee157ecf497a0666063ea115047a309ecc020b6931b1e68d0109632083f65ec15c460dc58f0a163d783d5399965c57fbd23d2e7db4d60c0
-EBUILD openscad-9999.ebuild 1157 SHA256 defcb6541bec05738a084677760d6711963f5b0430e5caed96c541caa6a10176 SHA512 f581512ac8edb8086f77296886ce32e23352cc36a5e8102cd96e915d0b964a5b564e16dc367da94857b1928248607bda447970745b46c2c61d0507b8d043b8ae WHIRLPOOL d5cdcf56f667dde69c640e21919ee95250d445d1fdc535a73b4b476252a6b4662f24b62750b3f23bde2a7f9d793f5c5d92f15f2ff417c260be784faf56470e45
+EBUILD openscad-2015.03_p2-r3.ebuild 1533 SHA256 c52b438c5e50cdfdebba0be90b04e6831c814088cbb59c52cc5d987f4bd7835b SHA512 9f567f997e1f6b0f3dbe58e24678b0d3d271d4da224fe180189a3b73dce5dff5f837834d8f88981f1278d09d0e6a48f269460a6299651f244fe2836e66e8340d WHIRLPOOL 2d2d323199899700127ec43181edc0f1e297d3a0e5d428969daf866a5644e7819332a417970de365dfc6ca43a6385810162bddbe69a336883b5534f44e1b622d
+EBUILD openscad-9999.ebuild 1317 SHA256 ea3c6836b5c70f1104bfaf3e59baec2842012ed00ad4809c56c831ad38bd14c2 SHA512 e3e8711944d81ed93be206e2fcd15883b3716411854986232ff0a0acdd1d4bb75b7f9634df1578649584a2c9bced88c40fb3af840aec4a12838c3407ee01c209 WHIRLPOOL 3ac23511a49428bbe5ada40cc36c28f24f45288a9e6aa51d8ba69bdb760f42d15b67a776799518c5b34354552c9a032b0418f5107f7c985eeb03e5f0d7ae656e
 MISC ChangeLog 3209 SHA256 9d2fba0d7e98e0171fc2dad0642b3f0ac0e2422d8d6beb490c466daecbe51c81 SHA512 450299105f20f6c7eeb51dabdc6b7ba99f72d533ee0b02a82f924fbd8b57869578d9ecf723caf11d9db3fd26ffb268bb71243d9937345a41cf1f6740b824c235 WHIRLPOOL bc009a72a50a52f93bb5e1ced3bffe36bae908a46887f74848f2406c7d57446a59e019e5c4ed7d3481f4781a7ed921acc87b77740e3b134b829fa1cf9f48c304
 MISC ChangeLog-2015 1547 SHA256 b428dfdef4d7fba0346aaab3071a34b669793adcdc3ff47fdbcfb9c641718d9d SHA512 2cdd2755244984c643f4ac3681bfb9c6f2c3b17732863cf619f7514a200a6535c8b276e3aacda6a2d5464be954b8e07a13a90ba2b746904711ad18342ad1197f WHIRLPOOL e81a768275199a46ccf27af4f69b8d175b319d3167c893b710a7cf768d037accfb2bc0e217f76391281ef83881a0fe4eaca867ac9641c23d83dd143316d4d931
 MISC metadata.xml 830 SHA256 486a5b64ebd3b6b0fbb0be8b3cfde01f73e8735020f7ad90fec6754abd63cf08 SHA512 8c12064c65b8ffca0ad8ec585d3de5ed4ac17bec6e4c7340aba2980d2ddb047d1f7b0c5405cdb4b72869749f6ebaddf29bd6fa03eec8e71c8fa2ea3910767617 WHIRLPOOL 1d8b8520425bf31857948e1d80c8f29c1d2bedd36f05638262fa7db8caf1b980ae396be5def4ed9dcfee12e0879a4442166125bd33a9c51bb54ba9a997500bf2
diff --git a/media-gfx/openscad/files/openscad-2015.03_p2_uic_tr_fix.patch b/media-gfx/openscad/files/openscad-2015.03_p2_uic_tr_fix.patch
new file mode 100644
index 000000000000..ef0bcc421eb7
--- /dev/null
+++ b/media-gfx/openscad/files/openscad-2015.03_p2_uic_tr_fix.patch
@@ -0,0 +1,14 @@
+--- a/src/qtgettext.h	2017-03-22 00:17:29.808058905 -0400
++++ b/src/qtgettext.h	2017-03-22 00:18:55.251184835 -0400
+@@ -22,5 +22,10 @@
+ 	return QString::fromUtf8( _( msgid ) );
+ }
+ 
+-#endif
++inline QString _( const char *msgid, const char *disambiguation )
++{
++	Q_UNUSED( disambiguation );
++	return QString::fromUtf8( _( msgid ) );
++}
+ 
++#endif
diff --git a/media-gfx/openscad/openscad-2015.03_p2-r1.ebuild b/media-gfx/openscad/openscad-2015.03_p2-r1.ebuild
deleted file mode 100644
index 1b882516d55d..000000000000
--- a/media-gfx/openscad/openscad-2015.03_p2-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils qmake-utils
-
-MY_PV="2015.03-2"
-
-DESCRIPTION="The Programmers Solid 3D CAD Modeller"
-HOMEPAGE="http://www.openscad.org/"
-SRC_URI="http://files.openscad.org/${PN}-${MY_PV}.src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND="media-gfx/opencsg
-	sci-mathematics/cgal
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4[-egl]
-	dev-qt/qtopengl:4[-egl]
-	dev-cpp/eigen:3
-	dev-libs/glib:2
-	dev-libs/gmp:0=
-	dev-libs/mpfr:0=
-	dev-libs/boost:=
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	media-libs/glew:*
-	media-libs/harfbuzz
-	x11-libs/qscintilla:=[qt4(-)]"
-DEPEND="${CDEPEND}"
-RDEPEND="${CDEPEND}"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
-	#Use our CFLAGS (specifically don't force x86)
-	sed -i "s/QMAKE_CXXFLAGS_RELEASE = .*//g" ${PN}.pro  || die
-	sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro || die
-
-	eapply_user
-}
-
-src_configure() {
-	eqmake4 "${PN}.pro"
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-	einstalldocs
-}
diff --git a/media-gfx/openscad/openscad-2015.03_p2-r2.ebuild b/media-gfx/openscad/openscad-2015.03_p2-r3.ebuild
index 67206bfa9e1f..095f06b83030 100644
--- a/media-gfx/openscad/openscad-2015.03_p2-r2.ebuild
+++ b/media-gfx/openscad/openscad-2015.03_p2-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit elisp-common eutils qmake-utils
+inherit elisp-common qmake-utils xdg-utils
 
 MY_PV="2015.03-2"
 SITEFILE="50${PN}-gentoo.el"
@@ -17,36 +17,40 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="emacs"
 
-DEPEND="media-gfx/opencsg
-	sci-mathematics/cgal
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4[-egl]
-	dev-qt/qtopengl:4[-egl]
+DEPEND="
 	dev-cpp/eigen:3
+	dev-libs/boost:=
 	dev-libs/glib:2
 	dev-libs/gmp:0=
 	dev-libs/mpfr:0=
-	dev-libs/boost:=
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtopengl:5
+	media-gfx/opencsg
 	media-libs/fontconfig:1.0
 	media-libs/freetype:2
 	media-libs/glew:*
 	media-libs/harfbuzz
-	x11-libs/qscintilla:=[qt4(-)]
-	emacs? ( virtual/emacs )"
+	sci-mathematics/cgal:=
+	>=x11-libs/qscintilla-2.9.4:=[qt5(+)]
+	emacs? ( virtual/emacs )
+"
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${P}_uic_tr_fix.patch" )
+
 S="${WORKDIR}/${PN}-${MY_PV}"
 
 src_prepare() {
+	default
+
 	#Use our CFLAGS (specifically don't force x86)
 	sed -i "s/QMAKE_CXXFLAGS_RELEASE = .*//g" ${PN}.pro  || die
 	sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro || die
-
-	eapply_user
 }
 
 src_configure() {
-	eqmake4 "${PN}.pro"
+	eqmake5 "${PN}.pro"
 }
 
 src_compile() {
@@ -67,3 +71,13 @@ 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 95b2d2430823..60c555369540 100644
--- a/media-gfx/openscad/openscad-9999.ebuild
+++ b/media-gfx/openscad/openscad-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit elisp-common eutils git-r3 qmake-utils
+inherit elisp-common git-r3 qmake-utils xdg-utils
 
 SITEFILE="50${PN}-gentoo.el"
 
@@ -16,32 +16,34 @@ SLOT="0"
 KEYWORDS=""
 IUSE="emacs"
 
-DEPEND="media-gfx/opencsg
-	sci-mathematics/cgal
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4[-egl]
-	dev-qt/qtopengl:4[-egl]
+DEPEND="
 	dev-cpp/eigen:3
+	dev-libs/boost:=
 	dev-libs/glib:2
 	dev-libs/gmp:0=
 	dev-libs/mpfr:0=
-	dev-libs/boost:=
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtopengl:5
+	media-gfx/opencsg
 	media-libs/fontconfig:1.0
 	media-libs/freetype:2
 	media-libs/glew:*
 	media-libs/harfbuzz
-	x11-libs/qscintilla:=[qt4(-)]
-	emacs? ( virtual/emacs )"
+	sci-mathematics/cgal:=
+	>=x11-libs/qscintilla-2.9.4:=[qt5(+)]
+	emacs? ( virtual/emacs )
+"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro || die
-
 	default
+
+	sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro || die
 }
 
 src_configure() {
-	eqmake4 "${PN}.pro"
+	eqmake5 "${PN}.pro"
 }
 
 src_compile() {
@@ -62,3 +64,13 @@ src_install() {
 
 	einstalldocs
 }
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}