diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2017-01-05 10:40:54 +0100 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2017-01-05 10:42:53 +0100 |
| commit | 1d7266e35487144b7a48370571072c74c09c6347 (patch) | |
| tree | 286b28c18dedc7a32da1f7c210c22421c2073567 /dev-lang | |
| parent | x11-wm/windowmaker: bug of scim[gtk3] is resolved. (diff) | |
| download | gentoo-1d7266e35487144b7a48370571072c74c09c6347.tar.gz gentoo-1d7266e35487144b7a48370571072c74c09c6347.tar.bz2 gentoo-1d7266e35487144b7a48370571072c74c09c6347.zip | |
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.
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/perl/files/perl-patchlevel-manifest.patch | 10 | ||||
| -rw-r--r-- | dev-lang/perl/perl-5.24.1_rc4.ebuild | 6 |
2 files changed, 3 insertions, 13 deletions
diff --git a/dev-lang/perl/files/perl-patchlevel-manifest.patch b/dev-lang/perl/files/perl-patchlevel-manifest.patch deleted file mode 100644 index 3592ae0ee1ba..000000000000 --- 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 e560ac1a57b1..47bd73ddc2a5 100644 --- 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() { |