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

["Dongxu Li" <dongxuli2011@gmail.com>]

commit:     2653126b365d816173f95a330f7e967abc929527
Author:     Dongxu Li <dongxuli2011 <AT> gmail <DOT> com>
AuthorDate: Tue Dec 13 17:32:01 2011 +0000
Commit:     Dongxu Li <dongxuli2011 <AT> gmail <DOT> com>
CommitDate: Tue Dec 13 17:32:01 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=2653126b

media-gfx/librecad: version bump to 2.0.0_alpha1

---
 media-gfx/librecad/ChangeLog                       |    3 ++
 ...ad-9999.ebuild => librecad-2.0.0_alpha1.ebuild} |   19 +++++++----
 media-gfx/librecad/librecad-9999.ebuild            |   31 +++++++++-----------
 3 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/media-gfx/librecad/ChangeLog b/media-gfx/librecad/ChangeLog
index bfafbee..9e78e72 100644
--- a/media-gfx/librecad/ChangeLog
+++ b/media-gfx/librecad/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header$
 
+  13 Dec 2011; Dongxu Li <dongxuli2011@gmail.com> +librecad-2.0.0_alpha1.ebuild librecad-9999.ebuild:
+  Version bumped to 2.0.0_alpha1, updated ebuild for git version
+
   23 Oct 2011; Dongxu Li <dongxuli2011@gmail.com> +librecad-1.0.0_rc4.ebuild:
   Version bumped to 1.0.0_rc4
 

diff --git a/media-gfx/librecad/librecad-9999.ebuild b/media-gfx/librecad/librecad-2.0.0_alpha1.ebuild
similarity index 62%
copy from media-gfx/librecad/librecad-9999.ebuild
copy to media-gfx/librecad/librecad-2.0.0_alpha1.ebuild
index ced0341..4a4636f 100644
--- a/media-gfx/librecad/librecad-9999.ebuild
+++ b/media-gfx/librecad/librecad-2.0.0_alpha1.ebuild
@@ -4,11 +4,13 @@
 
 EAPI=4
 
-inherit qt4-r2 git-2
+inherit qt4-r2
 
 DESCRIPTION="An generic 2D CAD program"
 HOMEPAGE="http://www.librecad.org/"
-EGIT_REPO_URI="https://github.com/LibreCAD/LibreCAD.git"
+SRC_URI="https://nodeload.github.com/LibreCAD/LibreCAD/tarball/${PV/_/} ->
+${P}.tar.gz"
+
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -17,16 +19,19 @@ IUSE="debug doc"
 
 DEPEND="
 	x11-libs/qt-assistant:4
+	x11-libs/qt-gui:4
 	dev-libs/boost
 	"
+
 RDEPEND="${DEPEND}"
 
+src_unpack() {
+	unpack ${A}
+	mv * ${P}
+}
+
 src_prepare() {
-	# patch to solve an issue caused by gcc-4.6, by mickele, archlinux
-	sed \
-		-e "s|LiteralMask<Value_t, n>::mask;|LiteralMask<Value_t, static_cast<unsigned int>(n)>::mask;|" \
-		-e "s|SimpleSpaceMask<n>::mask;|SimpleSpaceMask<static_cast<unsigned int>(n)>::mask;|" \
-		-i fparser/fparser.cc || die
+sed -i -e '/HAS_CPP11/ s/^#//' src/src.pro
 }
 
 src_install() {

diff --git a/media-gfx/librecad/librecad-9999.ebuild b/media-gfx/librecad/librecad-9999.ebuild
index ced0341..9a5c5d5 100644
--- a/media-gfx/librecad/librecad-9999.ebuild
+++ b/media-gfx/librecad/librecad-9999.ebuild
@@ -2,41 +2,38 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
-
-inherit qt4-r2 git-2
+EAPI="4"
+inherit qt4-r2 git-2 flag-o-matic
 
 DESCRIPTION="An generic 2D CAD program"
 HOMEPAGE="http://www.librecad.org/"
-EGIT_REPO_URI="https://github.com/LibreCAD/LibreCAD.git"
-
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug doc"
 
-DEPEND="
+EGIT_REPO_URI="https://github.com/LibreCAD/LibreCAD.git"
+
+DEPEND="${RDEPEND}
 	x11-libs/qt-assistant:4
 	dev-libs/boost
-	"
-RDEPEND="${DEPEND}"
+"
 
 src_prepare() {
-	# patch to solve an issue caused by gcc-4.6, by mickele, archlinux
-	sed \
-		-e "s|LiteralMask<Value_t, n>::mask;|LiteralMask<Value_t, static_cast<unsigned int>(n)>::mask;|" \
-		-e "s|SimpleSpaceMask<n>::mask;|SimpleSpaceMask<static_cast<unsigned int>(n)>::mask;|" \
-		-i fparser/fparser.cc || die
+	#sed -i -e "s:\\\$\+system(git describe --tags):9999:" src/src.pro
+	#enable C++11 by default
+	sed -i -e '/HAS_CPP11/ s/^#//' src/src.pro
+	sed -i -e '/RS_VECTOR2D/ s/^#//' src/src.pro
 }
 
-src_install() {
-	qt4-r2_src_install
+src_install()
+{
 	dobin unix/librecad
 	insinto /usr/share/"${PN}"
 	doins -r unix/resources/*
 	if use doc ; then
-		dohtml -r support/doc/*
+	dohtml -r support/doc/*
 	fi
 	doicon res/main/"${PN}".png
-	make_desktop_entry "${PN}" LibreCAD "${PN}.png" Graphics
+	make_desktop_entry "${PN}" LibreCAD "${PN}" Graphics
 }