aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStuart Shelton <stuart@shelton.me>2016-03-01 09:13:03 +0000
committerStuart Shelton <stuart@shelton.me>2016-03-01 09:13:03 +0000
commit3508648d51fd75be051bfb8c989b6c864b29afe8 (patch)
treea844b59c25f36298b1ddc7817bbfa34431078adb /app-arch
parentUpdate net-misc/dhcpcd-6.10.1 (diff)
downloadsrcshelton-3508648d51fd75be051bfb8c989b6c864b29afe8.tar.gz
srcshelton-3508648d51fd75be051bfb8c989b6c864b29afe8.tar.bz2
srcshelton-3508648d51fd75be051bfb8c989b6c864b29afe8.zip
Update app-arch/unzip-6.0-r3
Diffstat (limited to 'app-arch')
-rw-r--r--app-arch/unzip/Manifest2
-rw-r--r--app-arch/unzip/unzip-6.0-r3.ebuild16
2 files changed, 8 insertions, 10 deletions
diff --git a/app-arch/unzip/Manifest b/app-arch/unzip/Manifest
index cb07e077..1d6c418f 100644
--- a/app-arch/unzip/Manifest
+++ b/app-arch/unzip/Manifest
@@ -2,4 +2,4 @@ AUX unzip-6.0-irix.patch 1146 SHA256 3c2bbd342a1c3a83db14c430443d4bf8bd9f69c8883
AUX unzip-6.0-natspec.patch 14746 SHA256 67ab260ae6adf8e7c5eda2d1d7846929b43562943ec4aff629bd7018954058b1 SHA512 5942f734325ed08656e45697893a005b416737f4bab4ba820a6a78513f58c08192d1d3ead599b8c13199f896cb20ab08449f63997fdd8e77a64c80ae727b3284 WHIRLPOOL 4e22fd9694148f6efa2361d08baa2e7554e5b75a87b6769889d8ecb744c729eb20c413a7915205ff52f073d2706691f311c6bb685fb21d8b9a42f7686ba32f59
AUX unzip-6.0-no-exec-stack.patch 381 SHA256 ae62249dcf8bbc3c30468b07944df6c8777b565927d9ed6d1fdf7395899ea7c7 SHA512 a00ba3c805aa64bebeb3194cd75093c1e7c951366d40bba4852837dcb355eedf1ca6a6e648ea007fcb71124e778e54b5168a7b38a7b7268bc3983d87594633a5 WHIRLPOOL e838b3835e9cdcbbe5f47bb1ab92b2ce0fffff1ce77e69ee460a9ff9d5ed4a3c16311d65b0a16f14a3b4e22b2c09db1f3d88b35fa978d40e67ad5307e5a29a39
DIST unzip60.tar.gz 1376845 SHA256 036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37 SHA512 0694e403ebc57b37218e00ec1a406cae5cc9c5b52b6798e0d4590840b6cdbf9ddc0d9471f67af783e960f8fa2e620394d51384257dca23d06bcd90224a80ce5d WHIRLPOOL eab32d6d0ab100d302b608658a3ae290d3dad4beddccebaf6cb6527102bb238f751ec6482dea68ae62474005de89f11f9e0cf1b1e12bee2ca5a2336a3c0c9808
-EBUILD unzip-6.0-r3.ebuild 3290 SHA256 d47134a8b547fadf83c0fc384f794615832d97ad46ecee3ab76f56635ab13bca SHA512 9be144d6a9cec55db161a4c698ec7c19659a85c3796790b2a415de741cf6fdd2c38861653204cb213db5b7ab551098fddc54876c9d22dd0596ec2f8eb433163f WHIRLPOOL c2a2cb01b1258428955ffe38bf427ddc21a71ccde1afb31d8bc0f9bba03cf3a1c8ca2b28ee3fdeef49470246894f471bae978a140e755cb4d8f5d406b837b418
+EBUILD unzip-6.0-r3.ebuild 3271 SHA256 45647cec1bee9363f3c08f2f04de8ad01214f5da80193162dc54bfa14365d5fa SHA512 71a36b2a87ecb56b1950910897bfd0936573c4c4654fb4fd2fea38348ae0fc48b8c4004afdb8354b2120e72ae366bb9a76c709969ad3afce44d18f476b060d09 WHIRLPOOL 4eca96113030c1f75d5a1b966057f81bfe399379faf25f135e5937b01dc87be6e96214858c0cdee335c08e8691c30088fca1b2cfe728f63623dd5787949485ca
diff --git a/app-arch/unzip/unzip-6.0-r3.ebuild b/app-arch/unzip/unzip-6.0-r3.ebuild
index 9cba8096..f3fc4e18 100644
--- a/app-arch/unzip/unzip-6.0-r3.ebuild
+++ b/app-arch/unzip/unzip-6.0-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id: 210563bcb5a19886e8575b70c4ec500bbfffcdac $
+# $Id: a1ea7610becc2fc350a991a8188244b1c2a4299f $
# $Header: /var/cvsroot/gentoo-x86/app-arch/unzip/unzip-6.0-r3.ebuild,v 1.10 2014/01/18 05:01:26 vapier Exp $
EAPI="2"
@@ -28,15 +28,13 @@ src_prepare() {
epatch "${FILESDIR}"/${P}-no-exec-stack.patch
use natspec && epatch "${FILESDIR}/${PN}-6.0-natspec.patch" #275244
epatch "${FILESDIR}"/${P}-irix.patch
- sed -i \
+ sed -i -r \
-e '/^CFLAGS/d' \
- -e '/CFLAGS/s:-O[0-9]\?:$(CFLAGS) $(CPPFLAGS):' \
+ -e '/CFLAGS/s:-O[0-9]?:$(CFLAGS) $(CPPFLAGS):' \
-e '/^STRIP/s:=.*:=true:' \
- -e "s:\<CC = cc\>:CC = $(tc-getCC):" \
- -e "s:\<AS = as\>:AS = $(tc-getCC):" \
- -e "s:\<CC=gcc\>:CC=$(tc-getCC):" \
- -e "s:\<LD=gcc\>:LD=$(tc-getCC):" \
- -e "s:\<AS=gcc\>:AS=$(tc-getCC):" \
+ -e "s:\<CC *= *\"?g?cc2?\"?\>:CC=\"$(tc-getCC)\":" \
+ -e "s:\<LD *= *\"?(g?cc2?|ld)\"?\>:LD=\"$(tc-getCC)\":" \
+ -e "s:\<AS *= *\"?(g?cc2?|as)\"?\>:AS=\"$(tc-getCC)\":" \
-e 's:LF2 = -s:LF2 = :' \
-e 's:LF = :LF = $(LDFLAGS) :' \
-e 's:SL = :SL = $(LDFLAGS) :' \