* [gentoo-commits] proj/sci:master commit in: media-gfx/librecad/files/, media-gfx/librecad/
@ 2011-06-09 18:54 Dongxu Li
0 siblings, 0 replies; 3+ messages in thread
From: Dongxu Li @ 2011-06-09 18:54 UTC (permalink / raw
To: gentoo-commits
commit: 9195041bb399674ee72adba0eee70fb510412b4f
Author: Dongxu Li <dongxuli2011 <AT> gmail <DOT> com>
AuthorDate: Thu Jun 9 18:53:41 2011 +0000
Commit: Dongxu Li <dongxuli2011 <AT> gmail <DOT> com>
CommitDate: Thu Jun 9 18:53:41 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=9195041b
media-gfx/librecad: added tagged version
---
media-gfx/librecad/ChangeLog | 3 ++
media-gfx/librecad/files/redo.patch | 13 ++++++++++++
...cad-9999.ebuild => librecad-1.0.0_beta5.ebuild} | 21 ++++++++++---------
media-gfx/librecad/librecad-9999.ebuild | 20 +++++++++---------
4 files changed, 37 insertions(+), 20 deletions(-)
diff --git a/media-gfx/librecad/ChangeLog b/media-gfx/librecad/ChangeLog
index 394a163..dbaf87f 100644
--- a/media-gfx/librecad/ChangeLog
+++ b/media-gfx/librecad/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header$
+ 09 Jun 2011; Dongxu Li <dongxuli2011@gmail.com> +librecad-1.0.0_beta5.ebuild:
+ added tagged version 1.0.0beta5
+
24 May 2011; Dongxu Li <dongxuli2011@gmail.com> librecad-9999.ebuild:
Switch from svn to git, add qt-assistant DEPEND
diff --git a/media-gfx/librecad/files/redo.patch b/media-gfx/librecad/files/redo.patch
new file mode 100644
index 0000000..296f842
--- /dev/null
+++ b/media-gfx/librecad/files/redo.patch
@@ -0,0 +1,13 @@
+diff --git a/src/ui/forms/qg_commandwidget.ui b/src/ui/forms/qg_commandwidget.ui
+index b6ab92a..30fb453 100644
+--- a/src/ui/forms/qg_commandwidget.ui
++++ b/src/ui/forms/qg_commandwidget.ui
+@@ -50,7 +50,7 @@
+ <bool>true</bool>
+ </property>
+ <property name="undoRedoEnabled">
+- <bool>false</bool>
++ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
diff --git a/media-gfx/librecad/librecad-9999.ebuild b/media-gfx/librecad/librecad-1.0.0_beta5.ebuild
similarity index 50%
copy from media-gfx/librecad/librecad-9999.ebuild
copy to media-gfx/librecad/librecad-1.0.0_beta5.ebuild
index 261aa6e..7e7e71d 100644
--- a/media-gfx/librecad/librecad-9999.ebuild
+++ b/media-gfx/librecad/librecad-1.0.0_beta5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: caduntu-9999.ebuild $
+# $Header: $
EAPI="3"
inherit qt4-r2 git-2
@@ -13,6 +13,7 @@ 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}
@@ -22,20 +23,20 @@ DEPEND="${RDEPEND}
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;|" \
+# 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
+ dobin unix/librecad
insinto /usr/share/"${PN}"
- doins -r unix/resources/*
+ doins -r unix/resources/*
if use doc ; then
- dohtml -r support/doc/*
+ dohtml -r support/doc/*
fi
- doicon res/main/"${PN}".png
- make_desktop_entry "${PN}" LibreCAD "${PN}.png" Graphics
+ doicon res/main/"${PN}".png
+ make_desktop_entry "${PN}" LibreCAD "${PN}.png" Graphics
}
diff --git a/media-gfx/librecad/librecad-9999.ebuild b/media-gfx/librecad/librecad-9999.ebuild
index 261aa6e..e0c605d 100644
--- a/media-gfx/librecad/librecad-9999.ebuild
+++ b/media-gfx/librecad/librecad-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: caduntu-9999.ebuild $
+# $Header: $
EAPI="3"
inherit qt4-r2 git-2
@@ -22,20 +22,20 @@ DEPEND="${RDEPEND}
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;|" \
+ # 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
+ dobin unix/librecad
insinto /usr/share/"${PN}"
- doins -r unix/resources/*
+ doins -r unix/resources/*
if use doc ; then
- dohtml -r support/doc/*
+ dohtml -r support/doc/*
fi
- doicon res/main/"${PN}".png
- make_desktop_entry "${PN}" LibreCAD "${PN}.png" Graphics
+ doicon res/main/"${PN}".png
+ make_desktop_entry "${PN}" LibreCAD "${PN}.png" Graphics
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/sci:master commit in: media-gfx/librecad/files/, media-gfx/librecad/
@ 2011-08-15 15:55 Justin Lecher
0 siblings, 0 replies; 3+ messages in thread
From: Justin Lecher @ 2011-08-15 15:55 UTC (permalink / raw
To: gentoo-commits
commit: 169876e17654102be38af48217b48079ca293c8e
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 15 15:43:28 2011 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Aug 15 15:43:28 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=169876e1
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$
+*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/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 -= 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 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="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 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="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 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=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 684d041..f90bf4a 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.
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/sci:master commit in: media-gfx/librecad/files/, media-gfx/librecad/
@ 2013-06-17 16:22 Sebastien Fabbro
0 siblings, 0 replies; 3+ messages in thread
From: Sebastien Fabbro @ 2013-06-17 16:22 UTC (permalink / raw
To: gentoo-commits
commit: 36798d64055aed215ff129c5c7ede61441d84d92
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 17 16:20:26 2013 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Mon Jun 17 16:20:26 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=36798d64
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/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 ++++++-----
7 files changed, 31 insertions(+), 167 deletions(-)
diff --git a/media-gfx/librecad/ChangeLog b/media-gfx/librecad/ChangeLog
index 136cdde..be52d5a 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 <bicatali@gentoo.org>
+ -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 <jlec@gentoo.org> librecad-9999.ebuild:
Drop KEYWORDS of live ebuilds
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 b912801..0000000
--- 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<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/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 da103c5..0000000
--- 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 c9f9068..0000000
--- 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 a16e4c8..0000000
--- 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 a16e4c8..7017bcc 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 c79d2df..19375c3 100644
--- a/media-gfx/librecad/metadata.xml
+++ b/media-gfx/librecad/metadata.xml
@@ -1,15 +1,18 @@
<?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>
- <name>Dongxu Li</name>
- <description>Package maintainer and upstream developer</description>
- </maintainer>
- <longdescription>
-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.
+<herd>sci</herd>
+<maintainer>
+ <email>dongxuli2011@gmail.com</email>
+ <name>Dongxu Li</name>
+ <description>Package maintainer and upstream developer</description>
+</maintainer>
+<longdescription>
+ 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.
</longdescription>
+<use>
+ <flag name="3d">Use 3D vectors</flag>
+</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-06-17 16:22 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-06-09 18:54 [gentoo-commits] proj/sci:master commit in: media-gfx/librecad/files/, media-gfx/librecad/ Dongxu Li
-- strict thread matches above, loose matches on Subject: below --
2011-08-15 15:55 Justin Lecher
2013-06-17 16:22 Sebastien Fabbro
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox