Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 220739 | Differences between
and this patch

Collapse All | Expand All

(-)astyle-1.22.ebuild.orig (-5 / +7 lines)
Lines 2-8 Link Here
2
# Distributed under the terms of the GNU General Public License v2
2
# Distributed under the terms of the GNU General Public License v2
3
# $Header: /var/cvsroot/gentoo-x86/dev-util/astyle/astyle-1.22.ebuild,v 1.3 2008/05/30 18:53:54 corsair Exp $
3
# $Header: /var/cvsroot/gentoo-x86/dev-util/astyle/astyle-1.22.ebuild,v 1.3 2008/05/30 18:53:54 corsair Exp $
4
4
5
inherit eutils java-pkg-2 java-pkg-opt-2 toolchain-funcs
5
inherit eutils java-pkg-opt-2 toolchain-funcs
6
6
7
DESCRIPTION="Artistic Style is a reindenter and reformatter of C++, C and Java source code"
7
DESCRIPTION="Artistic Style is a reindenter and reformatter of C++, C and Java source code"
8
HOMEPAGE="http://astyle.sourceforge.net/"
8
HOMEPAGE="http://astyle.sourceforge.net/"
Lines 22-28 Link Here
22
22
23
pkg_setup() {
23
pkg_setup() {
24
	if use java ; then
24
	if use java ; then
25
	    java-pkg-2_pkg_setup
25
		java-pkg-opt-2_pkg_setup
26
26
27
	    if use x86; then
27
	    if use x86; then
28
		jvmarch=i386
28
		jvmarch=i386
Lines 45-53 Link Here
45
		buildgcc/Makefile || die "sed failed"
45
		buildgcc/Makefile || die "sed failed"
46
	fi
46
	fi
47
	# Fix JAVA_HOME
47
	# Fix JAVA_HOME
48
	sed -i -e \
48
	if use java; then
49
	    "s:/usr/lib/jvm/java-6-sun-1.6.0.00:$(java-config --jdk-home):g" \
49
		sed -i -e \
50
	    buildgcc/Makefile || die "sed failed"
50
	    	"s:/usr/lib/jvm/java-6-sun-1.6.0.00:$(java-config --jdk-home):g" \
51
		    buildgcc/Makefile || die "sed failed"
52
	fi
51
}
53
}
52
54
53
src_compile() {
55
src_compile() {

Return to bug 220739