Cleaned up ebuild

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

4 files changed, 33 insertions, 22 deletions

diff --git a/media-gfx/librecad/ChangeLog b/media-gfx/librecad/ChangeLog
index 6b6b41b22..a19cce36f 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/Manifest b/media-gfx/librecad/Manifest
index 4c1f61e5d..50ca72487 100644
--- a/media-gfx/librecad/Manifest
+++ b/media-gfx/librecad/Manifest
@@ -1,7 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX 1.0.0_rc2-gcc4.6.patch 1404 RMD160 a2e72683beb7bb3fb5e27118dc0819b00cc5a328 SHA1 f38fe80a5eeaab8f942ca84cd061f7593b22161b SHA256 3e6cd17cdb896d0da670e4731154600e3a7cfcc536982a802027a3c175721572
-AUX librecad-1.0.0_rc2-version.patch 532 RMD160 ef600cab3da265fa5b9b336e61386037eb0bdb28 SHA1 88c3605f71f3cef2cd44f810604716acdea03a0d SHA256 e43d1f3c5e10583ffbc2b6c6d7ff1b70c2dbef54593c510c05d443fb842b2d81
 DIST librecad-1.0.0_rc2.tar.gz 6317800 RMD160 9d4027075c27e99286d74c4f33510b3293c62858 SHA1 435038f0f8da6b513010f6ef1cc69350db36cdcb SHA256 80da2799c5d22d182453e951b44193c2657edafc04ffc60996e4c83d844e6500
-EBUILD librecad-1.0.0_rc2.ebuild 875 RMD160 62458ca7187c0c3940c52227e6cec55f61540eae SHA1 5369a6cafb4a132f6a4898308586deca3ceba395 SHA256 c9683bcc4250db1983d7887f1329cf8a56b7220a1c2b26aab80180f8bf46457e
-EBUILD librecad-9999.ebuild 1018 RMD160 10d1acbd8c87d7e2962ff16fdaad8eee4f52aa7d SHA1 e1c22ab5fcba91293d67b00f88e34b2bdd874512 SHA256 01bd4a7a6759fcf85bce25ef61549dd7ee4f85d4e96a86652563bd57f5788280
-MISC ChangeLog 1079 RMD160 4a0e6773bce4ff21c567d18c511d6e28ad2c60d2 SHA1 a7e445d4f16cee874b20421f57578c1c20cff703 SHA256 dae278a6bc5d1b2b582dd18d167d97e34a1127c8e60a8031d001f3844ff90637
+EBUILD librecad-1.0.0_rc2.ebuild 875 RMD160 d237bf7f8ab09661292670f63b2a133e02599d54 SHA1 4ca5f399e33b0e9cf42bdab70eedbff3200c9780 SHA256 dbca38aeb92657d5f7592943eec8d95c72ec9800a89e8d267912538bf0b7969a
+EBUILD librecad-9999.ebuild 1029 RMD160 a1485833f6e64ad68ac6967b579967bac9bd1fbd SHA1 75553aefa208d3ab05746bdb5300c7f877ff043d SHA256 fa94c1c399ab01533664d4559741cd6b0e540eaf26be579e65f793b84f371f66
+MISC ChangeLog 1347 RMD160 8bc1b48ac777059be14c5281a215047f68ae3550 SHA1 f448240c250c6805c7fe044df7a4b14771ba8503 SHA256 a0f780fa1440abbc2d949706e20bbef9a431adb9752961f0a56786b451e8c32a
 MISC metadata.xml 563 RMD160 7ee54da17f2d162cf66ff72333fd458f5073bf75 SHA1 c54642a9a3890b0b92ca9316b8567c210134ab64 SHA256 bb401fd8571309964771e933a1149e8845052a86d6031dcdaa74e505d05f1478
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iEYEAREKAAYFAk5aCo4ACgkQgAnW8HDreRY1PwCfbWOrc2zz6fPPgGZdQ7V5jxfR
+ixUAoJvVESnIGW6juru1rZad7b75uILG
+=9vAs
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/librecad/librecad-1.0.0_rc2.ebuild b/media-gfx/librecad/librecad-1.0.0_rc2.ebuild
index 5656c1114..792915a42 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 6339f11fd..bb130378d 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/*