summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2012-03-05 06:54:29 +0000
committerMike Frysinger <vapier@gentoo.org>2012-03-05 06:54:29 +0000
commit505b5b53f13ba12a9c6af5c204501802b6051149 (patch)
treea86ea34aba0be1812f69e3f739e4e34c8bfbba41 /media-libs/gd
parentBump (diff)
downloadhistorical-505b5b53f13ba12a9c6af5c204501802b6051149.tar.gz
historical-505b5b53f13ba12a9c6af5c204501802b6051149.tar.bz2
historical-505b5b53f13ba12a9c6af5c204501802b6051149.zip
Restore sed -r flag after refactor in previous commit lost it #406933 by Drake Donahue.
Package-Manager: portage-2.2.0_alpha86/cvs/Linux x86_64
Diffstat (limited to 'media-libs/gd')
-rw-r--r--media-libs/gd/ChangeLog6
-rw-r--r--media-libs/gd/Manifest30
-rw-r--r--media-libs/gd/gd-2.0.35-r3.ebuild4
3 files changed, 22 insertions, 18 deletions
diff --git a/media-libs/gd/ChangeLog b/media-libs/gd/ChangeLog
index a8b8a34216dd..692e236b1e4f 100644
--- a/media-libs/gd/ChangeLog
+++ b/media-libs/gd/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/gd
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/ChangeLog,v 1.81 2012/03/02 06:59:29 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/ChangeLog,v 1.82 2012/03/05 06:54:29 vapier Exp $
+
+ 05 Mar 2012; Mike Frysinger <vapier@gentoo.org> gd-2.0.35-r3.ebuild:
+ Restore sed -r flag after refactor in previous commit lost it #406933 by
+ Drake Donahue.
02 Mar 2012; Ulrich Müller <ulm@gentoo.org> gd-2.0.35-r3.ebuild:
Fix LICENSE, "||" would mean dual licensing which is not the case here.
diff --git a/media-libs/gd/Manifest b/media-libs/gd/Manifest
index 47ed54204bf4..77b3774e3c83 100644
--- a/media-libs/gd/Manifest
+++ b/media-libs/gd/Manifest
@@ -6,23 +6,23 @@ AUX gd-2.0.35-libpng-pkg-config.patch 4240 RMD160 46c596c53cf4c1892c85dad591e349
AUX gd-2.0.35-libpng14.patch 347 RMD160 2d845e72cfe88a0b32d61efc8377b0d5aa438709 SHA1 cba6b3a13c9d35bbe3446dcf7130250e1b3958fa SHA256 b9f5e121ae652e211c866e1982bc6c37303d43b2a3df420be7069ca5fbb04bc4
AUX gd-2.0.35-maxcolors.patch 348 RMD160 14ef5425229c5406c90beb4a8fade801cd1013bb SHA1 1da2b14b84f2f44aeac04d16cd5fd07e6272966e SHA256 c5dbbc7c1acd9e602fea8bf893333ca6258e7801761b6c899c7da62cd88cbc3b
DIST gd-2.0.35.tar.bz2 1212730 RMD160 f452a2c333b2ba9b7b4c143983ec2af18a335516 SHA1 ccf34a610abff2dbf133a20c4d2a4aa94939018a SHA256 bf222490749d2a9a9ac3593b01eb55aed98461ff81202414707f61b42aa300f9
-EBUILD gd-2.0.35-r3.ebuild 1988 RMD160 e256a43688cc8c037687fbcd2f22dcdf7afb2736 SHA1 9fbbdcc777df51dec02b5b84e3225d164175d364 SHA256 3f6d8f07eaec8d44ddb377214734e8d0b5728de919f4100554bdbcd3859ac5ad
-MISC ChangeLog 16235 RMD160 da4ae10abdf89114e454a0e8f39067507dc6cc66 SHA1 679d9e3ea0ab631fa2768f052424a64e9875853d SHA256 2c59b062b2f4dc43566a1562b0b8a81b34b503bb5cf1cc207824605d14bbf23d
+EBUILD gd-2.0.35-r3.ebuild 1994 RMD160 a246ae9c7e18e51374a1bf9ae1f4a6e0a47450e4 SHA1 29a1d7802a1da52f4cf163526d07cee3f1134906 SHA256 a922cfa9fc58808e9aad2cfa5508020e33e1d04a2cc7495e66b49b9840ee92dc
+MISC ChangeLog 16402 RMD160 c431d08bf8dbff92602651c1f1fe28a43e1486ac SHA1 ba1c70f3171821927851a1d7d045905ab31ad096 SHA256 aa0da85b6c1b9a2e30423209822de4ba2f295e3e53076f7fb195bc01b3dee1af
MISC metadata.xml 1199 RMD160 d34c8a08b02ececd35c66c0c3594f326639ef8a5 SHA1 e52d9e8500558488eee80333fe2e112a23a519a5 SHA256 a670f3b0950512e392f25f290fc70b953c941cecdc6919cb38048bef2d46c843
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iQIcBAEBAgAGBQJPUHBNAAoJEDxpGckxwJCBhccP/0dJYcMKKrp2dl+oIoo6IlPr
-gyjQ/FS0l1VebonEOf1QN9LVaPVwGB7pPhyT5J2wdDxY85vHbkoJ9lDBhPEFndom
-IxEpnAagEGzaoyl6ax3HPD+OdQXTpE+V+cWC5NFweSz4x72o7VnW7M1yAw3gI+HI
-9cpGIeJKohUdi9S3ZtHby1wYuVidiPbsW/DWawnVks23etU1DVJRh78v3+TloooO
-kL9js0DnGWxOn39tCGAQhEix+UDtykvlXt6xHT6PrLQkIWEMGODOBXEJ393CgLik
-t2FVi+3bzyoP9QF1NbeJWmJA3JkLIjNJGxlXSxar74v2B+So/Ys8QhrwUT9t/vQr
-2cM0/S1nr6/YIzt3Iqhkj7FjgVjmonf9KXmgX0+9xkPbSEc5sPLfPs2CO+mRiMuy
-5x2jktr0XPSq3Sgp6DywsObLzMpmQtoXKf+QIPleRnj5SmkMidMVM9BXuHYOItpk
-+7nGtBnyXHK5LOxaJoCqIX/AGwUWPZuXwjHx/R1syyA1RiaVeNAj4NxBoE99mRJ8
-fnAv+shxHnaOY9unhGirbNvRSg9AjwHEUIiFhZfqccd9SX5fJ7894fvcDlBXbmSo
-pTlST7d9EeP3PmFgUFTlqAvhYH7qYeiPPpBSoSwwl/XPSWF4LcX/HZMnDkTTtI/z
-+RrC0ExzhpSPC8oKzgto
-=r0sh
+iQIcBAEBAgAGBQJPVGMvAAoJELEHsLL7fEFWn/UP/2E8CLAYUvK6R7DsngtbIkGi
+o8Jh3ZhoQQtwoW3Ngk8mjqhthJxnfkEa/bki3AwQQ8CuN4cPAHEOBCEoN9IdN+IX
+RKLX8c07fjCPwEbPjMKVf0suVql74NCbG9Z0IZXYDSsp+iUghPx6DQIjlC2ogVif
+oQRtU1DFjfSsb2aR2IOHbL1+l+tLPEDLVDy8qff1XeVVCjifsPvQ15eTjBdLChI4
++NOSeymvnLUKyzKZ22blyL+ffxWM8mZ0V9TeMkoqhWOs1JYz1ZT3t5nt0YLQDc9z
+Fb0/tudsjYKzhG7qnLNJWpWHq6nhM444brLegA18YuY+p355ztUJs8CWc/euk7UP
+63fFnWm6U2BohZi/veZz09nLfDaqsQqomNwgAqMc40hfwhYKuqpb9FoGpJWrC59J
+V6stOmb6YM3/oi6rJWkBT4y0wj2btZMd7dcVZHnwbXhV437UM/9aATOJJ5lLrjZS
+bb1ma5CojcAGLbDN+D+USaU/S+E29T+plCKDewM5aVhW/I7Wz/TGWA26j+Mu9Psf
+4gtWXcGN6t7VlbUavVIHOssxtH0Lc/8BENdFmHBVrCJ8vTZ27pdigBo7YHxSHhxW
+qu/QrLvsbfYVGA0741J0Rpbd30kY2AzsjYUW0T2JiK3XCGvIQQk9ItUbu9mx0rfq
+5mzbNCmlik24mjyC4VG1
+=Ttb2
-----END PGP SIGNATURE-----
diff --git a/media-libs/gd/gd-2.0.35-r3.ebuild b/media-libs/gd/gd-2.0.35-r3.ebuild
index 6b34d74b6bc0..849ef6b5d308 100644
--- a/media-libs/gd/gd-2.0.35-r3.ebuild
+++ b/media-libs/gd/gd-2.0.35-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/gd-2.0.35-r3.ebuild,v 1.14 2012/03/02 06:59:29 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/gd-2.0.35-r3.ebuild,v 1.15 2012/03/05 06:54:29 vapier Exp $
EAPI="2"
@@ -34,7 +34,7 @@ src_prepare() {
local make_sed=( -e '/^noinst_PROGRAMS/s:noinst:check:' )
use png || make_sed+=( -e '/_PROGRAMS/s:(gdparttopng|gdtopng|gd2topng|pngtogd|pngtogd2|webpng)::g' )
use zlib || make_sed+=( -e '/_PROGRAMS/s:(gd2topng|gd2copypal|gd2togif|giftogd2|gdparttopng|pngtogd2)::g' )
- sed -i "${make_sed[@]}" Makefile.am || die
+ sed -i -r "${make_sed[@]}" Makefile.am || die
eautoreconf
}