From 1ddfb9cc7eb204864bcf113b74ca4c5c9780c84a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= Date: Thu, 29 Dec 2016 17:53:20 +0100 Subject: dev-lang/perl: Restore MANIFEST sort order, bug 589302 Package-Manager: Portage-2.3.3, Repoman-2.3.1 --- dev-lang/perl/files/perl-patchlevel-manifest.patch | 10 ++++++++++ dev-lang/perl/perl-5.24.1_rc4.ebuild | 6 +++--- 2 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 dev-lang/perl/files/perl-patchlevel-manifest.patch (limited to 'dev-lang/perl') diff --git a/dev-lang/perl/files/perl-patchlevel-manifest.patch b/dev-lang/perl/files/perl-patchlevel-manifest.patch new file mode 100644 index 00000000000..3592ae0ee1b --- /dev/null +++ b/dev-lang/perl/files/perl-patchlevel-manifest.patch @@ -0,0 +1,10 @@ +--- a/MANIFEST ++++ b/MANIFEST +@@ -4678,6 +4678,7 @@ + pad.h Scratchpad headers + parser.h parser object header ++patchlevel-gentoo.h Gentoo's Perl patch level + patchlevel.h The current patch level of perl + perlapi.c Perl API functions + perlapi.h Perl API function declarations + perl.c main() diff --git a/dev-lang/perl/perl-5.24.1_rc4.ebuild b/dev-lang/perl/perl-5.24.1_rc4.ebuild index 47bd73ddc2a..e560ac1a57b 100644 --- a/dev-lang/perl/perl-5.24.1_rc4.ebuild +++ b/dev-lang/perl/perl-5.24.1_rc4.ebuild @@ -215,7 +215,6 @@ src_prepare_update_patchlevel_h() { # it under the same terms as Perl itself. local patchdir="${WORKDIR}/patches" local prefix - local patchoutput="patchlevel-gentoo.h" [[ -f ${patchdir}/series ]] || return 0 @@ -253,8 +252,9 @@ do # label: prepend to the hold space :prepend x; H; d; ' -done < "${WORKDIR}"/patches/series > "${S}/${patchoutput}" -echo "${patchoutput}" >> "${S}/MANIFEST" +done < "${WORKDIR}"/patches/series > "${S}/patchlevel-gentoo.h" + + eapply "${FILESDIR}/perl-patchlevel-manifest.patch" } src_prepare() { -- cgit v1.2.1