Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 495044 | Differences between
and this patch

Collapse All | Expand All

(-)file_not_specified_in_diff (-21 / +32 lines)
Line  Link Here
0
-- perl-module.eclass
0
++ perl-module.eclass
Lines 127-139 Link Here
127
	fi
127
	fi
128
128
129
	if [[ ( ${PREFER_BUILDPL} == yes || ! -f Makefile.PL ) && -f Build.PL ]] ; then
129
	if [[ ( ${PREFER_BUILDPL} == yes || ! -f Makefile.PL ) && -f Build.PL ]] ; then
130
		einfo "Using Module::Build"
130
		if grep -q '\(use\|require\)\s*Module::Build::Tiny' Build.PL ; then
131
		if [[ ${DEPEND} != *virtual/perl-Module-Build* && ${PN} != Module-Build ]] ; then
131
			einfo "Using Module::Build::Tiny"
132
			eqawarn "QA Notice: The ebuild uses Module::Build but doesn't depend on it."
132
			if [[ ${DEPEND} != *dev-perl/Module-Build-Tiny* && ${PN} != Module-Build-Tiny ]]; then
133
			eqawarn "           Add virtual/perl-Module-Build to DEPEND!"
133
				eqawarn "QA Notice: The ebuild uses Module::Build::Tiny but doesn't depend on it."
134
			if [[ -n ${PERLQAFATAL} ]]; then
134
				eqawarn " Add dev-perl/Module-Build-Tiny to DEPEND!"
135
				eerror "Bailing out due to PERLQAFATAL=1";
135
				if [[ -n ${PERLQAFATAL} ]]; then
136
				die;
136
					eerror "Bailing out due to PERLQAFATAL=1";
137
					die
138
				fi
139
			fi
140
		else
141
			einfo "Using Module::Build"
142
			if [[ ${DEPEND} != *virtual/perl-Module-Build* && ${PN} != Module-Build ]] ; then
143
				eqawarn "QA Notice: The ebuild uses Module::Build but doesn't depend on it."
144
				eqawarn " Add virtual/perl-Module-Build to DEPEND!"
145
				if [[ -n ${PERLQAFATAL} ]]; then
146
					eerror "Bailing out due to PERLQAFATAL=1";
147
					die
148
				fi
137
			fi
149
			fi
138
		fi
150
		fi
139
		set -- \
151
		set -- \
Lines 257-279 Link Here
257
269
258
	local f
270
	local f
259
271
260
	if [[ -z ${mytargets} ]] ; then
272
	if [[ -f Build ]]; then
273
		mytargets="${mytargets:-install}"
274
		mbparams="${mbparams:---pure}"
275
		einfo "./Build ${mytargets} ${mbparams}"
276
		./Build ${mytargets} ${mbparams} \
277
			|| die "./Build ${mytargets} ${mbparams} failed"
278
	elif [[ -f Makefile ]]; then
261
		case "${CATEGORY}" in
279
		case "${CATEGORY}" in
262
			dev-perl|perl-core) mytargets="pure_install" ;;
280
			dev-perl|perl-core) mytargets="pure_install" ;;
263
			*)                  mytargets="install" ;;
281
			*)                  mytargets="install" ;;
264
		esac
282
		esac
265
	fi
283
		if [[ $(declare -p myinst 2>&-) != "declare -a myinst="* ]]; then
266
284
			local myinst_local=(${myinst})
267
	if [[ $(declare -p myinst 2>&-) != "declare -a myinst="* ]]; then
285
		else
268
		local myinst_local=(${myinst})
286
			local myinst_local=("${myinst[@]}")
269
	else
287
		fi
270
		local myinst_local=("${myinst[@]}")
271
	fi
272
273
	if [[ -f Build ]] ; then
274
		./Build ${mytargets} \
275
			|| die "./Build ${mytargets} failed"
276
	elif [[ -f Makefile ]] ; then
277
		emake "${myinst_local[@]}" ${mytargets} \
288
		emake "${myinst_local[@]}" ${mytargets} \
278
			|| die "emake ${myinst_local[@]} ${mytargets} failed"
289
			|| die "emake ${myinst_local[@]} ${mytargets} failed"
279
	fi
290
	fi

Return to bug 495044