Remove useless cpp checks in freetype (bug #138116).

Package-Manager: portage-2.1.1_pre2-r6

4 files changed, 48 insertions, 22 deletions

diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog
index 9ad0c2caa09a..f41861f46de4 100644
--- a/media-gfx/splashutils/ChangeLog
+++ b/media-gfx/splashutils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/splashutils
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.56 2006/04/22 14:54:37 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.57 2006/07/12 10:17:24 spock Exp $
+
+  12 Jul 2006; Michał Januszewski <spock@gentoo.org>
+  splashutils-1.1.9.8-r1.ebuild, splashutils-1.1.9.10-r1.ebuild:
+  Remove useless cpp checks in freetype (bug #138116).
 
   22 Apr 2006; Michał Januszewski <spock@gentoo.org>
   -files/splashutils-1.1.9.9-external-klibc.patch:
diff --git a/media-gfx/splashutils/Manifest b/media-gfx/splashutils/Manifest
index fce948079702..e51c786a4a1d 100644
--- a/media-gfx/splashutils/Manifest
+++ b/media-gfx/splashutils/Manifest
@@ -1,37 +1,55 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 67a1f67c4fcf5dbc47ad7f992fcd0a62 ChangeLog 12283
-RMD160 9ef54dc2a9406d3ac4ec7f2b7611dcb5c7260de2 ChangeLog 12283
-SHA256 098c2246c091b725c96fe2b5544eb4ed7a8a9f4617b7716a00c613eeeedad60d ChangeLog 12283
-MD5 35cc14c0e9021cf2b900e89588015f07 files/digest-splashutils-1.1.9.10-r1 1774
-RMD160 12af3f46f7d493c35d5411de6ef76478b4d34145 files/digest-splashutils-1.1.9.10-r1 1774
-SHA256 ae313288aa756133eb20f3c3f738003bcdf7176636cabd47918916dae8fbd036 files/digest-splashutils-1.1.9.10-r1 1774
-MD5 f94a2c7d921f0fb8a93e7870384730a7 files/digest-splashutils-1.1.9.8-r1 2009
-RMD160 98e1467215be8e850a1164aa7d86833e67680991 files/digest-splashutils-1.1.9.8-r1 2009
-SHA256 791d499355b791860bab3f2fc5b30e3a946536395d503bfa7bc4af4ddf2b19f7 files/digest-splashutils-1.1.9.8-r1 2009
+AUX splashutils-1.1.9.10-makefile.patch 6258 RMD160 cd65e0feeefbaa053161959db5f1bb22120ee43c SHA1 b5a9afbcb97d8218f89926a3e53e8ac1dc6eeecb SHA256 777d5a6f59d49d00573cf4e99510abfc82865a16c27a67190b78b4e4a0e30d78
 MD5 38c4a990c2ad0581666c25da2029f08d files/splashutils-1.1.9.10-makefile.patch 6258
 RMD160 cd65e0feeefbaa053161959db5f1bb22120ee43c files/splashutils-1.1.9.10-makefile.patch 6258
 SHA256 777d5a6f59d49d00573cf4e99510abfc82865a16c27a67190b78b4e4a0e30d78 files/splashutils-1.1.9.10-makefile.patch 6258
+AUX splashutils-1.1.9.10-ppc-2.6.14.patch 749 RMD160 0642a987ff97cc18294840c37a2f88aa4f252450 SHA1 634712549ab4a1111347dcba3e459488fd3ffa0a SHA256 3995fd9d153a80f709882cbafc9c2330061eb0c8b6187b136ce79e956617f000
 MD5 6b70ab6899c37465a35de0f0a89c6365 files/splashutils-1.1.9.10-ppc-2.6.14.patch 749
 RMD160 0642a987ff97cc18294840c37a2f88aa4f252450 files/splashutils-1.1.9.10-ppc-2.6.14.patch 749
 SHA256 3995fd9d153a80f709882cbafc9c2330061eb0c8b6187b136ce79e956617f000 files/splashutils-1.1.9.10-ppc-2.6.14.patch 749
+AUX splashutils-depscan.patch 2197 RMD160 044f771f4d971abc177a1da9563cba76bc101d71 SHA1 6e8406a714b71446089b4337f329c9eeeff0465e SHA256 ea06dec56d412a30abe7da31ab3485ab9748cf58740aa1f08b128b0b5e1e6df9
 MD5 d78ee27cab85b59044d8ef3e7e5be4af files/splashutils-depscan.patch 2197
 RMD160 044f771f4d971abc177a1da9563cba76bc101d71 files/splashutils-depscan.patch 2197
 SHA256 ea06dec56d412a30abe7da31ab3485ab9748cf58740aa1f08b128b0b5e1e6df9 files/splashutils-depscan.patch 2197
+DIST freetype-2.1.9.tar.bz2 992394 RMD160 1dd8fb6fda8b159ef0d2ebedeca99a67ed65dc72 SHA1 a3c3a0c0d5f8f6e62c774e24817748a941016990 SHA256 4dabc3b38405f5c5f03b8f14d8902a9d506713182baf2baec9dea509515d4b6f
+DIST jpegsrc.v6b.tar.gz 613261 RMD160 18892206014fbb8cae2a44e281f4ed53feaf7882 SHA1 7079f0d6c42fad0cfba382cf6ad322add1ace8f9 SHA256 75c3ec241e9996504fe02a9ed4d12f16b74ade713972f3db9e65ce95cd27e35d
+DIST klibc-1.0.8.tar.bz2 446138 RMD160 006511b5178fc32cebd801ee399cc792b545418c SHA1 74d51df90912e5997adb17e7169222d358dbc837 SHA256 3d39bb503e2fc0ac9782edd235e06015bd4f14fe8bd4318042b208f3a9ce529a
+DIST libpng-1.2.8.tar.bz2 384970 RMD160 7de7456faaa4e4361b6b7ed74c87f0702f9cc88c SHA1 b6d73493eea4095166118b298efecb54a8e3d2f5 SHA256 9bec729a1e77d8bbc5800b14aa81f09290aa18daa40f344103f2c0d1d681531b
+DIST miscsplashutils-0.1.3.tar.bz2 91825 RMD160 47516ec50225ef18fd42e36d58e90e57bfc0dbac SHA1 844da6370e2a15da842bed109cc2574318bc25a0 SHA256 16fcb4d199e071a822d744bbd9238609a2175d512fc1c019018c05501cb23bdb
+DIST splashutils-gentoo-0.1.12.tar.bz2 7563 RMD160 5c8518b24bc1bbfaea9bf81f1b71eb7745eb8684 SHA1 8fd8f770d359c0d094f4b3e2cb535f35a37d2b5d SHA256 9118fb36f2352bf65ba69d4b9eebe916b25be028c0b7b1878d5d23cb675cd3e3
+DIST splashutils-gentoo-0.1.14.tar.bz2 7750 RMD160 680efa24119dcf699f37a9f295e3f81faebbdc18 SHA1 55285679ca778c82a5e8363526901689dc7b6cba SHA256 2515416c98bcf8e4e0d217cafc74b507295cb03d915d78b224683577159ae9dc
+DIST splashutils-lite-1.1.9.10.tar.bz2 55094 RMD160 274cfc9a79b69091b0feba8f6d64e3eb965dfb9a SHA1 c4bc383f40bd4f3cf45bd251fa133b59c6bd1d49 SHA256 de38e284103ed569360caf5d555d784309afea7625bad7acd689399d26c3955c
+DIST splashutils-lite-1.1.9.8.tar.bz2 55013 RMD160 377396b94562f4cde5e298170f762bb6518545ef SHA1 7d90c9b56d4d54083d21b618811eb225d456df0c SHA256 4f7ce63a2ec11884b4d624c334a93ddd5806f8b0acd5f80fc1e9edf369384f54
+DIST zlib-1.2.1.tar.bz2 284152 RMD160 aca88eb02d90b91c732f351e1b7efd4ce409ee25 SHA1 13bd164df955911c25342adfad805c1cad5e398e SHA256 9ea4bd04487e05254d05cebde539b3855af2899658e2da84487e86f7f400e0e1
+DIST zlib-1.2.3.tar.bz2 425209 RMD160 cfba9984b354dcc38da49331457e6bfc861c6f51 SHA1 967e280f284d02284b0cd8872a8e2e04bfdc7283 SHA256 e3b9950851a19904d642c4dec518623382cf4d2ac24f70a76510c944330d28ca
+EBUILD splashutils-1.1.9.10-r1.ebuild 6815 RMD160 f3476acc67ca6abb545f20d765d831b89e5250a8 SHA1 15f41ff735bb5f81e02b667bad090edeb54e0b2e SHA256 8c5c5634e46ff57177139c40223e373f23d4947afc6798c84995feb731696658
+MD5 d23d7c5f0679a3f95f0496c9ca810893 splashutils-1.1.9.10-r1.ebuild 6815
+RMD160 f3476acc67ca6abb545f20d765d831b89e5250a8 splashutils-1.1.9.10-r1.ebuild 6815
+SHA256 8c5c5634e46ff57177139c40223e373f23d4947afc6798c84995feb731696658 splashutils-1.1.9.10-r1.ebuild 6815
+EBUILD splashutils-1.1.9.8-r1.ebuild 6450 RMD160 ee8219564a3b039de20831eb52cb44d70fd8df87 SHA1 8cd9ff8737d7f40c2ffd7cde62c6b37df887539c SHA256 05085409393be9b3561dfa05fcbac6fea86bb2aaf1c82b0b11b31ba9ab8a590b
+MD5 e79713db9ac0cc2a97fcabab4fe83275 splashutils-1.1.9.8-r1.ebuild 6450
+RMD160 ee8219564a3b039de20831eb52cb44d70fd8df87 splashutils-1.1.9.8-r1.ebuild 6450
+SHA256 05085409393be9b3561dfa05fcbac6fea86bb2aaf1c82b0b11b31ba9ab8a590b splashutils-1.1.9.8-r1.ebuild 6450
+MISC ChangeLog 12458 RMD160 002d8cf682e1c16e471d9f86c4b403e492ba7433 SHA1 e5f9101666b7533622f5bac74c909e5b35b7eb9c SHA256 21bf0005045a0ae8bb4f2b98df28a0d187461df4d612240c1895776df3b4a3b6
+MD5 7ddd61fdf8a0d1f9149b6c83d4aac8ea ChangeLog 12458
+RMD160 002d8cf682e1c16e471d9f86c4b403e492ba7433 ChangeLog 12458
+SHA256 21bf0005045a0ae8bb4f2b98df28a0d187461df4d612240c1895776df3b4a3b6 ChangeLog 12458
+MISC metadata.xml 220 RMD160 6bb03cb6947aadf2672a58c61c1fb7aa405eaf86 SHA1 7810907f03c5a3ee23eeaa4b42699ce17bc5c3a7 SHA256 969b4125e7620e2fe0d616cb3cabbe52bd79e6c4bdd725ce807d5f4c7c1ad75d
 MD5 87131e5c56922624f8a0c7fe61cd28da metadata.xml 220
 RMD160 6bb03cb6947aadf2672a58c61c1fb7aa405eaf86 metadata.xml 220
 SHA256 969b4125e7620e2fe0d616cb3cabbe52bd79e6c4bdd725ce807d5f4c7c1ad75d metadata.xml 220
-MD5 42e04efdd821faee36ab3c385f25c872 splashutils-1.1.9.10-r1.ebuild 6803
-RMD160 acec383a3a7a73e7d9564b62cc44db94f9637bec splashutils-1.1.9.10-r1.ebuild 6803
-SHA256 c49c7d0b657242f3e70448f9c2ecd864d8a46a6491f09c2104c2baf556f53487 splashutils-1.1.9.10-r1.ebuild 6803
-MD5 2386738058615478a9b3c51dd6d7b919 splashutils-1.1.9.8-r1.ebuild 6440
-RMD160 6ab3a724189ad9bf14e8790c0d769393504426de splashutils-1.1.9.8-r1.ebuild 6440
-SHA256 98cab7e9ba08fce1d1944296d8cf5f282faa40a7d7a3c24271ccbf6ec5ddb410 splashutils-1.1.9.8-r1.ebuild 6440
+MD5 35cc14c0e9021cf2b900e89588015f07 files/digest-splashutils-1.1.9.10-r1 1774
+RMD160 12af3f46f7d493c35d5411de6ef76478b4d34145 files/digest-splashutils-1.1.9.10-r1 1774
+SHA256 ae313288aa756133eb20f3c3f738003bcdf7176636cabd47918916dae8fbd036 files/digest-splashutils-1.1.9.10-r1 1774
+MD5 f94a2c7d921f0fb8a93e7870384730a7 files/digest-splashutils-1.1.9.8-r1 2009
+RMD160 98e1467215be8e850a1164aa7d86833e67680991 files/digest-splashutils-1.1.9.8-r1 2009
+SHA256 791d499355b791860bab3f2fc5b30e3a946536395d503bfa7bc4af4ddf2b19f7 files/digest-splashutils-1.1.9.8-r1 2009
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
+Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFESkO6chej4aZK9/cRAg/hAJwN5/BdLY9iZxNMtLhbA7MivHMwKQCdHBwP
-oQEKdD2UFKJAfS/BkH9xn3Q=
-=u5Ls
+iD8DBQFEtMxGchej4aZK9/cRArWoAJ0U8178MzTxbuH0hq/ye2qCVwQpPwCfb+01
+/5XUdG5Y5G/MptuKJA0kcRA=
+=03Di
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/splashutils/splashutils-1.1.9.10-r1.ebuild b/media-gfx/splashutils/splashutils-1.1.9.10-r1.ebuild
index 1ebfc655d0bc..adff4f01ad0a 100644
--- a/media-gfx/splashutils/splashutils-1.1.9.10-r1.ebuild
+++ b/media-gfx/splashutils/splashutils-1.1.9.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.1.9.10-r1.ebuild,v 1.4 2006/04/16 19:59:40 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.1.9.10-r1.ebuild,v 1.5 2006/07/12 10:17:24 spock Exp $
 
 inherit eutils multilib linux-mod
 
@@ -123,6 +123,8 @@ src_unpack() {
 	if ! use truetype ; then
 		sed -i -e 's/fbtruetype kbd/kbd/' ${SM}/Makefile
 	fi
+
+	epunt_cxx
 }
 
 src_compile() {
diff --git a/media-gfx/splashutils/splashutils-1.1.9.8-r1.ebuild b/media-gfx/splashutils/splashutils-1.1.9.8-r1.ebuild
index 453eb5414ab3..c837bd3b7fba 100644
--- a/media-gfx/splashutils/splashutils-1.1.9.8-r1.ebuild
+++ b/media-gfx/splashutils/splashutils-1.1.9.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.1.9.8-r1.ebuild,v 1.2 2006/03/02 18:50:39 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.1.9.8-r1.ebuild,v 1.3 2006/07/12 10:17:24 spock Exp $
 
 inherit eutils multilib linux-mod
 
@@ -113,6 +113,8 @@ src_unpack() {
 
 	# Setup the kernel object directory
 	echo "KRNLOBJ = ${KV_OUT_DIR}" >> ${S}/libs/klibc-${V_KLIBC}/MCONFIG
+
+	epunt_cxx
 }
 
 src_compile() {