From 02e2208f46f4e2c00fb9743cbc47350bdd233bfa Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Tue, 16 Jan 2018 17:34:21 +0000
Subject: gentoo resync : 16.01.2018

---
 media-gfx/librecad/Manifest                 |  5 +--
 media-gfx/librecad/librecad-2.1.3-r1.ebuild | 69 -----------------------------
 media-gfx/librecad/librecad-2.1.3-r2.ebuild | 23 +++++-----
 media-gfx/librecad/librecad-9999.ebuild     | 42 ++++++------------
 4 files changed, 26 insertions(+), 113 deletions(-)
 delete mode 100644 media-gfx/librecad/librecad-2.1.3-r1.ebuild

(limited to 'media-gfx/librecad')

diff --git a/media-gfx/librecad/Manifest b/media-gfx/librecad/Manifest
index 9336e39e6adc..520ed904515e 100644
--- a/media-gfx/librecad/Manifest
+++ b/media-gfx/librecad/Manifest
@@ -1,5 +1,4 @@
 DIST librecad-2.1.3.zip 26086377 BLAKE2B 7f137c1f6c80f10b803ffbe8a739c230664d81003e47dc0f7b82509fdf0534e5fe046cbc6efaa75149daeaf6f0fa217c1fd08e4de83c74361c99108b6b8fd53a SHA512 9a41c17b512ccbc1a0ebb0e6da8e7297663490479f042fadaffda819e371afc7fa49b789449df9fd4e36a2e2b6f95b9b5be19df47cf3c4252111db2a7ed7f009
-EBUILD librecad-2.1.3-r1.ebuild 1418 BLAKE2B db2d3476c190f0e45b9ed1786de2369b887db0c3cdba7abfb259733123a2b96b4dd423236e05b4b8f4eba3a5254a1381ba4f9323fe171359e9cda7ff3205a2d1 SHA512 6489a761f0bad291fc536047653edfb527240fd8582428cb4811b3c5197a9e6a51b143dd650541f543ab4b312c71fc8a626248c8569ac1fbb6b5fe302e660761
-EBUILD librecad-2.1.3-r2.ebuild 1285 BLAKE2B 0dec0e60b81639a3c4850958d228c41df434ff508b83602c55ae493b7672544cb3fecf56e7a86762eb631414e83daf717f316a62d1fd2dc6d9e09cc9479f330a SHA512 639783a6be5bfb84267e6abb1c36db443f99edde1e2098705307d0888fe48d0310bcb10026a6e81ac5f1a749649863bbec789ceb7df59956bcaa973a614624bb
-EBUILD librecad-9999.ebuild 1344 BLAKE2B 7e2d33864340058bf32c0d6f541bfe7b7a16daf386d35015f39535f5ddbee51b2a46d99c7a5a7437d9763e4f953e0bbc9f4fab1d99bf42d1240247c1052e3993 SHA512 722322ffaab726f066da0497261ba9d9f4eedab1f885e1d19b587bfbae5745cfde7399c24767f303a9c76a7d456d7564b3cc9d872b875be2a4cab8c499e6589d
+EBUILD librecad-2.1.3-r2.ebuild 1238 BLAKE2B 4d8663d5bd9897969121283c5d272dfea333dd23e58dac53ee284721a50fc19ebf3ddb915bafa08bf07fb9e649e562256d476cd799c9ab9b2a6f33b30e25daf6 SHA512 ac694a6f1d02179250898479ee0cd0d819793ec4c9747d3f062ee72e2b13438174008cf507aa55f741371de42d1f18c06cb11f0f5edf5e237f88612071cac0a8
+EBUILD librecad-9999.ebuild 1183 BLAKE2B 0cb201b0865a6698ad8cc905c23487caabc22255a4bf2167080f4a7e06ca356f6a350e279c9b115a2a48c329402d4cc81e222a162ad8d86815b7e0f28afc85d3 SHA512 0eacdcb74fbef5864e20db36d7006d1e080a1dd9fc9197ba874e4724add193b8a6b95c31ad9a0ffaf4c71738a6ad5f406bd4ad08ae001e8623d2fdce2a1d8083
 MISC metadata.xml 459 BLAKE2B 8b648b5abdd62d9df306c90d182164694c753231b16ad37319863ee37feac91b2e0fcc89212b5259a899287a638a68cb2e48fcc55af8a076d23b201e6b38ebb3 SHA512 108977904dfb070a16279d3306f40982a73b1cdddfa90e8ab22f83c4a75cd620a829fea9a56a0290d2d160b1d30fd0fb67e320f526726dd57a613e781c700b6c
diff --git a/media-gfx/librecad/librecad-2.1.3-r1.ebuild b/media-gfx/librecad/librecad-2.1.3-r1.ebuild
deleted file mode 100644
index 0c5f0aeb2564..000000000000
--- a/media-gfx/librecad/librecad-2.1.3-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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/qtprintsupport:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-	)
-	dev-libs/boost:=
-	dev-cpp/muParser
-	media-libs/freetype:2"
-
-RDEPEND="${DEPEND}"
-S="${WORKDIR}/LibreCAD-${PV}"
-
-src_prepare() {
-# 	epatch "${FILESDIR}/iota-fix-2.1.1.patch"
-
-	# currently RS_VECTOR3D causes an internal compiler error on GCC-4.8
-	if ! use 3d; then
-		sed -i -e '/RS_VECTOR2D/ s/^#//' librecad/src/src.pro || die
-	fi
-}
-
-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 && docinto html && dodoc -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-2.1.3-r2.ebuild b/media-gfx/librecad/librecad-2.1.3-r2.ebuild
index dfd56d2aaf24..f7735d744d31 100644
--- a/media-gfx/librecad/librecad-2.1.3-r2.ebuild
+++ b/media-gfx/librecad/librecad-2.1.3-r2.ebuild
@@ -11,23 +11,20 @@ SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.zip -> ${P}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
-IUSE="3d debug doc tools qt4 +qt5"
-REQUIRED_USE="qt5"
+IUSE="3d debug doc tools"
 
 DEPEND="
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qthelp:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-	)
-	dev-libs/boost:=
 	dev-cpp/muParser
+	dev-libs/boost:=
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qthelp:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
 	media-libs/freetype:2"
 
 RDEPEND="${DEPEND}"
diff --git a/media-gfx/librecad/librecad-9999.ebuild b/media-gfx/librecad/librecad-9999.ebuild
index 4a1f2d51dc47..de157dedc9ef 100644
--- a/media-gfx/librecad/librecad-9999.ebuild
+++ b/media-gfx/librecad/librecad-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,29 +13,20 @@ EGIT_REPO_URI="https://github.com/LibreCAD/LibreCAD.git"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-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/qtprintsupport:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-	)
+IUSE="3d debug doc tools"
 
-	dev-libs/boost
+DEPEND="
 	dev-cpp/muParser
-	media-libs/freetype"
+	dev-libs/boost:=
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qthelp:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-libs/freetype:2"
 
 RDEPEND="${DEPEND}"
 S="${WORKDIR}/librecad-${PV}"
@@ -46,12 +37,7 @@ src_prepare() {
 }
 
 src_configure() {
-	if use qt4
-	then
-		eqmake4 -r
-	else
-		eqmake5 -r
-	fi
+	eqmake5 -r
 }
 
 src_install() {
@@ -61,7 +47,7 @@ src_install() {
 	doins -r unix/appdata
 	insinto /usr/share/${PN}
 	doins -r unix/resources/*
-	use doc && dohtml -r librecad/support/doc/*
+	use doc && insinto html && dodoc -r librecad/support/doc/*
 	insinto /usr/share/appdata
 	doins unix/appdata/librecad.appdata.xml
 	doicon librecad/res/main/${PN}.png
-- 
cgit v1.2.3