Added an X USE flag to control what utilities get installed. Patch fttimer to not link against X unnecessarily. Thanks to Calum for reporting. (Bug #177597)

Package-Manager: portage-2.1.2.7
author: Ryan Hill <rhill@gentoo.org> 2007-05-09 01:31:40 +0000
committer: Ryan Hill <rhill@gentoo.org> 2007-05-09 01:31:40 +0000
commit: 60f3fbcd2aa64e0d302bf165db8ea0639c680228 (patch)
tree: 4e9a9dd1633019498dbe98dffa16f2932c4c9fac /media-libs
parent: Version bump, various bugfixes and new dual MPL/GPL license. Adds examples us... (diff)
download: historical-60f3fbcd2aa64e0d302bf165db8ea0639c680228.tar.gz
historical-60f3fbcd2aa64e0d302bf165db8ea0639c680228.tar.bz2
historical-60f3fbcd2aa64e0d302bf165db8ea0639c680228.zip
4 files changed, 83 insertions, 23 deletions
diff --git a/media-libs/freetype/ChangeLog b/media-libs/freetype/ChangeLog
index ca96a94ccd5a..f659335c1598 100644
--- a/media-libs/freetype/ChangeLog
+++ b/media-libs/freetype/ChangeLog
@@ -1,6 +1,12 @@
 # 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.131 2007/05/07 20:25:05 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.132 2007/05/09 01:31:40 dirtyepic Exp $
+
+  09 May 2007; Ryan Hill <dirtyepic@gentoo.org>
+  +files/freetype-2.3.3-fttimer-noX.patch, freetype-2.3.3.ebuild:
+  Added an X USE flag to control what utilities get installed. Patch fttimer
+  to not link against X unnecessarily. Thanks to Calum for reporting. (Bug
+  #177597)
 
   07 May 2007; Andrej Kacian <ticho@gentoo.org> freetype-2.3.3.ebuild:
   Stable on x86, bug #173804.
diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index ffdec5f6f6bf..e81260c90f36 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX config.mk 1240 RMD160 4cd624996babb0a9a772c09fa9f5377209a8caf9 SHA1 1b6370905798d17ca7c254b1acbfb41e7099b5c8 SHA256 671fa47806f929e45b8f06368ae56b29600dae3cc376942215ed6588cc733e7f
 MD5 10bd432787c1a182edece351dbf82809 files/config.mk 1240
 RMD160 4cd624996babb0a9a772c09fa9f5377209a8caf9 files/config.mk 1240
@@ -37,6 +34,10 @@ AUX freetype-2.3.3-buffer-overwrite.patch 894 RMD160 6a53886d3a2129a634bfc336223
 MD5 e0d01fb210f817a211ccd922d751592b files/freetype-2.3.3-buffer-overwrite.patch 894
 RMD160 6a53886d3a2129a634bfc33622327914c4f4729c files/freetype-2.3.3-buffer-overwrite.patch 894
 SHA256 4b3417e5c704f25a8a087949cc6a62cf92dfd53628bd466aa5a13940a3728905 files/freetype-2.3.3-buffer-overwrite.patch 894
+AUX freetype-2.3.3-fttimer-noX.patch 1461 RMD160 4c1ae1373d8d7e93e9245a4c0ca9ac346b1d6434 SHA1 98848d00227a04f97823cd0ffcb725cbd5f03b4c SHA256 88e93df0307e327f826432ad59d1c658851942ca4819cbe163e95b8b632cac51
+MD5 f18407e18c1a48c7950bcaa44cfd1daa files/freetype-2.3.3-fttimer-noX.patch 1461
+RMD160 4c1ae1373d8d7e93e9245a4c0ca9ac346b1d6434 files/freetype-2.3.3-fttimer-noX.patch 1461
+SHA256 88e93df0307e327f826432ad59d1c658851942ca4819cbe163e95b8b632cac51 files/freetype-2.3.3-fttimer-noX.patch 1461
 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
@@ -70,18 +71,18 @@ EBUILD freetype-2.1.9-r1.ebuild 2125 RMD160 cb37dbc1753bc565b07842f44e012b6c26cc
 MD5 30ca0975fc22badd82a7f5ce0f87ce79 freetype-2.1.9-r1.ebuild 2125
 RMD160 cb37dbc1753bc565b07842f44e012b6c26cc2340 freetype-2.1.9-r1.ebuild 2125
 SHA256 eb02a32636bf51252984236d4fdc61a12536b9317778cc0967a4e9d5e4c9c663 freetype-2.1.9-r1.ebuild 2125
-EBUILD freetype-2.3.3.ebuild 3037 RMD160 97acb444268b10312a661bb19da8c35faf2a9a3e SHA1 4d9ece663061a8f85be6bb40fe41d045ae7c1dcd SHA256 14ecc4806a8ad49586e4ac1eee5456e9b5b6051dc3751529f689b4ce106ac6d5
-MD5 3bb0c0f27e2dbd27311451604c42dda5 freetype-2.3.3.ebuild 3037
-RMD160 97acb444268b10312a661bb19da8c35faf2a9a3e freetype-2.3.3.ebuild 3037
-SHA256 14ecc4806a8ad49586e4ac1eee5456e9b5b6051dc3751529f689b4ce106ac6d5 freetype-2.3.3.ebuild 3037
+EBUILD freetype-2.3.3.ebuild 3377 RMD160 418c0fa04d4c05c88e764e49fc889f9a8ff455fb SHA1 e78d0dcb8d6187603af3f1fc48c9174b663d89fe SHA256 1277aa31621fa8bdb4dfba3258ccd485cff40fde046d1cd467fbe74e577308cc
+MD5 661ad5af7181d90b26f72cc8b2304430 freetype-2.3.3.ebuild 3377
+RMD160 418c0fa04d4c05c88e764e49fc889f9a8ff455fb freetype-2.3.3.ebuild 3377
+SHA256 1277aa31621fa8bdb4dfba3258ccd485cff40fde046d1cd467fbe74e577308cc freetype-2.3.3.ebuild 3377
 EBUILD freetype-2.3.4.ebuild 2910 RMD160 8e8e6108048459647dfc7d18cabc938eef17f556 SHA1 a0d4c1985906e835883628d323c4a52ae70c7e0f SHA256 0968e829a5c42d3e8356012589cbe06c28d95a18553e83912a1b5547dc94bc6a
 MD5 ef47c8e25d5896eda9a4a0877f227e64 freetype-2.3.4.ebuild 2910
 RMD160 8e8e6108048459647dfc7d18cabc938eef17f556 freetype-2.3.4.ebuild 2910
 SHA256 0968e829a5c42d3e8356012589cbe06c28d95a18553e83912a1b5547dc94bc6a freetype-2.3.4.ebuild 2910
-MISC ChangeLog 19430 RMD160 742a797467a35616a23eb99e0e8b27c36b08abd3 SHA1 6011a13891d85fcf66d4ed54693d597cbf2b421f SHA256 fb2e40356f344e395557f2a2be66a07d89d21ee4403eb60c52523728d4fd785c
-MD5 dec1a7240074b2944d7fadf153fa72c2 ChangeLog 19430
-RMD160 742a797467a35616a23eb99e0e8b27c36b08abd3 ChangeLog 19430
-SHA256 fb2e40356f344e395557f2a2be66a07d89d21ee4403eb60c52523728d4fd785c ChangeLog 19430
+MISC ChangeLog 19712 RMD160 862854a0fe63f736097a33e34c25bbeb6ea86e08 SHA1 3edb83ec2650eda02e36ec5c324b3dac80de7b8f SHA256 5fa199c3e7cacb966bacc3181815e89a130d4c73dd0d7709d6ea1184ccac0c82
+MD5 6f280ba6e63f0dbafc639526cc9f8a4a ChangeLog 19712
+RMD160 862854a0fe63f736097a33e34c25bbeb6ea86e08 ChangeLog 19712
+SHA256 5fa199c3e7cacb966bacc3181815e89a130d4c73dd0d7709d6ea1184ccac0c82 ChangeLog 19712
 MISC metadata.xml 219 RMD160 71993cfc42c14ad1e5fa0f67864200489345b70f SHA1 700713fad4b00f68790cba19d660fa6f61223211 SHA256 4629bfc7523bb3880601e0fb403dca87c95fe12efd589135b9df8b5f21a02d23
 MD5 900688457f98bf6b49bd2ef06e64e7be metadata.xml 219
 RMD160 71993cfc42c14ad1e5fa0f67864200489345b70f metadata.xml 219
@@ -107,10 +108,3 @@ SHA256 4f0211825dcf95edbbda51f2eb7ef20d420cccb44e8e3454a5c315dd49fc8160 files/di
 MD5 b7c8de63eddfaa6bde19a07224c8a372 files/digest-freetype-2.3.4 750
 RMD160 f55642e057ab72b29913c308a054e11a4f7b7587 files/digest-freetype-2.3.4 750
 SHA256 7b611245484b86882f9fbe50e02a653895da611d0cc8b73c1e4d841f78a9f38a files/digest-freetype-2.3.4 750
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-iD8DBQFGP4snQlM6RnzZP+IRAvlwAJ9oFqS49RNJYMuTPAsQpl6BTHv1mACeIugN
-p9qnsmYlRm9m545g+N8ivE8=
-=GAdq
------END PGP SIGNATURE-----
diff --git a/media-libs/freetype/files/freetype-2.3.3-fttimer-noX.patch b/media-libs/freetype/files/freetype-2.3.3-fttimer-noX.patch
new file mode 100644
index 000000000000..4123f02ef08d
--- /dev/null
+++ b/media-libs/freetype/files/freetype-2.3.3-fttimer-noX.patch
@@ -0,0 +1,45 @@
+diff -Naur ft2demos-2.3.3-orig/Makefile ft2demos-2.3.3/Makefile
+--- ft2demos-2.3.3-orig/Makefile	2007-05-08 17:07:01.000000000 -0600
++++ ft2demos-2.3.3/Makefile	2007-05-08 17:17:35.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),$@ $<)
+@@ -441,6 +440,9 @@
+   $(BIN_DIR_2)/ftdump$E: $(OBJ_DIR_2)/ftdump.$(SO) $(FTLIB)
+ 	  $(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)
+ 	  $(LINK)
+ 
+@@ -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/freetype-2.3.3.ebuild b/media-libs/freetype/freetype-2.3.3.ebuild
index bb13fbb22af4..a8ea86d75112 100644
--- a/media-libs/freetype/freetype-2.3.3.ebuild
+++ b/media-libs/freetype/freetype-2.3.3.ebuild
@@ -1,6 +1,6 @@
 # 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.7 2007/05/07 20:25:05 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.3.3.ebuild,v 1.8 2007/05/09 01:31:40 dirtyepic Exp $
 
 inherit eutils flag-o-matic libtool
 
@@ -13,13 +13,14 @@ SRC_URI="mirror://sourceforge/freetype/${P/_/}.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="bindist debug doc zlib"
+IUSE="X 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.
 # Otherwise updating freetype will cause moz/ff/tb crashes.  #59849
 # 20 Nov 2004 agriffis
-DEPEND="zlib? ( sys-libs/zlib )"
+DEPEND="zlib? ( sys-libs/zlib )
+		X?    ( x11-libs/libX11 )"
 
 RDEPEND="${DEPEND}
 	!<www-client/mozilla-1.7.3-r3
@@ -68,7 +69,21 @@ src_unpack() {
 	# http://savannah.nongnu.org/bugs/?19536
 	epatch "${FILESDIR}"/${P}-buffer-overwrite.patch
 
-	sed -i -e "s:\.\.\/freetype2$:../freetype-${PV}:" ../ft2demos-${PV}/Makefile
+	### ft2demos ###
+		cd ../ft2demos-${PV}
+
+		# fttimer demo does not require X11.  fix linking appropriately.
+		epatch "${FILESDIR}"/${P}-fttimer-noX.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
author	Ryan Hill <rhill@gentoo.org>	2007-05-09 01:31:40 +0000
committer	Ryan Hill <rhill@gentoo.org>	2007-05-09 01:31:40 +0000
commit	60f3fbcd2aa64e0d302bf165db8ea0639c680228 (patch)
tree	4e9a9dd1633019498dbe98dffa16f2932c4c9fac /media-libs
parent	Version bump, various bugfixes and new dual MPL/GPL license. Adds examples us... (diff)
download	historical-60f3fbcd2aa64e0d302bf165db8ea0639c680228.tar.gz historical-60f3fbcd2aa64e0d302bf165db8ea0639c680228.tar.bz2 historical-60f3fbcd2aa64e0d302bf165db8ea0639c680228.zip