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

[Justin Lecher]

commit:     a8b71dca7014963eed77e5516da3d98814e6bd61
Author:     Dongxu Li <dongxuli2011 <AT> gmail <DOT> com>
AuthorDate: Sun Aug 30 19:55:43 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Aug 30 19:55:43 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=a8b71dca

media-gfx/librecad: more ebuild cleanup

 media-gfx/librecad/ChangeLog             |  4 ++++
 media-gfx/librecad/librecad-2.0.8.ebuild | 35 ++++++++++++++++----------------
 media-gfx/librecad/librecad-9999.ebuild  | 32 +++++++++++++++--------------
 media-gfx/librecad/metadata.xml          | 17 ++++++----------
 4 files changed, 45 insertions(+), 43 deletions(-)

diff --git a/media-gfx/librecad/ChangeLog b/media-gfx/librecad/ChangeLog
index 9aa934b..ffa9bfb 100644
--- a/media-gfx/librecad/ChangeLog
+++ b/media-gfx/librecad/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header$
 
+  30 Aug 2015; Dongxu Li <dongxuli2011@×××××.com>
+  librecad-2.0.8.ebuild librecad-9999.ebuild:
+  Updated with ebuilds with lukash's pull request
+
   26 Aug 2015; Dongxu Li <dongxuli2011@×××××.com>
   librecad-9999.ebuild:
   Fixed a building issue

diff --git a/media-gfx/librecad/librecad-2.0.8.ebuild b/media-gfx/librecad/librecad-2.0.8.ebuild
index f816820..f2f3812 100644
--- a/media-gfx/librecad/librecad-2.0.8.ebuild
+++ b/media-gfx/librecad/librecad-2.0.8.ebuild
@@ -13,26 +13,26 @@ 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
+		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-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"
@@ -46,11 +46,12 @@ src_prepare() {
 }
 
 src_configure() {
-	    if use qt4; then
-	            eqmake4 -r
-			else
-	            eqmake5 -r
-	    fi
+	if use qt4
+	then
+		eqmake4 -r
+	else
+		eqmake5 -r
+	fi
 }
 
 src_install() {

diff --git a/media-gfx/librecad/librecad-9999.ebuild b/media-gfx/librecad/librecad-9999.ebuild
index 7a6077d..0c9ba9b 100644
--- a/media-gfx/librecad/librecad-9999.ebuild
+++ b/media-gfx/librecad/librecad-9999.ebuild
@@ -19,18 +19,19 @@ REQUIRED_USE="|| ( qt4 qt5 )"
 
 DEPEND="
 	qt4? (
-	            dev-qt/qtcore:4
-	            dev-qt/qtgui:4
-	            dev-qt/qtsvg:4
-	            dev-qt/qthelp:4
+		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/qtsvg:5
-	            dev-qt/qtwidgets:5
-	            dev-qt/qtxml:5
+		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
@@ -46,11 +47,12 @@ src_prepare() {
 }
 
 src_configure() {
-	    if use qt4; then
-	            eqmake4 -r
-			else
-	            eqmake5 -r
-	    fi
+	if use qt4
+	then
+		eqmake4 -r
+	else
+		eqmake5 -r
+	fi
 }
 
 src_install() {

diff --git a/media-gfx/librecad/metadata.xml b/media-gfx/librecad/metadata.xml
index 44053b4..d34c73e 100644
--- a/media-gfx/librecad/metadata.xml
+++ b/media-gfx/librecad/metadata.xml
@@ -1,19 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
   <maintainer>
-    <email>dongxuli2011@×××××.com</email>
-    <name>Dongxu Li</name>
-    <description>Package maintainer and upstream developer</description>
+    <email>slis@g.o</email>
   </maintainer>
-  <longdescription>
-  LibreCAD is a 2D CAD drawing tool based on the community edition of QCad
-  (www.qcad.org). LibreCAD has been re-structured and ported to qt4 and 
-  works natively cross platform.
-</longdescription>
   <use>
-    <flag name="3d">Use 3D vectors</flag>
-    <flag name="tools">Build additional tool programs</flag>
+    <flag name="3d">Require all 2D coordinates stored as 3D</flag>
+    <flag name="tools">Build additional tool programs: tff2lff</flag>
   </use>
+  <upstream>
+    <remote-id type="github">LibreCAD/LibreCAD</remote-id>
+  </upstream>
 </pkgmetadata>