From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4291C1382C5 for ; Mon, 22 Jan 2018 08:40:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5A24CE08E2; Mon, 22 Jan 2018 08:40:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2BC23E08E2 for ; Mon, 22 Jan 2018 08:40:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A8B5E335C2F for ; Mon, 22 Jan 2018 08:40:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F0ACA1A0 for ; Mon, 22 Jan 2018 08:40:09 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1516610408.a2e67413ffef6eafd1e28ec3ecfaedd12ceb6dc5.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/librecad/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/librecad/librecad-2.1.3-r3.ebuild media-gfx/librecad/librecad-9999.ebuild X-VCS-Directories: media-gfx/librecad/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: a2e67413ffef6eafd1e28ec3ecfaedd12ceb6dc5 X-VCS-Branch: master Date: Mon, 22 Jan 2018 08:40:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0c0bee7e-6cc0-45e8-a803-6091f130f9e3 X-Archives-Hash: 249794901accd77f2d8b0cd34625b02a commit: a2e67413ffef6eafd1e28ec3ecfaedd12ceb6dc5 Author: Jeroen Roovers gentoo org> AuthorDate: Mon Jan 22 08:39:55 2018 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Mon Jan 22 08:40:08 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2e67413 media-gfx/librecad: insinto -> docinto (bug #637950). Package-Manager: Portage-2.3.20, Repoman-2.3.6 ...{librecad-9999.ebuild => librecad-2.1.3-r3.ebuild} | 19 ++++++++++--------- media-gfx/librecad/librecad-9999.ebuild | 2 +- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/media-gfx/librecad/librecad-9999.ebuild b/media-gfx/librecad/librecad-2.1.3-r3.ebuild similarity index 69% copy from media-gfx/librecad/librecad-9999.ebuild copy to media-gfx/librecad/librecad-2.1.3-r3.ebuild index de157dedc9e..20902c58015 100644 --- a/media-gfx/librecad/librecad-9999.ebuild +++ b/media-gfx/librecad/librecad-2.1.3-r3.ebuild @@ -3,16 +3,15 @@ EAPI=5 -inherit eutils git-r3 qmake-utils +inherit eutils qmake-utils DESCRIPTION="Generic 2D CAD program" HOMEPAGE="http://www.librecad.org/" -SRC_URI="" -EGIT_REPO_URI="https://github.com/LibreCAD/LibreCAD.git" +SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.zip -> ${P}.zip" LICENSE="GPL-2" SLOT="0" -KEYWORDS="" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="3d debug doc tools" @@ -29,11 +28,15 @@ DEPEND=" media-libs/freetype:2" RDEPEND="${DEPEND}" -S="${WORKDIR}/librecad-${PV}" +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 - use 3d || sed -i -e '/RS_VECTOR2D/ s/^#//' librecad/src/src.pro || die + if ! use 3d; then + sed -i -e '/RS_VECTOR2D/ s/^#//' librecad/src/src.pro || die + fi } src_configure() { @@ -43,11 +46,9 @@ src_configure() { src_install() { dobin unix/librecad use tools && dobin unix/ttf2lff - insinto /usr/share - doins -r unix/appdata insinto /usr/share/${PN} doins -r unix/resources/* - use doc && insinto html && dodoc -r librecad/support/doc/* + 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 diff --git a/media-gfx/librecad/librecad-9999.ebuild b/media-gfx/librecad/librecad-9999.ebuild index de157dedc9e..efb61a9472a 100644 --- a/media-gfx/librecad/librecad-9999.ebuild +++ b/media-gfx/librecad/librecad-9999.ebuild @@ -47,7 +47,7 @@ src_install() { doins -r unix/appdata insinto /usr/share/${PN} doins -r unix/resources/* - use doc && insinto html && dodoc -r librecad/support/doc/* + 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