From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 3DCA813829C for ; Fri, 3 Jun 2016 23:50:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9434621C012; Fri, 3 Jun 2016 23:50:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 1AF1721C012 for ; Fri, 3 Jun 2016 23:50:48 +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 9194E340CEF for ; Fri, 3 Jun 2016 23:50:46 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E6FC2971 for ; Fri, 3 Jun 2016 23:50:43 +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: <1464997838.24682fa7ca762c19de50999d2f93f9969c5b2e5a.dilfridge@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/perl/, dev-lang/perl/files/eblits/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/perl/files/eblits/src_prepare-v50240002.eblit dev-lang/perl/perl-5.24.0-r1.ebuild X-VCS-Directories: dev-lang/perl/ dev-lang/perl/files/eblits/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas Hüttel X-VCS-Revision: 24682fa7ca762c19de50999d2f93f9969c5b2e5a X-VCS-Branch: master Date: Fri, 3 Jun 2016 23:50:43 +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: 9f8e3f29-73ab-4ec0-82aa-b6ed0c6d3af0 X-Archives-Hash: 4b733562fe139f78ef9216d96239add3 commit: 24682fa7ca762c19de50999d2f93f9969c5b2e5a Author: Gwendal Grignou chromium org> AuthorDate: Fri Jun 3 23:42:08 2016 +0000 Commit: Andreas Hüttel gentoo org> CommitDate: Fri Jun 3 23:50:38 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24682fa7 dev-lang/perl: Add patchlevel-gentoo to perl MANIFEST To allow miniperl compilation, patchlevel-gentoo.h must be in the MANIFEST. Configure uses this file to create the /host symlinks. Signed-off-by: Gwendal Grignou chromium.org> Comment from Gentoo perl team: Being nice here and adding this commit which ended up without any further reasons or docs in our mailbox. I can't see how it could hurt. I can't really see any problem that it's supposed to fix either. Hey chromium team, more words please next time! .../perl/files/eblits/src_prepare-v50240002.eblit | 74 ++++++++++++++++++++++ dev-lang/perl/perl-5.24.0-r1.ebuild | 2 +- 2 files changed, 75 insertions(+), 1 deletion(-) diff --git a/dev-lang/perl/files/eblits/src_prepare-v50240002.eblit b/dev-lang/perl/files/eblits/src_prepare-v50240002.eblit new file mode 100644 index 0000000..b30b1a5 --- /dev/null +++ b/dev-lang/perl/files/eblits/src_prepare-v50240002.eblit @@ -0,0 +1,74 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +src_prepare_update_patchlevel_h() { + # Copied and modified from debian: + # Copyright 2011 Niko Tyni + # This program is free software; you can redistribute it and/or modify + # it under the same terms as Perl itself. + local patchdir="${WORKDIR}/patches" + local prefix + local patchoutput="patchlevel-gentoo.h" + + [[ -f ${patchdir}/series ]] || return 0 + +while read patch +do + patchname=$(echo $patch | sed 's/\.diff$//') + < $patchdir/$patch sed -e '/^Subject:/ { N; s/\n / / }' | sed -n -e ' + + # massage the patch headers + s|^Bug: .*https\?://rt\.perl\.org/.*id=\(.*\).*|[perl #\1]|; tprepend; + s|^Bug: .*https\?://rt\.cpan\.org/.*id=\(.*\).*|[rt.cpan.org #\1]|; tprepend; + s|^Bug-Gentoo: ||; tprepend; + s/^\(Subject\|Description\): //; tappend; + s|^Origin: .*http://perl5\.git\.perl\.org/perl\.git/commit\(diff\)\?/\(.......\).*|[\2]|; tprepend; + + # post-process at the end of input + $ { x; + # include the version number in the patchlevel.h description (if available) + s/List packaged patches/&'" for ${PF}(#${PATCH_VER})"'/; + + # escape any backslashes and double quotes + s|\\|\\\\|g; s|"|\\"|g; + + # add a prefix + s|^|\t,"'"$prefix$patchname"' - |; + # newlines away + s/\n/ /g; s/ */ /g; + # add a suffix + s/ *$/"/; p + }; + # stop all processing + d; + # label: append to the hold space + :append H; d; + # label: prepend to the hold space + :prepend x; H; d; + ' +done < "${WORKDIR}"/patches/series > "${S}/${patchoutput}" +echo "${patchoutput}" >> "${S}/MANIFEST" +} + +eblit-perl-src_prepare() { + local patch + EPATCH_OPTS+=" -p1" + einfo "Applying patches from ${MY_P}-${PATCH_VER} ..." + while read patch ; do + EPATCH_SINGLE_MSG=" ${patch} ..." + epatch "${WORKDIR}"/patches/${patch} + done < "${WORKDIR}"/patches/series + + src_prepare_update_patchlevel_h + + # pod/perltoc.pod fails + # lib/ExtUtils/t/Embed.t fails + if ! tc-is-static-only ; then + ln -s ${LIBPERL} libperl$(get_libname ${SHORT_PV}) || die + ln -s ${LIBPERL} libperl$(get_libname ) || die + fi + + default +} + diff --git a/dev-lang/perl/perl-5.24.0-r1.ebuild b/dev-lang/perl/perl-5.24.0-r1.ebuild index 1f34989..d63e0dc 100644 --- a/dev-lang/perl/perl-5.24.0-r1.ebuild +++ b/dev-lang/perl/perl-5.24.0-r1.ebuild @@ -102,7 +102,7 @@ eblit-run() { eblit-run-maybe eblit-$1-post } -src_prepare() { eblit-run src_prepare v50240001 ; } +src_prepare() { eblit-run src_prepare v50240002 ; } src_configure() { eblit-run src_configure v50240002 ; }