Skip to content

Commit

Permalink
dev-lang/perl: Bump 5.28.9999 to 5.28.0-RC2
Browse files Browse the repository at this point in the history 
- copy forward changes from Perl 5.26.* for prefix

Note: currently fails tests for PathTools under sandbox due to
bug #645084

Bug: https://bugs.gentoo.org/645084
Package-Manager: Portage-2.3.40, Repoman-2.3.9
  • Loading branch information
@kentfredric
kentfredric committed Jun 17, 2018
1 parent 8678507 commit e97174b
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 14 deletions.
5 changes: 2 additions & 3 deletions dev-lang/perl/Manifest
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ DIST perl-5.26.1-patches-1.tar.xz 16764 BLAKE2B 95fb086d214bf27dedfdc96f927e11ca
DIST perl-5.26.1.tar.xz 11922848 BLAKE2B 8ba5ac50bc6bc3cea1ede7dbd9b41566bd3f62e432d9a1f5ee45837cc3051c1edc037a13d73d4c867edc7833f9dfa8a9d22216e14a19df179ba030a03d3acc07 SHA512 13faa7bcd7ed8c490c37e9032c115af06c9b8152b75f8062409dd72d263d1314480e8a9a883490de1b448b2e6d53b6a87d108e2eceb17de2524d5857c6a7d300
DIST perl-5.26.2-patches-1.tar.xz 17100 BLAKE2B 681239e438945285e006ee1d1e2a9eb888fc9b425e6fbd4822e65e1fe1ced2216de76485b9792d3fee28783a588c09e1d34c294ef43d81055c4566af37fe9b6c SHA512 2a274150d2dba406c6efb67ec236f67032a51ff1788b30ea556e74b2f02fab68f5029ebd4b9d4daeb16b3a63fa7aa1744d323bf637a9d21946f19f33b69da245
DIST perl-5.26.2.tar.xz 11931624 BLAKE2B 2d54b155ace7c70a33adbe9911ba5384281aa49a0f6d4f452f4249b4deb58804268b473457470488f7592e041221f552b09156eb55c10078002aae3715446d9a SHA512 fd54c90da250144c81b94587c01c49fa367f84c54406f1d360ddab4a41589a7b19efc1707f95c95d6357fae66fc3f6f00bf69dd7741db114c7034a14f52be65f
DIST perl-5.27.7-patches-1.tar.xz 16276 BLAKE2B 81d6d4eb2459abd80d9dbf9a0300af3dac0e45f745ea844bd2d306b7fb816159470552179253d13ae13e20fe588e84b92bfae3a0189a76009b8cbb423b444209 SHA512 ef1084e307b57545de319248b8f9df6d7eae605604da9721e41b3f0f03e4c63b825e1cfee47eb0d52dc51f65ca2712d7c87f89a3e329d4bf7a6662f1fb08ce41
DIST perl-5.27.8.tar.xz 12103968 BLAKE2B d2145ddfb3be35bc23788616bc2a9133f6875db112d307f326e31a67345dc1abb0b11992d28974682f5a7831e2366b391ef1c84de76222d2a1780ec37fc965f6 SHA512 f710e89d36cbf24cfb78e6ae3a48f7dc0262504688d94fd6fbf6826444531f4843084b6b874759537968b926fa991e46462cd5c4d5199f6ebbbfc78f661cd1e9
DIST perl-5.28.0-RC2-patches-1.tar.xz 16544 BLAKE2B 7c22c1d7edee19d85788c1e0bd090c83c9480aea689ab483dcf982bef989624e4e6b1215c735377ef152ae95a6d59e7f167bf9b3f4def070b4d836a7d993419d SHA512 83b0198f2601ce48c0e8091862c11550e7c2a6bb9fbebef78368a421ec4d8ba8c810205b0f5dee483fb461bf6df55818a95a906f3fc8bc1d9627c8d4f69bc32a
DIST perl-5.28.0-RC2.tar.xz 12412488 BLAKE2B 6ce7437398e119b10078dc2b138de9e53d80b09544eb6e950e6455f85fb10e6c6b0c075ff7219186b6ef556be919f81a6ed5f05531f835d8d2eca6589a968374 SHA512 d2b8ef4fb5e9563369e08d027b58345573d2ee0bbf0594526a9e82fab6a56206b16e317322650b42cff0299dde0b802d65b1c0b1bf4b854ffb89331bc0cf9a55
DIST perl-cross-1.1.7.tar.gz 97622 BLAKE2B c58dd51492cfbda6fc58b43d9de45c35dd5ed5768ca8db61b5ac092ad6c0067386597875d6613c75671f026387ba474ce8c28789d6d77b9dcfc4cf4bf7227126 SHA512 b64d487129b295ec6d996606b8b8559de681e1cf7c3e3167d6d646d5d7a848d7929b1ab698d1f950e265213749772fc74d209cea5020b61e133c8f8851b7cfa0
DIST perl-cross-1.1.8.tar.gz 98686 BLAKE2B e4fa78e99cb0b93025468d6035dfa352e78867003847637e3730df7f3df252cd13370b71b8c724e4dcc9c0851a8e224402ba6880a1ac666521a64b9053a7e4c2 SHA512 00de89c4b4dbef4aede397c541ef5b9c5b1c2b8fecc7ea4b8d5d133dcceb65da6e834ff28609e7865d24e563f050de25c72ce3a88a162d8c88e87524aac5217f
DIST perl-cross-1.1.9.tar.gz 102939 BLAKE2B 438ea75a14c4d60fdf3cb2f3671c736d229a83af210ba4fe6e79b989c6c4b45500d0221ec65bc71e1d43d234ec1daa20b3a19be6ceb01e638810900dbe3664a7 SHA512 002441012bd31f1ea71341707d91f89b76266c187c9d28f947ed5eddbcc6e3155e8dfd4b1814331561c3557764fea25bf6a938f08bcd4adfb5895361ad5a269a
34 changes: 23 additions & 11 deletions dev-lang/perl/perl-5.28.9999.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@ EAPI=6
inherit eutils alternatives flag-o-matic toolchain-funcs multilib multiprocessing

PATCH_VER=1
CROSS_VER=1.1.8
PATCH_BASE="perl-5.27.7-patches-${PATCH_VER}"
CROSS_VER=1.1.9
PATCH_BASE="perl-5.28.0-RC2-patches-${PATCH_VER}"

DIST_AUTHOR=ABIGAIL
DIST_AUTHOR=XSAWYERX

# Greatest first, don't include yourself
# Devel point-releases are not ABI-intercompatible, but stable point releases are
# BIN_OLDVERSEN is contains only C-ABI-intercompatible versions
PERL_BIN_OLDVERSEN=""
if [[ "${PV##*.}" == "9999" ]]; then
DIST_VERSION=5.27.8
DIST_VERSION=5.28.0-RC2
else
DIST_VERSION="${PV/_rc/-RC}"
fi
Expand Down Expand Up @@ -78,17 +78,17 @@ dual_scripts() {
src_remove_dual perl-core/Archive-Tar 2.260.0 ptar ptardiff ptargrep
src_remove_dual perl-core/CPAN 2.200.0 cpan
src_remove_dual perl-core/Digest-SHA 6.10.0 shasum
src_remove_dual perl-core/Encode 2.940.0 enc2xs piconv
src_remove_dual perl-core/ExtUtils-MakeMaker 7.300.0 instmodsh
src_remove_dual perl-core/ExtUtils-ParseXS 3.360.0 xsubpp
src_remove_dual perl-core/Encode 2.970.0 enc2xs piconv
src_remove_dual perl-core/ExtUtils-MakeMaker 7.340.0 instmodsh
src_remove_dual perl-core/ExtUtils-ParseXS 3.390.0 xsubpp
src_remove_dual perl-core/IO-Compress 2.74.0 zipdetails
src_remove_dual perl-core/JSON-PP 2.970.10 json_pp
src_remove_dual perl-core/Module-CoreList 5.201.801.200 corelist
src_remove_dual perl-core/Module-CoreList 5.201.806.60 corelist
src_remove_dual perl-core/Pod-Parser 1.630.0 pod2usage podchecker podselect
src_remove_dual perl-core/Pod-Perldoc 3.280.100 perldoc
src_remove_dual perl-core/Test-Harness 3.390.0 prove
src_remove_dual perl-core/podlators 4.100.0 pod2man pod2text
src_remove_dual_man perl-core/podlators 4.100.0 /usr/share/man/man1/perlpodstyle.1
src_remove_dual perl-core/Test-Harness 3.420.0 prove
src_remove_dual perl-core/podlators 4.100.0 pod2man pod2text
src_remove_dual_man perl-core/podlators 4.100.0 /usr/share/man/man1/perlpodstyle.1
}

check_rebuild() {
Expand Down Expand Up @@ -306,6 +306,13 @@ src_prepare_dynamic() {
src_prepare() {
local patch
EPATCH_OPTS+=" -p1"

if [[ ${CHOST} == *-solaris* ]] ; then
# do NOT mess with nsl, on Solaris this is always necessary,
# when -lsocket is used e.g. to get h_errno
sed -i '/gentoo\/no-nsl\.patch/d' "${WORKDIR}/patches/series" || die "Can't exclude libnsl patch"
fi

einfo "Applying patches from ${PATCH_BASE} ..."
while read patch ; do
EPATCH_SINGLE_MSG=" ${patch} ..."
Expand All @@ -323,6 +330,11 @@ src_prepare() {
ext/NDBM_File/Makefile.PL || die
fi

# Use errno.h from prefix rather than from host system, bug #645804
if use prefix && ! use prefix-guest; then
sed -i "/my..sysroot/s:'':'${EPREFIX}':" ext/Errno/Errno_pm.PL || die
fi

default
}

Expand Down

0 comments on commit e97174b

Please sign in to comment.