revision bump for ppc64 key problem; stable on ppc64 only

Package-Manager: portage-2.0.51.19

5 files changed, 201 insertions, 44 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index dacce89e11e4..d0fb87f881fc 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.211 2005/03/13 23:23:23 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.212 2005/03/14 18:01:43 corsair Exp $
+
+*kdelibs-3.3.2-r6 (14 Mar 2005)
+
+  14 Mar 2005; Markus Rothe <corsair@gentoo.org>
+  +files/kdelibs-3.3.2-ppc64.patch, +kdelibs-3.3.2-r6.ebuild:
+  Added patch which fixes a weird key problem on ppc64. Revision bump which is
+  stable on ppc64 only. Bug #63529
 
   13 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kdelibs-3.4.0.ebuild:
   Marked ~amd64, keywording KDE split ebuilds, bug 80944.
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 8f2e3f40698f..127022ca24d6 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -1,57 +1,50 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 67696ae942c29ed0075597a29214b6ca ChangeLog 34312
+MD5 e9880699449565ce112cfb096a2b73bf kdelibs-3.3.2-r3.ebuild 3291
 MD5 46de211493d01cca0a5916b85f7ed074 kdelibs-3.2.3-r6.ebuild 3005
-MD5 79b789f02dced6acb0daf91de04bd55c kdelibs-3.3.2-r2.ebuild 3153
 MD5 3110a84a8fab7b6ed8b7e2d6d8458eae kdelibs-3.4.0_rc1-r1.ebuild 2637
-MD5 a269dba5d66751563def52ffa62c65f5 kdelibs-3.3.2-r4.ebuild 3348
-MD5 fcbbc60f31a8a5ec853b401b5a058e9d kdelibs-3.4.0_beta2.ebuild 2701
-MD5 2c0cb12da53349c06a23f2485a3f2fe9 kdelibs-3.3.1-r2.ebuild 2986
-MD5 642ea25c3926d67609ba51eb5730114f kdelibs-3.2.3-r5.ebuild 2940
-MD5 3021246221af32533fb1f3160f64c179 kdelibs-3.4.0.ebuild 2685
 MD5 a54271a06765de123e3afaad451fbadc kdelibs-3.2.3-r7.ebuild 3002
-MD5 e9880699449565ce112cfb096a2b73bf kdelibs-3.3.2-r3.ebuild 3291
-MD5 ea27e399daaad758dcac0697981f3584 kdelibs-3.4.0_beta1.ebuild 2813
-MD5 9554b29ff4c92d8d60193eea86ee98f1 ChangeLog 34051
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
+MD5 642ea25c3926d67609ba51eb5730114f kdelibs-3.2.3-r5.ebuild 2940
+MD5 2c0cb12da53349c06a23f2485a3f2fe9 kdelibs-3.3.1-r2.ebuild 2986
+MD5 79b789f02dced6acb0daf91de04bd55c kdelibs-3.3.2-r2.ebuild 3153
+MD5 ea27e399daaad758dcac0697981f3584 kdelibs-3.4.0_beta1.ebuild 2813
+MD5 fcbbc60f31a8a5ec853b401b5a058e9d kdelibs-3.4.0_beta2.ebuild 2701
+MD5 a269dba5d66751563def52ffa62c65f5 kdelibs-3.3.2-r4.ebuild 3348
 MD5 ace31212785d2c9045a3f337339dd8e0 kdelibs-3.3.2-r5.ebuild 3345
-MD5 e5285c7be708bc634b61a720515f2091 files/kdelibs-3.4.0_beta2-export-symbols-for-bindings.diff 5733
-MD5 1c47f3fafa13fcf69ce4cb1c474f5643 files/digest-kdelibs-3.4.0_beta1 69
-MD5 c4a839a9c3a59950aa5e8db4e312d219 files/digest-kdelibs-3.4.0_beta2 69
+MD5 3021246221af32533fb1f3160f64c179 kdelibs-3.4.0.ebuild 2685
+MD5 a035952084a62e407328599ea1263b36 kdelibs-3.3.2-r6.ebuild 3409
+MD5 3f21fc4e8ddbf79459bfa8f2df1a5e15 files/animated-gif-fix.patch 317
+MD5 dd2a593a052e2ea070d310e38297bec0 files/digest-kdelibs-3.3.2-r3 68
 MD5 25ab050b323a8efb2049fd770f50058b files/kdelibs-3.3.2-anchor-fix.patch 5947
-MD5 a9840789442b11d5f1d4418b706566a7 files/post-3.3.1-kdelibs-kio.diff 1324
-MD5 0046c691fa833b2ff8d7eac15312a68b files/post-3.2.3-kdelibs-dcopserver.patch 4751
-MD5 a639b7b592f005e911c454a0a8c9c542 files/post-3.2.3-kdelibs-kioslave.patch 549
-MD5 ca12b078c7288ce9b2653e639a5b3ee0 files/post-3.2.3-kdelibs-kcookiejar.patch 5384
+MD5 57b3bdaa9934d84f320c1aa40a56afe4 files/digest-kdelibs-3.2.3-r5 68
 MD5 a5d3cb18c9572d8ca3dd06cbe5d226f1 files/kde3-dcopidlng.patch 681
+MD5 c4a839a9c3a59950aa5e8db4e312d219 files/digest-kdelibs-3.4.0_beta2 69
+MD5 d3df6d042148fd884422822aaf4ffbab files/kdelibs-3.3.2-aspell-dir.patch 467
+MD5 e5285c7be708bc634b61a720515f2091 files/kdelibs-3.4.0_beta2-export-symbols-for-bindings.diff 5733
+MD5 57b3bdaa9934d84f320c1aa40a56afe4 files/digest-kdelibs-3.2.3-r6 68
+MD5 3b4b9a9cd4249a8f5aafe27a234db33c files/kdelibs-3.4.0_beta2-export-kio-symbols.diff 819
 MD5 29bcfee4f3cecd8529fa92ce4caba53c files/digest-kdelibs-3.4.0_rc1-r1 72
+MD5 57b3bdaa9934d84f320c1aa40a56afe4 files/digest-kdelibs-3.2.3-r7 68
+MD5 0046c691fa833b2ff8d7eac15312a68b files/post-3.2.3-kdelibs-dcopserver.patch 4751
 MD5 119cc73926dceafff9107b5f916277ee files/post-3.2.3-kdelibs-htmlframes.patch 15435
-MD5 7e082af5fd71b9b01d01a86f31646499 files/post-3.3.2-kdelibs-htmlframes2.patch 989
+MD5 ca12b078c7288ce9b2653e639a5b3ee0 files/post-3.2.3-kdelibs-kcookiejar.patch 5384
+MD5 345ce2e01cfdfa4754c47894c0271dcc files/post-3.2.3-kdelibs-kstandarddirs.patch 1417
+MD5 dd2a593a052e2ea070d310e38297bec0 files/digest-kdelibs-3.3.2-r4 68
+MD5 a874ee470150aacab38ec42463cac4dd files/digest-kdelibs-3.3.1-r2 68
+MD5 dd2a593a052e2ea070d310e38297bec0 files/digest-kdelibs-3.3.2-r2 68
+MD5 1f98b72b586d9a988c47dfce380dd8b6 files/post-3.2.3-kdelibs-htmlframes2.patch 975
 MD5 5e9c627e4e9e367ce88ed62a0a9ac162 files/post-3.2.3-kdelibs-khtml.diff 2411
-MD5 3b4b9a9cd4249a8f5aafe27a234db33c files/kdelibs-3.4.0_beta2-export-kio-symbols.diff 819
-MD5 1b408d4b494b5328cd15768991836fd8 files/post-3.3.2-kdelibs-kio.diff 1442
-MD5 fed1da1d587ee8aa43b3affc1fa9a35b files/post-3.3.1-kdelibs-khtml.diff 2447
+MD5 0ce7a1c41d2bc3c102c6c4d4a6ba8f0b files/post-3.2.3-kdelibs-kio.diff 1315
 MD5 7e082af5fd71b9b01d01a86f31646499 files/post-3.3.1-kdelibs-htmlframes2.patch 989
-MD5 3f21fc4e8ddbf79459bfa8f2df1a5e15 files/animated-gif-fix.patch 317
-MD5 1f98b72b586d9a988c47dfce380dd8b6 files/post-3.2.3-kdelibs-htmlframes2.patch 975
-MD5 661f99a406078c89ff9cae9fd67fd28a files/digest-kdelibs-3.4.0 68
-MD5 345ce2e01cfdfa4754c47894c0271dcc files/post-3.2.3-kdelibs-kstandarddirs.patch 1417
+MD5 fed1da1d587ee8aa43b3affc1fa9a35b files/post-3.3.1-kdelibs-khtml.diff 2447
+MD5 a9840789442b11d5f1d4418b706566a7 files/post-3.3.1-kdelibs-kio.diff 1324
+MD5 7e082af5fd71b9b01d01a86f31646499 files/post-3.3.2-kdelibs-htmlframes2.patch 989
+MD5 1b408d4b494b5328cd15768991836fd8 files/post-3.3.2-kdelibs-kio.diff 1442
+MD5 a639b7b592f005e911c454a0a8c9c542 files/post-3.2.3-kdelibs-kioslave.patch 549
 MD5 fe67157b26a8cdf5bcfa1898cdf3b154 files/post-3.3.2-kdelibs-kioslave.patch 663
-MD5 d3df6d042148fd884422822aaf4ffbab files/kdelibs-3.3.2-aspell-dir.patch 467
+MD5 1c47f3fafa13fcf69ce4cb1c474f5643 files/digest-kdelibs-3.4.0_beta1 69
 MD5 054d042dcbccec0be386a2d26d30a5b1 files/reference-list-rev-1.3.diff 526
-MD5 0ce7a1c41d2bc3c102c6c4d4a6ba8f0b files/post-3.2.3-kdelibs-kio.diff 1315
-MD5 57b3bdaa9934d84f320c1aa40a56afe4 files/digest-kdelibs-3.2.3-r5 68
-MD5 57b3bdaa9934d84f320c1aa40a56afe4 files/digest-kdelibs-3.2.3-r6 68
-MD5 57b3bdaa9934d84f320c1aa40a56afe4 files/digest-kdelibs-3.2.3-r7 68
-MD5 a874ee470150aacab38ec42463cac4dd files/digest-kdelibs-3.3.1-r2 68
-MD5 dd2a593a052e2ea070d310e38297bec0 files/digest-kdelibs-3.3.2-r2 68
-MD5 dd2a593a052e2ea070d310e38297bec0 files/digest-kdelibs-3.3.2-r3 68
-MD5 dd2a593a052e2ea070d310e38297bec0 files/digest-kdelibs-3.3.2-r4 68
 MD5 dd2a593a052e2ea070d310e38297bec0 files/digest-kdelibs-3.3.2-r5 68
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCNMuVntT9W3vfTuoRAkQlAKCGAbVX/a6VcIruejhT1Ds//Hm6EQCeOOMl
-ZdRSe/JF+dH/Ivfnu4Cntys=
-=jJMD
------END PGP SIGNATURE-----
+MD5 661f99a406078c89ff9cae9fd67fd28a files/digest-kdelibs-3.4.0 68
+MD5 40783b984dcb127c8852246f7eb0a1e8 files/kdelibs-3.3.2-ppc64.patch 957
+MD5 dd2a593a052e2ea070d310e38297bec0 files/digest-kdelibs-3.3.2-r6 68
diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.3.2-r6 b/kde-base/kdelibs/files/digest-kdelibs-3.3.2-r6
new file mode 100644
index 000000000000..bc59a2da5ef1
--- /dev/null
+++ b/kde-base/kdelibs/files/digest-kdelibs-3.3.2-r6
@@ -0,0 +1 @@
+MD5 0473fb4c6c2cd2bc0f267cfa201f3fd8 kdelibs-3.3.2.tar.bz2 15623180
diff --git a/kde-base/kdelibs/files/kdelibs-3.3.2-ppc64.patch b/kde-base/kdelibs/files/kdelibs-3.3.2-ppc64.patch
new file mode 100644
index 000000000000..7fbeba177c48
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-3.3.2-ppc64.patch
@@ -0,0 +1,35 @@
+--- kdecore/kkeyserver_x11.cpp.orig	2005-03-14 16:50:52.696326808 +0000
++++ kdecore/kkeyserver_x11.cpp	2005-03-14 16:52:40.241351192 +0000
+@@ -640,6 +640,7 @@
+ 
+ bool codeXToSym( uchar codeX, uint modX, uint& sym )
+ {
++	KeySym keySym;
+ 	XKeyPressedEvent event;
+ 
+ 	event.type = KeyPress;
+@@ -647,7 +648,8 @@
+ 	event.state = modX;
+ 	event.keycode = codeX;
+ 
+-	XLookupString( &event, 0, 0, (KeySym*) &sym, 0 );
++	XLookupString( &event, 0, 0, &keySym, 0 );
++	sym = (uint) keySym;
+ 	return true;
+ }
+ 
+--- kdecore/kkeynative_x11.cpp.orig	2005-03-14 16:53:11.868337144 +0000
++++ kdecore/kkeynative_x11.cpp	2005-03-14 16:53:57.579311152 +0000
+@@ -71,9 +71,11 @@
+ 
+ bool KKeyNative::init( const XEvent* pEvent )
+ {
++	KeySym keySym;
+ 	m_code = pEvent->xkey.keycode;
+ 	m_mod = pEvent->xkey.state;
+-	XLookupString( (XKeyEvent*) pEvent, 0, 0, (KeySym*) &m_sym, 0 );
++	XLookupString( (XKeyEvent*) pEvent, 0, 0, &keySym, 0 );
++	m_sym = (uint) keySym;
+ 	return true;
+ }
+ 
diff --git a/kde-base/kdelibs/kdelibs-3.3.2-r6.ebuild b/kde-base/kdelibs/kdelibs-3.3.2-r6.ebuild
new file mode 100644
index 000000000000..fcc44b291036
--- /dev/null
+++ b/kde-base/kdelibs/kdelibs-3.3.2-r6.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.3.2-r6.ebuild,v 1.1 2005/03/14 18:01:43 corsair Exp $
+
+inherit kde eutils flag-o-matic
+set-kdedir 3.3
+
+DESCRIPTION="KDE libraries needed by all kde programs"
+HOMEPAGE="http://www.kde.org/"
+SRC_URI="mirror://kde/stable/${PV}/src/${PN}-${PV}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="3.3"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc ppc64 ~sparc ~x86 ~alpha"
+IUSE="alsa arts cups doc ipv6 kerberos ldap spell ssl tiff"
+
+# kde.eclass has kdelibs in DEPEND, and we can't have that in here.
+# so we recreate the entire DEPEND from scratch.
+RDEPEND="arts? ( ~kde-base/arts-1.3.2 )
+	>=x11-libs/qt-3.3.3
+	app-arch/bzip2
+	>=dev-libs/libxslt-1.1.4
+	>=dev-libs/libxml2-2.6.6
+	>=dev-libs/libpcre-4.2
+	ssl? ( >=dev-libs/openssl-0.9.7d )
+	alsa? ( media-libs/alsa-lib virtual/alsa )
+	cups? ( >=net-print/cups-1.1.19 )
+	ldap? ( >=net-nds/openldap-2.1.26 )
+	tiff? ( media-libs/tiff )
+	spell? ( || ( app-text/aspell
+		      app-text/ispell ) )
+	kerberos? ( virtual/krb5 )
+	virtual/fam
+	virtual/ghostscript
+	media-libs/libart_lgpl
+	net-dns/libidn
+	sys-devel/gettext"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.58
+	>=sys-devel/automake-1.8
+	doc? ( app-doc/doxygen )
+	!kde-misc/kgamma"
+
+src_unpack() {
+	kde_src_unpack
+	epatch ${FILESDIR}/post-3.3.2-kdelibs-kio.diff
+	epatch ${FILESDIR}/post-3.3.2-kdelibs-htmlframes2.patch
+	epatch ${FILESDIR}/post-3.3.2-kdelibs-kioslave.patch
+
+	# see bug #67748. Patch applied in kdelibs 3.4.x.
+	epatch ${FILESDIR}/${P}-aspell-dir.patch
+
+	# see bug #77127. Patch applied in kdelibs 3.3.3.
+	epatch ${FILESDIR}/${P}-anchor-fix.patch
+
+	# see bug #81652.
+	epatch ${FILESDIR}/kde3-dcopidlng.patch
+
+	# see bug #63529.
+	epatch ${FILESDIR}/${P}-ppc64.patch
+}
+
+src_compile() {
+	kde_src_compile myconf
+
+	myconf="$myconf --with-distribution=Gentoo --enable-libfam --enable-dnotify"
+	myconf="$myconf $(use_with alsa) $(use_enable cups) $(use_with arts)"
+
+	use ipv6	|| myconf="$myconf --with-ipv6-lookup=no"
+	use ssl		&& myconf="$myconf --with-ssl-dir=/usr"	|| myconf="$myconf --without-ssl"
+
+	use kerberos || myconf="$myconf --with-gssapi=no"
+
+	use x86 && myconf="$myconf --enable-fast-malloc=full"
+	use ppc64 && append-flags -mminimal-toc
+
+	kde_src_compile configure make
+
+	use doc && make apidox
+}
+
+src_install() {
+	kde_src_install
+	dohtml *.html
+
+	if use doc ; then
+		einfo "Copying API documentation..."
+		dodir ${KDEDIR}/share/doc/HTML/en/kdelibs-apidocs
+		cp -r ${S}/apidocs/* ${D}/$KDEDIR/share/doc/HTML/en/kdelibs-apidocs
+	else
+		rm -r ${D}/$KDEDIR/share/doc/HTML/en/kdelibs-apidocs
+	fi
+
+	# needed to fix lib64 issues on amd64, see bug #45669
+	use amd64 && ln -s ${KDEDIR}/lib ${D}/${KDEDIR}/lib64
+	# Needed to create lib -> lib64 symlink for amd64 2005.0 profile
+	if [ "${SYMLINK_LIB}" = "yes" ]; then
+		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) ${KDEDIR}/lib
+	fi
+
+	if ! use arts ; then
+
+		dodir /etc/env.d
+
+		echo "PATH=${PREFIX}/bin
+ROOTPATH=${PREFIX}/sbin:${PREFIX}/bin
+LDPATH=${PREFIX}/lib
+CONFIG_PROTECT=\"${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown\"" > ${D}/etc/env.d/47kdepaths-3.3.1 # number goes down with version upgrade
+
+	fi
+
+}
+
+pkg_postinst() {
+	if use doc ; then
+		rm $KDEDIR/share/doc/HTML/en/kdelibs-apidocs/common
+		ln -sf $KDEDIR/share/doc/HTML/en/common \
+			$KDEDIR/share/doc/HTML/en/kdelibs-apidocs/common
+	fi
+}