[gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/, media-gfx/openscad/files/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     82b27387e7847268227a680fe402f63fd4b97113
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 21 21:14:15 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Oct 21 21:24:09 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82b27387

media-gfx/openscad: Switch to Qt5, add xdg-utils

Drop unused eutils.eclass.

Thanks-to: maurerpe <junk4me46806 <AT> yahoo.com>
Gentoo-bug: 623610
Package-Manager: Portage-2.3.12, Repoman-2.3.3

 .../files/openscad-2015.03_p2_uic_tr_fix.patch     | 14 +++++++
 ...d-9999.ebuild => openscad-2015.03_p2-r3.ebuild} | 47 +++++++++++++++-------
 media-gfx/openscad/openscad-9999.ebuild            | 36 +++++++++++------
 3 files changed, 71 insertions(+), 26 deletions(-)

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 00000000000..ef0bcc421eb
--- /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-9999.ebuild b/media-gfx/openscad/openscad-2015.03_p2-r3.ebuild
similarity index 56%
copy from media-gfx/openscad/openscad-9999.ebuild
copy to media-gfx/openscad/openscad-2015.03_p2-r3.ebuild
index 95b2d243082..a9e86a2a047 100644
--- a/media-gfx/openscad/openscad-9999.ebuild
+++ b/media-gfx/openscad/openscad-2015.03_p2-r3.ebuild
@@ -3,45 +3,54 @@
 
 EAPI=6
 
-inherit elisp-common eutils git-r3 qmake-utils
+inherit elisp-common qmake-utils xdg-utils
 
+MY_PV="2015.03-2"
 SITEFILE="50${PN}-gentoo.el"
 
 DESCRIPTION="The Programmers Solid 3D CAD Modeller"
 HOMEPAGE="http://www.openscad.org/"
-EGIT_REPO_URI="https://github.com/openscad/openscad.git"
+SRC_URI="http://files.openscad.org/${PN}-${MY_PV}.src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
+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}"
 
-src_prepare() {
-	sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro || die
+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
 }
 
 src_configure() {
-	eqmake4 "${PN}.pro"
+	eqmake5 "${PN}.pro"
 }
 
 src_compile() {
@@ -62,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 95b2d243082..781c41bb5f0 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
+}