Drop KDE 4.4

Package-Manager: portage-2.1.9.49/cvs/Linux x86_64
RepoMan-Options: --force

6 files changed, 7 insertions, 409 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index b74424b4f035..c9c11933f621 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.759 2011/06/01 18:10:20 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.760 2011/06/02 21:57:38 dilfridge Exp $
+
+  02 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdelibs-4.4.5-r4.ebuild, -files/kdelibs-4.4.5-cve20111168.patch,
+  -files/kdelibs-4.4.5-formpainter.patch, -files/kdelibs-4.4.5-hostname.patch,
+  -files/kdelibs-4.4.5-qt471.patch:
+  Drop KDE-4.4
 
   01 Jun 2011; Brent Baude <ranger@gentoo.org> kdelibs-4.6.2-r3.ebuild:
   Marking kdelibs-4.6.2-r3 ppc stable for bug 354033
diff --git a/kde-base/kdelibs/files/kdelibs-4.4.5-cve20111168.patch b/kde-base/kdelibs/files/kdelibs-4.4.5-cve20111168.patch
deleted file mode 100644
index 9a81db700566..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.4.5-cve20111168.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/khtml/khtml_part.cpp
-+++ b/khtml/khtml_part.cpp
-@@ -1848,7 +1848,10 @@ void KHTMLPart::htmlError( int errorCode
-   stream >> errorName >> techName >> description >> causes >> solutions;
- 
-   QString url, protocol, datetime;
--  url = Qt::escape( reqUrl.prettyUrl() );
-+
-+  // This is somewhat confusing, but we have to escape the externally-
-+  // controlled URL twice: once for i18n, and once for HTML.
-+  url = Qt::escape( Qt::escape( reqUrl.prettyUrl() ) );
-   protocol = reqUrl.protocol();
-   datetime = KGlobal::locale()->formatDateTime( QDateTime::currentDateTime(),
-                                                 KLocale::LongDate );
diff --git a/kde-base/kdelibs/files/kdelibs-4.4.5-formpainter.patch b/kde-base/kdelibs/files/kdelibs-4.4.5-formpainter.patch
deleted file mode 100644
index 8fd94b269913..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.4.5-formpainter.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: kdelibs/khtml/khtmlview.cpp
-===================================================================
---- kdelibs/khtml/khtmlview.cpp	(Revision 1185321)
-+++ kdelibs/khtml/khtmlview.cpp	(Revision 1185322)
-@@ -2135,17 +2135,6 @@
-       case QEvent::DragLeave:
-       case QEvent::Drop:
-         return false;
--      case QEvent::Paint: {
--          QRect r = static_cast<QPaintEvent*>(e)->rect();
--          r = r.intersect( widget()->rect() );
--          if (r.isValid() && !r.isEmpty()) {
--              r.setX(r.x() +contentsX());
--              r.setY(r.y() +contentsY());
--              QPaintEvent pe(r);
--              paintEvent(&pe);
--          }
--          return true;
--      }
-       default:
-         break;
-     }
diff --git a/kde-base/kdelibs/files/kdelibs-4.4.5-hostname.patch b/kde-base/kdelibs/files/kdelibs-4.4.5-hostname.patch
deleted file mode 100644
index d4f7db5c1c40..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.4.5-hostname.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -ruN kdelibs-4.4.5.orig/kio/kio/tcpslavebase.cpp kdelibs-4.4.5/kio/kio/tcpslavebase.cpp
---- kdelibs-4.4.5.orig/kio/kio/tcpslavebase.cpp	2010-04-29 21:52:23.000000000 +0200
-+++ kdelibs-4.4.5/kio/kio/tcpslavebase.cpp	2011-03-09 10:31:37.000000000 +0100
-@@ -490,8 +490,6 @@
-     // domain<->certificate matching here.
-     d->sslErrors = d->socket.sslErrors();
-     QSslCertificate peerCert = d->socket.peerCertificateChain().first();
--    QStringList domainPatterns(peerCert.subjectInfo(QSslCertificate::CommonName));
--    domainPatterns += peerCert.alternateSubjectNames().values(QSsl::DnsEntry);
-     QRegExp domainMatcher(QString(), Qt::CaseInsensitive, QRegExp::Wildcard);
-     QMutableListIterator<KSslError> it(d->sslErrors);
-     while (it.hasNext()) {
-@@ -499,16 +498,29 @@
-         // *in the case of HostNameMismatch*. A HostNameMismatch, however, will always
-         // be an error of the peer certificate so we just don't check the error's
-         // certificate().
--        if (it.next().error() != KSslError::HostNameMismatch) {
--            continue;
--        }
--        foreach (const QString &dp, domainPatterns) {
--            domainMatcher.setPattern(dp);
--            if (domainMatcher.exactMatch(d->host)) {
--                it.remove();
--            }
-+
-+        // Remove all HostNameMismatch, we have to redo name checking later.
-+        if (it.next().error() == KSslError::HostNameMismatch) {
-+            it.remove();
-         }
-     }
-+    // Redo name checking here and (re-)insert HostNameMismatch to sslErrors if
-+    // host name does not match any of the names in server certificate.
-+    // QSslSocket may not report HostNameMismatch error, when server
-+    // certificate was issued for the IP we are connecting to.
-+    QStringList domainPatterns(peerCert.subjectInfo(QSslCertificate::CommonName));
-+    domainPatterns += peerCert.alternateSubjectNames().values(QSsl::DnsEntry);
-+    bool names_match = false;
-+    foreach (const QString &dp, domainPatterns) {
-+        domainMatcher.setPattern(dp);
-+        if (domainMatcher.exactMatch(d->host)) {
-+            names_match = true;
-+            break;
-+       }
-+    }
-+    if (!names_match) {
-+        d->sslErrors.insert(0, KSslError(KSslError::HostNameMismatch, peerCert));
-+    }
- 
-     // The app side needs the metadata now for the SSL error dialog (if any) but
-     // the same metadata will be needed later, too. When "later" arrives the slave
diff --git a/kde-base/kdelibs/files/kdelibs-4.4.5-qt471.patch b/kde-base/kdelibs/files/kdelibs-4.4.5-qt471.patch
deleted file mode 100644
index fc17b20aaaa4..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.4.5-qt471.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdelibs-4.4.5/kded/kded.cpp
-+++ kdelibs-4.4.5/kded/kded.cpp
-@@ -72,7 +72,7 @@
- static bool bCheckUpdates;
- static bool bCheckHostname;
- 
--extern QDBUS_EXPORT void qDBusAddSpyHook(void (*)(const QDBusMessage&));
-+extern  void qDBusAddSpyHook(void (*)(const QDBusMessage&));
- 
- static void runBuildSycoca(QObject *callBackObj=0, const char *callBackSlot=0)
- {
diff --git a/kde-base/kdelibs/kdelibs-4.4.5-r4.ebuild b/kde-base/kdelibs/kdelibs-4.4.5-r4.ebuild
deleted file mode 100644
index 1f654785533e..000000000000
--- a/kde-base/kdelibs/kdelibs-4.4.5-r4.ebuild
+++ /dev/null
@@ -1,311 +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.4.5-r4.ebuild,v 1.5 2011/04/11 04:05:32 josejx Exp $
-
-EAPI="3"
-
-CPPUNIT_REQUIRED="optional"
-OPENGL_REQUIRED="optional"
-WEBKIT_REQUIRED="always"
-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 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.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.3.80
-	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/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 )
-	semantic-desktop? (
-		>=dev-libs/shared-desktop-ontologies-0.2
-		>=dev-libs/soprano-2.3.73[dbus,raptor,redland]
-	)
-	spell? ( app-text/enchant )
-	ssl? ( dev-libs/openssl )
-	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
-	>=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
-	)
-"
-PDEPEND="
-	handbook? ( $(add_kdebase_dep khelpcenter) )
-	policykit? ( >=sys-auth/polkit-kde-0.95.1 )
-	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'
-# @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.patch"
-	"${FILESDIR}/dist/23_solid_no_double_build.patch"
-	"${FILESDIR}/${PN}-4.3.80-module-suffix.patch"
-	"${FILESDIR}/${PN}-4.4.66-macos-unbundle.patch"
-	"${FILESDIR}/${PN}-4.3.3-klauncher_kdeinit.patch"
-	"${FILESDIR}/${PN}-4.3.3-klauncher_kioslave.patch"
-	"${FILESDIR}/${PN}-4.3.3-klauncher_mac.patch"
-	"${FILESDIR}/${PN}-4.4.3-mimetypes.patch"
-	"${FILESDIR}/${PN}-4.4.90-xslt.patch"
-	"${FILESDIR}/${PN}-4.4.5-qt471.patch"
-	"${FILESDIR}/${PN}-4.4.5-formpainter.patch"
-	"${FILESDIR}/${PN}-4.4.5-hostname.patch"
-	"${FILESDIR}/${PN}-4.4.5-cve20111168.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)
-	)
-	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
-}
-
-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
-
-	if ! has_version sys-apps/hal; then
-		echo
-		ewarn "You need sys-apps/hal for new device notifications, power management and any"
-		ewarn "other hardware related functionalities to work."
-		echo
-	fi
-
-	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
-}