| 1 |
commit: bc17c0d6129ed527c9a5f67008d010f673411fcf |
| 2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Aug 28 09:29:51 2011 +0000 |
| 4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Aug 28 09:29:51 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=bc17c0d6 |
| 7 |
|
| 8 |
Cleaned up ebuild |
| 9 |
|
| 10 |
(Portage version: 2.2.0_alpha51/git/Linux x86_64, signed Manifest commit with key 70EB7916) |
| 11 |
|
| 12 |
--- |
| 13 |
media-gfx/librecad/ChangeLog | 4 ++++ |
| 14 |
media-gfx/librecad/librecad-1.0.0_rc2.ebuild | 8 ++++---- |
| 15 |
media-gfx/librecad/librecad-9999.ebuild | 26 ++++++++++++-------------- |
| 16 |
3 files changed, 20 insertions(+), 18 deletions(-) |
| 17 |
|
| 18 |
diff --git a/media-gfx/librecad/ChangeLog b/media-gfx/librecad/ChangeLog |
| 19 |
index 6b6b41b..a19cce3 100644 |
| 20 |
--- a/media-gfx/librecad/ChangeLog |
| 21 |
+++ b/media-gfx/librecad/ChangeLog |
| 22 |
@@ -2,6 +2,10 @@ |
| 23 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 24 |
# $Header$ |
| 25 |
|
| 26 |
+ 28 Aug 2011; Justin Lecher <jlec@g.o> librecad-1.0.0_rc2.ebuild, |
| 27 |
+ librecad-9999.ebuild: |
| 28 |
+ Cleaned up ebuild |
| 29 |
+ |
| 30 |
*librecad-1.0.0_rc2 (15 Aug 2011) |
| 31 |
|
| 32 |
26 Aug 2011; Dongxu Li <dongxuli2011@×××××.com> librecad-1.0.0_rc2.ebuild: |
| 33 |
|
| 34 |
diff --git a/media-gfx/librecad/librecad-1.0.0_rc2.ebuild b/media-gfx/librecad/librecad-1.0.0_rc2.ebuild |
| 35 |
index 5656c11..792915a 100644 |
| 36 |
--- a/media-gfx/librecad/librecad-1.0.0_rc2.ebuild |
| 37 |
+++ b/media-gfx/librecad/librecad-1.0.0_rc2.ebuild |
| 38 |
@@ -8,8 +8,7 @@ inherit qt4-r2 |
| 39 |
|
| 40 |
DESCRIPTION="An generic 2D CAD program" |
| 41 |
HOMEPAGE="http://www.librecad.org/" |
| 42 |
-SRC_URI="https://nodeload.github.com/LibreCAD/LibreCAD/tarball/1.0.0rc2 -> |
| 43 |
-${P}.tar.gz" |
| 44 |
+SRC_URI="https://nodeload.github.com/LibreCAD/LibreCAD/tarball/1.0.0rc2 -> ${P}.tar.gz" |
| 45 |
|
| 46 |
LICENSE="GPL-2" |
| 47 |
SLOT="0" |
| 48 |
@@ -28,8 +27,9 @@ src_unpack() { |
| 49 |
} |
| 50 |
|
| 51 |
src_prepare() { |
| 52 |
- epatch "${FILESDIR}/${PV}-gcc4.6.patch" |
| 53 |
- epatch "${FILESDIR}/${P}-version.patch" |
| 54 |
+ epatch \ |
| 55 |
+ "${FILESDIR}"/${PV}-gcc4.6.patch \ |
| 56 |
+ "${FILESDIR}"/${P}-version.patch |
| 57 |
} |
| 58 |
|
| 59 |
src_install() { |
| 60 |
|
| 61 |
diff --git a/media-gfx/librecad/librecad-9999.ebuild b/media-gfx/librecad/librecad-9999.ebuild |
| 62 |
index 6339f11..bb13037 100644 |
| 63 |
--- a/media-gfx/librecad/librecad-9999.ebuild |
| 64 |
+++ b/media-gfx/librecad/librecad-9999.ebuild |
| 65 |
@@ -2,37 +2,35 @@ |
| 66 |
# Distributed under the terms of the GNU General Public License v2 |
| 67 |
# $Header: $ |
| 68 |
|
| 69 |
-EAPI="4" |
| 70 |
+EAPI=4 |
| 71 |
+ |
| 72 |
inherit qt4-r2 git-2 |
| 73 |
|
| 74 |
DESCRIPTION="An generic 2D CAD program" |
| 75 |
HOMEPAGE="http://www.librecad.org/" |
| 76 |
+EGIT_REPO_URI="https://github.com/LibreCAD/LibreCAD.git" |
| 77 |
+ |
| 78 |
LICENSE="GPL-2" |
| 79 |
SLOT="0" |
| 80 |
KEYWORDS="~amd64 ~x86" |
| 81 |
IUSE="debug doc" |
| 82 |
|
| 83 |
-EGIT_REPO_URI="https://github.com/LibreCAD/LibreCAD.git" |
| 84 |
- |
| 85 |
DEPEND=" |
| 86 |
x11-libs/qt-gui[qt3support] |
| 87 |
x11-libs/qt-assistant:4 |
| 88 |
- x11-libs/qt-qt3support:4 |
| 89 |
-" |
| 90 |
- |
| 91 |
+ x11-libs/qt-qt3support:4" |
| 92 |
RDEPEND="${DEPEND}" |
| 93 |
|
| 94 |
-src_prepare() |
| 95 |
-{ |
| 96 |
+src_prepare() { |
| 97 |
# patch to solve an issue caused by gcc-4.6, by mickele, archlinux |
| 98 |
- sed -e "s|LiteralMask<Value_t, n>::mask;|LiteralMask<Value_t, static_cast<unsigned int>(n)>::mask;|" \ |
| 99 |
- -e "s|SimpleSpaceMask<n>::mask;|SimpleSpaceMask<static_cast<unsigned int>(n)>::mask;|" \ |
| 100 |
- -i fparser/fparser.cc |
| 101 |
+ sed \ |
| 102 |
+ -e "s|LiteralMask<Value_t, n>::mask;|LiteralMask<Value_t, static_cast<unsigned int>(n)>::mask;|" \ |
| 103 |
+ -e "s|SimpleSpaceMask<n>::mask;|SimpleSpaceMask<static_cast<unsigned int>(n)>::mask;|" \ |
| 104 |
+ -i fparser/fparser.cc || die |
| 105 |
} |
| 106 |
|
| 107 |
-src_install() |
| 108 |
-{ |
| 109 |
-qt4-r2_src_install |
| 110 |
+src_install() { |
| 111 |
+ qt4-r2_src_install |
| 112 |
dobin unix/librecad |
| 113 |
insinto /usr/share/"${PN}" |
| 114 |
doins -r unix/resources/* |
Archives