diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass
index ccf8db2..5629108 100644
--- a/eclass/java-utils-2.eclass
+++ b/eclass/java-utils-2.eclass
@@ -8,39 +8,30 @@
 #
 # $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.153 2013/04/17 18:01:48 sera Exp $
 
-# -----------------------------------------------------------------------------
-# @eclass-begin
-# @eclass-shortdesc Java Utility eclass
-# @eclass-maintainer java@gentoo.org
-#
+# @ECLASS: java-utils-2.eclass
+# @MAINTAINER:
+# java@gentoo.org
+# @AUTHOR:
+# Thomas Matthijs <axxo@gentoo.org>, Karl Trygve Kalleberg <karltk@gentoo.org>
+# @BLURB: Base eclass for Java packages
+# @DESCRIPTION:
 # This eclass provides functionality which is used by
 # java-pkg.eclass and java-pkg-opt.eclass as well as from ebuilds.
 #
-# @warning
-#   You probably don't want to inherit this directly from an ebuild. Instead,
-#   you should inherit java-ant for Ant-based Java packages, java-pkg for other
-#   Java packages, or java-pkg-opt for packages that have optional Java support.
-#
-# -----------------------------------------------------------------------------
+# You probably don't want to inherit this directly from an ebuild. Instead,
+# you should inherit java-ant for Ant-based Java packages, java-pkg for other
+# Java packages, or java-pkg-opt for packages that have optional Java support.
 
 inherit eutils versionator multilib
 
 IUSE="elibc_FreeBSD"
 
-# -----------------------------------------------------------------------------
-# @section-begin variables
-# @section-title Variables
-#
-# Summary of variables which control the behavior of building Java packges.
-# -----------------------------------------------------------------------------
-
 # Make sure we use java-config-2
 export WANT_JAVA_CONFIG="2"
 
-# -----------------------------------------------------------------------------
-# @variable-external WANT_ANT_TASKS
-# @variable-default ""
-#
+# @ECLASS-VARIABLE: WANT_ANT_TASKS
+# @DEFAULT_UNSET
+# @DESCRIPTION:
 # An $IFS separated list of ant tasks.
 # Ebuild can specify this variable before inheriting java-ant-2 eclass to
 # determine ANT_TASKS it needs. They will be automatically translated to
@@ -50,38 +41,33 @@ export WANT_JAVA_CONFIG="2"
 # differently for different eant calls can't use this simplified approach.
 # You also cannot specify version or anything else than ant-*.
 #
-# @example WANT_ANT_TASKS="ant-junit ant-trax"
-#
-# @seealso JAVA_PKG_FORCE_ANT_TASKS
-# -----------------------------------------------------------------------------
+# @CODE
+# WANT_ANT_TASKS="ant-junit ant-trax"
+# @CODE
+
 #WANT_ANT_TASKS
 
-# -----------------------------------------------------------------------------
-# @variable-internal JAVA_PKG_PORTAGE_DEP
-#
+# @VARIABLE: JAVA_PKG_PORTAGE_DEP
+# @INTERNAL
+# @DESCRIPTION:
 # The version of portage we need to function properly. Previously it was
 # portage with phase hooks support but now we use a version with proper env
 # saving. For EAPI 2 we have new enough stuff so let's have cleaner deps.
-# -----------------------------------------------------------------------------
 has "${EAPI}" 0 1 && JAVA_PKG_PORTAGE_DEP=">=sys-apps/portage-2.1.2.7"
 
-# -----------------------------------------------------------------------------
-# @variable-internal JAVA_PKG_E_DEPEND
-#
+# @VARIABLE: JAVA_PKG_E_DEPEND
+# @INTERNAL
+# @DESCRIPTION:
 # This is a convience variable to be used from the other java eclasses. This is
 # the version of java-config we want to use. Usually the latest stable version
 # so that ebuilds can use new features without depending on specific versions.
-# -----------------------------------------------------------------------------
 JAVA_PKG_E_DEPEND=">=dev-java/java-config-2.1.9-r1 ${JAVA_PKG_PORTAGE_DEP}"
 has source ${JAVA_PKG_IUSE} && JAVA_PKG_E_DEPEND="${JAVA_PKG_E_DEPEND} source? ( app-arch/zip )"
 
-# -----------------------------------------------------------------------------
-# @variable-preinherit JAVA_PKG_WANT_BOOTCLASSPATH
-#
+# @ECLASS-VARIABLE: JAVA_PKG_WANT_BOOTCLASSPATH
+# @DESCRIPTION:
 # The version of bootclasspath the package needs to work. Translates to a proper
 # dependency. The bootclasspath has to be obtained by java-ant_rewrite-bootclasspath
-# -----------------------------------------------------------------------------
-
 if [[ -n "${JAVA_PKG_WANT_BOOTCLASSPATH}" ]]; then
 	if [[ "${JAVA_PKG_WANT_BOOTCLASSPATH}" == "1.5" ]]; then
 		JAVA_PKG_E_DEPEND="${JAVA_PKG_E_DEPEND} >=dev-java/gnu-classpath-0.98-r1:0.98"
@@ -92,32 +78,29 @@ if [[ -n "${JAVA_PKG_WANT_BOOTCLASSPATH}" ]]; then
 	fi
 fi
 
-# -----------------------------------------------------------------------------
-# @variable-external JAVA_PKG_ALLOW_VM_CHANGE
-# @variable-default yes
-#
+# @ECLASS-VARIABLE: JAVA_PKG_ALLOW_VM_CHANGE
+# @DESCRIPTION:
 # Allow this eclass to change the active VM?
 # If your system VM isn't sufficient for the package, the build will fail.
-# @note This is useful for testing specific VMs.
-# -----------------------------------------------------------------------------
+# This is useful for testing specific VMs.
 JAVA_PKG_ALLOW_VM_CHANGE=${JAVA_PKG_ALLOW_VM_CHANGE:="yes"}
 
-# -----------------------------------------------------------------------------
-# @variable-external JAVA_PKG_FORCE_VM
-#
+# @ECLASS-VARIABLE: JAVA_PKG_FORCE_VM
+# @DEFAULT_UNSET
+# @DESCRIPTION:
 # Explicitly set a particular VM to use. If its not valid, it'll fall back to
 # whatever /etc/java-config-2/build/jdk.conf would elect to use.
 #
 # Should only be used for testing and debugging.
 #
-# @example Use sun-jdk-1.5 to emerge foo
+# Use sun-jdk-1.5 to emerge foo:
+# @CODE
 #	JAVA_PKG_FORCE_VM=sun-jdk-1.5 emerge foo
-#
-# -----------------------------------------------------------------------------
+# @CODE
 
-# -----------------------------------------------------------------------------
-# @variable-external JAVA_PKG_WANT_BUILD_VM
-#
+# @ECLASS-VARIABLE: JAVA_PKG_WANT_BUILD_VM
+# @DEFAULT_UNSET
+# @DESCRIPTION:
 # A list of VM handles to choose a build VM from. If the list contains the
 # currently active VM use that one, otherwise step through the list till a
 # usable/installed VM is found.
@@ -125,112 +108,90 @@ JAVA_PKG_ALLOW_VM_CHANGE=${JAVA_PKG_ALLOW_VM_CHANGE:="yes"}
 # This allows to use an explicit list of JDKs in DEPEND instead of a virtual.
 # Users of this variable must make sure at least one of the listed handles is
 # covered by DEPEND.
-# Requires JAVA_PKG_WANT_SOURCE and JAVA_PKG_WANT_TARGET to be set as well. 
-# -----------------------------------------------------------------------------
+# Requires JAVA_PKG_WANT_SOURCE and JAVA_PKG_WANT_TARGET to be set as well.
 
-# -----------------------------------------------------------------------------
-# @variable-external JAVA_PKG_WANT_SOURCE
-#
+# @ECLASS-VARIABLE: JAVA_PKG_WANT_SOURCE
+# @DEFAULT_UNSET
+# @DESCRIPTION:
 # Specify a specific VM version to compile for to use for -source.
 # Normally this is determined from DEPEND.
 # See java-pkg_get-source function below.
 #
 # Should only be used for testing and debugging.
 #
-# @seealso java-pkg_get-source
-#
-# @example Use 1.4 source to emerge baz
+# Use 1.4 source to emerge baz
+# @CODE
 #	JAVA_PKG_WANT_SOURCE=1.4 emerge baz
-# -----------------------------------------------------------------------------
+# @CODE
 
-# -----------------------------------------------------------------------------
-# @variable-external JAVA_PKG_WANT_TARGET
-#
+# @ECLASS-VARIABLE: JAVA_PKG_WANT_TARGET
+# @DEFAULT_UNSET
+# @DESCRIPTION:
 # Same as JAVA_PKG_WANT_SOURCE above but for -target.
 # See java-pkg_get-target function below.
 #
 # Should only be used for testing and debugging.
-#
-# @seealso java-pkg_get-target
-#
-# @example emerge bar to be compatible with 1.3
+# emerge bar to be compatible with 1.3
+# @CODE
 #	JAVA_PKG_WANT_TARGET=1.3 emerge bar
-# -----------------------------------------------------------------------------
+# @CODE
 
-# -----------------------------------------------------------------------------
-# @variable-internal JAVA_PKG_COMPILER_DIR
-# @default /usr/share/java-config-2/compiler
-#
+# @VARIABLE: JAVA_PKG_COMPILER_DIR
+# @INTERNAL
+# @DESCRIPTION:
 # Directory where compiler settings are saved, without trailing slash.
 # Probably shouldn't touch this variable.
-# -----------------------------------------------------------------------------
 JAVA_PKG_COMPILER_DIR=${JAVA_PKG_COMPILER_DIR:="/usr/share/java-config-2/compiler"}
 
-
-# -----------------------------------------------------------------------------
-# @variable-internal JAVA_PKG_COMPILERS_CONF
-# @variable-default /etc/java-config-2/build/compilers.conf
-#
+# @VARIABLE: JAVA_PKG_COMPILERS_CONF
+# @INTERNAL
+# @DESCRIPTION:
 # Path to file containing information about which compiler to use.
 # Can be overloaded, but it should be overloaded for testing.
-# -----------------------------------------------------------------------------
 JAVA_PKG_COMPILERS_CONF=${JAVA_PKG_COMPILERS_CONF:="/etc/java-config-2/build/compilers.conf"}
 
-# -----------------------------------------------------------------------------
-# @variable-external JAVA_PKG_FORCE_COMPILER
-#
+# @ECLASS-VARIABLE: JAVA_PKG_FORCE_COMPILER
+# @INTERNAL
+# @DEFAULT_UNSET
+# @DESCRIPTION:
 # Explicitly set a list of compilers to use. This is normally read from
 # JAVA_PKG_COMPILERS_CONF.
 #
-# @note This should only be used internally or for testing.
-# @example Use jikes and javac, in that order
+# Use jikes and javac, in that order
+# @CODE
 #	JAVA_PKG_FORCE_COMPILER="jikes javac"
-# -----------------------------------------------------------------------------
+# @CODE
 
-# -----------------------------------------------------------------------------
-# @variable-external JAVA_PKG_FORCE_ANT_TASKS
-#
+# @ECLASS-VARIABLE: JAVA_PKG_FORCE_ANT_TASKS
+# @DEFAULT_UNSET
+# @DESCRIPTION:
 # An $IFS separated list of ant tasks. Can be set in environment before calling
 # emerge/ebuild to override variables set in ebuild, mainly for testing before
 # putting the resulting (WANT_)ANT_TASKS into ebuild. Affects only ANT_TASKS in
 # eant() call, not the dependencies specified in WANT_ANT_TASKS.
 #
-# @example JAVA_PKG_FORCE_ANT_TASKS="ant-junit ant-trax" \
+# @CODE
+# JAVA_PKG_FORCE_ANT_TASKS="ant-junit ant-trax" \
 # 	ebuild foo.ebuild compile
-#
-# @seealso WANT_ANT_TASKS
-# -----------------------------------------------------------------------------
+# @CODE
 
-# TODO document me
 JAVA_PKG_QA_VIOLATIONS=0
 
-# -----------------------------------------------------------------------------
-# @section-end variables
-# -----------------------------------------------------------------------------
-
-
-# -----------------------------------------------------------------------------
-# @section-begin install
-# @section-summary Install functions
-#
-# These are used to install Java-related things, such as jars, Javadocs, JNI
-# libraries, etc.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# @ebuild-function java-pkg_doexamples
-#
+# @FUNCTION: java-pkg_doexamples
+# @DESCRIPTION:
 # Installs given arguments to /usr/share/doc/${PF}/examples
 # If you give it only one parameter and it is a directory it will install
 # everything in that directory to the examples directory.
 #
-# @example
+# @CODE
+# Parameters:
+# --subdir - If the examples need a certain directory structure
+# $* - list of files to install
+#
+# Examples:
 #	java-pkg_doexamples demo
 #	java-pkg_doexamples demo/* examples/*
-#
-# @param --subdir - If the examples need a certain directory structure
-# @param $* - list of files to install
-# ------------------------------------------------------------------------------
+# @CODE
 java-pkg_doexamples() {
 	debug-print-function ${FUNCNAME} $*
 
@@ -261,20 +222,19 @@ java-pkg_doexamples() {
 	dosym "${dest}" "${JAVA_PKG_SHAREPATH}/examples" || die
 }
 
-# -----------------------------------------------------------------------------
-# @ebuild-function java-pkg_dojar
-#
+# @FUNCTION: java-pkg_dojar
+# @DESCRIPTION:
 # Installs any number of jars.
 # Jar's will be installed into /usr/share/${PN}(-${SLOT})/lib/ by default.
 # You can use java-pkg_jarinto to change this path.
 # You should never install a jar with a package version in the filename.
 # Instead, use java-pkg_newjar defined below.
 #
-# @example
+# @CODE
 #	java-pkg_dojar dist/${PN}.jar dist/${PN}-core.jar
+# @CODE
 #
 # @param $* - list of jars to install
-# ------------------------------------------------------------------------------
 java-pkg_dojar() {
 	debug-print-function ${FUNCNAME} $*
 
@@ -326,23 +286,20 @@ java-pkg_dojar() {
 	java-pkg_do_write_
 }
 
-# ------------------------------------------------------------------------------
-# @internal-function depend-java-query
-#
+# @FUNCTION: depend-java-query
+# @INTERNAL
+# @DESCRIPTION:
 # Wrapper for the depend-java-query binary to enable passing USE in env.
 # Using env variables keeps this eclass working with java-config versions that
 # do not handle use flags.
-# ------------------------------------------------------------------------------
-
 depend-java-query() {
 	# Used to have a which call here but it caused endless loops for some people
 	# that had some weird bashrc voodoo for which.
 	USE="${USE}" /usr/bin/depend-java-query "${@}"
 }
 
-# ------------------------------------------------------------------------------
-# @ebuild-function java-pkg_regjar
-#
+# @FUNCTION: java-pkg_regjar
+# @DESCRIPTION:
 # Records an already installed jar in the package.env
 # This would mostly be used if the package has make or a custom script to
 # install things.
@@ -351,23 +308,26 @@ depend-java-query() {
 #	java-pkg_regjar ${D}/opt/foo/lib/foo.jar
 #
 # WARNING:
-#   if you want to use shell expansion, you have to use ${D}/... as the for in
-#   this function will not be able to expand the path, here's an example:
+# if you want to use shell expansion, you have to use ${D}/... as the for in
+# this function will not be able to expand the path, here's an example:
 #
+# @CODE
 #   java-pkg_regjar /opt/my-java/lib/*.jar
+# @CODE
 #
-#   will not work, because:
-#    * the `for jar in "$@"` can't expand the path to jar file names, as they
-#      don't exist yet
-#    * all `if ...` inside for will fail - the file '/opt/my-java/lib/*.jar'
-#      doesn't exist
+# will not work, because:
+# * the `for jar in "$@"` can't expand the path to jar file names, as they
+# don't exist yet
+# * all `if ...` inside for will fail - the file '/opt/my-java/lib/*.jar'
+# doesn't exist
 #
-#   you have to use it as:
+# you have to use it as:
 #
+# @CODE
 #   java-pkg_regjar ${D}/opt/my-java/lib/*.jar
+# @CODE
 #
 # @param $@ - jars to record
-# ------------------------------------------------------------------------------
 # TODO should we be making sure the jar is present on ${D} or wherever?
 java-pkg_regjar() {
 	debug-print-function ${FUNCNAME} $*
@@ -408,17 +368,19 @@ java-pkg_regjar() {
 	java-pkg_do_write_
 }
 
-# ------------------------------------------------------------------------------
-# @ebuild-function java-pkg_newjar
-#
+# @FUNCTION: java-pkg_newjar
+# @DESCRIPTION:
 # Installs a jar with a new name
 #
-# @example: install a versioned jar without the version
-#	java-pkg_newjar dist/${P}.jar ${PN}.jar
+# Install a versioned jar without the version
+# @CODE
+# Parameters:
+# $1 - jar to install
+# $2 - new name for jar - defaults to ${PN}.jar if not specified
 #
-# @param $1 - jar to install
-# @param $2 - new name for jar - defaults to ${PN}.jar if not specified
-# ------------------------------------------------------------------------------
+# Examples:
+#	java-pkg_newjar dist/${P}.jar ${PN}.jar
+# @CODE
 java-pkg_newjar() {
 	debug-print-function ${FUNCNAME} $*
 
@@ -436,32 +398,31 @@ java-pkg_newjar() {
 	java-pkg_dojar "${new_jar_dest}"
 }
 
-# ------------------------------------------------------------------------------
-# @ebuild-function java-pkg_addcp
-#
+# @FUNCTION: java-pkg_addcp
+# @DESCRIPTION:
 # Add something to the package's classpath. For jars, you should use dojar,
 # newjar, or regjar. This is typically used to add directories to the classpath.
 #
 # TODO add example
 # @param $@ - value to append to JAVA_PKG_CLASSPATH
-# ------------------------------------------------------------------------------
 java-pkg_addcp() {
 	java-pkg_append_ JAVA_PKG_CLASSPATH "${@}"
 	java-pkg_do_write_
 }
 
-# ------------------------------------------------------------------------------
-# @ebuild-function java-pkg_doso
-#
+# @FUNCTION: java-pkg_doso
+# @DESCRIPTION:
 # Installs any number of JNI libraries
 # They will be installed into /usr/lib by default, but java-pkg_sointo
 # can be used change this path
 #
+# @CODE
+# Parameters:
+# $@ - JNI libraries to install
+#
 # Example:
 #	java-pkg_doso *.so
-#
-# @param $@ - JNI libraries to install
-# ------------------------------------------------------------------------------
+# @CODE
 java-pkg_doso() {
 	debug-print-function ${FUNCNAME} $*
 
@@ -497,16 +458,17 @@ java-pkg_doso() {
 	java-pkg_do_write_
 }
 
-# ------------------------------------------------------------------------------
-# @ebuild-function java-pkg_regso
-#
+# @FUNCTION: java-pkg_regso
+# @DESCRIPTION:
 # Registers an already JNI library in package.env.
 #
+# @CODE
+# Parameters:
+# $@ - JNI libraries to register
+#
 # Example:
 #	java-pkg_regso *.so /path/*.so
-#
-# @param $@ - JNI libraries to register
-# ------------------------------------------------------------------------------
+# @CODE
 java-pkg_regso() {
 	debug-print-function ${FUNCNAME} $*
 
@@ -534,41 +496,41 @@ java-pkg_regso() {
 	java-pkg_do_write_
 }
 
-# ------------------------------------------------------------------------------
-# @ebuild-function java-pkg_jarinto
-#
+# @FUNCTION: java-pkg_jarinto
+# @DESCRIPTION:
 # Changes the path jars are installed into
 #
-# @param $1 - new location to install jars into.
-# -----------------------------------------------------------------------------
+# @CODE
+# Parameters:
+# $1 - new location to install jars into.
+# @CODE
 java-pkg_jarinto() {
 	debug-print-function ${FUNCNAME} $*
 
 	JAVA_PKG_JARDEST="${1}"
 }
 
-# ------------------------------------------------------------------------------
-# @ebuild-function java-pkg_sointo
-#
+# @FUNCTION: java-pkg_sointo
+# @DESCRIPTION:
 # Changes the path that JNI libraries are installed into.
 #
-# @param $1 - new location to install JNI libraries into.
-# ------------------------------------------------------------------------------
+# @CODE
+# Parameters:
+# $1 - new location to install JNI libraries into.
+# @CODE
 java-pkg_sointo() {
 	debug-print-function ${FUNCNAME} $*
 
 	JAVA_PKG_LIBDEST="${1}"
 }
 
-# ------------------------------------------------------------------------------
-# @ebuild-function java-pkg_dohtml
-#
+# @FUNCTION: java-pkg_dohtml
+# @DESCRIPTION:
 # Install Javadoc HTML documentation
 #
-# @example
+# @CODE
 #	java-pkg_dohtml dist/docs/
-#
-# ------------------------------------------------------------------------------
+# @CODE
 java-pkg_dohtml() {
 	debug-print-function ${FUNCNAME} $*
 
@@ -584,20 +546,20 @@ java-pkg_dohtml() {
 	java-pkg_recordjavadoc
 }
 
-# ------------------------------------------------------------------------------
-# @ebuild-function java-pkg_dojavadoc
-#
+# @FUNCTION: java-pkg_dojavadoc
+# @DESCRIPTION:
 # Installs javadoc documentation. This should be controlled by the doc use flag.
 #
-# @param $1: optional --symlink creates to symlink like this for html
+# @CODE
+# Parameters:
+# $1: optional --symlink creates to symlink like this for html
 #            documentation bundles.
-# @param $2: - The javadoc root directory.
+# $2: - The javadoc root directory.
 #
-# @example:
+# Examples:
 #	java-pkg_dojavadoc docs/api
-#   java-pkg_dojavadoc --symlink apidocs docs/api
-#
-# ------------------------------------------------------------------------------
+#	java-pkg_dojavadoc --symlink apidocs docs/api
+# @CODE
 java-pkg_dojavadoc() {
 	debug-print-function ${FUNCNAME} $*
 
@@ -650,24 +612,24 @@ java-pkg_dojavadoc() {
 	fi
 }
 
-# ------------------------------------------------------------------------------
-# @ebuild-function java-pkg_dosrc
-#
+# @FUNCTION: java-pkg_dosrc
+# @DESCRIPTION:
 # Installs a zip containing the source for a package, so it can used in
 # from IDEs like eclipse and netbeans.
+# Ebuild needs to DEPEND on app-arch/zip to use this. It also should be controlled by USE=source.
 #
-# Ebuild needs to DEPEND on app-arch/zip to use this.
-#
-# It also should be controlled by USE=source.
-#
-# @example:
-#	java-pkg_dosrc src/*
+# @CODE
+# Example:
+# java-pkg_dosrc src/*
+# @CODE
 #
-# ------------------------------------------------------------------------------
 # TODO change so it the arguments it takes are the base directories containing
-# 	source -nichoj
+# source -nichoj
+#
 # TODO should we be able to handle multiple calls to dosrc? -nichoj
+#
 # TODO maybe we can take an existing zip/jar? -nichoj
+#
 # FIXME apparently this fails if you give it an empty directories
 java-pkg_dosrc() {
 	debug-print-function ${FUNCNAME} $*
@@ -709,17 +671,18 @@ java-pkg_dosrc() {
 	java-pkg_do_write_
 }
 
-# ------------------------------------------------------------------------------
-# @ebuild-function java-pkg_dolauncher
-#
+# @FUNCTION: java-pkg_dolauncher
+# @DESCRIPTION:
 # Make a wrapper script to lauch/start this package
 # If necessary, the wrapper will switch to the appropriate VM.
 #
 # Can be called without parameters if the package installs only one jar
 # that has the Main-class attribute set. The wrapper will be named ${PN}.
 #
-# @param $1 - filename of launcher to create
-# @param $2 - options, as follows:
+# @CODE
+# Parameters:
+# $1 - filename of launcher to create
+# $2 - options, as follows:
 #  --main the.main.class.too.start
 #  --jar /the/jar/too/launch.jar or just <name>.jar
 #  --java_args 'Extra arguments to pass to java'
@@ -727,7 +690,7 @@ java-pkg_dosrc() {
 #  --pwd Directory the launcher changes to before executing java
 #  -into Directory to install the launcher to, instead of /usr/bin
 #  -pre Prepend contents of this file to the launcher
-# ------------------------------------------------------------------------------
+# @CODE
 java-pkg_dolauncher() {
 	debug-print-function ${FUNCNAME} $*
 
@@ -798,10 +761,10 @@ java-pkg_dolauncher() {
 	fi
 }
 
-# ------------------------------------------------------------------------------
+# @FUNCTION: java-pkg_dowar
+# @DESCRIPTION:
 # Install war files.
 # TODO document
-# ------------------------------------------------------------------------------
 java-pkg_dowar() {
 	debug-print-function ${FUNCNAME} $*
 
@@ -835,12 +798,12 @@ java-pkg_dowar() {
 	done
 }
 
-# ------------------------------------------------------------------------------
-# @internal-function java-pkg_recordjavadoc
+# @FUNCTION: java-pkg_recordjavadoc
+# @INTERNAL
+# @DESCRIPTION:
 # Scan for JavaDocs, and record their existence in the package.env file
 #
 # TODO make sure this in the proper section
-# ------------------------------------------------------------------------------
 java-pkg_recordjavadoc()
 {
 	debug-print-function ${FUNCNAME} $*
@@ -857,18 +820,9 @@ java-pkg_recordjavadoc()
 	fi
 }
 
-# ------------------------------------------------------------------------------
-# @section-end install
-# ------------------------------------------------------------------------------
 
-# ------------------------------------------------------------------------------
-# @begin-section query
-# Use these to build the classpath for building a package.
-# ------------------------------------------------------------------------------
-
-# ------------------------------------------------------------------------------
-# @ebuild-function java-pkg_jar-from
-#
+# @FUNCTION: java-pkg_jar-from
+# @DESCRIPTION:
 # Makes a symlink to a jar from a certain package
 # A lot of java packages include dependencies in a lib/ directory
 # You can use this function to replace these bundled dependencies.
@@ -876,16 +830,22 @@ java-pkg_recordjavadoc()
 # is passed as the very first argument, for jars that have to be present only
 # at build time and are not needed on runtime (junit testing etc).
 #
+# @CODE
 # Example: get all jars from xerces slot 2
 #	java-pkg_jar-from xerces-2
+#
 # Example: get a specific jar from xerces slot 2
 # 	java-pkg_jar-from xerces-2 xml-apis.jar
+#
 # Example: get a specific jar from xerces slot 2, and name it diffrently
 # 	java-pkg_jar-from xerces-2 xml-apis.jar xml.jar
+#
 # Example: get junit.jar which is needed only for building
 #	java-pkg_jar-from --build-only junit junit.jar
+# @CODE
 #
-# @param $opt
+# @CODE
+# Parameters
 #	--build-only - makes the jar(s) not added into package.env DEPEND line.
 #	  (assumed automatically when called inside src_test)
 #	--with-dependencies - get jars also from requested package's dependencies
@@ -893,12 +853,12 @@ java-pkg_recordjavadoc()
 #	--virtual - Packages passed to this function are to be handled as virtuals
 #	  and will not have individual jar dependencies recorded.
 #	--into $dir - symlink jar(s) into $dir (must exist) instead of .
-# @param $1 - Package to get jars from, or comma-separated list of packages in
+# $1 - Package to get jars from, or comma-separated list of packages in
 #	case other parameters are not used.
-# @param $2 - jar from package. If not specified, all jars will be used.
-# @param $3 - When a single jar is specified, destination filename of the
+# $2 - jar from package. If not specified, all jars will be used.
+# $3 - When a single jar is specified, destination filename of the
 #	symlink. Defaults to the name of the jar.
-# ------------------------------------------------------------------------------
+# @CODE
 # TODO could probably be cleaned up a little
 java-pkg_jar-from() {
 	debug-print-function ${FUNCNAME} $*
@@ -1013,18 +973,15 @@ java-pkg_jar-from() {
 	fi
 }
 
-# ------------------------------------------------------------------------------
-# @ebuild-function java-pkg_jarfrom
-#
+# @FUNCTION: java-pkg_jarfrom
+# @DESCRIPTION:
 # See java-pkg_jar-from
-# ------------------------------------------------------------------------------
 java-pkg_jarfrom() {
 	java-pkg_jar-from "$@"
 }
 
-# ------------------------------------------------------------------------------
-# @ebuild-function java-pkg_getjars
-#
+# @FUNCTION: java-pkg_getjars
+# @DESCRIPTION:
 # Get the classpath provided by any number of packages
 # Among other things, this can be passed to 'javac -classpath' or 'ant -lib'.
 # The providing packages are recorded as dependencies into package.env DEPEND
@@ -1032,19 +989,22 @@ java-pkg_jarfrom() {
 # that have to be present only at build time and are not needed on runtime
 # (junit testing etc).
 #
+# @CODE
 # Example: Get the classpath for xerces-2 and xalan,
 #	java-pkg_getjars xerces-2,xalan
+#
 # Example Return:
 #	/usr/share/xerces-2/lib/xml-apis.jar:/usr/share/xerces-2/lib/xmlParserAPIs.jar:/usr/share/xalan/lib/xalan.jar
 #
-# @param $opt
+#
+# Parameters:
 #	--build-only - makes the jar(s) not added into package.env DEPEND line.
 #	  (assumed automatically when called inside src_test)
 #	--with-dependencies - get jars also from requested package's dependencies
 #	  transitively.
-# @param $1 - list of packages to get jars from
+# $1 - list of packages to get jars from
 #   (passed to java-config --classpath)
-# ------------------------------------------------------------------------------
+# @CODE
 java-pkg_getjars() {
 	debug-print-function ${FUNCNAME} $*
 
@@ -1092,27 +1052,28 @@ java-pkg_getjars() {
 	echo "${jars}"
 }
 
-# ------------------------------------------------------------------------------
-# @ebuild-function java-pkg_getjar
-#
+# @FUNCTION: java-pkg_getjar
+# @DESCRIPTION:
 # Get the filename of a single jar from a package
 # The providing package is recorded as runtime dependency into package.env
 # DEPEND line, unless "--build-only" is passed as the very first argument, for
 # jars that have to be present only at build time and are not needed on runtime
 # (junit testing etc).
 #
-# @example
+# @CODE
+# Example:
 #	java-pkg_getjar xerces-2 xml-apis.jar
-# @example-return
+# returns
 #	/usr/share/xerces-2/lib/xml-apis.jar
 #
-# @param $opt
+# Parameters:
 #	--build-only - makes the jar not added into package.env DEPEND line.
 #	--virtual - Packages passed to this function are to be handled as virtuals
 #	  and will not have individual jar dependencies recorded.
-# @param $1 - package to use
-# @param $2 - jar to get
-# ------------------------------------------------------------------------------
+# $1 - package to use
+# $2 - jar to get
+# @CODE
+# @RETURN: The filename of the jar from the package
 java-pkg_getjar() {
 	debug-print-function ${FUNCNAME} $*
 
@@ -1185,9 +1146,8 @@ java-pkg_getjar() {
 	return 1
 }
 
-# ------------------------------------------------------------------------------
-# @ebuild-function java-pkg_register-dependency
-#
+# @FUNCTION: java-pkg_register-dependency
+# @DESCRIPTION:
 # Registers runtime dependency on a package, list of packages, or a single jar
 # from a package, into package.env DEPEND line. Can only be called in
 # src_install phase.
@@ -1195,21 +1155,25 @@ java-pkg_getjar() {
 # their classpath during build. As such, the dependencies only need to be
 # specified in ebuild's RDEPEND, and should be omitted in DEPEND.
 #
-# @param $1 - comma-separated list of packages, or a single package
-# @param $2 - if param $1 is a single package, optionally specify the jar
+# @CODE
+# Parameters:
+# $1 - comma-separated list of packages, or a single package
+# $2 - if param $1 is a single package, optionally specify the jar
 #   to depend on
 #
-# Example: Record the dependency on whole xerces-2 and xalan,
+# Examples:
+# Record the dependency on whole xerces-2 and xalan,
 #	java-pkg_register-dependency xerces-2,xalan
-# Example: Record the dependency on ant.jar from ant-core
+#
+# Record the dependency on ant.jar from ant-core
 #	java-pkg_register-dependency ant-core ant.jar
+# @CODE
 #
 # Note: Passing both list of packages as the first parameter AND specifying the
 # jar as the second is not allowed and will cause the function to die. We assume
 # that there's more chance one passes such combination as a mistake, than that
 # there are more packages providing identically named jar without class
 # collisions.
-# ------------------------------------------------------------------------------
 java-pkg_register-dependency() {
 	debug-print-function ${FUNCNAME} $*
 
@@ -1241,9 +1205,8 @@ java-pkg_register-dependency() {
 	java-pkg_do_write_
 }
 
-# ------------------------------------------------------------------------------
-# @ebuild-function java-pkg_register-optional-dependency
-#
+# @FUNCTION: java-pkg_register-optional-dependency
+# @DESCRIPTION:
 # Registers optional runtime dependency on a package, list of packages, or a
 # single jar from a package, into package.env OPTIONAL_DEPEND line. Can only be
 # called in src_install phase.
@@ -1252,19 +1215,21 @@ java-pkg_register-dependency() {
 # JDBC implementations for various databases. It's better than having USE flag
 # for each implementation triggering hard dependency.
 #
-# @param $1 - comma-separated list of packages, or a single package
-# @param $2 - if param $1 is a single package, optionally specify the jar
-#   to depend on
+# @CODE
+# Parameters:
+# $1 - comma-separated list of packages, or a single package
+# $2 - if param $1 is a single package, optionally specify the jar to depend on
 #
-# Example: Record the optional dependency on some jdbc providers
+# Example:
+# Record the optional dependency on some jdbc providers
 #	java-pkg_register-optional-dependency jdbc-jaybird,jtds-1.2,jdbc-mysql
+# @CODE
 #
 # Note: Passing both list of packages as the first parameter AND specifying the
 # jar as the second is not allowed and will cause the function to die. We assume
 # that there's more chance one passes such combination as a mistake, than that
 # there are more packages providing identically named jar without class
 # collisions.
-# ------------------------------------------------------------------------------
 java-pkg_register-optional-dependency() {
 	debug-print-function ${FUNCNAME} $*
 
@@ -1294,17 +1259,18 @@ java-pkg_register-optional-dependency() {
 	java-pkg_do_write_
 }
 
-# ------------------------------------------------------------------------------
-# @ebuild-function java-pkg_register-environment-variable
-#
+# @FUNCTION: java-pkg_register-environment-variable
+# @DESCRIPTION:
 # Register an arbitrary environment variable into package.env. The gjl launcher
 # for this package or any package depending on this will export it into
 # environement before executing java command.
 # Must only be called in src_install phase.
 #
-# @param $1 - variable name
-# @param $2 - variable value
-# ------------------------------------------------------------------------------
+# @CODE
+# Parameters:
+# $1 - variable name
+# $2 - variable value
+# @CODE
 JAVA_PKG_EXTRA_ENV="${T}/java-pkg-extra-env"
 JAVA_PKG_EXTRA_ENV_VARS=""
 java-pkg_register-environment-variable() {
@@ -1320,15 +1286,12 @@ java-pkg_register-environment-variable() {
 	java-pkg_do_write_
 }
 
-# ------------------------------------------------------------------------------
-# @ebuild-function java-pkg_get-bootclasspath
-#
+# @FUNCTION: java-pkg_get-bootclasspath
+# @DESCRIPTION:
 # Returns classpath of a given bootclasspath-providing package version.
 #
 # @param $1 - the version of bootclasspath (e.g. 1.5), 'auto' for bootclasspath
 #             of the current JDK
-# ------------------------------------------------------------------------------
-
 java-pkg_get-bootclasspath() {
 	local version="${1}"
 
@@ -1386,24 +1349,13 @@ java-pkg_get-bootclasspath() {
 #	done
 #}
 
-# ------------------------------------------------------------------------------
-# @section-end query
-# ------------------------------------------------------------------------------
-
-# ------------------------------------------------------------------------------
-# @section-begin helper
-# @section-summary Helper functions
-#
-# Various other functions to use from an ebuild
-# ------------------------------------------------------------------------------
-
-# ------------------------------------------------------------------------------
-# @ebuild-function java-pkg_find-normal-jars
-#
+# @FUNCTION: java-pkg_find-normal-jars
+# @DESCRIPTION:
 # Find the files with suffix .jar file in the given directory or $WORKDIR
-#
-# @param $1 - The directory to search for jar files (default: ${WORKDIR})
-# ------------------------------------------------------------------------------
+# @CODE
+# Parameters:
+# $1 - The directory to search for jar files (default: ${WORKDIR})
+# @CODE
 java-pkg_find-normal-jars() {
 	local dir=$1
 	[[ "${dir}" ]] || dir="${WORKDIR}"
@@ -1416,13 +1368,11 @@ java-pkg_find-normal-jars() {
 	return $?
 }
 
-# ------------------------------------------------------------------------------
-# @ebuild-function java-pkg_ensure-no-bundled-jars
-#
+# @FUNCTION: java-pkg_ensure-no-bundled-jars
+# @DESCRIPTION:
 # Try to locate bundled jar files in ${WORKDIR} and die if found.
 # This function should be called after WORKDIR has been populated with symlink
 # to system jar files or bundled jars removed.
-# ------------------------------------------------------------------------------
 java-pkg_ensure-no-bundled-jars() {
 	debug-print-function ${FUNCNAME} $*
 
@@ -1437,12 +1387,10 @@ java-pkg_ensure-no-bundled-jars() {
 	fi
 }
 
-# ------------------------------------------------------------------------------
-# @internal-function java-pkg_ensure-vm-version-sufficient
-#
+# @FUNCTION: java-pkg_ensure-vm-version-sufficient
+# @INTERNAL
+# @DESCRIPTION:
 # Checks if we have a sufficient VM and dies if we don't.
-#
-# ------------------------------------------------------------------------------
 java-pkg_ensure-vm-version-sufficient() {
 	debug-print-function ${FUNCNAME} $*
 
@@ -1454,12 +1402,10 @@ java-pkg_ensure-vm-version-sufficient() {
 	fi
 }
 
-# ------------------------------------------------------------------------------
-# @internal-function java-pkg_is-vm-version-sufficient
-#
-# @return zero - VM is sufficient
-# @return non-zero - VM is not sufficient
-# ------------------------------------------------------------------------------
+# @FUNCTION: java-pkg_is-vm-version-sufficient
+# @INTERNAL
+# @DESCRIPTION:
+# @RETURN: zero - VM is sufficient; non-zero - VM is not sufficient
 java-pkg_is-vm-version-sufficient() {
 	debug-print-function ${FUNCNAME} $*
 
@@ -1467,13 +1413,12 @@ java-pkg_is-vm-version-sufficient() {
 	return $?
 }
 
-# ------------------------------------------------------------------------------
-# @internal-function java-pkg_ensure-vm-version-eq
-#
+# @FUNCTION: java-pkg_ensure-vm-version-eq
+# @INTERNAL
+# @DESCRIPTION:
 # Die if the current VM is not equal to the argument passed.
 #
 # @param $@ - Desired VM version to ensure
-# ------------------------------------------------------------------------------
 java-pkg_ensure-vm-version-eq() {
 	debug-print-function ${FUNCNAME} $*
 
@@ -1485,13 +1430,14 @@ java-pkg_ensure-vm-version-eq() {
 	fi
 }
 
-# ------------------------------------------------------------------------------
-# @internal-function java-pkg_is-vm-version-eq
-#
-# @param $@ - VM version to compare current VM to
-# @return zero - VM versions are equal
-# @return non-zero - VM version are not equal
-# ------------------------------------------------------------------------------
+# @FUNCTION: java-pkg_is-vm-version-eq
+# @INTERNAL
+# @RETURN: zero - VM versions are equal; non-zero - VM version are not equal
+# DESCRIPTION:
+# @CODE
+# Parameters:
+# $@ - VM version to compare current VM to
+# @CODE
 java-pkg_is-vm-version-eq() {
 	debug-print-function ${FUNCNAME} $*
 
@@ -1518,13 +1464,12 @@ java-pkg_is-vm-version-eq() {
 	fi
 }
 
-# ------------------------------------------------------------------------------
-# @internal-function java-pkg_ensure-vm-version-ge
-#
+# @FUNCTION: java-pkg_ensure-vm-version-ge
+# @INTERNAL
+# @DESCRIPTION:
 # Die if the current VM is not greater than the desired version
 #
 # @param $@ - VM version to compare current to
-# ------------------------------------------------------------------------------
 java-pkg_ensure-vm-version-ge() {
 	debug-print-function ${FUNCNAME} $*
 
@@ -1536,13 +1481,15 @@ java-pkg_ensure-vm-version-ge() {
 	fi
 }
 
-# ------------------------------------------------------------------------------
-# @internal-function java-pkg_is-vm-version-ge
-#
-# @param $@ - VM version to compare current VM to
-# @return zero - current VM version is greater than checked version
-# @return non-zero - current VM version is not greater than checked version
-# ------------------------------------------------------------------------------
+# @FUNCTION: java-pkg_is-vm-version-ge
+# @INTERNAL
+# @DESCRIPTION:
+# @CODE
+# Parameters:
+# $@ - VM version to compare current VM to
+# @CODE
+# @RETURN: zero - current VM version is greater than checked version;
+# 	non-zero - current VM version is not greater than checked version
 java-pkg_is-vm-version-ge() {
 	debug-print-function ${FUNCNAME} $*
 
@@ -1575,31 +1522,30 @@ java-pkg_current-vm-matches() {
 	return $?
 }
 
-# ------------------------------------------------------------------------------
-# @ebuild-function java-pkg_get-source
-#
+# @FUNCTION: java-pkg_get-source
+# @DESCRIPTION:
 # Determines what source version should be used, for passing to -source.
 # Unless you want to break things you probably shouldn't set _WANT_SOURCE
 #
-# @return string - Either the lowest possible source, or JAVA_PKG_WANT_SOURCE
-# ------------------------------------------------------------------------------
+# @RETURN: string - Either the lowest possible source, or JAVA_PKG_WANT_SOURCE
 java-pkg_get-source() {
 	echo ${JAVA_PKG_WANT_SOURCE:-$(depend-java-query --get-lowest "${DEPEND} ${RDEPEND}")}
 }
 
-# ------------------------------------------------------------------------------
-# @ebuild-function java-pkg_get-target
-#
+# @FUNCTION: java-pkg_get-target
+# @DESCRIPTION:
 # Determines what target version should be used, for passing to -target.
 # If you don't care about lower versions, you can set _WANT_TARGET to the
 # version of your JDK.
 #
-# @return string - Either the lowest possible target, or JAVA_PKG_WANT_TARGET
-# ------------------------------------------------------------------------------
+# @RETURN: string - Either the lowest possible target, or JAVA_PKG_WANT_TARGET
 java-pkg_get-target() {
 	echo ${JAVA_PKG_WANT_TARGET:-$(depend-java-query --get-lowest "${DEPEND} ${RDEPEND}")}
 }
 
+# @FUNCTION: java-pkg_get-javac
+# @DESCRIPTION:
+# Returns the compiler executable
 java-pkg_get-javac() {
 	debug-print-function ${FUNCNAME} $*
 
@@ -1639,14 +1585,12 @@ java-pkg_get-javac() {
 	echo ${compiler_executable}
 }
 
-# ------------------------------------------------------------------------------
-# @ebuild-function java-pkg_javac-args
-#
+# @FUNCTION: java-pkg_javac-args
+# @DESCRIPTION:
 # If an ebuild uses javac directly, instead of using ejavac, it should call this
 # to know what -source/-target to use.
 #
-# @return string - arguments to pass to javac, complete with -target and -source
-# ------------------------------------------------------------------------------
+# @RETURN: string - arguments to pass to javac, complete with -target and -source
 java-pkg_javac-args() {
 	debug-print-function ${FUNCNAME} $*
 
@@ -1672,7 +1616,9 @@ java-pkg_javac-args() {
 	fi
 }
 
-# TODO document
+# @FUNCTION: java-pkg_get-jni-cflags
+# @DESCRIPTION:
+# Echos the CFLAGS for JNI compilations
 java-pkg_get-jni-cflags() {
 	local flags="-I${JAVA_HOME}/include"
 
@@ -1695,9 +1641,8 @@ java-pkg_ensure-test() {
 	die "${FUNCNAME} was removed. Package mangers handle this already. #278965"
 }
 
-# ------------------------------------------------------------------------------
-# @ebuild-function java-pkg_register-ant-task
-#
+# @FUNCTION: java-pkg_register-ant-task
+# @DESCRIPTION:
 # Register this package as ant task, so that ant will load it when no specific
 # ANT_TASKS are specified. Note that even without this registering, all packages
 # specified in ANT_TASKS will be loaded. Mostly used by the actual ant tasks
@@ -1705,12 +1650,14 @@ java-pkg_ensure-test() {
 # .jar into /usr/share/ant-core/lib to get autoloaded, for backwards
 # compatibility.
 #
-# @param --version x.y Register only for ant version x.y (otherwise for any ant
+# @CODE
+# Parameters
+# --version x.y Register only for ant version x.y (otherwise for any ant
 #		version). Used by the ant-* packages to prevent loading of mismatched
 #		ant-core ant tasks after core was updated, before the tasks are updated,
 #		without a need for blockers.
-# @param $1 Name to register as. Defaults to JAVA_PKG_NAME ($PN[-$SLOT])
-# ------------------------------------------------------------------------------
+# $1 Name to register as. Defaults to JAVA_PKG_NAME ($PN[-$SLOT])
+# @CODE
 java-pkg_register-ant-task() {
 	local TASKS_DIR="tasks"
 
@@ -1732,11 +1679,10 @@ java-pkg_register-ant-task() {
 	touch "${D}/usr/share/ant/${TASKS_DIR}/${TASK_NAME}"
 }
 
-# ------------------------------------------------------------------------------
-# @internal-function java-pkg_ant-tasks-depend
-#
+# @FUNCTION: java-pkg_ant-tasks-depend
+# @INTERNAL
+# @DESCRIPTION:
 # Translates the WANT_ANT_TASKS variable into valid dependencies.
-# ------------------------------------------------------------------------------
 java-pkg_ant-tasks-depend() {
 	debug-print-function ${FUNCNAME} ${WANT_ANT_TASKS}
 
@@ -1761,16 +1707,18 @@ java-pkg_ant-tasks-depend() {
 }
 
 
-# ------------------------------------------------------------------------------
-# @internal-function ejunit_
-#
+# @FUNCTION: ejunit_
+# @INTERNAL
+# @DESCRIPTION:
 # Internal Junit wrapper function. Makes it easier to run the tests and checks for
 # dev-java/junit in DEPEND. Launches the tests using junit.textui.TestRunner.
-#
-# @param $1 - junit package (junit or junit-4)
-# @param $2 - -cp or -classpath
-# @param $3 - classpath; junit and recorded dependencies get appended
-# @param $@ - the rest of the parameters are passed to java
+# @CODE
+# Parameters:
+# $1 - junit package (junit or junit-4)
+# $2 - -cp or -classpath
+# $3 - classpath; junit and recorded dependencies get appended
+# $@ - the rest of the parameters are passed to java
+# @CODE
 ejunit_() {
 	debug-print-function ${FUNCNAME} $*
 
@@ -1800,61 +1748,55 @@ ejunit_() {
 	java -cp "${cp}" -Djava.awt.headless=true ${runner} "${@}" || die "Running junit failed"
 }
 
-# ------------------------------------------------------------------------------
-# @ebuild-function ejunit
-#
+# @FUNCTION: ejunit
+# @DESCRIPTION:
 # Junit wrapper function. Makes it easier to run the tests and checks for
 # dev-java/junit in DEPEND. Launches the tests using org.junit.runner.JUnitCore.
 #
+# @CODE
+# Parameters:
+# $1 - -cp or -classpath
+# $2 - classpath; junit and recorded dependencies get appended
+# $@ - the rest of the parameters are passed to java
+#
 # Examples:
 # ejunit -cp build/classes org.blinkenlights.jid3.test.AllTests
 # ejunit org.blinkenlights.jid3.test.AllTests
-# ejunit org.blinkenlights.jid3.test.FirstTest \
-#         org.blinkenlights.jid3.test.SecondTest
-#
-# @param $1 - -cp or -classpath
-# @param $2 - classpath; junit and recorded dependencies get appended
-# @param $@ - the rest of the parameters are passed to java
-# ------------------------------------------------------------------------------
+# ejunit org.blinkenlights.jid3.test.FirstTest org.blinkenlights.jid3.test.SecondTest
+# @CODE
 ejunit() {
 	debug-print-function ${FUNCNAME} $*
 
 	ejunit_ "junit" "${@}"
 }
 
-# ------------------------------------------------------------------------------
-# @ebuild-function ejunit4
-#
+# @FUNCTION: ejunit4
+# @DESCRIPTION:
 # Junit4 wrapper function. Makes it easier to run the tests and checks for
 # dev-java/junit:4 in DEPEND. Launches the tests using junit.textui.TestRunner.
 #
+# @CODE
+# Parameters:
+# $1 - -cp or -classpath
+# $2 - classpath; junit and recorded dependencies get appended
+# $@ - the rest of the parameters are passed to java
+#
 # Examples:
 # ejunit4 -cp build/classes org.blinkenlights.jid3.test.AllTests
 # ejunit4 org.blinkenlights.jid3.test.AllTests
 # ejunit4 org.blinkenlights.jid3.test.FirstTest \
 #         org.blinkenlights.jid3.test.SecondTest
-#
-# @param $1 - -cp or -classpath
-# @param $2 - classpath; junit and recorded dependencies get appended
-# @param $@ - the rest of the parameters are passed to java
-# ------------------------------------------------------------------------------
+# @CODE
 ejunit4() {
 	debug-print-function ${FUNCNAME} $*
 
 	ejunit_ "junit-4" "${@}"
 }
 
-# ------------------------------------------------------------------------------
-# @section-end helper
-# ------------------------------------------------------------------------------
-
-# ------------------------------------------------------------------------------
-# @eclass-src_prepare
-#
+# @FUNCTION: java-utils-2_src_prepare
+# @DESCRIPTION:
 # src_prepare Searches for bundled jars
 # Don't call directly, but via java-pkg-2_src_prepare!
-# ------------------------------------------------------------------------------
-
 java-utils-2_src_prepare() {
 	[[ ${EBUILD_PHASE} == prepare ]] &&
 		java-pkg_func-exists java_prepare && java_prepare
@@ -1870,13 +1812,10 @@ java-utils-2_src_prepare() {
 	touch "${T}/java-utils-2_src_prepare-run"
 }
 
-# ------------------------------------------------------------------------------
-# @eclass-pkg_preinst
-#
+# @FUNCTION: java-utils-2_pkg_preinst
+# @DESCRIPTION:
 # pkg_preinst Searches for missing and unneeded dependencies
 # Don't call directly, but via java-pkg-2_pkg_preinst!
-# ------------------------------------------------------------------------------
-
 java-utils-2_pkg_preinst() {
 	if is-java-strict; then
 		if has_version dev-java/java-dep-check; then
@@ -1897,28 +1836,21 @@ java-utils-2_pkg_preinst() {
 	fi
 }
 
-# ------------------------------------------------------------------------------
-# @section-begin build
-# @section-summary Build functions
-#
-# These are some functions for building a package. In particular, it consists of
-# wrappers for javac and ant.
-# ------------------------------------------------------------------------------
-
-# ------------------------------------------------------------------------------
-# @ebuild-function eant
-#
+# @FUNCTION: eant
+# @DESCRIPTION:
 # Ant wrapper function. Will use the appropriate compiler, based on user-defined
 # compiler. Will also set proper ANT_TASKS from the variable ANT_TASKS,
 # variables:
+# 
+# @CODE
+# Variables:
 # EANT_GENTOO_CLASSPATH - calls java-pkg_getjars for the value and adds to the
-#                         gentoo.classpath property. Be sure to call
-#                         java-ant_rewrite-classpath in src_unpack.
+# 		gentoo.classpath property. Be sure to call java-ant_rewrite-classpath in src_unpack.
 # EANT_NEEDS_TOOLS - add tools.jar to the gentoo.classpath. Should only be used
-#                    for build-time purposes, the dependency is not recorded to
-#                    package.env!
-# *ANT_TASKS - used to determine ANT_TASKS before calling Ant.
-# ------------------------------------------------------------------------------
+# 		for build-time purposes, the dependency is not recorded to
+# 		package.env!
+# ANT_TASKS - used to determine ANT_TASKS before calling Ant.
+# @CODE
 eant() {
 	debug-print-function ${FUNCNAME} $*
 
@@ -2037,14 +1969,12 @@ eant() {
 	ant ${antflags} "${@}" || die "eant failed"
 }
 
-# ------------------------------------------------------------------------------
-# @ebuild-function ejavac
-#
+# @FUNCTION: ejavac
+# @DESCRIPTION:
 # Javac wrapper function. Will use the appropriate compiler, based on
 # /etc/java-config/compilers.conf
 #
 # @param $@ - Arguments to be passed to the compiler
-# ------------------------------------------------------------------------------
 ejavac() {
 	debug-print-function ${FUNCNAME} $*
 
@@ -2068,67 +1998,54 @@ ejavac() {
 	${compiler_executable} ${javac_args} "${@}" || die "ejavac failed"
 }
 
-# ------------------------------------------------------------------------------
-# @ebuild-function java-pkg_filter-compiler
-#
+# @FUNCTION: java-pkg_filter-compiler
+# @DESCRIPTION:
 # Used to prevent the use of some compilers. Should be used in src_compile.
 # Basically, it just appends onto JAVA_PKG_FILTER_COMPILER
 #
 # @param $@ - compilers to filter
-# ------------------------------------------------------------------------------
 java-pkg_filter-compiler() {
 	JAVA_PKG_FILTER_COMPILER="${JAVA_PKG_FILTER_COMPILER} $@"
 }
 
-# ------------------------------------------------------------------------------
-# @ebuild-function java-pkg_force-compiler
-#
+# @FUNCTION: java-pkg_force-compiler
+# @DESCRIPTION:
 # Used to force the use of particular compilers. Should be used in src_compile.
 # A common use of this would be to force ecj-3.1 to be used on amd64, to avoid
 # OutOfMemoryErrors that may come up.
 #
 # @param $@ - compilers to force
-# ------------------------------------------------------------------------------
 java-pkg_force-compiler() {
 	JAVA_PKG_FORCE_COMPILER="$@"
 }
 
-# ------------------------------------------------------------------------------
-# @ebuild-function use_doc
+# @FUNCTION: use_doc
+# @DESCRIPTION:
 #
 # Helper function for getting ant to build javadocs. If the user has USE=doc,
 # then 'javadoc' or the argument are returned. Otherwise, there is no return.
 #
 # The output of this should be passed to ant.
+# @CODE
+# Parameters:
+# $@ - Option value to return. Defaults to 'javadoc'
 #
-# Example: build javadocs by calling 'javadoc' target
+# Examples:
+# build javadocs by calling 'javadoc' target
 #	eant $(use_doc)
-# Example: build javadocs by calling 'apidoc' target
-#	eant $(use_doc apidoc)
 #
-# @param $@ - Option value to return. Defaults to 'javadoc'
-# @return string - Name of the target to create javadocs
-# ------------------------------------------------------------------------------
+# build javadocs by calling 'apidoc' target
+#	eant $(use_doc apidoc)
+# @CODE
+# @RETURN string - Name of the target to create javadocs
 use_doc() {
 	use doc && echo ${@:-javadoc}
 }
 
 
-# ------------------------------------------------------------------------------
-# @section-end build
-# ------------------------------------------------------------------------------
-
-# ------------------------------------------------------------------------------
-# @section-begin internal
-# @section-summary Internal functions
-#
-# Do __NOT__ use any of these from an ebuild! These are only to be used from
-# within the java eclasses.
-# ------------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# @function-internal java-pkg_init
-#
+# @FUNCTION: java-pkg_init
+# @INTERNAL
+# @DESCRIPTION:
 # The purpose of this function, as the name might imply, is to initialize the
 # Java environment. It ensures that that there aren't any environment variables
 # that'll muss things up. It initializes some variables, which are used
@@ -2136,8 +2053,6 @@ use_doc() {
 #
 # This shouldn't be used directly. Instead, java-pkg and java-pkg-opt will
 # call it during each of the phases of the merge process.
-#
-# -----------------------------------------------------------------------------
 java-pkg_init() {
 	debug-print-function ${FUNCNAME} $*
 
@@ -2207,9 +2122,9 @@ java-pkg_init() {
 	export ANT_RESPECT_JAVA_HOME=
 }
 
-# ------------------------------------------------------------------------------
-# @function-internal java-pkg-init-compiler_
-#
+# @FUNCTION: java-pkg-init-compiler_
+# @INTERNAL
+# @DESCRIPTION:
 # This function attempts to figure out what compiler should be used. It does
 # this by reading the file at JAVA_PKG_COMPILERS_CONF, and checking the
 # COMPILERS variable defined there.
@@ -2230,8 +2145,7 @@ java-pkg_init() {
 # by the current VM.
 #
 #
-# @return name of the compiler to use
-# ------------------------------------------------------------------------------
+# @RETURN name of the compiler to use
 java-pkg_init-compiler_() {
 	debug-print-function ${FUNCNAME} $*
 
@@ -2321,12 +2235,11 @@ java-pkg_init-compiler_() {
 
 }
 
-# ------------------------------------------------------------------------------
-# @internal-function init_paths_
-#
+# @FUNCTION: init_paths_
+# @INTERNAL
+# @DESCRIPTION:
 # Initializes some variables that will be used. These variables are mostly used
 # to determine where things will eventually get installed.
-# ------------------------------------------------------------------------------
 java-pkg_init_paths_() {
 	debug-print-function ${FUNCNAME} $*
 
@@ -2356,12 +2269,11 @@ java-pkg_init_paths_() {
 	debug-print "JAVA_PKG_WARDEST: ${JAVA_PKG_WARDEST}"
 }
 
-# ------------------------------------------------------------------------------
-# @internal-function java-pkg_do_write_
-#
+# @FUNCTION: java-pkg_do_write_
+# @INTERNAL
+# @DESCRIPTION:
 # Writes the package.env out to disk.
 #
-# ------------------------------------------------------------------------------
 # TODO change to do-write, to match everything else
 java-pkg_do_write_() {
 	debug-print-function ${FUNCNAME} $*
@@ -2426,15 +2338,17 @@ java-pkg_do_write_() {
 	fi
 }
 
-# ------------------------------------------------------------------------------
-# @internal-function java-pkg_record-jar_
-#
+# @FUNCTION: java-pkg_record-jar_
+# @INTERNAL
+# @DESCRIPTION:
 # Record an (optional) dependency to the package.env
-# @param --optional - record dependency as optional
-# @param --build - record dependency as build_only
-# @param $1 - package to record
-# @param $2 - (optional) jar of package to record
-# ------------------------------------------------------------------------------
+# @CODE
+# Parameters:
+# --optional - record dependency as optional
+# --build - record dependency as build_only
+# $1 - package to record
+# $2 - (optional) jar of package to record
+# @CODE
 JAVA_PKG_DEPEND_FILE="${T}/java-pkg-depend"
 JAVA_PKG_OPTIONAL_DEPEND_FILE="${T}/java-pkg-optional-depend"
 JAVA_PKG_BUILD_DEPEND_FILE="${T}/java-pkg-build-depend"
@@ -2458,15 +2372,19 @@ java-pkg_record-jar_() {
 	echo "${append}" >> "${depend_file}"
 }
 
-# ------------------------------------------------------------------------------
-# @internal-function java-pkg_append_
-#
+# @FUNCTION: java-pkg_append_
+# @INTERNAL
+# @DESCRIPTION
 # Appends a value to a variable
 #
-# Example: java-pkg_append_ CLASSPATH foo.jar
-# @param $1 variable name to modify
-# @param $2 value to append
-# ------------------------------------------------------------------------------
+# @CODE
+# Parameters:
+# $1 variable name to modify
+# $2 value to append
+#
+# Examples:
+#	java-pkg_append_ CLASSPATH foo.jar
+# @CODE
 java-pkg_append_() {
 	debug-print-function ${FUNCNAME} $*
 
@@ -2487,37 +2405,34 @@ java-pkg_append_() {
 	fi
 }
 
-# ------------------------------------------------------------------------------
-# @internal-function java-pkg_expand_dir_
-#
+# @FUNCTION: java-pkg_expand_dir_
+# @INTERNAL
+# @DESCRIPTION:
 # Gets the full path of the file/directory's parent.
-# @param $1 - file/directory to find parent directory for
-# @return - path to $1's parent directory
-# ------------------------------------------------------------------------------
+# @CODE
+# Parameters:
+# $1 - file/directory to find parent directory for
+# @CODE
+# @RETURN: path to $1's parent directory
 java-pkg_expand_dir_() {
 	pushd "$(dirname "${1}")" >/dev/null 2>&1
 	pwd
 	popd >/dev/null 2>&1
 }
 
-# ------------------------------------------------------------------------------
-# @internal-function java-pkg_func-exists
-#
+# @FUNCTION: java-pkg_func-exists
+# @INTERNAL
+# @DESCRIPTION:
 # Does the indicated function exist?
-#
-# @return 0 - function is declared
-# @return 1 - function is undeclared
-# ------------------------------------------------------------------------------
+# @RETURN: 0 - function is declared, 1 - function is undeclared
 java-pkg_func-exists() {
 	declare -F ${1} > /dev/null
 }
 
-# ------------------------------------------------------------------------------
-# @internal-function java-pkg_setup-vm
-#
+# @FUNCTION: java-pkg_setup-vm
+# @INTERNAL
+# @DESCRIPTION
 # Sets up the environment for a specific VM
-#
-# ------------------------------------------------------------------------------
 java-pkg_setup-vm() {
 	debug-print-function ${FUNCNAME} $*
 
@@ -2539,15 +2454,14 @@ java-pkg_setup-vm() {
 	fi
 }
 
-# ------------------------------------------------------------------------------
-# @internal-function java-pkg_needs-vm
-#
+# @FUNCTION: java-pkg_needs-vm
+# @INTERNAL
+# @DESCRIPTION:
 # Does the current package depend on virtual/jdk or does it set
 # JAVA_PKG_WANT_BUILD_VM?
 #
-# @return 0 - Package depends on virtual/jdk
-# @return 1 - Package does not depend on virtual/jdk
-# ------------------------------------------------------------------------------
+# @RETURN 0 - Package depends on virtual/jdk
+# @RETURN 1 - Package does not depend on virtual/jdk
 java-pkg_needs-vm() {
 	debug-print-function ${FUNCNAME} $*
 
@@ -2560,20 +2474,16 @@ java-pkg_needs-vm() {
 	return 1
 }
 
-# ------------------------------------------------------------------------------
-# @internal-function java-pkg_get-current-vm
-#
-# @return - The current VM being used
-# ------------------------------------------------------------------------------
+# @FUNCTION: java-pkg_get-current-vm
+# @INTERNAL
+# @RETURN - The current VM being used
 java-pkg_get-current-vm() {
 	java-config -f
 }
 
-# ------------------------------------------------------------------------------
-# @internal-function java-pkg_get-vm-vendor
-#
-# @return - The vendor of the current VM
-# ------------------------------------------------------------------------------
+# @FUNCTION: java-pkg_get-vm-vendor
+# @INTERNAL
+# @RETURN - The vendor of the current VM
 java-pkg_get-vm-vendor() {
 	debug-print-function ${FUNCNAME} $*
 
@@ -2582,26 +2492,23 @@ java-pkg_get-vm-vendor() {
 	echo "${vm}"
 }
 
-# ------------------------------------------------------------------------------
-# @internal-function java-pkg_get-vm-version
-#
-# @return - The version of the current VM
-# ------------------------------------------------------------------------------
+# @FUNCTION: java-pkg_get-vm-version
+# @INTERNAL
+# @RETURN - The version of the current VM
 java-pkg_get-vm-version() {
 	debug-print-function ${FUNCNAME} $*
 
 	java-config -g PROVIDES_VERSION
 }
 
-# ------------------------------------------------------------------------------
-# @internal-function java-pkg_build-vm-from-handle
-#
+# @FUNCTION: java-pkg_build-vm-from-handle
+# @INTERNAL
+# @DESCRIPTION:
 # Selects a build vm from a list of vm handles. First checks for the system-vm
 # beeing usable, then steps through the listed handles till a suitable vm is
 # found.
 #
-# @return - VM handle of an available JDK
-# ------------------------------------------------------------------------------
+# @RETURN - VM handle of an available JDK
 java-pkg_build-vm-from-handle() {
 	debug-print-function ${FUNCNAME} "$*"
 
@@ -2625,13 +2532,12 @@ java-pkg_build-vm-from-handle() {
 	return 1
 }
 
-# ------------------------------------------------------------------------------
-# @internal-function java-pkg_switch-vm
-#
+# @FUNCTION: java-pkg_switch-vm
+# @INTERNAL
+# @DESCRIPTION:
 # Switch VM if we're allowed to (controlled by JAVA_PKG_ALLOW_VM_CHANGE), and
 # verify that the current VM is sufficient.
 # Setup the environment for the VM being used.
-# ------------------------------------------------------------------------------
 java-pkg_switch-vm() {
 	debug-print-function ${FUNCNAME} $*
 
@@ -2709,12 +2615,11 @@ java-pkg_switch-vm() {
 	fi
 }
 
-# ------------------------------------------------------------------------------
-# @internal-function java-pkg_die
-#
+# @FUNCTION: java-pkg_die
+# @INTERNAL
+# @DESCRIPTION:
 # Enhanced die for Java packages, which displays some information that may be
 # useful for debugging bugs on bugzilla.
-# ------------------------------------------------------------------------------
 #register_die_hook java-pkg_die
 if ! has java-pkg_die ${EBUILD_DEATH_HOOKS}; then
 	EBUILD_DEATH_HOOKS="${EBUILD_DEATH_HOOKS} java-pkg_die"
@@ -2741,13 +2646,14 @@ java-pkg_jar-list() {
 	fi
 }
 
-# ------------------------------------------------------------------------------
-# @internal-function java-pkg_verify-classes
-#
+# @FUNCTION: java-pkg_verify-classes
+# @INTERNAL
+# @DESCRIPTION:
 # Verify that the classes were compiled for the right source / target. Dies if
 # not.
-# @param $1 (optional) - the file to check, otherwise checks whole ${D}
-# ------------------------------------------------------------------------------
+# @CODE
+# $1 (optional) - the file to check, otherwise checks whole ${D}
+# @CODE
 java-pkg_verify-classes() {
 	#$(find ${D} -type f -name '*.jar' -o -name '*.class')
 
@@ -2785,14 +2691,17 @@ java-pkg_verify-classes() {
 	fi
 }
 
-# ----------------------------------------------------------------------------
-# @internal-function java-pkg_ensure-dep
+# @FUNCTION: java-pkg_ensure-dep
+# @INTERNAL
+# @DESCRIPTION
 # Check that a package being used in jarfrom, getjars and getjar is contained
 # within DEPEND or RDEPEND.
-# @param $1 - empty - check both vars; "runtime" or "build" - check only
+# @CODE
+# Parameters:
+# $1 - empty - check both vars; "runtime" or "build" - check only
 #	RDEPEND, resp. DEPEND
-# @param $2 - Package name and slot.
-
+# $2 - Package name and slot.
+# @CODE
 java-pkg_ensure-dep() {
 	debug-print-function ${FUNCNAME} $*
 
@@ -2840,10 +2749,6 @@ java-pkg_ensure-dep() {
 	fi
 }
 
-# ------------------------------------------------------------------------------
-# @section-end internal
-# ------------------------------------------------------------------------------
-
 java-pkg_check-phase() {
 	local phase=${1}
 	local funcname=${FUNCNAME[1]}
@@ -2887,8 +2792,3 @@ is-java-strict() {
 	[[ -n ${JAVA_PKG_STRICT} ]]
 	return $?
 }
-
-
-# ------------------------------------------------------------------------------
-# @eclass-end
-# ------------------------------------------------------------------------------