Remove old and cleanup.
authorRyan Hill <rhill@gentoo.org>
Sun, 2 Mar 2008 22:21:29 +0000 (22:21 +0000)
committerRyan Hill <rhill@gentoo.org>
Sun, 2 Mar 2008 22:21:29 +0000 (22:21 +0000)
Package-Manager: portage-2.1.4.4

media-libs/freetype/ChangeLog
media-libs/freetype/Manifest
media-libs/freetype/files/freetype-2.1.9-fix_bci.patch [deleted file]
media-libs/freetype/files/freetype-2.3.3-buffer-overwrite.patch [deleted file]
media-libs/freetype/files/freetype-2.3.3-ft2demos-Makefile.patch [deleted file]
media-libs/freetype/files/freetype-2.3.4-CVE-2007-2754.patch [deleted file]
media-libs/freetype/freetype-2.1.10-r2.ebuild [deleted file]
media-libs/freetype/freetype-2.3.3.ebuild [deleted file]
media-libs/freetype/freetype-2.3.4-r2.ebuild [deleted file]
media-libs/freetype/freetype-2.3.5-r1.ebuild [deleted file]

index 2b00d33b2ee5d6e133a5fe54ff5646fa6f74db0e..b6dfb3936f2654f509679533a95777c7bc0357c8 100644 (file)
@@ -1,6 +1,15 @@
 # ChangeLog for media-libs/freetype
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.169 2008/02/10 16:57:09 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.170 2008/03/02 22:21:28 dirtyepic Exp $
+
+  02 Mar 2008; Ryan Hill <dirtyepic@gentoo.org>
+  -files/freetype-2.1.9-fix_bci.patch,
+  -files/freetype-2.3.3-buffer-overwrite.patch,
+  -files/freetype-2.3.3-ft2demos-Makefile.patch,
+  -files/freetype-2.3.4-CVE-2007-2754.patch, -freetype-2.1.10-r2.ebuild,
+  -freetype-2.3.3.ebuild, -freetype-2.3.4-r2.ebuild,
+  -freetype-2.3.5-r1.ebuild:
+  Remove old and cleanup.
 
   10 Feb 2008; Alexis Ballier <aballier@gentoo.org>
   freetype-1.3.1-r5.ebuild:
index ad8961bfe30c92cadfa55f9e0d5b19b4c9169a3d..c9654acd3d1da23baff9f542706bb5fcfd2dbe28 100644 (file)
@@ -6,41 +6,26 @@ AUX freetype-1.3.1-malloc.patch 772 RMD160 93e57de9f466d159e3eeb80befc9ef216650a
 AUX freetype-2.1.10-fix_synth.patch 919 RMD160 85cea83ecb4d63660470519d40095ee5ae39f9e2 SHA1 eab0ee7b80ea927fe715df6ba7f9a5a7a864b1ce SHA256 416e34b095449d8981678225597eb12d0f0cc8a258c430d4061254303687443c
 AUX freetype-2.1.10-internal_header.patch 667 RMD160 c1959d97a8588e8efec6cfc5dde79ac5ff6552ef SHA1 693dd29284f8ced58a9b4610db0bd57c24836655 SHA256 da72ae11e658332a0e22bc0fd69c9d0c89d61dcbd376243b6dface7b33b8d239
 AUX freetype-2.1.10-revert_pointer.patch 544 RMD160 7295ee885d3377cf8d76df1aa85d9d8c2dba3e51 SHA1 52e3e79f75cdd3eedfff52aba4646241b8a67f46 SHA256 47805b36c85b9d63b161757c0a7fa399c2320182b423db88909056712f426838
-AUX freetype-2.1.9-fix_bci.patch 643 RMD160 cf09457bc1f385b04f5013ed568886f854c33847 SHA1 7ea4f9a5f503e1e240ae895811d3c226f500255f SHA256 401d6db5446f80d086a6dbc89c8e7578d1e84a4fec8a691513f4a47447616b73
 AUX freetype-2.3.2-bdflib.patch 1795 RMD160 52fcb8535696e3a78ee345d870fc32d26173e424 SHA1 d45f06ee89be7da300b2955a7d17543cba70369e SHA256 2f2f025419112221afd9d30bc99ebded4df998142c940723e1deb37355252cd0
 AUX freetype-2.3.2-enable-valid.patch 624 RMD160 88bc4de26daa91a09dda2ca1308319c0cf7dff4d SHA1 212c5c9e3362b3a058803bb5031358b5b92a1d29 SHA256 3c26cd8b92510490b4bdbdd12b078e33a4f8607eaee64a800c3ea23097d5d43b
-AUX freetype-2.3.3-buffer-overwrite.patch 894 RMD160 6a53886d3a2129a634bfc33622327914c4f4729c SHA1 2e684d95501222418347b8953dbabb9f17e8e402 SHA256 4b3417e5c704f25a8a087949cc6a62cf92dfd53628bd466aa5a13940a3728905
-AUX freetype-2.3.3-ft2demos-Makefile.patch 1621 RMD160 5be4422135d6649902b2e511878a57fa0ff73306 SHA1 366db2ede6d0890ffbb92729396b9c134442a88d SHA256 0f172dd4aa4da75b3ba772aab9c27161db9edcc4d4dec54980e7015f5438384a
-AUX freetype-2.3.4-CVE-2007-2754.patch 1065 RMD160 33894f4c5224a3437d6849926d8cd59947e984e0 SHA1 8e1df2fd0759262fe0a2c0d26a5870a4b23c6997 SHA256 be10b2005f1033dc9540b775cb87bbda1e5b65b04ffb1adebb17f68c753e248a
 AUX freetype-2.3.5-crossbuild.patch 2030 RMD160 46a5da036eb5fe0f4050b53ea7db563f588d846a SHA1 41079e988b03795450d2117edc49c632cd776764 SHA256 c4ea1e2ff04466187a4b1c2a1141e1fd0527fbee7eaa6e1be47756feb17e66b8
 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
-DIST freetype-2.3.3.tar.bz2 1253262 RMD160 bec85941cb22fc43ab4935a074d32dc37c24b483 SHA1 01796d4ac2875b47e81cf9b0aae710459bfca633 SHA256 6ce667f4beafed9fb15895ac5dbe81504febfd8e32cf94d85dfa31c21eee2f7b
-DIST freetype-2.3.4.tar.bz2 1277929 RMD160 23b641c0b6e6102449e6f2512a131743d8836321 SHA1 09b8f5ecbb3e06a14cc1c2f2dc7c04fe34c48eca SHA256 7157876cf358d1fb68b890c7da4f7025288a4e7b756af7b01009c5055637c954
 DIST freetype-2.3.5.tar.bz2 1279861 RMD160 2a97cb1c3d93572c094d5d2890d12445ef2786d4 SHA1 45695d44c74be31944d807526a7e69a818e4afd2 SHA256 1b357a3a1106c78c80dfd25e3854c3faa9a3dfc7063a4a1e5404e70c241d677e
 DIST freetype-doc-2.1.10.tar.bz2 163725 RMD160 fef03cfdf83c8980a8b16fe7a2b9bb139f6f62a9 SHA1 27dc706f167ba21b9892e7d36b60d5a2764f905a SHA256 2bfdca5fd7bb44fe80c41b12998dc044418038e69c828b0e2c31d79d72d1117c
-DIST freetype-doc-2.3.3.tar.bz2 98685 RMD160 1b1dd6e981271497d0155cfbc82a6ac716c1f4b2 SHA1 a3a84edf3045cff715f0bc0f6e0cc69b16900724 SHA256 c8883d1f265c57f1ec7cbc6ea0ee27619f008e409f7823d7f59473246a02e60e
-DIST freetype-doc-2.3.4.tar.bz2 98715 RMD160 73e0f29dacd7a0d093518a3795bb0de18128f81e SHA1 48e59931b0b6909420a26f6901542efc820fe435 SHA256 26639e244ad83e8f73700ee688602e965dadde0fdb7dc1d3a8b71bf8a105344b
 DIST freetype-doc-2.3.5.tar.bz2 98644 RMD160 d0a5cbe51eceb6c4a3a8eaaf4e3d99c2ca02266f SHA1 a3edb74195eee9384d0463104edde4881d73a308 SHA256 9c37aee42427feaaec7a276267f8c8ad771cb81033066bdf452c731fa41e4b0b
 DIST freetype1-contrib.tar.gz 538248 RMD160 ba2912ed6afb5ddd5fe930ba16d2ef23f87ec092 SHA1 d6198fe70ef16dbe2365d7971bf8a8975dd5b734 SHA256 95f0af3d6c93b061b389f502411ba639623f85b3e8d6bba6bc474ca7372d5812
-DIST ft2demos-2.3.3.tar.gz 196955 RMD160 a2e2c11f53fd4f929eee8966d7541974f5a1eb52 SHA1 793c3cfece5742a53ee5d120a6bdf39f97bf4a09 SHA256 ce5b54cc0e3d2738af9d8c99ebcb83d963060fa91e931d1bee079c74e29cd8b5
-DIST ft2demos-2.3.4.tar.gz 201627 RMD160 48909351943e1bb45df5916c1afecfc84e0b83cb SHA1 e23f4722a5882a1e02a4d33de904d97648f20167 SHA256 4752254b67131797993b4eecf90f3228cd04e0e9e439710a8788c79044a02125
 DIST ft2demos-2.3.5.tar.bz2 157557 RMD160 7620d829a86d4125bc08d949cee13f8c383f6d88 SHA1 c528287137b534c38d0c2b94d3e76e6f9e8ff915 SHA256 f86d0d2906a2520d70460336002d20346c5013a973f3cedd049246715cef8e9f
-DIST ft2demos-2.3.5.tar.gz 203020 RMD160 cf469582ea42ec9886e1482ffbe32a17e5aa974f SHA1 7bc7739fda853edd1d8ed85052ddc433aac8e703 SHA256 219d40fd0c9340a4519b7cc317eca8efa92d9751b7e2c6b5243b91c3e72604ce
 EBUILD freetype-1.3.1-r5.ebuild 3271 RMD160 1d83221c1d429da9d3f32c1c103cf11a21c9d35a SHA1 87c9404f6f2ef07a87dc3948d88bf3346b829259 SHA256 4a6887774ec8cfee8a27000696a7219819e23e36580c6efc840b563b72af3e98
-EBUILD freetype-2.1.10-r2.ebuild 2218 RMD160 1be25ecc279a37bfcc827d06950490518007b3f3 SHA1 05a960d270dc55e91e73df72f514fc4d3300215d SHA256 d6c05b618c9c5507ab6127abfd01c925144079646ec195b5fb51eb4a1894189b
 EBUILD freetype-2.1.10-r3.ebuild 2304 RMD160 ef35e9ca9caa02fb428c0df72e56d57770e48f3b SHA1 6d9c672fdcc174f362338dd12e5e1a60f223af46 SHA256 6a2a0e3d214755a501ccab1f94950ec3624b50fdd614168a80a85a632e16dbe9
-EBUILD freetype-2.3.3.ebuild 3441 RMD160 d06cb0d079dcfb259fb90f00c409135cf0a87c16 SHA1 54b9346aba794c8a24651f079238fdbd9926aeb7 SHA256 118c5b58ac6a8cfeee74ab2cd618de2113f57cddf1c3d98be7d0c44854f32f48
-EBUILD freetype-2.3.4-r2.ebuild 3443 RMD160 7b199b50686766d3af73f130d34718e1cc67857c SHA1 56d47241d3f12697165bfe43f3d6ee76dfe3edcf SHA256 6ff2657457e131db2797aed645a64899f3e46a2c116fee738b05d8660e5a592d
-EBUILD freetype-2.3.5-r1.ebuild 3449 RMD160 d70cc7249e49fb8b3e5af76ddc4a864d77cea60f SHA1 7016174c10b00e3367f1d39eb8b0c5e5cb95ecd8 SHA256 9bae086802628c945e769f546e0ac541aa6eba451dff7c9923f3333ad3c95191
 EBUILD freetype-2.3.5-r2.ebuild 3259 RMD160 a3f00c95b97eea8930bb107a076a52299c30007e SHA1 8586435b258e455c0a9f5eef85932f380ab97ba7 SHA256 35b7a4eb11c52ddd7297e031ae09e681fb08974a8885800c2a0f00249c0a5a2d
-MISC ChangeLog 25312 RMD160 06d024dcd445de36a0f5ecc9e8a1ca24becd487f SHA1 81a8cc0811f9951ff2acf38eb8f5a56a7d62f950 SHA256 ab4d58ba08d55887fcd063a3e5b1d9938cf1f4c028a0bab49d0616dba00e2909
+MISC ChangeLog 25679 RMD160 504404903a92597b1e0c82c898f52f465e2241d4 SHA1 8c361ce20dfaff4dd229491dd28f7747be47503f SHA256 cba744e7ddd83954ab853810dbff04458fe7c40ef8cecd01a0c5c7506be14123
 MISC metadata.xml 159 RMD160 e9d6dae6266cd59331aaa78481fd5a67fc2ed725 SHA1 152e7ea08489d788f3f1c4c59be552a5f94b2d02 SHA256 952d89bc3335f3d2f69460945016b173913db58759fe7d906f3927909120c890
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHryzvvFcC4BYPU0oRAsUQAJ4geppad7ZvwQF0v9JqxGWHB1zsbgCbBM/a
-b1pFIwyrBGCSxwUXkXTnUBo=
-=jLB2
+iD8DBQFHyyhuiqiDRvmkBmIRAq17AKC78Qn4mXpYAARM4J3whOa6ZCDa5gCgoUQT
+p07ZhayHJJo+fh+mdaz6ITM=
+=Ib7y
 -----END PGP SIGNATURE-----
diff --git a/media-libs/freetype/files/freetype-2.1.9-fix_bci.patch b/media-libs/freetype/files/freetype-2.1.9-fix_bci.patch
deleted file mode 100644 (file)
index 792146d..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -x '*~' -uNr freetype-2.1.9/src/truetype/ttgload.c freetype-2.1.9.patched/src/truetype/ttgload.c
---- freetype-2.1.9/src/truetype/ttgload.c      2004-06-21 23:16:56.000000000 +0200
-+++ freetype-2.1.9.patched/src/truetype/ttgload.c      2004-12-24 11:57:59.349364992 +0100
-@@ -795,12 +795,9 @@
-     if ( IS_HINTED( load->load_flags ) )
-     {
-       FT_Pos  x = zone->org[n_points-4].x;
--      FT_Pos  y = zone->org[n_points-2].y;
--
- 
-       x = FT_PIX_ROUND( x ) - x;
--      y = FT_PIX_ROUND( y ) - y;
--      translate_array( n_points, zone->org, x, y );
-+      translate_array( n_points, zone->org, x, 0 );
- 
-       org_to_cur( n_points, zone );
- 
diff --git a/media-libs/freetype/files/freetype-2.3.3-buffer-overwrite.patch b/media-libs/freetype/files/freetype-2.3.3-buffer-overwrite.patch
deleted file mode 100644 (file)
index bbb8b2b..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-===================================================================
-RCS file: /var/lib/cvs/sources/freetype/freetype2/src/base/ftbitmap.c,v
-retrieving revision 1.17
-retrieving revision 1.18
-diff -u -r1.17 -r1.18
---- freetype/freetype2/src/base/ftbitmap.c     2007/03/29 11:56:21     1.17
-+++ freetype/freetype2/src/base/ftbitmap.c     2007/04/06 08:19:04     1.18
-@@ -149,15 +149,15 @@
-       if ( bit_last < bit_width )
-       {
-         FT_Byte*  line  = bitmap->buffer + ( bit_last >> 3 );
-+        FT_Byte*  end   = bitmap->buffer + pitch;
-         FT_Int    shift = bit_last & 7;
-         FT_UInt   mask  = 0xFF00U >> shift;
-         FT_Int    count = height;
- 
- 
--        for ( ; count > 0; count--, line += pitch )
-+        for ( ; count > 0; count--, line += pitch, end += pitch )
-         {
-           FT_Byte*  write = line;
--          FT_Byte*  end   = line + pitch;
- 
- 
-           if ( shift > 0 )
diff --git a/media-libs/freetype/files/freetype-2.3.3-ft2demos-Makefile.patch b/media-libs/freetype/files/freetype-2.3.3-ft2demos-Makefile.patch
deleted file mode 100644 (file)
index ece4476..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -Naur ft2demos-2.3.3-orig/Makefile ft2demos-2.3.3/Makefile
---- ft2demos-2.3.3-orig/Makefile       2007-05-09 08:45:56.000000000 -0600
-+++ ft2demos-2.3.3/Makefile    2007-05-09 08:47:23.000000000 -0600
-@@ -308,6 +308,9 @@
-   $(OBJ_DIR_2)/ftmemchk.$(SO): $(SRC_DIR)/ftmemchk.c
-         $(COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<)
- 
-+  $(OBJ_DIR_2)/fttimer.$(SO): $(SRC_DIR)/fttimer.c
-+        $(COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<)
-+
-   $(OBJ_DIR_2)/fttry.$(SO): $(SRC_DIR)/fttry.c
-         $(COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<)
- 
-@@ -338,10 +341,6 @@
-         $(COMPILE) $(GRAPH_INCLUDES:%=$I%) \
-                      $T$(subst /,$(COMPILER_SEP),$@ $<)
- 
--  $(OBJ_DIR_2)/fttimer.$(SO): $(SRC_DIR)/fttimer.c $(GRAPH_LIB)
--        $(COMPILE) $(GRAPH_INCLUDES:%=$I%) \
--                     $T$(subst /,$(COMPILER_SEP),$@ $<)
--
- 
- # $(OBJ_DIR_2)/ftsbit.$(SO): $(SRC_DIR)/ftsbit.c $(GRAPH_LIB)
- #      $(COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<)
-@@ -438,7 +437,10 @@
-   $(BIN_DIR_2)/ftvalid$E: $(OBJ_DIR_2)/ftvalid.$(SO) $(FTLIB) $(COMMON_OBJ)
-         $(LINK_COMMON)
- 
--  $(BIN_DIR_2)/ftdump$E: $(OBJ_DIR_2)/ftdump.$(SO) $(FTLIB)
-+  $(BIN_DIR_2)/ftdump$E: $(OBJ_DIR_2)/ftdump.$(SO) $(FTLIB) $(COMMON_OBJ)
-+        $(LINK_COMMON)
-+
-+  $(BIN_DIR_2)/fttimer$E: $(OBJ_DIR_2)/fttimer.$(SO) $(FTLIB) $(COMMON_OBJ)
-         $(LINK_COMMON)
- 
-   $(BIN_DIR_2)/fttry$E: $(OBJ_DIR_2)/fttry.$(SO) $(FTLIB)
-@@ -481,10 +483,6 @@
-                            $(GRAPH_LIB) $(COMMON_OBJ) $(FTCOMMON_OBJ)
-         $(LINK_NEW)
- 
--  $(BIN_DIR_2)/fttimer$E: $(OBJ_DIR_2)/fttimer.$(SO) $(FTLIB) \
--                          $(GRAPH_LIB) $(COMMON_OBJ)
--        $(LINK_GRAPH)
--
- 
- endif
- 
diff --git a/media-libs/freetype/files/freetype-2.3.4-CVE-2007-2754.patch b/media-libs/freetype/files/freetype-2.3.4-CVE-2007-2754.patch
deleted file mode 100644 (file)
index ccf4415..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Naur freetype-2.3.4-orig/src/truetype/ttgload.c freetype-2.3.4/src/truetype/ttgload.c
---- freetype-2.3.4-orig/src/truetype/ttgload.c 2007-04-09 02:25:09.000000000 -0600
-+++ freetype-2.3.4/src/truetype/ttgload.c      2007-05-20 00:58:45.000000000 -0600
-@@ -271,7 +271,11 @@
- 
-     n_points = 0;
-     if ( n_contours > 0 )
-+    {
-       n_points = cont[-1] + 1;
-+      if ( n_points < 0 )
-+        goto Invalid_Outline;
-+    }
- 
-     /* note that we will add four phantom points later */
-     error = FT_GLYPHLOADER_CHECK_POINTS( gloader, n_points + 4, 0 );
-@@ -682,7 +686,7 @@
-     FT_GlyphLoader  gloader = loader->gloader;
-     FT_Error        error   = TT_Err_Ok;
-     FT_Outline*     outline;
--    FT_UInt         n_points;
-+    FT_Int          n_points;
- 
- 
-     outline  = &gloader->current.outline;
-@@ -709,7 +713,7 @@
-       /* Deltas apply to the unscaled data. */
-       FT_Vector*  deltas;
-       FT_Memory   memory = loader->face->memory;
--      FT_UInt     i;
-+      FT_Int      i;
- 
- 
-       error = TT_Vary_Get_Glyph_Deltas( (TT_Face)(loader->face),
diff --git a/media-libs/freetype/freetype-2.1.10-r2.ebuild b/media-libs/freetype/freetype-2.1.10-r2.ebuild
deleted file mode 100644 (file)
index 8790bf5..0000000
+++ /dev/null
@@ -1,79 +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.1.10-r2.ebuild,v 1.12 2007/02/08 19:13:30 grobian 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://gentoo/freetype-2.1.10-security_batch-r1.patch.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}
-       !<www-client/mozilla-1.7.3-r3
-       !<www-client/mozilla-firefox-1.0-r3
-       !<mail-client/mozilla-thunderbird-0.9-r3
-       !<media-libs/libwmf-0.2.8.2"
-
-src_unpack() {
-
-       unpack ${A}
-
-       # fix internal header cast which gets used by pango (bad)
-       epatch ${FILESDIR}/${P}-internal_header.patch
-       # fix bunch of overflows etc. (#124828)
-       epatch ${WORKDIR}/${P}-security_batch-r1.patch
-       # revert pointer
-       epatch ${FILESDIR}/${P}-revert_pointer.patch
-       # fix artificial bold bug (#127872)
-       cd ${S}/src/base
-       epatch ${FILESDIR}/${P}-fix_synth.patch
-
-       elibtoolize
-       epunt_cxx
-
-}
-
-src_compile() {
-
-       # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=118021
-       append-flags "-fno-strict-aliasing"
-
-       use bindist || append-flags -DTT_CONFIG_OPTION_BYTECODE_INTERPRETER
-
-       # Fix missing symbols in fontconfig in some circumstances
-       append-flags -DFT_CONFIG_OPTION_OLD_INTERNALS
-
-       make setup CFG="--host=${CHOST} --prefix=/usr $(use_with zlib) --libdir=/usr/$(get_libdir)" unix || die
-
-       emake || die "make failed"
-
-       if use doc ; then
-               emake refdoc || die "refdoc failed"
-       fi
-
-}
-
-src_install() {
-
-       make 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/*
-
-}
diff --git a/media-libs/freetype/freetype-2.3.3.ebuild b/media-libs/freetype/freetype-2.3.3.ebuild
deleted file mode 100644 (file)
index 7193baa..0000000
+++ /dev/null
@@ -1,119 +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.3.ebuild,v 1.17 2007/07/12 03:10:24 mr_bones_ 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="X bindist debug doc zlib"
-
-DEPEND="zlib? ( sys-libs/zlib )
-               X?    ( x11-libs/libX11 )"
-
-# 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
-# We also need a recent fontconfig version to prevent segfaults. #166029
-# July 3 2007 dirtyepic
-RDEPEND="${DEPEND}
-       !<www-client/mozilla-1.7.3-r3
-       !<www-client/mozilla-firefox-1.0-r3
-       !<mail-client/mozilla-thunderbird-0.9-r3
-       !<media-libs/libwmf-0.2.8.2
-       !<media-libs/fontconfig-2.3.2-r2"
-
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-
-       enable_option() {
-               sed -i -e "/#define $1/a #define $1" \
-                       include/freetype/config/ftoption.h \
-                       || die "unable to enable option $1"
-       }
-
-       disable_option() {
-               sed -i -e "/#define $1/ { s:^:/*:; s:$:*/: }" \
-                       include/freetype/config/ftoption.h \
-                       || die "unable to disable option $1"
-       }
-
-       if ! use bindist; then
-               # Bytecodes and subpixel hinting supports are patented
-               # in United States; for safety, disable them while building
-               # binaries, so that no risky code is distributed.
-               # See http://freetype.org/patents.html
-
-               enable_option TT_CONFIG_OPTION_BYTECODE_INTERPRETER
-               enable_option FT_CONFIG_OPTION_SUBPIXEL_RENDERING
-               disable_option TT_CONFIG_OPTION_UNPATENTED_HINTING
-       fi
-
-       if use debug; then
-               enable_option FT_DEBUG_LEVEL_ERROR
-               enable_option FT_DEBUG_MEMORY
-       fi
-
-       enable_option FT_CONFIG_OPTION_INCREMENTAL
-       disable_option FT_CONFIG_OPTION_OLD_INTERNALS
-
-       epatch "${FILESDIR}"/${PN}-2.3.2-enable-valid.patch
-
-       # Fix memory buffer overwrite (2.3.3 only)
-       # http://savannah.nongnu.org/bugs/?19536
-       epatch "${FILESDIR}"/${P}-buffer-overwrite.patch
-
-       ### ft2demos ###
-               cd ../ft2demos-${PV}
-
-               epatch "${FILESDIR}"/${P}-ft2demos-Makefile.patch
-               sed -i -e "s:\.\.\/freetype2$:../freetype-${PV}:" Makefile
-
-               # Disable tests needing X11 when USE="-X". (bug #177597)
-               if ! use X; then
-                       sed -i -e "/EXES\ +=\ ftview/ s:^:#:" Makefile
-               fi
-
-               cd ${S}
-       ### end ft2demos ###
-
-       elibtoolize
-       epunt_cxx
-}
-
-src_compile() {
-       # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=118021
-       append-flags "-fno-strict-aliasing"
-
-       type -P gmake &> /dev/null && export GNUMAKE=gmake
-       econf $(use_with zlib) || die "econf failed"
-       emake || die "emake failed"
-
-       cd ../ft2demos-${PV}
-       emake || die "ft2demos emake failed"
-}
-
-src_install() {
-       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.4-r2.ebuild b/media-libs/freetype/freetype-2.3.4-r2.ebuild
deleted file mode 100644 (file)
index 9b53119..0000000
+++ /dev/null
@@ -1,119 +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.4-r2.ebuild,v 1.13 2007/08/11 00:37:30 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="X bindist debug doc zlib"
-
-DEPEND="zlib? ( sys-libs/zlib )
-               X?    ( x11-libs/libX11 )"
-
-# 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
-# We also need a recent fontconfig version to prevent segfaults. #166029
-# July 3 2007 dirtyepic
-RDEPEND="${DEPEND}
-       !<www-client/mozilla-1.7.3-r3
-       !<www-client/mozilla-firefox-1.0-r3
-       !<mail-client/mozilla-thunderbird-0.9-r3
-       !<media-libs/libwmf-0.2.8.2
-       !<media-libs/fontconfig-2.3.2-r2"
-
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-
-       # Bug #179161
-       epatch "${FILESDIR}"/${P}-CVE-2007-2754.patch
-
-       enable_option() {
-               sed -i -e "/#define $1/a #define $1" \
-                       include/freetype/config/ftoption.h \
-                       || die "unable to enable option $1"
-       }
-
-       disable_option() {
-               sed -i -e "/#define $1/ { s:^:/*:; s:$:*/: }" \
-                       include/freetype/config/ftoption.h \
-                       || die "unable to disable option $1"
-       }
-
-       if ! use bindist; then
-               # Bytecodes and subpixel hinting supports are patented
-               # in United States; for safety, disable them while building
-               # binaries, so that no risky code is distributed.
-               # See http://freetype.org/patents.html
-
-               enable_option TT_CONFIG_OPTION_BYTECODE_INTERPRETER
-               enable_option FT_CONFIG_OPTION_SUBPIXEL_RENDERING
-               disable_option TT_CONFIG_OPTION_UNPATENTED_HINTING
-       fi
-
-       if use debug; then
-               enable_option FT_DEBUG_LEVEL_ERROR
-               enable_option FT_DEBUG_MEMORY
-       fi
-
-       enable_option FT_CONFIG_OPTION_INCREMENTAL
-       disable_option FT_CONFIG_OPTION_OLD_INTERNALS
-
-       epatch "${FILESDIR}"/${PN}-2.3.2-enable-valid.patch
-       epatch "${FILESDIR}"/${PN}-2.3.5-crossbuild.patch               # bug #185681
-
-       ### ft2demos ###
-               cd ../ft2demos-${PV}
-
-               epatch "${FILESDIR}"/${PN}-2.3.3-ft2demos-Makefile.patch
-               sed -i -e "s:\.\.\/freetype2$:../freetype-${PV}:" Makefile
-
-               # Disable tests needing X11 when USE="-X". (bug #177597)
-               if ! use X; then
-                       sed -i -e "/EXES\ +=\ ftview/ s:^:#:" Makefile
-               fi
-
-               cd ${S}
-       ### end ft2demos ###
-
-       elibtoolize
-       epunt_cxx
-}
-
-src_compile() {
-       # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=118021
-       append-flags "-fno-strict-aliasing"
-
-       type -P gmake &> /dev/null && export GNUMAKE=gmake
-       econf $(use_with zlib) || die "econf failed"
-       emake || die "emake failed"
-
-       cd ../ft2demos-${PV}
-       emake || die "ft2demos emake failed"
-}
-
-src_install() {
-       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.5-r1.ebuild b/media-libs/freetype/freetype-2.3.5-r1.ebuild
deleted file mode 100644 (file)
index 161d413..0000000
+++ /dev/null
@@ -1,121 +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.5-r1.ebuild,v 1.1 2007/08/24 22:42:01 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 ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="X bindist debug doc zlib"
-
-DEPEND="zlib? ( sys-libs/zlib )
-               X?    ( x11-libs/libX11 )"
-
-# 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
-# We also need a recent fontconfig version to prevent segfaults. #166029
-# July 3 2007 dirtyepic
-RDEPEND="${DEPEND}
-       !<www-client/mozilla-1.7.3-r3
-       !<www-client/mozilla-firefox-1.0-r3
-       !<mail-client/mozilla-thunderbird-0.9-r3
-       !<media-libs/libwmf-0.2.8.2
-       !<media-libs/fontconfig-2.3.2-r2"
-
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-
-       enable_option() {
-               sed -i -e "/#define $1/a #define $1" \
-                       include/freetype/config/ftoption.h \
-                       || die "unable to enable option $1"
-       }
-
-       disable_option() {
-               sed -i -e "/#define $1/ { s:^:/*:; s:$:*/: }" \
-                       include/freetype/config/ftoption.h \
-                       || die "unable to disable option $1"
-       }
-
-       if ! use bindist; then
-               # Bytecodes and subpixel hinting supports are patented
-               # in United States; for safety, disable them while building
-               # binaries, so that no risky code is distributed.
-               # See http://freetype.org/patents.html
-
-               enable_option FT_CONFIG_OPTION_SUBPIXEL_RENDERING
-               enable_option TT_CONFIG_OPTION_BYTECODE_INTERPRETER
-               disable_option TT_CONFIG_OPTION_UNPATENTED_HINTING
-       fi
-
-       if use debug; then
-               enable_option FT_DEBUG_LEVEL_ERROR
-               enable_option FT_DEBUG_MEMORY
-       fi
-
-       enable_option FT_CONFIG_OPTION_INCREMENTAL
-       disable_option FT_CONFIG_OPTION_OLD_INTERNALS
-
-       epatch "${FILESDIR}"/${PN}-2.3.2-enable-valid.patch
-       epatch "${FILESDIR}"/${PN}-2.3.5-crossbuild.patch               # bug #185681
-
-       ### ft2demos ###
-               cd ../ft2demos-${PV}
-               sed -i -e "s:\.\.\/freetype2$:../freetype-${PV}:" Makefile
-
-               # Disable tests needing X11 when USE="-X". (bug #177597)
-               if ! use X; then
-                       sed -i -e "/EXES\ +=\ ftview/ s:^:#:" Makefile
-               fi
-
-               cd ${S}
-       ### end ft2demos ###
-
-       elibtoolize
-       epunt_cxx
-}
-
-src_compile() {
-       append-flags -fno-strict-aliasing
-
-       type -P gmake &> /dev/null && export GNUMAKE=gmake
-       econf $(use_with zlib) || die "econf failed"
-       emake || die "emake failed"
-
-       cd ../ft2demos-${PV}
-       emake || die "ft2demos emake failed"
-}
-
-src_install() {
-       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
-}
-
-pkg_postinst() {
-       echo
-       ewarn "After upgrading to freetype-2.3.5, it is necessary to rebuild"
-       ewarn "libXfont to avoid build errors in some packages."
-       echo
-       epause 3
-}