From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 433A1139085 for ; Thu, 29 Dec 2016 17:01:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7CDD021C028; Thu, 29 Dec 2016 16:53:58 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 58FD821C028 for ; Thu, 29 Dec 2016 16:53:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 437FD34167D for ; Thu, 29 Dec 2016 16:53:57 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 10E4B24E0 for ; Thu, 29 Dec 2016 16:53:56 +0000 (UTC) From: "Andreas Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Hüttel" Message-ID: <1483030424.1ddfb9cc7eb204864bcf113b74ca4c5c9780c84a.dilfridge@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/perl/files/, dev-lang/perl/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/perl/files/perl-patchlevel-manifest.patch dev-lang/perl/perl-5.24.1_rc4.ebuild X-VCS-Directories: dev-lang/perl/ dev-lang/perl/files/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas Hüttel X-VCS-Revision: 1ddfb9cc7eb204864bcf113b74ca4c5c9780c84a X-VCS-Branch: master Date: Thu, 29 Dec 2016 16:53:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 7a8b18dc-0e79-4025-aab8-f518561ad3af X-Archives-Hash: eaf065b9c4c9a068e5a925b6da7c6fdd commit: 1ddfb9cc7eb204864bcf113b74ca4c5c9780c84a Author: Andreas K. Hüttel gentoo org> AuthorDate: Thu Dec 29 16:53:20 2016 +0000 Commit: Andreas Hüttel gentoo org> CommitDate: Thu Dec 29 16:53:44 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ddfb9cc 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(-) 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 00000000..3592ae0 --- /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 47bd73d..e560ac1 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() {