From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Qxzrr-0002FJ-2Q for garchives@archives.gentoo.org; Mon, 29 Aug 2011 11:19:03 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1F4D221C298; Mon, 29 Aug 2011 11:18:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C9E1221C298 for ; Mon, 29 Aug 2011 11:18:55 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3AF6A1B40FB for ; Mon, 29 Aug 2011 11:18:55 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 1B29680040 for ; Mon, 29 Aug 2011 11:18:54 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: Subject: [gentoo-commits] proj/sci:master commit in: media-gfx/librecad/ X-VCS-Repository: proj/sci X-VCS-Files: media-gfx/librecad/ChangeLog media-gfx/librecad/librecad-1.0.0_rc2.ebuild media-gfx/librecad/librecad-9999.ebuild X-VCS-Directories: media-gfx/librecad/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: bc17c0d6129ed527c9a5f67008d010f673411fcf Date: Mon, 29 Aug 2011 11:18:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 645f56333780c59d392b9cf42be19a68 commit: bc17c0d6129ed527c9a5f67008d010f673411fcf Author: Justin Lecher gentoo org> AuthorDate: Sun Aug 28 09:29:51 2011 +0000 Commit: Justin Lecher gentoo org> CommitDate: Sun Aug 28 09:29:51 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3Dbc17c0d6 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$ =20 + 28 Aug 2011; Justin Lecher librecad-1.0.0_rc2.ebuild= , + librecad-9999.ebuild: + Cleaned up ebuild + *librecad-1.0.0_rc2 (15 Aug 2011) =20 26 Aug 2011; Dongxu Li librecad-1.0.0_rc2.ebu= ild: diff --git a/media-gfx/librecad/librecad-1.0.0_rc2.ebuild b/media-gfx/lib= recad/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 =20 DESCRIPTION=3D"An generic 2D CAD program" HOMEPAGE=3D"http://www.librecad.org/" -SRC_URI=3D"https://nodeload.github.com/LibreCAD/LibreCAD/tarball/1.0.0rc= 2 -> -${P}.tar.gz" +SRC_URI=3D"https://nodeload.github.com/LibreCAD/LibreCAD/tarball/1.0.0rc= 2 -> ${P}.tar.gz" =20 LICENSE=3D"GPL-2" SLOT=3D"0" @@ -28,8 +27,9 @@ src_unpack() { } =20 src_prepare() { - epatch "${FILESDIR}/${PV}-gcc4.6.patch" - epatch "${FILESDIR}/${P}-version.patch" + epatch \ + "${FILESDIR}"/${PV}-gcc4.6.patch \ + "${FILESDIR}"/${P}-version.patch } =20 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: $ =20 -EAPI=3D"4" +EAPI=3D4 + inherit qt4-r2 git-2 =20 DESCRIPTION=3D"An generic 2D CAD program" HOMEPAGE=3D"http://www.librecad.org/" +EGIT_REPO_URI=3D"https://github.com/LibreCAD/LibreCAD.git" + LICENSE=3D"GPL-2" SLOT=3D"0" KEYWORDS=3D"~amd64 ~x86" IUSE=3D"debug doc" =20 -EGIT_REPO_URI=3D"https://github.com/LibreCAD/LibreCAD.git" - DEPEND=3D" x11-libs/qt-gui[qt3support] x11-libs/qt-assistant:4 - x11-libs/qt-qt3support:4 -" - + x11-libs/qt-qt3support:4" RDEPEND=3D"${DEPEND}" =20 -src_prepare() -{ +src_prepare() { # patch to solve an issue caused by gcc-4.6, by mickele, archlinux - sed -e "s|LiteralMask::mask;|LiteralMask(n)>::mask;|" \ - -e "s|SimpleSpaceMask::mask;|SimpleSpaceMask(n)>::mask;|" \ - -i fparser/fparser.cc + sed \ + -e "s|LiteralMask::mask;|LiteralMask(n)>::mask;|" \ + -e "s|SimpleSpaceMask::mask;|SimpleSpaceMask(n)>::mask;|" \ + -i fparser/fparser.cc || die } =20 -src_install() -{ -qt4-r2_src_install +src_install() { + qt4-r2_src_install dobin unix/librecad insinto /usr/share/"${PN}" doins -r unix/resources/*