diff options
| author |   Steve Arnold <nerdboy@gentoo.org> | 2009-02-18 03:03:32 +0000 |
|---|---|---|
| committer | Steve Arnold <nerdboy@gentoo.org> | 2009-02-18 03:03:32 +0000 |
| commit | f53728c92d22eb5271bfef0ffa09b39163c4b3ec (patch) | |
| tree | 89a078f80f52b82016de4071fb4f9820aa84f151 /dev-util/astyle | |
| parent | Version bump and old version cleanup (diff) | |
| download | gentoo-2-f53728c92d22eb5271bfef0ffa09b39163c4b3ec.tar.gz gentoo-2-f53728c92d22eb5271bfef0ffa09b39163c4b3ec.tar.bz2 gentoo-2-f53728c92d22eb5271bfef0ffa09b39163c4b3ec.zip | |
updated DEPs to use jdk instead of jre (fixes bug #256610)
(Portage version: 2.2_rc23/cvs/Linux x86_64)
Diffstat (limited to 'dev-util/astyle')
| -rw-r--r-- | dev-util/astyle/ChangeLog | 9 | ||||
| -rw-r--r-- | dev-util/astyle/astyle-1.22.ebuild | 26 |
2 files changed, 12 insertions, 23 deletions
diff --git a/dev-util/astyle/ChangeLog b/dev-util/astyle/ChangeLog index cef355e57019..537316936e6f 100644 --- a/dev-util/astyle/ChangeLog +++ b/dev-util/astyle/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-util/astyle -# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/astyle/ChangeLog,v 1.35 2008/12/02 22:49:28 ranger Exp $ +# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/astyle/ChangeLog,v 1.36 2009/02/18 03:03:32 nerdboy Exp $ + + 18 Feb 2009; Steve Arnold <nerdboy@gentoo.org> astyle-1.22.ebuild: + updated DEPs to use jdk instead of jre (fixes bug #256610) 02 Dec 2008; Brent Baude <ranger@gentoo.org> astyle-1.22.ebuild: Marking astyle-1.22 ~ppc64 for bug 220379 @@ -66,7 +69,7 @@ Dropped ppc-macos keyword, see you in prefix 14 Nov 2007; Robin H. Johnson <robbat2@gentoo.org> astyle-1.21.ebuild: - Fix $Header: /var/cvsroot/gentoo-x86/dev-util/astyle/ChangeLog,v 1.35 2008/12/02 22:49:28 ranger Exp $ string. + Fix $Header: /var/cvsroot/gentoo-x86/dev-util/astyle/ChangeLog,v 1.36 2009/02/18 03:03:32 nerdboy Exp $ string. *astyle-1.21 (07 Oct 2007) diff --git a/dev-util/astyle/astyle-1.22.ebuild b/dev-util/astyle/astyle-1.22.ebuild index 5f109587ee5a..8adf5b3b7a5d 100644 --- a/dev-util/astyle/astyle-1.22.ebuild +++ b/dev-util/astyle/astyle-1.22.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/astyle/astyle-1.22.ebuild,v 1.11 2008/12/02 22:49:28 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/astyle/astyle-1.22.ebuild,v 1.12 2009/02/18 03:03:32 nerdboy Exp $ inherit eutils java-pkg-opt-2 toolchain-funcs @@ -14,24 +14,12 @@ KEYWORDS="alpha amd64 ppc ~ppc64 sparc x86" IUSE="debug java libs" -RDEPEND="java? ( >=virtual/jre-1.6 )" +RDEPEND="java? ( >=virtual/jdk-1.6 )" -DEPEND="java? ( >=virtual/jre-1.6 )" +DEPEND="java? ( >=virtual/jdk-1.6 )" S=${WORKDIR}/${PN} -pkg_setup() { - if use java ; then - java-pkg-opt-2_pkg_setup - - if use x86; then - jvmarch=i386 - else - jvmarch=${ARCH} - fi - fi -} - src_unpack() { unpack ${A} cd "${S}" @@ -48,10 +36,8 @@ src_unpack() { src_compile() { cd buildgcc - local build_targets="all" - use java && build_targets="${build_targets} javaall" - - emake CXX="$(tc-getCXX)" ${build_targets} || die "build failed" + emake CXX="$(tc-getCXX)" all $(use java && echo javaall) \ + || die "build failed" } src_install() { |