From: Carsten Lohrke Date: Fri, 27 Apr 2007 21:10:19 +0000 (+0000) Subject: Revert the Kate patch changes from the previous revision, bug #176190. Make OpenSSL... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0fe71b01fc54af50cbc4437fa7e37da37c1d0221;p=gentoo.git Revert the Kate patch changes from the previous revision, bug #176190. Make OpenSSL and zeroconf/avahi dependencies mandatory, bug #172972 and bug #175984. Package-Manager: portage-2.1.2.5 --- diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog index 49face7e3d01..11540c3b5a41 100644 --- a/kde-base/kdelibs/ChangeLog +++ b/kde-base/kdelibs/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for kde-base/kdelibs # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.451 2007/04/25 08:48:16 carlo Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.452 2007/04/27 21:10:19 carlo Exp $ + +*kdelibs-3.5.6-r7 (27 Apr 2007) + + 27 Apr 2007; Carsten Lohrke +kdelibs-3.5.6-r7.ebuild: + Revert the Kate patch changes from the previous revision, bug #176190. Make + OpenSSL and zeroconf/avahi dependencies mandatory, bug #172972 and bug + #175984. *kdelibs-3.5.6-r6 (25 Apr 2007) diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest index 0fe07910a1cd..94c936f5003d 100644 --- a/kde-base/kdelibs/Manifest +++ b/kde-base/kdelibs/Manifest @@ -41,6 +41,7 @@ SHA256 124ba2baf644585a7f348e232ff7f7b13949b5948bf7ce3cc6f3af220d3776e8 files/kd DIST kdelibs-3.5-patchset-05.tar.bz2 36423 RMD160 684bb235f3b5b3cb900632e11aa912670f641b96 SHA1 138232cf05ab131a51f3b3febfdd8a3cbc42d45f SHA256 f237ccd3a35c629740355fbcf69b0d706690acac832a4d35db5c0d3a30235e0a DIST kdelibs-3.5-patchset-06.tar.bz2 18862 RMD160 e7f59e24897d83432ba5bd908e8dae168c1ae3e1 SHA1 5798ee57ccc43a9e7f5d05a4c89be965ce39f28a SHA256 5b3ef71460779a0b16ec87628de7d3d76bae643e86c5b029c07b5541bf0cd16b DIST kdelibs-3.5-patchset-07.tar.bz2 23971 RMD160 9e404a2523fd4dbc13ef93803b0752979cb9dd95 SHA1 47e9263f6d580f4316f3188d3e6ecac9f4bb8fbd SHA256 00792cc883b9f8e9b88e1c9efecaac1cc6814f9e7f80b9fda67d3495f8758182 +DIST kdelibs-3.5-patchset-08.tar.bz2 19973 RMD160 ea2edb4973cca353baabc89559f11c3db76c9ab2 SHA1 4c17a0b5577e98e28444f5e038ed06e3b2382c12 SHA256 24461470100d91c1374f5257be5e73767389df9ce8fb9e26af8b6b2030c3963a DIST kdelibs-3.5.5-seli-xinerama.patch.bz2 5470 RMD160 46ed378f1ff2f7e2fa113aa0bf51eae1758264f9 SHA1 1f1e7a02e0dfc35fd2d27d8983a16e53e42397c0 SHA256 8d002a55954aabdb91a534a1b1f1f37c706faebbae0398fb5a2ff29eeb66954c DIST kdelibs-3.5.5.tar.bz2 15486690 RMD160 8e389869f9a53445754c76a0f7535ef2fffc6d03 SHA1 7961818e41e22cce7c58219c4eb63ed5fbb94307 SHA256 e487cdd56aa14eec3e100501a5e14658c6329fac30ea0ce812c860e3564c31e3 DIST kdelibs-3.5.6.tar.bz2 15509460 RMD160 ce8c088e13f0e59238719600da9c768eac58b57d SHA1 2cc15499bd2191bd9333cfd1892b5ecf1199fbfd SHA256 06766202c6ae21277b7879f363ed88fde8016586ec8c94deb59be260f2231b5c @@ -92,10 +93,14 @@ EBUILD kdelibs-3.5.6-r6.ebuild 6535 RMD160 c8eea1e7b0335aef9c74719c70a710e866f82 MD5 0a04e8b84ddde168dea3f3bbf2677374 kdelibs-3.5.6-r6.ebuild 6535 RMD160 c8eea1e7b0335aef9c74719c70a710e866f8238f kdelibs-3.5.6-r6.ebuild 6535 SHA256 01a21459bea501cee5408e756afcc27ae074f3bbf11201a7175febf11b1249bb kdelibs-3.5.6-r6.ebuild 6535 -MISC ChangeLog 72958 RMD160 898439f3003e90c00b5d56e5acd59f2497a42c4d SHA1 a11b312e235c459a65001447b0c4bacdede57d01 SHA256 f41169096341d1751c62f9872604fca30a839e5cfd070974a58e8c20655f5116 -MD5 f24209e2974c243ea85611dfe6f5316b ChangeLog 72958 -RMD160 898439f3003e90c00b5d56e5acd59f2497a42c4d ChangeLog 72958 -SHA256 f41169096341d1751c62f9872604fca30a839e5cfd070974a58e8c20655f5116 ChangeLog 72958 +EBUILD kdelibs-3.5.6-r7.ebuild 6362 RMD160 e761b558ee0cd1a63ee26a9d51e87bad4e2ccf24 SHA1 d142bebebe479d599a5a0f7cd6735b78e677deac SHA256 7be5362495819946589ac8aa916e62745a3d06878a5418c88cefe35e0586d661 +MD5 9aa6b05790a73bf2c2d7f9a79d99363f kdelibs-3.5.6-r7.ebuild 6362 +RMD160 e761b558ee0cd1a63ee26a9d51e87bad4e2ccf24 kdelibs-3.5.6-r7.ebuild 6362 +SHA256 7be5362495819946589ac8aa916e62745a3d06878a5418c88cefe35e0586d661 kdelibs-3.5.6-r7.ebuild 6362 +MISC ChangeLog 73229 RMD160 fe1b256d20ed15ae4f5d87dda1505bd12fa0c876 SHA1 5e6cc1061ffc775c0837991424976798e5052bb8 SHA256 a429dca0dd131f37fd501cc369348a4f8713fad3fb06ae5bcfb8905d9a92f647 +MD5 6ac7104ed24a0890f9b79aaca8f4a67f ChangeLog 73229 +RMD160 fe1b256d20ed15ae4f5d87dda1505bd12fa0c876 ChangeLog 73229 +SHA256 a429dca0dd131f37fd501cc369348a4f8713fad3fb06ae5bcfb8905d9a92f647 ChangeLog 73229 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156 @@ -136,3 +141,6 @@ SHA256 abf6d8962d3cd69375773bcc17af35186f8854af77d80c0155cb5c1b6bb1ea85 files/di MD5 ae0fba83125f960623dbc3031e3e7b8c files/digest-kdelibs-3.5.6-r6 807 RMD160 e5835fbc3135389470c7ea8b7d983a94cfb2a60b files/digest-kdelibs-3.5.6-r6 807 SHA256 7213f3a2cbc1374c5ed04c42309fa695291579a2a5c0851e761033eb8ecf2676 files/digest-kdelibs-3.5.6-r6 807 +MD5 f8b50b783cb1b957e55712ff76791423 files/digest-kdelibs-3.5.6-r7 807 +RMD160 6be56c93cce88e47c6094bfbb259765585939a5c files/digest-kdelibs-3.5.6-r7 807 +SHA256 c8d07b98bd3c441e1b22c0221e8436cb5bf3c97a7b448739f70f9915d933f982 files/digest-kdelibs-3.5.6-r7 807 diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.5.6-r7 b/kde-base/kdelibs/files/digest-kdelibs-3.5.6-r7 new file mode 100644 index 000000000000..5efee083f169 --- /dev/null +++ b/kde-base/kdelibs/files/digest-kdelibs-3.5.6-r7 @@ -0,0 +1,9 @@ +MD5 6aa828f386434a4267f2ca79d88637f4 kdelibs-3.5-patchset-08.tar.bz2 19973 +RMD160 ea2edb4973cca353baabc89559f11c3db76c9ab2 kdelibs-3.5-patchset-08.tar.bz2 19973 +SHA256 24461470100d91c1374f5257be5e73767389df9ce8fb9e26af8b6b2030c3963a kdelibs-3.5-patchset-08.tar.bz2 19973 +MD5 d8ce997461cb1aa2255032f02fd14326 kdelibs-3.5.5-seli-xinerama.patch.bz2 5470 +RMD160 46ed378f1ff2f7e2fa113aa0bf51eae1758264f9 kdelibs-3.5.5-seli-xinerama.patch.bz2 5470 +SHA256 8d002a55954aabdb91a534a1b1f1f37c706faebbae0398fb5a2ff29eeb66954c kdelibs-3.5.5-seli-xinerama.patch.bz2 5470 +MD5 e4d137879a66e92b895b3de5413a61d8 kdelibs-3.5.6.tar.bz2 15509460 +RMD160 ce8c088e13f0e59238719600da9c768eac58b57d kdelibs-3.5.6.tar.bz2 15509460 +SHA256 06766202c6ae21277b7879f363ed88fde8016586ec8c94deb59be260f2231b5c kdelibs-3.5.6.tar.bz2 15509460 diff --git a/kde-base/kdelibs/kdelibs-3.5.6-r7.ebuild b/kde-base/kdelibs/kdelibs-3.5.6-r7.ebuild new file mode 100644 index 000000000000..3417ac45f77a --- /dev/null +++ b/kde-base/kdelibs/kdelibs-3.5.6-r7.ebuild @@ -0,0 +1,212 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.6-r7.ebuild,v 1.1 2007/04/27 21:10:19 carlo Exp $ + +inherit kde flag-o-matic eutils multilib +set-kdedir 3.5 + +DESCRIPTION="KDE libraries needed by all KDE programs." +HOMEPAGE="http://www.kde.org/" +SRC_URI="mirror://kde/stable/${PV}/src/${P}.tar.bz2 + mirror://gentoo/kdelibs-3.5-patchset-08.tar.bz2 + mirror://gentoo/${PN}-3.5.5-seli-xinerama.patch.bz2" + +LICENSE="GPL-2 LGPL-2" +SLOT="3.5" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="acl alsa arts branding cups doc jpeg2k kerberos legacyssl utempter openexr spell tiff +avahi kernel_linux fam lua linguas_he kdehiddenvisibility" + +# Added aspell-en as dependency to work around bug 131512. +# Made openssl and zeroconf mandatory dependencies, see bug #172972 and #175984 +RDEPEND="$(qt_min_version 3.3.3) + arts? ( >=kde-base/arts-3.5.5 ) + app-arch/bzip2 + >=media-libs/freetype-2 + media-libs/fontconfig + >=dev-libs/libxslt-1.1.16 + >=dev-libs/libxml2-2.6.6 + >=dev-libs/libpcre-4.2 + media-libs/libart_lgpl + net-dns/libidn + >=dev-libs/openssl-0.9.7d + acl? ( kernel_linux? ( sys-apps/acl ) ) + alsa? ( media-libs/alsa-lib ) + cups? ( >=net-print/cups-1.1.19 ) + tiff? ( media-libs/tiff ) + kerberos? ( virtual/krb5 ) + jpeg2k? ( media-libs/jasper ) + openexr? ( >=media-libs/openexr-1.2.2-r2 ) + !avahi? ( net-misc/mDNSResponder !kde-misc/kdnssd-avahi ) + fam? ( virtual/fam ) + virtual/ghostscript + utempter? ( sys-libs/libutempter ) + !kde-base/kde-env + lua? ( dev-lang/lua ) + spell? ( app-text/aspell app-dicts/aspell-en + linguas_he? ( >=app-text/hspell-1.0 ) )" + +DEPEND="${RDEPEND} + doc? ( app-doc/doxygen ) + sys-devel/gettext" + +RDEPEND="${RDEPEND} + x11-apps/rgb + x11-apps/iceauth" + +PDEPEND="avahi? ( kde-misc/kdnssd-avahi )" + +# Testing code is rather broken and merely for developer purposes, so disable it. +RESTRICT="test" + +pkg_setup() { + if use legacyssl ; then + echo "" + elog "You have the legacyssl use flag enabled, which fixes issues with some broken" + elog "sites, but breaks others instead. It is strongly discouraged to use it." + elog "For more information, see bug #128922." + echo "" + fi + + if ! use utempter ; then + echo "" + elog "On some setups, which rely on the correct update of utmp records, not using" + elog "utempter might not update them correctly. If you experience unexpected" + elog "behaviour, try to rebuild kde-base/kdelibs with utempter use-flag enabled." + echo "" + fi + + if use alsa && ! built_with_use --missing true media-libs/alsa-lib midi; then + eerror "The alsa USE flag in this package enables ALSA support" + eerror "for libkmid, KDE midi library." + eerror "For this reason, you have to merge media-libs/alsa-lib" + eerror "with the midi USE flag enabled, or disable alsa USE flag" + eerror "for this package." + die "Missing midi USE flag on media-libs/alsa-lib" + fi +} + +src_unpack() { + kde_src_unpack + + if use legacyssl ; then + # This patch won't be included upstream, see bug #128922. + epatch "${WORKDIR}/patches/kdelibs_3.5.4-kssl-3des.patch" + fi + + if use utempter ; then + # Bug #135818 is the eternal reference. + epatch "${WORKDIR}/patches/kdelibs-3.5_libutempter.patch" + fi + + if use branding ; then + # Add "(Gentoo)" to khtml user agent. + epatch "${WORKDIR}/patches/kdelibs_3.5-cattlebrand.diff" + fi + + # Xinerama patch from Lubos Lunak. + # http://ktown.kde.org/~seli/xinerama/ + epatch "${DISTDIR}/${PN}-3.5.5-seli-xinerama.patch.bz2" +} + +src_compile() { + rm -f "${S}/configure" + + myconf="--with-distribution=Gentoo --disable-fast-malloc + --with-libart --with-libidn --with-ssl + $(use_enable fam libfam) $(use_enable kernel_linux dnotify) + $(use_with acl) $(use_with alsa) + $(use_with arts) $(use_enable cups) + $(use_with kerberos gssapi) $(use_with tiff) + $(use_with jpeg2k jasper) $(use_with openexr) + $(use_with utempter) $(use_with lua) + $(use_enable kernel_linux sendfile) --enable-mitshm + $(use_with spell aspell)" + + if ! use avahi; then + myconf="${myconf} --enable-dnssd" + else + myconf="${myconf} --disable-dnssd" + fi + + if use spell; then + myconf="${myconf} $(use_with linguas_he hspell)" + else + myconf="${myconf} --without-hspell" + fi + + if has_version x11-apps/rgb; then + myconf="${myconf} --with-rgbfile=/usr/share/X11/rgb.txt" + fi + + # fix bug 58179, bug 85593 + # kdelibs-3.4.0 needed -fno-gcse; 3.4.1 needs -mminimal-toc; this needs a + # closer look... - corsair + use ppc64 && append-flags "-mminimal-toc" + + # work around bug #120858, gcc 3.4.x -Os miscompilation + use x86 && replace-flags "-Os" "-O2" # see bug #120858 + + use amd64 && replace-flags "-O3" "-O2" # see bug #148180 + + export BINDNOW_FLAGS="$(bindnow-flags)" + + kde_src_compile + + if use doc; then + make apidox || die + fi +} + +src_install() { + kde_src_install + + if use doc; then + make DESTDIR="${D}" install-apidox || die + fi + + # 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 + + # Get rid of the disabled version of the kdnsd libraries + if use zeroconf && use avahi; then + rm -rf "${D}/${PREFIX}"/$(get_libdir)/libkdnssd.* + fi + + dodir /etc/env.d + + # List all the multilib libdirs + local libdirs + for libdir in $(get_all_libdirs); do + libdirs="${libdirs}:${PREFIX}/${libdir}" + done + + # Please note that the KDE install path has to be the last value in KDEDIRS. + cat < "${D}"/etc/env.d/45kdepaths-${SLOT} # number goes down with version upgrade +PATH=${PREFIX}/bin +ROOTPATH=${PREFIX}/sbin:${PREFIX}/bin +LDPATH=${libdirs:1} +MANPATH=${PREFIX}/share/man +CONFIG_PROTECT="${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown /usr/share/config" +KDEDIRS="/usr:/usr/local:${PREFIX}" +#KDE_IS_PRELINKED=1 +XDG_DATA_DIRS="/usr/share:${PREFIX}/share:/usr/local/share" +XDG_CONFIG_DIRS="/etc/xdg:${PREFIX}/etc/xdg" +COLON_SEPARATED="XDG_DATA_DIRS XDG_CONFIG_DIRS" +EOF + +cat < "${D}"/etc/revdep-rebuild/50-kde3 +SEARCH_DIRS="${PREFIX}/bin ${PREFIX}/lib*" +EOF +} + +pkg_postinst() { + echo + elog "To make zeroconf support available in KDE make sure that the 'mdnsd' daemon" + elog "is running. Make sure also that multicast dns lookups are enabled by editing" + elog "the 'hosts:' line in /etc/nsswitch.conf to include 'mdns', e.g.:" + elog " hosts: files mdns dns" + echo +}