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 1RaWDB-0002c4-2a for garchives@archives.gentoo.org; Tue, 13 Dec 2011 17:32:17 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1E03721C178; Tue, 13 Dec 2011 17:32:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D349621C178 for ; Tue, 13 Dec 2011 17:32:09 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 214741B4027 for ; Tue, 13 Dec 2011 17:32:09 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 3CBD68004A for ; Tue, 13 Dec 2011 17:32:08 +0000 (UTC) From: "Dongxu Li" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Dongxu Li" Message-ID: <2653126b365d816173f95a330f7e967abc929527.dongxuli@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: media-gfx/librecad/ X-VCS-Repository: proj/sci X-VCS-Files: media-gfx/librecad/ChangeLog media-gfx/librecad/librecad-2.0.0_alpha1.ebuild media-gfx/librecad/librecad-9999.ebuild X-VCS-Directories: media-gfx/librecad/ X-VCS-Committer: dongxuli X-VCS-Committer-Name: Dongxu Li X-VCS-Revision: 2653126b365d816173f95a330f7e967abc929527 Date: Tue, 13 Dec 2011 17:32:08 +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: 224cb78d-a7e3-4353-a32c-6dc228954c6f X-Archives-Hash: cf91b7589bbb70de4a91624a2904d41d commit: 2653126b365d816173f95a330f7e967abc929527 Author: Dongxu Li gmail com> AuthorDate: Tue Dec 13 17:32:01 2011 +0000 Commit: Dongxu Li gmail com> CommitDate: Tue Dec 13 17:32:01 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3D2653126b media-gfx/librecad: version bump to 2.0.0_alpha1 --- media-gfx/librecad/ChangeLog | 3 ++ ...ad-9999.ebuild =3D> librecad-2.0.0_alpha1.ebuild} | 19 +++++++---- media-gfx/librecad/librecad-9999.ebuild | 31 +++++++++-----= ------ 3 files changed, 29 insertions(+), 24 deletions(-) diff --git a/media-gfx/librecad/ChangeLog b/media-gfx/librecad/ChangeLog index bfafbee..9e78e72 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$ =20 + 13 Dec 2011; Dongxu Li +librecad-2.0.0_alpha1= .ebuild librecad-9999.ebuild: + Version bumped to 2.0.0_alpha1, updated ebuild for git version + 23 Oct 2011; Dongxu Li +librecad-1.0.0_rc4.eb= uild: Version bumped to 1.0.0_rc4 =20 diff --git a/media-gfx/librecad/librecad-9999.ebuild b/media-gfx/librecad= /librecad-2.0.0_alpha1.ebuild similarity index 62% copy from media-gfx/librecad/librecad-9999.ebuild copy to media-gfx/librecad/librecad-2.0.0_alpha1.ebuild index ced0341..4a4636f 100644 --- a/media-gfx/librecad/librecad-9999.ebuild +++ b/media-gfx/librecad/librecad-2.0.0_alpha1.ebuild @@ -4,11 +4,13 @@ =20 EAPI=3D4 =20 -inherit qt4-r2 git-2 +inherit qt4-r2 =20 DESCRIPTION=3D"An generic 2D CAD program" HOMEPAGE=3D"http://www.librecad.org/" -EGIT_REPO_URI=3D"https://github.com/LibreCAD/LibreCAD.git" +SRC_URI=3D"https://nodeload.github.com/LibreCAD/LibreCAD/tarball/${PV/_/= } -> +${P}.tar.gz" + =20 LICENSE=3D"GPL-2" SLOT=3D"0" @@ -17,16 +19,19 @@ IUSE=3D"debug doc" =20 DEPEND=3D" x11-libs/qt-assistant:4 + x11-libs/qt-gui:4 dev-libs/boost " + RDEPEND=3D"${DEPEND}" =20 +src_unpack() { + unpack ${A} + mv * ${P} +} + 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 || die +sed -i -e '/HAS_CPP11/ s/^#//' src/src.pro } =20 src_install() { diff --git a/media-gfx/librecad/librecad-9999.ebuild b/media-gfx/librecad= /librecad-9999.ebuild index ced0341..9a5c5d5 100644 --- a/media-gfx/librecad/librecad-9999.ebuild +++ b/media-gfx/librecad/librecad-9999.ebuild @@ -2,41 +2,38 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ =20 -EAPI=3D4 - -inherit qt4-r2 git-2 +EAPI=3D"4" +inherit qt4-r2 git-2 flag-o-matic =20 DESCRIPTION=3D"An generic 2D CAD program" HOMEPAGE=3D"http://www.librecad.org/" -EGIT_REPO_URI=3D"https://github.com/LibreCAD/LibreCAD.git" - LICENSE=3D"GPL-2" SLOT=3D"0" KEYWORDS=3D"~amd64 ~x86" IUSE=3D"debug doc" =20 -DEPEND=3D" +EGIT_REPO_URI=3D"https://github.com/LibreCAD/LibreCAD.git" + +DEPEND=3D"${RDEPEND} x11-libs/qt-assistant:4 dev-libs/boost - " -RDEPEND=3D"${DEPEND}" +" =20 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 || die + #sed -i -e "s:\\\$\+system(git describe --tags):9999:" src/src.pro + #enable C++11 by default + sed -i -e '/HAS_CPP11/ s/^#//' src/src.pro + sed -i -e '/RS_VECTOR2D/ s/^#//' src/src.pro } =20 -src_install() { - qt4-r2_src_install +src_install() +{ dobin unix/librecad insinto /usr/share/"${PN}" 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 + make_desktop_entry "${PN}" LibreCAD "${PN}" Graphics }