Cleanup
authorAndreas Hüttel <dilfridge@gentoo.org>
Sat, 15 Oct 2011 17:30:35 +0000 (17:30 +0000)
committerAndreas Hüttel <dilfridge@gentoo.org>
Sat, 15 Oct 2011 17:30:35 +0000 (17:30 +0000)
Package-Manager: portage-2.1.10.27/cvs/Linux x86_64

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

index 5cd124a1334a4271e92d26c367374283986ee207..6be7bcdaf8e82998fed84e45c10ca781f8b2aeb7 100644 (file)
@@ -1,6 +1,11 @@
 # 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.797 2011/10/15 17:25:55 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.798 2011/10/15 17:30:35 dilfridge Exp $
+
+  15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdelibs-4.6.3-r2.ebuild, -kdelibs-4.6.5-r1.ebuild, -kdelibs-4.7.1-r1.ebuild,
+  -kdelibs-4.7.1-r2.ebuild:
+  Cleanup
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kdelibs-4.7.0-r1.ebuild:
index 9cbd8c2036e0885ddfac1852278a1e7cc7b6e555..2625bea98259f64e810c3c2432d3ae0f231ed8ce 100644 (file)
@@ -30,30 +30,26 @@ DIST kdelibs-4.6.3.tar.bz2 12916816 RMD160 f7f78ef93fa75d488efcd7c66dcbce6d153f9
 DIST kdelibs-4.6.5.tar.bz2 12917554 RMD160 cd167d17c4c090b21f7271c84d52bfa6401b8f6c SHA1 9bb948769a3a5d4d5b6c65e84a8cf570bd7bc120 SHA256 d7b0de699f6db29a6309053719a523f2516a08e77b951d15610aeb11ea9d5ba0
 DIST kdelibs-4.7.1.tar.bz2 12074524 RMD160 1bbe819fb1b0c3223fb8f2cdc371f099d367cf8b SHA1 661cc56f199b7250bd825cc0e85ff442b85171e2 SHA256 3c32b3ab1e1fe6d50fceec6075b62cf83e8dc74ba795820947b5a42a328d8fbf
 DIST kdelibs-4.7.2.tar.bz2 12066803 RMD160 b887172ac490fa1d69f38eddebc99fbced1c249f SHA1 4b074633cbf69752fda96018514ee771efe8f18b SHA256 bfa70b33d2153c209a21735d73ae061772c59696c1715881191da7a3993f8b38
-EBUILD kdelibs-4.6.3-r2.ebuild 10232 RMD160 d5721a6cceb66462ec6f416e6831dd09723afe74 SHA1 48ca86ab24245a7c16bb14f93193051384eb6c90 SHA256 4f894027f0ee9ba2235bc69d1290e7ae5c73c8961c210bfab3c751cf99b1cb81
 EBUILD kdelibs-4.6.3-r3.ebuild 10260 RMD160 219ce682d98ae8fea028ba0de00f8a0bf2dea95e SHA1 4e67a81caded776e57b0c0e56981b96d6481a382 SHA256 765935ae4fd8a94b61c9683275e0b70edb263172a79c7f07db75c30197b57485
-EBUILD kdelibs-4.6.5-r1.ebuild 10183 RMD160 77a8cf3cbaf829f0979f199765778a41d54214f4 SHA1 ffd4a2e0deef8ab82d839a61381843ba9a4c0d13 SHA256 b7cbcd64349e95c95358ab1cab2fb9fceefa620b6af4b9963104d4a3711b8c4f
 EBUILD kdelibs-4.6.5-r2.ebuild 10309 RMD160 79a7b340fcb76abf74abddfbb8d076856bc71f01 SHA1 4b3728dc951e3d09ffe0c2ad35761ec8b11edbdf SHA256 f3d25c3d4cd6bee8defb2c2a7e56ccfbfb1ad1a843e9dabfe7f7c5c8e45cd2bd
-EBUILD kdelibs-4.7.1-r1.ebuild 9798 RMD160 3db62313641a622b42336a73a564e5369e6477f3 SHA1 fcfefe372b40c87457334cc8aad709c7021836db SHA256 820a18c60f363bd4fb087033772a4fde77e2e9d5edd2903fc95eb8374ade4a50
-EBUILD kdelibs-4.7.1-r2.ebuild 9833 RMD160 a8ede133c71ddb6620eddf1d2e64506b2aa72c37 SHA1 417df0a07d9525b2e7b5d7a73df7c4a31ff8c535 SHA256 a245f3a7b33a44711792d6649b3f621afc1a0998db442b5b388da1f65f65e495
 EBUILD kdelibs-4.7.1-r3.ebuild 9917 RMD160 0a406902a032714f6e0828350967831206c260cf SHA1 bd378ecb90dfe8fb29c65f83cfcb2959ad0638c2 SHA256 7559666f67ab08e264ad94844ce8d9754a1a5b2a8aa98955a29260dc03e6cdab
 EBUILD kdelibs-4.7.2.ebuild 9174 RMD160 fcdbc6668009d25e1a599b58f667403fd6d81671 SHA1 7bb546c9790caa55888eeb56da1da30e6b6c93a5 SHA256 fe0a79d966a7aed6c4488515bc764cd2b1ea041b03832589bc6d1dd394181d2f
-MISC ChangeLog 133458 RMD160 ea0f5ae9fc2ccfc3a490fc0e4c4540e84e31b679 SHA1 0b717209bf4b0a86fe64019b60d5dccaaf2fcb47 SHA256 2ed1f0fb423521b6026fd60c961db7ee9f969587fddd4ad21f70d87bd26395d3
+MISC ChangeLog 133634 RMD160 431e3ae3f2d6067aed507a67c77efb0cac2e3849 SHA1 5a63a81162bf06fc4e81742111cf61b754b135d4 SHA256 cdb4a4870d05bfe01c2b91fac233cfc251204653bf30dfaf5d456368a0ea6bc7
 MISC metadata.xml 443 RMD160 765aa5080e9ecee24e26f5b8a5168e674db2ffd2 SHA1 82f77d1dc84732dbedcdebbac460896bd6b5484b SHA256 79624eb4920e9849ea5ce593a5adc8c7e45cd9670f9f63a64cf00a637de2d701
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOmcJlAAoJENwGBM22xffe2HkP/2jMtLiictE56jViYIfTmn6H
-0eh84YaXWlOAocpw1Os0cY0iyj/ymRx9RzgwsNYH1B2/xtbHgVH9D1c/pSIcBuoS
-NlLJKiw8E89QBAeBuYrkd5k/+JpEqqVxl3EPfOPDeQuyrCHIPZMRZ6vpZjwB5Hnp
-NodzhT71pjcxUw7TQdAqcPY6THxrTVLTmxY3iL0Z2sekXGYSae5o1+RMNy0cUH67
-tN0b56YeikFTnzrLK7eqUobHnb8G8Xz1Zj6uK2zmXTkzNHfpmP781AmXgh574++e
-rRa+7p2vU5CUthGnipqM02sXrVcjVDa5oFBZo/Ug3mUK2FN8PnDQIp2mCy7joF0Y
-+tVeelQVLIoAjbrXX28sixSyLCkmYaYuQNZ5Sw8M7Qzg7KSLftbt8FnIlm0Piyaw
-Wfv0rlYjnCVPU6Jlrfbvt00dFEDqUEZLcRBOYMeBmi8adPVl2HOmbWEtgbl2b4CE
-ON2HEceRdn6NDBRRTFoxXE5DuXrzscvnY3PtlO1Zo+BvJaNoj+4t6duzFML408nG
-YpuVlb51qJrJKUhQWJlJnIQGjYAuufl6dJ9zLumXRech+lEWv/RRJ9jiPt6Oq9Fi
-ONWdNlBr4M31cN3LiO/wGUn+zoB6G+YZNF7F2lwa/qKdZ54eD8EXSnh47liySGWL
-TrcGce1WUmV7wvOD5Ujt
-=k5WU
+iQIcBAEBCgAGBQJOmcNEAAoJENwGBM22xffehg8P/2i8i0nIzW/l/F/23cnRAZra
+oZBgbvGcmRpqoLtpB3+QmGExfscDaXrMxtlYgsR/Ai8OTXTaVjn5EYjsuKviOvKd
+tZhScE7z6C5lXKgcDnx9xyFD1eJAwM96KMwffYs7vbD3KtAst6jIJPBuP16YjVIg
+tTpBPfABbxlvKtjlJ7VeC7nkjPLGdh4g9rPFOvAXn3icYD7S7FKq9KFvyanvcOSZ
+NnfdAshJEwq2pR7bgVaQuCBqAHHAxGko14gj9FK+ccB2YTCZYWjWFozCxne2cMiF
+m5LQkj2P92JKzxb/pHhLnnIwLKc5Yh5QIfomM2cgUAZeZ26b7D1Qq5BfozcizIyf
+G3qBILWcLGD8BWh3smGTm8mNkE0vrOJVl1pTagCGw5+p8v4b+DFwKjEeu+CvaF77
+c3bpX1JG3WnWvJJIqL07Yhd0f45Zqg+aIuPlQOq2VSO1JzFkz4AjPjoAQdLn38yh
+0GXJx0h1Q8wS8R5qz3Xkc71fxacauS+UVyvcQY11YLloaxSoEQAZthtPWU51SvI/
+/lJNr0dDnLGWOB2x3J7fYQ+8zzQ+xbLG2eK3MXr7OF3KiO5Qdk/glfI5NbClbDPj
+Jl4XN6mRCT19NFCe2eJzd8ufHVc2HlKdpIl/zBZHKMThdC1DdmLoqSbgX5yRUlkC
+xiscrq8XDCbNDtb0tymw
+=AgtG
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdelibs/kdelibs-4.6.3-r2.ebuild b/kde-base/kdelibs/kdelibs-4.6.3-r2.ebuild
deleted file mode 100644 (file)
index 4934fe5..0000000
+++ /dev/null
@@ -1,329 +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-r2.ebuild,v 1.8 2011/10/14 21:53:37 dilfridge 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
-       >=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"
-)
-
-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
-}
diff --git a/kde-base/kdelibs/kdelibs-4.6.5-r1.ebuild b/kde-base/kdelibs/kdelibs-4.6.5-r1.ebuild
deleted file mode 100644 (file)
index 97b77b0..0000000
+++ /dev/null
@@ -1,332 +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.5-r1.ebuild,v 1.4 2011/10/14 21:53:37 dilfridge 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 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
-       >=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
-       >=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.2-nonepomuk.patch"
-       "${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch"
-       "${FILESDIR}/${PN}-4.6.3-bytecode.patch"
-       "${FILESDIR}/${PN}-4.6.5-cardinality.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)
-       )
-       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.
-       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
-
-       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
-}
diff --git a/kde-base/kdelibs/kdelibs-4.7.1-r1.ebuild b/kde-base/kdelibs/kdelibs-4.7.1-r1.ebuild
deleted file mode 100644 (file)
index 7ef65f9..0000000
+++ /dev/null
@@ -1,326 +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-r1.ebuild,v 1.5 2011/10/14 21:53:37 dilfridge 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
-       >=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}
-       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
-       >=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"
-       "${FILESDIR}/${PN}-4.7.1-clearbutton.patch"
-       "${FILESDIR}/${PN}-4.7.1-libpng15.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
-}
diff --git a/kde-base/kdelibs/kdelibs-4.7.1-r2.ebuild b/kde-base/kdelibs/kdelibs-4.7.1-r2.ebuild
deleted file mode 100644 (file)
index e0c2275..0000000
+++ /dev/null
@@ -1,327 +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-r2.ebuild,v 1.3 2011/10/14 21:53:37 dilfridge 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
-       >=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}
-       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
-       >=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'
-# Force the upgrade of plasma-workspace to a version that explicitly depends on kactivities
-add_blocker plasma-workspace 4.7.1
-
-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.1-clearbutton.patch"
-       "${FILESDIR}/${PN}-4.7.1-libpng15.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
-}