From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RUQhO-0002SI-TQ for garchives@archives.gentoo.org; Sat, 26 Nov 2011 22:26:19 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 70C9B21C04A; Sat, 26 Nov 2011 22:26:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 281ED21C04A for ; Sat, 26 Nov 2011 22:26:11 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 476971B402A for ; Sat, 26 Nov 2011 22:26:10 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 7A14380042 for ; Sat, 26 Nov 2011 22:26:09 +0000 (UTC) From: "Jonathan Callen" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jonathan Callen" Message-ID: <235b4ae0a7efd5bd178adfce56fbcafb9c6cdc70.abcd@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: Documentation/package.unmask/, Documentation/package.keywords/.kde-live/, ... X-VCS-Repository: proj/kde X-VCS-Files: Documentation/package.keywords/.kde-live/kdelibs-live Documentation/package.keywords/kde-live.keywords Documentation/package.unmask/kde-live eclass/kde4-functions.eclass kde-base/kdelibs/kdelibs-9999.ebuild sets/kdelibs-live X-VCS-Directories: Documentation/package.unmask/ Documentation/package.keywords/.kde-live/ kde-base/kdelibs/ eclass/ sets/ Documentation/package.keywords/ X-VCS-Committer: abcd X-VCS-Committer-Name: Jonathan Callen X-VCS-Revision: 235b4ae0a7efd5bd178adfce56fbcafb9c6cdc70 Date: Sat, 26 Nov 2011 22:26:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 158aefe5-b459-458d-b810-138a66105b2b X-Archives-Hash: 99cacab1b8e68a0ed6997af8cb2d063d commit: 235b4ae0a7efd5bd178adfce56fbcafb9c6cdc70 Author: Jonathan Callen gentoo org> AuthorDate: Sat Nov 26 19:04:33 2011 +0000 Commit: Jonathan Callen gentoo org> CommitDate: Sat Nov 26 22:26:01 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3D235b4ae0 [kde-base/kdelibs] Re-add a -9999 version that actually uses KDE/4.7 --- .../package.keywords/.kde-live/kdelibs-live | 2 +- Documentation/package.keywords/kde-live.keywords | 2 +- Documentation/package.unmask/kde-live | 2 +- eclass/kde4-functions.eclass | 5 - kde-base/kdelibs/kdelibs-9999.ebuild | 316 ++++++++++++++= ++++++ sets/kdelibs-live | 2 +- 6 files changed, 320 insertions(+), 9 deletions(-) diff --git a/Documentation/package.keywords/.kde-live/kdelibs-live b/Docu= mentation/package.keywords/.kde-live/kdelibs-live index e9ce955..57ae337 100644 --- a/Documentation/package.keywords/.kde-live/kdelibs-live +++ b/Documentation/package.keywords/.kde-live/kdelibs-live @@ -1,6 +1,6 @@ ~kde-base/kactivities-9999 ** ~kde-base/kde-env-9999 ** -~kde-base/kdelibs-4.7.49.9999 ** +~kde-base/kdelibs-9999 ** ~kde-base/kdepimlibs-9999 ** ~kde-base/oxygen-icons-9999 ** ~kde-base/katepart-9999 ** diff --git a/Documentation/package.keywords/kde-live.keywords b/Documenta= tion/package.keywords/kde-live.keywords index d01e80c..171623f 100644 --- a/Documentation/package.keywords/kde-live.keywords +++ b/Documentation/package.keywords/kde-live.keywords @@ -223,7 +223,7 @@ ~kde-base/thumbnailers-9999 ** ~kde-base/kactivities-9999 ** ~kde-base/kde-env-9999 ** -~kde-base/kdelibs-4.7.49.9999 ** +~kde-base/kdelibs-9999 ** ~kde-base/kdepimlibs-9999 ** ~kde-base/oxygen-icons-9999 ** ~kde-base/katepart-9999 ** diff --git a/Documentation/package.unmask/kde-live b/Documentation/packag= e.unmask/kde-live index bec0bcb..ef92383 100644 --- a/Documentation/package.unmask/kde-live +++ b/Documentation/package.unmask/kde-live @@ -223,7 +223,7 @@ ~kde-base/thumbnailers-9999 ~kde-base/kactivities-9999 ~kde-base/kde-env-9999 -~kde-base/kdelibs-4.7.49.9999 +~kde-base/kdelibs-9999 ~kde-base/kdepimlibs-9999 ~kde-base/oxygen-icons-9999 ~kde-base/katepart-9999 diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass index ad15b6e..45c68bd 100644 --- a/eclass/kde4-functions.eclass +++ b/eclass/kde4-functions.eclass @@ -418,11 +418,6 @@ add_kdebase_dep() { =20 [[ -z ${1} ]] && die "Missing parameter" =20 - # There will be no kdelibs 4.8+ (the next kdelibs will be a non-BC 5.0,= apparently) - if [[ ${1} =3D=3D kdelibs ]] && version_is_at_least 4.7.50 ${ver}; then - ver=3D4.7.1 - fi - echo " >=3Dkde-base/${1}-${ver}:4[aqua=3D${2:+,${2}}]" } =20 diff --git a/kde-base/kdelibs/kdelibs-9999.ebuild b/kde-base/kdelibs/kdel= ibs-9999.ebuild new file mode 100644 index 0000000..a58ce79 --- /dev/null +++ b/kde-base/kdelibs/kdelibs-9999.ebuild @@ -0,0 +1,316 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=3D4 + +CPPUNIT_REQUIRED=3D"optional" +DECLARATIVE_REQUIRED=3D"always" +OPENGL_REQUIRED=3D"optional" +KDE_SCM=3D"git" +inherit kde4-base fdo-mime toolchain-funcs + +# The "master" branch is out of date, so use KDE/4.7 per upstream's +# recommendation (KDE/4.8 will be branched off of KDE/4.7) +EGIT_BRANCH=3D"KDE/4.7" + +DESCRIPTION=3D"KDE libraries needed by all KDE programs." +HOMEPAGE=3D"http://www.kde.org/" + +KEYWORDS=3D"" +LICENSE=3D"LGPL-2.1" +IUSE=3D"3dnow acl alsa altivec bindist +bzip2 debug doc fam +handbook jp= eg2k kerberos +lzma mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +ude= v ++udisks +upower upnp zeroconf" + +REQUIRED_USE=3D" + udisks? ( udev ) + upower? ( udev ) +" + +# needs the kate regression testsuite from svn +RESTRICT=3D"test" + +COMMONDEPEND=3D" + app-crypt/qca:2 + >=3Dapp-misc/strigi-0.7.6 + app-text/docbook-xml-dtd:4.2 + app-text/docbook-xsl-stylesheets + >=3Ddev-libs/libattica-0.1.90 + >=3Ddev-libs/libdbusmenu-qt-0.3.2 + dev-libs/libpcre[unicode] + dev-libs/libxml2 + dev-libs/libxslt + media-libs/fontconfig + media-libs/freetype:2 + media-libs/giflib + >=3Dmedia-libs/libpng-1.4 + >=3Dmedia-libs/phonon-4.4.3 + sys-libs/zlib + virtual/jpeg + >=3Dx11-misc/shared-mime-info-0.60 + acl? ( virtual/acl ) + alsa? ( media-libs/alsa-lib ) + !aqua? ( + 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/libXScrnSaver + x11-libs/libXtst + !kernel_SunOS? ( sys-libs/libutempter ) + ) + bzip2? ( app-arch/bzip2 ) + fam? ( virtual/fam ) + jpeg2k? ( media-libs/jasper ) + kerberos? ( virtual/krb5 ) + lzma? ( app-arch/xz-utils ) + openexr? ( + media-libs/openexr + media-libs/ilmbase + ) + policykit? ( >=3Dsys-auth/polkit-qt-0.99 ) + semantic-desktop? ( + >=3Ddev-libs/shared-desktop-ontologies-0.6.50 + >=3Ddev-libs/soprano-2.6.51[dbus,raptor,redland] + ) + spell? ( app-text/enchant ) + ssl? ( dev-libs/openssl ) + udev? ( sys-fs/udev ) + upnp? ( media-libs/herqq ) + zeroconf? ( + || ( + net-dns/avahi[mdnsresponder-compat] + !bindist? ( net-misc/mDNSResponder ) + ) + ) +" +DEPEND=3D"${COMMONDEPEND} + doc? ( app-doc/doxygen ) + nls? ( virtual/libintl ) +" +RDEPEND=3D"${COMMONDEPEND} + !x11-libs/qt-phonon + >=3Dapp-crypt/gnupg-2.0.11 + app-misc/ca-certificates + $(add_kdebase_dep kde-env) + !aqua? ( + x11-apps/iceauth + x11-apps/rgb + >=3Dx11-misc/xdg-utils-1.0.2-r3 + udisks? ( sys-fs/udisks ) + upower? ( sys-power/upower ) + ) +" +PDEPEND=3D" + $(add_kdebase_dep katepart) + || ( ( $(add_kdebase_dep kfmclient) ) x11-misc/xdg-utils ) + handbook? ( $(add_kdebase_dep khelpcenter) ) + policykit? ( + >=3Dkde-misc/polkit-kde-kcmodules-0.98_pre20101127 + >=3Dsys-auth/polkit-kde-agent-0.99 + ) + semantic-desktop? ( $(add_kdebase_dep nepomuk) ) +" + +# Force the upgrade of plasma-workspace to a version that explicitly dep= ends on kactivities +add_blocker plasma-workspace 4.7.1 + +PATCHES=3D( + "${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch" + "${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch" + "${FILESDIR}/${PN}-4.5.90-mimetypes.patch" + "${FILESDIR}/${PN}-4.4.90-xslt.patch" + "${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch" + "${FILESDIR}/${PN}-4.6.3-bytecode.patch" +) + +pkg_pretend() { + if [[ ${MERGE_TYPE} !=3D binary ]]; then + [[ $(gcc-major-version) -lt 4 ]] || \ + ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \ + && die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see= bug #354837)." + fi +} + +src_prepare() { + kde4-base_src_prepare + use arm && epatch "${FILESDIR}/${PN}-4.6.2-armlinking.patch" + + # Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix-1.patch= to work) + sed -e 's|FILES[[:space:]]applications.menu|FILES applications.menu REN= AME kde-4-applications.menu|g' \ + -i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.= menu failed." + + if use aqua; then + sed -i -e \ + "s:BUNDLE_INSTALL_DIR \"/Applications:BUNDLE_INSTALL_DIR \"${EPREFIX}= /${APP_BUNDLE_DIR}:g" \ + cmake/modules/FindKDE4Internal.cmake || die "failed to sed FindKDE4In= ternal.cmake" + + #if [[ ${CHOST} =3D=3D *-darwin8 ]]; then + sed -i -e \ + "s:set(_add_executable_param MACOSX_BUNDLE):remove(_add_executable_pa= ram MACOSX_BUNDLE):g" \ + cmake/modules/KDE4Macros.cmake || die "failed to sed KDE4Macros.cmake= " + #fi + + # solid/solid/backends/iokit doesn't properly link, so disable it. + sed -e "s|\(APPLE\)|(FALSE)|g" -i solid/solid/CMakeLists.txt \ + || die "disabling solid/solid/backends/iokit failed" + sed -e "s|m_backend =3D .*Backends::IOKit.*;|m_backend =3D 0;|g" -i so= lid/solid/managerbase.cpp \ + || die "disabling solid/solid/backends/iokit failed" + + # There's no fdatasync on OSX and the check fails to detect that. + sed -e "/HAVE_FDATASYNC/ d" -i config.h.cmake \ + || die "disabling fdatasync failed" + + # Fix nameser include to nameser8_compat + sed -e "s|nameser8_compat.h|nameser_compat.h|g" -i kio/misc/kpac/disco= very.cpp \ + || die "fixing nameser include failed" + append-flags -DHAVE_ARPA_NAMESER8_COMPAT_H=3D1 + + # Try to fix kkeyserver_mac + epatch "${FILESDIR}"/${PN}-4.3.80-kdeui_util_kkeyserver_mac.patch + fi + + if [[ ${CHOST} =3D=3D *-solaris* ]] ; then + epatch "${FILESDIR}/kdelibs-4.3.2-solaris-ksyscoca.patch" + # getgrouplist not in solaris libc + epatch "${FILESDIR}/kdelibs-4.3.2-solaris-getgrouplist.patch" + # solaris has no d_type element in dir_ent + epatch "${FILESDIR}/kdelibs-4.3.2-solaris-fileunix.patch" + fi +} + +src_configure() { + if use zeroconf; then + if has_version net-dns/avahi; then + mycmakeargs=3D(-DWITH_Avahi=3DON -DWITH_DNSSD=3DOFF) + elif has_version net-misc/mDNSResponder; then + mycmakeargs=3D(-DWITH_Avahi=3DOFF -DWITH_DNSSD=3DON) + else + die "USE=3D\"zeroconf\" enabled but neither net-dns/avahi nor net-mis= c/mDNSResponder were found." + fi + else + mycmakeargs=3D(-DWITH_Avahi=3DOFF -DWITH_DNSSD=3DOFF) + fi + mycmakeargs+=3D( + -DWITH_HSPELL=3DOFF + -DWITH_ASPELL=3DOFF + -DKDE_DEFAULT_HOME=3D.kde4 + -DKAUTH_BACKEND=3DPOLKITQT-1 + -DBUILD_libkactivities=3DOFF + $(cmake-utils_use_build handbook doc) + $(cmake-utils_use_has 3dnow X86_3DNOW) + $(cmake-utils_use_has altivec PPC_ALTIVEC) + $(cmake-utils_use_has mmx X86_MMX) + $(cmake-utils_use_has sse X86_SSE) + $(cmake-utils_use_has sse2 X86_SSE2) + $(cmake-utils_use_with acl) + $(cmake-utils_use_with alsa) + $(cmake-utils_use_with bzip2 BZip2) + $(cmake-utils_use_with fam) + $(cmake-utils_use_with jpeg2k Jasper) + $(cmake-utils_use_with kerberos GSSAPI) + $(cmake-utils_use_with lzma LibLZMA) + $(cmake-utils_use_with nls Libintl) + $(cmake-utils_use_with openexr OpenEXR) + $(cmake-utils_use_with opengl OpenGL) + $(cmake-utils_use_with policykit PolkitQt-1) + $(cmake-utils_use_with semantic-desktop Soprano) + $(cmake-utils_use_with semantic-desktop SharedDesktopOntologies) + $(cmake-utils_use_with spell ENCHANT) + $(cmake-utils_use_with ssl OpenSSL) + $(cmake-utils_use_with udev UDev) + $(cmake-utils_use_with upnp HUpnp) + ) + kde4-base_src_configure +} + +src_compile() { + 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 + + # use system certificates + rm -f "${ED}"/usr/share/apps/kssl/ca-bundle.crt || die + dosym /etc/ssl/certs/ca-certificates.crt /usr/share/apps/kssl/ca-bundle= .crt + + 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/* + fi + + if use aqua; then + einfo "fixing ${PN} plugins" + + local _PV=3D${PV:0:3}.0 + local _dir=3D${EPREFIX}/usr/$(get_libdir)/kde4/plugins/script + + install_name_tool -id \ + "${_dir}/libkrossqtsplugin.${_PV}.dylib" \ + "${D}/${_dir}/libkrossqtsplugin.${_PV}.dylib" \ + || die "failed fixing libkrossqtsplugin.${_PV}.dylib" + + einfo "fixing ${PN} cmake detection files" + #sed -i -e \ + # "s:if (HAVE_XKB):if (HAVE_XKB AND NOT APPLE):g" \ + echo -e "set(XKB_FOUND FALSE)\nset(HAVE_XKB FALSE)" > \ + "${ED}"/usr/share/apps/cmake/modules/FindXKB.cmake \ + || die "failed fixing FindXKB.cmake" + fi + + einfo Installing environment file. + # Since 44qt4 is sourced earlier QT_PLUGIN_PATH is defined. + echo "COLON_SEPARATED=3DQT_PLUGIN_PATH" > "${T}/77kde" + echo "QT_PLUGIN_PATH=3D${EPREFIX}/usr/$(get_libdir)/kde4/plugins" >> "$= {T}/77kde" + doenvd "${T}/77kde" +} + +pkg_postinst() { + fdo-mime_mime_database_update + + if use zeroconf; then + echo + elog "To make zeroconf support available in KDE make sure that the 'md= nsd' daemon" + elog "is running." + echo + einfo "If you also want to use zeroconf for hostname resolution, emerg= e sys-auth/nss-mdns" + einfo "and enable multicast dns lookups by editing the 'hosts:' line i= n /etc/nsswitch.conf" + einfo "to include 'mdns', e.g.:" + einfo " hosts: files mdns dns" + echo + fi + + elog "Your homedir is set to \${HOME}/.kde4" + echo + + kde4-base_pkg_postinst +} + +pkg_prerm() { + # Remove ksycoca4 global database + rm -f "${EROOT}${PREFIX}"/share/kde4/services/ksycoca4 +} + +pkg_postrm() { + fdo-mime_mime_database_update + + kde4-base_pkg_postrm +} diff --git a/sets/kdelibs-live b/sets/kdelibs-live index ea91f65..519edc4 100644 --- a/sets/kdelibs-live +++ b/sets/kdelibs-live @@ -1,6 +1,6 @@ ~kde-base/kactivities-9999 ~kde-base/kde-env-9999 -~kde-base/kdelibs-4.7.49.9999 +~kde-base/kdelibs-9999 ~kde-base/kdepimlibs-9999 ~kde-base/oxygen-icons-9999 ~kde-base/katepart-9999