diff options
| author |   Aaron Mavrinac <mavrinac@gmail.com> | 2012-02-22 11:15:12 -0500 |
|---|---|---|
| committer | Aaron Mavrinac <mavrinac@gmail.com> | 2012-02-22 11:15:12 -0500 |
| commit | 6fa8966710e748c7f9c5a31723bd4cff2fc2eb01 (patch) | |
| tree | 9deefb1a395d7783cd2752301ec51d58758174b2 /sci-misc | |
| parent | Apparently qhull dependency is not optional, but 2010.1 from the official tre... (diff) | |
| download | ezod-6fa8966710e748c7f9c5a31723bd4cff2fc2eb01.tar.gz ezod-6fa8966710e748c7f9c5a31723bd4cff2fc2eb01.tar.bz2 ezod-6fa8966710e748c7f9c5a31723bd4cff2fc2eb01.zip | |
Repoman QA audit, fix all issues not related to profiles or metadata.
Diffstat (limited to 'sci-misc')
| -rw-r--r-- | sci-misc/swarm/Manifest | 2 | ||||
| -rw-r--r-- | sci-misc/swarm/swarm-2.2.3.ebuild | 46 |
2 files changed, 20 insertions, 28 deletions
diff --git a/sci-misc/swarm/Manifest b/sci-misc/swarm/Manifest index 66861f0..8a88e0e 100644 --- a/sci-misc/swarm/Manifest +++ b/sci-misc/swarm/Manifest @@ -1,3 +1,3 @@ AUX swarm-2.2.3-amd64.patch 505 RMD160 8a491f26d134c2393b1edfcd9bd1ae423f400d11 SHA1 ed8cc60fe250ca046c366017c5d5bcaefe319439 SHA256 33cbf9839de4950e3c16975deead12a00a461911b9025acdc21ed33d6895de6f DIST swarm-2.2.3.tar.gz 2960666 RMD160 d99a33c423a83c6fbb4bad6b9abf554b86879af7 SHA1 e2aa16835b749dcff4f5f8c638902fb8683128cf SHA256 908412f08ae53c321a403c737de30ffa5c905d0b6f5a947bb306f08a2116be7b -EBUILD swarm-2.2.3.ebuild 1455 RMD160 b5fdeedfd0f70b2a54bab160a99b8b2ff6477b0c SHA1 232ca6909c01d2a9e996046a362f6031e28659a2 SHA256 1381f74f08a25217e1c42aa6a0ad2674a16bc858f001161aa47ffc7b2d68534e +EBUILD swarm-2.2.3.ebuild 1022 RMD160 bbbdb85dc3a28f0ed695ee637f78593e3642adfb SHA1 1da1c1b0bf6674975896ce7cd18cc55bf50c880e SHA256 a5fcaf3c849cac7b181dddd5b9649146495d67aa527eb3d5392bb6b77c8278e8 diff --git a/sci-misc/swarm/swarm-2.2.3.ebuild b/sci-misc/swarm/swarm-2.2.3.ebuild index e60c683..610cf63 100644 --- a/sci-misc/swarm/swarm-2.2.3.ebuild +++ b/sci-misc/swarm/swarm-2.2.3.ebuild @@ -2,7 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -inherit eutils +EAPI=4 + +inherit eutils java-pkg-2 DESCRIPTION="Swarm is a platform for agent-based models." HOMEPAGE="http://www.swarm.org" @@ -13,34 +15,25 @@ SLOT="0" KEYWORDS="amd64 x86" IUSE="java hdf5" -DEPEND="dev-lang/tcl - dev-lang/tk - dev-tcltk/blt - >=media-libs/libpng-1.2.5 - >=sys-libs/zlib-1.2.2 - x11-libs/libXpm - virtual/emacs - hdf5? ( >=sci-libs/hdf5-1.6.2 ) - java? ( >=virtual/jdk-1.4.2 )" +DEPEND=" + sys-devel/gcc[objc] + dev-lang/tcl + dev-lang/tk + dev-tcltk/blt + >=media-libs/libpng-1.2.5 + >=sys-libs/zlib-1.2.2 + x11-libs/libXpm + virtual/emacs + hdf5? ( >=sci-libs/hdf5-1.6.2 ) + java? ( >=virtual/jdk-1.4.2 ) +" RDEPEND="${DEPEND}" -pkg_setup() { - if ! built_with_use --missing false gcc objc ; then - eerror "Your GCC compiler has been built without Objective-C support." - eerror "Please enable the 'objc' USE flag and re-emerge sys-devel/gcc." - elog "You can enable this USE flag either globally in /etc/make.conf," - elog "or just for specific packages in /etc/portage/package.use." - die "sys-devel/gcc missing objc support" - fi -} - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${P}-amd64.patch -} +PATCHES=( + "${FILESDIR}/${P}-amd64.patch" +) -src_compile() { +src_configure() { javaconf="--without-jdkdir" use java && javaconf="--with-jdkdir=`java-config -O`" hdf5conf="--without-hdf5dir" @@ -50,7 +43,6 @@ src_compile() { ${javaconf} \ ${hdf5conf} \ || die "econf failed" - emake || die "emake failed" } src_install() { |