diff options
| -rw-r--r-- | media-gfx/librecad/ChangeLog | 7 | ||||
| -rw-r--r-- | media-gfx/librecad/Manifest | 19 | ||||
| -rw-r--r-- | media-gfx/librecad/files/1.0.0_rc2-gcc4.6.patch | 38 | ||||
| -rw-r--r-- | media-gfx/librecad/librecad-1.0.0_beta5.ebuild | 42 | ||||
| -rw-r--r-- | media-gfx/librecad/librecad-1.0.0_rc1.ebuild | 42 | ||||
| -rw-r--r-- | media-gfx/librecad/librecad-1.0.0_rc2.ebuild | 42 | ||||
| -rw-r--r-- | media-gfx/librecad/metadata.xml | 10 |
7 files changed, 107 insertions, 93 deletions
diff --git a/media-gfx/librecad/ChangeLog b/media-gfx/librecad/ChangeLog index c9a2f7e6c..c020189b4 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$ +*librecad-1.0.0_rc2 (15 Aug 2011) + + 15 Aug 2011; Justin Lecher <jlec@gentoo.org> +files/1.0.0_rc2-gcc4.6.patch, + -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 <jlec@gentoo.org> librecad-1.0.0_beta5.ebuild, librecad-1.0.0_rc1.ebuild, librecad-9999.ebuild: Sort inherit and/or USE diff --git a/media-gfx/librecad/Manifest b/media-gfx/librecad/Manifest index 7396f8178..f29f5942d 100644 --- a/media-gfx/librecad/Manifest +++ b/media-gfx/librecad/Manifest @@ -1,5 +1,16 @@ -EBUILD librecad-1.0.0_beta5.ebuild 1026 RMD160 6f3911c70fa4fb9d7c567c59461043703f6361a9 SHA1 ecf63cbc86357ad8d4aab725069c781c0aa4c5a8 SHA256 8bf33da124d924a17e2de727107ecc582efe75c4f09569d32e873effa360f2fa -EBUILD librecad-1.0.0_rc1.ebuild 1022 RMD160 65a83ae087ec90c8737157cc3f94628e18a5f2b1 SHA1 65e9382cf7a3df13685a9c345f96c2f066d13344 SHA256 ebabd9d622e584ac3ce9921469cb233c4d2e222d9ef75db3b5c299f6153701da +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA512 + +AUX 1.0.0_rc2-gcc4.6.patch 1404 RMD160 a2e72683beb7bb3fb5e27118dc0819b00cc5a328 SHA1 f38fe80a5eeaab8f942ca84cd061f7593b22161b SHA256 3e6cd17cdb896d0da670e4731154600e3a7cfcc536982a802027a3c175721572 +DIST librecad-1.0.0_rc2.zip 7382029 RMD160 38e6f3d7e77d0b3c621d878cc611b040c3de54d6 SHA1 34fa226fe1232c7573ae513c30783c27a62c692a SHA256 92258a1a8639d18f187ca0efa4a8f0ff32316f07668eb5c8164e5f054454f4ed +EBUILD librecad-1.0.0_rc2.ebuild 831 RMD160 4badb612e442ad2ebd304afb9d3a8b097ba3f509 SHA1 8101908a9ab4f49d0b40359dad0f9459ab37afda SHA256 3e4dfdd01c2d5ca83393cfbb682c2de0f7c97c2e22cc2e59eb6e04311fc7286f EBUILD librecad-9999.ebuild 991 RMD160 823baf6530595b9f337ea45a32a1dd6c171e3a58 SHA1 d1fb05ede6aa78c11721e6150ecde68ff4837a84 SHA256 418da24f661bfe51a62e5ebe4b46420b58d6eebfcdf388527a34ab7be953c071 -MISC ChangeLog 738 RMD160 8da5b642c518fbe646a1c47aff41d7d9dc463e62 SHA1 588c5f947c13ce5d85745775a97d27cb1a602f4e SHA256 bac2883e23376c1fe285f0bd031be01619000e0d5fccd32b1456727a7371f5c2 -MISC metadata.xml 450 RMD160 62a6501cecfe47078279b48be9b1c658d40e59f9 SHA1 c4ea83204f0d636b89b362f43aa2f5f487b9d9c7 SHA256 891d496161866e9f329036a1a953bd667d7be70de7cb1da41eadbb4be21c7df8 +MISC ChangeLog 974 RMD160 e3c57bac4cbe8d05f8b5f4defe54891ed96b1abd SHA1 2a818e831ff67a3749f059c703bdde35e3933b1a SHA256 3b1e3e2e3124fce8414d940299a9b731e84612a05032711da646c7ad13e9586c +MISC metadata.xml 454 RMD160 b987e76661aa927fd1a79447f4f6366cce4e595b SHA1 7966452c59727c6e51026f386da02dcd777d60fc SHA256 a6f0158f6db83700bf7e761c31cde341aa25bacd51e882e17c3a81431fc65df6 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.17 (GNU/Linux) + +iEYEAREKAAYFAk5JPqAACgkQgAnW8HDreRZFCQCcDdfCjBmw39c+OIMgrFpxct9V +R/wAn2TAft4QWJCHHgKL/IHGijvCfdoO +=c96s +-----END PGP SIGNATURE----- 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 000000000..b912801d6 --- /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 -= n; + if(byte > (unsigned char)('9'-n)) return false; + unsigned long shifted = 1UL << byte; +- const unsigned long mask = LiteralMask<Value_t, n>::mask; ++ const unsigned long mask = LiteralMask<Value_t, static_cast<unsigned int>(n)>::mask; + return (mask & shifted) != 0; + } + +@@ -956,7 +956,7 @@ U+000B \v + if(byte <= (unsigned char)(' '-n)) + { + unsigned long shifted = 1UL << byte; +- const unsigned long mask = SimpleSpaceMask<n>::mask; ++ const unsigned long mask = SimpleSpaceMask<static_cast<unsigned int>(n)>::mask; + if(mask & shifted) + { ++function; continue; } // \r, \n, \t, \v and space + break; +diff --git a/src/lib/engine/rs_ellipse.cpp b/src/lib/engine/rs_ellipse.cpp +index 452de0a..7ccc807 100644 +--- a/src/lib/engine/rs_ellipse.cpp ++++ b/src/lib/engine/rs_ellipse.cpp +@@ -24,6 +24,7 @@ + ** + **********************************************************************/ + ++#include <algorithm> + + #include "rs_ellipse.h" + diff --git a/media-gfx/librecad/librecad-1.0.0_beta5.ebuild b/media-gfx/librecad/librecad-1.0.0_beta5.ebuild deleted file mode 100644 index 2830384a5..000000000 --- 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="3" -inherit git-2 qt4-r2 - -DESCRIPTION="An generic 2D CAD program" -HOMEPAGE="http://www.librecad.org/" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug doc" - -EGIT_REPO_URI="https://github.com/LibreCAD/LibreCAD.git" -EGIT_COMMIT="${PV/_beta/beta}" - -RDEPEND="x11-libs/qt-gui[qt3support]" -DEPEND="${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<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 -} - -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/librecad/librecad-1.0.0_rc1.ebuild deleted file mode 100644 index 19fe1248e..000000000 --- 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="3" -inherit git-2 qt4-r2 - -DESCRIPTION="An generic 2D CAD program" -HOMEPAGE="http://www.librecad.org/" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug doc" - -EGIT_REPO_URI="https://github.com/LibreCAD/LibreCAD.git" -EGIT_COMMIT="${PV/_rc/rc}" - -RDEPEND="x11-libs/qt-gui[qt3support]" -DEPEND="${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<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 -} - -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/librecad/librecad-1.0.0_rc2.ebuild new file mode 100644 index 000000000..fe9145624 --- /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=3 + +inherit qt4-r2 + +DESCRIPTION="An generic 2D CAD program" +HOMEPAGE="http://www.librecad.org/" +SRC_URI="https://nodeload.github.com/LibreCAD/LibreCAD/zipball/1.0.0rc2 -> ${P}.zip" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="debug doc" + +RDEPEND=" + x11-libs/qt-gui[qt3support] + x11-libs/qt-assistant:4 + x11-libs/qt-qt3support:4" +DEPEND="${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/metadata.xml index 684d04155..f90bf4ae0 100644 --- a/media-gfx/librecad/metadata.xml +++ b/media-gfx/librecad/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<herd>sci</herd> -<maintainer> - <email>dongxuli2011@gmail.com</email> -</maintainer> -<longdescription lang="en"> + <herd>sci</herd> + <maintainer> + <email>dongxuli2011@gmail.com</email> + </maintainer> + <longdescription lang="en"> LibreCAD is a 2D CAD drawing tool based on the community edition of QCad (www.qcad.org). LibreCAD has been re-structured and ported to qt4 and works natively cross platform. |