media-gfx/librecad: version bump 2.0.8

4 files changed, 103 insertions, 9 deletions

diff --git a/media-gfx/librecad/ChangeLog b/media-gfx/librecad/ChangeLog
index f1965b136..c810091b5 100644
--- a/media-gfx/librecad/ChangeLog
+++ b/media-gfx/librecad/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header$
 
+  26 Aug 2015; Dongxu Li <dongxuli2011@gmail.com>
+  +librecad-2.0.8.ebuild librecad-9999.ebuild:
+  version bump: 2.0.8, qt5 support
+
   05 Apr 2015; Dongxu Li <dongxuli2011@gmail.com>
   librecad-2.0.7.ebuild librecad-9999.ebuild:
   fixed doc and appdata installation
diff --git a/media-gfx/librecad/Manifest b/media-gfx/librecad/Manifest
index 2cef675a6..1955e9c1c 100644
--- a/media-gfx/librecad/Manifest
+++ b/media-gfx/librecad/Manifest
@@ -1,3 +1,4 @@
 DIST librecad-1.0.3.tar.gz 4578450 SHA256 8c2f5a7e55a4ae41a9bd47e2e7981577c740edd526e1f305cd6cbf581d053f30 SHA512 5a8e6e612bc954f3af0dfc26d1fc19938c80e216ac252fb65a38a13651c6e2313d593a3ee834ecc98bbd72a4dfd28ef1c39dd9ed6a6f9140d28b765edb59bee9 WHIRLPOOL d8157af2021bba2cee626d023125045455a2fe5f453ae065c9660be61f4c0d687a1c72957d1af1aa640cfde3815625bb7d0899dc5541fcb82bfe0eea4cfad6c6
 DIST librecad-1.0.4.tar.gz 4578450 SHA256 8c2f5a7e55a4ae41a9bd47e2e7981577c740edd526e1f305cd6cbf581d053f30 SHA512 5a8e6e612bc954f3af0dfc26d1fc19938c80e216ac252fb65a38a13651c6e2313d593a3ee834ecc98bbd72a4dfd28ef1c39dd9ed6a6f9140d28b765edb59bee9 WHIRLPOOL d8157af2021bba2cee626d023125045455a2fe5f453ae065c9660be61f4c0d687a1c72957d1af1aa640cfde3815625bb7d0899dc5541fcb82bfe0eea4cfad6c6
 DIST librecad-2.0.7.zip 17457197 SHA256 b0e031bca4f00730076606e830d0d559824d0000f8a3e5c1918c4f0b6e507b71 SHA512 432622c9f7d1d006172ec964fc8bb338e5019a70ecd0e6c3d524bf1458febe35a7cb929cc9323df61275247582cb86c6111d4c03e7255da90ffd14a15734abe6 WHIRLPOOL 605937f8028f28d5a94226372f59df2b5975a2c1245303c2fd7b3089babdc4cb230290a96ba283de7230e6c98dccb91b3c9d7f1cdbf6649bef5a8d5cd8f2a140
+DIST librecad-2.0.8.zip 23469997 SHA256 3f3affbff85fd16746a0e551777c4f234d2b03384d04edf9483d36db1c7144a3 SHA512 d0dd1fdcaafbb7b83a8d0791e132633e9a72648d7d8d7ffdfc02bb092348472a05917df7ea1f2096404afabc92d586b75f6cafa3bc54da535bcaf005c96ed8a7 WHIRLPOOL 14ae2c433345b5081c92426913744d57f2fa4a97621fb55143995365381d5fbed6c8ad6a1f3a6d215dc4791e3493259b3e09801bfb288a85de7db87f010aae49
diff --git a/media-gfx/librecad/librecad-2.0.8.ebuild b/media-gfx/librecad/librecad-2.0.8.ebuild
new file mode 100644
index 000000000..cd1777537
--- /dev/null
+++ b/media-gfx/librecad/librecad-2.0.8.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils qmake-utils
+
+DESCRIPTION="Generic 2D CAD program"
+HOMEPAGE="http://www.librecad.org/"
+SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.zip -> ${P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="3d debug doc tools qt4 +qt5"
+REQUIRED_USE="|| ( qt4 qt5 )"
+
+DEPEND="
+	qt4? (
+	            dev-qt/qtcore:4
+	            dev-qt/qtgui:4
+	            dev-qt/qtsvg:4
+	            dev-qt/qthelp:4
+	)
+	qt5? (
+	            dev-qt/qtcore:5
+	            dev-qt/qtgui:5
+	            dev-qt/qthelp:5
+	            dev-qt/qtsvg:5
+	            dev-qt/qtwidgets:5
+	            dev-qt/qtxml:5
+	)
+
+	dev-libs/boost
+	dev-cpp/muParser
+	media-libs/freetype"
+
+RDEPEND="${DEPEND}"
+S="${WORKDIR}/LibreCAD-${PV}"
+
+src_prepare() {
+	# currently RS_VECTOR3D causes an internal compiler error on GCC-4.8
+	use 3d || sed -i -e '/RS_VECTOR2D/ s/^#//' librecad/src/src.pro || die
+}
+
+src_configure() {
+	    if use qt4; then
+	            eqmake4 -r
+			else
+	            eqmake5 -r
+	    fi
+}
+
+src_install() {
+	dobin unix/librecad
+	use tools && dobin unix/ttf2lff
+	insinto /usr/share/${PN}
+	doins -r unix/resources/*
+	use doc && dohtml -r librecad/support/doc/*
+	insinto /usr/share/appdata
+	doins unix/appdata/librecad.appdata.xml
+	doicon librecad/res/main/"${PN}".png
+	make_desktop_entry ${PN} LibreCAD ${PN} Graphics
+}
diff --git a/media-gfx/librecad/librecad-9999.ebuild b/media-gfx/librecad/librecad-9999.ebuild
index 4858c75c7..0c63626d0 100644
--- a/media-gfx/librecad/librecad-9999.ebuild
+++ b/media-gfx/librecad/librecad-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit qt4-r2 eutils git-r3
+inherit eutils git-r3 qmake-utils
 
 DESCRIPTION="Generic 2D CAD program"
 HOMEPAGE="http://www.librecad.org/"
@@ -14,24 +14,48 @@ EGIT_REPO_URI="https://github.com/LibreCAD/LibreCAD.git"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug doc"
+IUSE="3d debug doc tools qt4 +qt5"
+REQUIRED_USE="|| ( qt4 qt5 )"
+
+DEPEND="
+	qt4? (
+	            dev-qt/qtcore:4
+	            dev-qt/qtgui:4
+	            dev-qt/qtsvg:4
+	            dev-qt/qthelp:4
+	)
+	qt5? (
+	            dev-qt/qtcore:5
+	            dev-qt/qtgui:5
+	            dev-qt/qthelp:5
+	            dev-qt/qtsvg:5
+	            dev-qt/qtwidgets:5
+	            dev-qt/qtxml:5
+	)
 
-DEPEND="${RDEPEND}
-	dev-qt/qtgui:4
-	dev-qt/qthelp:4
-	dev-qt/qtsvg:4
 	dev-libs/boost
 	dev-cpp/muParser
 	media-libs/freetype"
 
+RDEPEND="${DEPEND}"
+S="${WORKDIR}/LibreCAD-${PV}"
+
 src_prepare() {
-	#sed -i -e "s:\\\$\+system(git describe --tags):9999:" src/src.pro
-	#enable C++11 by default
-	sed -i -e '/RS_VECTOR2D/ s/^#//' librecad/src/src.pro || die
+	# currently RS_VECTOR3D causes an internal compiler error on GCC-4.8
+	use 3d || sed -i -e '/RS_VECTOR2D/ s/^#//' librecad/src/src.pro || die
+}
+
+src_configure() {
+	    if use qt4; then
+	            eqmake4 -r
+			else
+	            eqmake5 -r
+	    fi
 }
 
 src_install() {
 	dobin unix/librecad
+	use tools && dobin unix/ttf2lff
 	insinto /usr/share
 	doins -r unix/appdata
 	insinto /usr/share/${PN}