Merge updates from master

eclass/gstreamer-meson.eclass

@@ -209,7 +209,7 @@ if [[ "${PN}" != "${GST_ORG_MODULE}" ]]; then
 	# Export multilib phases used for split builds.
 	multilib_src_install_all() { gstreamer_multilib_src_install_all; }
 else
-	local extra_deps=""
+	extra_deps=""
 
 	IUSE="nls test"
 	RESTRICT="!test? ( test )"

eclass/java-ant-2.eclass

@@ -59,7 +59,6 @@ if [[ -z "${JAVA_ANT_DISABLE_ANT_CORE_DEP}" ]]; then
 fi
 
 # add ant tasks specified in WANT_ANT_TASKS to DEPEND
-local ANT_TASKS_DEPEND;
 ANT_TASKS_DEPEND="$(java-pkg_ant-tasks-depend)"
 # check that java-pkg_ant-tasks-depend didn't fail
 if [[ $? != 0 ]]; then

eclass/java-pkg-simple.eclass

@@ -36,7 +36,7 @@ S="${WORKDIR}"
 
 # handle dependencies for testing frameworks
 if has test ${JAVA_PKG_IUSE}; then
-	local test_deps
+	test_deps=
 	for framework in ${JAVA_TESTING_FRAMEWORKS}; do
 		case ${framework} in
 			junit)