From: Samuli Suominen Date: Thu, 5 Jan 2012 09:36:04 +0000 (+0000) Subject: Fix FindXine.cmake to use pkg-config instead of xine-config wrt #397595 by Johannes... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2fc5c28622c3edb61e831b81740b3729278a7ac3;p=gentoo.git Fix FindXine.cmake to use pkg-config instead of xine-config wrt #397595 by Johannes Huber Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64 --- diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog index ea39d3154bed..ed1b8448149a 100644 --- a/kde-base/kdelibs/ChangeLog +++ b/kde-base/kdelibs/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for kde-base/kdelibs # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.814 2012/01/02 15:46:43 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.815 2012/01/05 09:36:04 ssuominen Exp $ + +*kdelibs-4.7.4-r11 (05 Jan 2012) + + 05 Jan 2012; Samuli Suominen kdelibs-4.6.3-r3.ebuild, + kdelibs-4.7.4.ebuild, +kdelibs-4.7.4-r11.ebuild, + +files/kdelibs-4.7.4-xinelib12x.patch: + Fix FindXine.cmake to use pkg-config instead of xine-config wrt #397595 by + Johannes Huber 02 Jan 2012; Andreas K. Huettel +ChangeLog-2009: Split ChangeLog. diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest index 036e8d55b52b..7cb74c1c31a6 100644 --- a/kde-base/kdelibs/Manifest +++ b/kde-base/kdelibs/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +Hash: SHA1 AUX dist/01_gentoo_set_xdg_menu_prefix-1.patch 592 RMD160 80ac0ae419f0f721a044053cdaeaf2f1f982f74e SHA1 80e9a70b108cab0b05efc50d6fa66665b711f149 SHA256 dea20e8a0e8f0ecc1aec1b38cec994312514aa1e88ba25fede01e1953623f341 AUX dist/01_gentoo_set_xdg_menu_prefix.patch 606 RMD160 37290ce06adf1cf43b0006c02804d7fe762ed609 SHA1 8e86e06a70438c12085a595fd66e2354141fb056 SHA256 9c64b093340d7d25ce6c28d298cd62f3f4da141b762c663df9cd9b5b7722f7d3 @@ -21,31 +21,27 @@ AUX kdelibs-4.6.5-qlabel-1.patch 488 RMD160 c91170ec890055118f8aad3b984b12374a87 AUX kdelibs-4.6.5-qlabel-2.patch 2412 RMD160 c66da201738b10ec3507206efebcf4b14380ec9a SHA1 5f389b92c33103aa8f4f3fb1191a009312b4ba38 SHA256 5f2da4bc7f0175f143ec75ccb4a7678177d785c20067fbcc8e6a232ed1532431 AUX kdelibs-4.7.1-libpng15.patch 498 RMD160 cbb61db267bb80b89de2963f6d73c2a79de637e5 SHA1 8343944314614f6aa21320c7de3289c9eda6e335 SHA256 4e102b98b30987a8a860b57436637c27ed32533a5bb7df76cc359e083a93c181 AUX kdelibs-4.7.3-customcont.patch 1673 RMD160 13de4a1b2026326ef91e27cea278fbab41b61b33 SHA1 0810ce778314ec89566ef290bb31ff016cecee78 SHA256 9821678b7422a6184e2a08bf01d37cab95affb32a1589571825bf10442577875 +AUX kdelibs-4.7.4-xinelib12x.patch 1292 RMD160 99422bd8f4204b6743ed8c662991d5bd7c207654 SHA1 9cb83cb7f6394549354c6837977f9e9529127041 SHA256 25d47c260d674cdbd8354c21bc449fb8c116c9594c04d1db8709abbe59ca8cdd DIST kdelibs-4.6.3.tar.bz2 12916816 RMD160 f7f78ef93fa75d488efcd7c66dcbce6d153f9c28 SHA1 c7fb089c9d52a6b1d9188b9e788753373a3288e4 SHA256 b6ea04dc9014ff3fca0242fd927faeb67dc53288779aeb873d46104aa6109e38 DIST kdelibs-4.7.3.tar.bz2 12071229 RMD160 e8bb93554a915d97d6619b8a9bfccdd7175259a0 SHA1 4f1bbd1b4d558f3541057747db9bf7e9dcececb3 SHA256 00ef65295134e998e8bc1123b0bd64245811106e827ab90458378ea4ab5b0e66 DIST kdelibs-4.7.4.tar.bz2 12084560 RMD160 5666cacb69ebdbd2d0e9ce9300f35ecf6d6ba48c SHA1 78b25e93a8c70ccc1e0f117cce960fe4e1deb8d8 SHA256 fe1d41ecce95d9ef67a9b81cee55afe5ac98aa937e2c2356bd69f9bb31a2af39 -EBUILD kdelibs-4.6.3-r3.ebuild 10267 RMD160 ab37da5d4a2a6ff65143b3e7a569274309615c90 SHA1 00a26ee63092a99f8e910ce9e553db52c81dba8d SHA256 aac5be6a7b5f61d8f4b876e743a1bf2f82c21efa8f5a823af7d46f7b68165033 +EBUILD kdelibs-4.6.3-r3.ebuild 10311 RMD160 458755a33f4ccc84711c713bd9a36a2438ab4c64 SHA1 f8b5bd4cf142dab88dee02a4d93da7b2e36f24a4 SHA256 14f94fc5eec806df47e144a25efa4a87cbbfd3299273d8dc52625fa64bd0d951 EBUILD kdelibs-4.7.3-r1.ebuild 9258 RMD160 548c38a475ef5026f7e15b471273239ce83b0ffc SHA1 3a2503920447e418c823e12a938837777e2e95a5 SHA256 409c7827589f9169438134d2e40bffce82ca593756cad574573f32089be051f7 EBUILD kdelibs-4.7.3-r11.ebuild 9312 RMD160 c4a672ffea8fd177fef6b3afaa9526ab3e8ba4cc SHA1 d83656c8d4ec7cebe36c203092ca9f1daebe9033 SHA256 03010896d7a5880f06136476c92738c2d7ae34a2007ec965b992dd42284db159 EBUILD kdelibs-4.7.4-r10.ebuild 9268 RMD160 d73da9f0a53f78bdb6582774eaf3658c8910db80 SHA1 b0ccbcfe53f9e99c8ee79734752d2912d5de021e SHA256 4003e514a923c908b591257bc048baeab5f16ea7866f6cd25db4836215ef6b77 -EBUILD kdelibs-4.7.4.ebuild 9213 RMD160 3e79dc67909fdd43d9ee735bc5b9fdf9533fd91e SHA1 58f794525c60eab31aa5a0acfaa2f67d622e64bf SHA256 c0a2924df2dd07cc1aa21c71b3d6a1ebb07a1f40f4ed75d6ae054041e22a37c0 -MISC ChangeLog 25935 RMD160 97a97c0e1fc553844368757abe7843f10855171b SHA1 11d93d532f4185bd440a578362ccd8b4a998c2ff SHA256 3b22be04ba7409c9761c03ea2f2e3edf145c8550190083c7ca16aa0e471d9333 +EBUILD kdelibs-4.7.4-r11.ebuild 9312 RMD160 4d0c447a6fb90ae44fbce3441e5898175eccccb2 SHA1 7cd21e8a95918d424c1e91406ccadf374a61ba37 SHA256 9863b08377b8020200e02e9c2fc86b5d06641897457174fe3f1d3043e8583bc7 +EBUILD kdelibs-4.7.4.ebuild 9257 RMD160 602e3505e05946a3a638c2cc0b09d1f857114e62 SHA1 a704a9ca1faac6b48c5744f8671c4e853b55a80f SHA256 f8412f17ebdbff569dd75e1a33c0074fb04b92503ced42f8cb3e8909dbce94d3 +MISC ChangeLog 26235 RMD160 6848e4d0617831988d79696f18694f99bcbbd4e8 SHA1 16579a576590a29f0c1ad00a5ef74ffbed7de11c SHA256 df9b89c43599132ed5d8bddabed6c3fbe76824c36409433210b4dec97b3e8115 MISC ChangeLog-2009 110608 RMD160 9dfb93acebe4df4b7bbbca589c1bacd7033ec36c SHA1 c5fbfedfb78a157dd182606b0056b376bd3353d6 SHA256 845ba7764dc9cabd4753d146e82cc0347a0dbbe21a76a4aab453106e7d70ba1f MISC metadata.xml 443 RMD160 765aa5080e9ecee24e26f5b8a5168e674db2ffd2 SHA1 82f77d1dc84732dbedcdebbac460896bd6b5484b SHA256 79624eb4920e9849ea5ce593a5adc8c7e45cd9670f9f63a64cf00a637de2d701 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iQIcBAEBCgAGBQJPAdHlAAoJEEb+UGWnxTyHuHMP/RT2xjelrsKDpxgcC3s4mpRF -8ek5Fx+kfnEW0Sz5BaBB4m0ey5sjLs4tZ77O7Km4xBPv8PRVJgJc0SGSi/ZO+sJi -O26RIE5uxEwWQxpJg8RzYQpYrCx6RcOuV1xOQYAwoUStdfxfMHcpFoJuSKJi4snN -FyQ4OYV6pmBGOO2ofZFb7e+pNf99qJ7nb8gmB1/kdI3Pki8rHBNyTRG737ykxIIk -oG5GBg3JSJZOr1CixrEbgYCGBozuCuyqz7mZ9T2E3PcmudeVegbGUgEvCRw6Zjdo -NXlPyrZCNYF1p7DYA+b8Q9G29h2N8kDEbza+x2hoM+4RDvfqC8EABT7ahRSiIEsS -QG8X+jLh7zxJgTsVokgBQHcU5eQIuee8PVnvwGxudHiLrC5TUorz3vKwm+8GRGT9 -7ml/y2szoYyg209y0VFmJco+CE5dT2qb7bDA2p7KfZEAbZF7/zf3gScjv0R9hRy0 -iib7yPHBtdKiHtVNRxJndryBou9Sq2vCqe5+pXwBuI6TZpcwj0riw/upiwPTlwMR -8AdrAY5L0Xdk/q4H0uRTvKdTZE4V8a7Lei8mSGrFqwjdu4VmMue+ZyYqeEeEzVw0 -WPyysfR+pbQw62tN20QWnoCqRIozt5b6kPIuE2jgTTG8BkTy59f+9Hp3TfOM6Eva -1cfSQ3NvaoL+6ArLfNqs -=cMTw +iQEcBAEBAgAGBQJPBW6LAAoJEEdUh39IaPFNneoH/2Eto9ma4VBkbaEvuhcLVtSw +mfYgJREBx+GGHRDhp3GbcgLktt76RgruMI6rIdlrG1Dnb1KxHZB62lAwp0O8UMRK +n3pMEJlchHSMyM1d0PDRYUS6fGlzceZESLGIQ7vvLL3Bo2LNgX8hTBlI1lahBC8H +vzdZoFRPxBAknQ3IDYEL6iYJHr3lHvrznQZIsJiY5uXdN9BitUHIfY6O6EKTkLfh +R45LKT14DNqh2D49ApEVGV0rCXigB6pM6kuAiZGhR3eHZ+1cniU30N449ceejr/6 +ktKz3+XXr5o04bKq1Q5eRV6E7doZWHX2u7vzgKAouquap42vbBNt0h8SLCo+anE= +=Sqds -----END PGP SIGNATURE----- diff --git a/kde-base/kdelibs/files/kdelibs-4.7.4-xinelib12x.patch b/kde-base/kdelibs/files/kdelibs-4.7.4-xinelib12x.patch new file mode 100644 index 000000000000..bdcd39a6c974 --- /dev/null +++ b/kde-base/kdelibs/files/kdelibs-4.7.4-xinelib12x.patch @@ -0,0 +1,32 @@ +From de5da56d10a47ff8fdf55c0818e9e776dcfa01f9 Mon Sep 17 00:00:00 2001 +From: Johannes Huber +Date: Thu, 5 Jan 2012 10:06:05 +0100 +Subject: [PATCH] Fix FindXine.cmake module with >=xine-lib-1.2. + +--- + cmake/modules/FindXine.cmake | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/cmake/modules/FindXine.cmake b/cmake/modules/FindXine.cmake +index 37c58c6..d71969a 100644 +--- a/cmake/modules/FindXine.cmake ++++ b/cmake/modules/FindXine.cmake +@@ -36,13 +36,13 @@ find_library(XINE_LIBRARY NAMES xine + ${PC_LIBXINE_LIBRARY_DIRS} + ) + +-find_program(XINECONFIG_EXECUTABLE NAMES xine-config ++find_program(XINECONFIG_EXECUTABLE NAMES pkg-config + HINTS + ${PC_LIBXINE_PREFIX}/bin + ) + + if (XINE_INCLUDE_DIR AND XINE_LIBRARY AND XINECONFIG_EXECUTABLE) +- exec_program(${XINECONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE XINE_VERSION ERROR_QUIET) ++ exec_program(${XINECONFIG_EXECUTABLE} ARGS --modversion libxine RETURN_VALUE _return_VALUE OUTPUT_VARIABLE XINE_VERSION ERROR_QUIET) + if("${XINE_VERSION}" VERSION_GREATER "1.1.0") #if (... VERSION_GREATER) is new since cmake 2.6.2 + set(XINE_VERSION_OK TRUE) + string(REGEX REPLACE "[0-9]\\.[0-9]\\." "" XINE_BUGFIX_VERSION ${XINE_VERSION}) +-- +1.7.8.2 + diff --git a/kde-base/kdelibs/kdelibs-4.6.3-r3.ebuild b/kde-base/kdelibs/kdelibs-4.6.3-r3.ebuild index 53eb6c28b0eb..4e7698b29359 100644 --- a/kde-base/kdelibs/kdelibs-4.6.3-r3.ebuild +++ b/kde-base/kdelibs/kdelibs-4.6.3-r3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.6.3-r3.ebuild,v 1.8 2011/12/26 16:12:48 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.6.3-r3.ebuild,v 1.9 2012/01/05 09:36:04 ssuominen Exp $ EAPI=4 @@ -136,6 +136,7 @@ PATCHES=( "${FILESDIR}/${PN}-4.6.3-doublepost.patch" "${FILESDIR}/${PN}-4.6.5-qlabel-1.patch" "${FILESDIR}/${PN}-4.6.5-qlabel-2.patch" + "${FILESDIR}/${PN}-4.7.4-xinelib12x.patch" ) pkg_pretend() { diff --git a/kde-base/kdelibs/kdelibs-4.7.4-r11.ebuild b/kde-base/kdelibs/kdelibs-4.7.4-r11.ebuild new file mode 100644 index 000000000000..de78bb96dec6 --- /dev/null +++ b/kde-base/kdelibs/kdelibs-4.7.4-r11.ebuild @@ -0,0 +1,316 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.7.4-r11.ebuild,v 1.1 2012/01/05 09:36:04 ssuominen Exp $ + +EAPI=4 + +CPPUNIT_REQUIRED="optional" +DECLARATIVE_REQUIRED="always" +OPENGL_REQUIRED="optional" +KDE_SCM="git" +inherit kde4-base fdo-mime toolchain-funcs + +DESCRIPTION="KDE libraries needed by all KDE programs." +HOMEPAGE="http://www.kde.org/" + +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" +LICENSE="LGPL-2.1" +IUSE="3dnow acl alsa altivec bindist +bzip2 debug doc fam +handbook jpeg2k kerberos +lzma mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev ++udisks +upower upnp zeroconf" + +REQUIRED_USE=" + udisks? ( udev ) + upower? ( udev ) +" + +# needs the kate regression testsuite from svn +RESTRICT="test" + +COMMONDEPEND=" + app-crypt/qca:2 + >=app-misc/strigi-0.7.6 + app-text/docbook-xml-dtd:4.2 + app-text/docbook-xsl-stylesheets + >=dev-libs/libattica-0.1.90 + >=dev-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 + >=media-libs/libpng-1.4 + >=media-libs/phonon-4.4.3 + sys-libs/zlib + virtual/jpeg + >=x11-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? ( >=sys-auth/polkit-qt-0.99 ) + semantic-desktop? ( + >=dev-libs/shared-desktop-ontologies-0.6.50 + >=dev-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="${COMMONDEPEND} + doc? ( app-doc/doxygen ) + nls? ( virtual/libintl ) +" +RDEPEND="${COMMONDEPEND} + !x11-libs/qt-phonon + >=app-crypt/gnupg-2.0.11 + app-misc/ca-certificates + $(add_kdebase_dep kde-env) + !aqua? ( + x11-apps/iceauth + x11-apps/rgb + >=x11-misc/xdg-utils-1.0.2-r3 + udisks? ( sys-fs/udisks ) + upower? ( sys-power/upower ) + ) +" +PDEPEND=" + $(add_kdebase_dep katepart) + || ( ( $(add_kdebase_dep kfmclient) ) x11-misc/xdg-utils ) + handbook? ( $(add_kdebase_dep khelpcenter) ) + policykit? ( + >=kde-misc/polkit-kde-kcmodules-0.98_pre20101127 + >=sys-auth/polkit-kde-agent-0.99 + ) + semantic-desktop? ( $(add_kdebase_dep nepomuk) ) +" + +# Force the upgrade of plasma-workspace to a version that explicitly depends on kactivities +add_blocker plasma-workspace 4.7.1 + +# file collision, bug 394991 +add_blocker kcontrol 4.4.50 + +PATCHES=( + "${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" + "${FILESDIR}/${PN}-4.7.4-xinelib12x.patch" +) + +pkg_pretend() { + if [[ ${MERGE_TYPE} != 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 RENAME 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 FindKDE4Internal.cmake" + + #if [[ ${CHOST} == *-darwin8 ]]; then + sed -i -e \ + "s:set(_add_executable_param MACOSX_BUNDLE):remove(_add_executable_param 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 = .*Backends::IOKit.*;|m_backend = 0;|g" -i solid/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/discovery.cpp \ + || die "fixing nameser include failed" + append-flags -DHAVE_ARPA_NAMESER8_COMPAT_H=1 + + # Try to fix kkeyserver_mac + epatch "${FILESDIR}"/${PN}-4.3.80-kdeui_util_kkeyserver_mac.patch + fi + + if [[ ${CHOST} == *-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=(-DWITH_Avahi=ON -DWITH_DNSSD=OFF) + elif has_version net-misc/mDNSResponder; then + mycmakeargs=(-DWITH_Avahi=OFF -DWITH_DNSSD=ON) + else + die "USE=\"zeroconf\" enabled but neither net-dns/avahi nor net-misc/mDNSResponder were found." + fi + else + mycmakeargs=(-DWITH_Avahi=OFF -DWITH_DNSSD=OFF) + fi + mycmakeargs+=( + -DWITH_HSPELL=OFF + -DWITH_ASPELL=OFF + -DKDE_DEFAULT_HOME=.kde4 + -DKAUTH_BACKEND=POLKITQT-1 + -DBUILD_libkactivities=OFF + $(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=${PV:0:3}.0 + local _dir=${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=QT_PLUGIN_PATH" > "${T}/77kde" + echo "QT_PLUGIN_PATH=${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 'mdnsd' daemon" + elog "is running." + echo + einfo "If you also want to use zeroconf for hostname resolution, emerge sys-auth/nss-mdns" + einfo "and enable multicast dns lookups by editing the 'hosts:' line in /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/kde-base/kdelibs/kdelibs-4.7.4.ebuild b/kde-base/kdelibs/kdelibs-4.7.4.ebuild index c624c91a9aac..aaed43d00e11 100644 --- a/kde-base/kdelibs/kdelibs-4.7.4.ebuild +++ b/kde-base/kdelibs/kdelibs-4.7.4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.7.4.ebuild,v 1.3 2011/12/28 22:07:07 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.7.4.ebuild,v 1.4 2012/01/05 09:36:04 ssuominen Exp $ EAPI=4 @@ -128,6 +128,7 @@ PATCHES=( "${FILESDIR}/${PN}-4.4.90-xslt.patch" "${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch" "${FILESDIR}/${PN}-4.6.3-bytecode.patch" + "${FILESDIR}/${PN}-4.7.4-xinelib12x.patch" ) pkg_pretend() {