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 1QszWH-00024l-EG for garchives@archives.gentoo.org; Mon, 15 Aug 2011 15:56:05 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 111C121C231; Mon, 15 Aug 2011 15:55:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C1C5221C22F for ; Mon, 15 Aug 2011 15:55:12 +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 2C61D1B405B for ; Mon, 15 Aug 2011 15:55:12 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 814DE80040 for ; Mon, 15 Aug 2011 15:55:11 +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: <169876e17654102be38af48217b48079ca293c8e.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: media-gfx/librecad/files/, media-gfx/librecad/ X-VCS-Repository: proj/sci X-VCS-Files: media-gfx/librecad/ChangeLog media-gfx/librecad/files/1.0.0_rc2-gcc4.6.patch media-gfx/librecad/librecad-1.0.0_beta5.ebuild media-gfx/librecad/librecad-1.0.0_rc1.ebuild media-gfx/librecad/librecad-1.0.0_rc2.ebuild media-gfx/librecad/metadata.xml X-VCS-Directories: media-gfx/librecad/files/ media-gfx/librecad/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 169876e17654102be38af48217b48079ca293c8e Date: Mon, 15 Aug 2011 15:55:11 +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: 854684692ef5056a19a1e55233bdc123 commit: 169876e17654102be38af48217b48079ca293c8e Author: Justin Lecher gentoo org> AuthorDate: Mon Aug 15 15:43:28 2011 +0000 Commit: Justin Lecher gentoo org> CommitDate: Mon Aug 15 15:43:28 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3D169876e1 Cleaned ebuilds (Portage version: 2.2.0_alpha51/git/Linux x86_64, signed Manifest commit = with key 70EB7916) --- media-gfx/librecad/ChangeLog | 7 ++++ media-gfx/librecad/files/1.0.0_rc2-gcc4.6.patch | 38 +++++++++++++++++= +++ media-gfx/librecad/librecad-1.0.0_beta5.ebuild | 42 -----------------= ------ media-gfx/librecad/librecad-1.0.0_rc1.ebuild | 42 -----------------= ------ media-gfx/librecad/librecad-1.0.0_rc2.ebuild | 42 +++++++++++++++++= ++++++ media-gfx/librecad/metadata.xml | 10 +++--- 6 files changed, 92 insertions(+), 89 deletions(-) diff --git a/media-gfx/librecad/ChangeLog b/media-gfx/librecad/ChangeLog index c9a2f7e..c020189 100644 --- a/media-gfx/librecad/ChangeLog +++ b/media-gfx/librecad/ChangeLog @@ -2,6 +2,13 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header$ =20 +*librecad-1.0.0_rc2 (15 Aug 2011) + + 15 Aug 2011; Justin Lecher +files/1.0.0_rc2-gcc4.6.p= atch, + -librecad-1.0.0_beta5.ebuild, -librecad-1.0.0_rc1.ebuild, + +librecad-1.0.0_rc2.ebuild, metadata.xml: + Cleaned ebuilds + 24 Jun 2011; Justin Lecher librecad-1.0.0_beta5.ebui= ld, librecad-1.0.0_rc1.ebuild, librecad-9999.ebuild: Sort inherit and/or USE diff --git a/media-gfx/librecad/files/1.0.0_rc2-gcc4.6.patch b/media-gfx/= librecad/files/1.0.0_rc2-gcc4.6.patch new file mode 100644 index 0000000..b912801 --- /dev/null +++ b/media-gfx/librecad/files/1.0.0_rc2-gcc4.6.patch @@ -0,0 +1,38 @@ + fparser/fparser.cc | 4 ++-- + src/lib/engine/rs_ellipse.cpp | 1 + + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/fparser/fparser.cc b/fparser/fparser.cc +index 49e6ae0..0e65dbb 100644 +--- a/fparser/fparser.cc ++++ b/fparser/fparser.cc +@@ -899,7 +899,7 @@ namespace + byte -=3D n; + if(byte > (unsigned char)('9'-n)) return false; + unsigned long shifted =3D 1UL << byte; +- const unsigned long mask =3D LiteralMask::mask; ++ const unsigned long mask =3D LiteralMask(n)>::mask; + return (mask & shifted) !=3D 0; + } +=20 +@@ -956,7 +956,7 @@ U+000B \v + if(byte <=3D (unsigned char)(' '-n)) + { + unsigned long shifted =3D 1UL << byte; +- const unsigned long mask =3D SimpleSpaceMask::mask; ++ const unsigned long mask =3D SimpleSpaceMask(n)>::mask; + if(mask & shifted) + { ++function; continue; } // \r, \n, \t, \v and spa= ce + break; +diff --git a/src/lib/engine/rs_ellipse.cpp b/src/lib/engine/rs_ellipse.c= pp +index 452de0a..7ccc807 100644 +--- a/src/lib/engine/rs_ellipse.cpp ++++ b/src/lib/engine/rs_ellipse.cpp +@@ -24,6 +24,7 @@ + ** + **********************************************************************/ +=20 ++#include +=20 + #include "rs_ellipse.h" +=20 diff --git a/media-gfx/librecad/librecad-1.0.0_beta5.ebuild b/media-gfx/l= ibrecad/librecad-1.0.0_beta5.ebuild deleted file mode 100644 index 2830384..0000000 --- a/media-gfx/librecad/librecad-1.0.0_beta5.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3D"3" -inherit git-2 qt4-r2 - -DESCRIPTION=3D"An generic 2D CAD program" -HOMEPAGE=3D"http://www.librecad.org/" -LICENSE=3D"GPL-2" -SLOT=3D"0" -KEYWORDS=3D"~amd64 ~x86" -IUSE=3D"debug doc" - -EGIT_REPO_URI=3D"https://github.com/LibreCAD/LibreCAD.git" -EGIT_COMMIT=3D"${PV/_beta/beta}" - -RDEPEND=3D"x11-libs/qt-gui[qt3support]" -DEPEND=3D"${RDEPEND} - x11-libs/qt-assistant:4 - x11-libs/qt-qt3support:4 -" - -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 -} - -src_install() -{ - dobin unix/librecad - insinto /usr/share/"${PN}" - doins -r unix/resources/* - if use doc ; then - dohtml -r support/doc/* - fi - doicon res/main/"${PN}".png - make_desktop_entry "${PN}" LibreCAD "${PN}.png" Graphics -} diff --git a/media-gfx/librecad/librecad-1.0.0_rc1.ebuild b/media-gfx/lib= recad/librecad-1.0.0_rc1.ebuild deleted file mode 100644 index 19fe124..0000000 --- a/media-gfx/librecad/librecad-1.0.0_rc1.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3D"3" -inherit git-2 qt4-r2 - -DESCRIPTION=3D"An generic 2D CAD program" -HOMEPAGE=3D"http://www.librecad.org/" -LICENSE=3D"GPL-2" -SLOT=3D"0" -KEYWORDS=3D"~amd64 ~x86" -IUSE=3D"debug doc" - -EGIT_REPO_URI=3D"https://github.com/LibreCAD/LibreCAD.git" -EGIT_COMMIT=3D"${PV/_rc/rc}" - -RDEPEND=3D"x11-libs/qt-gui[qt3support]" -DEPEND=3D"${RDEPEND} - x11-libs/qt-assistant:4 - x11-libs/qt-qt3support:4 -" - -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 -} - -src_install() -{ - dobin unix/librecad - insinto /usr/share/"${PN}" - doins -r unix/resources/* - if use doc ; then - dohtml -r support/doc/* - fi - doicon res/main/"${PN}".png - make_desktop_entry "${PN}" LibreCAD "${PN}.png" Graphics -} diff --git a/media-gfx/librecad/librecad-1.0.0_rc2.ebuild b/media-gfx/lib= recad/librecad-1.0.0_rc2.ebuild new file mode 100644 index 0000000..fe91456 --- /dev/null +++ b/media-gfx/librecad/librecad-1.0.0_rc2.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=3D3 + +inherit qt4-r2 + +DESCRIPTION=3D"An generic 2D CAD program" +HOMEPAGE=3D"http://www.librecad.org/" +SRC_URI=3D"https://nodeload.github.com/LibreCAD/LibreCAD/zipball/1.0.0rc= 2 -> ${P}.zip" + +LICENSE=3D"GPL-2" +SLOT=3D"0" +KEYWORDS=3D"~amd64 ~x86" +IUSE=3D"debug doc" + +RDEPEND=3D" + x11-libs/qt-gui[qt3support] + x11-libs/qt-assistant:4 + x11-libs/qt-qt3support:4" +DEPEND=3D"${RDEPEND}" + +src_unpack() { + unpack ${A} + mv * ${P} +} + +src_prepare() { + epatch "${FILESDIR}"/${PV}-gcc4.6.patch +} + +src_install() { + dobin unix/librecad || die + insinto /usr/share/"${PN}" + doins -r unix/resources/* || die + if use doc ; then + dohtml -r support/doc/* + fi + doicon res/main/"${PN}".png + make_desktop_entry "${PN}" LibreCAD "${PN}.png" Graphics +} diff --git a/media-gfx/librecad/metadata.xml b/media-gfx/librecad/metadat= a.xml index 684d041..f90bf4a 100644 --- a/media-gfx/librecad/metadata.xml +++ b/media-gfx/librecad/metadata.xml @@ -1,11 +1,11 @@ -sci - - dongxuli2011@gmail.com - - + sci + + dongxuli2011@gmail.com + + LibreCAD is a 2D CAD drawing tool based on the community edition of QC= ad (www.qcad.org). LibreCAD has been re-structured and ported to qt4 and = works natively cross platform.