diff options
author | Andreas Hüttel <dilfridge@gentoo.org> | 2011-04-10 19:43:35 +0000 |
---|---|---|
committer | Andreas Hüttel <dilfridge@gentoo.org> | 2011-04-10 19:43:35 +0000 |
commit | 42030a3baefd0108cab7ba931ac0c8da4f12ff8d (patch) | |
tree | 6c299790cbf22e27a7ac7b95fb33d24c06ebe0e6 /kde-base | |
parent | Marked ~x86-macos, fixed for Prefix (EAPI=3) (diff) | |
download | historical-42030a3baefd0108cab7ba931ac0c8da4f12ff8d.tar.gz historical-42030a3baefd0108cab7ba931ac0c8da4f12ff8d.tar.bz2 historical-42030a3baefd0108cab7ba931ac0c8da4f12ff8d.zip |
Set QT_PLUGIN_PATH, fixes bug 358299
Package-Manager: portage-2.1.9.45/cvs/Linux x86_64
Diffstat (limited to 'kde-base')
-rw-r--r-- | kde-base/kdelibs/ChangeLog | 8 | ||||
-rw-r--r-- | kde-base/kdelibs/Manifest | 29 | ||||
-rw-r--r-- | kde-base/kdelibs/kdelibs-4.6.2-r2.ebuild | 321 |
3 files changed, 343 insertions, 15 deletions
diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog index 5972ecf8af29..f10bf7245b83 100644 --- a/kde-base/kdelibs/ChangeLog +++ b/kde-base/kdelibs/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for kde-base/kdelibs # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.740 2011/04/08 19:39:21 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.741 2011/04/10 19:43:35 dilfridge Exp $ + +*kdelibs-4.6.2-r2 (10 Apr 2011) + + 10 Apr 2011; Andreas K. Huettel <dilfridge@gentoo.org> + +kdelibs-4.6.2-r2.ebuild: + Set QT_PLUGIN_PATH, fixes bug 358299 08 Apr 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kdelibs-4.4.5.ebuild, -kdelibs-4.4.5-r1.ebuild, -kdelibs-4.4.5-r2.ebuild: diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest index 53d9aa342a2a..a56bcbe9be66 100644 --- a/kde-base/kdelibs/Manifest +++ b/kde-base/kdelibs/Manifest @@ -36,22 +36,23 @@ DIST kdelibs-4.6.2.tar.bz2 12917847 RMD160 3a6f2a95f12d15c2ebfe2c5fb1e8f1fb3f512 EBUILD kdelibs-4.4.5-r3.ebuild 9389 RMD160 623d5b887f84431bf568fc87cd69daa2e7cfcd28 SHA1 b9b4ffe449c7a73ae7b0a00acb2e0fb5d00a85d9 SHA256 49970c6e40ce296c329067244f42ac0746b57ea571ed96e9972f78197fe990fb EBUILD kdelibs-4.4.5-r4.ebuild 9431 RMD160 2844a2000bb885b30a1597f8274ecd15f57e7efd SHA1 9d1bdcaecbae0e80a1980f1f51c7fa6ca0fb8d34 SHA256 3d15b70c3e72410e05b519de40f53f125c0f633d0c14d591c70f8b7171874ea4 EBUILD kdelibs-4.6.2-r1.ebuild 9688 RMD160 304c950f7cebf7673ff074693a8352e72fbc96c3 SHA1 4bd241e8ae9e3a13b03d4384df6515e6988fae18 SHA256 68acb993ee5ec9c62e27f85a061f0b166b416d9cb9b891de5fe5ce82a67f7eee -MISC ChangeLog 123555 RMD160 3b606b82ce408a157bca72a4b8545ebf464f0936 SHA1 e401ee9c8cb230920ae749e5a466ea4d3275369d SHA256 5ef8c831c72d6747d46bc721a4ceae12484cc955e3c6dea2c4091f9fb876917a +EBUILD kdelibs-4.6.2-r2.ebuild 9918 RMD160 e376e098a8bc45bbd7466a4471ecc27245814817 SHA1 ba3cf74dd086fee00d96d5017900b1af10752fbf SHA256 c4d29436ee1c3b1bfe50dfff5a3e6852800a0cf8c6b7b0b11f50c6f82bad1918 +MISC ChangeLog 123713 RMD160 efccc78c456bc87706db66301ab678e0c670d0fe SHA1 01bbdcc6ca868eeb5320d81370daf53f305d257e SHA256 2a292b81fe37061557385aeb36a54f9324e930b3638eb45120f9a709e28f8c6f MISC metadata.xml 250 RMD160 1cf3a68b9ec97616d8ad515fba750a045cd261e5 SHA1 e13cc9329dd1557d621d84e042a3cfac56490548 SHA256 01ebccaddc9d829aec527fdcfd6d81dc72b5034d0eb59881838ecc10131c12a7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iQIcBAEBCgAGBQJNn2UkAAoJENwGBM22xffeTgoP/1pFz7WYHLQ7Pznps/gvhTYV -3KsP3hI9qOUk7ZEVskaofWcJL4VWMQDmgmRIonS0Fzxt1rO0l8rRxP1vmVI8kvZu -3QdIplhjVBTFjYAEPR/IV7FCLBIcqcUvo9ofmv5a2HbA1TOn2jD7kOYgcqYgsJC/ -UKZ0kWrsxZNU95wqQ68OI2usUQ7FI7tD5oP9moaXoCKhA0H1dhKJuJ5Xug4mrvvH -fciR/KdxnR0PLvuyWm406NNCyVjFhIxNP5Q1ey01hce3T61zoPRAIHhMLWdAVzj6 -O0LjfgHyL+ciFRLGr1XdklP90ywO+0XKbdoE3HvWBJtIYnLESO8g6rTrIMgj7VKG -Sdp013RYDjtnuEylUIOqhOYfc13kuetaxbMOl7GNkVMRAaDRcbwl14XgW9+ODnHE -QUYSlAcTv95m79YG17ndPweB37LageEbpr1RDlJpaPKGh8jOyPuax7Bblzmjwz+U -5AoSLSxQKoWYh2hbqTsZHssOm8f5086n7Jo8NSLQWz7gjCQ28QoBvBxFtE6BjsQ8 -FiPDWJ+aFeoZxbCpbzyAoQ90hOqUI2Nbt3jsRYUHqy4rwWOvU6E55r1d/wyQCmbT -rNloAmu4BAvKCOXzsXLPYu6SiJT4lo+rPlmhjkrFIcJ5A8Gqibiy8bLlbhuRi+ng -jm1C8F08ncOrrlu5gqs1 -=BtuI +iQIcBAEBCgAGBQJNogkrAAoJENwGBM22xfferCwQAKpTzncadxWfjnJMbcREWHfJ +WV6mMjYIN9MC0E6cuxN/T2vg8zXd2F6zr5Cx+1pPA1fvCxCyEbodiFVo/an6ad8v +GqwPmTZEiI7NtAO+5dxYu8FdloUIfUM737i+fuJudtvPDpagcs50OWjhMesRjEXc +NEjICQhD7AXbz5HeRhxvHGg9Cqng9UhIr0SSx2M/xkoeNkWrRf5vPmbhTKxnHBqk +0XCXh417J+VWIqEeCvQ/E7DfrVA4uzPjsL5TnRY2v36DgaaJPVHFKzVa/hG41Gwc +cWSXKmSX5ROgFrdfGLWkIR7WVuozmYaTqrK4M+30pFE+0I7ItmXo5HQXoDLfvK0s +yg61SF6X4R/HmXos2U3DanTHh3CyNwn9ts0ivEUlvP4lmcVrkIHBWyB/oXzdOG0Z +aC+NTkfzPN5YYFkaelJIClBa684cJW9mcr8hhoVlbWP20eJZX2m+EOs2biSfM8l7 +ZuwzQs3AGIuYx1RQy+ob+6RM9H9zR/s+GrhFnbhv7Oukn3mEIdtMJDA4oW1DcohE +5KSXtLp99gGQeaeUIOIElJdTnbxANw5mKikfDT0Z2O6K8H60eIoN0w5OWDScmsi6 +GChSsBhI2GBhY19TBTSrZ5Qxx3/qY98G99XnO4nl7ycKPghI5aM7EcOVasmrGBLF +lTEEGZ+BeOZM5uiBimd/ +=a3HR -----END PGP SIGNATURE----- diff --git a/kde-base/kdelibs/kdelibs-4.6.2-r2.ebuild b/kde-base/kdelibs/kdelibs-4.6.2-r2.ebuild new file mode 100644 index 000000000000..608ec8728cd5 --- /dev/null +++ b/kde-base/kdelibs/kdelibs-4.6.2-r2.ebuild @@ -0,0 +1,321 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.6.2-r2.ebuild,v 1.1 2011/04/10 19:43:35 dilfridge Exp $ + +EAPI=3 + +CPPUNIT_REQUIRED="optional" +DECLARATIVE_REQUIRED="always" +OPENGL_REQUIRED="optional" +WEBKIT_REQUIRED="always" +KDE_SCM="git" +inherit kde4-base fdo-mime + +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 zeroconf" + +# needs the kate regression testsuite from svn +RESTRICT="test" + +COMMONDEPEND=" + app-crypt/qca:2 + >=app-misc/strigi-0.6.3 + >=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.5 + >=dev-libs/soprano-2.5.63_pre[dbus,raptor,redland] + ) + spell? ( app-text/enchant ) + ssl? ( dev-libs/openssl ) + udev? ( sys-fs/udev ) + zeroconf? ( + || ( + net-dns/avahi[mdnsresponder-compat] + !bindist? ( net-misc/mDNSResponder ) + ) + ) +" +DEPEND="${COMMONDEPEND} + app-text/docbook-xml-dtd:4.2 + app-text/docbook-xsl-stylesheets + doc? ( app-doc/doxygen ) + nls? ( virtual/libintl ) +" +RDEPEND="${COMMONDEPEND} + !dev-libs/conversion + !dev-libs/kunitconversion + !x11-libs/qt-phonon + !<=kde-misc/kdnssd-avahi-0.1.2:0 + !<=kde-misc/knetworkmanager-4.4.0_p20100820 + >=app-crypt/gnupg-2.0.11 + app-misc/ca-certificates + $(add_kdebase_dep kde-env) + !aqua? ( + sys-fs/udisks + sys-power/upower + x11-apps/iceauth + x11-apps/rgb + >=x11-misc/xdg-utils-1.0.2-r3 + ) +" +PDEPEND=" + || ( ( $(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) ) +" + +# Blockers added due to packages from old versions, removed in the meanwhile +# as well as for file collisions +add_blocker libknotificationitem +add_blocker libkworkspace '<4.3.66' +add_blocker kcontrol '<4.5.80' +# @since 4.4 - kpilot is gone (blocker added to help upgrades) +add_blocker kpilot +# Block some old versions of KDE-3.5 packages that don't work well with KDE-4 +add_blocker kdebase 0 3.5.9-r4:3.5 +add_blocker kdebase-startkde 0 3.5.10:3.5 +add_blocker kdelibs 0 '<3.5.10:3.5' +# libnepomukquery moved to kdelibs from plasma-workspace between 4.3.74 -> 4.3.75 +add_blocker plasma-workspace '<4.3.75' + +PATCHES=( + "${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix.patch" + "${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch" +# "${FILESDIR}/${PN}-4.5.73-module-suffix.patch" - FIXME what is this and why is it needed? +# "${FILESDIR}/${PN}-4.4.66-macos-unbundle.patch" - FIXME needs to be ported, also see above +# "${FILESDIR}/${PN}-4.3.3-klauncher_kioslave.patch" - FIXME is this really needed? if so, please upstream it +# "${FILESDIR}/${PN}-4.5.74-klauncher_mac.patch" - FIXME read above + "${FILESDIR}/${PN}-4.5.90-mimetypes.patch" + "${FILESDIR}/${PN}-4.4.90-xslt.patch" + "${FILESDIR}/${PN}-4.6.0-kateacc.patch" + "${FILESDIR}/${PN}-4.6.2-nonepomuk.patch" +) + +src_prepare() { + kde4-base_src_prepare + + # Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix.patch to work) + local menu_prefix="kde-${SLOT}-" + sed -e "s|FILES[[:space:]]applications.menu|FILES applications.menu RENAME ${menu_prefix}applications.menu|g" \ + -i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed." + sed -e "s|@REPLACE_MENU_PREFIX@|${menu_prefix}|g" \ + -i kded/vfolder_menu.cpp || die "Sed on vfolder_menu.cpp 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 + if use kdeprefix; then + HME=".kde${SLOT}" + else + HME=".kde4" + fi + mycmakeargs+=( + -DWITH_HSPELL=OFF + -DWITH_ASPELL=OFF + -DKDE_DEFAULT_HOME=${HME} + -DKAUTH_BACKEND=POLKITQT-1 + $(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) + ) + 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}/${KDEDIR}"/share/apps/kssl/ca-bundle.crt || die + dosym /etc/ssl/certs/ca-certificates.crt \ + "${KDEDIR}"/share/apps/kssl/ca-bundle.crt || die + + 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 + + if use aqua; then + einfo "fixing ${PN} plugins" + + local _PV=${PV:0:3}.0 + local _dir=${EKDEDIR}/$(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}"/${KDEDIR}/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 "QT_PLUGIN_PATH=${EROOT}/${KDEDIR}/$(get_libdir)/kde4/plugins/:\${QT_PLUGIN_PATH}" > "${T}/77kde" + doenvd "${T}/77kde" || die +} + +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}/${HME}" + 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 +} |