Bump strigi version dependency because of bug 377225; remove old
authorAndreas Hüttel <dilfridge@gentoo.org>
Mon, 26 Sep 2011 21:15:36 +0000 (21:15 +0000)
committerAndreas Hüttel <dilfridge@gentoo.org>
Mon, 26 Sep 2011 21:15:36 +0000 (21:15 +0000)
Package-Manager: portage-2.1.10.19/cvs/Linux x86_64

kde-base/kdelibs/ChangeLog
kde-base/kdelibs/Manifest
kde-base/kdelibs/kdelibs-4.6.3-r3.ebuild [deleted file]
kde-base/kdelibs/kdelibs-4.7.1-r1.ebuild
kde-base/kdelibs/kdelibs-4.7.1.ebuild [deleted file]

index 4beb182fdb164b10976f77ecc7b39e036773e3f8..c4e661e39d172f177c5daae2b89e485438bef103 100644 (file)
@@ -1,6 +1,10 @@
 # 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.786 2011/09/24 15:35:16 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.787 2011/09/26 21:15:36 dilfridge Exp $
+
+  26 Sep 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdelibs-4.6.3-r3.ebuild, -kdelibs-4.7.1.ebuild, kdelibs-4.7.1-r1.ebuild:
+  Bump strigi version dependency because of bug 377225; remove old
 
   24 Sep 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   kdelibs-4.7.1-r1.ebuild, +files/kdelibs-4.7.1-libpng15.patch:
index 482ae6fe244739192eb360ba8deb41f7191942c6..a01ed5454b05122d43d36bced8afab1e532e01ab 100644 (file)
@@ -27,27 +27,25 @@ DIST kdelibs-4.6.5.tar.bz2 12917554 RMD160 cd167d17c4c090b21f7271c84d52bfa6401b8
 DIST kdelibs-4.7.0.tar.bz2 12032091 RMD160 8bcc65072818285031f5611f4b183a74ad0f4d1a SHA1 2a7a59ac78a161c7c2393db89179449b495dd2db SHA256 db6bed2159c192a614e793ae583c9f0ce446af93dd0b1a1b566e52c035ab1cb8
 DIST kdelibs-4.7.1.tar.bz2 12074524 RMD160 1bbe819fb1b0c3223fb8f2cdc371f099d367cf8b SHA1 661cc56f199b7250bd825cc0e85ff442b85171e2 SHA256 3c32b3ab1e1fe6d50fceec6075b62cf83e8dc74ba795820947b5a42a328d8fbf
 EBUILD kdelibs-4.6.3-r2.ebuild 10274 RMD160 c748b1ac47cd5f75ae30e59659d6f8057a95f868 SHA1 245188128967bcb12a4ebf016cd56a22b6b32360 SHA256 5e468ac3ce1a8af33dcf0faa6dfe999a86d2445b621243e2519dd57d29bd379d
-EBUILD kdelibs-4.6.3-r3.ebuild 10317 RMD160 66ab258e9c360dc84b17e4ae2932ba2b2cdac7aa SHA1 ce71cfa98a6642744cddc5a8f616b7032cef091e SHA256 cdb146d2cd4d45203d91ec3b890a407cb195a7edbaa40d33456ab4553a40a4aa
 EBUILD kdelibs-4.6.5-r1.ebuild 10225 RMD160 aef9c6922a3c5a82c1aa383335917d1245ba06e8 SHA1 1902170d6a79c851b48da35a7d2e8ef119c6228a SHA256 dd3b27125574655dbf525f0d90e8855d3fad786ea5af8bfc99ae81a04b29dd7f
 EBUILD kdelibs-4.7.0-r1.ebuild 9799 RMD160 d26d79209a7d849e40b5710e1071498901578e5c SHA1 895a9ef91374c0a44aa4ff6ac336d2aeaeb6fb5b SHA256 79ebaa6afccb6d1ca93a417f9f4136e0356512077a810f7d88881fa93dae8c4e
-EBUILD kdelibs-4.7.1-r1.ebuild 9843 RMD160 9be854200d221c032ca013a9dffaf973f659c028 SHA1 943444df7e3614c1f6a37529b6b324bcd12ec386 SHA256 2b0eb3c92125ba32dccf6d7408bd849c8bc9a4e868b6384fe5d040f6fc064f26
-EBUILD kdelibs-4.7.1.ebuild 9750 RMD160 0905fe3efba7ce5197b97366882b7cab2f5ebd14 SHA1 e75b107847f50657fd6ad87ab9843e81818a448b SHA256 6f7aa754c2e3fcd53efa5af1c629b76e4831cef8a11cf121c05a0575aa6d4b4a
-MISC ChangeLog 131383 RMD160 1d6fc3eb5474875d424df1c7a1c4da35129bb314 SHA1 dd15a40053a8361969a6840c7a906823d74abf3c SHA256 92dc0c5c720d88cc489dbe05d907b9012ff70fa519e44284f6eab676dda96147
+EBUILD kdelibs-4.7.1-r1.ebuild 9843 RMD160 e9322ba24e9b48f37dcf90ac37e30d05176bb1c0 SHA1 f6f115a49dd069839f22865086a8e15652615cfa SHA256 3d83efe02635e1a628fc9edd12084271c148e8622aeaee79fd170b3243afb5b5
+MISC ChangeLog 131584 RMD160 bd946bf5192148a2a82ab59a746366a1bbd4cbd2 SHA1 4f1cb441e27c648ce5d004f84666a2b4af1cd67d SHA256 303d35d81f888edbb39cee0813d662c67339e00367f4fb39056163cc645b5012
 MISC metadata.xml 443 RMD160 765aa5080e9ecee24e26f5b8a5168e674db2ffd2 SHA1 82f77d1dc84732dbedcdebbac460896bd6b5484b SHA256 79624eb4920e9849ea5ce593a5adc8c7e45cd9670f9f63a64cf00a637de2d701
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOffjZAAoJENwGBM22xffebt4QAIqTpoKw9PpaXuSDD/XfM2Lz
-wmOBZm7rVEK+XQpLquD43BFXRQpXJqcIqBJ0iBt0V1UeNhR6X4EZJ1XHd+1cK345
-8+bCTbKcjAAHn741IcvJu3klw4Nj3eTCynGgYkaMrbB9OZNPVSqV6Hr7oSJxJKjp
-+6bw3aWmyyp3Mmli7v4V/dS4on/gr+9Mq6XpzUHo6mpbazdgakvegfn1Is9ccz4L
-jogsmyCxrsm1e9L6DWR5QiNvPX3Dt8Jq/u2MOzgXT6Mgq2dmz4N7YEVVV7RLe2Hf
-lwPmUwzGACIB/+EpcsUcCxhQrwgG9kBiWD2YAJn/UXMUzmCOsJkhXJATnQbbSD/w
-BY+pBJQ+FB9VRHVs1KVMH0GxDeYYHXR5ClNaB3ldFyZGC5rMCNv1wGoNCo2TqfJb
-EChhUyKTTOfQd3wXq6E+XYAJQHKTDuSEeTBaf6e4NhR/tHX+NElNtwanknCcGspY
-O7XD7K/Dh8mgAApo9zP5wm+VO4PwmD4onu585SJUfb3uhfC2mJcggna5t55T6jTz
-ffUS8xlSCUIuKffYscXdTtTGN/lB4JwlwavREnyFVzZ58IlQRy9LOafgkuSDcW92
-YE6vZgyXhW9Eiu/125N/KVrGyw9T73MbMMPetJfkBXXzPlBe9d81hbsI0hyylffE
-mqigTbQQgiEZrfF9f8Mp
-=OQQj
+iQIcBAEBCgAGBQJOgOudAAoJENwGBM22xffeljUP/0yTEe41ZJESuOrwjXWOBT+0
+OgEiE4ePDWXOmTb2cvNQGl8yORnvwFIuVrxc+nLsZXM3DsphiPjVmNOH6Zo61NFp
++/dOj437V/xy4LpREzeFgw9ObTFKtpmvy7NtDh5yqaMCcW4BKhuOQiREaIsB9f8x
+WLGz63yIdVQPh+kSffBgAVdOxHc3eJXUsGgi+3YYLcJKrFFkrj0u2RrSK8Tqb1rM
+SbB6/G+bXi2wHz4NtCKxslGKjcmVKUydnFFuMhVU9L8TK1nnPyVpiE7CjcbcEwD5
+IS7KqOlftYgoeqWUAWMRTUa0SZ+EY0N5BAaaH/4Rnk7fVmtOEoQWyzrOml+cOWxc
+HobEE/eL0Kpw2Su7t1Zu2bbP7GKYX/4UEH9W85a0112GEorX9ujxa9ZIRtxPFdma
+RlMT0y1bFBf2u3LRCifgI9FZQ7uKRarYxvBfTMQnn4KOOncUvdMWRtg0prOLwfbV
+YBzPEoLr+4Xf3g1kOO2FegxmWocG5HrTXvxtugN2Fy3im1POuwe0/LbhsS/QOeH+
+kf2ARis68EghObdgr/8LYjK2ivg4i1aoMPjjrLpmZ9PyU82GfjwJZOfxWKjErCTL
+fgkwlxyFGJQwfMdHhc080adRD2prU65Kkf4OG591a3gA7mt1DmCgb7Cm3fT8Mgzw
+S942uGQBwidw34+M+AiW
+=+kun
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdelibs/kdelibs-4.6.3-r3.ebuild b/kde-base/kdelibs/kdelibs-4.6.3-r3.ebuild
deleted file mode 100644 (file)
index 1787480..0000000
+++ /dev/null
@@ -1,331 +0,0 @@
-# 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.3-r3.ebuild,v 1.3 2011/07/21 10:32:16 maekke 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 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.90-mimetypes.patch"
-       "${FILESDIR}/${PN}-4.4.90-xslt.patch"
-       "${FILESDIR}/${PN}-4.6.2-nonepomuk.patch"
-       "${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch"
-       "${FILESDIR}/${PN}-4.6.3-use_QWeakPointer.patch"
-       "${FILESDIR}/${PN}-4.6.3-doublepost.patch"
-       "${FILESDIR}/${PN}-4.6.3-bytecode.patch"
-)
-
-pkg_pretend() {
-       [[ $(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)."
-}
-
-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.patch to work)
-       local menu_prefix="kde-$(get_kde_version)-"
-       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
-       mycmakeargs+=(
-               -DWITH_HSPELL=OFF
-               -DWITH_ASPELL=OFF
-               -DKDE_DEFAULT_HOME=.kde4
-               -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
-
-       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=${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.
-       echo "COLON_SEPARATED=QT_PLUGIN_PATH" > "${T}/77kde"
-       echo "QT_PLUGIN_PATH=${EKDEDIR}/$(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
-
-       if has_version 'net-libs/libproxy'; then
-               echo
-               elog "You have net-libs/libproxy installed. This may lead to serious problems, e.g."
-               elog "not being able to log in. We used to prohibit that combination via a blocker,"
-               elog "however the blocker has been removed because of popular request. Now everyone"
-               elog "may shoot himself in the foot as much as he wants."
-               ewarn "If you encounter timeouts and/or hangs, please have a look at bug 365479,"
-               ewarn "https://bugs.gentoo.org/show_bug.cgi?id=365479"
-       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
-}
index 6292292451222fe4a84290551f43069f0fc99f90..2683b97e21c86f16115fca31e5cb67908ea41e20 100644 (file)
@@ -1,6 +1,6 @@
 # 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.7.1-r1.ebuild,v 1.2 2011/09/24 15:35:16 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.7.1-r1.ebuild,v 1.3 2011/09/26 21:15:36 dilfridge Exp $
 
 EAPI=4
 
@@ -29,7 +29,7 @@ RESTRICT="test"
 
 COMMONDEPEND="
        app-crypt/qca:2
-       >=app-misc/strigi-0.6.3
+       >=app-misc/strigi-0.7.6
        app-text/docbook-xml-dtd:4.2
        app-text/docbook-xsl-stylesheets
        >=dev-libs/libattica-0.1.90
diff --git a/kde-base/kdelibs/kdelibs-4.7.1.ebuild b/kde-base/kdelibs/kdelibs-4.7.1.ebuild
deleted file mode 100644 (file)
index 49f0f49..0000000
+++ /dev/null
@@ -1,325 +0,0 @@
-# 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.7.1.ebuild,v 1.1 2011/09/07 20:13:54 alexxy 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.6.3
-       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}
-       !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? (
-               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 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-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} != 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
-               $(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
-}