From: Caleb Tennis Date: Mon, 13 Dec 2004 15:15:07 +0000 (+0000) Subject: Rev bump for security bug fix #73869 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1036c4935026640acd76e1bb3db2b82989be6198;p=gentoo.git Rev bump for security bug fix #73869 --- diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog index 7df9f7758501..66fe824daa8c 100644 --- a/kde-base/kdelibs/ChangeLog +++ b/kde-base/kdelibs/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for kde-base/kdelibs # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.172 2004/12/09 17:51:18 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.173 2004/12/13 15:15:07 caleb Exp $ + +*kdelibs-3.2.3-r4 (13 Dec 2004) + + 13 Dec 2004; Caleb Tennis + +files/post-3.2.3-kdelibs-htmlframes2.patch, + +files/post-3.3.1-kdelibs-htmlframes2.patch, + +files/post-3.3.2-kdelibs-htmlframes2.patch, +kdelibs-3.2.3-r4.ebuild, + +kdelibs-3.3.1-r2.ebuild, +kdelibs-3.3.2-r1.ebuild: + Rev bump for security bug fix #73869 *kdelibs-3.3.1-r1 (09 Dec 2004) diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest index f33964399029..7a711fc8b3aa 100644 --- a/kde-base/kdelibs/Manifest +++ b/kde-base/kdelibs/Manifest @@ -3,10 +3,13 @@ MD5 79ad3c607a60e2726d82a6f0579af78d kdelibs-3.2.3-r3.ebuild 2828 MD5 8a989f55b68f5521cd6e86f131f78a6e kdelibs-3.1.5-r1.ebuild 2055 MD5 3c4af305c1f179c1d4e04ec8c5224a36 kdelibs-3.3.0.ebuild 3001 MD5 b707cac51f1876562c5dc8552788d09f kdelibs-3.2.2-r1.ebuild 2611 +MD5 82160abdfe32c5cb8eeac51ca97043e5 kdelibs-3.3.1-r2.ebuild 2986 MD5 a6e84bcc0ded1adff3f3555fbfda3ad7 kdelibs-3.3.2.ebuild 2876 +MD5 3244614cd7bf456f1848f3f7158940a1 kdelibs-3.3.2-r1.ebuild 2936 MD5 3076e42461e8f1a8cd2829c5307f6d39 kdelibs-3.2.3-r2.ebuild 2731 MD5 bc136d907a72bfa0d9f09352d18b4b9a kdelibs-3.3.1-r1.ebuild 2929 -MD5 94aba605053b0118e1cbe6bda71fbab6 ChangeLog 27608 +MD5 42b14b3985c7f3ff8f06dfcd67c59012 kdelibs-3.2.3-r4.ebuild 2885 +MD5 006bec955aff528c0eb011b4b7f2c7e6 ChangeLog 27949 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161 MD5 748d9bf5fe752ab9587b9d0c15a3eff6 kdelibs-3.3.1.ebuild 2849 MD5 a9840789442b11d5f1d4418b706566a7 files/post-3.3.1-kdelibs-kio.diff 1324 @@ -15,10 +18,13 @@ MD5 52e0e955204a77781505d33b9a3c341d files/post-3.2.2-kdelibs-ktelnetservice.pat MD5 285676023bab94666dfec728231cfcd1 files/kdelibs-3.2.2-su.cpp.diff 383 MD5 ca12b078c7288ce9b2653e639a5b3ee0 files/post-3.2.3-kdelibs-kcookiejar.patch 5384 MD5 119cc73926dceafff9107b5f916277ee files/post-3.2.3-kdelibs-htmlframes.patch 15435 +MD5 7e082af5fd71b9b01d01a86f31646499 files/post-3.3.2-kdelibs-htmlframes2.patch 989 MD5 5e9c627e4e9e367ce88ed62a0a9ac162 files/post-3.2.3-kdelibs-khtml.diff 2411 MD5 1b408d4b494b5328cd15768991836fd8 files/post-3.3.2-kdelibs-kio.diff 1442 MD5 fed1da1d587ee8aa43b3affc1fa9a35b files/post-3.3.1-kdelibs-khtml.diff 2447 +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 ee0b53e6fbaea17ae3543638dc09ca34 files/digest-kdelibs-3.2.0 68 MD5 bf08eeb18202c2640f0184420af9a19e files/digest-kdelibs-3.3.0 68 MD5 a874ee470150aacab38ec42463cac4dd files/digest-kdelibs-3.3.1 68 @@ -34,4 +40,7 @@ MD5 1e53bd5071cc4fe6ba67fda7252a1cf2 files/digest-kdelibs-3.1.5-r1 68 MD5 6176dc207f5ba91edee9b04ab111afe5 files/digest-kdelibs-3.2.2-r1 68 MD5 57b3bdaa9934d84f320c1aa40a56afe4 files/digest-kdelibs-3.2.3-r2 68 MD5 57b3bdaa9934d84f320c1aa40a56afe4 files/digest-kdelibs-3.2.3-r3 68 +MD5 57b3bdaa9934d84f320c1aa40a56afe4 files/digest-kdelibs-3.2.3-r4 68 MD5 a874ee470150aacab38ec42463cac4dd files/digest-kdelibs-3.3.1-r1 68 +MD5 a874ee470150aacab38ec42463cac4dd files/digest-kdelibs-3.3.1-r2 68 +MD5 dd2a593a052e2ea070d310e38297bec0 files/digest-kdelibs-3.3.2-r1 68 diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.2.3-r4 b/kde-base/kdelibs/files/digest-kdelibs-3.2.3-r4 new file mode 100644 index 000000000000..ab94bd8ba7fd --- /dev/null +++ b/kde-base/kdelibs/files/digest-kdelibs-3.2.3-r4 @@ -0,0 +1 @@ +MD5 d9d1c4bd2016a96f156b491ca908dc16 kdelibs-3.2.3.tar.bz2 12737024 diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.3.1-r2 b/kde-base/kdelibs/files/digest-kdelibs-3.3.1-r2 new file mode 100644 index 000000000000..d9d5a99e33bc --- /dev/null +++ b/kde-base/kdelibs/files/digest-kdelibs-3.3.1-r2 @@ -0,0 +1 @@ +MD5 8636c93405b20eceadb12af5c5483508 kdelibs-3.3.1.tar.bz2 15573765 diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.3.2-r1 b/kde-base/kdelibs/files/digest-kdelibs-3.3.2-r1 new file mode 100644 index 000000000000..bc59a2da5ef1 --- /dev/null +++ b/kde-base/kdelibs/files/digest-kdelibs-3.3.2-r1 @@ -0,0 +1 @@ +MD5 0473fb4c6c2cd2bc0f267cfa201f3fd8 kdelibs-3.3.2.tar.bz2 15623180 diff --git a/kde-base/kdelibs/files/post-3.2.3-kdelibs-htmlframes2.patch b/kde-base/kdelibs/files/post-3.2.3-kdelibs-htmlframes2.patch new file mode 100644 index 000000000000..74f41b2da1d8 --- /dev/null +++ b/kde-base/kdelibs/files/post-3.2.3-kdelibs-htmlframes2.patch @@ -0,0 +1,21 @@ +--- khtml/khtml_part.cpp 8 Dec 2004 02:12:39 -0000 1.959.2.24 ++++ khtml/khtml_part.cpp 12 Dec 2004 16:59:03 -0000 +@@ -4471,7 +4471,7 @@ KHTMLPart * + KHTMLPart::findFrameParent( KParts::ReadOnlyPart *callingPart, const QString &f, khtml::ChildFrame **childFrame ) + { + #ifdef DEBUG_FINDFRAME +- kdDebug(6050) << "KHTMLPart::findFrameParent: this = " << this << " URL = " << m_url << " findFrameParent( " << f << " )" << endl; ++ kdDebug(6050) << "KHTMLPart::findFrameParent: this = " << this << " URL = " << m_url << " name = " << name() << " findFrameParent( " << f << " )" << endl; + #endif + // Check access + KHTMLPart *callingHtmlPart = dynamic_cast(callingPart); +@@ -4479,6 +4479,9 @@ KHTMLPart::findFrameParent( KParts::Read + if (!checkFrameAccess(callingHtmlPart)) + return 0; + ++ if (!childFrame && !parentPart() && (name() == f)) ++ return this; ++ + FrameIt it = d->m_frames.find( f ); + FrameIt end = d->m_frames.end(); + if ( it != end ) diff --git a/kde-base/kdelibs/files/post-3.3.1-kdelibs-htmlframes2.patch b/kde-base/kdelibs/files/post-3.3.1-kdelibs-htmlframes2.patch new file mode 100644 index 000000000000..856eeab7119b --- /dev/null +++ b/kde-base/kdelibs/files/post-3.3.1-kdelibs-htmlframes2.patch @@ -0,0 +1,21 @@ +--- khtml/khtml_part.cpp 17 Nov 2004 13:46:56 -0000 1.1015.2.12 ++++ khtml/khtml_part.cpp 12 Dec 2004 15:55:30 -0000 +@@ -4758,7 +4758,7 @@ KHTMLPart * + KHTMLPart::findFrameParent( KParts::ReadOnlyPart *callingPart, const QString &f, khtml::ChildFrame **childFrame ) + { + #ifdef DEBUG_FINDFRAME +- kdDebug(6050) << "KHTMLPart::findFrameParent: this = " << this << " URL = " << m_url << " findFrameParent( " << f << " )" << endl; ++ kdDebug(6050) << "KHTMLPart::findFrameParent: this = " << this << " URL = " << m_url << " name = " << name() << " findFrameParent( " << f << " )" << endl; + #endif + // Check access + KHTMLPart* const callingHtmlPart = dynamic_cast(callingPart); +@@ -4766,6 +4766,9 @@ KHTMLPart::findFrameParent( KParts::Read + if (!checkFrameAccess(callingHtmlPart)) + return 0; + ++ if (!childFrame && !parentPart() && (name() == f)) ++ return this; ++ + FrameIt it = d->m_frames.find( f ); + const FrameIt end = d->m_frames.end(); + if ( it != end ) diff --git a/kde-base/kdelibs/files/post-3.3.2-kdelibs-htmlframes2.patch b/kde-base/kdelibs/files/post-3.3.2-kdelibs-htmlframes2.patch new file mode 100644 index 000000000000..856eeab7119b --- /dev/null +++ b/kde-base/kdelibs/files/post-3.3.2-kdelibs-htmlframes2.patch @@ -0,0 +1,21 @@ +--- khtml/khtml_part.cpp 17 Nov 2004 13:46:56 -0000 1.1015.2.12 ++++ khtml/khtml_part.cpp 12 Dec 2004 15:55:30 -0000 +@@ -4758,7 +4758,7 @@ KHTMLPart * + KHTMLPart::findFrameParent( KParts::ReadOnlyPart *callingPart, const QString &f, khtml::ChildFrame **childFrame ) + { + #ifdef DEBUG_FINDFRAME +- kdDebug(6050) << "KHTMLPart::findFrameParent: this = " << this << " URL = " << m_url << " findFrameParent( " << f << " )" << endl; ++ kdDebug(6050) << "KHTMLPart::findFrameParent: this = " << this << " URL = " << m_url << " name = " << name() << " findFrameParent( " << f << " )" << endl; + #endif + // Check access + KHTMLPart* const callingHtmlPart = dynamic_cast(callingPart); +@@ -4766,6 +4766,9 @@ KHTMLPart::findFrameParent( KParts::Read + if (!checkFrameAccess(callingHtmlPart)) + return 0; + ++ if (!childFrame && !parentPart() && (name() == f)) ++ return this; ++ + FrameIt it = d->m_frames.find( f ); + const FrameIt end = d->m_frames.end(); + if ( it != end ) diff --git a/kde-base/kdelibs/kdelibs-3.2.3-r4.ebuild b/kde-base/kdelibs/kdelibs-3.2.3-r4.ebuild new file mode 100644 index 000000000000..7c8cf6a1bd69 --- /dev/null +++ b/kde-base/kdelibs/kdelibs-3.2.3-r4.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.2.3-r4.ebuild,v 1.1 2004/12/13 15:15:07 caleb Exp $ + +inherit kde eutils + +need-autoconf 2.5 +set-kdedir ${PV} + +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.2" +KEYWORDS="alpha amd64 hppa ia64 ~mips ppc sparc x86" +IUSE="alsa cups ipv6 ssl doc ldap" + +# kde.eclass has kdelibs in DEPEND, and we can't have that in here. +# so we recreate the entire DEPEND from scratch. +DEPEND=">=sys-devel/autoconf-2.58 + >=sys-devel/automake-1.8 + >=app-arch/bzip2-1.0.2 + >=dev-libs/libxslt-1.0.31 + >=dev-libs/libxml2-2.5.8 + >=dev-libs/libpcre-3.9 + ssl? ( >=dev-libs/openssl-0.9.6k ) + alsa? ( media-libs/alsa-lib virtual/alsa ) + cups? ( >=net-print/cups-1.1.19 ) + ldap? ( >=net-nds/openldap-2.0.25 ) + media-libs/tiff + >=app-admin/fam-2.6.10 + virtual/ghostscript + media-libs/libart_lgpl + sys-devel/gettext + ~kde-base/arts-1.2.3 + >=x11-libs/qt-3.2.3" +RDEPEND="${DEPEND} + app-text/sgml-common + cups? ( net-print/cups ) + doc? ( app-doc/doxygen ) + dev-lang/python" + +src_unpack() { + kde_src_unpack + epatch ${FILESDIR}/post-3.2.3-kdelibs-kcookiejar.patch + epatch ${FILESDIR}/post-3.2.3-kdelibs-kstandarddirs.patch + epatch ${FILESDIR}/post-3.2.3-kdelibs-htmlframes.patch + epatch ${FILESDIR}/post-3.2.3-kdelibs-htmlframes2.patch + epatch ${FILESDIR}/post-3.2.3-kdelibs-kio.diff + epatch ${FILESDIR}/post-3.2.3-kdelibs-khtml.diff + cd ${S}/dcop && patch -p0 < ${FILESDIR}/post-3.2.3-kdelibs-dcopserver.patch + cd ${S} && aclocal -I ${S} +} + +src_compile() { + kde_src_compile myconf + + myconf="$myconf --with-distribution=Gentoo --enable-libfam --enable-dnotify" + myconf="$myconf `use_with alsa` `use_enable cups`" + + use ipv6 || myconf="$myconf --with-ipv6-lookup=no" + use ssl && myconf="$myconf --with-ssl-dir=/usr" || myconf="$myconf --without-ssl" + use alsa && myconf="$myconf --with-alsa" || myconf="$myconf --without-alsa" + use cups && myconf="$myconf --enable-cups" || myconf="$myconf --disable-cups" + + use x86 && myconf="$myconf --enable-fast-malloc=full" + + 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 + +} + +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 +} diff --git a/kde-base/kdelibs/kdelibs-3.3.1-r2.ebuild b/kde-base/kdelibs/kdelibs-3.3.1-r2.ebuild new file mode 100644 index 000000000000..d2ab0c3b1072 --- /dev/null +++ b/kde-base/kdelibs/kdelibs-3.3.1-r2.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.3.1-r2.ebuild,v 1.1 2004/12/13 15:15:07 caleb 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 ssl tiff" + +# kde.eclass has kdelibs in DEPEND, and we can't have that in here. +# so we recreate the entire DEPEND from scratch. +DEPEND=">=sys-devel/autoconf-2.58 + >=sys-devel/automake-1.8 + 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 ) + arts? ( ~kde-base/arts-1.3.1 ) + cups? ( >=net-print/cups-1.1.19 ) + ldap? ( >=net-nds/openldap-2.1.26 ) + tiff? ( media-libs/tiff ) + kerberos? ( virtual/krb5 ) + virtual/fam + virtual/ghostscript + media-libs/libart_lgpl + net-dns/libidn + sys-devel/gettext + >=x11-libs/qt-3.3.3" +RDEPEND="${DEPEND} + app-text/sgml-common + cups? ( net-print/cups ) + doc? ( app-doc/doxygen )" + +src_unpack() { + kde_src_unpack + epatch ${FILESDIR}/post-3.3.1-kdelibs-kio.diff + epatch ${FILESDIR}/post-3.3.1-kdelibs-khtml.diff + epatch ${FILESDIR}/post-3.3.1-kdelibs-htmlframes2.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 + + + 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 + + echo "KDEDIR=$PREFIX" > ${D}/etc/env.d/58kdedir-3.3.1 # number goes up 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 +} diff --git a/kde-base/kdelibs/kdelibs-3.3.2-r1.ebuild b/kde-base/kdelibs/kdelibs-3.3.2-r1.ebuild new file mode 100644 index 000000000000..ba1c60312178 --- /dev/null +++ b/kde-base/kdelibs/kdelibs-3.3.2-r1.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2004 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-r1.ebuild,v 1.1 2004/12/13 15:15:07 caleb 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 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 ) + 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 + app-text/sgml-common + 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 +} + +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 + + + 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 + + echo "KDEDIR=$PREFIX" > ${D}/etc/env.d/58kdedir-3.3.2 # number goes up 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 +}