From: Caleb Tennis Date: Thu, 9 Dec 2004 01:43:18 +0000 (+0000) Subject: Version bump X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=72a28e2f6ad1be724973b0b101fdbbbe68b60726;p=gentoo.git Version bump --- diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog index c9a2dc71c7c9..07de5374ba15 100644 --- a/kde-base/kdelibs/ChangeLog +++ b/kde-base/kdelibs/ChangeLog @@ -1,6 +1,11 @@ # 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.170 2004/12/06 23:56:48 jhuebel Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.171 2004/12/09 01:43:18 caleb Exp $ + +*kdelibs-3.3.2 (08 Dec 2004) + + 08 Dec 2004; Caleb Tennis +kdelibs-3.3.2.ebuild: + Version bump 06 Dec 2004; Jason Huebel kdelibs-3.3.1.ebuild: stable on amd64 diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest index 254c3e021d60..91713096c1a0 100644 --- a/kde-base/kdelibs/Manifest +++ b/kde-base/kdelibs/Manifest @@ -1,26 +1,29 @@ -MD5 dc55e3d6237256208000b8bf6265f982 ChangeLog 27147 -MD5 8a989f55b68f5521cd6e86f131f78a6e kdelibs-3.1.5-r1.ebuild 2055 MD5 2f58e1c51efb89082af89b80505983be kdelibs-3.2.0.ebuild 2404 +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 a6e84bcc0ded1adff3f3555fbfda3ad7 kdelibs-3.3.2.ebuild 2876 MD5 3076e42461e8f1a8cd2829c5307f6d39 kdelibs-3.2.3-r2.ebuild 2731 -MD5 3c4af305c1f179c1d4e04ec8c5224a36 kdelibs-3.3.0.ebuild 3001 -MD5 748d9bf5fe752ab9587b9d0c15a3eff6 kdelibs-3.3.1.ebuild 2849 +MD5 db63869f3266251f0d413573d24710c3 ChangeLog 27261 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161 +MD5 748d9bf5fe752ab9587b9d0c15a3eff6 kdelibs-3.3.1.ebuild 2849 +MD5 0046c691fa833b2ff8d7eac15312a68b files/post-3.2.3-kdelibs-dcopserver.patch 4751 +MD5 52e0e955204a77781505d33b9a3c341d files/post-3.2.2-kdelibs-ktelnetservice.patch 974 +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 1b408d4b494b5328cd15768991836fd8 files/post-3.3.2-kdelibs-kio.diff 1442 MD5 3f21fc4e8ddbf79459bfa8f2df1a5e15 files/animated-gif-fix.patch 317 -MD5 1e53bd5071cc4fe6ba67fda7252a1cf2 files/digest-kdelibs-3.1.5-r1 68 MD5 ee0b53e6fbaea17ae3543638dc09ca34 files/digest-kdelibs-3.2.0 68 -MD5 6176dc207f5ba91edee9b04ab111afe5 files/digest-kdelibs-3.2.2-r1 68 -MD5 57b3bdaa9934d84f320c1aa40a56afe4 files/digest-kdelibs-3.2.3-r2 68 MD5 bf08eeb18202c2640f0184420af9a19e files/digest-kdelibs-3.3.0 68 MD5 a874ee470150aacab38ec42463cac4dd files/digest-kdelibs-3.3.1 68 +MD5 dd2a593a052e2ea070d310e38297bec0 files/digest-kdelibs-3.3.2 68 +MD5 345ce2e01cfdfa4754c47894c0271dcc files/post-3.2.3-kdelibs-kstandarddirs.patch 1417 MD5 41d30ba8cf8d36ad3caebeedb1ddfd0e files/kdelibs-3.1.5-kjs-alphaev6-gcc3-workaround.patch 477 -MD5 285676023bab94666dfec728231cfcd1 files/kdelibs-3.2.2-su.cpp.diff 383 -MD5 8fea98dc672d5c85b217bcb8bcec9214 files/post-3.1.5-kdelibs-kapplication.patch 653 -MD5 bde52aa0bba055c4f678540ec20bfe5a files/post-3.1.5-kdelibs-ktelnetservice.patch 968 MD5 7cebc1abb3141287db618486fd679b32 files/post-3.2.2-kdelibs-kapplication.patch 882 -MD5 52e0e955204a77781505d33b9a3c341d files/post-3.2.2-kdelibs-ktelnetservice.patch 974 -MD5 0046c691fa833b2ff8d7eac15312a68b files/post-3.2.3-kdelibs-dcopserver.patch 4751 -MD5 119cc73926dceafff9107b5f916277ee files/post-3.2.3-kdelibs-htmlframes.patch 15435 -MD5 ca12b078c7288ce9b2653e639a5b3ee0 files/post-3.2.3-kdelibs-kcookiejar.patch 5384 -MD5 345ce2e01cfdfa4754c47894c0271dcc files/post-3.2.3-kdelibs-kstandarddirs.patch 1417 MD5 76ef4c7d472a5e3659219ee223f12cb5 files/qt-3.3-printfix.patch 333 +MD5 bde52aa0bba055c4f678540ec20bfe5a files/post-3.1.5-kdelibs-ktelnetservice.patch 968 +MD5 8fea98dc672d5c85b217bcb8bcec9214 files/post-3.1.5-kdelibs-kapplication.patch 653 +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 diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.3.2 b/kde-base/kdelibs/files/digest-kdelibs-3.3.2 new file mode 100644 index 000000000000..bc59a2da5ef1 --- /dev/null +++ b/kde-base/kdelibs/files/digest-kdelibs-3.3.2 @@ -0,0 +1 @@ +MD5 0473fb4c6c2cd2bc0f267cfa201f3fd8 kdelibs-3.3.2.tar.bz2 15623180 diff --git a/kde-base/kdelibs/files/post-3.3.2-kdelibs-kio.diff b/kde-base/kdelibs/files/post-3.3.2-kdelibs-kio.diff new file mode 100644 index 000000000000..0ed671fd3ac4 --- /dev/null +++ b/kde-base/kdelibs/files/post-3.3.2-kdelibs-kio.diff @@ -0,0 +1,21 @@ +--- kdelibs/kio/kio/job.cpp 9 Nov 2004 00:50:35 -0000 1.397.2.5 ++++ kdelibs/kio/kio/job.cpp 8 Dec 2004 01:08:15 -0000 1.397.2.8 +@@ -3119,14 +3119,14 @@ void CopyJob::copyNextFile() + if ( f.open( IO_ReadWrite ) ) + { + f.close(); + KSimpleConfig config( path ); + config.setDesktopGroup(); +- config.writePathEntry( QString::fromLatin1("URL"), (*it).uSource.url() ); +- KURL urlName = (*it).uSource; +- urlName.setPass( "" ); +- config.writeEntry( QString::fromLatin1("Name"), urlName.url() ); ++ KURL url = (*it).uSource; ++ url.setPass( "" ); ++ config.writePathEntry( QString::fromLatin1("URL"), url.url() ); ++ config.writeEntry( QString::fromLatin1("Name"), url.url() ); + config.writeEntry( QString::fromLatin1("Type"), QString::fromLatin1("Link") ); + QString protocol = (*it).uSource.protocol(); + if ( protocol == QString::fromLatin1("ftp") ) + config.writeEntry( QString::fromLatin1("Icon"), QString::fromLatin1("ftp") ); + else if ( protocol == QString::fromLatin1("http") ) diff --git a/kde-base/kdelibs/kdelibs-3.3.2.ebuild b/kde-base/kdelibs/kdelibs-3.3.2.ebuild new file mode 100644 index 000000000000..2ed20876d144 --- /dev/null +++ b/kde-base/kdelibs/kdelibs-3.3.2.ebuild @@ -0,0 +1,105 @@ +# 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.ebuild,v 1.1 2004/12/09 01:43:18 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 +} + +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 +}