diff options
Diffstat (limited to 'kde-base/kdelibs')
| -rw-r--r-- | kde-base/kdelibs/ChangeLog | 9 | ||||
| -rw-r--r-- | kde-base/kdelibs/files/kdelibs-4.0.2-X11-optional.patch | 102 | ||||
| -rw-r--r-- | kde-base/kdelibs/files/kdelibs-4.0.2-alsa-optional.patch | 51 | ||||
| -rw-r--r-- | kde-base/kdelibs/kdelibs-4.0.2.ebuild | 211 |
4 files changed, 372 insertions, 1 deletions
diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog index 22f636a19fc9..e1a332f7dbcc 100644 --- a/kde-base/kdelibs/ChangeLog +++ b/kde-base/kdelibs/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for kde-base/kdelibs # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.517 2008/03/07 00:31:09 dirtyepic Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.518 2008/03/10 23:33:14 philantrop Exp $ + +*kdelibs-4.0.2 (10 Mar 2008) + + 10 Mar 2008; Wulf C. Krueger <philantrop@gentoo.org> + +files/kdelibs-4.0.2-X11-optional.patch, + +files/kdelibs-4.0.2-alsa-optional.patch, +kdelibs-4.0.2.ebuild: + Version bump to KDE 4.0.2 07 Mar 2008; Ryan Hill <dirtyepic@gentoo.org> kdelibs-3.5.9.ebuild: Keyword ~mips. diff --git a/kde-base/kdelibs/files/kdelibs-4.0.2-X11-optional.patch b/kde-base/kdelibs/files/kdelibs-4.0.2-X11-optional.patch new file mode 100644 index 000000000000..9a3c680f59b0 --- /dev/null +++ b/kde-base/kdelibs/files/kdelibs-4.0.2-X11-optional.patch @@ -0,0 +1,102 @@ + cmake/modules/FindX11.cmake | 44 +++++++++++++++++++++++++++++++++++++----- + 1 files changed, 38 insertions(+), 6 deletions(-) + +diff --git a/cmake/modules/FindX11.cmake b/cmake/modules/FindX11.cmake +index 5fdbe82..b56f594 100644 +--- a/cmake/modules/FindX11.cmake ++++ b/cmake/modules/FindX11.cmake +@@ -39,6 +39,34 @@ + # Copyright (c) 2002 Kitware, Inc., Insight Consortium. All rights reserved. + # See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details. + ++ ++# Look for an optional X11 package, and provide a cmake switch to disable searching for it. ++# ++# Example usage: FIND_X11(X11_Xinerama X11/extensions/Xinerama.h Xinerama) ++# which provides: `cmake -DWITH_X11_Xinerama=OFF` to disable the check. ++# ++# You need to pass a header _and_ a library, in that order. ++MACRO (FIND_X11 _name _header _library ) ++ OPTION(WITH_${_name} "Search for X11 package ${_name}" ON) ++ ++ IF (WITH_${_name}) ++ FIND_PATH(${_name}_INCLUDE_PATH ${_header} ${X11_INC_SEARCH_PATH}) ++ ++ FIND_LIBRARY(${_name}_LIB ${_library} ${X11_LIB_SEARCH_PATH}) ++ ++ IF (${_name}_INCLUDE_PATH AND ${_name}_LIB) ++ SET(${_name}_FOUND TRUE) ++ SET(_temp ${${_name}_INCLUDE_PATH}) ++ SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${_temp}) ++ ENDIF (${_name}_INCLUDE_PATH AND ${_name}_LIB) ++ ++ ELSE (WITH_${_name}) ++ SET(${_name}_FOUND FALSE CACHE BOOL "${_name} found") ++ SET(${_name}_LIB NOTFOUND CACHE FILEPATH "Path to ${_name} library") ++ SET(${_name}_INCLUDE_PATH NOTFOUND CACHE PATH "Path to ${_name}") ++ ENDIF (WITH_${_name}) ++ENDMACRO (FIND_X11) ++ + IF (UNIX) + SET(X11_FOUND 0) + # X11 is never a framework and some header files may be +@@ -75,7 +103,7 @@ IF (UNIX) + FIND_PATH(X11_Xaccessrules_INCLUDE_PATH X11/extensions/XKBrules.h ${X11_INC_SEARCH_PATH}) + FIND_PATH(X11_Xaccessstr_INCLUDE_PATH X11/extensions/XKBstr.h ${X11_INC_SEARCH_PATH}) + FIND_PATH(X11_Xau_INCLUDE_PATH X11/Xauth.h ${X11_INC_SEARCH_PATH}) +- FIND_PATH(X11_Xcomposite_INCLUDE_PATH X11/extensions/Xcomposite.h ${X11_INC_SEARCH_PATH}) ++ #FIND_PATH(X11_Xcomposite_INCLUDE_PATH X11/extensions/Xcomposite.h ${X11_INC_SEARCH_PATH}) + FIND_PATH(X11_Xcursor_INCLUDE_PATH X11/Xcursor/Xcursor.h ${X11_INC_SEARCH_PATH}) + FIND_PATH(X11_Xdamage_INCLUDE_PATH X11/extensions/Xdamage.h ${X11_INC_SEARCH_PATH}) + FIND_PATH(X11_Xdmcp_INCLUDE_PATH X11/Xdmcp.h ${X11_INC_SEARCH_PATH}) +@@ -84,7 +112,7 @@ IF (UNIX) + FIND_PATH(X11_xf86vmode_INCLUDE_PATH X11/extensions/xf86vmode.h ${X11_INC_SEARCH_PATH}) + FIND_PATH(X11_Xfixes_INCLUDE_PATH X11/extensions/Xfixes.h ${X11_INC_SEARCH_PATH}) + FIND_PATH(X11_Xft_INCLUDE_PATH X11/Xft/Xft.h ${X11_INC_SEARCH_PATH}) +- FIND_PATH(X11_Xinerama_INCLUDE_PATH X11/extensions/Xinerama.h ${X11_INC_SEARCH_PATH}) ++ #FIND_PATH(X11_Xinerama_INCLUDE_PATH X11/extensions/Xinerama.h ${X11_INC_SEARCH_PATH}) + FIND_PATH(X11_Xinput_INCLUDE_PATH X11/extensions/XInput.h ${X11_INC_SEARCH_PATH}) + FIND_PATH(X11_Xkb_INCLUDE_PATH X11/extensions/XKB.h ${X11_INC_SEARCH_PATH}) + FIND_PATH(X11_Xkblib_INCLUDE_PATH X11/XKBlib.h ${X11_INC_SEARCH_PATH}) +@@ -94,7 +122,7 @@ IF (UNIX) + FIND_PATH(X11_XShm_INCLUDE_PATH X11/extensions/XShm.h ${X11_INC_SEARCH_PATH}) + FIND_PATH(X11_Xrandr_INCLUDE_PATH X11/extensions/Xrandr.h ${X11_INC_SEARCH_PATH}) + FIND_PATH(X11_Xrender_INCLUDE_PATH X11/extensions/Xrender.h ${X11_INC_SEARCH_PATH}) +- FIND_PATH(X11_Xscreensaver_INCLUDE_PATH X11/extensions/scrnsaver.h ${X11_INC_SEARCH_PATH}) ++ #FIND_PATH(X11_Xscreensaver_INCLUDE_PATH X11/extensions/scrnsaver.h ${X11_INC_SEARCH_PATH}) + FIND_PATH(X11_Xshape_INCLUDE_PATH X11/extensions/shape.h ${X11_INC_SEARCH_PATH}) + FIND_PATH(X11_Xutil_INCLUDE_PATH X11/Xutil.h ${X11_INC_SEARCH_PATH}) + FIND_PATH(X11_Xt_INCLUDE_PATH X11/Intrinsic.h ${X11_INC_SEARCH_PATH}) +@@ -107,25 +135,29 @@ IF (UNIX) + # Find additional X libraries. Keep list sorted by library name. + FIND_LIBRARY(X11_ICE_LIB ICE ${X11_LIB_SEARCH_PATH}) + FIND_LIBRARY(X11_Xau_LIB Xau ${X11_LIB_SEARCH_PATH}) +- FIND_LIBRARY(X11_Xcomposite_LIB Xcomposite ${X11_LIB_SEARCH_PATH}) ++ #FIND_LIBRARY(X11_Xcomposite_LIB Xcomposite ${X11_LIB_SEARCH_PATH}) + FIND_LIBRARY(X11_Xcursor_LIB Xcursor ${X11_LIB_SEARCH_PATH}) + FIND_LIBRARY(X11_Xdamage_LIB Xdamage ${X11_LIB_SEARCH_PATH}) + FIND_LIBRARY(X11_Xdmcp_LIB Xdmcp ${X11_LIB_SEARCH_PATH}) + FIND_LIBRARY(X11_Xext_LIB Xext ${X11_LIB_SEARCH_PATH}) + FIND_LIBRARY(X11_Xfixes_LIB Xfixes ${X11_LIB_SEARCH_PATH}) + FIND_LIBRARY(X11_Xft_LIB Xft ${X11_LIB_SEARCH_PATH}) +- FIND_LIBRARY(X11_Xinerama_LIB Xinerama ${X11_LIB_SEARCH_PATH}) ++ #FIND_LIBRARY(X11_Xinerama_LIB Xinerama ${X11_LIB_SEARCH_PATH}) + FIND_LIBRARY(X11_Xinput_LIB Xi ${X11_LIB_SEARCH_PATH}) + FIND_LIBRARY(X11_Xkbfile_LIB xkbfile ${X11_LIB_SEARCH_PATH}) + FIND_LIBRARY(X11_Xpm_LIB Xpm ${X11_LIB_SEARCH_PATH}) + FIND_LIBRARY(X11_Xrandr_LIB Xrandr ${X11_LIB_SEARCH_PATH}) + FIND_LIBRARY(X11_Xrender_LIB Xrender ${X11_LIB_SEARCH_PATH}) +- FIND_LIBRARY(X11_Xscreensaver_LIB Xss ${X11_LIB_SEARCH_PATH}) ++ #FIND_LIBRARY(X11_Xscreensaver_LIB Xss ${X11_LIB_SEARCH_PATH}) + FIND_LIBRARY(X11_Xt_LIB Xt ${X11_LIB_SEARCH_PATH}) + FIND_LIBRARY(X11_XTest_LIB Xtst ${X11_LIB_SEARCH_PATH}) + FIND_LIBRARY(X11_Xv_LIB Xv ${X11_LIB_SEARCH_PATH}) + FIND_LIBRARY(X11_Xxf86misc_LIB Xxf86misc ${X11_LIB_SEARCH_PATH}) + ++ FIND_X11(X11_Xcomposite X11/extensions/Xcomposite.h Xcomposite) ++ FIND_X11(X11_Xinerama X11/extensions/Xinerama.h Xinerama) ++ FIND_X11(X11_Xscreensaver X11/extensions/scrnsaver.h Xss) ++ + SET(X11_LIBRARY_DIR "") + IF(X11_X11_LIB) + GET_FILENAME_COMPONENT(X11_LIBRARY_DIR ${X11_X11_LIB} PATH) diff --git a/kde-base/kdelibs/files/kdelibs-4.0.2-alsa-optional.patch b/kde-base/kdelibs/files/kdelibs-4.0.2-alsa-optional.patch new file mode 100644 index 000000000000..77e9ae04dc16 --- /dev/null +++ b/kde-base/kdelibs/files/kdelibs-4.0.2-alsa-optional.patch @@ -0,0 +1,51 @@ +--- a/cmake/modules/FindAlsa.cmake ++++ b/cmake/modules/FindAlsa.cmake +@@ -13,10 +13,14 @@ + # Redistribution and use is allowed according to the terms of the BSD license. + # For details see the accompanying COPYING-CMAKE-SCRIPTS file. + ++OPTION(WITH_Alsa "Support for the ALSA sound system." ON) ++ + include(CheckIncludeFiles) + include(CheckIncludeFileCXX) + include(CheckLibraryExists) + ++if(WITH_Alsa) ++ + # Already done by toplevel + find_library(ASOUND_LIBRARY asound) + check_library_exists(asound snd_seq_create_simple_port ${ASOUND_LIBRARY} HAVE_LIBASOUND2) +@@ -29,19 +33,22 @@ + + find_path(ALSA_INCLUDES alsa/version.h) + ++endif(WITH_Alsa) ++ + macro(ALSA_VERSION_STRING _result) + # check for version in alsa/version.h +- if(ALSA_INCLUDES) ++ if(WITH_Alsa AND ALSA_INCLUDES) + file(READ "${ALSA_INCLUDES}/alsa/version.h" _ALSA_VERSION_CONTENT) + string(REGEX REPLACE ".*SND_LIB_VERSION_STR.*\"(.*)\".*" "\\1" ${_result} ${_ALSA_VERSION_CONTENT}) +- else(ALSA_INCLUDES) ++ else(WITH_Alsa AND ALSA_INCLUDES) + message(STATUS "ALSA version not known. ALSA output will probably not work correctly.") +- endif(ALSA_INCLUDES) ++ endif(WITH_Alsa AND ALSA_INCLUDES) + endmacro(ALSA_VERSION_STRING _result) + + + get_filename_component(_FIND_ALSA_MODULE_DIR ${CMAKE_CURRENT_LIST_FILE} PATH) + macro(ALSA_CONFIGURE_FILE _destFile) ++ if(WITH_Alsa) + check_include_files(sys/soundcard.h HAVE_SYS_SOUNDCARD_H) + check_include_files(machine/soundcard.h HAVE_MACHINE_SOUNDCARD_H) + +@@ -58,6 +65,7 @@ + set(HAVE_SND_PCM_RESUME 1) + endif(ASOUND_HAS_SND_PCM_RESUME) + ++ endif(WITH_Alsa) + configure_file(${_FIND_ALSA_MODULE_DIR}/config-alsa.h.cmake ${_destFile}) + endmacro(ALSA_CONFIGURE_FILE _destFile) + diff --git a/kde-base/kdelibs/kdelibs-4.0.2.ebuild b/kde-base/kdelibs/kdelibs-4.0.2.ebuild new file mode 100644 index 000000000000..9cb5a417fafc --- /dev/null +++ b/kde-base/kdelibs/kdelibs-4.0.2.ebuild @@ -0,0 +1,211 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.0.2.ebuild,v 1.1 2008/03/10 23:33:14 philantrop Exp $ + +EAPI="1" + +CPPUNIT_REQUIRED="optional" +OPENGL_REQUIRED="optional" +inherit kde4-base + +DESCRIPTION="KDE libraries needed by all KDE programs." +HOMEPAGE="http://www.kde.org/" + +KEYWORDS="~amd64 ~x86" +IUSE="3dnow acl alsa altivec bindist +bzip2 debug doc fam htmlhandbook jpeg2k +kerberos mmx nls openexr +semantic-desktop spell sse sse2 ssl zeroconf" +LICENSE="GPL-2 LGPL-2" +RESTRICT="test" + +COMMONDEPEND=" + !<kde-base/kdebase-3.5.7-r6 + !<kde-base/kdebase-startkde-3.5.7-r1 + !=kde-base/kdebase-3.5.8 + !=kde-base/kdebase-3.5.8-r1 + !=kde-base/kdebase-3.5.8-r2 + !=kde-base/kdebase-startkde-3.5.8 + >=app-misc/strigi-0.5.7 + >=dev-libs/libxml2-2.6.6 + >=dev-libs/libxslt-1.1.17 + media-libs/fontconfig + >=media-libs/freetype-2 + media-libs/giflib + media-libs/jpeg + media-libs/libpng + >=sys-apps/dbus-0.91 + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXau + x11-libs/libXcursor + x11-libs/libXdmcp + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXft + x11-libs/libXpm + x11-libs/libXrender + x11-libs/libXtst + >=x11-misc/shared-mime-info-0.20 + acl? ( kernel_linux? ( sys-apps/acl ) ) + alsa? ( >=media-libs/alsa-lib-1.0.14a ) + fam? ( virtual/fam ) + jpeg2k? ( media-libs/jasper ) + kerberos? ( virtual/krb5 ) + nls? ( virtual/libintl ) + openexr? ( >=media-libs/openexr-1.2.2-r2 media-libs/ilmbase ) + opengl? ( virtual/opengl ) + >=dev-libs/libpcre-4.5 + semantic-desktop? ( >=dev-libs/soprano-2.0.0 ) + spell? ( app-text/aspell app-dicts/aspell-en app-text/enchant ) + ssl? ( >=dev-libs/openssl-0.9.7d ) + zeroconf? ( || ( net-dns/avahi + !bindist? ( net-misc/mDNSResponder ) ) ) +" + +DEPEND="${COMMONDEPEND} + doc? ( app-doc/doxygen ) + sys-devel/gettext" + +RDEPEND="${COMMONDEPEND} + x11-apps/rgb + x11-apps/iceauth" + +# Patch to respect the sandbox when cmake tries to create symlinks, +# or executes an external program that tries to write files. +PATCHES="${FILESDIR}/e-tempdir.patch +${FILESDIR}/${P}-X11-optional.patch +${FILESDIR}/${P}-alsa-optional.patch" +# Create CMake switches to make Xcomposite, Xinerama & Xscreensaver optional. + +pkg_setup() { + if has_version x11-libs/qt-core:4; then + ewarn "KDE 4.0.2 doesn't work well with Qt-4.4, expect strange bugs." + ewarn "It is highly recommend, that you install x11-libs/qt-4.3.4," + ewarn "recompile ${P} and all of its dependencies if you want" + ewarn "to use KDE 4.0.2." + fi + KDE4_BUILT_WITH_USE_CHECK="--missing true sys-apps/dbus X" + use alsa && KDE4_BUILT_WITH_USE_CHECK="${KDE4_BUILT_WITH_USE_CHECK} + --missing true media-libs/alsa-lib midi" + if use zeroconf && has_version net-dns/avahi; then + KDE4_BUILT_WITH_USE_CHECK="${KDE4_BUILT_WITH_USE_CHECK} + net-dns/avahi mdnsresponder-compat" + fi + + kde4-base_pkg_setup +} + +src_compile() { + if use zeroconf; then + if has_version net-dns/avahi; then + mycmakeargs="${mycmakeargs} -DWITH_Avahi=ON -DWITH_DNSSD=OFF" + elif has_version net-misc/mDNSResponder; then + mycmakeargs="${mycmakeargs} -DWITH_Avahi=OFF -DWITH_DNSSD=ON" + else + die "USE=\"zeroconf\" enabled but neither net-dns/avahi nor net-misc/mDNSResponder were found." + fi + fi + + mycmakeargs="${mycmakeargs} + -DWITH_HSPELL=OFF + $(cmake-utils_has 3dnow X86_3DNOW) + $(cmake-utils_has altivec PPC_ALTIVEC) + $(cmake-utils_has mmx X86_MMX) + $(cmake-utils_has sse X86_SSE) + $(cmake-utils_has sse2 X86_SSE2) + $(cmake-utils_use_with acl ACL) + $(cmake-utils_use_with alsa Alsa) + $(cmake-utils_use_with bzip2 BZip2) + $(cmake-utils_use_with fam FAM) + $(cmake-utils_use_with jpeg2k Jasper) + $(cmake-utils_use_with kerberos GSSAPI) + $(cmake-utils_use_with nls Libintl) + $(cmake-utils_use_with openexr OpenEXR) + $(cmake-utils_use_with opengl OpenGL) + $(cmake-utils_use_with semantic-desktop Soprano) + $(cmake-utils_use_with spell ASPELL) + $(cmake-utils_use_with spell ENCHANT) + $(cmake-utils_use_with ssl OpenSSL) + " + + kde4-base_src_compile + + # The building of apidox is not managed anymore by the build system + if use doc; then + einfo "Building API documentation" + cd "${S}"/doc/api/ + ./doxygen.sh "${S}" || die "APIDOX generation failed" + fi +} + +src_install() { + kde4-base_src_install + + # Some external applications need FindXine.cmake. Therefore upstream moved it + # to kdelibs in trunk. Doing the same for :kde-4. See bug #209701. + insinto ${KDEDIR}/share/apps/cmake/modules/ + doins "${FILESDIR}"/FindXine.cmake || die "doins FindXine failed." + + if use doc; then + einfo "Installing API documentation. This could take a bit of time." + cd "${S}"/doc/api/ + docinto /HTML/en/kdelibs-apidox + dohtml -r ${P}-apidocs/* || die "Install phase of KDE4 API Documentation failed" + fi + + dodir /etc/env.d + dodir /etc/revdep-rebuild + + # List all the multilib libdirs + local _libdir _libdirs + for _libdir in $(get_all_libdirs); do + _libdirs="${_libdirs}:${PREFIX}/${_libdir}" + done + _libdirs=${_libdirs#:} + + cat <<-EOF > "${T}"/44kdepaths-${SLOT} # number goes down with version bump + PATH="${PREFIX}/bin" + ROOTPATH="${PREFIX}/sbin:${PREFIX}/bin" + LDPATH="${_libdirs}" + 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" + COLON_SEPARATED="XDG_DATA_DIRS" + EOF + doenvd "${T}"/44kdepaths-${SLOT} + + # make sure 'source /etc/profile' doesn't hose the PATH + dodir /etc/profile.d + cat <<-'EOF' > "${D}"/etc/profile.d/44kdereorderpaths-${SLOT}.sh + if [ -n "${KDEDIR}" ]; then + export PATH=${KDEDIR}/bin:$(echo ${PATH} | sed "s#${KDEDIR}/s\?bin:##g") + export ROOTPATH=${KDEDIR}/sbin:${KDEDIR}/bin:$(echo ${PATH} | sed "s#${KDEDIR}/s\?bin:##g") + fi + EOF + + cat <<-EOF > "${D}/etc/revdep-rebuild/50-kde-${SLOT}" + SEARCH_DIRS="${PREFIX}/bin ${PREFIX}/lib*" + EOF +} + +src_test() { + # FIXME: Disable kate tests + mycmakeargs="${mycmakeargs} + -DKHTML_BUILD_TESTREGRESSION=ON" + kde4-base_src_test +} + +pkg_postinst() { + if use zeroconf; then + 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 + fi + + kde4-base_pkg_postinst +} |