From 36798d64055aed215ff129c5c7ede61441d84d92 Mon Sep 17 00:00:00 2001 From: Sébastien Fabbro Date: Mon, 17 Jun 2013 09:20:26 -0700 Subject: media-gfx/librecad: Cleanup and apply patch from bug #473388 Package-Manager: portage-2.2.01.22013-prefix RepoMan-Options: --force --- media-gfx/librecad/ChangeLog | 6 +++ media-gfx/librecad/Manifest | 4 +- media-gfx/librecad/files/1.0.0_rc2-gcc4.6.patch | 38 ----------------- .../files/librecad-1.0.0_rc2-version.patch | 11 ----- media-gfx/librecad/librecad-1.0.2.ebuild | 45 -------------------- media-gfx/librecad/librecad-2.0.0_beta5.ebuild | 48 ---------------------- media-gfx/librecad/librecad-2.0.0_rc1.ebuild | 27 ++++++------ media-gfx/librecad/metadata.xml | 23 ++++++----- 8 files changed, 32 insertions(+), 170 deletions(-) delete mode 100644 media-gfx/librecad/files/1.0.0_rc2-gcc4.6.patch delete mode 100644 media-gfx/librecad/files/librecad-1.0.0_rc2-version.patch delete mode 100644 media-gfx/librecad/librecad-1.0.2.ebuild delete mode 100644 media-gfx/librecad/librecad-2.0.0_beta5.ebuild (limited to 'media-gfx/librecad') diff --git a/media-gfx/librecad/ChangeLog b/media-gfx/librecad/ChangeLog index 136cdde70..be52d5aad 100644 --- a/media-gfx/librecad/ChangeLog +++ b/media-gfx/librecad/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header$ + 17 Jun 2013; Sébastien Fabbro + -files/1.0.0_rc2-gcc4.6.patch, -files/librecad-1.0.0_rc2-version.patch, + -librecad-1.0.2.ebuild, -librecad-2.0.0_beta5.ebuild, + librecad-2.0.0_rc1.ebuild, metadata.xml: + media-gfx/librecad: Cleanup and apply patch from bug #473388 + 14 Jun 2013; Justin Lecher librecad-9999.ebuild: Drop KEYWORDS of live ebuilds diff --git a/media-gfx/librecad/Manifest b/media-gfx/librecad/Manifest index b9ea34fe7..d74adebb1 100644 --- a/media-gfx/librecad/Manifest +++ b/media-gfx/librecad/Manifest @@ -1,4 +1,2 @@ -DIST librecad-1.0.2.tar.gz 4577097 SHA256 f04ad98b6c9bc0e8f748ef99a7052794155f246c36663e09508810d9acebadad SHA512 4cb8732b047ba01e7d796c51bbc1300e4ee3b674a4ca65c6ff3f18acd0107d3d0e83610f45af86dc164cbf22241558dddc2fb77e31bd2fb33425cb6d7b582889 WHIRLPOOL 73099244f56eb3953fb0a7b80aa5ea3a20adcbaa19a40ca51c14501316e7ebec2a44e30bb669e6ed6797a74c42b0640f959e648c3cee8c7865a9a5f3427b1591 DIST librecad-1.0.3.tar.gz 4578450 SHA256 8c2f5a7e55a4ae41a9bd47e2e7981577c740edd526e1f305cd6cbf581d053f30 SHA512 5a8e6e612bc954f3af0dfc26d1fc19938c80e216ac252fb65a38a13651c6e2313d593a3ee834ecc98bbd72a4dfd28ef1c39dd9ed6a6f9140d28b765edb59bee9 WHIRLPOOL d8157af2021bba2cee626d023125045455a2fe5f453ae065c9660be61f4c0d687a1c72957d1af1aa640cfde3815625bb7d0899dc5541fcb82bfe0eea4cfad6c6 -DIST librecad-2.0.0_beta5.tar.gz 15196079 SHA256 8d21a2b887d65ea28ac7fde1d0dea373f8267767e33ae26c0207ec1f6d42656f SHA512 22ec041a0a36bd9f59d2bf22aa343824b54c83febeb8b6fd836e4e3a821617ae80f2e5b7c38250b5791b946f8494561b49d9a880b49383c52395a04f0cb57547 WHIRLPOOL 20805394d0576c380b491fe7c02af3adfcbf09850ff84dee3155206746746e5f39b9cc2556836e74bd9c9449e7c50757b9f3ff3fcab6083abd140d0a3934ed06 -DIST librecad-2.0.0_rc1.tar.gz 15196079 SHA256 8d21a2b887d65ea28ac7fde1d0dea373f8267767e33ae26c0207ec1f6d42656f SHA512 22ec041a0a36bd9f59d2bf22aa343824b54c83febeb8b6fd836e4e3a821617ae80f2e5b7c38250b5791b946f8494561b49d9a880b49383c52395a04f0cb57547 WHIRLPOOL 20805394d0576c380b491fe7c02af3adfcbf09850ff84dee3155206746746e5f39b9cc2556836e74bd9c9449e7c50757b9f3ff3fcab6083abd140d0a3934ed06 +DIST librecad-2.0.0_rc1.zip 16210997 SHA256 9a5345463c19b64cf5f4e4f308460988a60ce4c8c8d311b08d16805fbec68f90 SHA512 b97eaf81050cfe06a7910ac3a7c64d7906dec3159ac3e5f24f92bd74e60d86c67b661b65fd6c258996043e8c4ae09b1d8d5cb92aea28b313eca10e54149abde1 WHIRLPOOL 768244e63bf34bfff259712fd1c5e9aee872eda496106bc8e33ab5f4c3f1c8c0131167984d55bf5d6e82d9af0e2cdb5e01a5d125f19749369679dfbf7bd60f5f 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 deleted file mode 100644 index b912801d6..000000000 --- a/media-gfx/librecad/files/1.0.0_rc2-gcc4.6.patch +++ /dev/null @@ -1,38 +0,0 @@ - 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::mask; -+ const unsigned long mask = LiteralMask(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::mask; -+ const unsigned long mask = SimpleSpaceMask(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 - - #include "rs_ellipse.h" - diff --git a/media-gfx/librecad/files/librecad-1.0.0_rc2-version.patch b/media-gfx/librecad/files/librecad-1.0.0_rc2-version.patch deleted file mode 100644 index da103c51b..000000000 --- a/media-gfx/librecad/files/librecad-1.0.0_rc2-version.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- LibreCAD-LibreCAD-460bd78/librecad.pro 2011-08-26 22:26:35.201935340 -0400 -+++ LibreCAD-LibreCAD-460bd78/librecad.pro 2011-08-26 22:26:59.138898865 -0400 -@@ -24,7 +24,7 @@ - # Get SVN revision number - # SVNREVISION = $$system(svn info -R | grep -o \"Revision: [0-9]*\" | sed -e \"s/Revision: //\" | head -n1) - # Temporary disabled getting SCM version -- SCMREVISION=$$system(git describe --tags) -+ SCMREVISION=1.0.0_rc2 - DEFINES += QC_SCMREVISION=\"$$SCMREVISION\" - macx { - CONFIG += x86 x86_64 diff --git a/media-gfx/librecad/librecad-1.0.2.ebuild b/media-gfx/librecad/librecad-1.0.2.ebuild deleted file mode 100644 index c9f90681f..000000000 --- a/media-gfx/librecad/librecad-1.0.2.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3 - -inherit qt4-r2 eutils - -DESCRIPTION="An generic 2D CAD program" -HOMEPAGE="http://www.librecad.org/" -SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/v1.0.2.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug doc" - -RDEPEND=" - dev-qt/qtgui[qt3support] - dev-qt/qthelp:4 - dev-qt/qt3support:4 - dev-cpp/muParser - " - -DEPEND="${RDEPEND}" - -src_unpack() { - unpack ${A} - mv * ${P} -} - -src_prepare() { -sed -i -e "s:\\\$\+system(git describe --tags):1.0.2:" "${PN}.pro" -} - -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/librecad-2.0.0_beta5.ebuild b/media-gfx/librecad/librecad-2.0.0_beta5.ebuild deleted file mode 100644 index a16e4c8f6..000000000 --- a/media-gfx/librecad/librecad-2.0.0_beta5.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=4 - -inherit qt4-r2 eutils flag-o-matic - -DESCRIPTION="An generic 2D CAD program" -HOMEPAGE="http://www.librecad.org/" -SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/2.0.0beta5.tar.gz -> -${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug doc" - -DEPEND=" - dev-qt/qthelp:4 - dev-qt/qtgui:4 - dev-qt/qtsvg:4 - dev-libs/boost - dev-cpp/muParser - media-libs/freetype - " - -RDEPEND="${DEPEND}" - -src_unpack() { - unpack ${A} - mv * ${P} -} - -src_prepare() { - sed -i -e '/RS_VECTOR2D/ s/^#//' librecad/src/src.pro -} - -src_install() { - dobin unix/librecad - insinto /usr/share/"${PN}" - doins -r unix/resources/* - if use doc ; then - dohtml -r support/doc/* - fi - doicon librecad/res/main/"${PN}".png - make_desktop_entry "${PN}" LibreCAD "${PN}.png" Graphics -} diff --git a/media-gfx/librecad/librecad-2.0.0_rc1.ebuild b/media-gfx/librecad/librecad-2.0.0_rc1.ebuild index a16e4c8f6..7017bccb8 100644 --- a/media-gfx/librecad/librecad-2.0.0_rc1.ebuild +++ b/media-gfx/librecad/librecad-2.0.0_rc1.ebuild @@ -2,29 +2,27 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI=4 +EAPI=5 inherit qt4-r2 eutils flag-o-matic -DESCRIPTION="An generic 2D CAD program" +DESCRIPTION="Generic 2D CAD program" HOMEPAGE="http://www.librecad.org/" -SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/2.0.0beta5.tar.gz -> -${P}.tar.gz" +SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.zip -> ${P}.zip" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug doc" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="debug doc 3d" DEPEND=" - dev-qt/qthelp:4 dev-qt/qtgui:4 + dev-qt/qthelp:4 dev-qt/qtsvg:4 dev-libs/boost dev-cpp/muParser media-libs/freetype " - RDEPEND="${DEPEND}" src_unpack() { @@ -33,16 +31,15 @@ src_unpack() { } src_prepare() { - sed -i -e '/RS_VECTOR2D/ s/^#//' librecad/src/src.pro + # currently RS_VECTOR3D causes an internal compiler error on GCC-4.8 + use 3d || sed -i -e '/RS_VECTOR2D/ s/^#//' librecad/src/src.pro } src_install() { dobin unix/librecad - insinto /usr/share/"${PN}" + insinto /usr/share/${PN} doins -r unix/resources/* - if use doc ; then - dohtml -r support/doc/* - fi - doicon librecad/res/main/"${PN}".png - make_desktop_entry "${PN}" LibreCAD "${PN}.png" Graphics + use doc && dohtml -r support/doc/* + doicon librecad/res/main/${PN}.png + make_desktop_entry ${PN} LibreCAD ${PN} Graphics } diff --git a/media-gfx/librecad/metadata.xml b/media-gfx/librecad/metadata.xml index c79d2dfcf..19375c344 100644 --- a/media-gfx/librecad/metadata.xml +++ b/media-gfx/librecad/metadata.xml @@ -1,15 +1,18 @@ - sci - - dongxuli2011@gmail.com - Dongxu Li - Package maintainer and upstream developer - - -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. +sci + + dongxuli2011@gmail.com + Dongxu Li + Package maintainer and upstream developer + + + 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. + + Use 3D vectors + -- cgit v1.2.3-18-g5258