gentoo resync : 29.03.2018

4 files changed, 54 insertions, 58 deletions

diff --git a/media-gfx/pencil/Manifest b/media-gfx/pencil/Manifest
index 066ba74589c4..d350f0e62b7a 100644
--- a/media-gfx/pencil/Manifest
+++ b/media-gfx/pencil/Manifest
@@ -1,4 +1,3 @@
-AUX pencil-0.4.4_beta-gcc461.patch 819 BLAKE2B e13306455cdd812c5124b287f430486ae9c1e9475abd464795fa12e6223782bd169b4d70262ecfb1dfd15408da3d8c66ebb9a29445b6d6c03b08c47a6be5db97 SHA512 2d775516265d844cf72d85015111321e487cad8094cb0bd55166654a06b913b63f55c87623374e4fafc8927169224235ff2b759f57ef5515bd9684faf8e4d84f
-DIST pencil-0.4.4b-src.zip 1147003 BLAKE2B 178f25c716b392505862ed4f56c5683428a7c36cf99d5e1c959be4e2c0fa1d4262ef50234d83c8a4591eaaa4ebaebaa62fcce8484ba4bf45a87ec74784401c25 SHA512 5ed5bad3d2a1ac993539c2c510bcc5a1df3e33f37187c069d21f3c784eb8a290c69cfccbba8645ebab58b0feafb3c229d882dcade72fca3110846c7b1629331b
-EBUILD pencil-0.4.4_beta.ebuild 987 BLAKE2B 6a4db75de28621ce8272a926c71342e558b1e186680a1bd38397d384205dc6640dcf889f66dda686ff59f8fcb98a0f742f4699a9bbe05c664bf3633acc8d1306 SHA512 369f57c73ec3f1e2a3eaab6cf04334c07f1224dd1a33fbdd62688e7f86d0479e44f37e2d12d4131bb72a9b1fe153e7d2cf1274199966ecdd8aa858108bd00007
+DIST pencil-0.6.1_rc1.tar.gz 2515450 BLAKE2B 7852368397f51cf8f6d51d8a16aafa148ab5f7d3286d593ae9f610322379a84e0b5473ccdb065b2c0d175fb5faf04b908cb129feafeff75f756858b8cf8f6e48 SHA512 242a226d5ef9cdb5c886ff5e452f0aab22689ad787bbb6ce649b5ad4939959dc5245d3fdf50402438b8f62598f59e166f739af4b37f6092e7a10e26b4e02febb
+EBUILD pencil-0.6.1_rc1.ebuild 1020 BLAKE2B 64e8e29a52c75f723cec7f0fc7582628bbee667adf2774ff9d8022bdcc4e0399820656fdafda1610c7a429166e8fa280156e81ffeed80c0a913cfa82dd138937 SHA512 e6831caf2caebc27d54a3a406e7775c01483e37c64ab732d569414264a1ceade6d6083fac85d0025a37723aebc8ae4eb787deb291172bd30e071a9811f73a77a
 MISC metadata.xml 251 BLAKE2B 014f8e7a6a13c0ed2ba147bc1ecb8768c9cea185f10b74923d2e2157b3bdf0771a8300a4d88d2492ff9e7daaa5d0bb5c5e04f6c70273a4a0afe85869087d201c SHA512 d515519588ccedd03f6b4d0b653e957c8f26c922098a5408e9962fe9dbbb9105001a9ea1b08b73ce6e5fa41fabdc86081f6fe24f8394e2a44d036d01a01da0ed
diff --git a/media-gfx/pencil/files/pencil-0.4.4_beta-gcc461.patch b/media-gfx/pencil/files/pencil-0.4.4_beta-gcc461.patch
deleted file mode 100644
index d0aa8936b8fd..000000000000
--- a/media-gfx/pencil/files/pencil-0.4.4_beta-gcc461.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/graphics/vector/beziercurve.cpp	2007-07-14 21:41:33.000000000 +0200
-+++ src/graphics/vector/beziercurve.cpp	2011-08-29 16:19:08.930675072 +0200
-@@ -700,9 +700,9 @@ 
- 	R1.setTopLeft(P1); R1.setBottomRight(Q1);
- 	R2.setTopLeft(P2); R2.setBottomRight(Q2);
- 	
--	//QPointF intersectionPoint = QPointF(50.0, 50.0); // bogus point
-+	QPointF intersectionPoint = QPointF(50.0, 50.0); // bogus point
- 	//QPointF* intersection = &intersectionPoint;
--	QPointF* cubicIntersection = &QPointF(50.0, 50.0); // bogus point
-+	QPointF* cubicIntersection = &intersectionPoint; // bogus point
- 	if( R1.intersects(R2) || L2.intersect(L1, cubicIntersection) == QLineF::BoundedIntersection ) {
- 	//if(L2.intersect(L1, intersection) == QLineF::BoundedIntersection) {
- 		//qDebug() << "                   FOUND rectangle intersection ";
diff --git a/media-gfx/pencil/pencil-0.4.4_beta.ebuild b/media-gfx/pencil/pencil-0.4.4_beta.ebuild
deleted file mode 100644
index 700f6494d1cc..000000000000
--- a/media-gfx/pencil/pencil-0.4.4_beta.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit eutils qt4-r2
-
-MY_P=${P/_beta/b}
-
-DESCRIPTION="A Qt4 based animation and drawing program"
-HOMEPAGE="http://www.pencil-animation.org/"
-SRC_URI="mirror://sourceforge/pencil-planner/${MY_P}-src.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-qt/qtgui:4
-	dev-qt/qtopengl:4
-	>=media-libs/ming-0.4.3"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}/${MY_P}-source
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc461.patch
-	sed -i s:SWFSprite:SWFMovieClip:g src/external/flash/flash.{cpp,h} || die
-}
-
-src_install() {
-	# install target not yet provided
-	#emake INSTALL_ROOT="${D}" install || die "emake install failed"
-	newbin Pencil ${PN} || die "dobin failed"
-
-	dodoc README TODO || die
-
-	mv "${S}"/icons/icon.png "${S}"/icons/${PN}.png
-	doicon "${S}"/icons/${PN}.png || die "doicon failed"
-	make_desktop_entry ${PN} Pencil ${PN} Graphics
-}
diff --git a/media-gfx/pencil/pencil-0.6.1_rc1.ebuild b/media-gfx/pencil/pencil-0.6.1_rc1.ebuild
new file mode 100644
index 000000000000..ae567e8d0058
--- /dev/null
+++ b/media-gfx/pencil/pencil-0.6.1_rc1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop qmake-utils xdg-utils
+
+DESCRIPTION="2D animation and drawing program based on Qt5"
+HOMEPAGE="https://www.pencil2d.org/"
+SRC_URI="https://github.com/pencil2d/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P/_/-}"
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	einstalldocs
+
+	# install target not yet provided
+	# emake INSTALL_ROOT="${D}" install || die "emake install failed"
+	newbin bin/pencil2d ${PN}
+
+	newicon app/data/icons/icon.png ${PN}.png
+	make_desktop_entry ${PN} pencil2d ${PN} Graphics
+
+	insinto /usr/share/mime/packages/
+	doins app/data/pencil2d.xml
+
+	# TODO: Install l10n files
+}
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}