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 1Qu4nD-0000Mi-8r for garchives@archives.gentoo.org; Thu, 18 Aug 2011 15:46:03 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4F72421C086; Thu, 18 Aug 2011 15:45:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 04C9721C086 for ; Thu, 18 Aug 2011 15:45:54 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2DEA11B4030 for ; Thu, 18 Aug 2011 15:45:54 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 6852C80040 for ; Thu, 18 Aug 2011 15:45:53 +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: Subject: [gentoo-commits] proj/sci:master commit in: media-gfx/brlcad/ X-VCS-Repository: proj/sci X-VCS-Files: media-gfx/brlcad/ChangeLog media-gfx/brlcad/brlcad-9999.ebuild X-VCS-Directories: media-gfx/brlcad/ X-VCS-Committer: dongxuli X-VCS-Committer-Name: Dongxu Li X-VCS-Revision: f0c664a4d0802e02968d9e5b6d0e320bebdbbb4a Date: Thu, 18 Aug 2011 15:45:53 +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: X-Archives-Hash: a80ecaeeb70b6d7ba8b47d91a0b3dd48 commit: f0c664a4d0802e02968d9e5b6d0e320bebdbbb4a Author: Dongxu Li gmail com> AuthorDate: Thu Aug 18 15:45:09 2011 +0000 Commit: Dongxu Li gmail com> CommitDate: Thu Aug 18 15:45:09 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3Df0c664a4 media-gfx/brlcad: fixed building issue for 9999 svn live build --- media-gfx/brlcad/ChangeLog | 3 +++ media-gfx/brlcad/brlcad-9999.ebuild | 14 +++++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/media-gfx/brlcad/ChangeLog b/media-gfx/brlcad/ChangeLog index 6e5d65c..08295cf 100644 --- a/media-gfx/brlcad/ChangeLog +++ b/media-gfx/brlcad/ChangeLog @@ -4,6 +4,9 @@ =20 *brlcad-7.20.2 (15 Jul 2011) =20 + 18 Aug 2011; Dongxu Li brlcad-9999.ebuild: + Fixed an ebuild configuration issue + 15 Aug 2011; Dongxu Li -brlcad-7.20.2-r1.ebui= ld: removed cmake ebuild for 7.20.2, waiting for upstream to fix the tcl/t= k building issue with cmake =20 diff --git a/media-gfx/brlcad/brlcad-9999.ebuild b/media-gfx/brlcad/brlca= d-9999.ebuild index 6a25268..33de024 100644 --- a/media-gfx/brlcad/brlcad-9999.ebuild +++ b/media-gfx/brlcad/brlcad-9999.ebuild @@ -3,7 +3,7 @@ # $Header: /var/cvsroot/gentoo-x86/media-gfx/brlcad/brlcad-7.18.4.ebuild= ,v 1.1 2011/04/18 22:47:37 dilfridge Exp $ =20 EAPI=3D4 -inherit cmake-utils eutils subversion +inherit cmake-utils eutils subversion java-pkg-2 =20 DESCRIPTION=3D"Constructive solid geometry modeling system" HOMEPAGE=3D"http://brlcad.org/" @@ -12,7 +12,7 @@ ESVN_REPO_URI=3D"https://brlcad.svn.sourceforge.net/svn= root/${PN}/${PN}/trunk" LICENSE=3D"LGPL-2 BSD" SLOT=3D"0" KEYWORDS=3D"~amd64 ~x86" -IUSE=3D"benchmarks debug doc examples opengl smp" +IUSE=3D"benchmarks debug doc examples java opengl smp" =20 RDEPEND=3D"media-libs/libpng sys-libs/zlib @@ -29,8 +29,8 @@ RDEPEND=3D"media-libs/libpng media-libs/urt x11-libs/libXt x11-libs/libXi + java? ( >=3Dvirtual/jre-1.5 ) " - #java? ( >=3Dvirtual/jre-1.5 )" =20 DEPEND=3D"${RDEPEND} sys-devel/bison @@ -46,6 +46,9 @@ BRLCAD_DIR=3D"${EPREFIX}/usr/${PN}" =20 src_prepare() { epatch "${FILESDIR}/${P}-cmake.patch" +} + +src_configure() { if use Debug; then CMAKE_BUILD_TYPE=3DDebug else @@ -85,6 +88,7 @@ src_prepare() { fi mycmakeargs+=3D( $(cmake-utils_use amd64 BRLCAD-ENABLE_64BIT) + $(cmake-utils_use java BRLCAD-ENABLE_RTSERVER) $(cmake-utils_use examples BRLCAD-INSTALL_EXAMPLE_GEOMETRY) $(cmake-utils_use doc BRLCAD_EXTRADOCS) $(cmake-utils_use doc BRLCAD_EXTRADOCS_PDF) @@ -104,6 +108,10 @@ src_prepare() { cmake-utils_src_configure } =20 +src_compile() { + cmake-utils_src_compile +} + src_test() { cmake-utils_src_test #emake check || die "emake check failed"