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

["Justin Lecher" <jlec@gentoo.org>]

commit:     bc17c0d6129ed527c9a5f67008d010f673411fcf
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 28 09:29:51 2011 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Aug 28 09:29:51 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=bc17c0d6

Cleaned up ebuild

(Portage version: 2.2.0_alpha51/git/Linux x86_64, signed Manifest commit with key 70EB7916)

---
 media-gfx/librecad/ChangeLog                 |    4 ++++
 media-gfx/librecad/librecad-1.0.0_rc2.ebuild |    8 ++++----
 media-gfx/librecad/librecad-9999.ebuild      |   26 ++++++++++++--------------
 3 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/media-gfx/librecad/ChangeLog b/media-gfx/librecad/ChangeLog
index 6b6b41b..a19cce3 100644
--- a/media-gfx/librecad/ChangeLog
+++ b/media-gfx/librecad/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header$
 
+  28 Aug 2011; Justin Lecher <jlec@gentoo.org> librecad-1.0.0_rc2.ebuild,
+  librecad-9999.ebuild:
+  Cleaned up ebuild
+
 *librecad-1.0.0_rc2 (15 Aug 2011)
 
   26 Aug 2011; Dongxu Li <dongxuli2011@gmail.com> librecad-1.0.0_rc2.ebuild:

diff --git a/media-gfx/librecad/librecad-1.0.0_rc2.ebuild b/media-gfx/librecad/librecad-1.0.0_rc2.ebuild
index 5656c11..792915a 100644
--- a/media-gfx/librecad/librecad-1.0.0_rc2.ebuild
+++ b/media-gfx/librecad/librecad-1.0.0_rc2.ebuild
@@ -8,8 +8,7 @@ inherit qt4-r2
 
 DESCRIPTION="An generic 2D CAD program"
 HOMEPAGE="http://www.librecad.org/"
-SRC_URI="https://nodeload.github.com/LibreCAD/LibreCAD/tarball/1.0.0rc2 ->
-${P}.tar.gz"
+SRC_URI="https://nodeload.github.com/LibreCAD/LibreCAD/tarball/1.0.0rc2 -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -28,8 +27,9 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${PV}-gcc4.6.patch"
-	epatch "${FILESDIR}/${P}-version.patch"
+	epatch \
+		"${FILESDIR}"/${PV}-gcc4.6.patch \
+		"${FILESDIR}"/${P}-version.patch
 }
 
 src_install() {

diff --git a/media-gfx/librecad/librecad-9999.ebuild b/media-gfx/librecad/librecad-9999.ebuild
index 6339f11..bb13037 100644
--- a/media-gfx/librecad/librecad-9999.ebuild
+++ b/media-gfx/librecad/librecad-9999.ebuild
@@ -2,37 +2,35 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
+
 inherit qt4-r2 git-2
 
 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"
 
-EGIT_REPO_URI="https://github.com/LibreCAD/LibreCAD.git"
-
 DEPEND="
 	x11-libs/qt-gui[qt3support]
 	x11-libs/qt-assistant:4
-	x11-libs/qt-qt3support:4
-"
-
+	x11-libs/qt-qt3support:4"
 RDEPEND="${DEPEND}"
 
-src_prepare()
-{
+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
+	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
 }
 
-src_install()
-{
-qt4-r2_src_install
+src_install() {
+	qt4-r2_src_install
 	dobin unix/librecad
 	insinto /usr/share/"${PN}"
 	doins -r unix/resources/*