summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2014-09-02 11:13:10 +0000
committerPacho Ramos <pacho@gentoo.org>2014-09-02 11:13:10 +0000
commitb83747ade5608b58ec3ef8ca5bcac7fc138846a2 (patch)
treed7304884f43c55862b63ec430e1e63afc9e5779d
parentUse the correct slots for the jruby mask and add missing virtual/rubygems. (diff)
downloadhistorical-b83747ade5608b58ec3ef8ca5bcac7fc138846a2.tar.gz
historical-b83747ade5608b58ec3ef8ca5bcac7fc138846a2.tar.bz2
historical-b83747ade5608b58ec3ef8ca5bcac7fc138846a2.zip
Fix build with freetype-2.5
Package-Manager: portage-2.2.12/cvs/Linux x86_64 Manifest-Sign-Key: 0xA188FBD4
-rw-r--r--app-editors/ted/ChangeLog7
-rw-r--r--app-editors/ted/Manifest16
-rw-r--r--app-editors/ted/ted-2.23.ebuild7
3 files changed, 16 insertions, 14 deletions
diff --git a/app-editors/ted/ChangeLog b/app-editors/ted/ChangeLog
index e9c6889b8450..6ac3c1b2efba 100644
--- a/app-editors/ted/ChangeLog
+++ b/app-editors/ted/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-editors/ted
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/ted/ChangeLog,v 1.63 2013/07/03 07:46:23 kensington Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/ted/ChangeLog,v 1.64 2014/09/02 11:13:08 pacho Exp $
+
+ 02 Sep 2014; Pacho Ramos <pacho@gentoo.org> ted-2.23.ebuild:
+ Fix build with freetype-2.5
03 Jul 2013; Michael Palimaka <kensington@gentoo.org>
-files/ted-2.21-make.patch, -ted-2.22.ebuild:
diff --git a/app-editors/ted/Manifest b/app-editors/ted/Manifest
index c35f5531f148..ed7556a0b295 100644
--- a/app-editors/ted/Manifest
+++ b/app-editors/ted/Manifest
@@ -3,17 +3,13 @@ Hash: SHA256
AUX ted-2.23-make.patch 418 SHA256 737765240afffc6eda88f6299c7f6a5de797d5204d744c27e0e030c05e4eeadb SHA512 a1dc77b4788a71445cb30db010d1413e11c06861c692137747d2d02d1cd16b07fb3dd05e702fd37aad600432a985c86d785465a2fe6ddbe6f506b16cafb80b01 WHIRLPOOL ce9eb527df8e36c9fcf0e2d186c93d59a2c11eeb3a80c88312df3e1646f16d1a46f2a06957a6a60d551d7f9fc9bedcb9e43a155f0d862f25234569f48d2f854a
DIST ted-2.23.src.tar.gz 4672208 SHA256 3fa992c2bc96af3ca788ef941cb5314f4a1d843202efd0201b8b4ee9adbf316c SHA512 c6541e5a07545a08b30cb9b33429d9a7675f9252df32ccca5cdb4f2ff09978085d28d015a42922baf8c95db1ea6379a9d1088541aafd9ce45b8870212496849f WHIRLPOOL 14f757dbc3cee1adae3abcc63ce32d9ebec4de5d5764060826321469a6d2c18339d239e9c0b084aaeb9979595d42411d1f86efb6280e85b7f4e8ea91db7775cd
-EBUILD ted-2.23.ebuild 1421 SHA256 069838f2dbc04ae32da6e870ea6fdef61829af9e1e9054d81a3d2214fff2c2fb SHA512 3126f659c0955686ebeeabb8e28a575a907348bc2420b1f3844f093ad33ff7e42d79d27eb6bc4e638683a33552c5805a9f575347168413b24e8c5d7824eac399 WHIRLPOOL b220b6ef66af2b3ae5702d475ad602a1db0b0000b4613191704eafa3608ab071873d285c6d5639795b454f09750d5e8ecf93e24e7244a21221e51ddfbf5ceb0b
-MISC ChangeLog 7562 SHA256 5e6c031e700b39da28ab5225c734b00a6cceb9dd1e58ac396ae8f7ddd2b576e1 SHA512 97a6a3b3b7ed1f56baa62febb66d1a03433b0e9e7a3ca85807e96e0d352645fd85d42b5a48e1a55031417b31c437b5663e2bf690abd305ffc0eda76367141704 WHIRLPOOL 977380da25f5e521b4caeb505801d9aec90df920a9d0c0a9800a22f782c27532368747ab259955a8c775c3bf59bebc1621fdc6f98c0e19638faa5a3da3b156a3
+EBUILD ted-2.23.ebuild 1539 SHA256 1668fecad34f8acd44f07436a0906658ac397d6a49e2ea56ecace7bf66105dbf SHA512 ae977570a3b460e72b1c20b3d8034d684de75b68aa88face2c90ab0910f5d1112e307ebb260b9d7861e5281a94ba6b1cc8fdf0be6a95c47b73b49b569001527a WHIRLPOOL 35b60310b246e3c123e15453974b622ec6b53a8220f36d8b38dd80c850a5355683159e4f024805316a3337a2dee4a811db9565a68ad8d21b14768c15f122d714
+MISC ChangeLog 7651 SHA256 a99600ef1c027af927d2ddfafa0a8dddbbe6aeb7e56b728352bf2eafa3800f17 SHA512 e13b844d1a3038c00f3f8ec542c255e543ecbf6b8c877605b42511e6718331249de714efb50b622de1a291484fc8e90a7fd9037849e0a19f90ab84ca03f502d1 WHIRLPOOL 199516aaf1829651610fac8fd19b5789ec0b9cceb934d8e1d40c1e15b7301414eb358f104ccc7309a663524c44bdfb24fd73a9a2a45c41a0e5d052b7d22778ce
MISC metadata.xml 214 SHA256 0e019c1dee563e5b23815be471ae1b65fcaf721a91ec48037446d41ca787d3e5 SHA512 701b8c51f43f8660d40700929c243a2dae9f19dcbc7b8eca877e20eadc1ae2e0c84f7c7d8c3cb576055c1a49a55e9c759ef469eeda67026ce252d341937f6691 WHIRLPOOL 977119e736e0795137df14faae681f7fa07ba8297a19ef4a7d7b93de7efceaed16f7103f179a762be41b8849c33c535b55d16d2fd0ea795df0525592752e0156
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2
-iQEcBAEBCAAGBQJR09ZnAAoJEMbwO6tnXQ0sYYIH/AmnGXdUnvPV5rznPwfd/OR1
-mIfcBEy5HfYOSyMGD9WBBzqFfxtOB61UlllKtXb3ptEt6Sc6sCR0meGE/MREpjYm
-8bYSq80mHzZW1zmWEayN36ngD19n09QNiuQaSZhlpG6qd+Ht6bSs5K5K/IY3Zp+J
-PxxU2diPL+fpsCclmPae9Gj+yb+113RkKBkUz/1M9WaiUzN4IRXA3bqxqKREr+Vr
-xLpb/mv0nD6mpDMCmdoHO8B/3MHh+JYdyvL+WhLUhKKglIiFKn0ihG2RiTshF/ur
-KwgKfTC0P+/XWoqk0pFl/vXGaiOVXH6o4fqLg4eS6sTrBQMyz0EZAN3wolM0XmE=
-=Hmbv
+iEYEAREIAAYFAlQFpkUACgkQCaWpQKGI+9T75QCdF5XVuXQ2N4PVf35xrKsXAMRM
++S0AnAhLK7A6m0gcVq0k9BCR4BIomfxU
+=34vX
-----END PGP SIGNATURE-----
diff --git a/app-editors/ted/ted-2.23.ebuild b/app-editors/ted/ted-2.23.ebuild
index 20a3ea8b92f0..b63ea0e1f60b 100644
--- a/app-editors/ted/ted-2.23.ebuild
+++ b/app-editors/ted/ted-2.23.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/ted/ted-2.23.ebuild,v 1.5 2013/06/29 16:25:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/ted/ted-2.23.ebuild,v 1.6 2014/09/02 11:13:08 pacho Exp $
EAPI=5
inherit eutils toolchain-funcs
@@ -40,6 +40,9 @@ src_prepare() {
-e '/strip/d' \
tedPackage/makefile.in || die 'sed failed on tedPackage/makefile.in'
+ # Fix build with freetype-2.5
+ sed -i "s|^\(#[ \t]*include[ \t]*<\)freetype/|\1|" appFrame/appFontConfig.c || die
+
mkdir lib || die
}