diff options
author | Dongxu Li <dongxuli2011@gmail.com> | 2011-08-18 11:45:09 -0400 |
---|---|---|
committer | Dongxu Li <dongxuli2011@gmail.com> | 2011-08-18 11:45:09 -0400 |
commit | f0c664a4d0802e02968d9e5b6d0e320bebdbbb4a (patch) | |
tree | 20ea45e53769023bccba8e510bc33b637b1cf668 /media-gfx | |
parent | Fix manifest (diff) | |
download | sci-f0c664a4d0802e02968d9e5b6d0e320bebdbbb4a.tar.gz sci-f0c664a4d0802e02968d9e5b6d0e320bebdbbb4a.tar.bz2 sci-f0c664a4d0802e02968d9e5b6d0e320bebdbbb4a.zip |
media-gfx/brlcad: fixed building issue for 9999 svn live build
Diffstat (limited to 'media-gfx')
-rw-r--r-- | media-gfx/brlcad/ChangeLog | 3 | ||||
-rw-r--r-- | media-gfx/brlcad/Manifest | 4 | ||||
-rw-r--r-- | media-gfx/brlcad/brlcad-9999.ebuild | 14 |
3 files changed, 16 insertions, 5 deletions
diff --git a/media-gfx/brlcad/ChangeLog b/media-gfx/brlcad/ChangeLog index 6e5d65c02..08295cf27 100644 --- a/media-gfx/brlcad/ChangeLog +++ b/media-gfx/brlcad/ChangeLog @@ -4,6 +4,9 @@ *brlcad-7.20.2 (15 Jul 2011) + 18 Aug 2011; Dongxu Li <dongxuli2011@gmail.com> brlcad-9999.ebuild: + Fixed an ebuild configuration issue + 15 Aug 2011; Dongxu Li <dongxuli2011@gmail.com> -brlcad-7.20.2-r1.ebuild: removed cmake ebuild for 7.20.2, waiting for upstream to fix the tcl/tk building issue with cmake diff --git a/media-gfx/brlcad/Manifest b/media-gfx/brlcad/Manifest index fdb7d0b57..22e53e1d7 100644 --- a/media-gfx/brlcad/Manifest +++ b/media-gfx/brlcad/Manifest @@ -3,6 +3,6 @@ AUX brlcad-9999-cmake.patch 488 RMD160 51c1eaa27d2248f186746ad1b1b9c5ee32a9abbf AUX png_patch.diff 1171 RMD160 6faea89e2fcd65b5dc48e82a3cd343e4aba5b104 SHA1 509a912d0114599dcc600601d4eac04e614946b3 SHA256 066d0aec82e7e72d51d7dd3f5b12ce722e21e2b79382256e7e09aeb9a6a2a7e0 DIST brlcad-7.20.2.tar.gz 56219423 RMD160 b366d6956aa63f22ea14ed03f212e1a184eee429 SHA1 6d465398740a67572cfd9a8c3c6771e0b263d806 SHA256 879d21ff87808bf60956eec915b5bd6f1af1b4869145c239345f2a00267434ca EBUILD brlcad-7.20.2.ebuild 2584 RMD160 b0e5363f18e894c77fdf18e340f3f354a977d782 SHA1 cb54a0b829fa9a433b37a185119a3c2568e7c42c SHA256 44d8d0987fab07c5e6b482649eb776fff4055bec021d6dbf8a2e8d66a430aec4 -EBUILD brlcad-9999.ebuild 3533 RMD160 39e773df9336d7df3088a33cba70e0b6a64b65df SHA1 eaf7d503ba83cbfc0b54d9123d861b68c6d5c5c7 SHA256 4407990c82144a663b26fa95a53115d0bd4d4b7a17ca62f5b7c7bc1805120d88 -MISC ChangeLog 4390 RMD160 e7f7f4c31b488be4861031aa8b97479fce8fe54f SHA1 d0788581c1a12e376b3abae917da4083220f2d0b SHA256 9990e9b82bf86e796ba99c315c832df827fc76fa482d0f859b274a8a9832887a +EBUILD brlcad-9999.ebuild 3661 RMD160 aa52d79587ab5ca2154176628035c61acf56da05 SHA1 1f4cc0732b9c9fb7758b1c9d314fd37aaee33dc4 SHA256 2a2c3a4c6bee71a22ad700e65e6d8d9a55ba29d330cea59028b3f480a21e8181 +MISC ChangeLog 4499 RMD160 6468902c7c141973ada693b3773be59fcbbcd16b SHA1 e884be006ab93600ac6154ec7bdcf308a4fe2b7a SHA256 d692599098baedb727a3544a8ccf24a2f57950e881a41af466a0a6f951c401e9 MISC metadata.xml 1379 RMD160 7407a87496226206896ad41f07cbf1b4900faf05 SHA1 6fb2b9de93b48435f93a968de325d1b483160a63 SHA256 0374773ad63ea0e195813d44eeca951b9b756a73ad1fe034499532aef7e6078d diff --git a/media-gfx/brlcad/brlcad-9999.ebuild b/media-gfx/brlcad/brlcad-9999.ebuild index 6a2526870..33de02428 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 $ EAPI=4 -inherit cmake-utils eutils subversion +inherit cmake-utils eutils subversion java-pkg-2 DESCRIPTION="Constructive solid geometry modeling system" HOMEPAGE="http://brlcad.org/" @@ -12,7 +12,7 @@ ESVN_REPO_URI="https://brlcad.svn.sourceforge.net/svnroot/${PN}/${PN}/trunk" LICENSE="LGPL-2 BSD" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="benchmarks debug doc examples opengl smp" +IUSE="benchmarks debug doc examples java opengl smp" RDEPEND="media-libs/libpng sys-libs/zlib @@ -29,8 +29,8 @@ RDEPEND="media-libs/libpng media-libs/urt x11-libs/libXt x11-libs/libXi + java? ( >=virtual/jre-1.5 ) " - #java? ( >=virtual/jre-1.5 )" DEPEND="${RDEPEND} sys-devel/bison @@ -46,6 +46,9 @@ BRLCAD_DIR="${EPREFIX}/usr/${PN}" src_prepare() { epatch "${FILESDIR}/${P}-cmake.patch" +} + +src_configure() { if use Debug; then CMAKE_BUILD_TYPE=Debug else @@ -85,6 +88,7 @@ src_prepare() { fi mycmakeargs+=( $(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 } +src_compile() { + cmake-utils_src_compile +} + src_test() { cmake-utils_src_test #emake check || die "emake check failed" |