diff options
author | Guillaume Horel <guillaume.horel@gmail.com> | 2011-06-10 12:35:02 -0400 |
---|---|---|
committer | Guillaume Horel <guillaume.horel@gmail.com> | 2011-06-10 12:41:26 -0400 |
commit | d307e3bf5f31fd40ab257235b65675f71e0f96cd (patch) | |
tree | 730b8e9f900993b44d652ddaed7eadd89358fae7 /media-gfx | |
parent | [sci-mathematics/scilab] version bump (diff) | |
parent | sci-biology/sra_sdk-2.0.1: quote properly (diff) | |
download | sci-d307e3bf5f31fd40ab257235b65675f71e0f96cd.tar.gz sci-d307e3bf5f31fd40ab257235b65675f71e0f96cd.tar.bz2 sci-d307e3bf5f31fd40ab257235b65675f71e0f96cd.zip |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'media-gfx')
-rw-r--r-- | media-gfx/librecad/ChangeLog | 3 | ||||
-rw-r--r-- | media-gfx/librecad/Manifest | 6 | ||||
-rw-r--r-- | media-gfx/librecad/librecad-1.0.0_beta5.ebuild | 42 | ||||
-rw-r--r-- | media-gfx/librecad/librecad-9999.ebuild | 20 |
4 files changed, 59 insertions, 12 deletions
diff --git a/media-gfx/librecad/ChangeLog b/media-gfx/librecad/ChangeLog index 394a16304..dbaf87f6c 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/Manifest b/media-gfx/librecad/Manifest index 9729b2c5a..b68afa405 100644 --- a/media-gfx/librecad/Manifest +++ b/media-gfx/librecad/Manifest @@ -1,3 +1,5 @@ -EBUILD librecad-9999.ebuild 1030 RMD160 5e4b722e954dfa2703b2d61d0f8763acdc31d04d SHA1 82bc477c7d4d61b46492cef27c20213ad7051456 SHA256 72318e7fc15c57434c644b921a0f87e71abacfaf9f960151efaef7b623eab64d -MISC ChangeLog 363 RMD160 ed9de650428d1b97ac5602869c650d23923d364f SHA1 805941ab891d362aa83150b974dd2ee38783853c SHA256 db21546f5a01e0a4a381ea5e671e70c6b386eba40906aed4507418a454dbcece +AUX redo.patch 426 RMD160 6310676c97e7dbcf7e714cedf74cc9fbce858d6b SHA1 6dd8788c5869bab1863585b74954b8079e238e8c SHA256 8c8c51aa56f004739cb44e363e082d3da26ff21991eb4ce569f6b5b7bc5b8bfb +EBUILD librecad-1.0.0_beta5.ebuild 1026 RMD160 51fcc8a3ea196ebecea814a02cc01eca466e4ed7 SHA1 cb8e1c7f825daacb19fcd40401f4c41690ca4df3 SHA256 dfa8d18c0e22447719eb425a4ae6387c0feb6773f53ad75bbb93813d4caf7f61 +EBUILD librecad-9999.ebuild 996 RMD160 d9ce7fa7f930871a46f7e0f59f6ea0743a6b4261 SHA1 65afe6bae17430931f2c36bd5f2c95eaaf62a2ff SHA256 9042a2a97a40b4ed23c4a9649c263600988a1f660e6a84854f0198ceb2f0de04 +MISC ChangeLog 478 RMD160 0b3a74f5b4bc5cba8bf6d8b5db0a4364c2ca3dbd SHA1 7c25225e00f2195724979643314874245757a6df SHA256 2eec70764f6409ef93c4efb58849f8248773c6fd40bd77313420e0628f02fd8b MISC metadata.xml 450 RMD160 62a6501cecfe47078279b48be9b1c658d40e59f9 SHA1 c4ea83204f0d636b89b362f43aa2f5f487b9d9c7 SHA256 891d496161866e9f329036a1a953bd667d7be70de7cb1da41eadbb4be21c7df8 diff --git a/media-gfx/librecad/librecad-1.0.0_beta5.ebuild b/media-gfx/librecad/librecad-1.0.0_beta5.ebuild new file mode 100644 index 000000000..7e7e71d1d --- /dev/null +++ b/media-gfx/librecad/librecad-1.0.0_beta5.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 git-2 + +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-9999.ebuild b/media-gfx/librecad/librecad-9999.ebuild index 261aa6edd..e0c605de1 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 } |