Add patch to fix bug #149723. I'll take care of unmasking freetype 2.2, so add restri...

Package-Manager: portage-2.1.2-r9

diff --git a/media-libs/freetype/ChangeLog b/media-libs/freetype/ChangeLog
index d8fbe49a652cebdc8b24dc00fe9b0244a82c3d9e..e1db10af821dd307ce3ec2ecf60a56661a2ad3fa 100644 (file)
--- a/media-libs/freetype/ChangeLog
+++ b/media-libs/freetype/ChangeLog
@@ -1,6 +1,14 @@
 # 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.93 2007/01/05 08:06:37 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.94 2007/02/08 14:04:34 flameeyes Exp $
+
+*freetype-2.2.1-r1 (08 Feb 2007)
+
+  08 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  +files/freetype-2.2.1-foobillard.patch, metadata.xml,
+  -freetype-2.2.1.ebuild, +freetype-2.2.1-r1.ebuild:
+  Add patch to fix bug #149723. I'll take care of unmasking freetype 2.2, so
+  add restricted maintainership in metadata.
 
   05 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
   freetype-2.1.9-r1.ebuild, freetype-2.1.10.ebuild,

diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index f3c9fa3ecc5f0c8541fcf8dc412c3f225c52a9ff..3d363c6fb6ec4985783657ac607ca80d9906f7e3 100644 (file)
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -33,6 +33,10 @@ AUX freetype-2.1.9-fix_bci.patch 643 RMD160 cf09457bc1f385b04f5013ed568886f854c3
 MD5 6c404648e3cb8f86b329f7dac5d70cc8 files/freetype-2.1.9-fix_bci.patch 643
 RMD160 cf09457bc1f385b04f5013ed568886f854c33847 files/freetype-2.1.9-fix_bci.patch 643
 SHA256 401d6db5446f80d086a6dbc89c8e7578d1e84a4fec8a691513f4a47447616b73 files/freetype-2.1.9-fix_bci.patch 643
+AUX freetype-2.2.1-foobillard.patch 951 RMD160 d077f6a3ce5645183e8656169347d698a18f184f SHA1 2967cea0b796a3f987fa0e4807170286f98d9f40 SHA256 9ba8c5ede47f5a2eb7a9cad5f245325035da1df13eaca8bc24fa6da51b3370f4
+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
 DIST freetype-1.3.1.tar.gz 1427072 RMD160 43993a667b536b4f85d32318dec32eb3f3b66454 SHA1 a398fb4d6dd756826e459058d8075759086f8ca4 SHA256 a27271fc5b2d91ee8931972dfb9683cd3971272cfe04d03caf5d13b1db5287c4
 DIST freetype-2.1.10-security_batch-r1.patch.bz2 10300 RMD160 3994ed6bd5fc3c1e09467267a00ae0166f180fc5 SHA1 3d9a74e6c2ccd18711610e39d339e8796108e2a5 SHA256 d1d31feb556c21a51a08451b14eccb697cf18979e2d24d4412ec47fa1597b296
 DIST freetype-2.1.10.tar.bz2 1037107 RMD160 3d31d548632f14784283c97ece64c7425efc3975 SHA1 f9e5c52e466c3e41483d5d6d44b4f3135a9c4b16 SHA256 fed2ed148d7d105b95493c5e95561c8b05ee7909e00f828f036d8ed1be6a5e53
@@ -41,7 +45,7 @@ DIST freetype-2.2.1.tar.bz2 1212258 RMD160 1c7eb4a43501c8fd5e89d0399e184847351ee
 DIST freetype-doc-2.1.10.tar.bz2 163725 RMD160 fef03cfdf83c8980a8b16fe7a2b9bb139f6f62a9 SHA1 27dc706f167ba21b9892e7d36b60d5a2764f905a SHA256 2bfdca5fd7bb44fe80c41b12998dc044418038e69c828b0e2c31d79d72d1117c
 DIST freetype-doc-2.2.1.tar.bz2 100288 RMD160 d32bb6da85e63f797eaa40ff0c0f93356bcab23d SHA1 10134cb7c6763880bab68081f6478760d1971ba6 SHA256 7b0bd93d765ee2b92e0602ec89ba5363ab23add9f947f8ab4fc67cb45c83f4c2
 DIST freetype1-contrib.tar.gz 538248 RMD160 ba2912ed6afb5ddd5fe930ba16d2ef23f87ec092 SHA1 d6198fe70ef16dbe2365d7971bf8a8975dd5b734 SHA256 95f0af3d6c93b061b389f502411ba639623f85b3e8d6bba6bc474ca7372d5812
-DIST ftdocs-2.1.9.tar.bz2 219666
+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
 RMD160 a4b68a9763f0603dc4c3d869ef2a8364126ca9d2 freetype-1.3.1-r4.ebuild 3094
@@ -66,18 +70,18 @@ EBUILD freetype-2.1.9-r1.ebuild 2135 RMD160 f84be5afdadf4b0a6f53bfd52b14adb1f57c
 MD5 f2eebfac062f3ecc881902a28d941cf2 freetype-2.1.9-r1.ebuild 2135
 RMD160 f84be5afdadf4b0a6f53bfd52b14adb1f57cd1fc freetype-2.1.9-r1.ebuild 2135
 SHA256 c5f8580f778ed6350c0b1d1cbf6fe5afdf1b7ae767d5b91be2c6f50f460719ff freetype-2.1.9-r1.ebuild 2135
-EBUILD freetype-2.2.1.ebuild 1649 RMD160 a01060c5618d11f81ca1beeb9b6e1e203295a4e1 SHA1 72785e8d60f409812917cf1629a52d0b6a036102 SHA256 3910571c6c1b326b10652ce988db53f0dc0316d38a4541be912e8122454efb91
-MD5 688f604a4b013026b502819da857dbd0 freetype-2.2.1.ebuild 1649
-RMD160 a01060c5618d11f81ca1beeb9b6e1e203295a4e1 freetype-2.2.1.ebuild 1649
-SHA256 3910571c6c1b326b10652ce988db53f0dc0316d38a4541be912e8122454efb91 freetype-2.2.1.ebuild 1649
-MISC ChangeLog 13592 RMD160 7bd51303a3d748345afa2b5399220ff9a511c372 SHA1 6343973896d75e7697118c7dd4bbf4c57944c715 SHA256 f92bfcbc13bdb5f5f8ca6ad60724d1ecc647b4815ee603c0a415e38007666e4f
-MD5 9a9244082a70e49f871c73b3c0ef0b49 ChangeLog 13592
-RMD160 7bd51303a3d748345afa2b5399220ff9a511c372 ChangeLog 13592
-SHA256 f92bfcbc13bdb5f5f8ca6ad60724d1ecc647b4815ee603c0a415e38007666e4f ChangeLog 13592
-MISC metadata.xml 219 RMD160 71993cfc42c14ad1e5fa0f67864200489345b70f SHA1 700713fad4b00f68790cba19d660fa6f61223211 SHA256 4629bfc7523bb3880601e0fb403dca87c95fe12efd589135b9df8b5f21a02d23
-MD5 900688457f98bf6b49bd2ef06e64e7be metadata.xml 219
-RMD160 71993cfc42c14ad1e5fa0f67864200489345b70f metadata.xml 219
-SHA256 4629bfc7523bb3880601e0fb403dca87c95fe12efd589135b9df8b5f21a02d23 metadata.xml 219
+EBUILD freetype-2.2.1-r1.ebuild 1725 RMD160 bbb843256ac81e0f11b3c9187ebba44970964903 SHA1 f2a29b25f62fd2389976df1f84fc3d0ea45531ce SHA256 1d2fa895ceb469f599a6096b3819b3880a50db8ed9368a7ea6df3c276a45f289
+MD5 5f04813789f82fad08567d6ae0473d1f freetype-2.2.1-r1.ebuild 1725
+RMD160 bbb843256ac81e0f11b3c9187ebba44970964903 freetype-2.2.1-r1.ebuild 1725
+SHA256 1d2fa895ceb469f599a6096b3819b3880a50db8ed9368a7ea6df3c276a45f289 freetype-2.2.1-r1.ebuild 1725
+MISC ChangeLog 13911 RMD160 5035b8114b16934452003fbef858c83861fec665 SHA1 a9da0d6c6e0b955b877061980b095a65a0043473 SHA256 1458064d70d46377faab50d0d50be92a8e9bffafea3ba559db80d39805742995
+MD5 03087c1ba6419e50da8db1a1bbb2264c ChangeLog 13911
+RMD160 5035b8114b16934452003fbef858c83861fec665 ChangeLog 13911
+SHA256 1458064d70d46377faab50d0d50be92a8e9bffafea3ba559db80d39805742995 ChangeLog 13911
+MISC metadata.xml 430 RMD160 fd4493b55b7373e6e7d76ad81e532335b326c249 SHA1 8a8498ffe7c5cac2994a94ac2372892331a07f7e SHA256 3e903a4e9693fcc3affd735969b90c9e199697f02009ca43882a3d3a75607341
+MD5 23a07d4f778d5c58a736240cfd21c722 metadata.xml 430
+RMD160 fd4493b55b7373e6e7d76ad81e532335b326c249 metadata.xml 430
+SHA256 3e903a4e9693fcc3affd735969b90c9e199697f02009ca43882a3d3a75607341 metadata.xml 430
 MD5 10918fc5aac4314bd2e5c68ba12bddb2 files/digest-freetype-1.3.1-r4 500
 RMD160 6aea5fc9334cbb19738b9e764dca8b58f0030197 files/digest-freetype-1.3.1-r4 500
 SHA256 a246ee2bcd4f324ce902f48e815880d7352c85388cffa2ed2afa255410ccc796 files/digest-freetype-1.3.1-r4 500
@@ -93,16 +97,16 @@ SHA256 f1f2333b7e69d3f6dc43053862bdae95e1684129d208f8dca3dc33a083c55516 files/di
 MD5 c7f077933d57907377995b1fecf98549 files/digest-freetype-2.1.10-r2 822
 RMD160 9f4891075f0ca9c564a932acdf563d7fb6f215ab files/digest-freetype-2.1.10-r2 822
 SHA256 e99172c4c57de9df61db320bba4778ff1c5e89b166b56350aac3470b7c4504c0 files/digest-freetype-2.1.10-r2 822
-MD5 f24ddda899653208ae64242f39322190 files/digest-freetype-2.1.9-r1 312
-RMD160 609390cefd649385f5ea57895acf14d735403caa files/digest-freetype-2.1.9-r1 312
-SHA256 5276661ea48c44bde9de06cb88a6e67f769284f1df33a996e909a7919c0c13e6 files/digest-freetype-2.1.9-r1 312
-MD5 3c2b5154784100c0dbb9658fbc8f9ac1 files/digest-freetype-2.2.1 509
-RMD160 9d29c4f7965c74206243a67698edf2b42f543fae files/digest-freetype-2.2.1 509
-SHA256 ba210855afe97ebccdc658a1d2ab68c385ce05567abbfc0963a31ce53dd6f475 files/digest-freetype-2.2.1 509
+MD5 b240cade20edb6f33fe3c6a8c599a7e7 files/digest-freetype-2.1.9-r1 488
+RMD160 db309224ff7b6d1e1898eeb39416d8836c21f2b2 files/digest-freetype-2.1.9-r1 488
+SHA256 d3da26b45e4594494cd665551dabded16009799a41656ee29cf86288f866b708 files/digest-freetype-2.1.9-r1 488
+MD5 3c2b5154784100c0dbb9658fbc8f9ac1 files/digest-freetype-2.2.1-r1 509
+RMD160 9d29c4f7965c74206243a67698edf2b42f543fae files/digest-freetype-2.2.1-r1 509
+SHA256 ba210855afe97ebccdc658a1d2ab68c385ce05567abbfc0963a31ce53dd6f475 files/digest-freetype-2.2.1-r1 509
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
+Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFFngcVAiZjviIA2XgRAgk6AKDfkFjLQioYTNsbWRf4lD/xs566pQCcCv7o
-QmCCloTEB86hXCyJZP7+t4E=
-=Nqq3
+iD8DBQFFyy36AiZjviIA2XgRAgFiAJ9HAH+mr6Ndri1jJXjc1ONg2xH3pQCgwYD5
+rSxz4lI6ipe1+XlKfj/C4lE=
+=Z1yO
 -----END PGP SIGNATURE-----

diff --git a/media-libs/freetype/files/digest-freetype-2.1.9-r1 b/media-libs/freetype/files/digest-freetype-2.1.9-r1
index 067c6b2cee237151dc4f6c5331b01726e1ebbeea..d86d8a553e455fce8baa2d3b9de2ab3428405659 100644 (file)
--- a/media-libs/freetype/files/digest-freetype-2.1.9-r1
+++ b/media-libs/freetype/files/digest-freetype-2.1.9-r1
@@ -2,3 +2,5 @@ MD5 ec1b903e4be5f073caa72458ea58c29c freetype-2.1.9.tar.bz2 992394
 RMD160 1dd8fb6fda8b159ef0d2ebedeca99a67ed65dc72 freetype-2.1.9.tar.bz2 992394
 SHA256 4dabc3b38405f5c5f03b8f14d8902a9d506713182baf2baec9dea509515d4b6f freetype-2.1.9.tar.bz2 992394
 MD5 db77177afe35955f55bcaa2953724b78 ftdocs-2.1.9.tar.bz2 219666
+RMD160 68dd21bb3d7a9ef3808f5a1887736b32b9e9a371 ftdocs-2.1.9.tar.bz2 219666
+SHA256 69d0e4ad07f60da9739a0c09d35a89ab020df4bedb12a6c3817c0ffb77e6dd9f ftdocs-2.1.9.tar.bz2 219666

diff --git a/media-libs/freetype/files/digest-freetype-2.2.1 b/media-libs/freetype/files/digest-freetype-2.2.1-r1
similarity index 100%
rename from media-libs/freetype/files/digest-freetype-2.2.1
rename to media-libs/freetype/files/digest-freetype-2.2.1-r1

diff --git a/media-libs/freetype/files/freetype-2.2.1-foobillard.patch b/media-libs/freetype/files/freetype-2.2.1-foobillard.patch
new file mode 100644 (file)
index 0000000..0e2751d
--- /dev/null
+++ b/media-libs/freetype/files/freetype-2.2.1-foobillard.patch
@@ -0,0 +1,29 @@
+===================================================================
+RCS file: /var/lib/cvs/sources/freetype/freetype2/src/sfnt/ttcmap.c,v
+retrieving revision 1.65
+retrieving revision 1.66
+diff -u -r1.65 -r1.66
+--- freetype/freetype2/src/sfnt/ttcmap.c       2006/08/18 17:20:37     1.65
++++ freetype/freetype2/src/sfnt/ttcmap.c       2006/09/29 18:22:11     1.66
+@@ -1094,14 +1094,19 @@
+           /* search in segments before the current segment */
+           for ( i = max ; i > 0; i-- )
+           {
+-            FT_UInt  prev_end;
++            FT_UInt   prev_end;
++            FT_Byte*  old_p;
+ 
+ 
+-            p = cmap->data + 14 + ( i - 1 ) * 2;
++            old_p    = p;
++            p        = cmap->data + 14 + ( i - 1 ) * 2;
+             prev_end = TT_PEEK_USHORT( p );
+ 
+             if ( charcode > prev_end )
++            {
++              p = old_p;
+               break;
++            }
+ 
+             end    = prev_end;
+             p     += 2 + num_segs2;

diff --git a/media-libs/freetype/freetype-2.2.1.ebuild b/media-libs/freetype/freetype-2.2.1-r1.ebuild
similarity index 88%
rename from media-libs/freetype/freetype-2.2.1.ebuild
rename to media-libs/freetype/freetype-2.2.1-r1.ebuild
index e48ce9d65abc94bf1d0ecb755781b99f88be9e72..dce8522e0218b68f66d3c7f5b18781583ce3051d 100644 (file)
--- a/media-libs/freetype/freetype-2.2.1.ebuild
+++ b/media-libs/freetype/freetype-2.2.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# 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.2.1.ebuild,v 1.4 2006/10/01 13:43:20 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.2.1-r1.ebuild,v 1.1 2007/02/08 14:04:34 flameeyes Exp $
 
-inherit eutils flag-o-matic
+inherit eutils flag-o-matic libtool
 
 DESCRIPTION="A high-quality and portable font engine"
 HOMEPAGE="http://www.freetype.org/"
@@ -29,16 +29,19 @@ RDEPEND="${DEPEND}
 src_unpack() {
 
        unpack ${A}
+       cd "${S}"
 
        # disable BCI when distributing binaries (patent issues)
        use bindist || epatch "${FILESDIR}"/${PN}-2-enable_bci.patch
 
+       epatch "${FILESDIR}/${P}-foobillard.patch"
+
+       elibtoolize
        epunt_cxx
 
 }
 
 src_compile() {
-
        # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=118021
        append-flags "-fno-strict-aliasing"
 
@@ -46,11 +49,9 @@ src_compile() {
        econf $(use_with zlib) || die
 
        emake || die
-
 }
 
 src_install() {
-
        make DESTDIR="${D}" install || die
 
        dodoc ChangeLog README
@@ -58,5 +59,4 @@ src_install() {
 
        cd "${WORKDIR}"/${PN}-doc-${PV}
        use doc && dohtml -r docs/*
-
 }

diff --git a/media-libs/freetype/metadata.xml b/media-libs/freetype/metadata.xml
index 3b6bbdbe1a1751a1fdd2f329ccd4034c1843796b..a1ae09358171b987be536bd9f64eb26a463fc74c 100644 (file)
--- a/media-libs/freetype/metadata.xml
+++ b/media-libs/freetype/metadata.xml
@@ -5,4 +5,10 @@
 <maintainer>
   <email>foser@gentoo.org</email>
 </maintainer>
+<maintainer restrict="=media-libs/freetype-2.2*">
+  <email>flameeyes@gentoo.org</email>
+  <description>
+    Assign to me bugs that come from versions 2.2, as I unmasked it myself.
+  </description>
+</maintainer>
 </pkgmetadata>