4 files changed, 11 insertions, 11 deletions

diff --git a/classes/java-library.bbclass b/classes/java-library.bbclass
index 2ce96ab..67541d2 100644
--- a/classes/java-library.bbclass
+++ b/classes/java-library.bbclass
@@ -40,11 +40,11 @@ def java_package_name(d):
 
 JPN ?= "${@java_package_name(d)}"
 
-DEPENDS_prepend = "virtual/javac-native fastjar-native "
+DEPENDS:prepend = "virtual/javac-native fastjar-native "
 
 PACKAGES += "${JPN}"
 
-FILES_${JPN} = "${datadir_java}"
+FILES:${JPN} = "${datadir_java}"
 
 # File name of the libraries' main Jar file
 JARFILENAME = "${BP}.jar"
@@ -54,15 +54,15 @@ ALTJARFILENAMES = "${BPN}.jar"
 
 # Java "source" distributions often contain precompiled things
 # we want to delete first.
-do_removebinaries() {
+do_deletebinaries() {
   find ${WORKDIR} ! -path "${RECIPE_SYSROOT}/*" ! -path "${RECIPE_SYSROOT_NATIVE}/*" \
                   -name "*.jar" -exec rm {} \;
   find ${WORKDIR} ! -path "${RECIPE_SYSROOT}/*" ! -path "${RECIPE_SYSROOT_NATIVE}/*" \
                   -name "*.class" -exec rm {} \;
 }
 
-addtask removebinaries after do_unpack before do_patch
+addtask deletebinaries after do_unpack before do_patch
 
-do_install_append() {
+do_install:append() {
   oe_jarinstall ${JARFILENAME} ${ALTJARFILENAMES}
 }
diff --git a/classes/openjdk-build-helper.bbclass b/classes/openjdk-build-helper.bbclass
index 4e334c2..1aeca8d 100644
--- a/classes/openjdk-build-helper.bbclass
+++ b/classes/openjdk-build-helper.bbclass
@@ -2,8 +2,8 @@
 # passing a valid ${PARALLEL_MAKE} to it. OTOH OpenJDK's makefiles are
 # parallelizable and we need ${PARALLEL_MAKE} to derive the proper value.
 # The base for this quirk is that GNU Make only considers the last "-j" option.
-EXTRA_OEMAKE_remove_task-compile = "${PARALLEL_MAKE}"
-EXTRA_OEMAKE_remove_task-install = "${PARALLEL_MAKEINST}"
+EXTRA_OEMAKE:remove:task-compile = "${PARALLEL_MAKE}"
+EXTRA_OEMAKE:remove:task-install = "${PARALLEL_MAKEINST}"
 
 # OpenJDK supports parallel compilation but uses a plain number for this.
 # In OE we have PARALLEL_MAKE which is the actual option passed to make,
@@ -45,7 +45,7 @@ def openjdk_build_helper_get_target_cflags(d):
     # doesn't work anyway.
     version = d.getVar('GCCVERSION')[0]
     # skip non digit characters at the beginning, e.g. from "linaro-6.2%"
-    match = re.search("\d", version)
+    match = re.search(r"\d", version)
     if match:
         version = version[match.start():]
     return openjdk_build_helper_get_cflags_by_cc_version(d, version)
@@ -83,7 +83,7 @@ def openjdk_build_helper_get_llvm_configure_arch(d):
     elif arch == "arm":
         arch = "arm"
     else:
-        if 'shark' in d.getVar('PACKAGECONFIG').split():
+        if bb.utils.contains('PACKAGECONFIG', 'shark', True, False, d):
             bb.warn("%s does not support %s in Shark builds yet" % (d.getVar('PN'), arch) );
 
     return arch
diff --git a/classes/openjdk-test-image.bbclass b/classes/openjdk-test-image.bbclass
index f6e4fca..47ad4bb 100644
--- a/classes/openjdk-test-image.bbclass
+++ b/classes/openjdk-test-image.bbclass
@@ -1,5 +1,5 @@
 DESCRIPTION = "An image for OpenJDK testing purposes"
 
-TEST_SUITES_append = " javac"
+TEST_SUITES:append = " javac"
 
 inherit openjre-test-image
diff --git a/classes/openjre-test-image.bbclass b/classes/openjre-test-image.bbclass
index 77dbd74..9562be4 100644
--- a/classes/openjre-test-image.bbclass
+++ b/classes/openjre-test-image.bbclass
@@ -4,6 +4,6 @@ IMAGE_FEATURES += "ssh-server-openssh package-management"
 
 IMAGE_INSTALL = "${CORE_IMAGE_BASE_INSTALL}"
 
-DEFAULT_TEST_SUITES_pn-${PN} = "ping ssh java"
+DEFAULT_TEST_SUITES:pn-${PN} = "ping ssh java"
 
 inherit core-image