[gentoo-commits] gentoo-x86 commit in dev-util/astyle: ChangeLog astyle-1.22.ebuild

["Steve Arnold (nerdboy)" <nerdboy@gentoo.org>]

nerdboy     09/02/18 03:03:32

  Modified:             ChangeLog astyle-1.22.ebuild
  Log:
  updated DEPs to use jdk instead of jre (fixes bug #256610)
  (Portage version: 2.2_rc23/cvs/Linux x86_64)

Revision  Changes    Path
1.36                 dev-util/astyle/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/astyle/ChangeLog?rev=1.36&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/astyle/ChangeLog?rev=1.36&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/astyle/ChangeLog?r1=1.35&r2=1.36

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/astyle/ChangeLog,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- ChangeLog	2 Dec 2008 22:49:28 -0000	1.35
+++ ChangeLog	18 Feb 2009 03:03:32 -0000	1.36
@@ -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)
 



1.12                 dev-util/astyle/astyle-1.22.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/astyle/astyle-1.22.ebuild?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/astyle/astyle-1.22.ebuild?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/astyle/astyle-1.22.ebuild?r1=1.11&r2=1.12

Index: astyle-1.22.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/astyle/astyle-1.22.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- astyle-1.22.ebuild	2 Dec 2008 22:49:28 -0000	1.11
+++ astyle-1.22.ebuild	18 Feb 2009 03:03:32 -0000	1.12
@@ -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 @@
 
 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_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() {