From c2ba40f349b4cfd66ae8020bd029fc247c1a1980 Mon Sep 17 00:00:00 2001 From: Ryan Hill Date: Sat, 31 Mar 2007 17:31:37 +0000 Subject: [PATCH] Revision bump: - we now install the ft2demos suite of font-related utilities (ftview, ftvalid, ftgrid, etc.) - added debug support - build the gxvalid and oxvalid modules for use with ftvalid Removed old versions. Package-Manager: portage-2.1.2.3 --- media-libs/freetype/ChangeLog | 15 +++- media-libs/freetype/Manifest | 34 ++++---- .../freetype/files/digest-freetype-2.3.2-r1 | 6 -- ...reetype-2.3.2 => digest-freetype-2.3.2-r2} | 3 + .../files/freetype-2.3.2-enable-valid.patch | 22 +++++ ...3.2-r1.ebuild => freetype-2.3.2-r2.ebuild} | 29 +++++-- media-libs/freetype/freetype-2.3.2.ebuild | 82 ------------------- 7 files changed, 78 insertions(+), 113 deletions(-) delete mode 100644 media-libs/freetype/files/digest-freetype-2.3.2-r1 rename media-libs/freetype/files/{digest-freetype-2.3.2 => digest-freetype-2.3.2-r2} (67%) create mode 100644 media-libs/freetype/files/freetype-2.3.2-enable-valid.patch rename media-libs/freetype/{freetype-2.3.2-r1.ebuild => freetype-2.3.2-r2.ebuild} (74%) delete mode 100644 media-libs/freetype/freetype-2.3.2.ebuild diff --git a/media-libs/freetype/ChangeLog b/media-libs/freetype/ChangeLog index 8711316f93fd..7c6ba9ebdbcb 100644 --- a/media-libs/freetype/ChangeLog +++ b/media-libs/freetype/ChangeLog @@ -1,6 +1,19 @@ # ChangeLog for media-libs/freetype # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.109 2007/03/26 21:34:05 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.110 2007/03/31 17:31:37 dirtyepic Exp $ + +*freetype-2.3.2-r2 (31 Mar 2007) + + 31 Mar 2007; Ryan Hill + +files/freetype-2.3.2-enable-valid.patch, -freetype-2.3.2.ebuild, + -freetype-2.3.2-r1.ebuild, +freetype-2.3.2-r2.ebuild: + Revision bump: + - we now install the ft2demos suite of font-related utilities (ftview, + ftvalid, ftgrid, etc.) + - added debug support + - build the gxvalid and oxvalid modules for use with ftvalid + + Removed old versions. 26 Mar 2007; Raúl Porcel freetype-1.3.1-r5.ebuild: ia64 stable wrt bug 166265 diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest index 5925131ac104..98fceddb7f74 100644 --- a/media-libs/freetype/Manifest +++ b/media-libs/freetype/Manifest @@ -30,6 +30,10 @@ AUX freetype-2.2.1-foobillard.patch 951 RMD160 d077f6a3ce5645183e8656169347d698a MD5 7c46e7d6f0159a84608bf4bd85fe6bb8 files/freetype-2.2.1-foobillard.patch 951 RMD160 d077f6a3ce5645183e8656169347d698a18f184f files/freetype-2.2.1-foobillard.patch 951 SHA256 9ba8c5ede47f5a2eb7a9cad5f245325035da1df13eaca8bc24fa6da51b3370f4 files/freetype-2.2.1-foobillard.patch 951 +AUX freetype-2.3.2-enable-valid.patch 624 RMD160 88bc4de26daa91a09dda2ca1308319c0cf7dff4d SHA1 212c5c9e3362b3a058803bb5031358b5b92a1d29 SHA256 3c26cd8b92510490b4bdbdd12b078e33a4f8607eaee64a800c3ea23097d5d43b +MD5 90217c5567fba0617d2bec4003aeadd9 files/freetype-2.3.2-enable-valid.patch 624 +RMD160 88bc4de26daa91a09dda2ca1308319c0cf7dff4d files/freetype-2.3.2-enable-valid.patch 624 +SHA256 3c26cd8b92510490b4bdbdd12b078e33a4f8607eaee64a800c3ea23097d5d43b files/freetype-2.3.2-enable-valid.patch 624 AUX freetype-2.3.2-truetype-regression.patch 4892 RMD160 f1120ff608dc19eeb3b5f887fdda182b8903a3ce SHA1 8095fe264ce5ac3bc4951bdf41d8f166bae9eab5 SHA256 b0a688533a5b7cc205b179565d28aed9d11ff9f83dda8556e13a6ab82ef258be MD5 fac7a7cbe58f59fe4ab2f575d2695b85 files/freetype-2.3.2-truetype-regression.patch 4892 RMD160 f1120ff608dc19eeb3b5f887fdda182b8903a3ce files/freetype-2.3.2-truetype-regression.patch 4892 @@ -46,6 +50,7 @@ DIST freetype-doc-2.2.1.tar.bz2 100288 RMD160 d32bb6da85e63f797eaa40ff0c0f93356b DIST freetype-doc-2.3.1.tar.bz2 98643 RMD160 07d65ab6635cfd827b94511e968eb9d19129839e SHA1 8a1b6565f63f4749dda88d4559dbeada55349f24 SHA256 99becb0256bce96de14e4f57065c5d0c0db72f851eced8bd58c05a3a7551c593 DIST freetype-doc-2.3.2.tar.bz2 98679 RMD160 ecd619ded06bf5bf144c18c8d981aec88bab6370 SHA1 74fe7c3b2d9b3a5e4a890d3d6bf35701f8e9494d SHA256 c30052d7d860b45edde95075525dd1c9d477d2b7ab5d99b5c601ac0a44b7d75c DIST freetype1-contrib.tar.gz 538248 RMD160 ba2912ed6afb5ddd5fe930ba16d2ef23f87ec092 SHA1 d6198fe70ef16dbe2365d7971bf8a8975dd5b734 SHA256 95f0af3d6c93b061b389f502411ba639623f85b3e8d6bba6bc474ca7372d5812 +DIST ft2demos-2.3.2.tar.gz 191685 RMD160 30bb4c24eefe714dc9fa628076c554604a973d1d SHA1 a373eac47b288f5747e42a9f7765813fa501f520 SHA256 60ae6647436459703344cd64e006ed4334a4f904b2cf828042216c64d093fcb0 DIST ftdocs-2.1.9.tar.bz2 219666 RMD160 68dd21bb3d7a9ef3808f5a1887736b32b9e9a371 SHA1 aba56e909f1e76715a8971ce8457516420bac9a4 SHA256 69d0e4ad07f60da9739a0c09d35a89ab020df4bedb12a6c3817c0ffb77e6dd9f EBUILD freetype-1.3.1-r4.ebuild 3094 RMD160 a4b68a9763f0603dc4c3d869ef2a8364126ca9d2 SHA1 6dcdae3b7a317c4267202d4cb630496f951b5a74 SHA256 6a01c432a23f9c787f2b300dc336d7b2f6251b7178c7ec9d8f91b86001968a75 MD5 11bad807109dac4e9208fdab1a127b14 freetype-1.3.1-r4.ebuild 3094 @@ -71,18 +76,14 @@ EBUILD freetype-2.3.1.ebuild 2294 RMD160 aec6206dccba8032cf3a9deb8860185564d034a MD5 16522a0064c8bc8419a6b03d07ada7d5 freetype-2.3.1.ebuild 2294 RMD160 aec6206dccba8032cf3a9deb8860185564d034a1 freetype-2.3.1.ebuild 2294 SHA256 b81b5a7c9c4a17b21e3b0de58e1b662103efb841e583a930e2b2db35e2260a39 freetype-2.3.1.ebuild 2294 -EBUILD freetype-2.3.2-r1.ebuild 2382 RMD160 2af4edd7589441737764f4cdbae2c70e96eccf9d SHA1 f5709a614d23a481ee62544117994b0fb38f0ef5 SHA256 870fbff6bd8393e3a77253c3a83a1713a8cdaff12dae08fb116135af33b64d41 -MD5 6e39378120978577eaf031669a6f68ca freetype-2.3.2-r1.ebuild 2382 -RMD160 2af4edd7589441737764f4cdbae2c70e96eccf9d freetype-2.3.2-r1.ebuild 2382 -SHA256 870fbff6bd8393e3a77253c3a83a1713a8cdaff12dae08fb116135af33b64d41 freetype-2.3.2-r1.ebuild 2382 -EBUILD freetype-2.3.2.ebuild 2294 RMD160 d57c91afe9d95aebbf80b1777d89523f55a6ed81 SHA1 8f2ddbbe098475edee68b5a3e20332b44743b79d SHA256 5888543a530ab1f90a0a1ee21ce4b1a3c94adcdc47621c4bc8af5aacdf925345 -MD5 e15f98270ae95e1d6b9d630da5892349 freetype-2.3.2.ebuild 2294 -RMD160 d57c91afe9d95aebbf80b1777d89523f55a6ed81 freetype-2.3.2.ebuild 2294 -SHA256 5888543a530ab1f90a0a1ee21ce4b1a3c94adcdc47621c4bc8af5aacdf925345 freetype-2.3.2.ebuild 2294 -MISC ChangeLog 16074 RMD160 0c446fb14d1edafc4333a929fd231fdc5677d39e SHA1 1eb256b135d28b585c90c0f7b9c2c89ce4b54896 SHA256 2df90a2adcc60ed8992e4f379e07d8d7906890b39e588b0c521a4c9d1297cbc1 -MD5 28237700d974c4fa1f86efebd6eef74b ChangeLog 16074 -RMD160 0c446fb14d1edafc4333a929fd231fdc5677d39e ChangeLog 16074 -SHA256 2df90a2adcc60ed8992e4f379e07d8d7906890b39e588b0c521a4c9d1297cbc1 ChangeLog 16074 +EBUILD freetype-2.3.2-r2.ebuild 2988 RMD160 51c5a8f3824644a09336966f37b95041c0c9ba84 SHA1 64acd7f53c561fb73aa4534606c8193050e1c27b SHA256 bf61943dc9a696c1f5170f9005e32f2638a0c833798392621a7c236279cf12d1 +MD5 463b59c8beab6ee9977a4289979e0d40 freetype-2.3.2-r2.ebuild 2988 +RMD160 51c5a8f3824644a09336966f37b95041c0c9ba84 freetype-2.3.2-r2.ebuild 2988 +SHA256 bf61943dc9a696c1f5170f9005e32f2638a0c833798392621a7c236279cf12d1 freetype-2.3.2-r2.ebuild 2988 +MISC ChangeLog 16522 RMD160 b2f168da39cc0a6c0693692f05eb2e43cdda80de SHA1 dcc6da7a737635ce4077c83f4e13ae0e7c4279a6 SHA256 633d1d46adc55254718c2e2462f21bf9d61f2d21ea4f98508717aabd0184e95a +MD5 5fc5956cabb6c6a71aa56942fea8abe4 ChangeLog 16522 +RMD160 b2f168da39cc0a6c0693692f05eb2e43cdda80de ChangeLog 16522 +SHA256 633d1d46adc55254718c2e2462f21bf9d61f2d21ea4f98508717aabd0184e95a ChangeLog 16522 MISC metadata.xml 449 RMD160 1aa0a350b9b93a527af79a3d6aa6233d498d6366 SHA1 7491212724f2bb6e5068b47ebf4047f1f2c57056 SHA256 4a2b47a4958439e0e153d37652d2165891f490c3cbf356424636edb0b91114a7 MD5 bc35457473f59e79ce028b34001d3e95 metadata.xml 449 RMD160 1aa0a350b9b93a527af79a3d6aa6233d498d6366 metadata.xml 449 @@ -105,9 +106,6 @@ SHA256 ba210855afe97ebccdc658a1d2ab68c385ce05567abbfc0963a31ce53dd6f475 files/di MD5 af3f72b302725edb1c0156ecf04c688e files/digest-freetype-2.3.1 506 RMD160 2c75e888d5bbb3486999ba5ed6cfe96df9e7f6b6 files/digest-freetype-2.3.1 506 SHA256 938933517d160671e27f2ffd282286a85b9cc9b84f243f7ae0715a06e03f6d23 files/digest-freetype-2.3.1 506 -MD5 acaa568c2c8efed8764cdbbaa7c62c0c files/digest-freetype-2.3.2 506 -RMD160 264289318167f326e2c89e5080d865646e3c4139 files/digest-freetype-2.3.2 506 -SHA256 c4706259a8f0e032c3428e0a02e3321dcf9420a437146c49d68d3306f18c347d files/digest-freetype-2.3.2 506 -MD5 acaa568c2c8efed8764cdbbaa7c62c0c files/digest-freetype-2.3.2-r1 506 -RMD160 264289318167f326e2c89e5080d865646e3c4139 files/digest-freetype-2.3.2-r1 506 -SHA256 c4706259a8f0e032c3428e0a02e3321dcf9420a437146c49d68d3306f18c347d files/digest-freetype-2.3.2-r1 506 +MD5 6d4951ef7998ea18536cfd09fffbd2aa files/digest-freetype-2.3.2-r2 750 +RMD160 15b67e79494d5c89e3a136464058f37fa6e47760 files/digest-freetype-2.3.2-r2 750 +SHA256 29e57481d8db1799cf0cf400fdcdf224adb40caef4d7a114115d907d974d407f files/digest-freetype-2.3.2-r2 750 diff --git a/media-libs/freetype/files/digest-freetype-2.3.2-r1 b/media-libs/freetype/files/digest-freetype-2.3.2-r1 deleted file mode 100644 index 526b40efbcfe..000000000000 --- a/media-libs/freetype/files/digest-freetype-2.3.2-r1 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 119e1fe126fcfa5a70bc56db55f573d5 freetype-2.3.2.tar.bz2 1252007 -RMD160 e4da77b6f8956d69e57269c5681560beda0ddb27 freetype-2.3.2.tar.bz2 1252007 -SHA256 ba97537c711ea1970ccd97f957cabd63474de9c05aff0fc5ae931f8c90a47e7e freetype-2.3.2.tar.bz2 1252007 -MD5 d732b9b5971d019fab9c695dfa496247 freetype-doc-2.3.2.tar.bz2 98679 -RMD160 ecd619ded06bf5bf144c18c8d981aec88bab6370 freetype-doc-2.3.2.tar.bz2 98679 -SHA256 c30052d7d860b45edde95075525dd1c9d477d2b7ab5d99b5c601ac0a44b7d75c freetype-doc-2.3.2.tar.bz2 98679 diff --git a/media-libs/freetype/files/digest-freetype-2.3.2 b/media-libs/freetype/files/digest-freetype-2.3.2-r2 similarity index 67% rename from media-libs/freetype/files/digest-freetype-2.3.2 rename to media-libs/freetype/files/digest-freetype-2.3.2-r2 index 526b40efbcfe..5d8420427568 100644 --- a/media-libs/freetype/files/digest-freetype-2.3.2 +++ b/media-libs/freetype/files/digest-freetype-2.3.2-r2 @@ -4,3 +4,6 @@ SHA256 ba97537c711ea1970ccd97f957cabd63474de9c05aff0fc5ae931f8c90a47e7e freetype MD5 d732b9b5971d019fab9c695dfa496247 freetype-doc-2.3.2.tar.bz2 98679 RMD160 ecd619ded06bf5bf144c18c8d981aec88bab6370 freetype-doc-2.3.2.tar.bz2 98679 SHA256 c30052d7d860b45edde95075525dd1c9d477d2b7ab5d99b5c601ac0a44b7d75c freetype-doc-2.3.2.tar.bz2 98679 +MD5 4843d92d3e92d45fc985f944a9a96671 ft2demos-2.3.2.tar.gz 191685 +RMD160 30bb4c24eefe714dc9fa628076c554604a973d1d ft2demos-2.3.2.tar.gz 191685 +SHA256 60ae6647436459703344cd64e006ed4334a4f904b2cf828042216c64d093fcb0 ft2demos-2.3.2.tar.gz 191685 diff --git a/media-libs/freetype/files/freetype-2.3.2-enable-valid.patch b/media-libs/freetype/files/freetype-2.3.2-enable-valid.patch new file mode 100644 index 000000000000..44f3bf6e1c94 --- /dev/null +++ b/media-libs/freetype/files/freetype-2.3.2-enable-valid.patch @@ -0,0 +1,22 @@ +Enables gxvalid and otvalid modules for use with ftvalid. + +--- freetype-2.2.1/modules.cfg.orig 2006-07-07 21:01:09.000000000 -0400 ++++ freetype-2.2.1/modules.cfg 2006-07-07 21:01:54.000000000 -0400 +@@ -110,7 +110,7 @@ + AUX_MODULES += cache + + # TrueType GX/AAT table validation. Needs ftgxval.c below. +-# AUX_MODULES += gxvalid ++AUX_MODULES += gxvalid + + # Support for streams compressed with gzip (files with suffix .gz). + # +@@ -124,7 +124,7 @@ + + # OpenType table validation. Needs ftotval.c below. + # +-# AUX_MODULES += otvalid ++AUX_MODULES += otvalid + + # Auxiliary PostScript driver component to share common code. + # diff --git a/media-libs/freetype/freetype-2.3.2-r1.ebuild b/media-libs/freetype/freetype-2.3.2-r2.ebuild similarity index 74% rename from media-libs/freetype/freetype-2.3.2-r1.ebuild rename to media-libs/freetype/freetype-2.3.2-r2.ebuild index c7d956aadb43..6450599b4a64 100644 --- a/media-libs/freetype/freetype-2.3.2-r1.ebuild +++ b/media-libs/freetype/freetype-2.3.2-r2.ebuild @@ -1,18 +1,19 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.3.2-r1.ebuild,v 1.1 2007/03/25 15:10:04 dirtyepic Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.3.2-r2.ebuild,v 1.1 2007/03/31 17:31:37 dirtyepic Exp $ inherit eutils flag-o-matic libtool DESCRIPTION="A high-quality and portable font engine" HOMEPAGE="http://www.freetype.org/" SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.bz2 + mirror://sourceforge/freetype/ft2demos-${PV}.tar.gz doc? ( mirror://sourceforge/${PN}/${PN}-doc-${PV}.tar.bz2 )" LICENSE="FTL GPL-2" SLOT="2" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="zlib bindist doc" +IUSE="bindist debug doc zlib" # The RDEPEND below makes sure that if there is a version of moz/ff/tb # installed, then it will have the freetype-2.1.8+ binary compatibility patch. @@ -27,7 +28,6 @@ RDEPEND="${DEPEND} ! /dev/null && export GNUMAKE=gmake - econf $(use_with zlib) || die + econf $(use_with zlib) || die "econf failed" + emake || die "emake failed" - emake || die + cd ../ft2demos-${PV} + emake || die "ft2demos emake failed" } src_install() { - emake -j1 DESTDIR="${D}" install || die + emake DESTDIR="${D}" install || die "emake install failed" dodoc ChangeLog README dodoc docs/{CHANGES,CUSTOMIZE,DEBUG,*.txt,PATENTS,TODO} #cd "${WORKDIR}"/${PN}-doc-${PV} use doc && dohtml -r docs/* + + rm ../ft2demos-${PV}/bin/README + for ft2demo in ../ft2demos-${PV}/bin/*; do + ./builds/unix/libtool --mode=install $(type -P install) -m 755 $ft2demo \ + ${D}/usr/bin + done } diff --git a/media-libs/freetype/freetype-2.3.2.ebuild b/media-libs/freetype/freetype-2.3.2.ebuild deleted file mode 100644 index 6f0de91661ab..000000000000 --- a/media-libs/freetype/freetype-2.3.2.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.3.2.ebuild,v 1.1 2007/03/09 23:46:42 beandog Exp $ - -inherit eutils flag-o-matic libtool - -DESCRIPTION="A high-quality and portable font engine" -HOMEPAGE="http://www.freetype.org/" -SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.bz2 - doc? ( mirror://sourceforge/${PN}/${PN}-doc-${PV}.tar.bz2 )" - -LICENSE="FTL GPL-2" -SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="zlib bindist doc" - -# The RDEPEND below makes sure that if there is a version of moz/ff/tb -# installed, then it will have the freetype-2.1.8+ binary compatibility patch. -# Otherwise updating freetype will cause moz/ff/tb crashes. #59849 -# 20 Nov 2004 agriffis -DEPEND="zlib? ( sys-libs/zlib )" - -RDEPEND="${DEPEND} - ! /dev/null && export GNUMAKE=gmake - econf $(use_with zlib) || die - - emake || die -} - -src_install() { - emake -j1 DESTDIR="${D}" install || die - - dodoc ChangeLog README - dodoc docs/{CHANGES,CUSTOMIZE,DEBUG,*.txt,PATENTS,TODO} - - cd "${WORKDIR}"/${PN}-doc-${PV} - use doc && dohtml -r docs/* -} -- 2.26.2