gentoo resync : 01.12.2017

5 files changed, 6 insertions, 136 deletions

diff --git a/media-gfx/librecad/Manifest b/media-gfx/librecad/Manifest
index 8cf498bd048e..c1708c74daa5 100644
--- a/media-gfx/librecad/Manifest
+++ b/media-gfx/librecad/Manifest
@@ -1,11 +1,5 @@
-AUX iota-fix-2.1.1.patch 264 BLAKE2B 6cb4a8834eee3bf7af7cb38c7bdfecbe63ca3703aaa0bc328af061df8861789a45f6be9f4277bbb72a90a697d5da0cc3cb4dcaf3b93f35742971a58463baae42 SHA512 fe9fa83e7bcaeaea01b08d3a294501f2738ec41a2433c154eabb3544b169aedcdd99525157473baa254b0890292185b17733c1e6a4810c633ed6cc1ec5d5e689
-DIST librecad-2.0.3.zip 16590256 SHA256 4221348541c46c6e9698c1fa3471a14a81376e022a009a164a7f0d0035da4643 SHA512 c40952ae967d83197645bef65dac6e050ddeacf536401b2b99cd18d753462af086ac2a410c6746a92c094ad76fd9177a900c21531ed7b7fcdf1e4b0f7f070e00 WHIRLPOOL c2e1d33b17b7a47ffd9b3795ad292b22cb1225aceacf052494745243630b0537e21701930b9433ea235c462d65581efc2b5ccda3b37712d4ab639ab9bcc6a97d
-DIST librecad-2.0.9.zip 25524745 SHA256 3fd92e8249642462d41d688446393ee5e79f68b7b0d9878388c6c194af2cb43a SHA512 e2029389b2ced67a94d9411cb2f49f524ac12542409bc7829a043af9611dd51544fc431e364f4dcfb1a8b645b2bc6eb86fc74294726a65ee687f69bd7eb8f700 WHIRLPOOL 20aaa38cd92547bae6cee4b696f5b7f3699438481c5051af6112c6b1661ffb018509ff1fdcfb4591e8828c8ffcfcc5a3002c594dbcf95beba93e9768c5133c02
-DIST librecad-2.1.1.zip 26085717 SHA256 a5d27119ff137611c090fb174890ed1312c56897fb1482327d676da148fbd7dc SHA512 82b27e75fddae798da0e30e0c560d3769dfddab936e33a3585fd3e871eccf88e51c28d5ed938a530cb65c2e2ecfc593772ca83a2d23dd29126aa8225595f3d01 WHIRLPOOL 50ac34d0bdf1cd55ee6f7a959c1c1430197ac8acb7739755887b726349e39c9a1fe32ef25cab285aeaf649057701256f6210750c986ddb67ed3f338c80e300ed
 DIST librecad-2.1.3.zip 26086377 SHA256 f05af030c71192109c1472c6fd24696fcb564b2eb83ff9789b88bec2e93c10a3 SHA512 9a41c17b512ccbc1a0ebb0e6da8e7297663490479f042fadaffda819e371afc7fa49b789449df9fd4e36a2e2b6f95b9b5be19df47cf3c4252111db2a7ed7f009 WHIRLPOOL a0209b3513fd5f10e608795e34267d5efc7338996ba6cc485cbd9084200cb87fb8b51ab3f224520fc8c693c5ac3db8d049dde68011e8005922ad9c761625971c
-EBUILD librecad-2.0.3.ebuild 787 BLAKE2B 6441e2b285da0c3c5afd64ea573e743af11816ad8b82e13f50c3d660e08039370fcc768c291f79ae0953888044c87a8fae16e1ed80bed3eeba2fb2681f14e91d SHA512 5d34f9e791018f75a990d378f41c077458411d96ed40729a1b34afe527849e7fc3d245a02941dc95ce1582e3ffb935aec50efc926b57b98d3e5f48e7378b7325
-EBUILD librecad-2.0.9-r1.ebuild 1374 BLAKE2B 19d3feaecdb7d816b67c503eedc9d23dba971fd1bac424f7472a4ad3c061a6f8bccd16cb8d9910cb5f7a0383210ddf4acf026195c7d17df5f933be148ec14ab4 SHA512 c41f56a05b3f98f10947ec5c648796ad138fd9ae013e7b64045cc3a66ac74e075c962c02cbef5ee5e40f1597927a903fd5a177ebb3c84cd74efd7e4a8e97c2c5
-EBUILD librecad-2.1.1.ebuild 1418 BLAKE2B 9c495bc078b8e8a40273415faf6eb92f90c123fae3d53f2dfc49c4b359aa323091fe86c381bbae2afd2276c1a9a7f9271e5895e6077e86b1bc6c8bfc8e9a3995 SHA512 2080a1913324c030b6f7f3a2e21c96b894ec72ca335dc04c5594061d0a06637e9b40e7fae20920832012a5317baca4987971fe4e7cc86dea6c9cd40e4e2d9ded
 EBUILD librecad-2.1.3-r1.ebuild 1418 BLAKE2B db2d3476c190f0e45b9ed1786de2369b887db0c3cdba7abfb259733123a2b96b4dd423236e05b4b8f4eba3a5254a1381ba4f9323fe171359e9cda7ff3205a2d1 SHA512 6489a761f0bad291fc536047653edfb527240fd8582428cb4811b3c5197a9e6a51b143dd650541f543ab4b312c71fc8a626248c8569ac1fbb6b5fe302e660761
+EBUILD librecad-2.1.3-r2.ebuild 1286 BLAKE2B a2e32013aae07cadbed37d15785da9e0371f746a334d70209c5271f06f8986936ae16d4399c002345ab3e9784ea81e105737aeebd0c860a30919b6f3700b6708 SHA512 ee11a46159107e2673d9885860aa0f1456658932503423d24c6965007b022703e0c1a9a2c0ea10165f35856a0adda13fa72967bc4515e956d1abff5480c44aab
 EBUILD librecad-9999.ebuild 1344 BLAKE2B 7e2d33864340058bf32c0d6f541bfe7b7a16daf386d35015f39535f5ddbee51b2a46d99c7a5a7437d9763e4f953e0bbc9f4fab1d99bf42d1240247c1052e3993 SHA512 722322ffaab726f066da0497261ba9d9f4eedab1f885e1d19b587bfbae5745cfde7399c24767f303a9c76a7d456d7564b3cc9d872b875be2a4cab8c499e6589d
 MISC metadata.xml 459 BLAKE2B 8b648b5abdd62d9df306c90d182164694c753231b16ad37319863ee37feac91b2e0fcc89212b5259a899287a638a68cb2e48fcc55af8a076d23b201e6b38ebb3 SHA512 108977904dfb070a16279d3306f40982a73b1cdddfa90e8ab22f83c4a75cd620a829fea9a56a0290d2d160b1d30fd0fb67e320f526726dd57a613e781c700b6c
diff --git a/media-gfx/librecad/files/iota-fix-2.1.1.patch b/media-gfx/librecad/files/iota-fix-2.1.1.patch
deleted file mode 100644
index 12506f4b820d..000000000000
--- a/media-gfx/librecad/files/iota-fix-2.1.1.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- librecad/src/lib/engine/rs_spline.cpp.old	2016-06-20 20:43:27.000000000 +0200
-+++ librecad/src/lib/engine/rs_spline.cpp	2016-09-05 13:23:25.459841304 +0200
-@@ -26,6 +26,7 @@
- 
- #include<iostream>
- #include<cmath>
-+#include<numeric>
- #include "rs_spline.h"
- 
- 
diff --git a/media-gfx/librecad/librecad-2.0.3.ebuild b/media-gfx/librecad/librecad-2.0.3.ebuild
deleted file mode 100644
index c1767e4ccf78..000000000000
--- a/media-gfx/librecad/librecad-2.0.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils qt4-r2
-
-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"
-IUSE="debug doc tools"
-
-DEPEND="
-	dev-cpp/muParser
-	dev-qt/qtgui:4
-	dev-qt/qthelp:4
-	dev-qt/qtsvg:4
-	dev-libs/boost
-	media-libs/freetype
-	"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/LibreCAD-${PV}"
-
-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/*
-	doicon librecad/res/main/${PN}.png
-	make_desktop_entry ${PN} LibreCAD ${PN} Graphics
-}
diff --git a/media-gfx/librecad/librecad-2.1.1.ebuild b/media-gfx/librecad/librecad-2.1.1.ebuild
deleted file mode 100644
index 87af2fd665b6..000000000000
--- a/media-gfx/librecad/librecad-2.1.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2016 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 && insinto 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.0.9-r1.ebuild b/media-gfx/librecad/librecad-2.1.3-r2.ebuild
index c1bc20456856..517916041bd8 100644
--- a/media-gfx/librecad/librecad-2.0.9-r1.ebuild
+++ b/media-gfx/librecad/librecad-2.1.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,15 +14,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
 IUSE="3d debug doc tools qt4 +qt5"
-REQUIRED_USE="|| ( qt4 qt5 )"
+REQUIRED_USE="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
@@ -40,6 +34,8 @@ 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
@@ -47,11 +43,7 @@ src_prepare() {
 }
 
 src_configure() {
-	if use qt4; then
-		eqmake4 -r
-	else
-		eqmake5 -r
-	fi
+	eqmake5 -r
 }
 
 src_install() {