| 1 |
commit: 1ddfb9cc7eb204864bcf113b74ca4c5c9780c84a |
| 2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Dec 29 16:53:20 2016 +0000 |
| 4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Dec 29 16:53:44 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ddfb9cc |
| 7 |
|
| 8 |
dev-lang/perl: Restore MANIFEST sort order, bug 589302 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 11 |
|
| 12 |
dev-lang/perl/files/perl-patchlevel-manifest.patch | 10 ++++++++++ |
| 13 |
dev-lang/perl/perl-5.24.1_rc4.ebuild | 6 +++--- |
| 14 |
2 files changed, 13 insertions(+), 3 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-lang/perl/files/perl-patchlevel-manifest.patch b/dev-lang/perl/files/perl-patchlevel-manifest.patch |
| 17 |
new file mode 100644 |
| 18 |
index 00000000..3592ae0 |
| 19 |
--- /dev/null |
| 20 |
+++ b/dev-lang/perl/files/perl-patchlevel-manifest.patch |
| 21 |
@@ -0,0 +1,10 @@ |
| 22 |
+--- a/MANIFEST |
| 23 |
++++ b/MANIFEST |
| 24 |
+@@ -4678,6 +4678,7 @@ |
| 25 |
+ pad.h Scratchpad headers |
| 26 |
+ parser.h parser object header |
| 27 |
++patchlevel-gentoo.h Gentoo's Perl patch level |
| 28 |
+ patchlevel.h The current patch level of perl |
| 29 |
+ perlapi.c Perl API functions |
| 30 |
+ perlapi.h Perl API function declarations |
| 31 |
+ perl.c main() |
| 32 |
|
| 33 |
diff --git a/dev-lang/perl/perl-5.24.1_rc4.ebuild b/dev-lang/perl/perl-5.24.1_rc4.ebuild |
| 34 |
index 47bd73d..e560ac1 100644 |
| 35 |
--- a/dev-lang/perl/perl-5.24.1_rc4.ebuild |
| 36 |
+++ b/dev-lang/perl/perl-5.24.1_rc4.ebuild |
| 37 |
@@ -215,7 +215,6 @@ src_prepare_update_patchlevel_h() { |
| 38 |
# it under the same terms as Perl itself. |
| 39 |
local patchdir="${WORKDIR}/patches" |
| 40 |
local prefix |
| 41 |
- local patchoutput="patchlevel-gentoo.h" |
| 42 |
|
| 43 |
[[ -f ${patchdir}/series ]] || return 0 |
| 44 |
|
| 45 |
@@ -253,8 +252,9 @@ do |
| 46 |
# label: prepend to the hold space |
| 47 |
:prepend x; H; d; |
| 48 |
' |
| 49 |
-done < "${WORKDIR}"/patches/series > "${S}/${patchoutput}" |
| 50 |
-echo "${patchoutput}" >> "${S}/MANIFEST" |
| 51 |
+done < "${WORKDIR}"/patches/series > "${S}/patchlevel-gentoo.h" |
| 52 |
+ |
| 53 |
+ eapply "${FILESDIR}/perl-patchlevel-manifest.patch" |
| 54 |
} |
| 55 |
|
| 56 |
src_prepare() { |
Archives