Support for fontconfig 2.2

3 files changed, 67 insertions, 49 deletions

diff --git a/kde-base/kdebase/Manifest b/kde-base/kdebase/Manifest
index 63f3c09c7adb..e5ade1c4b823 100644
--- a/kde-base/kdebase/Manifest
+++ b/kde-base/kdebase/Manifest
@@ -1,68 +1,69 @@
-MD5 ca73db9b94c492139a32e5fd957114f6 kdebase-3.1.1a.ebuild 3610
-MD5 6ba0e2e9989556df9f0b79f75047a400 kdebase-3.1.2.ebuild 3647
-MD5 97c3ee75d6a4fde7ac863fd664d4eb5f kdebase-3.1-r1.ebuild 3805
+MD5 ddb0727df5c7b48c4a21f6ca92f764bd ChangeLog 13859
+MD5 c9aae02d663167cd32e6e0be07b66e84 kdebase-2.2.2-r4.ebuild 2811
+MD5 e5df5ef4b2369f3349fb61c6f567b230 kdebase-3.0.4-r3.ebuild 4489
+MD5 34e832659ad20dad4378fe1dbd192f17 kdebase-3.0.5a-r2.ebuild 8502
+MD5 abbe2ac5e9c940d44fa2a15503f10e66 kdebase-3.0.5a.ebuild 4189
 MD5 8abae83002b281ed8245261bfafe8763 kdebase-3.0.5b.ebuild 8115
+MD5 97c3ee75d6a4fde7ac863fd664d4eb5f kdebase-3.1-r1.ebuild 3805
 MD5 b46aebf341a449ebe4dcf597a5cc09f4 kdebase-3.1.1-r1.ebuild 3414
-MD5 e5df5ef4b2369f3349fb61c6f567b230 kdebase-3.0.4-r3.ebuild 4489
 MD5 378cf74d42ba6d30ccd0b61c420b1b96 kdebase-3.1.1.ebuild 3315
-MD5 f5e53e01db11fbdf081b5eec3e383d59 kdebase-2.2.2-r5.ebuild 2943
+MD5 ca73db9b94c492139a32e5fd957114f6 kdebase-3.1.1a.ebuild 3610
 MD5 4616c3a5dac71294a65bd62b42550cc6 kdebase-3.1.ebuild 3320
-MD5 abbe2ac5e9c940d44fa2a15503f10e66 kdebase-3.0.5a.ebuild 4189
-MD5 ddb0727df5c7b48c4a21f6ca92f764bd ChangeLog 13859
-MD5 34e832659ad20dad4378fe1dbd192f17 kdebase-3.0.5a-r2.ebuild 8502
-MD5 c9aae02d663167cd32e6e0be07b66e84 kdebase-2.2.2-r4.ebuild 2811
+MD5 f5e53e01db11fbdf081b5eec3e383d59 kdebase-2.2.2-r5.ebuild 2943
+MD5 5489ff7f68ae9cbc0f08f902c1418e19 kdebase-3.1.2.ebuild 3772
+MD5 79fc6f0cd8a9dfcaf9acec89c1e53685 files/digest-kdebase-2.2.2-r4 135
+MD5 4b4d530bf8e05f89991d2161242da3f2 files/digest-kdebase-3.0.4-r3 68
 MD5 d06aabcc5fd1c39bc732b7571318d5d2 files/digest-kdebase-3.0.5a 69
+MD5 d06aabcc5fd1c39bc732b7571318d5d2 files/digest-kdebase-3.0.5a-r2 69
 MD5 c07ead342cf5e19907a9ba978d713d80 files/digest-kdebase-3.0.5b 69
-MD5 1c511caae066d700eabea2058d8caae3 files/digest-kdebase-3.1.1a 136
+MD5 94f7c5a331319b84b9a54094c2e6641e files/digest-kdebase-3.1 66
 MD5 94f7c5a331319b84b9a54094c2e6641e files/digest-kdebase-3.1-r1 66
+MD5 7a40dbe0a3460fa95aa08d1a6df1af8a files/digest-kdebase-3.1.1 68
+MD5 7a40dbe0a3460fa95aa08d1a6df1af8a files/digest-kdebase-3.1.1-r1 68
+MD5 1c511caae066d700eabea2058d8caae3 files/digest-kdebase-3.1.1a 136
 MD5 b048371a651391ef2bb4166e40e6adff files/kde.pam 405
-MD5 d06aabcc5fd1c39bc732b7571318d5d2 files/digest-kdebase-3.0.5a-r2 69
 MD5 6eb40b28a36f889d0f1919cdbf160ef7 files/kscreensaver.pam 79
-MD5 4b4d530bf8e05f89991d2161242da3f2 files/digest-kdebase-3.0.4-r3 68
-MD5 7a40dbe0a3460fa95aa08d1a6df1af8a files/digest-kdebase-3.1.1-r1 68
-MD5 79fc6f0cd8a9dfcaf9acec89c1e53685 files/digest-kdebase-2.2.2-r4 135
-MD5 63e277899292d5e8e765367ab6f4234c files/digest-kdebase-2.2.2-r5 210
-MD5 7a40dbe0a3460fa95aa08d1a6df1af8a files/digest-kdebase-3.1.1 68
 MD5 ad9e6eef841435f5c66f31ef9874c563 files/digest-kdebase-3.1.2 68
-MD5 94f7c5a331319b84b9a54094c2e6641e files/digest-kdebase-3.1 66
-MD5 7db6d7353b1bfbb47d44e9df63be1410 files/3.1/kdmrc 17661
-MD5 a500709e4a41d613bd4a59bcc7d9a11c files/3.1/startkde-3.1-gentoo.diff 1848
-MD5 2f1f31f38b93136baeb537500c8cfabc files/3.1/backgroundrc 342
-MD5 7db6d7353b1bfbb47d44e9df63be1410 files/3.1.1/kdmrc 17661
-MD5 2f1f31f38b93136baeb537500c8cfabc files/3.1.1/backgroundrc 342
-MD5 f12f03b607574596c17507007591b61b files/3.1.1/startkde-3.1.1-gentoo.diff 1879
-MD5 ce285a04f7eaf402c947046989a141f1 files/3.1.2/startkde-3.1.2-gentoo.diff 1878
-MD5 7db6d7353b1bfbb47d44e9df63be1410 files/3.1.2/kdmrc 17661
-MD5 2f1f31f38b93136baeb537500c8cfabc files/3.1.2/backgroundrc 342
-MD5 7c9cbd2320beaf7cd91b417794e172d2 files/3.1.2/sftp.patch 337
+MD5 63e277899292d5e8e765367ab6f4234c files/digest-kdebase-2.2.2-r5 210
+MD5 4653ca8833aa10adb3a4d2fe0afa1863 files/2.2.2-r4/startkde-2.2.2-r4-gentoo 4010
 MD5 41d954f907dd2ba220ebca498e7f1735 files/3.0.4-r3/kdebase-3.0.4-konsole-qt31.diff 611
-MD5 5a8c948b28b4558217ee06a9ea0c0305 files/3.0.4-r3/startkde-3.0.4-r3-gentoo.diff 1605
 MD5 b0dd1d862909571ddd17ea58bf3925d4 files/3.0.4-r3/kdebase-3.0.4-nspluginviewer-qt31.diff.gz 13733
 MD5 54c424a5920645360378aa5f494d35b2 files/3.0.4-r3/kdebase-3.0.4-xft1.1-fix.diff 3129
 MD5 867ead4d7b68109c1437e1b96eb26342 files/3.0.4-r3/kdebase-3.0.4-xft_h-fix.diff 214
-MD5 a4c64296993987d930fb938a3902b51b files/3.1.1-r1/kdebase-3.1.1-kdm.diff 5975
-MD5 f12f03b607574596c17507007591b61b files/3.1.1-r1/startkde-3.1.1-r1-gentoo.diff 1879
-MD5 7db6d7353b1bfbb47d44e9df63be1410 files/3.1.1-r1/kdmrc 17661
-MD5 2f1f31f38b93136baeb537500c8cfabc files/3.1.1-r1/backgroundrc 342
-MD5 7814212b71b6d5ef8a1fb4042d9d9edc files/3.1.1-r1/kdebase-3.1.1-minicli.diff 772
-MD5 4653ca8833aa10adb3a4d2fe0afa1863 files/2.2.2-r4/startkde-2.2.2-r4-gentoo 4010
-MD5 4653ca8833aa10adb3a4d2fe0afa1863 files/2.2.2-r5/startkde-2.2.2-r5-gentoo 4010
-MD5 91f01b28ae245f6af19ea53cb5586101 files/3.0.5a-r2/kdebase-3.0.5a-nspluginviewer-qt31.diff.gz 36346
-MD5 290aae1d211e55fcc2e6aa54859eb342 files/3.0.5a-r2/kdebase-3.0.5a-xft2.0-fix.diff 4745
-MD5 836a4045534a443437eea7506a7fa3f7 files/3.0.5a-r2/startkde-3.0.5a-r2-gentoo.diff 1641
-MD5 867ead4d7b68109c1437e1b96eb26342 files/3.0.5a-r2/kdebase-3.0.5a-xft_h-fix.diff 214
+MD5 5a8c948b28b4558217ee06a9ea0c0305 files/3.0.4-r3/startkde-3.0.4-r3-gentoo.diff 1605
 MD5 91f01b28ae245f6af19ea53cb5586101 files/3.0.5a/kdebase-3.0.5a-nspluginviewer-qt31.diff.gz 36346
 MD5 54c424a5920645360378aa5f494d35b2 files/3.0.5a/kdebase-3.0.5a-xft1.1-fix.diff 3129
 MD5 867ead4d7b68109c1437e1b96eb26342 files/3.0.5a/kdebase-3.0.5a-xft_h-fix.diff 214
 MD5 32feb8257a8724e235935b111fa98a94 files/3.0.5a/startkde-3.0.5a-gentoo.diff 1608
+MD5 91f01b28ae245f6af19ea53cb5586101 files/3.0.5a-r2/kdebase-3.0.5a-nspluginviewer-qt31.diff.gz 36346
+MD5 290aae1d211e55fcc2e6aa54859eb342 files/3.0.5a-r2/kdebase-3.0.5a-xft2.0-fix.diff 4745
+MD5 867ead4d7b68109c1437e1b96eb26342 files/3.0.5a-r2/kdebase-3.0.5a-xft_h-fix.diff 214
+MD5 836a4045534a443437eea7506a7fa3f7 files/3.0.5a-r2/startkde-3.0.5a-r2-gentoo.diff 1641
 MD5 91f01b28ae245f6af19ea53cb5586101 files/3.0.5b/kdebase-3.0.5b-nspluginviewer-qt31.diff.gz 36346
-MD5 836a4045534a443437eea7506a7fa3f7 files/3.0.5b/startkde-3.0.5b-gentoo.diff 1641
-MD5 867ead4d7b68109c1437e1b96eb26342 files/3.0.5b/kdebase-3.0.5b-xft_h-fix.diff 214
 MD5 290aae1d211e55fcc2e6aa54859eb342 files/3.0.5b/kdebase-3.0.5b-xft2.0-fix.diff 4745
-MD5 7db6d7353b1bfbb47d44e9df63be1410 files/3.1.1a/kdmrc 17661
-MD5 2f1f31f38b93136baeb537500c8cfabc files/3.1.1a/backgroundrc 342
-MD5 f12f03b607574596c17507007591b61b files/3.1.1a/startkde-3.1.1a-gentoo.diff 1879
-MD5 7db6d7353b1bfbb47d44e9df63be1410 files/3.1-r1/kdmrc 17661
+MD5 867ead4d7b68109c1437e1b96eb26342 files/3.0.5b/kdebase-3.0.5b-xft_h-fix.diff 214
+MD5 836a4045534a443437eea7506a7fa3f7 files/3.0.5b/startkde-3.0.5b-gentoo.diff 1641
+MD5 2f1f31f38b93136baeb537500c8cfabc files/3.1/backgroundrc 342
+MD5 7db6d7353b1bfbb47d44e9df63be1410 files/3.1/kdmrc 17661
+MD5 a500709e4a41d613bd4a59bcc7d9a11c files/3.1/startkde-3.1-gentoo.diff 1848
 MD5 2f1f31f38b93136baeb537500c8cfabc files/3.1-r1/backgroundrc 342
-MD5 4c83f4f577a2cbcf7021fef0f2482fcc files/3.1-r1/startkde-3.1-r1-gentoo.diff 1901
 MD5 e5929c2c92c147f160b824c6fed8b573 files/3.1-r1/kdebase-3.1-kpager.diff 521
+MD5 7db6d7353b1bfbb47d44e9df63be1410 files/3.1-r1/kdmrc 17661
+MD5 4c83f4f577a2cbcf7021fef0f2482fcc files/3.1-r1/startkde-3.1-r1-gentoo.diff 1901
+MD5 2f1f31f38b93136baeb537500c8cfabc files/3.1.1/backgroundrc 342
+MD5 7db6d7353b1bfbb47d44e9df63be1410 files/3.1.1/kdmrc 17661
+MD5 f12f03b607574596c17507007591b61b files/3.1.1/startkde-3.1.1-gentoo.diff 1879
+MD5 2f1f31f38b93136baeb537500c8cfabc files/3.1.1-r1/backgroundrc 342
+MD5 a4c64296993987d930fb938a3902b51b files/3.1.1-r1/kdebase-3.1.1-kdm.diff 5975
+MD5 7814212b71b6d5ef8a1fb4042d9d9edc files/3.1.1-r1/kdebase-3.1.1-minicli.diff 772
+MD5 7db6d7353b1bfbb47d44e9df63be1410 files/3.1.1-r1/kdmrc 17661
+MD5 f12f03b607574596c17507007591b61b files/3.1.1-r1/startkde-3.1.1-r1-gentoo.diff 1879
+MD5 2f1f31f38b93136baeb537500c8cfabc files/3.1.1a/backgroundrc 342
+MD5 7db6d7353b1bfbb47d44e9df63be1410 files/3.1.1a/kdmrc 17661
+MD5 f12f03b607574596c17507007591b61b files/3.1.1a/startkde-3.1.1a-gentoo.diff 1879
+MD5 2f1f31f38b93136baeb537500c8cfabc files/3.1.2/backgroundrc 342
+MD5 7db6d7353b1bfbb47d44e9df63be1410 files/3.1.2/kdmrc 17661
+MD5 ce285a04f7eaf402c947046989a141f1 files/3.1.2/startkde-3.1.2-gentoo.diff 1878
+MD5 7c9cbd2320beaf7cd91b417794e172d2 files/3.1.2/sftp.patch 337
+MD5 9d860dc75112c99b5706fb02c9eacae0 files/3.1.2/fontconfig-2.2-support.patch 696
+MD5 4653ca8833aa10adb3a4d2fe0afa1863 files/2.2.2-r5/startkde-2.2.2-r5-gentoo 4010
diff --git a/kde-base/kdebase/files/3.1.2/fontconfig-2.2-support.patch b/kde-base/kdebase/files/3.1.2/fontconfig-2.2-support.patch
new file mode 100644
index 000000000000..94ad898a93a7
--- /dev/null
+++ b/kde-base/kdebase/files/3.1.2/fontconfig-2.2-support.patch
@@ -0,0 +1,14 @@
+--- kcontrol/fonts/configure.in.in.old	2003-05-07 13:44:01.000000000 +0200
++++ kcontrol/fonts/configure.in.in	2003-05-15 19:52:31.000000000 +0200
+@@ -2,6 +2,11 @@
+   AC_MSG_WARN([Could not find libfontconfig anywhere, check http://www.fontconfig.org/])
+ ])
+ 
++PKG_CHECK_MODULES(LIBFONTCONFIG, fontconfig)
++if test -n "$LIBFONTCONFIG_LIBS"; then
++     AC_DEFINE_UNQUOTED(HAVE_FONTCONFIG, 1, [Defines if your system has the libfontconfig library])
++fi
++
+ if test -n "$FONTCONFIG_CONFIG"; then
+   vers=`$FONTCONFIG_CONFIG --version 2>/dev/null | sed -e 's/libfontconfig //' | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
+   if test -n "$vers" && test "$vers" -ge 1000000
diff --git a/kde-base/kdebase/kdebase-3.1.2.ebuild b/kde-base/kdebase/kdebase-3.1.2.ebuild
index 794c46b44f7a..21ae8751c435 100644
--- a/kde-base/kdebase/kdebase-3.1.2.ebuild
+++ b/kde-base/kdebase/kdebase-3.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.1.2.ebuild,v 1.2 2003/05/13 01:28:08 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.1.2.ebuild,v 1.3 2003/05/16 21:06:02 brain Exp $
 inherit kde-dist eutils
 
 IUSE="ldap pam motif encode oggvorbis cups ssl opengl samba java"
@@ -19,7 +19,8 @@ newdepend ">=media-sound/cdparanoia-3.9.8
 	opengl? ( virtual/opengl )
 	samba? ( net-fs/samba )
 	java? ( virtual/jdk )
-	>=media-libs/freetype-2" 
+	>=media-libs/freetype-2
+	dev-util/pkgconfig" 
 #	lm_sensors? ( ?/lm_sensors ) # ebuild doesn't exist yet
 
 RDEPEND="$RDEPEND sys-apps/eject"
@@ -37,9 +38,11 @@ use ssl		&& myconf="$myconf --with-ssl"		|| myconf="$myconf --without-ssl"
 use pam		&& myconf="$myconf --with-pam=yes"	|| myconf="$myconf --with-pam=no --with-shadow"
 use java	&& myconf="$myconf --with-java=$(java-config --jdk-home)"	|| myconf="$myconf --without-java"
 
-PATCHES="$FILESDIR/$PVR/sftp.patch"
+PATCHES="$FILESDIR/$PVR/sftp.patch $FILESDIR/$PVR/fontconfig-2.2-support.patch"
 
 src_compile() {
+	rm -f configure configure.in
+	make -f admin/Makefile.common
 	kde_src_compile myconf configure
 	kde_remove_flag kdm/kfrontend -fomit-frame-pointer
 	kde_src_compile make