Merge updates from master

35 files changed, 50 insertions, 29 deletions

diff --git a/eclass/cdrom.eclass b/eclass/cdrom.eclass
index 623a19867d42..9dca3f63bc10 100644
--- a/eclass/cdrom.eclass
+++ b/eclass/cdrom.eclass
@@ -4,6 +4,7 @@
 # @ECLASS: cdrom.eclass
 # @MAINTAINER:
 # games@gentoo.org
+# @SUPPORTED_EAPIS: 6 7
 # @BLURB: Functions for CD-ROM handling
 # @DESCRIPTION:
 # Acquire CD(s) for those lovely CD-based emerges.  Yes, this violates
@@ -14,6 +15,11 @@
 # eclass will require RESTRICT="bindist" but the point still stands.
 # The functions are generally called in src_unpack.
 
+case ${EAPI:-0} in
+	[67]) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
+esac
+
 if [[ -z ${_CDROM_ECLASS} ]]; then
 _CDROM_ECLASS=1
 
diff --git a/eclass/chromium-2.eclass b/eclass/chromium-2.eclass
index b8dae862dfea..54df3b1394c7 100644
--- a/eclass/chromium-2.eclass
+++ b/eclass/chromium-2.eclass
@@ -6,6 +6,7 @@
 # Chromium Project <chromium@gentoo.org>
 # @AUTHOR:
 # Mike Gilbert <floppym@gentoo.org>
+# @SUPPORTED_EAPIS: 7
 # @BLURB: Shared functions for chromium and google-chrome
 
 case ${EAPI} in
diff --git a/eclass/common-lisp-3.eclass b/eclass/common-lisp-3.eclass
index eb02ae59c86e..0f47b3c094d1 100644
--- a/eclass/common-lisp-3.eclass
+++ b/eclass/common-lisp-3.eclass
@@ -4,6 +4,7 @@
 # @ECLASS: common-lisp-3.eclass
 # @MAINTAINER:
 # Common Lisp project <common-lisp@gentoo.org>
+# @SUPPORTED_EAPIS: 6 7
 # @BLURB: functions to support the installation of Common Lisp libraries
 # @DESCRIPTION:
 # Since Common Lisp libraries share similar structure, this eclass aims
diff --git a/eclass/cron.eclass b/eclass/cron.eclass
index 337352b4e285..81f963a4f722 100644
--- a/eclass/cron.eclass
+++ b/eclass/cron.eclass
@@ -6,6 +6,7 @@
 # maintainer-needed@gentoo.org
 # @AUTHOR:
 # Original Author: Aaron Walker <ka0ttic@gentoo.org>
+# @SUPPORTED_EAPIS: 6 7
 # @BLURB: Some functions for cron
 # @DESCRIPTION:
 # Purpose: The main motivation for this eclass was to simplify
diff --git a/eclass/findlib.eclass b/eclass/findlib.eclass
index d117c0b2bfd6..e8b6e73c97af 100644
--- a/eclass/findlib.eclass
+++ b/eclass/findlib.eclass
@@ -6,10 +6,19 @@
 # ML <ml@gentoo.org>
 # @AUTHOR:
 # Original author: Matthieu Sozeau <mattam@gentoo.org> (retired)
+# @SUPPORTED_EAPIS: 6 7
 # @BLURB: ocamlfind (a.k.a. findlib) eclass
 # @DESCRIPTION:
 # ocamlfind (a.k.a. findlib) eclass
 
+case ${EAPI:-0} in
+	[67]) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
+esac
+
+if [[ -z ${_FINDLIB_ECLASS} ]] ; then
+_FINDLIB_ECLASS=1
+
 # Do not complain about CFLAGS etc since ML projects do not use them.
 QA_FLAGS_IGNORED='.*'
 
@@ -60,3 +69,5 @@ findlib_src_install() {
 	findlib_src_preinst
 	make DESTDIR="${D}" "$@" install || die "make failed"
 }
+
+fi
diff --git a/eclass/gnome.org.eclass b/eclass/gnome.org.eclass
index 3c244adef000..dba26155d740 100644
--- a/eclass/gnome.org.eclass
+++ b/eclass/gnome.org.eclass
@@ -7,8 +7,8 @@
 # @AUTHOR:
 # Authors: Spidler <spidler@gentoo.org> with help of carparski.
 # eclass variable additions and documentation: Gilles Dartiguelongue <eva@gentoo.org>
-# @BLURB: Helper eclass for gnome.org hosted archives
 # @SUPPORTED_EAPIS: 5 6 7
+# @BLURB: Helper eclass for gnome.org hosted archives
 # @DESCRIPTION:
 # Provide a default SRC_URI for tarball hosted on gnome.org mirrors.
 
diff --git a/eclass/java-ant-2.eclass b/eclass/java-ant-2.eclass
index 9a7e97a97eda..5592186936c0 100644
--- a/eclass/java-ant-2.eclass
+++ b/eclass/java-ant-2.eclass
@@ -7,8 +7,8 @@
 # @AUTHOR:
 # kiorky <kiorky@cryptelium.net>
 # Petteri Räty <betelgeuse@gentoo.org>
-# @BLURB: eclass for ant based Java packages
 # @SUPPORTED_EAPIS: 5 6 7
+# @BLURB: eclass for ant based Java packages
 # @DESCRIPTION:
 # Eclass for Ant-based Java packages. Provides support for both automatic and
 # manual manipulation of build.xml files. Should be inherited after java-pkg-2
diff --git a/eclass/java-osgi.eclass b/eclass/java-osgi.eclass
index 69f8f90d0ae3..abbf73cdd3fa 100644
--- a/eclass/java-osgi.eclass
+++ b/eclass/java-osgi.eclass
@@ -6,8 +6,8 @@
 # java@gentoo.org
 # @AUTHOR:
 # Java maintainers <java@gentoo.org>
-# @BLURB: Java OSGi eclass
 # @SUPPORTED_EAPIS: 5 6 7
+# @BLURB: Java OSGi eclass
 # @DESCRIPTION:
 # This eclass provides functionality which is used by packages that need to be
 # OSGi compliant. This means that the generated jars will have special headers
diff --git a/eclass/java-pkg-2.eclass b/eclass/java-pkg-2.eclass
index 362e5f47d66a..4d5cb7665728 100644
--- a/eclass/java-pkg-2.eclass
+++ b/eclass/java-pkg-2.eclass
@@ -6,8 +6,8 @@
 # java@gentoo.org
 # @AUTHOR:
 # Thomas Matthijs <axxo@gentoo.org>
-# @BLURB: Eclass for Java Packages
 # @SUPPORTED_EAPIS: 5 6 7
+# @BLURB: Eclass for Java Packages
 # @DESCRIPTION:
 # This eclass should be inherited for pure Java packages, or by packages which
 # need to use Java.
diff --git a/eclass/java-pkg-opt-2.eclass b/eclass/java-pkg-opt-2.eclass
index 7733fc7afd11..7f1f5a2f8394 100644
--- a/eclass/java-pkg-opt-2.eclass
+++ b/eclass/java-pkg-opt-2.eclass
@@ -6,8 +6,8 @@
 # java@gentoo.org
 # @AUTHOR:
 # Thomas Matthijs <axxo@gentoo.org>
-# @BLURB: Eclass for package with optional Java support
 # @SUPPORTED_EAPIS: 5 6 7
+# @BLURB: Eclass for package with optional Java support
 # @DESCRIPTION:
 # Inherit this eclass instead of java-pkg-2 if you only need optional Java
 # support.
diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass
index afd2f92f5332..0c3e1af70364 100644
--- a/eclass/java-pkg-simple.eclass
+++ b/eclass/java-pkg-simple.eclass
@@ -6,8 +6,8 @@
 # java@gentoo.org
 # @AUTHOR:
 # Java maintainers <java@gentoo.org>
-# @BLURB: Eclass for packaging Java software with ease.
 # @SUPPORTED_EAPIS: 5 6 7
+# @BLURB: Eclass for packaging Java software with ease.
 # @DESCRIPTION:
 # This class is intended to build pure Java packages from Java sources
 # without the use of any build instructions shipped with the sources.
diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass
index da5f91505129..3368e6977f60 100644
--- a/eclass/java-utils-2.eclass
+++ b/eclass/java-utils-2.eclass
@@ -6,8 +6,8 @@
 # java@gentoo.org
 # @AUTHOR:
 # Thomas Matthijs <axxo@gentoo.org>, Karl Trygve Kalleberg <karltk@gentoo.org>
-# @BLURB: Base eclass for Java packages
 # @SUPPORTED_EAPIS: 5 6 7
+# @BLURB: Base eclass for Java packages
 # @DESCRIPTION:
 # This eclass provides functionality which is used by java-pkg-2.eclass,
 # java-pkg-opt-2.eclass and java-ant-2 eclass, as well as from ebuilds.
diff --git a/eclass/java-virtuals-2.eclass b/eclass/java-virtuals-2.eclass
index d511682c26ac..27ed9157da5b 100644
--- a/eclass/java-virtuals-2.eclass
+++ b/eclass/java-virtuals-2.eclass
@@ -6,8 +6,8 @@
 # java@gentoo.org
 # @AUTHOR:
 # Original Author: Alistair John Bush <ali_bush@gentoo.org>
-# @BLURB: Java virtuals eclass
 # @SUPPORTED_EAPIS: 5 6
+# @BLURB: Java virtuals eclass
 # @DESCRIPTION:
 # To provide a default (and only) src_install function for ebuilds in the
 # java-virtuals category.
diff --git a/eclass/l10n.eclass b/eclass/l10n.eclass
index 878879e5e57a..5cf3931b7bf5 100644
--- a/eclass/l10n.eclass
+++ b/eclass/l10n.eclass
@@ -6,8 +6,8 @@
 # Ulrich Müller <ulm@gentoo.org>
 # @AUTHOR:
 # Ben de Groot <yngwin@gentoo.org>
-# @BLURB: convenience functions to handle localizations
 # @SUPPORTED_EAPIS: 5 6 7
+# @BLURB: convenience functions to handle localizations
 # @DESCRIPTION:
 # The l10n (localization) eclass offers a number of functions to more
 # conveniently handle localizations (translations) offered by packages.
diff --git a/eclass/linux-mod.eclass b/eclass/linux-mod.eclass
index 10a8413357a4..e87c5ec0cdb3 100644
--- a/eclass/linux-mod.eclass
+++ b/eclass/linux-mod.eclass
@@ -7,8 +7,8 @@
 # @AUTHOR:
 # John Mylchreest <johnm@gentoo.org>,
 # Stefan Schweizer <genstef@gentoo.org>
-# @BLURB: It provides the functionality required to install external modules against a kernel source tree.
 # @SUPPORTED_EAPIS: 5 6 7
+# @BLURB: It provides the functionality required to install external modules against a kernel source tree.
 # @DESCRIPTION:
 # This eclass is used to interface with linux-info.eclass in such a way
 # to provide the functionality and initial functions
diff --git a/eclass/llvm.org.eclass b/eclass/llvm.org.eclass
index 394df33df047..7f4aa723e0a5 100644
--- a/eclass/llvm.org.eclass
+++ b/eclass/llvm.org.eclass
@@ -6,6 +6,7 @@
 # Michał Górny <mgorny@gentoo.org>
 # @AUTHOR:
 # Michał Górny <mgorny@gentoo.org>
+# @SUPPORTED_EAPIS: 7
 # @BLURB: Common bits for fetching & unpacking llvm.org projects
 # @DESCRIPTION:
 # The llvm.org eclass provides common code to fetch and unpack parts
diff --git a/eclass/mercurial.eclass b/eclass/mercurial.eclass
index 1f4ae2c3b482..b62ecdf102a5 100644
--- a/eclass/mercurial.eclass
+++ b/eclass/mercurial.eclass
@@ -7,8 +7,8 @@
 # @AUTHOR:
 # Next gen author: Krzysztof Pawlik <nelchael@gentoo.org>
 # Original author: Aron Griffis <agriffis@gentoo.org>
-# @BLURB: This eclass provides generic mercurial fetching functions
 # @SUPPORTED_EAPIS: 7
+# @BLURB: This eclass provides generic mercurial fetching functions
 # @DESCRIPTION:
 # This eclass provides generic mercurial fetching functions. To fetch sources
 # from mercurial repository just set EHG_REPO_URI to correct repository URI. If
diff --git a/eclass/mono-env.eclass b/eclass/mono-env.eclass
index 46a25fb98893..8cec214e615f 100644
--- a/eclass/mono-env.eclass
+++ b/eclass/mono-env.eclass
@@ -4,8 +4,8 @@
 # @ECLASS: mono-env.eclass
 # @MAINTAINER:
 # maintainer-needed@gentoo.org
-# @BLURB: Set environment variables commonly used by dotnet packages.
 # @SUPPORTED_EAPIS: 5 6 7
+# @BLURB: Set environment variables commonly used by dotnet packages.
 # @DESCRIPTION:
 # Set environment variables commonly used by dotnet packages.
 
diff --git a/eclass/mono.eclass b/eclass/mono.eclass
index 744b8099fe17..ea0485746230 100644
--- a/eclass/mono.eclass
+++ b/eclass/mono.eclass
@@ -4,9 +4,9 @@
 # @ECLASS: mono.eclass
 # @MAINTAINER:
 # maintainer-needed@gentoo.org
+# @SUPPORTED_EAPIS: 7
 # @BLURB: common settings and functions for mono and dotnet related packages
 # @DEPRECATED: mono-env
-# @SUPPORTED_EAPIS: 7
 # @DESCRIPTION:
 # The mono eclass contains common environment settings that are useful for
 # dotnet packages.  Currently, it provides no functions, just exports
diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass
index 4e3baa7188e4..29acc7f5fba9 100644
--- a/eclass/multilib.eclass
+++ b/eclass/multilib.eclass
@@ -4,8 +4,8 @@
 # @ECLASS: multilib.eclass
 # @MAINTAINER:
 # toolchain@gentoo.org
-# @BLURB: This eclass is for all functions pertaining to handling multilib configurations.
 # @SUPPORTED_EAPIS: 5 6 7
+# @BLURB: This eclass is for all functions pertaining to handling multilib configurations.
 # @DESCRIPTION:
 # This eclass is for all functions pertaining to handling multilib configurations.
 
diff --git a/eclass/multiprocessing.eclass b/eclass/multiprocessing.eclass
index 8363fa33bd12..c32bfaac2e6b 100644
--- a/eclass/multiprocessing.eclass
+++ b/eclass/multiprocessing.eclass
@@ -7,8 +7,8 @@
 # @AUTHOR:
 # Brian Harring <ferringb@gentoo.org>
 # Mike Frysinger <vapier@gentoo.org>
-# @BLURB: multiprocessing helper functions
 # @SUPPORTED_EAPIS: 5 6 7 8
+# @BLURB: multiprocessing helper functions
 # @DESCRIPTION:
 # The multiprocessing eclass contains a suite of utility functions
 # that could be helpful to controlling parallel multiple job execution.
diff --git a/eclass/openib.eclass b/eclass/openib.eclass
index 8fb0c782ea44..e25418854c89 100644
--- a/eclass/openib.eclass
+++ b/eclass/openib.eclass
@@ -6,8 +6,8 @@
 # maintainer-needed@gentoo.org
 # @AUTHOR:
 # Author: Alexey Shvetsov <alexxy@gentoo.org>
-# @BLURB: Simplify working with OFED packages
 # @SUPPORTED_EAPIS: 5 6
+# @BLURB: Simplify working with OFED packages
 
 case ${EAPI:-0} in
 	[56]) inherit eutils rpm versionator ;;
diff --git a/eclass/optfeature.eclass b/eclass/optfeature.eclass
index ef69335d6a0b..8fc346c3ac6a 100644
--- a/eclass/optfeature.eclass
+++ b/eclass/optfeature.eclass
@@ -4,8 +4,8 @@
 # @ECLASS: optfeature.eclass
 # @MAINTAINER:
 # base-system@gentoo.org
-# @BLURB: Advertise optional functionality that might be useful to users
 # @SUPPORTED_EAPIS: 0 1 2 3 4 5 6 7
+# @BLURB: Advertise optional functionality that might be useful to users
 
 case ${EAPI:-0} in
 	[0-7]) ;;
diff --git a/eclass/pam.eclass b/eclass/pam.eclass
index 642595f9b2f9..0b3421b5e7c8 100644
--- a/eclass/pam.eclass
+++ b/eclass/pam.eclass
@@ -6,8 +6,8 @@
 # Mikle Kolyada <zlogene@gentoo.org>
 # @AUTHOR:
 # Diego Pettenò <flameeyes@gentoo.org>
-# @BLURB: Handles pam related tasks
 # @SUPPORTED_EAPIS: 5 6 7
+# @BLURB: Handles pam related tasks
 # @DESCRIPTION:
 # This eclass contains functions to install pamd configuration files and
 # pam modules.
diff --git a/eclass/pax-utils.eclass b/eclass/pax-utils.eclass
index 1b3fa65d1319..9c4903d24b61 100644
--- a/eclass/pax-utils.eclass
+++ b/eclass/pax-utils.eclass
@@ -7,8 +7,8 @@
 # @AUTHOR:
 # Author: Kevin F. Quinn <kevquinn@gentoo.org>
 # Author: Anthony G. Basile <blueness@gentoo.org>
-# @BLURB: functions to provide PaX markings for hardened kernels
 # @SUPPORTED_EAPIS: 5 6 7
+# @BLURB: functions to provide PaX markings for hardened kernels
 # @DESCRIPTION:
 #
 # This eclass provides support for manipulating PaX markings on ELF binaries,
diff --git a/eclass/php-ext-pecl-r3.eclass b/eclass/php-ext-pecl-r3.eclass
index eaf20e026f90..f3977b225aa4 100644
--- a/eclass/php-ext-pecl-r3.eclass
+++ b/eclass/php-ext-pecl-r3.eclass
@@ -4,8 +4,8 @@
 # @ECLASS: php-ext-pecl-r3.eclass
 # @MAINTAINER:
 # Gentoo PHP team <php-bugs@gentoo.org>
-# @BLURB: A uniform way to install PECL extensions
 # @SUPPORTED_EAPIS: 6 7
+# @BLURB: A uniform way to install PECL extensions
 # @DESCRIPTION:
 # This eclass should be used by all dev-php/pecl-* ebuilds as a uniform
 # way of installing PECL extensions. For more information about PECL,
diff --git a/eclass/portability.eclass b/eclass/portability.eclass
index 1b3c3952f831..1cc36757b625 100644
--- a/eclass/portability.eclass
+++ b/eclass/portability.eclass
@@ -6,8 +6,8 @@
 # base-system@gentoo.org
 # @AUTHOR:
 # Diego Pettenò <flameeyes@gentoo.org>
-# @BLURB: This eclass is created to avoid using non-portable GNUisms inside ebuilds
 # @SUPPORTED_EAPIS: 5 6 7
+# @BLURB: This eclass is created to avoid using non-portable GNUisms inside ebuilds
 
 case ${EAPI:-0} in
 	[567]) ;;
diff --git a/eclass/prefix.eclass b/eclass/prefix.eclass
index febdb7afeccb..da6f63bcc50c 100644
--- a/eclass/prefix.eclass
+++ b/eclass/prefix.eclass
@@ -5,8 +5,8 @@
 # @MAINTAINER:
 # Feel free to contact the Prefix team through <prefix@gentoo.org> if
 # you have problems, suggestions or questions.
-# @BLURB: Eclass to provide Prefix functionality
 # @SUPPORTED_EAPIS: 5 6 7
+# @BLURB: Eclass to provide Prefix functionality
 # @DESCRIPTION:
 # Gentoo Prefix allows users to install into a self defined offset
 # located somewhere in the filesystem.  Prefix ebuilds require
diff --git a/eclass/preserve-libs.eclass b/eclass/preserve-libs.eclass
index 8b2daf3e7f20..da13e7943add 100644
--- a/eclass/preserve-libs.eclass
+++ b/eclass/preserve-libs.eclass
@@ -4,8 +4,8 @@
 # @ECLASS: preserve-libs.eclass
 # @MAINTAINER:
 # base-system@gentoo.org
-# @BLURB: preserve libraries after SONAME changes
 # @SUPPORTED_EAPIS: 5 6 7
+# @BLURB: preserve libraries after SONAME changes
 
 case ${EAPI:-0} in
 	[567]) ;;
diff --git a/eclass/qmail.eclass b/eclass/qmail.eclass
index 92df9ad28fc5..76c612f026f2 100644
--- a/eclass/qmail.eclass
+++ b/eclass/qmail.eclass
@@ -4,8 +4,8 @@
 # @ECLASS: qmail.eclass
 # @MAINTAINER:
 # Rolf Eike Beer <eike@sf-mail.de>
-# @BLURB: common qmail functions
 # @SUPPORTED_EAPIS: 6 7
+# @BLURB: common qmail functions
 
 case ${EAPI:-0} in
 	[67]) ;;
diff --git a/eclass/rpm.eclass b/eclass/rpm.eclass
index 19a89a3c0cbd..351d7974877e 100644
--- a/eclass/rpm.eclass
+++ b/eclass/rpm.eclass
@@ -4,8 +4,8 @@
 # @ECLASS: rpm.eclass
 # @MAINTAINER:
 # base-system@gentoo.org
-# @BLURB: convenience class for extracting RPMs
 # @SUPPORTED_EAPIS: 5 6 7
+# @BLURB: convenience class for extracting RPMs
 
 case ${EAPI:-0} in
 	[567]) inherit eutils ;;
diff --git a/eclass/ruby-utils.eclass b/eclass/ruby-utils.eclass
index 82e09cf49cb2..4db362e2cd50 100644
--- a/eclass/ruby-utils.eclass
+++ b/eclass/ruby-utils.eclass
@@ -6,8 +6,8 @@
 # Ruby team <ruby@gentoo.org>
 # @AUTHOR:
 # Author: Hans de Graaff <graaff@gentoo.org>
-# @BLURB: An eclass for supporting ruby scripts and bindings in non-ruby packages
 # @SUPPORTED_EAPIS: 5 6 7
+# @BLURB: An eclass for supporting ruby scripts and bindings in non-ruby packages
 # @DESCRIPTION:
 # The ruby-utils eclass is designed to allow an easier installation of
 # Ruby scripts and bindings for non-ruby packages.
diff --git a/eclass/toolchain-funcs.eclass b/eclass/toolchain-funcs.eclass
index 6806bd0883bb..e0e8433f4d41 100644
--- a/eclass/toolchain-funcs.eclass
+++ b/eclass/toolchain-funcs.eclass
@@ -4,8 +4,8 @@
 # @ECLASS: toolchain-funcs.eclass
 # @MAINTAINER:
 # Toolchain Ninjas <toolchain@gentoo.org>
-# @BLURB: functions to query common info about the toolchain
 # @SUPPORTED_EAPIS: 5 6 7
+# @BLURB: functions to query common info about the toolchain
 # @DESCRIPTION:
 # The toolchain-funcs aims to provide a complete suite of functions
 # for gleaning useful information about the toolchain and to simplify
diff --git a/eclass/unpacker.eclass b/eclass/unpacker.eclass
index b8a40cc682e0..c9dab4345c95 100644
--- a/eclass/unpacker.eclass
+++ b/eclass/unpacker.eclass
@@ -4,8 +4,8 @@
 # @ECLASS: unpacker.eclass
 # @MAINTAINER:
 # base-system@gentoo.org
-# @BLURB: helpers for extraneous file formats and consistent behavior across EAPIs
 # @SUPPORTED_EAPIS: 5 6 7
+# @BLURB: helpers for extraneous file formats and consistent behavior across EAPIs
 # @DESCRIPTION:
 # Some extraneous file formats are not part of PMS, or are only in certain
 # EAPIs.  Rather than worrying about that, support the crazy cruft here
diff --git a/eclass/user.eclass b/eclass/user.eclass
index 7c643252f6da..e1f87a383ada 100644
--- a/eclass/user.eclass
+++ b/eclass/user.eclass
@@ -5,8 +5,8 @@
 # @MAINTAINER:
 # base-system@gentoo.org (Linux)
 # Michał Górny <mgorny@gentoo.org> (NetBSD)
-# @BLURB: user management in ebuilds
 # @SUPPORTED_EAPIS: 0 1 2 3 4 5 6 7
+# @BLURB: user management in ebuilds
 # @DEPRECATED: acct-user/acct-group packages
 # @DESCRIPTION:
 # The user eclass contains a suite of functions that allow ebuilds