[gentoo-commits] repo/gentoo:master commit in: media-gfx/librecad/

["Jeroen Roovers" <jer@gentoo.org>]

commit:     a2e67413ffef6eafd1e28ec3ecfaedd12ceb6dc5
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 22 08:39:55 2018 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> 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