[patch] Patch using use()

icedtea_use.patch (text/plain), 1.76 KB, created by Arfrever Frehtes Taifersar Arahesis on 2014-11-03 23:33:30 UTC

--- icedtea-7.2.5.3.ebuild
+++ icedtea-7.2.5.3.ebuild
@@ -147,13 +147,9 @@
 	${X_DEPEND}
 	pax_kernel? ( sys-apps/elfix )"
 
-PDEPEND="webstart? (
-			dev-java/icedtea-web:0[icedtea7]
-		)
-		nsplugin? (
-			dev-java/icedtea-web:0[icedtea7,nsplugin]
-		)
-		pulseaudio? ( dev-java/icedtea-sound )"
+PDEPEND="webstart? ( dev-java/icedtea-web:0[icedtea7] )
+	nsplugin? ( dev-java/icedtea-web:0[icedtea7,nsplugin] )
+	pulseaudio? ( dev-java/icedtea-sound )"
 
 S="${WORKDIR}"/${ICEDTEA_PKG}
 
@@ -230,10 +226,10 @@
 	fi
 
 	# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
-	# In-tree JIT ports are available for arm, aarch64, amd64, ppc64, ppc64le, SPARC and x86.
+	# In-tree JIT ports are available for amd64, arm, arm64, ppc64, sparc and x86.
 	# Otherwise use CACAO
-	if ! has "${ARCH}" arm aarch64 amd64 ppc64 ppc64le sparc x86 ; then
-		if has "${ARCH}" ppc ; then
+	if ! { use amd64 || use arm || use arm64 || use ppc64 || use sparc || use x86; }; then
+		if use ppc; then
 			use_cacao="yes"
 		else
 			use_zero="yes"
--- icedtea-6.1.13.5-r1.ebuild
+++ icedtea-6.1.13.5-r1.ebuild
@@ -118,12 +118,8 @@
 	${X_DEPEND}
 	pax_kernel? ( sys-apps/elfix )"
 
-PDEPEND="webstart? (
-			dev-java/icedtea-web:0
-		)
-		nsplugin? (
-			dev-java/icedtea-web:0[nsplugin]
-		)"
+PDEPEND="webstart? ( dev-java/icedtea-web:0 )
+	nsplugin? ( dev-java/icedtea-web:0[nsplugin] )"
 
 S="${WORKDIR}"/${ICEDTEA_PKG}
 
@@ -198,7 +194,7 @@
 
 	# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
 	# Otherwise use CACAO
-	if ! has "${ARCH}" amd64 arm sparc x86; then
+	if ! { use amd64 || use arm || use sparc || use x86; }; then
 		enable_cacao=yes
 	elif use cacao; then
 		ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.'