Revert "dev-lang/perl: Restore MANIFEST sort order, bug 589302"

This commit / patch is not needed since we already have a fix for the bug.
See https://github.com/gentoo-perl/perl-patchset/commit/23179a630d04c3d40e7c09bccbf2f38f3ad72b93

This reverts commit 1ddfb9cc7eb204864bcf113b74ca4c5c9780c84a.

diff --git a/dev-lang/perl/files/perl-patchlevel-manifest.patch b/dev-lang/perl/files/perl-patchlevel-manifest.patch
deleted file mode 100644 (file)
index 3592ae0..0000000
--- a/dev-lang/perl/files/perl-patchlevel-manifest.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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 e560ac1a57b179cc6d58d52af4e4193d73f84e6f..47bd73ddc2a502a0edf34513c989b0418b023e37 100644 (file)
--- a/dev-lang/perl/perl-5.24.1_rc4.ebuild
+++ b/dev-lang/perl/perl-5.24.1_rc4.ebuild
@@ -215,6 +215,7 @@ 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
 
@@ -252,9 +253,8 @@ do
        # label: prepend to the hold space
        :prepend x; H; d;
        '
-done < "${WORKDIR}"/patches/series > "${S}/patchlevel-gentoo.h"
-
-       eapply "${FILESDIR}/perl-patchlevel-manifest.patch"
+done < "${WORKDIR}"/patches/series > "${S}/${patchoutput}"
+echo "${patchoutput}" >> "${S}/MANIFEST"
 }
 
 src_prepare() {