25a26,27
> 	# Respect CFLAGS
> 	epatch "${FILESDIR}"/${PN}-1.24-Makefile.patch
27c29
< 	sed -i -e "s:-shared:-shared -Wl,-soname,\$@ :g" buildgcc/Makefile
---
> 	sed -i -e "s:-shared:-shared -Wl,-soname,\$@ :g" build/gcc/Makefile
29,33c31,35
< 	sed -i -e \
< 	    "s:/usr/lib/jvm/java-6-sun-1.6.0.00:$(java-config --jdk-home):g" \
< 	    buildgcc/Makefile || die "sed failed"
< 	# respect CFLAGS, remove strip and other hard-coded crap
< 	epatch "${FILESDIR}"/${PN}-1.22-Makefile.patch
---
> 	if use java ; then
> 		sed -i -e \
> 			"s:/usr/lib/jvm/java-6-sun-1.6.0.00:$(java-config --jdk-home):g" \
> 			build/gcc/Makefile || die "sed failed"
> 	fi
37c39
< 	cd buildgcc
---
> 	cd build/gcc
39,40c41,50
< 	emake CXX="$(tc-getCXX)" all $(use java && echo javaall) \
< 	    || die "build failed"
---
> 	if use debug ; then
> 		# Build debug target
> 		emake CXX="$(tc-getCXX)" debug staticdebug \
> 			$(use java && echo javadebug) $(use libs && echo shareddebug) \
> 			|| die "make debug failed"
> 	else
> 		# Build release target
> 		emake CXX="$(tc-getCXX)" release static $(use java && echo java) \
> 			$(use libs && echo shared) || die "make release failed"
> 	fi
43a54,55
> 	cd build/gcc
> 
45,55c57,68
< 	    newbin bin/astyled astyle || die "install debug bin failed"
< 	    newlib.a bin/libastyled.a libastyle.a  \
< 		|| die "install debug static lib failed"
< 	    if use libs ; then
< 		newlib.so bin/libastyled.so libastyle.so \
< 		    || die "install debug shared lib failed"
< 		if use java ; then
< 		    local j_dir="/usr/$(get_libdir)"
< 		    dolib.so bin/libastylejd.so \
< 			|| die "install debug shared java lib failed"
< 		    java-pkg_regso "${D}${j_dir}/libastylejd.so"
---
> 		newbin bin/astyled astyle || die "install debug bin failed"
> 		newlib.a bin/libastyled.a libastyle.a  \
> 			|| die "install debug static lib failed"
> 		if use libs ; then
> 			newlib.so bin/libastyled.so libastyle.so \
> 				|| die "install debug shared lib failed"
> 			if use java ; then
> 				local j_dir="/usr/$(get_libdir)"
> 				dolib.so bin/libastylejd.so \
> 					|| die "install debug shared java lib failed"
> 				java-pkg_regso "${D}${j_dir}/libastylejd.so"
> 			fi
57d69
< 	    fi
59,65c71,78
< 	    if use libs ; then
< 		dolib.so bin/libastyle.so || die "install shared lib failed"
< 		if use java ; then
< 		    local j_dir="/usr/$(get_libdir)"
< 		    dolib.so bin/libastylej.so \
< 			|| die "install shared java lib failed"
< 		    java-pkg_regso "${D}${j_dir}/libastylej.so"
---
> 		if use libs ; then
> 			dolib.so bin/libastyle.so || die "install shared lib failed"
> 			if use java ; then
> 				local j_dir="/usr/$(get_libdir)"
> 				dolib.so bin/libastylej.so \
> 					|| die "install shared java lib failed"
> 				java-pkg_regso "${D}${j_dir}/libastylej.so"
> 			fi
67,69c80,81
< 	    fi
< 	    dobin bin/astyle || die "install bin failed"
< 	    dolib.a bin/libastyle.a || die "install static lib failed"
---
> 		dobin bin/astyle || die "install bin failed"
> 		dolib.a bin/libastyle.a || die "install static lib failed"
71c83
< 	dohtml doc/*.html
---
> 	dohtml "${S}"/doc/*