[gentoo-dev] perl-module.eclass EAPI=6 support

[gentoo-dev] perl-module.eclass EAPI=6 support

[Andreas K. Huettel]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512


Hey all, 

as replies to this mail follow proposed updates to perl-module.eclass. 

Basically the plan it to use the EAPI step to sanitize API. This leads to a 
lot of conditionals, which can and will go away again some time after all Perl 
packages are updated to EAPI=6. That is doable; after all, we're EAPI=5 only 
right now already.

The patches can probably be squashed a bit, but I leave them as logical steps 
now. Feel free to criticise my bash, it's definitively not my first language.

Cheers, 
Andreas

About the motivation of the patches:

0001-perl-module.eclass-Allow-EAPI-6-ban-PERL_EXPORT_PHAS.patch
* So far the variable PERL_EXPORT_PHASE_FUNCTIONS (defaulting to yes) could be 
set to "no" to get helper functionality but no phase functions. Instead, now 
inherit perl-functions.eclass.
* The auto-added dependency on Perl drops the [-build(-)] use-flag requirement 
(that useflag has been gone for many years).

0002-perl-module.eclass-Remove-references-to-perlinfo_don.patch
* Doesn't really belong in this patch series; it removes a leftover from the 
perl-module vs perl-functions eclass split. Should not change anything.

0003-perl-module.eclass-Just-go-ahead-when-calling-config.patch
* So far the configure phase could not run twice (for reasons lost in the 
mists of history). Now in EAPI=6 it's just doing what it's told.

0004-perl-module.eclass-Use-default-unpacking-from-EAPI-6.patch
* Don't inherit unpacker.eclass in EAPI=6, use default unpacking code, don't 
export unpack phase and die if someone tries to call it anyway. Nuff said.

0005-perl-module.eclass-Use-eapply-from-EAPI-6-on-and-alw.patch
* From EAPI=6 on use eapply and eapply_user instead of epatch and epatch_user

0006-perl-module.eclass-Introduce-MODULE_NAME-and-MODULE_.patch
* This patch introduces two new variables but should not change behaviour for 
any EAPI. Simplifying the code for later conditionals.

0007-perl-module.eclass-Do-not-do-any-magic-with-MY_.-var.patch
* This eclass is full of magic of the type of "Set MY_xxx before inheriting, 
and I'll automatically use it somehow instead of xxx". I think this is majorly 
silly since 1) MY_xxx is no proper API, and 2) it was never documented anyway.
So, in EAPI=6 ignore MY_PN, MY_P, and MY_S and use MODULE_PN and MODULE_P 
instead.

0008-perl-module.eclass-Document-variables-available-in-E.patch
* Documentation.

0009-perl-module.eclass-Use-DIST_-prefix-instead-of-MODUL.patch
* What we're downloading from CPAN are not actually "modules" (like CGI.pm) 
but "module distributions" (like CGI.tar.gz containg a set of modules). So, 
change all control variables that use the MODULE_ prefix to DIST_

0010-perl-module.eclass-Rename-SRC_TEST-to-DIST_TEST-in-E.patch
* The variable SRC_TEST used to allow some control over the testing phase (run 
it, run tests parallelized, skip it). Named DIST_TEST in EAPI=6 now for 
consistency (and gets more functionality below).

0011-perl-module.eclass-Introduce-DIST_TEST_OVERRIDE-in-E.patch
* Add functionality for ebuild authors: even if the ebuild specifies that e.g. 
tests should not be run or run single-threaded, allow in EAPI=6 to override 
that from make.conf or package.env.

0012-perl-module.eclass-Minor-docu-improvements.patch

0013-perl-module.eclass-Make-some-former-warnings-fatal-t.patch
* Basically, get rid of eutils.eclass in EAPI=6 (and we need to drop eqawarn 
calls)

0014-perl-module.eclass-Rewrite-src_test-for-EAPI-6.patch
* Rewrite of the test phase for EAPI=6. Adds options to control test verbosity 
and switch network tests (something that might or might not work depending on 
upstream cooperativity).

0015-dev-perl-CGI-Add-EAPI-6-test-ebuild.patch
* Example ebuild...


- -- 

Andreas K. Huettel
Gentoo Linux developer 
dilfridge@gentoo.org
http://www.akhuettel.de/

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.1

iQJ8BAEBCgBmBQJWazmVXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkJDMzI0NjNBOTIwMDY5MTQ2NkMzNDBF
MTM4NkZEN0VGNEI1Nzc5AAoJEOE4b9fvS1d5/iAQALh2L7WHTVWGcqu2wOI33o3K
A8QnluTpxmYjGNhNz1gBtjPoUQ7AZrtfhIbYCUO6oIQYG3hL2l2wllZQlYBZYEUw
72yAGo6z3FYpQG0S/wBMESNJyRcZ5RnKoLKxPE+k/O8aPqjcS8AuWbJry7FN5eVS
R5BI/jrO2G4wFrAt07sMSNzHGvAcStdGfkE0fWXBTfyJS7mS1X+cobnVLkFYFqF3
Ega390yxQ8kxAO5b0d7l/vXTsn0AcryCK5DajY6DlCkDX+iAuS/5TuGB62OlMJ+d
UZOcNTGwlSqNodxPnbAy0jBMdd6JfCYdYJOT4k1oNBSUgszvm5nzezgy1sV6yGyC
Na8wqYleRpRQdeUDr25SAVnbgjAioG+idbYVSE5WSXP9dO9DNaeX+E+Zk9PXcnNe
jS5og84DSAt774d45i/HhiNzvmhNWIeCD8Kf3Z7M2bTtjinYKV0bgCUOIV0pSJy9
BUtHqcBHRAJSI2ShVh7cNvOj5DV2TbHtQvMRvRjOa/T9yisG6EcFLaF7Q4FIEfSq
JaEzPHqvcpAkWjwedoGYpuMGN6FUFH+pQCkrM0BXED1G/XlN8KLfbSyuYsPlO1Dt
vgZIxzwH1WutBGosN0kGkH53ED5s2nITNhXivezunraRyEw/nwrdVEZBJKYrUztF
uaSTW5wKapK7B9Wnjwli
=Mawt
-----END PGP SIGNATURE-----

[gentoo-dev] [PATCH 01/15] perl-module.eclass: Allow EAPI=6, ban PERL_EXPORT_PHASE_FUNCTIONS there, simplify perl dependency

[dilfridge]

From: "Andreas K. Huettel (dilfridge)" <dilfridge@gentoo.org>

---
 eclass/perl-module.eclass | 54 ++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 44 insertions(+), 10 deletions(-)

diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass
index 5a476d2..82c72fc 100644
--- a/eclass/perl-module.eclass
+++ b/eclass/perl-module.eclass
@@ -37,21 +37,55 @@ case "${EAPI:-0}" in
 			RDEPEND="${DEPEND}"
 			;;
 		esac
+
+		case "${PERL_EXPORT_PHASE_FUNCTIONS:-yes}" in
+			yes)
+				EXPORT_FUNCTIONS ${PERL_EXPF}
+				;;
+			no)
+				debug-print "PERL_EXPORT_PHASE_FUNCTIONS=no"
+				;;
+			*)
+				die "PERL_EXPORT_PHASE_FUNCTIONS=${PERL_EXPORT_PHASE_FUNCTIONS} is not supported by perl-module.eclass"
+				;;
+		esac
 		;;
-	*)
-		die "EAPI=${EAPI} is not supported by perl-module.eclass"
-		;;
-esac
+	6)
+		[[ ${CATEGORY} == "perl-core" ]] && \
+			PERL_EXPF+=" pkg_postinst pkg_postrm"
+
+		case "${GENTOO_DEPEND_ON_PERL:-yes}" in
+		yes)
+			case "${GENTOO_DEPEND_ON_PERL_SUBSLOT:-yes}" in
+			yes)
+				DEPEND="dev-lang/perl:="
+				;;
+			*)
+				DEPEND="dev-lang/perl"
+				;;
+			esac
+			RDEPEND="${DEPEND}"
+			;;
+		esac
+
+		case "${PERL_EXPORT_PHASE_FUNCTIONS:-undefined}" in
+			yes)
+				die "PERL_EXPORT_PHASE_FUNCTIONS is banned in EAPI=6. It defaults to yes anyway."
+				;;
+			no)
+				die "PERL_EXPORT_PHASE_FUNCTIONS is banned in EAPI=6. Inherit perl-functions.eclass instead."
+				;;
+			undefined)
+				;;
+			*)
+				die "PERL_EXPORT_PHASE_FUNCTIONS is banned in EAPI=6."
+				;;
+		esac
 
-case "${PERL_EXPORT_PHASE_FUNCTIONS:-yes}" in
-	yes)
 		EXPORT_FUNCTIONS ${PERL_EXPF}
 		;;
-	no)
-		debug-print "PERL_EXPORT_PHASE_FUNCTIONS=no"
-		;;
 	*)
-		die "PERL_EXPORT_PHASE_FUNCTIONS=${PERL_EXPORT_PHASE_FUNCTIONS} is not supported by perl-module.eclass"
+		die "EAPI=${EAPI} is not supported by perl-module.eclass"
 		;;
 esac
 
-- 
2.6.3

[gentoo-dev] [PATCH 02/15] perl-module.eclass: Remove references to perlinfo_done

[dilfridge]

From: "Andreas K. Huettel (dilfridge)" <dilfridge@gentoo.org>

---
 eclass/perl-module.eclass | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass
index 82c72fc..78fa01d 100644
--- a/eclass/perl-module.eclass
+++ b/eclass/perl-module.eclass
@@ -108,7 +108,6 @@ SRC_TEST="skip"
 PREFER_BUILDPL="yes"
 
 pm_echovar=""
-perlinfo_done=false
 
 # @FUNCTION: perl-module_src_unpack
 # @USAGE: perl-module_src_unpack
@@ -271,7 +270,7 @@ perl-module_src_test() {
 			export HARNESS_OPTIONS=j$(makeopts_jobs)
 			einfo "Test::Harness Jobs=$(makeopts_jobs)"
 		fi
-		${perlinfo_done} || perl_set_version
+		perl_set_version
 		if [[ -f Build ]] ; then
 			./Build test verbose=${TEST_VERBOSE:-0} || die "test failed"
 		elif [[ -f Makefile ]] ; then
-- 
2.6.3

[gentoo-dev] [PATCH 03/15] perl-module.eclass: Just go ahead when calling configure twice in EAPI=6

[dilfridge]

From: "Andreas K. Huettel (dilfridge)" <dilfridge@gentoo.org>

---
 eclass/perl-module.eclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass
index 78fa01d..734de11 100644
--- a/eclass/perl-module.eclass
+++ b/eclass/perl-module.eclass
@@ -146,7 +146,9 @@ perl-module_src_prepare() {
 perl-module_src_configure() {
 	debug-print-function $FUNCNAME "$@"
 
-	[[ ${SRC_PREP} = yes ]] && return 0
+	if [[ ${EAPI:-0} = 5 ]]; then
+		[[ ${SRC_PREP} = yes ]] && return 0
+	fi
 	SRC_PREP="yes"
 
 	perl_check_env
-- 
2.6.3

Re: [gentoo-dev] [PATCH 03/15] perl-module.eclass: Just go ahead when calling configure twice in EAPI=6

[Michał Górny]

Dnia 11 grudnia 2015 22:02:59 CET, dilfridge@gentoo.org napisał(a):
>From: "Andreas K. Huettel (dilfridge)" <dilfridge@gentoo.org>
>
>---
> eclass/perl-module.eclass | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
>diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass
>index 78fa01d..734de11 100644
>--- a/eclass/perl-module.eclass
>+++ b/eclass/perl-module.eclass
>@@ -146,7 +146,9 @@ perl-module_src_prepare() {
> perl-module_src_configure() {
> 	debug-print-function $FUNCNAME "$@"
> 
>-	[[ ${SRC_PREP} = yes ]] && return 0
>+	if [[ ${EAPI:-0} = 5 ]]; then
>+		[[ ${SRC_PREP} = yes ]] && return 0
>+	fi

Why not combine this into single [[ ]]?

> 	SRC_PREP="yes"
> 
> 	perl_check_env

-- 
Sent from my Android device with K-9 Mail. Please excuse my brevity.

Re: [gentoo-dev] [PATCH 03/15] perl-module.eclass: Just go ahead when calling configure twice in EAPI=6

[Andreas K. Huettel]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Am Samstag, 12. Dezember 2015, 12:50:29 schrieb Michał Górny:
> >+	if [[ ${EAPI:-0} = 5 ]]; then
> >+		[[ ${SRC_PREP} = yes ]] && return 0
> >+	fi
> 
> Why not combine this into single [[ ]]?
> 

yep, better!


- -- 

Andreas K. Huettel
Gentoo Linux developer 
dilfridge@gentoo.org
http://www.akhuettel.de/

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.1

iQJ8BAEBCgBmBQJWbEftXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkJDMzI0NjNBOTIwMDY5MTQ2NkMzNDBF
MTM4NkZEN0VGNEI1Nzc5AAoJEOE4b9fvS1d5xc4P/0XQLQWsQClxMXwrKBdys0kI
DxowbgEHis7hfXRqVJv9EQ7BYw3PMwin56ghh26Q2troFsbO/4/iNVPa0qBNv58S
tWWYFVqpD5Rf302jQK7wIVRNwKyPLDbKjJkEd8/6iWdEiTYj7XAOT5i7lo6TJkwH
1tLdln9dKKhaPPBxz2MNm22deEzT+g2A4+sEKxBKSwqFQgPQyiuSf6ngwf6V45iH
A5Nn7z2iAQ+iPKvkQYyWtLY0wAGHLaL+674WM3Fb4vtS6YHVnHzJuKDq8aUG6qJu
rT0yVDtH1jJ6nt2DaIZ2RzRe4+45btHvXAOP0uje1CyGo0BJEmnu1EQ3Ow9oi/Hz
/KVKmpK1nxK71Th9ZAdjXGBZb8HUJHCQ1dD9z9o5VHSMOa7eKJGX0gEhCivrq/D4
bwFufYSDG0Hp+QKG0PIZuRSpOfphSz4JXDAo1rh0Fb6QdvvHC1ZHHRhbKo2aswuV
67f3MUh7UhEzKKzYOrC/1cn1KA1T5j//JsBuw1fcwKR4acb4rSQ+2yh/3unRXvh0
vS/1eJ5T27MfC6S1kkURv+JWrsXl9N4jM/ZZDp9VEz3u8UNTCyjHiDfzDI395sFr
v6/CKUUOTuy8G5gY5B3Lj/EY/wOfmDGoPPWVOmFciU8cPzGmAeJdnHmw+6OdhUiN
pSWVYFouRu00gWJTSRGe
=F5DS
-----END PGP SIGNATURE-----

[gentoo-dev] [PATCH 04/15] perl-module.eclass: Use default unpacking from EAPI=6 on

[dilfridge]

From: "Andreas K. Huettel (dilfridge)" <dilfridge@gentoo.org>

---
 eclass/perl-module.eclass | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass
index 734de11..8caa981 100644
--- a/eclass/perl-module.eclass
+++ b/eclass/perl-module.eclass
@@ -15,9 +15,20 @@
 # All exported functions from perl-functions.eclass (inherited here)
 # explicitly also belong to the interface of perl-module.eclass.
 
-inherit eutils multiprocessing unpacker perl-functions
+case "${EAPI:-0}" in
+	5)
+		inherit eutils multiprocessing unpacker perl-functions
+		PERL_EXPF="src_unpack src_prepare src_configure src_compile src_test src_install"
+		;;
+	6)
+		inherit eutils multiprocessing perl-functions
+		PERL_EXPF="src_prepare src_configure src_compile src_test src_install"
+		;;
+	*)
+		die "EAPI=${EAPI} is not supported by perl-module.eclass"
+		;;
+esac
 
-PERL_EXPF="src_unpack src_prepare src_configure src_compile src_test src_install"
 
 case "${EAPI:-0}" in
 	5)
@@ -116,7 +127,7 @@ pm_echovar=""
 # This function is to be called during the ebuild src_unpack() phase.
 perl-module_src_unpack() {
 	debug-print-function $FUNCNAME "$@"
-
+	[[ ${EAPI}==5 ]] || die "perl-module_src_unpack is banned in EAPI=6 or later"
 	unpacker_src_unpack
 }
 
-- 
2.6.3

Re: [gentoo-dev] [PATCH 04/15] perl-module.eclass: Use default unpacking from EAPI=6 on

[Ulrich Mueller]

[-- Attachment #1: Type: text/plain, Size: 309 bytes --]

>>>>> On Fri, 11 Dec 2015, dilfridge  wrote:

> +case "${EAPI:-0}" in

Quotes are not needed here.

>  case "${EAPI:-0}" in

Ditto.

> +	[[ ${EAPI}==5 ]] || die "perl-module_src_unpack is banned in EAPI=6 or later"

Without spaces around the operator, this condition will always
evaluate to true. ;-)

Ulrich

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

Re: [gentoo-dev] [PATCH 04/15] perl-module.eclass: Use default unpacking from EAPI=6 on

[Andreas K. Huettel]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Am Samstag, 12. Dezember 2015, 00:40:52 schrieb Ulrich Mueller:
> >>>>> On Fri, 11 Dec 2015, dilfridge  wrote:
> 
> > +	[[ ${EAPI}==5 ]] || die "perl-module_src_unpack is banned in EAPI=6 or
> > later"
> 
> Without spaces around the operator, this condition will always
> evaluate to true. ;-)

Ok will fix this. Reminds me why I keep getting puzzled by Bash... :D

- -- 

Andreas K. Huettel
Gentoo Linux developer 
dilfridge@gentoo.org
http://www.akhuettel.de/

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.1

iQJ8BAEBCgBmBQJWbII0XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkJDMzI0NjNBOTIwMDY5MTQ2NkMzNDBF
MTM4NkZEN0VGNEI1Nzc5AAoJEOE4b9fvS1d5kV0P/3G8HTn+Xic+PURxnC1+GaRk
egVa7wNVV/GsMqvEOCuGsce7E5dKtPQsED/yuqLBvmKxLcTGpirE+40nurSD74jk
az3V6A2D0aEJKEiCv+Dn1fw6AVuUwfywnSVkvUmaMMdVVUUqjDYOKqjq0J6+JX3k
hCRFv+le2i8RnE2jreX3UnnTJJQor16MyIupFdPQ2x7pJOrZEAv9k9S8aJKCmNOw
mN583dlf207eHdcC2jr3yBYFl0a/z8LfsOG1ii7U3nSQXgQzR55E189h8gkiEmiO
6xxthmbpL3g5yOzpm07eBh5g+MqT5W/1B5vdbW0TY5O43SbTFJt2MxoKVKFE4eBv
TJzNvMsDic+Je+si7i/HLLjReh7JbhRB/C4iNrxoz5FIeIwVG1y/lGmI8Hnoabbl
c4ItIqMglRLGgDgZFjN1z+NvAphvnZMbkgR7N8dthOWElkWf3SLsJzRS1102mwJy
pCtYOGkbkVJN1WZaErrNtGxe0OHa52lOg3MpBDgQdYLDbKdG9k7H1OOXzHCdhjR6
DHpTe446PVaHpeVtMch0gPO2MERzsVMTt00ptOGH+q50/ZTu5DijRDCmsDuUywG7
AmWMLE/QUMKf/x47O99afupyiZFkGtYFmnPreouIIyxaLtB7llTd9GaKXJ7IXCYM
By0HF4faSxcszNKijEQo
=zczv
-----END PGP SIGNATURE-----

[gentoo-dev] [PATCH 05/15] perl-module.eclass: Use eapply from EAPI=6 on and always call eapply_user

[dilfridge]

From: "Andreas K. Huettel (dilfridge)" <dilfridge@gentoo.org>

---
 eclass/perl-module.eclass | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass
index 8caa981..9d87b17 100644
--- a/eclass/perl-module.eclass
+++ b/eclass/perl-module.eclass
@@ -138,9 +138,17 @@ perl-module_src_unpack() {
 # This function is to be called during the ebuild src_prepare() phase.
 perl-module_src_prepare() {
 	debug-print-function $FUNCNAME "$@"
-	[[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
-	debug-print "$FUNCNAME: applying user patches"
-	epatch_user
+
+	if [[ ${EAPI:-0} = 5 ]] ; then
+		[[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
+		debug-print "$FUNCNAME: applying user patches"
+		epatch_user
+	else
+		[[ ${PATCHES[@]} ]] && eapply "${PATCHES[@]}"
+		debug-print "$FUNCNAME: applying user patches"
+		eapply_user
+	fi
+
 	if [[ ${PERL_RM_FILES[@]} ]]; then
 		debug-print "$FUNCNAME: stripping unneeded files"
 		perl_rm_files "${PERL_RM_FILES[@]}"
-- 
2.6.3

Re: [gentoo-dev] [PATCH 05/15] perl-module.eclass: Use eapply from EAPI=6 on and always call eapply_user

[Michał Górny]

Dnia 11 grudnia 2015 22:03:01 CET, dilfridge@gentoo.org napisał(a):
>From: "Andreas K. Huettel (dilfridge)" <dilfridge@gentoo.org>
>
>---
> eclass/perl-module.eclass | 14 +++++++++++---
> 1 file changed, 11 insertions(+), 3 deletions(-)
>
>diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass
>index 8caa981..9d87b17 100644
>--- a/eclass/perl-module.eclass
>+++ b/eclass/perl-module.eclass
>@@ -138,9 +138,17 @@ perl-module_src_unpack() {
> # This function is to be called during the ebuild src_prepare() phase.
> perl-module_src_prepare() {
> 	debug-print-function $FUNCNAME "$@"
>-	[[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
>-	debug-print "$FUNCNAME: applying user patches"
>-	epatch_user
>+
>+	if [[ ${EAPI:-0} = 5 ]] ; then
>+		[[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
>+		debug-print "$FUNCNAME: applying user patches"
>+		epatch_user
>+	else
>+		[[ ${PATCHES[@]} ]] && eapply "${PATCHES[@]}"
>+		debug-print "$FUNCNAME: applying user patches"
>+		eapply_user

Why not just 'default'?

>+	fi
>+
> 	if [[ ${PERL_RM_FILES[@]} ]]; then
> 		debug-print "$FUNCNAME: stripping unneeded files"
> 		perl_rm_files "${PERL_RM_FILES[@]}"

-- 
Sent from my Android device with K-9 Mail. Please excuse my brevity.

Re: [gentoo-dev] [PATCH 05/15] perl-module.eclass: Use eapply from EAPI=6 on and always call eapply_user

[Andreas K. Huettel]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Am Samstag, 12. Dezember 2015, 12:54:35 schrieb Michał Górny:
> Dnia 11 grudnia 2015 22:03:01 CET, dilfridge@gentoo.org napisał(a):
> >diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass
> >index 8caa981..9d87b17 100644
> >--- a/eclass/perl-module.eclass
> >+++ b/eclass/perl-module.eclass
> >@@ -138,9 +138,17 @@ perl-module_src_unpack() {
> >
> > # This function is to be called during the ebuild src_prepare() phase.
> > perl-module_src_prepare() {
> > 
> > 	debug-print-function $FUNCNAME "$@"
> >
> >-	[[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
> >-	debug-print "$FUNCNAME: applying user patches"
> >-	epatch_user
> >+
> >+	if [[ ${EAPI:-0} = 5 ]] ; then
> >+		[[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
> >+		debug-print "$FUNCNAME: applying user patches"
> >+		epatch_user
> >+	else
> >+		[[ ${PATCHES[@]} ]] && eapply "${PATCHES[@]}"
> >+		debug-print "$FUNCNAME: applying user patches"
> >+		eapply_user
> 
> Why not just 'default'?
> 

Much better, yes.

- -- 

Andreas K. Huettel
Gentoo Linux developer 
dilfridge@gentoo.org
http://www.akhuettel.de/

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.1

iQJ8BAEBCgBmBQJWbIJcXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkJDMzI0NjNBOTIwMDY5MTQ2NkMzNDBF
MTM4NkZEN0VGNEI1Nzc5AAoJEOE4b9fvS1d5E0cQAJGoF+P5DtrY4IMYxpFqhOF7
9aKo0LqEtikYnnJfnRJyTzsfPXgXGV5x9rONHfrZGdzsbQhuu3G2cjlWrK7aPdNT
UaMnOXaaAAGOB/VKaFueUsbGz0VPedyZFRgZuwPdke6RNO3tZRrKEfs4mXo9lNAq
8wUNcshiAgAKla/IMVdASulLPEaZkeybS2EmvoIid0Fjru02OJxTVXhtxH5hbslS
fu07IFu9aM7x9Lt4X/N9qBbQzjbS7kiqeZpkhMdKDi11qTjBDtDb7qpQ+1jdY9cl
3GYsUPdDAkGkQbcU9d9bWRb2BA9mJOfNFkviYMEzu6m02TeDj+KL4MqY+OleGOT/
jX0IxVUxNKA5zNLsNGMDi/zULoQdVQmKk+3YsDvipQ3/H+0CtTQ7A1x7t1dWjCbT
sED0ozJdaXxBUfTSWTQTUEKEqCoS37GJWhtOspEGb3EpzdCh+I456ikJ+sQAstNX
gQIV7d5Yz52myz4m3ZwpYuoYe55dgxtY5qwXy5QM5DNZkioqMFbO6pVRWLB1DGUV
WmcfNk434toO7IAcdzDNJTsOvAKqrBp/+xWMecxw4WNlSjHK3vuyTLX1r4Cw6I8r
9EwT8njp8Qwkm2eD5928fWGMMc4Zc07Iwyy1J7Zi6h+T8jgQB1oyC10RmxBe+hIu
iwJkXbNQnGFbP8n2fSyM
=E1if
-----END PGP SIGNATURE-----

[gentoo-dev] [PATCH 06/15] perl-module.eclass: Introduce MODULE_NAME and MODULE_P while still keeping existing weirdness compatible

[dilfridge]

From: Andreas K. Hüttel <dilfridge@gentoo.org>

---
 eclass/perl-module.eclass | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass
index 9d87b17..6a5f2ff 100644
--- a/eclass/perl-module.eclass
+++ b/eclass/perl-module.eclass
@@ -106,13 +106,15 @@ if [[ -n ${MY_PN} || -n ${MY_PV} || -n ${MODULE_VERSION} ]] ; then
 	: ${MY_P:=${MY_PN:-${PN}}-${MY_PV:-${MODULE_VERSION:-${PV}}}}
 	S=${MY_S:-${WORKDIR}/${MY_P}}
 fi
+MODULE_NAME=${MY_PN:-${PN}}
+MODULE_P=${MY_P:-${P}}
 
 [[ -z "${SRC_URI}" && -z "${MODULE_A}" ]] && \
-	MODULE_A="${MY_P:-${P}}.${MODULE_A_EXT:-tar.gz}"
+	MODULE_A="${MODULE_P}.${MODULE_A_EXT:-tar.gz}"
 [[ -z "${SRC_URI}" && -n "${MODULE_AUTHOR}" ]] && \
 	SRC_URI="mirror://cpan/authors/id/${MODULE_AUTHOR:0:1}/${MODULE_AUTHOR:0:2}/${MODULE_AUTHOR}/${MODULE_SECTION:+${MODULE_SECTION}/}${MODULE_A}"
 [[ -z "${HOMEPAGE}" ]] && \
-	HOMEPAGE="http://search.cpan.org/dist/${MY_PN:-${PN}}/"
+	HOMEPAGE="http://search.cpan.org/dist/${MODULE_NAME}/"
 
 SRC_PREP="no"
 SRC_TEST="skip"
-- 
2.6.3

Re: [gentoo-dev] [PATCH 06/15] perl-module.eclass: Introduce MODULE_NAME and MODULE_P while still keeping existing weirdness compatible

[Michał Górny]

Dnia 11 grudnia 2015 22:03:02 CET, dilfridge@gentoo.org napisał(a):
>From: Andreas K. Hüttel <dilfridge@gentoo.org>
>
>---
> eclass/perl-module.eclass | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
>diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass
>index 9d87b17..6a5f2ff 100644
>--- a/eclass/perl-module.eclass
>+++ b/eclass/perl-module.eclass
>@@ -106,13 +106,15 @@ if [[ -n ${MY_PN} || -n ${MY_PV} || -n
>${MODULE_VERSION} ]] ; then
> 	: ${MY_P:=${MY_PN:-${PN}}-${MY_PV:-${MODULE_VERSION:-${PV}}}}
> 	S=${MY_S:-${WORKDIR}/${MY_P}}
> fi
>+MODULE_NAME=${MY_PN:-${PN}}
>+MODULE_P=${MY_P:-${P}}
> 
> [[ -z "${SRC_URI}" && -z "${MODULE_A}" ]] && \
>-	MODULE_A="${MY_P:-${P}}.${MODULE_A_EXT:-tar.gz}"
>+	MODULE_A="${MODULE_P}.${MODULE_A_EXT:-tar.gz}"
> [[ -z "${SRC_URI}" && -n "${MODULE_AUTHOR}" ]] && \
>	SRC_URI="mirror://cpan/authors/id/${MODULE_AUTHOR:0:1}/${MODULE_AUTHOR:0:2}/${MODULE_AUTHOR}/${MODULE_SECTION:+${MODULE_SECTION}/}${MODULE_A}"
> [[ -z "${HOMEPAGE}" ]] && \
>-	HOMEPAGE="http://search.cpan.org/dist/${MY_PN:-${PN}}/"
>+	HOMEPAGE="http://search.cpan.org/dist/${MODULE_NAME}/"
> 
> SRC_PREP="no"
> SRC_TEST="skip"

Here, the commit message summary line is way too long.


-- 
Sent from my Android device with K-9 Mail. Please excuse my brevity.

[gentoo-dev] [PATCH 07/15] perl-module.eclass: Do not do any magic with MY_... variables in EAPI=6 anymore

[dilfridge]

From: Andreas K. Hüttel <dilfridge@gentoo.org>

---
 eclass/perl-module.eclass | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass
index 6a5f2ff..7434bcf 100644
--- a/eclass/perl-module.eclass
+++ b/eclass/perl-module.eclass
@@ -102,12 +102,18 @@ esac
 
 LICENSE="${LICENSE:-|| ( Artistic GPL-1+ )}"
 
-if [[ -n ${MY_PN} || -n ${MY_PV} || -n ${MODULE_VERSION} ]] ; then
-	: ${MY_P:=${MY_PN:-${PN}}-${MY_PV:-${MODULE_VERSION:-${PV}}}}
-	S=${MY_S:-${WORKDIR}/${MY_P}}
+if [[ ${EAPI:-0} = 5 ]] ; then
+	if [[ -n ${MY_PN} || -n ${MY_PV} || -n ${MODULE_VERSION} ]] ; then
+		: ${MY_P:=${MY_PN:-${PN}}-${MY_PV:-${MODULE_VERSION:-${PV}}}}
+		S=${MY_S:-${WORKDIR}/${MY_P}}
+	fi
+	MODULE_NAME=${MY_PN:-${PN}}
+	MODULE_P=${MY_P:-${P}}
+else
+	MODULE_NAME=${MODULE_NAME:-${PN}}
+	MODULE_P=${MODULE_NAME}-${MODULE_VERSION:-${PV}}
+	S=${WORKDIR}/${MODULE_P}
 fi
-MODULE_NAME=${MY_PN:-${PN}}
-MODULE_P=${MY_P:-${P}}
 
 [[ -z "${SRC_URI}" && -z "${MODULE_A}" ]] && \
 	MODULE_A="${MODULE_P}.${MODULE_A_EXT:-tar.gz}"
-- 
2.6.3

Re: [gentoo-dev] [PATCH 07/15] perl-module.eclass: Do not do any magic with MY_... variables in EAPI=6 anymore

[Michał Górny]

Dnia 11 grudnia 2015 22:03:03 CET, dilfridge@gentoo.org napisał(a):
>From: Andreas K. Hüttel <dilfridge@gentoo.org>
>
>---
> eclass/perl-module.eclass | 16 +++++++++++-----
> 1 file changed, 11 insertions(+), 5 deletions(-)
>
>diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass
>index 6a5f2ff..7434bcf 100644
>--- a/eclass/perl-module.eclass
>+++ b/eclass/perl-module.eclass
>@@ -102,12 +102,18 @@ esac
> 
> LICENSE="${LICENSE:-|| ( Artistic GPL-1+ )}"
> 
>-if [[ -n ${MY_PN} || -n ${MY_PV} || -n ${MODULE_VERSION} ]] ; then
>-	: ${MY_P:=${MY_PN:-${PN}}-${MY_PV:-${MODULE_VERSION:-${PV}}}}
>-	S=${MY_S:-${WORKDIR}/${MY_P}}
>+if [[ ${EAPI:-0} = 5 ]] ; then
>+	if [[ -n ${MY_PN} || -n ${MY_PV} || -n ${MODULE_VERSION} ]] ; then
>+		: ${MY_P:=${MY_PN:-${PN}}-${MY_PV:-${MODULE_VERSION:-${PV}}}}
>+		S=${MY_S:-${WORKDIR}/${MY_P}}
>+	fi
>+	MODULE_NAME=${MY_PN:-${PN}}
>+	MODULE_P=${MY_P:-${P}}
>+else
>+	MODULE_NAME=${MODULE_NAME:-${PN}}
>+	MODULE_P=${MODULE_NAME}-${MODULE_VERSION:-${PV}}
>+	S=${WORKDIR}/${MODULE_P}
> fi
>-MODULE_NAME=${MY_PN:-${PN}}
>-MODULE_P=${MY_P:-${P}}
> 
> [[ -z "${SRC_URI}" && -z "${MODULE_A}" ]] && \
> 	MODULE_A="${MODULE_P}.${MODULE_A_EXT:-tar.gz}"

How likely is it that one would use MY_* without MODULE_*? Maybe it would be good to warn about this?
-- 
Sent from my Android device with K-9 Mail. Please excuse my brevity.

Re: [gentoo-dev] [PATCH 07/15] perl-module.eclass: Do not do any magic with MY_... variables in EAPI=6 anymore

[Andreas K. Huettel]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Am Samstag, 12. Dezember 2015, 12:59:08 schrieb Michał Górny:
> Dnia 11 grudnia 2015 22:03:03 CET, dilfridge@gentoo.org napisał(a):
> >
> >-if [[ -n ${MY_PN} || -n ${MY_PV} || -n ${MODULE_VERSION} ]] ; then
> >-	: ${MY_P:=${MY_PN:-${PN}}-${MY_PV:-${MODULE_VERSION:-${PV}}}}
> >-	S=${MY_S:-${WORKDIR}/${MY_P}}
> >+if [[ ${EAPI:-0} = 5 ]] ; then
> >+	if [[ -n ${MY_PN} || -n ${MY_PV} || -n ${MODULE_VERSION} ]] ; then
> >+		: ${MY_P:=${MY_PN:-${PN}}-${MY_PV:-${MODULE_VERSION:-${PV}}}}
> >+		S=${MY_S:-${WORKDIR}/${MY_P}}
> >+	fi
> >+	MODULE_NAME=${MY_PN:-${PN}}
> >+	MODULE_P=${MY_P:-${P}}
> >+else
> >+	MODULE_NAME=${MODULE_NAME:-${PN}}
> >+	MODULE_P=${MODULE_NAME}-${MODULE_VERSION:-${PV}}
> >+	S=${WORKDIR}/${MODULE_P}

> How likely is it that one would use MY_* without MODULE_*? Maybe it would
> be good to warn about this?

Well... the main usage of this input is calculation of SRC_URI and S. 

So, I'm not so worried about it, since failing to update the settings will 
lead to problems already when running ebuild manifest...

- -- 

Andreas K. Huettel
Gentoo Linux developer 
dilfridge@gentoo.org
http://www.akhuettel.de/

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.1

iQJ8BAEBCgBmBQJWbILnXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkJDMzI0NjNBOTIwMDY5MTQ2NkMzNDBF
MTM4NkZEN0VGNEI1Nzc5AAoJEOE4b9fvS1d5G+MQALIzMM1eedqHJJeLCd9wA1NB
0I9usDqNFv1XOUA0cMEpPMSSqpmEx5/rCBdTAwjOYhqzf1U7ks9ZPPaVwxNFTqR+
t1eoOtT2w9JbJzeBfWOefiwBwhAVKZH56mH5oITDzN+QWev7n2Xs336fSN1P6glW
Ip4JqKNXH7fbV0jvmID6Yc6iReXXGLKs862us6cDpkm03bq4c1SE4dgWNN69UCkv
oM5DfP3PqNkOXLWafNGpvgD0NCdzm64bDZo+/8OlmZ1rFNDp0pAuDUyblWCMuGZw
mvTetAES0u5F1TyOA4x2jK+CGHvonnBorCBaTvSjLiNtBZ/b/KatrGYqwn0/yHo7
Hoz3Vq9ZgcKnT9asKv2sJOLG8V1rjVTcJJrJKrhj6MziWikhFblxfktnc0MO1//1
DWPpj9kbO7H33gZ7Ob3fegdk7BJzhcKxoTTRwKixXpGcwpR+KZ98z7YvqCDZwJq3
RTKrsM9FgTmqPgMxkR+/8XLrJrEKDR8UfSUgp10fdXLgEVX/6fY5mmSUc5SOqfOV
HjpZAo5ioJ1lyETQisWIC4VTBYIlBvgWrkbqUPM5gh7lOk0Gd+NR3/8es1BMA0h/
68WpyJ1z2m57bnmseD/WXBwU81xp52teM0rWGrB+c0JvEtAQ2YB3Xq6UCxDcjuxs
nu83ET+yxh4A9ptmaJHb
=7sm6
-----END PGP SIGNATURE-----

[gentoo-dev] [PATCH 08/15] perl-module.eclass: Document variables available in EAPI=6

[dilfridge]

From: Andreas K. Hüttel <dilfridge@gentoo.org>

---
 eclass/perl-module.eclass | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass
index 7434bcf..82707fe 100644
--- a/eclass/perl-module.eclass
+++ b/eclass/perl-module.eclass
@@ -29,6 +29,18 @@ case "${EAPI:-0}" in
 		;;
 esac
 
+# @ECLASS-VARIABLE: GENTOO_DEPEND_ON_PERL
+# @DESCRIPTION:
+# This variable controls whether a runtime and build time dependency on
+# dev-lang/perl is automatically added by the eclass. It defaults to yes.
+# Set to no to disable.
+
+# @ECLASS-VARIABLE: GENTOO_DEPEND_ON_PERL_SUBSLOT
+# @DESCRIPTION:
+# This variable controls whether the dependency on dev-lang/perl added by
+# the eclass contains a := slot operator. Defaults to yes, set to no to
+# disable the slot operator. All packages installing into the vendor_perl
+# path must use yes here.
 
 case "${EAPI:-0}" in
 	5)
@@ -102,6 +114,31 @@ esac
 
 LICENSE="${LICENSE:-|| ( Artistic GPL-1+ )}"
 
+# @ECLASS-VARIABLE: MODULE_NAME
+# @DESCRIPTION:
+# (EAPI=6) This variable provides a way to override PN for the calculation of S,
+# SRC_URI, and HOMEPAGE. Defaults to PN.
+
+# @ECLASS-VARIABLE: MODULE_VERSION
+# @DESCRIPTION:
+# This variable provides a way to override PV for the calculation of S and SRC_URI.
+# Use it to provide the non-normalized, upstream version number. Defaults to PV.
+
+# @ECLASS-VARIABLE: MODULE_A_EXT
+# @DESCRIPTION:
+# This variable provides a way to override the distfile extension for the calculation of
+# SRC_URI. Defaults to tar.gz
+
+# @ECLASS-VARIABLE: MODULE_A
+# @DESCRIPTION:
+# This variable provides a way to override the distfile name for the calculation of
+# SRC_URI. Defaults to ${MODULE_NAME}-${MODULE_VERSION}.${MODULE_A_EXT}
+
+# @ECLASS-VARIABLE: MODULE_AUTHOR
+# @DESCRIPTION:
+# This variable sets the module author name for the calculation of
+# SRC_URI.
+
 if [[ ${EAPI:-0} = 5 ]] ; then
 	if [[ -n ${MY_PN} || -n ${MY_PV} || -n ${MODULE_VERSION} ]] ; then
 		: ${MY_P:=${MY_PN:-${PN}}-${MY_PV:-${MODULE_VERSION:-${PV}}}}
-- 
2.6.3

[gentoo-dev] [PATCH 09/15] perl-module.eclass: Use DIST_ prefix instead of MODULE_ prefix in EAPI=6 for control variables.

[dilfridge]

From: "Andreas K. Huettel (dilfridge)" <dilfridge@gentoo.org>

This is more consistent with upstream terminology and avoids clashes in case of kernel modules.
---
 eclass/perl-module.eclass | 52 +++++++++++++++++++++++++++--------------------
 1 file changed, 30 insertions(+), 22 deletions(-)

diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass
index 82707fe..efcc47c 100644
--- a/eclass/perl-module.eclass
+++ b/eclass/perl-module.eclass
@@ -114,30 +114,31 @@ esac
 
 LICENSE="${LICENSE:-|| ( Artistic GPL-1+ )}"
 
-# @ECLASS-VARIABLE: MODULE_NAME
+# @ECLASS-VARIABLE: DIST_NAME
 # @DESCRIPTION:
 # (EAPI=6) This variable provides a way to override PN for the calculation of S,
 # SRC_URI, and HOMEPAGE. Defaults to PN.
 
-# @ECLASS-VARIABLE: MODULE_VERSION
+# @ECLASS-VARIABLE: DIST_VERSION
 # @DESCRIPTION:
-# This variable provides a way to override PV for the calculation of S and SRC_URI.
+# (EAPI=6) This variable provides a way to override PV for the calculation of S and SRC_URI.
 # Use it to provide the non-normalized, upstream version number. Defaults to PV.
+# Named MODULE_VERSION in EAPI=5.
 
-# @ECLASS-VARIABLE: MODULE_A_EXT
+# @ECLASS-VARIABLE: DIST_A_EXT
 # @DESCRIPTION:
-# This variable provides a way to override the distfile extension for the calculation of
-# SRC_URI. Defaults to tar.gz
+# (EAPI=6) This variable provides a way to override the distfile extension for the calculation of
+# SRC_URI. Defaults to tar.gz. Named MODULE_A_EXT in EAPI=5.
 
-# @ECLASS-VARIABLE: MODULE_A
+# @ECLASS-VARIABLE: DIST_A
 # @DESCRIPTION:
-# This variable provides a way to override the distfile name for the calculation of
-# SRC_URI. Defaults to ${MODULE_NAME}-${MODULE_VERSION}.${MODULE_A_EXT}
+# (EAPI=6) This variable provides a way to override the distfile name for the calculation of
+# SRC_URI. Defaults to ${DIST_NAME}-${DIST_VERSION}.${DIST_A_EXT} Named MODULE_A in EAPI=5.
 
-# @ECLASS-VARIABLE: MODULE_AUTHOR
+# @ECLASS-VARIABLE: DIST_AUTHOR
 # @DESCRIPTION:
-# This variable sets the module author name for the calculation of
-# SRC_URI.
+# (EAPI=6) This variable sets the module author name for the calculation of
+# SRC_URI. Named MODULE_AUTHOR in EAPI=5.
 
 if [[ ${EAPI:-0} = 5 ]] ; then
 	if [[ -n ${MY_PN} || -n ${MY_PV} || -n ${MODULE_VERSION} ]] ; then
@@ -146,19 +147,26 @@ if [[ ${EAPI:-0} = 5 ]] ; then
 	fi
 	MODULE_NAME=${MY_PN:-${PN}}
 	MODULE_P=${MY_P:-${P}}
+
+	[[ -z "${SRC_URI}" && -z "${MODULE_A}" ]] && \
+		MODULE_A="${MODULE_P}.${MODULE_A_EXT:-tar.gz}"
+	[[ -z "${SRC_URI}" && -n "${MODULE_AUTHOR}" ]] && \
+		SRC_URI="mirror://cpan/authors/id/${MODULE_AUTHOR:0:1}/${MODULE_AUTHOR:0:2}/${MODULE_AUTHOR}/${MODULE_SECTION:+${MODULE_SECTION}/}${MODULE_A}"
+	[[ -z "${HOMEPAGE}" ]] && \
+		HOMEPAGE="http://search.cpan.org/dist/${MODULE_NAME}/"
 else
-	MODULE_NAME=${MODULE_NAME:-${PN}}
-	MODULE_P=${MODULE_NAME}-${MODULE_VERSION:-${PV}}
-	S=${WORKDIR}/${MODULE_P}
+	DIST_NAME=${DIST_NAME:-${PN}}
+	DIST_P=${DIST_NAME}-${DIST_VERSION:-${PV}}
+	S=${WORKDIR}/${DIST_P}
+
+	[[ -z "${SRC_URI}" && -z "${DIST_A}" ]] && \
+		DIST_A="${DIST_P}.${DIST_A_EXT:-tar.gz}"
+	[[ -z "${SRC_URI}" && -n "${DIST_AUTHOR}" ]] && \
+		SRC_URI="mirror://cpan/authors/id/${DIST_AUTHOR:0:1}/${DIST_AUTHOR:0:2}/${DIST_AUTHOR}/${DIST_SECTION:+${DIST_SECTION}/}${DIST_A}"
+	[[ -z "${HOMEPAGE}" ]] && \
+		HOMEPAGE="http://search.cpan.org/dist/${DIST_NAME}/"
 fi
 
-[[ -z "${SRC_URI}" && -z "${MODULE_A}" ]] && \
-	MODULE_A="${MODULE_P}.${MODULE_A_EXT:-tar.gz}"
-[[ -z "${SRC_URI}" && -n "${MODULE_AUTHOR}" ]] && \
-	SRC_URI="mirror://cpan/authors/id/${MODULE_AUTHOR:0:1}/${MODULE_AUTHOR:0:2}/${MODULE_AUTHOR}/${MODULE_SECTION:+${MODULE_SECTION}/}${MODULE_A}"
-[[ -z "${HOMEPAGE}" ]] && \
-	HOMEPAGE="http://search.cpan.org/dist/${MODULE_NAME}/"
-
 SRC_PREP="no"
 SRC_TEST="skip"
 PREFER_BUILDPL="yes"
-- 
2.6.3

[gentoo-dev] Re: [PATCH 09/15] perl-module.eclass: Use DIST_ prefix instead of MODULE_ prefix in EAPI=6 for control variables.

[Duncan]

dilfridge posted on Fri, 11 Dec 2015 22:03:05 +0100 as excerpted:

> -# @ECLASS-VARIABLE: MODULE_VERSION
> +# @ECLASS-VARIABLE: DIST_VERSION
>  # @DESCRIPTION:
> -# This variable provides a way to override PV for the calculation of S and SRC_URI.
> +# (EAPI=6) This variable provides a way to override PV for the calculation of S and SRC_URI.
>  # Use it to provide the non-normalized, upstream version number. Defaults to PV.
> +# Named MODULE_VERSION in EAPI=5.

Dev-author's discretion, here and below, as it's purely style, but...

What I would have expected to see here (and in other docs-related patches) would be cleanly
separate EAPI-5 vs. EAPI-6 descriptions, on separate lines, so when EAPI-5 support cleanup
time comes, it's easy to simply delete EAPI-5 lines.  Something like:

+# ECLASS-VARIABLE: DIST_VERSION
+# (EAPI=6)
+# This variable provides a way to override PV for the calculation of S and SRC_URI.
+
 # @ECLASS-VARIABLE: MODULE_VERSION
 # @DESCRIPTION:
-# This variable provides a way to override PV for the calculation of S and SRC_URI.
+# (EAPI-5 version of DIST_VERSION)

With this, EAPI-5 cleanup should be purely lines deleted (including the EAPI-6 on its own line).
Additionally, people (like me) trying to debug failing existing EAPI-5 ebuilds won't be having
to look for EAPI-5 var-names at unexpected locations in the documentation. =:^)

Of course for the other vars that change names but not functionality between the two
EAPIs, both in this patch and in others, as well.

(Don't miss the further comment below.)

> @@ -146,19 +147,26 @@ if [[ ${EAPI:-0} = 5 ]] ; then
>  	fi
>  	MODULE_NAME=${MY_PN:-${PN}}
>  	MODULE_P=${MY_P:-${P}}
> +
> +	[[ -z "${SRC_URI}" && -z "${MODULE_A}" ]] && \
> +		MODULE_A="${MODULE_P}.${MODULE_A_EXT:-tar.gz}"
> +	[[ -z "${SRC_URI}" && -n "${MODULE_AUTHOR}" ]] && \
> +		SRC_URI="mirror://cpan/authors/id/${MODULE_AUTHOR:0:1}/${MODULE_AUTHOR:0:2}/${MODULE_AUTHOR}/${MODULE_SECTION:+${MODULE_SECTION}/}${MODULE_A}"
> +	[[ -z "${HOMEPAGE}" ]] && \
> +		HOMEPAGE="http://search.cpan.org/dist/${MODULE_NAME}/"
>  else
> -	MODULE_NAME=${MODULE_NAME:-${PN}}
> -	MODULE_P=${MODULE_NAME}-${MODULE_VERSION:-${PV}}
> -	S=${WORKDIR}/${MODULE_P}
> +	DIST_NAME=${DIST_NAME:-${PN}}
> +	DIST_P=${DIST_NAME}-${DIST_VERSION:-${PV}}
> +	S=${WORKDIR}/${DIST_P}
> +
> +	[[ -z "${SRC_URI}" && -z "${DIST_A}" ]] && \
> +		DIST_A="${DIST_P}.${DIST_A_EXT:-tar.gz}"
> +	[[ -z "${SRC_URI}" && -n "${DIST_AUTHOR}" ]] && \
> +		SRC_URI="mirror://cpan/authors/id/${DIST_AUTHOR:0:1}/${DIST_AUTHOR:0:2}/${DIST_AUTHOR}/${DIST_SECTION:+${DIST_SECTION}/}${DIST_A}"
> +	[[ -z "${HOMEPAGE}" ]] && \
> +		HOMEPAGE="http://search.cpan.org/dist/${DIST_NAME}/"
>  fi
>  
> -[[ -z "${SRC_URI}" && -z "${MODULE_A}" ]] && \
> -	MODULE_A="${MODULE_P}.${MODULE_A_EXT:-tar.gz}"
> -[[ -z "${SRC_URI}" && -n "${MODULE_AUTHOR}" ]] && \
> -	SRC_URI="mirror://cpan/authors/id/${MODULE_AUTHOR:0:1}/${MODULE_AUTHOR:0:2}/${MODULE_AUTHOR}/${MODULE_SECTION:+${MODULE_SECTION}/}${MODULE_A}"
> -[[ -z "${HOMEPAGE}" ]] && \
> -	HOMEPAGE="http://search.cpan.org/dist/${MODULE_NAME}/"
> -

Particularly for 100% straight var-renames with no change in functionality,
I'd expect something more like (pseudocode):

if $EAPI = 5 then
	# eapi-6+ only, clear them
	unset newvarname newvarname2

	# assign eapi-6 vars from eapi-5 vars so we
	# can reference only the new eapi-6 ones below
	newvarname=oldvarname
	newvarname2=oldvarname2
	...
fi

# make sure we don't use old eapi-5 varnames
unset oldvarname1 oldvarname2

# the rest of the patch simply changes old varnames to new ones,
# thus avoiding duplicate code


That makes it very clear in both the patch and the post-patch code
what's going on, while preventing all three of:
1) use of the old varnames in EAPI-6 (due to the unset)
2) use of the new varnames in EAPI-5 (due to the unset and reassignment)
3) uncaught and unchanged reference to the old vars (due to the unset)

Again, when eapi-5 code cleanup time comes, it's just deletion of the
eapi-5 lines.  No else clause to unwind.  And in the mean time, the code
isn't duplicated to eapi-5 and eapi-6 locations with only differing vars.
=:^)

Seems cleaner to me, but as I said above, purely a matter of author style,
so if you don't like it, feel free to ignore.

-- 
Duncan - List replies preferred.   No HTML msgs.
"Every nonfree program has a lord, a master --
and if you use the program, he is your master."  Richard Stallman

Re: [gentoo-dev] Re: [PATCH 09/15] perl-module.eclass: Use DIST_ prefix instead of MODULE_ prefix in EAPI=6 for control variables.

[Andreas K. Huettel]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Am Samstag, 12. Dezember 2015, 10:15:05 schrieb Duncan:
> 
> What I would have expected to see here (and in other docs-related patches)
> would be cleanly separate EAPI-5 vs. EAPI-6 descriptions, on separate
> lines, so when EAPI-5 support cleanup time comes, it's easy to simply
> delete EAPI-5 lines.  Something like:
> 

Well... In a way that certainly makes sense. However, ...

Once this is out I would personally prefer all bumps to be also EAPI bumps, 
and all new perl-module.eclass ebuilds to use EAPI=6. Adding extensive 
documentation about EAPI=5 seems to be counterproductive there.

- -- 

Andreas K. Huettel
Gentoo Linux developer 
dilfridge@gentoo.org
http://www.akhuettel.de/

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.1

iQJ8BAEBCgBmBQJWbIOqXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkJDMzI0NjNBOTIwMDY5MTQ2NkMzNDBF
MTM4NkZEN0VGNEI1Nzc5AAoJEOE4b9fvS1d5sYgQALR5eWY3YmiNNuBfUJhNC5Lg
04/VY+vIohGVBRk8fQbxtbEMad2fE4Wyo/K9Jc3N1JBQ4PyZKpZlborggPzKOQfz
1Mv2OPP3blvV64nKfFZgta4n+viI6r41EYEPu4M68+DO7CCea5oSBt3+72puLYlP
o4d1YkxiAnR1A9BOIzYW8R8CDqgpuKsg6SLamyx3bSuGRrdxIWYGdnOVf71wpTCV
kxF/eODEbBUxaQON/sY7lFFVAmcSrXCJdwnYzdaDFgyz+cAdUhpfNVjMdrrxl166
SE2zYsATNx/DGBQufcTfjBcwPEzYfNCtBTbhau/o18b460gY97t5y1UvBp3dwPin
z/esjhGHvtyTKE+8eFpACqaDKsTYjmIJvzPG5vZ43pRAux0UqvnHxTpf7cQDJRYk
QM+8nyJ2OeoxkJhG6iyXDkmX+cW/LepNUnsnimHIpq8D9ipRW+qox2AUvY6bL29r
M9pTCWTC3j+ZAsZ9/0JIvs9O7t5SwGlziDS2jSbHCSxJn5a1DqonFq7EpF+N99oA
RAt85kps2XVNuP5kZgHZok4i/155q34aPVG6k8XrPTsFwEt/Mo1b3d+bWnEcHZmY
4qTvBXHIEzeGJlRn6d3yU1t+77Chmrf0sPVrB2ebmT/itPK/HMZD6l+FWFmbJ37J
p9bFcEsWcFAyh7VITyJh
=jmuY
-----END PGP SIGNATURE-----

[gentoo-dev] Re: [PATCH 09/15] perl-module.eclass: Use DIST_ prefix instead of MODULE_ prefix in EAPI=6 for control variables.

[Duncan]

Andreas K. Huettel posted on Sat, 12 Dec 2015 21:29:30 +0100 as excerpted:

> Am Samstag, 12. Dezember 2015, 10:15:05 schrieb Duncan:
>> 
>> What I would have expected to see here (and in other docs-related
>> patches) would be cleanly separate EAPI-5 vs. EAPI-6 descriptions, on
>> separate lines, so when EAPI-5 support cleanup time comes, it's easy
>> to simply delete EAPI-5 lines.  Something like:
>> 
> Well... In a way that certainly makes sense. However, ...
> 
> Once this is out I would personally prefer all bumps to be also EAPI
> bumps, and all new perl-module.eclass ebuilds to use EAPI=6. Adding
> extensive documentation about EAPI=5 seems to be counterproductive
> there.

What I was (perhaps too) gently hinting was that docs aren't just for 
devs.  Users use them too, when debugging existing ebuild failures, etc.  
Presumably existing EAPI-5 perl-module.eclass consuming ebuilds will be 
around, at least in stable, for a few months, correct?

But upon closer look I see only functions were previously documented (as 
of my tree from 10 days ago anyway), so you're adding var documentation 
that wasn't there at all earlier and it's not a labeling regression after 
all.  Given that any documentation is better than none...

I understand doing it the way you did it, now. =:^)

Tho I'd still probably put that last EAPI-5 sentence on its own line, 
again, making EAPI-5 cleanup when the time comes that much easier. =:^)

-- 
Duncan - List replies preferred.   No HTML msgs.
"Every nonfree program has a lord, a master --
and if you use the program, he is your master."  Richard Stallman

Re: [gentoo-dev] [PATCH 09/15] perl-module.eclass: Use DIST_ prefix instead of MODULE_ prefix in EAPI=6 for control variables.

[Michał Górny]

Dnia 11 grudnia 2015 22:03:05 CET, dilfridge@gentoo.org napisał(a):
>From: "Andreas K. Huettel (dilfridge)" <dilfridge@gentoo.org>
>
>This is more consistent with upstream terminology and avoids clashes in
>case of kernel modules.
>---
>eclass/perl-module.eclass | 52
>+++++++++++++++++++++++++++--------------------
> 1 file changed, 30 insertions(+), 22 deletions(-)
>
>diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass
>index 82707fe..efcc47c 100644
>--- a/eclass/perl-module.eclass
>+++ b/eclass/perl-module.eclass
>@@ -114,30 +114,31 @@ esac
> 
> LICENSE="${LICENSE:-|| ( Artistic GPL-1+ )}"
> 
>-# @ECLASS-VARIABLE: MODULE_NAME
>+# @ECLASS-VARIABLE: DIST_NAME
> # @DESCRIPTION:
># (EAPI=6) This variable provides a way to override PN for the
>calculation of S,
> # SRC_URI, and HOMEPAGE. Defaults to PN.
> 
>-# @ECLASS-VARIABLE: MODULE_VERSION
>+# @ECLASS-VARIABLE: DIST_VERSION
> # @DESCRIPTION:
>-# This variable provides a way to override PV for the calculation of S
>and SRC_URI.
>+# (EAPI=6) This variable provides a way to override PV for the
>calculation of S and SRC_URI.
># Use it to provide the non-normalized, upstream version number.
>Defaults to PV.
>+# Named MODULE_VERSION in EAPI=5.
> 
>-# @ECLASS-VARIABLE: MODULE_A_EXT
>+# @ECLASS-VARIABLE: DIST_A_EXT
> # @DESCRIPTION:
>-# This variable provides a way to override the distfile extension for
>the calculation of
>-# SRC_URI. Defaults to tar.gz
>+# (EAPI=6) This variable provides a way to override the distfile
>extension for the calculation of
>+# SRC_URI. Defaults to tar.gz. Named MODULE_A_EXT in EAPI=5.
> 
>-# @ECLASS-VARIABLE: MODULE_A
>+# @ECLASS-VARIABLE: DIST_A
> # @DESCRIPTION:
>-# This variable provides a way to override the distfile name for the
>calculation of
>-# SRC_URI. Defaults to
>${MODULE_NAME}-${MODULE_VERSION}.${MODULE_A_EXT}
>+# (EAPI=6) This variable provides a way to override the distfile name
>for the calculation of
>+# SRC_URI. Defaults to ${DIST_NAME}-${DIST_VERSION}.${DIST_A_EXT}
>Named MODULE_A in EAPI=5.
> 
>-# @ECLASS-VARIABLE: MODULE_AUTHOR
>+# @ECLASS-VARIABLE: DIST_AUTHOR
> # @DESCRIPTION:
>-# This variable sets the module author name for the calculation of
>-# SRC_URI.
>+# (EAPI=6) This variable sets the module author name for the
>calculation of
>+# SRC_URI. Named MODULE_AUTHOR in EAPI=5.
> 
> if [[ ${EAPI:-0} = 5 ]] ; then
> 	if [[ -n ${MY_PN} || -n ${MY_PV} || -n ${MODULE_VERSION} ]] ; then
>@@ -146,19 +147,26 @@ if [[ ${EAPI:-0} = 5 ]] ; then
> 	fi
> 	MODULE_NAME=${MY_PN:-${PN}}
> 	MODULE_P=${MY_P:-${P}}
>+
>+	[[ -z "${SRC_URI}" && -z "${MODULE_A}" ]] && \
>+		MODULE_A="${MODULE_P}.${MODULE_A_EXT:-tar.gz}"
>+	[[ -z "${SRC_URI}" && -n "${MODULE_AUTHOR}" ]] && \
>+		SRC_URI="mirror://cpan/authors/id/${MODULE_AUTHOR:0:1}/${MODULE_AUTHOR:0:2}/${MODULE_AUTHOR}/${MODULE_SECTION:+${MODULE_SECTION}/}${MODULE_A}"
>+	[[ -z "${HOMEPAGE}" ]] && \
>+		HOMEPAGE="http://search.cpan.org/dist/${MODULE_NAME}/"
> else
>-	MODULE_NAME=${MODULE_NAME:-${PN}}
>-	MODULE_P=${MODULE_NAME}-${MODULE_VERSION:-${PV}}
>-	S=${WORKDIR}/${MODULE_P}
>+	DIST_NAME=${DIST_NAME:-${PN}}
>+	DIST_P=${DIST_NAME}-${DIST_VERSION:-${PV}}
>+	S=${WORKDIR}/${DIST_P}
>+
>+	[[ -z "${SRC_URI}" && -z "${DIST_A}" ]] && \
>+		DIST_A="${DIST_P}.${DIST_A_EXT:-tar.gz}"
>+	[[ -z "${SRC_URI}" && -n "${DIST_AUTHOR}" ]] && \
>+		SRC_URI="mirror://cpan/authors/id/${DIST_AUTHOR:0:1}/${DIST_AUTHOR:0:2}/${DIST_AUTHOR}/${DIST_SECTION:+${DIST_SECTION}/}${DIST_A}"
>+	[[ -z "${HOMEPAGE}" ]] && \
>+		HOMEPAGE="http://search.cpan.org/dist/${DIST_NAME}/"
> fi
> 
>-[[ -z "${SRC_URI}" && -z "${MODULE_A}" ]] && \
>-	MODULE_A="${MODULE_P}.${MODULE_A_EXT:-tar.gz}"
>-[[ -z "${SRC_URI}" && -n "${MODULE_AUTHOR}" ]] && \
>-	SRC_URI="mirror://cpan/authors/id/${MODULE_AUTHOR:0:1}/${MODULE_AUTHOR:0:2}/${MODULE_AUTHOR}/${MODULE_SECTION:+${MODULE_SECTION}/}${MODULE_A}"
>-[[ -z "${HOMEPAGE}" ]] && \
>-	HOMEPAGE="http://search.cpan.org/dist/${MODULE_NAME}/"
>-
> SRC_PREP="no"
> SRC_TEST="skip"
> PREFER_BUILDPL="yes"

Now that's confusing history. You introduce new variables, document them all, then suddenly rename then. Wouldn't it be better to rename old ones first and introduce new ones directly with correct names?
-- 
Sent from my Android device with K-9 Mail. Please excuse my brevity.

Re: [gentoo-dev] [PATCH 09/15] perl-module.eclass: Use DIST_ prefix instead of MODULE_ prefix in EAPI=6 for control variables.

[Andreas K. Huettel]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Am Samstag, 12. Dezember 2015, 13:01:58 schrieb Michał Górny:
> Dnia 11 grudnia 2015 22:03:05 CET, dilfridge@gentoo.org napisał(a):
> 
> Now that's confusing history. You introduce new variables, document them
> all, then suddenly rename then. Wouldn't it be better to rename old ones
> first and introduce new ones directly with correct names?

Yes. This is what I meant with squashing commits. 

Basically for now I just kept things along my line of thought, but some of 
these single patches can be consolidated once the finetuning is done.

- -- 

Andreas K. Huettel
Gentoo Linux developer 
dilfridge@gentoo.org
http://www.akhuettel.de/

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.1

iQJ8BAEBCgBmBQJWbIQNXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkJDMzI0NjNBOTIwMDY5MTQ2NkMzNDBF
MTM4NkZEN0VGNEI1Nzc5AAoJEOE4b9fvS1d5kTwP/A2/8Xro7h/NApFUOEx90Uz4
XMaRk0bh9XtzLB03Wait4ozxV06qOuNDB9iC99uZMZB4plqmegybPatotaaRlDhA
1StUJk0qfU8KYR3D2EHTsHZb80R9AYWNDwKSnK3c2VbHV0zPxoB0DSTL1ncCyhho
MGwzHOxVXx34o3fNFTaOtm3N0aIIz5eKmqQ5HQpH+CoZrSiFQqYeK3gOANkQCmuc
4j/FYl7yzdTReqifELzmBc62qUFjZET4QBEhq4tKSHPtOc6uJSXmUbwvRj8t3suG
CGZeWvq8i1CspaQrjIpfhz6MyHjxZ7tVLdC94RkM2OH9brwGO6TUl6lEZKOEDz9J
jNZf30sxnCpQ6ICnM0olCMnPdpOcfSTWhzl7PSJu3hIT5nMAbgh7PHry/Rz0T2nw
eP7izpSK6d1j3djf3Z0W9CQkrNjSohEa4xX6PIj/UFM8xHQ5F0ajihmMGb9gTdFI
Gh/JX0c1Q+vM8+9H3oSRvYNgwH1sOCeCBDYFdFwHxeDGNSWufo4xmhIrqJ1YTY81
n87vGc/QLB1d/f92WzDMDNI/WqN0odd+6rYpYE6SFAERZ+XrQXcN1uukbMzMAazd
qHgeLmMpdWxoe3RQygGdh5/xFFc6PzdrDo5OrpuUtMcE4mKGzrPjwohobDU2QhsW
SYOuaMjXnSCc9+EpO31O
=CLg4
-----END PGP SIGNATURE-----

[gentoo-dev] [PATCH 10/15] perl-module.eclass: Rename SRC_TEST to DIST_TEST in EAPI=6 and default to "do parallel"

[dilfridge]

From: "Andreas K. Huettel (dilfridge)" <dilfridge@gentoo.org>

---
 eclass/perl-module.eclass | 40 +++++++++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass
index efcc47c..0d428d2 100644
--- a/eclass/perl-module.eclass
+++ b/eclass/perl-module.eclass
@@ -154,6 +154,8 @@ if [[ ${EAPI:-0} = 5 ]] ; then
 		SRC_URI="mirror://cpan/authors/id/${MODULE_AUTHOR:0:1}/${MODULE_AUTHOR:0:2}/${MODULE_AUTHOR}/${MODULE_SECTION:+${MODULE_SECTION}/}${MODULE_A}"
 	[[ -z "${HOMEPAGE}" ]] && \
 		HOMEPAGE="http://search.cpan.org/dist/${MODULE_NAME}/"
+
+	SRC_TEST="skip"
 else
 	DIST_NAME=${DIST_NAME:-${PN}}
 	DIST_P=${DIST_NAME}-${DIST_VERSION:-${PV}}
@@ -168,7 +170,6 @@ else
 fi
 
 SRC_PREP="no"
-SRC_TEST="skip"
 PREFER_BUILDPL="yes"
 
 pm_echovar=""
@@ -315,6 +316,18 @@ perl-module_src_compile() {
 	fi
 }
 
+# @ECLASS-VARIABLE: DIST_TEST
+# @DESCRIPTION:
+# (EAPI=6) Variable that controls if tests are run in the test phase
+# at all, and if yes under which conditions. Defaults to "do parallel"
+# In EAPI=5 the variable is called SRC_TEST and defaults to "skip".
+# All of the following have been tested to work:
+#  DIST_TEST="do parallel"
+#  DIST_TEST="parallel"
+#  DIST_TEST="parallel do"
+#  DIST_TEST=parallel
+#  DIST_TEST=skip
+
 # @FUNCTION: perl-module_src-test
 # @USAGE: perl-module_src_test()
 # @DESCRIPTION:
@@ -323,24 +336,17 @@ perl-module_src_compile() {
 #
 # If you want more verbose testing, set TEST_VERBOSE=1
 # in your bashrc | /etc/portage/make.conf | ENV
-#
-# or ebuild writers:
-# If you wish to enable default tests w/ 'make test' ,
-#
-#  SRC_TEST="do"
-#
-# If you wish to have threads run in parallel ( using the users makeopts )
-# all of the following have been tested to work.
-#
-#  SRC_TEST="do parallel"
-#  SRC_TEST="parallel"
-#  SRC_TEST="parallel do"
-#  SRC_TEST=parallel
-#
 perl-module_src_test() {
 	debug-print-function $FUNCNAME "$@"
-	if has 'do' ${SRC_TEST} || has 'parallel' ${SRC_TEST} ; then
-		if has "${TEST_VERBOSE:-0}" 0 && has 'parallel' ${SRC_TEST} ; then
+	local my_test_control
+	if [[ ${EAPI:-0} = 5 ]] ; then
+		my_test_control=${SRC_TEST}
+	else
+		my_test_control=${DIST_TEST:-do parallel}
+	fi
+
+	if has 'do' ${my_test_control} || has 'parallel' ${my_test_control} ; then
+		if has "${TEST_VERBOSE:-0}" 0 && has 'parallel' ${my_test_control} ; then
 			export HARNESS_OPTIONS=j$(makeopts_jobs)
 			einfo "Test::Harness Jobs=$(makeopts_jobs)"
 		fi
-- 
2.6.3

Re: [gentoo-dev] [PATCH 10/15] perl-module.eclass: Rename SRC_TEST to DIST_TEST in EAPI=6 and default to "do parallel"

[Michał Górny]

Dnia 11 grudnia 2015 22:03:06 CET, dilfridge@gentoo.org napisał(a):
>From: "Andreas K. Huettel (dilfridge)" <dilfridge@gentoo.org>
>
>---
>eclass/perl-module.eclass | 40 +++++++++++++++++++++++-----------------
> 1 file changed, 23 insertions(+), 17 deletions(-)
>
>diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass
>index efcc47c..0d428d2 100644
>--- a/eclass/perl-module.eclass
>+++ b/eclass/perl-module.eclass
>@@ -154,6 +154,8 @@ if [[ ${EAPI:-0} = 5 ]] ; then
>		SRC_URI="mirror://cpan/authors/id/${MODULE_AUTHOR:0:1}/${MODULE_AUTHOR:0:2}/${MODULE_AUTHOR}/${MODULE_SECTION:+${MODULE_SECTION}/}${MODULE_A}"
> 	[[ -z "${HOMEPAGE}" ]] && \
> 		HOMEPAGE="http://search.cpan.org/dist/${MODULE_NAME}/"
>+
>+	SRC_TEST="skip"
> else
> 	DIST_NAME=${DIST_NAME:-${PN}}
> 	DIST_P=${DIST_NAME}-${DIST_VERSION:-${PV}}
>@@ -168,7 +170,6 @@ else
> fi
> 
> SRC_PREP="no"
>-SRC_TEST="skip"
> PREFER_BUILDPL="yes"
> 
> pm_echovar=""
>@@ -315,6 +316,18 @@ perl-module_src_compile() {
> 	fi
> }
> 
>+# @ECLASS-VARIABLE: DIST_TEST
>+# @DESCRIPTION:
>+# (EAPI=6) Variable that controls if tests are run in the test phase
>+# at all, and if yes under which conditions. Defaults to "do parallel"
>+# In EAPI=5 the variable is called SRC_TEST and defaults to "skip".
>+# All of the following have been tested to work:
>+#  DIST_TEST="do parallel"
>+#  DIST_TEST="parallel"
>+#  DIST_TEST="parallel do"
>+#  DIST_TEST=parallel
>+#  DIST_TEST=skip

At this point, I'm starting to wonder why you aren't using PERL_ prefix...

>+
> # @FUNCTION: perl-module_src-test
> # @USAGE: perl-module_src_test()
> # @DESCRIPTION:
>@@ -323,24 +336,17 @@ perl-module_src_compile() {
> #
> # If you want more verbose testing, set TEST_VERBOSE=1
> # in your bashrc | /etc/portage/make.conf | ENV
>-#
>-# or ebuild writers:
>-# If you wish to enable default tests w/ 'make test' ,
>-#
>-#  SRC_TEST="do"
>-#
>-# If you wish to have threads run in parallel ( using the users
>makeopts )
>-# all of the following have been tested to work.
>-#
>-#  SRC_TEST="do parallel"
>-#  SRC_TEST="parallel"
>-#  SRC_TEST="parallel do"
>-#  SRC_TEST=parallel
>-#
> perl-module_src_test() {
> 	debug-print-function $FUNCNAME "$@"
>-	if has 'do' ${SRC_TEST} || has 'parallel' ${SRC_TEST} ; then
>-		if has "${TEST_VERBOSE:-0}" 0 && has 'parallel' ${SRC_TEST} ; then
>+	local my_test_control
>+	if [[ ${EAPI:-0} = 5 ]] ; then
>+		my_test_control=${SRC_TEST}
>+	else
>+		my_test_control=${DIST_TEST:-do parallel}
>+	fi
>+
>+	if has 'do' ${my_test_control} || has 'parallel' ${my_test_control} ;
>then
>+		if has "${TEST_VERBOSE:-0}" 0 && has 'parallel' ${my_test_control} ;
>then
> 			export HARNESS_OPTIONS=j$(makeopts_jobs)
> 			einfo "Test::Harness Jobs=$(makeopts_jobs)"
> 		fi

-- 
Sent from my Android device with K-9 Mail. Please excuse my brevity.

Re: [gentoo-dev] [PATCH 10/15] perl-module.eclass: Rename SRC_TEST to DIST_TEST in EAPI=6 and default to "do parallel"

[Andreas K. Huettel]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Am Samstag, 12. Dezember 2015, 13:03:56 schrieb Michał Górny:
> Dnia 11 grudnia 2015 22:03:06 CET, dilfridge@gentoo.org napisał(a):
>
> >+# @ECLASS-VARIABLE: DIST_TEST
> >+# @DESCRIPTION:
> >+# (EAPI=6) Variable that controls if tests are run in the test phase
> >+# at all, and if yes under which conditions. Defaults to "do parallel"
> >+# In EAPI=5 the variable is called SRC_TEST and defaults to "skip".
> >+# All of the following have been tested to work:
> >+#  DIST_TEST="do parallel"
> >+#  DIST_TEST="parallel"
> >+#  DIST_TEST="parallel do"
> >+#  DIST_TEST=parallel
> >+#  DIST_TEST=skip
> 
> At this point, I'm starting to wonder why you aren't using PERL_ prefix...
> 

Well. We had that idea already, and at some point something barfed, I dont 
remember the details anymore. Maybe someone else from the team knows.

The problem is introducing too many variables that look like something 
*upstream* might use... 

(We in addition already had creative variable clashes with the kernel module 
build system in the past.)

"Gentoo Perl" would lead to GPL_... as variable prefix, not really suitable. 
Kent suggested GPLX_... which I find horrible. GPERL_? GP_? ...

- -- 

Andreas K. Huettel
Gentoo Linux developer 
dilfridge@gentoo.org
http://www.akhuettel.de/

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.1

iQJ8BAEBCgBmBQJWbIaIXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkJDMzI0NjNBOTIwMDY5MTQ2NkMzNDBF
MTM4NkZEN0VGNEI1Nzc5AAoJEOE4b9fvS1d5QtkQAIjvMwj0y5qR4Qut9yeUNKik
sZ/IaIj2l86EoyQiAVg8Rtb73t5PIqwh73Q2f99i8HVogV/J9BYgbS+u2kWax4em
ZQAJquJyUcKEV4YvIq+saFmUJG3RKg9ArDPZeq52AWA5HXF10YokijSLzhvknNuR
JMpj2b/a+kqBcpt3ssuf+q8hDAa6h2xdZySU+luIEDSNpxRYp4/1FBjoKOKDw659
u7jmOQs6oVaefbhKzQgt4Uh8LPhY4RBRC0A+6bN8XRHAYVkR7Fa6B939Xq9B/3iD
n+NGy1LY0UIot2QYuwdvqu2o4beng4unuGixZcXmpTQs+Cv5lJZrdE3Caid4z4m6
K/+lkjxwuI3bdSD6EoHH2Ie1CdcNDL+FTPB5N1wowQkjG3Sbo2yp83EPR/X643Mp
PF+Wm5XrabQFRZanJIYAbtmdpauIyqt/sRbD9hJ6za9OPUNU7PDehSaJVWJz79ZH
A0Wcj5B51vJaGcYrFSD7qp1oKMSL0qbT04EvpVC6C05FohMJcLZ6Y+1FiwB12Q9R
szWlVUU/V/sqwD+hflUK5KADQvPe0bHG6XRivxzBaMusfarjFuobjNr0HrS5S0IE
YTiqc9/yHKh5Z3jwKIOZ+PQ5C3OgSDI44FKUTcllv/RSKeA8X8nYupvHE3PNEcMj
BFH1L8YqrqviwBBATppl
=KnIg
-----END PGP SIGNATURE-----

Re: [gentoo-dev] [PATCH 10/15] perl-module.eclass: Rename SRC_TEST to DIST_TEST in EAPI=6 and default to "do parallel"

[Kent Fredric]

On 13 December 2015 at 09:41, Andreas K. Huettel <dilfridge@gentoo.org> wrote:
> Well. We had that idea already, and at some point something barfed, I dont
> remember the details anymore. Maybe someone else from the team knows.
>
> The problem is introducing too many variables that look like something
> *upstream* might use...
>
> (We in addition already had creative variable clashes with the kernel module
> build system in the past.)
>
> "Gentoo Perl" would lead to GPL_... as variable prefix, not really suitable.
> Kent suggested GPLX_... which I find horrible. GPERL_? GP_? ...


Yeah. There's a bit of a potential issue with using the PERL_ prefix
in that that prefix is heavily overloaded /in perl/ things, and `perl
-V` subsequently reports all ENV vars with a PERL prefix ( underscore
or not )

PERL_MOM=Yours perl -V  | grep MOM
    PERL_MOM="Yours"

So using the PERL_ prefix increases our chances we'll pick something
that will collide, or will mislead somebody into thinking that we're
using an ENV var that Perl reacts magically to, where the ENV var is
purely Gentoo and Purely part of our private API ( At least, its
supposed to be private from the context of a perl interpreter )

If there was a way to mark those vars so they didn't get exported to
perl that would help, but it wouldn't reduce the "What does this do"
impression-confusion.

-- 
Kent

KENTNL - https://metacpan.org/author/KENTNL

Re: [gentoo-dev] [PATCH 10/15] perl-module.eclass: Rename SRC_TEST to DIST_TEST in EAPI=6 and default to "do parallel"

[Jeroen Roovers]

On Fri, 11 Dec 2015 22:03:06 +0100
dilfridge@gentoo.org wrote:

> From: "Andreas K. Huettel (dilfridge)" <dilfridge@gentoo.org>
> 
> ---
>  eclass/perl-module.eclass | 40
> +++++++++++++++++++++++----------------- 1 file changed, 23
> insertions(+), 17 deletions(-)
> 
> diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass
> index efcc47c..0d428d2 100644
> --- a/eclass/perl-module.eclass
> +++ b/eclass/perl-module.eclass
> @@ -154,6 +154,8 @@ if [[ ${EAPI:-0} = 5 ]] ; then
>  		SRC_URI="mirror://cpan/authors/id/${MODULE_AUTHOR:0:1}/${MODULE_AUTHOR:0:2}/${MODULE_AUTHOR}/${MODULE_SECTION:+${MODULE_SECTION}/}${MODULE_A}"
>  	[[ -z "${HOMEPAGE}" ]] && \
>  		HOMEPAGE="http://search.cpan.org/dist/${MODULE_NAME}/"
> +
> +	SRC_TEST="skip"
>  else
>  	DIST_NAME=${DIST_NAME:-${PN}}
>  	DIST_P=${DIST_NAME}-${DIST_VERSION:-${PV}}
> @@ -168,7 +170,6 @@ else
>  fi

You're disabling src_test() by default in any ebuild that happens to
inherit perl-module. Everyone who wants a way around that has to set
STUPID_VARIABLE now. Why?


     jer

Re: [gentoo-dev] [PATCH 10/15] perl-module.eclass: Rename SRC_TEST to DIST_TEST in EAPI=6 and default to "do parallel"

[Andreas K. Huettel]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Am Samstag, 26. Dezember 2015, 12:53:20 schrieb Jeroen Roovers:
> On Fri, 11 Dec 2015 22:03:06 +0100
> 
> dilfridge@gentoo.org wrote:
> > From: "Andreas K. Huettel (dilfridge)" <dilfridge@gentoo.org>
> > 
> > ---
> > 
> >  eclass/perl-module.eclass | 40
> > 
> > +++++++++++++++++++++++----------------- 1 file changed, 23
> > insertions(+), 17 deletions(-)
> > 
> > diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass
> > index efcc47c..0d428d2 100644
> > --- a/eclass/perl-module.eclass
> > +++ b/eclass/perl-module.eclass
> > @@ -154,6 +154,8 @@ if [[ ${EAPI:-0} = 5 ]] ; then
> > 
> >  		
SRC_URI="mirror://cpan/authors/id/${MODULE_AUTHOR:0:1}/${MODULE_AUTHOR
> >  		:0:2}/${MODULE_AUTHOR}/${MODULE_SECTION:
+${MODULE_SECTION}/}${MODULE_A
> >  		}"
> >  	
> >  	[[ -z "${HOMEPAGE}" ]] && \
> >  	
> >  		HOMEPAGE="http://search.cpan.org/dist/${MODULE_NAME}/"
> > 
> > +
> > +	SRC_TEST="skip"
> > 
> >  else
> >  
> >  	DIST_NAME=${DIST_NAME:-${PN}}
> >  	DIST_P=${DIST_NAME}-${DIST_VERSION:-${PV}}
> > 
> > @@ -168,7 +170,6 @@ else
> > 
> >  fi
> 
> You're disabling src_test() by default in any ebuild that happens to
> inherit perl-module. Everyone who wants a way around that has to set
> STUPID_VARIABLE now. Why?
> 

That's the current (EAPI=5) behaviour, which has been unchanged in perl-
module.eclass since before I joined Gentoo afaik... I'm not too enthusiastic 
about it. 

EAPI=6 behaviour is the reverse; testing is enabled unless the variable 
DIST_TEST is set (and the variable allows more finetuning).

- -- 
Andreas K. Huettel
Gentoo Linux developer (council, perl, libreoffice)
dilfridge@gentoo.org
http://www.akhuettel.de/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAEBCgAGBQJWf811AAoJEHRrah2soMK+qhcP/2jKg70ic2XcGvdJnnsk/yuD
EJwE1dxlsSWBrTd01E71hbBcujJfHQQwslKtumU1TZ/a5uAF6jpEJXuxWtz/vV9U
XvNJuCjFhnKndWJxL3AiygbLNqk+R7ddOS5B2Pm2q/EV8PdSpVDhOX7qrmWQWWvL
dXekoN0ALTo5q+G/AKXddC/H4cu63V2ES4tjcVoc7dTVnXkiPD9oRTRYyPA3lG44
LCwIx3wVBO61Bu24DqvUqume/6obRp+ort3feM/mlGGxiOyYKSnlSHcOvcEw5FSg
stcF5urVRueiBTk8hHJVHHVttxwLRwrEGWL5849DgK3WZp1JMDRSrWmin93S6ur2
YXIbpxCm73ZwSXBJA74kcAh/CN3MVZf60ZIi/z3GdZE4pJU4zYRVlmd5AOVz3V4n
G0cGruJ2qtlFqinOxrrkj6/EKE7N4cjTN70nUggHKu4ApID8sd783uIbizs9+1Zs
0ZCCnj9EO28nIRmJhr8UfawVK0hQvZ14gGN/90D07bC1GIZeMFnd1aePIRz/bABN
eeI3OhhPI+yIlMKkRryT2RMi9lthUH9kIe+wEL9QnyCEjFlZsOhhl/e+m3lutfsF
E/AQ6WwzCrVpkjn1xkdrpKlZqjlzPXuQJv8irO9H/9IvViGvzxhF/+RO3Y6Cr/d3
ZqpUljJsvlT1Ob8/om55
=bJFY
-----END PGP SIGNATURE-----

[gentoo-dev] [PATCH 11/15] perl-module.eclass: Introduce DIST_TEST_OVERRIDE in EAPI=6

[dilfridge]

From: "Andreas K. Huettel (dilfridge)" <dilfridge@gentoo.org>

---
 eclass/perl-module.eclass | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass
index 0d428d2..4dc39eb 100644
--- a/eclass/perl-module.eclass
+++ b/eclass/perl-module.eclass
@@ -328,6 +328,14 @@ perl-module_src_compile() {
 #  DIST_TEST=parallel
 #  DIST_TEST=skip
 
+# @ECLASS-VARIABLE: DIST_TEST_OVERRIDE
+# @DESCRIPTION:
+# (EAPI=6) Variable that controls if tests are run in the test phase
+# at all, and if yes under which conditions. It is intended for use in
+# make.conf or the environment by ebuild authors during testing, and
+# accepts the same values as DIST_TEST. If set, it overrides DIST_TEST
+# completely. DO NOT USE THIS IN EBUILDS!
+
 # @FUNCTION: perl-module_src-test
 # @USAGE: perl-module_src_test()
 # @DESCRIPTION:
@@ -342,7 +350,8 @@ perl-module_src_test() {
 	if [[ ${EAPI:-0} = 5 ]] ; then
 		my_test_control=${SRC_TEST}
 	else
-		my_test_control=${DIST_TEST:-do parallel}
+		[[ -n "${DIST_TEST_OVERRIDE}" ]] && ewarn DIST_TEST_OVERRIDE is set to ${DIST_TEST_OVERRIDE}
+		my_test_control=${DIST_TEST_OVERRIDE:-${DIST_TEST:-do parallel}}
 	fi
 
 	if has 'do' ${my_test_control} || has 'parallel' ${my_test_control} ; then
-- 
2.6.3

Re: [gentoo-dev] [PATCH 11/15] perl-module.eclass: Introduce DIST_TEST_OVERRIDE in EAPI=6

[Michał Górny]

Dnia 11 grudnia 2015 22:03:07 CET, dilfridge@gentoo.org napisał(a):
>From: "Andreas K. Huettel (dilfridge)" <dilfridge@gentoo.org>
>
>---
> eclass/perl-module.eclass | 11 ++++++++++-
> 1 file changed, 10 insertions(+), 1 deletion(-)
>
>diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass
>index 0d428d2..4dc39eb 100644
>--- a/eclass/perl-module.eclass
>+++ b/eclass/perl-module.eclass
>@@ -328,6 +328,14 @@ perl-module_src_compile() {
> #  DIST_TEST=parallel
> #  DIST_TEST=skip
> 
>+# @ECLASS-VARIABLE: DIST_TEST_OVERRIDE
>+# @DESCRIPTION:
>+# (EAPI=6) Variable that controls if tests are run in the test phase
>+# at all, and if yes under which conditions. It is intended for use in
>+# make.conf or the environment by ebuild authors during testing, and
>+# accepts the same values as DIST_TEST. If set, it overrides DIST_TEST
>+# completely. DO NOT USE THIS IN EBUILDS!
>+
> # @FUNCTION: perl-module_src-test
> # @USAGE: perl-module_src_test()
> # @DESCRIPTION:
>@@ -342,7 +350,8 @@ perl-module_src_test() {
> 	if [[ ${EAPI:-0} = 5 ]] ; then
> 		my_test_control=${SRC_TEST}
> 	else
>-		my_test_control=${DIST_TEST:-do parallel}
>+		[[ -n "${DIST_TEST_OVERRIDE}" ]] && ewarn DIST_TEST_OVERRIDE is set
>to ${DIST_TEST_OVERRIDE}
>+		my_test_control=${DIST_TEST_OVERRIDE:-${DIST_TEST:-do parallel}}
> 	fi
> 
>	if has 'do' ${my_test_control} || has 'parallel' ${my_test_control} ;
>then

Why that? This seems really redundant to RESTRICT=test.

-- 
Sent from my Android device with K-9 Mail. Please excuse my brevity.

Re: [gentoo-dev] [PATCH 11/15] perl-module.eclass: Introduce DIST_TEST_OVERRIDE in EAPI=6

[Michał Górny]

Dnia 12 grudnia 2015 13:05:12 CET, "Michał Górny" <mgorny@gentoo.org> napisał(a):
>
>
>Dnia 11 grudnia 2015 22:03:07 CET, dilfridge@gentoo.org napisał(a):
>>From: "Andreas K. Huettel (dilfridge)" <dilfridge@gentoo.org>
>>
>>---
>> eclass/perl-module.eclass | 11 ++++++++++-
>> 1 file changed, 10 insertions(+), 1 deletion(-)
>>
>>diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass
>>index 0d428d2..4dc39eb 100644
>>--- a/eclass/perl-module.eclass
>>+++ b/eclass/perl-module.eclass
>>@@ -328,6 +328,14 @@ perl-module_src_compile() {
>> #  DIST_TEST=parallel
>> #  DIST_TEST=skip
>> 
>>+# @ECLASS-VARIABLE: DIST_TEST_OVERRIDE
>>+# @DESCRIPTION:
>>+# (EAPI=6) Variable that controls if tests are run in the test phase
>>+# at all, and if yes under which conditions. It is intended for use
>in
>>+# make.conf or the environment by ebuild authors during testing, and
>>+# accepts the same values as DIST_TEST. If set, it overrides
>DIST_TEST
>>+# completely. DO NOT USE THIS IN EBUILDS!
>>+
>> # @FUNCTION: perl-module_src-test
>> # @USAGE: perl-module_src_test()
>> # @DESCRIPTION:
>>@@ -342,7 +350,8 @@ perl-module_src_test() {
>> 	if [[ ${EAPI:-0} = 5 ]] ; then
>> 		my_test_control=${SRC_TEST}
>> 	else
>>-		my_test_control=${DIST_TEST:-do parallel}
>>+		[[ -n "${DIST_TEST_OVERRIDE}" ]] && ewarn DIST_TEST_OVERRIDE is set
>>to ${DIST_TEST_OVERRIDE}
>>+		my_test_control=${DIST_TEST_OVERRIDE:-${DIST_TEST:-do parallel}}
>> 	fi
>> 
>>	if has 'do' ${my_test_control} || has 'parallel' ${my_test_control} ;
>>then
>
>Why that? This seems really redundant to RESTRICT=test.

I meant FEATURES=-test. Sorry for the confusion.

-- 
Sent from my Android device with K-9 Mail. Please excuse my brevity.

Re: [gentoo-dev] [PATCH 11/15] perl-module.eclass: Introduce DIST_TEST_OVERRIDE in EAPI=6

[Andreas K. Huettel]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Am Samstag, 12. Dezember 2015, 13:06:59 schrieb Michał Górny:
> Dnia 12 grudnia 2015 13:05:12 CET, "Michał Górny" <mgorny@gentoo.org> 
napisał(a):
> >Dnia 11 grudnia 2015 22:03:07 CET, dilfridge@gentoo.org napisał(a):
> >>From: "Andreas K. Huettel (dilfridge)" <dilfridge@gentoo.org>
> >
> >Why that? This seems really redundant to RESTRICT=test.
> 
> I meant FEATURES=-test. Sorry for the confusion.

Well, it's less redundant than it is now. :)

Right now SRC_TEST can be used for two things: 
1) disabling tests (indeed redundantly redundant)
2) and running tests non-parallel or parallelized

The new version, DIST_TEST and DIST_TEST_OVERRIDE, allows a bit more 
finegrained control. 
- - verbose or not
- - enable network tests or not
- - parallelized or not

As Perl team member I'd likely set something like
DIST_TEST_OVERRIDE="do parallel" 
in my make.conf... which means that even ebuilds where the parallel testing 
caused problems in the past and has been disabled in the ebuild try to do 
that...

- -- 

Andreas K. Huettel
Gentoo Linux developer 
dilfridge@gentoo.org
http://www.akhuettel.de/

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.1

iQJ8BAEBCgBmBQJWbEeqXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkJDMzI0NjNBOTIwMDY5MTQ2NkMzNDBF
MTM4NkZEN0VGNEI1Nzc5AAoJEOE4b9fvS1d5cA0P/jTDM6x+Eu2ECPsimxLYSa+E
u8kMa119MAmSiZrA3DyMb/cVX5CRRMtvfQQG9G+1YWled4198VN0PuGnE1WWManK
XJU1UcEzXHM11HThLhSG6swkoS6Av8R7kokkqyq8fjlA+pKKc+ARHGjTcA0U+/J3
4o453ULLaUUbIV6M1Av7ERU6FrSQjgDLomz1jKNfuN0vVI5pzX1qSkMc8fbVdvFI
IgPwzqu5UCPUbDmUWDBaXUzsCLKKxkcMtzOKx5eU0PkDFenQn5r6TeHwPBvL4+X1
d2uBluqcUe2NwlxARQr0X9fmck200ssSkEgKj2YHbMPcUdaBUkaSfq8157/GOtf4
VKzJgZTWX+24FirQ3yRE53qjPSjESl+EwXWY6ZCOAv5vg0xr3nG+6Gy8kzr6LJrC
za8SAkceDcd984QtVJTbg7pcz1xuZXgG5rhjVWlKNHLZI+rWhq36WHjVtZAYahDu
cfGRdtbK/x4A6bjUvRzJanzXYFIfjdwN+NKFuQ30EBIuhwhzFiSlG4aDph/dk3Y1
s3AELWfFKL9sIM36HiRByG89/+X4FfrY8yIvxF60s5Blt9ZORSVLJvJpaKdJ+A2l
M4r7dTzggGEr9dBx92Ll0sTCnlmxW50tVKAzuw0k0lcI8u8ZpFAz9TY4dn6yBJZG
NByH66va0B9GPZ+dHGo2
=7aVq
-----END PGP SIGNATURE-----

[gentoo-dev] [PATCH 12/15] perl-module.eclass: Minor docu improvements

[dilfridge]

From: "Andreas K. Huettel (dilfridge)" <dilfridge@gentoo.org>

---
 eclass/perl-module.eclass | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass
index 4dc39eb..86c0a48 100644
--- a/eclass/perl-module.eclass
+++ b/eclass/perl-module.eclass
@@ -7,13 +7,16 @@
 # perl@gentoo.org
 # @AUTHOR:
 # Seemant Kulleen <seemant@gentoo.org>
-# Andreas K. Huettel <dilfridge@gentoo.org>
-# @BLURB: eclass for perl modules
+# Andreas K. Hüttel <dilfridge@gentoo.org>
+# @BLURB: eclass for installing Perl module distributions
 # @DESCRIPTION:
-# The perl-module eclass is designed to allow easier installation of perl
-# modules, and their incorporation into the Gentoo Linux system.
+# The perl-module eclass is designed to allow easier installation of Perl
+# module distributions, and their incorporation into the Gentoo Linux system.
 # All exported functions from perl-functions.eclass (inherited here)
 # explicitly also belong to the interface of perl-module.eclass.
+# If your package does not use any Perl-specific build system (as, e.g.,
+# ExtUtils::MakeMaker or Module::Build), we recommend to use perl-functions.eclass
+# instead.
 
 case "${EAPI:-0}" in
 	5)
-- 
2.6.3

[gentoo-dev] [PATCH 13/15] perl-module.eclass: Make some former warnings fatal to get rid of PERLQAFATAL, eqawarn, and (in EAPI=6) eutils.eclass

[dilfridge]

From: Andreas K. Hüttel <dilfridge@gentoo.org>

---
 eclass/perl-module.eclass | 29 +++++++++--------------------
 1 file changed, 9 insertions(+), 20 deletions(-)

diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass
index 86c0a48..faa8a34 100644
--- a/eclass/perl-module.eclass
+++ b/eclass/perl-module.eclass
@@ -24,7 +24,7 @@ case "${EAPI:-0}" in
 		PERL_EXPF="src_unpack src_prepare src_configure src_compile src_test src_install"
 		;;
 	6)
-		inherit eutils multiprocessing perl-functions
+		inherit multiprocessing perl-functions
 		PERL_EXPF="src_prepare src_configure src_compile src_test src_install"
 		;;
 	*)
@@ -211,7 +211,6 @@ perl-module_src_prepare() {
 		perl_rm_files "${PERL_RM_FILES[@]}"
 	fi
 	perl_fix_osx_extra
-	esvn_clean
 }
 
 # @FUNCTION: perl-module_src_configure
@@ -245,22 +244,14 @@ perl-module_src_configure() {
 		if grep -q '\(use\|require\)\s*Module::Build::Tiny' Build.PL ; then
 			einfo "Using Module::Build::Tiny"
 			if [[ ${DEPEND} != *dev-perl/Module-Build-Tiny* && ${PN} != Module-Build-Tiny ]]; then
-				eqawarn "QA Notice: The ebuild uses Module::Build::Tiny but doesn't depend on it."
-				eqawarn " Add dev-perl/Module-Build-Tiny to DEPEND!"
-				if [[ -n ${PERLQAFATAL} ]]; then
-					eerror "Bailing out due to PERLQAFATAL=1";
-					die
-				fi
+				eerror "QA Notice: The ebuild uses Module::Build::Tiny but doesn't depend on it."
+				die    " Add dev-perl/Module-Build-Tiny to DEPEND!"
 			fi
 		else
 			einfo "Using Module::Build"
 			if [[ ${DEPEND} != *virtual/perl-Module-Build* && ${DEPEND} != *dev-perl/Module-Build* && ${PN} != Module-Build ]] ; then
-				eqawarn "QA Notice: The ebuild uses Module::Build but doesn't depend on it."
-				eqawarn " Add dev-perl/Module-Build to DEPEND!"
-				if [[ -n ${PERLQAFATAL} ]]; then
-					eerror "Bailing out due to PERLQAFATAL=1";
-					die
-				fi
+				eerror "QA Notice: The ebuild uses Module::Build but doesn't depend on it."
+				die    " Add dev-perl/Module-Build to DEPEND!"
 			fi
 		fi
 		set -- \
@@ -425,9 +416,8 @@ perl-module_src_install() {
 perl-module_pkg_postinst() {
 	debug-print-function $FUNCNAME "$@"
 	if [[ ${CATEGORY} != perl-core ]] ; then
-		eqawarn "perl-module.eclass: You are calling perl-module_pkg_postinst outside the perl-core category."
-		eqawarn "   This does not do anything; the call can be safely removed."
-		return 0
+		eerror "perl-module.eclass: You are calling perl-module_pkg_postinst outside the perl-core category."
+		die    "   This does not do anything; the call can be removed."
 	fi
 	perl_link_duallife_scripts
 }
@@ -442,9 +432,8 @@ perl-module_pkg_postinst() {
 perl-module_pkg_postrm() {
 	debug-print-function $FUNCNAME "$@"
 	if [[ ${CATEGORY} != perl-core ]] ; then
-		eqawarn "perl-module.eclass: You are calling perl-module_pkg_postrm outside the perl-core category."
-		eqawarn "   This does not do anything; the call can be safely removed."
-		return 0
+		eerror "perl-module.eclass: You are calling perl-module_pkg_postrm outside the perl-core category."
+		die    "   This does not do anything; the call can be removed."
 	fi
 	perl_link_duallife_scripts
 }
-- 
2.6.3

[gentoo-dev] [PATCH 14/15] perl-module.eclass: Rewrite src_test for EAPI=6

[dilfridge]

From: Andreas K. Hüttel <dilfridge@gentoo.org>

---
 eclass/perl-module.eclass | 65 ++++++++++++++++++++++++++++++++---------------
 1 file changed, 45 insertions(+), 20 deletions(-)

diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass
index faa8a34..c174d5f 100644
--- a/eclass/perl-module.eclass
+++ b/eclass/perl-module.eclass
@@ -314,13 +314,14 @@ perl-module_src_compile() {
 # @DESCRIPTION:
 # (EAPI=6) Variable that controls if tests are run in the test phase
 # at all, and if yes under which conditions. Defaults to "do parallel"
-# In EAPI=5 the variable is called SRC_TEST and defaults to "skip".
-# All of the following have been tested to work:
-#  DIST_TEST="do parallel"
-#  DIST_TEST="parallel"
-#  DIST_TEST="parallel do"
-#  DIST_TEST=parallel
-#  DIST_TEST=skip
+# If neither "do" nor "parallel" is recognized, tests are skipped.
+# (In EAPI=5 the variable is called SRC_TEST, defaults to "skip", and
+# recognizes fewer options.)
+# The following space-separated keywords are recognized:
+#   do       : run tests
+#   parallel : run tests in parallel
+#   verbose  : increase test verbosity
+#   network  : do not try to disable network tests
 
 # @ECLASS-VARIABLE: DIST_TEST_OVERRIDE
 # @DESCRIPTION:
@@ -333,33 +334,57 @@ perl-module_src_compile() {
 # @FUNCTION: perl-module_src-test
 # @USAGE: perl-module_src_test()
 # @DESCRIPTION:
-# This code attempts to work out your threadingness from MAKEOPTS
-# and apply them to Test::Harness.
-#
-# If you want more verbose testing, set TEST_VERBOSE=1
-# in your bashrc | /etc/portage/make.conf | ENV
+# This code attempts to work out your threadingness and runs tests
+# according to the settings of DIST_TEST using Test::Harness.
 perl-module_src_test() {
 	debug-print-function $FUNCNAME "$@"
 	local my_test_control
+	local my_test_verbose
+
 	if [[ ${EAPI:-0} = 5 ]] ; then
 		my_test_control=${SRC_TEST}
+		my_test_verbose=${TEST_VERBOSE:-0}
+		if has 'do' ${my_test_control} || has 'parallel' ${my_test_control} ; then
+			if has "${my_test_verbose}" 0 && has 'parallel' ${my_test_control} ; then
+				export HARNESS_OPTIONS=j$(makeopts_jobs)
+				einfo "Test::Harness Jobs=$(makeopts_jobs)"
+			fi
+		else
+			einfo Skipping tests due to SRC_TEST=${SRC_TEST}
+			return 0
+		fi
 	else
 		[[ -n "${DIST_TEST_OVERRIDE}" ]] && ewarn DIST_TEST_OVERRIDE is set to ${DIST_TEST_OVERRIDE}
 		my_test_control=${DIST_TEST_OVERRIDE:-${DIST_TEST:-do parallel}}
-	fi
 
-	if has 'do' ${my_test_control} || has 'parallel' ${my_test_control} ; then
-		if has "${TEST_VERBOSE:-0}" 0 && has 'parallel' ${my_test_control} ; then
+		if ! has 'do' ${my_test_control} && ! has 'parallel' ${my_test_control} ; then
+			einfo Skipping tests due to DIST_TEST=${my_test_control}
+			return 0
+		fi
+
+		if has verbose ${my_test_control} ; then
+			my_test_verbose=1
+		else
+			my_test_verbose=0
+		fi
+
+		if has parallel ${my_test_control} ; then
 			export HARNESS_OPTIONS=j$(makeopts_jobs)
 			einfo "Test::Harness Jobs=$(makeopts_jobs)"
 		fi
-		perl_set_version
-		if [[ -f Build ]] ; then
-			./Build test verbose=${TEST_VERBOSE:-0} || die "test failed"
-		elif [[ -f Makefile ]] ; then
-			emake test TEST_VERBOSE=${TEST_VERBOSE:-0} || die "test failed"
+
+		# this might sometimes work...
+		if ! has network ${my_test_control} ; then
+			export NO_NETWORK_TESTING=1
 		fi
 	fi
+
+	perl_set_version
+	if [[ -f Build ]] ; then
+		./Build test verbose=${my_test_verbose} || die "test failed"
+	elif [[ -f Makefile ]] ; then
+		emake test TEST_VERBOSE=${my_test_verbose} || die "test failed"
+	fi
 }
 
 # @FUNCTION: perl-module_src_install
-- 
2.6.3

[gentoo-dev] [PATCH 15/15] dev-perl/CGI: Add EAPI=6 test ebuild

[dilfridge]

From: Andreas K. Hüttel <dilfridge@gentoo.org>

Package-Manager: portage-2.2.26
---
 dev-perl/CGI/CGI-4.220.0-r1.ebuild | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 dev-perl/CGI/CGI-4.220.0-r1.ebuild

diff --git a/dev-perl/CGI/CGI-4.220.0-r1.ebuild b/dev-perl/CGI/CGI-4.220.0-r1.ebuild
new file mode 100644
index 0000000..9d2500e
--- /dev/null
+++ b/dev-perl/CGI/CGI-4.220.0-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=LEEJO
+DIST_VERSION=4.22
+inherit perl-module
+
+DESCRIPTION="Simple Common Gateway Interface Class"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-Carp
+	virtual/perl-Encode
+	virtual/perl-Exporter
+	>=virtual/perl-File-Spec-0.820.0
+	virtual/perl-File-Temp
+	>=dev-perl/HTML-Parser-3.690.0
+	virtual/perl-if
+	>=virtual/perl-parent-0.225.0
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		>=virtual/perl-Test-Simple-0.980.0
+		dev-perl/Test-Warn
+	)
+"
-- 
2.6.3

Re: [gentoo-dev] [PATCH 01/15] perl-module.eclass: Allow EAPI=6, ban PERL_EXPORT_PHASE_FUNCTIONS there, simplify perl dependency

[Michał Górny]

Dnia 11 grudnia 2015 22:02:57 CET, dilfridge@gentoo.org napisał(a):
>From: "Andreas K. Huettel (dilfridge)" <dilfridge@gentoo.org>
>
>---
>eclass/perl-module.eclass | 54
>++++++++++++++++++++++++++++++++++++++---------
> 1 file changed, 44 insertions(+), 10 deletions(-)
>
>diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass
>index 5a476d2..82c72fc 100644
>--- a/eclass/perl-module.eclass
>+++ b/eclass/perl-module.eclass
>@@ -37,21 +37,55 @@ case "${EAPI:-0}" in
> 			RDEPEND="${DEPEND}"
> 			;;
> 		esac
>+
>+		case "${PERL_EXPORT_PHASE_FUNCTIONS:-yes}" in
>+			yes)
>+				EXPORT_FUNCTIONS ${PERL_EXPF}
>+				;;
>+			no)
>+				debug-print "PERL_EXPORT_PHASE_FUNCTIONS=no"
>+				;;
>+			*)
>+				die "PERL_EXPORT_PHASE_FUNCTIONS=${PERL_EXPORT_PHASE_FUNCTIONS} is
>not supported by perl-module.eclass"
>+				;;
>+		esac

You could split this move, you know.

> 		;;
>-	*)
>-		die "EAPI=${EAPI} is not supported by perl-module.eclass"
>-		;;
>-esac
>+	6)
>+		[[ ${CATEGORY} == "perl-core" ]] && \
>+			PERL_EXPF+=" pkg_postinst pkg_postrm"
>+
>+		case "${GENTOO_DEPEND_ON_PERL:-yes}" in
>+		yes)
>+			case "${GENTOO_DEPEND_ON_PERL_SUBSLOT:-yes}" in
>+			yes)
>+				DEPEND="dev-lang/perl:="
>+				;;
>+			*)
>+				DEPEND="dev-lang/perl"
>+				;;
>+			esac
>+			RDEPEND="${DEPEND}"
>+			;;
>+		esac

Why don't you pack this stuff into a single trinary variable?

>+
>+		case "${PERL_EXPORT_PHASE_FUNCTIONS:-undefined}" in

The ':' means it's not going to complain about PERL_EXPORT_PHASE_FUNCTIONS=.

>+			yes)
>+				die "PERL_EXPORT_PHASE_FUNCTIONS is banned in EAPI=6. It defaults
>to yes anyway."
>+				;;
>+			no)
>+				die "PERL_EXPORT_PHASE_FUNCTIONS is banned in EAPI=6. Inherit
>perl-functions.eclass instead."
>+				;;
>+			undefined)
>+				;;
>+			*)
>+				die "PERL_EXPORT_PHASE_FUNCTIONS is banned in EAPI=6."
>+				;;
>+		esac
> 
>-case "${PERL_EXPORT_PHASE_FUNCTIONS:-yes}" in
>-	yes)
> 		EXPORT_FUNCTIONS ${PERL_EXPF}
> 		;;
>-	no)
>-		debug-print "PERL_EXPORT_PHASE_FUNCTIONS=no"
>-		;;
> 	*)
>-		die "PERL_EXPORT_PHASE_FUNCTIONS=${PERL_EXPORT_PHASE_FUNCTIONS} is
>not supported by perl-module.eclass"
>+		die "EAPI=${EAPI} is not supported by perl-module.eclass"
> 		;;
> esac
> 

-- 
Sent from my Android device with K-9 Mail. Please excuse my brevity.

Re: [gentoo-dev] [PATCH 01/15] perl-module.eclass: Allow EAPI=6, ban PERL_EXPORT_PHASE_FUNCTIONS there, simplify perl dependency

[Andreas K. Huettel]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Am Samstag, 12. Dezember 2015, 12:49:09 schrieb Michał Górny:
> Dnia 11 grudnia 2015 22:02:57 CET, dilfridge@gentoo.org napisał(a):

> >+		case "${PERL_EXPORT_PHASE_FUNCTIONS:-yes}" in
> >+			yes)
> >+				EXPORT_FUNCTIONS ${PERL_EXPF}
> >+				;;
> >+			no)
> >+				debug-print "PERL_EXPORT_PHASE_FUNCTIONS=no"
> >+				;;
> >+			*)
> >+				die 
"PERL_EXPORT_PHASE_FUNCTIONS=${PERL_EXPORT_PHASE_FUNCTIONS} is
> >not supported by perl-module.eclass"
> >+				;;
> >+		esac
> 
> You could split this move, you know.

Yeah but it's probably more useful to change behavior now and then keep it 
consistent for whole EAPI=6... 

> >+		case "${GENTOO_DEPEND_ON_PERL:-yes}" in
> >+		yes)
> >+			case "${GENTOO_DEPEND_ON_PERL_SUBSLOT:-yes}" in
> >+			yes)
> >+				DEPEND="dev-lang/perl:="
> >+				;;
> >+			*)
> >+				DEPEND="dev-lang/perl"
> >+				;;
> >+			esac
> >+			RDEPEND="${DEPEND}"
> >+			;;
> >+		esac
> 
> Why don't you pack this stuff into a single trinary variable?

Good idea. Let's kill GENTOO_DEPEND_ON_PERL_SUBSLOT (never liked it, too long 
variable name :) and instead provide support for
GENTOO_DEPEND_ON_PERL=noslotop


- -- 

Andreas K. Huettel
Gentoo Linux developer 
dilfridge@gentoo.org
http://www.akhuettel.de/

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.1

iQJ8BAEBCgBmBQJWbIHoXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkJDMzI0NjNBOTIwMDY5MTQ2NkMzNDBF
MTM4NkZEN0VGNEI1Nzc5AAoJEOE4b9fvS1d5/NEP/RshKssht2YpkvxMzhj1wIj2
6ZAIWpq7lUlgaaORy/wVeGu29GVG1g5+Ov2KZdZjUVtVdG5JcRkdxihgwWL+AUT9
VfvEnlikEN+UTjJFE+1YmDEAynPpfAjv31UBLQg1LiKaUCHE8kABUFCJrUfmf6Pl
A0CkiwdGCDjeY3BFdQG4wQm/rbnMSeyMK39qodqNfKk/vwDl67LSHvifBKzuHqcJ
xcgKHVPNgN5T0HR6GLiBRO83PWOyQVYyX0/rMkQqTW4ggKGMHHtj15e+193sAyzX
ke1+yrYQtA1nLa3bwSRz/gWJkxXEPo9ZsRxPYgk1F3wM/l63hGYBQ5dR7oR2hx69
hoAhmwQvv4GpJoDq5Tm8//Ko+joRcFrj1yNTNmQn/KSWlX7+PE8uMrh2IoVznXb+
7BhWpeIx5/6txwlfGZzvdkH0KdK+Ahv0+QsKF0ZHm3S8T2fWsFLYfYR2cuC1UQYz
1W5vWaCUyt8nBZU7VR/+MWzyffZlwGkPmckbAxDX5CSn5EJTVs+y0PyhduYKd6RN
9i+8bmNHxPmehpjrs2En2iOhHiwO6q30wUTh0zY6CmNWmSsywUPlF8HSYwwScF0y
9C326aVegA29465gNdUw8njknwkksyUzFRBviGaB/ZzhjuA7AIvvdq/lpa3Eakhl
DXfw03GJDBK9cJogc2x+
=Zio8
-----END PGP SIGNATURE-----