[gentoo-dev] [PATCH 01/14] apache-module.eclass: Move EXPORT_FUNCTIONS below inherit

[gentoo-dev] [PATCH 01/14] apache-module.eclass: Move EXPORT_FUNCTIONS below inherit

[Ulrich Müller]

Signed-off-by: Ulrich Müller <ulm@gentoo.org>
---
 eclass/apache-module.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/apache-module.eclass b/eclass/apache-module.eclass
index 2594445c8b4f..60631171ed91 100644
--- a/eclass/apache-module.eclass
+++ b/eclass/apache-module.eclass
@@ -50,8 +50,6 @@ case ${EAPI} in
 	*)     die "EAPI=${EAPI:-0} is not supported" ;;
 esac
 
-EXPORT_FUNCTIONS src_compile src_install pkg_postinst
-
 if [[ -z ${_APACHE_MODULE_ECLASS} ]]; then
 _APACHE_MODULE_ECLASS=1
 
@@ -247,3 +245,5 @@ apache-module_pkg_postinst() {
 }
 
 fi
+
+EXPORT_FUNCTIONS src_compile src_install pkg_postinst
-- 
2.33.0

[gentoo-dev] [PATCH 02/14] emboss-r2.eclass: Move EXPORT_FUNCTIONS below inherit

[Ulrich Müller]

Signed-off-by: Ulrich Müller <ulm@gentoo.org>
---
 eclass/emboss-r2.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/emboss-r2.eclass b/eclass/emboss-r2.eclass
index 680b7b7e4d61..bcab338ad614 100644
--- a/eclass/emboss-r2.eclass
+++ b/eclass/emboss-r2.eclass
@@ -40,8 +40,6 @@ case ${EAPI:-0} in
 	*)     die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" ;;
 esac
 
-EXPORT_FUNCTIONS src_prepare src_configure src_install
-
 if [[ ! ${_EMBOSS_R2_ECLASS} ]]; then
 _EMBOSS_R2_ECLASS=1
 
@@ -156,3 +154,5 @@ emboss-r2_src_install() {
 }
 
 fi
+
+EXPORT_FUNCTIONS src_prepare src_configure src_install
-- 
2.33.0

[gentoo-dev] [PATCH 03/14] gnustep-base.eclass: Move EXPORT_FUNCTIONS below inherit

[Ulrich Müller]

Signed-off-by: Ulrich Müller <ulm@gentoo.org>
---
 eclass/gnustep-base.eclass | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/eclass/gnustep-base.eclass b/eclass/gnustep-base.eclass
index fb4a48b734cd..3a76939e60ff 100644
--- a/eclass/gnustep-base.eclass
+++ b/eclass/gnustep-base.eclass
@@ -15,8 +15,6 @@ case ${EAPI:-0} in
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-EXPORT_FUNCTIONS pkg_setup src_prepare src_configure src_compile src_install pkg_postinst
-
 if [[ -z ${_GNUSTEP_BASE_ECLASS} ]] ; then
 _GNUSTEP_BASE_ECLASS=1
 
@@ -263,3 +261,6 @@ EOF
 }
 
 fi
+
+EXPORT_FUNCTIONS pkg_setup src_prepare src_configure src_compile src_install \
+	pkg_postinst
-- 
2.33.0

[gentoo-dev] [PATCH 04/14] java-pkg-2.eclass: Move EXPORT_FUNCTIONS below inherit

[Ulrich Müller]

Signed-off-by: Ulrich Müller <ulm@gentoo.org>
---
 eclass/java-pkg-2.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/java-pkg-2.eclass b/eclass/java-pkg-2.eclass
index 4d5cb7665728..11f508cf349f 100644
--- a/eclass/java-pkg-2.eclass
+++ b/eclass/java-pkg-2.eclass
@@ -17,8 +17,6 @@ case ${EAPI:-0} in
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-EXPORT_FUNCTIONS pkg_setup src_prepare src_compile pkg_preinst
-
 if [[ -z ${_JAVA_PKG_2_ECLASS} ]] ; then
 _JAVA_PKG_2_ECLASS=1
 
@@ -158,3 +156,5 @@ java-pkg-2_pkg_preinst() {
 }
 
 fi
+
+EXPORT_FUNCTIONS pkg_setup src_prepare src_compile pkg_preinst
-- 
2.33.0

[gentoo-dev] [PATCH 05/14] java-pkg-opt-2.eclass: Move EXPORT_FUNCTIONS below inherit

[Ulrich Müller]

Signed-off-by: Ulrich Müller <ulm@gentoo.org>
---
 eclass/java-pkg-opt-2.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/java-pkg-opt-2.eclass b/eclass/java-pkg-opt-2.eclass
index 7f1f5a2f8394..f86609ad4710 100644
--- a/eclass/java-pkg-opt-2.eclass
+++ b/eclass/java-pkg-opt-2.eclass
@@ -17,8 +17,6 @@ case ${EAPI:-0} in
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-EXPORT_FUNCTIONS pkg_setup src_prepare pkg_preinst
-
 if [[ -z ${_JAVA_PKG_OPT_2_ECLASS} ]] ; then
 _JAVA_PKG_OPT_2_ECLASS=1
 
@@ -66,3 +64,5 @@ java-pkg-opt-2_pkg_preinst() {
 }
 
 fi
+
+EXPORT_FUNCTIONS pkg_setup src_prepare pkg_preinst
-- 
2.33.0

[gentoo-dev] [PATCH 06/14] java-pkg-simple.eclass: Move EXPORT_FUNCTIONS below inherit

[Ulrich Müller]

Signed-off-by: Ulrich Müller <ulm@gentoo.org>
---
 eclass/java-pkg-simple.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass
index 184934eb3bd3..fc006ff2fcc4 100644
--- a/eclass/java-pkg-simple.eclass
+++ b/eclass/java-pkg-simple.eclass
@@ -21,8 +21,6 @@ case ${EAPI:-0} in
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-EXPORT_FUNCTIONS src_compile src_install src_test
-
 if [[ -z ${_JAVA_PKG_SIMPLE_ECLASS} ]] ; then
 _JAVA_PKG_SIMPLE_ECLASS=1
 
@@ -570,3 +568,5 @@ java-pkg-simple_src_test() {
 }
 
 fi
+
+EXPORT_FUNCTIONS src_compile src_install src_test
-- 
2.33.0

[gentoo-dev] [PATCH 07/14] java-virtuals.eclass: Move EXPORT_FUNCTIONS below inherit

[Ulrich Müller]

Signed-off-by: Ulrich Müller <ulm@gentoo.org>
---
 eclass/java-virtuals-2.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/java-virtuals-2.eclass b/eclass/java-virtuals-2.eclass
index 27ed9157da5b..dedbf2f26195 100644
--- a/eclass/java-virtuals-2.eclass
+++ b/eclass/java-virtuals-2.eclass
@@ -17,8 +17,6 @@ case ${EAPI:-0} in
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-EXPORT_FUNCTIONS src_install
-
 if [[ -z ${_JAVA_VIRTUALS_2_ECLASS} ]] ; then
 _JAVA_VIRTUALS_2_ECLASS=1
 
@@ -63,3 +61,5 @@ java-virtuals-2_do_write() {
 }
 
 fi
+
+EXPORT_FUNCTIONS src_install
-- 
2.33.0

[gentoo-dev] [PATCH 08/14] kernel-2.eclass: Move EXPORT_FUNCTIONS below inherit

[Ulrich Müller]

Signed-off-by: Ulrich Müller <ulm@gentoo.org>
---
 eclass/kernel-2.eclass | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass
index c2f1e93dca68..ef70e250c179 100644
--- a/eclass/kernel-2.eclass
+++ b/eclass/kernel-2.eclass
@@ -199,12 +199,11 @@
 # that of course does not mean we're not willing to help.
 
 inherit estack toolchain-funcs
-[[ ${EAPI:-0} == 6 ]] && inherit eapi7-ver
-case ${EAPI:-0} in
-	6|7|8)
-		EXPORT_FUNCTIONS src_{unpack,prepare,compile,install,test} \
-			pkg_{setup,preinst,postinst,postrm} ;;
-	*) die "${ECLASS}: EAPI ${EAPI} not supported" ;;
+[[ ${EAPI} == 6 ]] && inherit eapi7-ver
+
+case ${EAPI} in
+	6|7|8) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
 # Added by Daniel Ostrow <dostrow@gentoo.org>
@@ -1566,3 +1565,6 @@ kernel-2_pkg_postrm() {
 	ewarn "For more detailed kernel removal instructions, please see: "
 	ewarn "https://wiki.gentoo.org/wiki/Kernel/Removal"
 }
+
+EXPORT_FUNCTIONS src_{unpack,prepare,compile,install,test} \
+	pkg_{setup,preinst,postinst,postrm}
-- 
2.33.0

[gentoo-dev] [PATCH 09/14] linux-mod.eclass: Move EXPORT_FUNCTIONS below inherit

[Ulrich Müller]

Signed-off-by: Ulrich Müller <ulm@gentoo.org>
---
 eclass/linux-mod.eclass | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/eclass/linux-mod.eclass b/eclass/linux-mod.eclass
index eda5e9aee013..4e56b609d025 100644
--- a/eclass/linux-mod.eclass
+++ b/eclass/linux-mod.eclass
@@ -153,8 +153,6 @@ case ${EAPI:-0} in
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-EXPORT_FUNCTIONS pkg_setup pkg_preinst pkg_postinst src_install src_compile pkg_postrm
-
 if [[ -z ${_LINUX_MOD_ECLASS} ]] ; then
 _LINUX_MOD_ECLASS=1
 
@@ -796,3 +794,6 @@ linux-mod_pkg_postrm() {
 }
 
 fi
+
+EXPORT_FUNCTIONS pkg_setup src_compile src_install \
+	pkg_preinst pkg_postinst pkg_postrm
-- 
2.33.0

[gentoo-dev] [PATCH 10/14] mercurial.eclass: Move EXPORT_FUNCTIONS below inherit

[Ulrich Müller]

Signed-off-by: Ulrich Müller <ulm@gentoo.org>
---
 eclass/mercurial.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/mercurial.eclass b/eclass/mercurial.eclass
index b62ecdf102a5..5d0ebf0d9e4f 100644
--- a/eclass/mercurial.eclass
+++ b/eclass/mercurial.eclass
@@ -20,8 +20,6 @@ case ${EAPI:-0} in
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-EXPORT_FUNCTIONS src_unpack
-
 if [[ -z ${_MERCURIAL_ECLASS} ]] ; then
 _MERCURIAL_ECLASS=1
 
@@ -219,3 +217,5 @@ function mercurial_src_unpack {
 }
 
 fi
+
+EXPORT_FUNCTIONS src_unpack
-- 
2.33.0

[gentoo-dev] [PATCH 11/14] php-ext-pecl-r3.eclass: Move EXPORT_FUNCTIONS below inherit

[Ulrich Müller]

Signed-off-by: Ulrich Müller <ulm@gentoo.org>
---
 eclass/php-ext-pecl-r3.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/php-ext-pecl-r3.eclass b/eclass/php-ext-pecl-r3.eclass
index f3977b225aa4..ccb4bcfc83da 100644
--- a/eclass/php-ext-pecl-r3.eclass
+++ b/eclass/php-ext-pecl-r3.eclass
@@ -16,8 +16,6 @@ case ${EAPI:-0} in
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-EXPORT_FUNCTIONS src_install src_test
-
 if [[ -z ${_PHP_EXT_PECL_R3_ECLASS} ]] ; then
 _PHP_EXT_PECL_R3_ECLASS=1
 
@@ -96,3 +94,5 @@ php-ext-pecl-r3_src_test() {
 }
 
 fi
+
+EXPORT_FUNCTIONS src_install src_test
-- 
2.33.0

[gentoo-dev] [PATCH 12/14] php-ext-source-r3.eclass: Move EXPORT_FUNCTIONS below inherit

[Ulrich Müller]

Signed-off-by: Ulrich Müller <ulm@gentoo.org>
---
 eclass/php-ext-source-r3.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/php-ext-source-r3.eclass b/eclass/php-ext-source-r3.eclass
index a782081b72a7..556b51ecb0cf 100644
--- a/eclass/php-ext-source-r3.eclass
+++ b/eclass/php-ext-source-r3.eclass
@@ -12,8 +12,6 @@
 
 inherit autotools
 
-EXPORT_FUNCTIONS src_prepare src_configure src_compile src_install src_test
-
 case ${EAPI:-0} in
 	6) inherit eapi7-ver ;;
 	7) ;;
@@ -461,3 +459,5 @@ php-ext-source-r3_addtoinifiles() {
 		done
 	done
 }
+
+EXPORT_FUNCTIONS src_prepare src_configure src_compile src_install src_test
-- 
2.33.0

[gentoo-dev] [PATCH 13/14] rpm.eclass: Move EXPORT_FUNCTIONS below inherit

[Ulrich Müller]

Signed-off-by: Ulrich Müller <ulm@gentoo.org>
---
 eclass/rpm.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/rpm.eclass b/eclass/rpm.eclass
index 77db8e808796..c97e23144c2b 100644
--- a/eclass/rpm.eclass
+++ b/eclass/rpm.eclass
@@ -14,8 +14,6 @@ case ${EAPI} in
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-EXPORT_FUNCTIONS src_unpack
-
 if [[ -z ${_RPM_ECLASS} ]] ; then
 _RPM_ECLASS=1
 
@@ -145,3 +143,5 @@ rpm_spec_epatch() {
 }
 
 fi
+
+EXPORT_FUNCTIONS src_unpack
-- 
2.33.0

[gentoo-dev] [PATCH 14/14] subversion.eclass: Move EXPORT_FUNCTIONS below inherit

[Ulrich Müller]

Signed-off-by: Ulrich Müller <ulm@gentoo.org>
---
 eclass/subversion.eclass | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/eclass/subversion.eclass b/eclass/subversion.eclass
index 6ed8a62dbe35..aa1a5c355877 100644
--- a/eclass/subversion.eclass
+++ b/eclass/subversion.eclass
@@ -14,18 +14,10 @@
 
 ESVN="${ECLASS}"
 
-case ${EAPI:-0} in
-	4|5)
-		inherit eutils
-		EXPORT_FUNCTIONS src_unpack src_prepare pkg_preinst
-		;;
-	6|7)
-		inherit estack
-		EXPORT_FUNCTIONS src_unpack pkg_preinst
-		;;
-	*)
-		die "${ESVN}: EAPI ${EAPI:-0} is not supported"
-		;;
+case ${EAPI} in
+	4|5) inherit eutils ;;
+	6|7) inherit estack ;;
+	*) die "${ESVN}: EAPI ${EAPI:-0} is not supported" ;;
 esac
 
 PROPERTIES+=" live"
@@ -543,3 +535,8 @@ subversion__get_peg_revision() {
 
 	echo "${peg_rev}"
 }
+
+EXPORT_FUNCTIONS src_unpack pkg_preinst
+if [[ ${EAPI} == [45] ]]; then
+	EXPORT_FUNCTIONS src_prepare
+fi
-- 
2.33.0