commit stuff that was forgotten

2 files changed, 12 insertions, 239 deletions

diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 1a06bad166c..0f9e7923534 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -1,12 +1,13 @@
-AUX dist/01_gentoo_set_xdg_menu_prefix.patch 606 RMD160 37290ce06adf1cf43b0006c02804d7fe762ed609 SHA1 8e86e06a70438c12085a595fd66e2354141fb056 SHA256 9c64b093340d7d25ce6c28d298cd62f3f4da141b762c663df9cd9b5b7722f7d3
-AUX dist/02_gentoo_append_xdg_config_dirs.patch 919 RMD160 1406b23f317710bf039aa6020f55781b6f2c2f6a SHA1 cc589b31277e5bb6322df0240389fa8423d8d942 SHA256 e0be8da02ea48eb6ad4dcb0d723bf2a619cc7ed57dd41f456018116fb05162f6
-AUX dist/23_solid_no_double_build.patch 838 RMD160 24bea0cd76edd2709edcdc654b74ebf1566e7ef7 SHA1 534aef07069b9b89ff3ff80619eb35f0fd588b61 SHA256 1ef6f6e7fe4b31b79126fd0cefaadab03f0e6a4bd9194fc8f4bee4750620c4ad
-AUX kdelibs-4.3.0-webkit-kpart-build-fix.patch 3134 RMD160 344f31aceb3feee0fe7bf2aaacfaae7d418fdb51 SHA1 76d08f7050c35d5246c72f414c6b1caed4fe8829 SHA256 4ea5f5980db5658a16bc2eb98fe0a99f360fbe956ed4d89c7393122a8a64ce57
-AUX kdelibs-4.3.68-compilefix.patch 297 RMD160 8b77489868f6bb75bb43f8d0a993becbd7125d3f SHA1 bd8ca6647000570baa00b90f8dbdaa540ec9556b SHA256 69892c7984f29f36a4a50e6b4b958ae5c355d6deeab89f85a272b68316c83f8c
-DIST kdelibs-4.3.1.tar.bz2 10510833 RMD160 25c8d6225813a677d4f1e1006f18b0d5c14f9003 SHA1 511532852caca9302c643fded4013ef1f57d5433 SHA256 a06ff50031cf14ba929ad2868b3f19434b7acfdcfbce75d87db625786fab615d
+AUX dist/01_gentoo_set_xdg_menu_prefix.patch 606 SHA1 8e86e06a70438c12085a595fd66e2354141fb056 SHA256 9c64b093340d7d25ce6c28d298cd62f3f4da141b762c663df9cd9b5b7722f7d3
+AUX dist/02_gentoo_append_xdg_config_dirs.patch 919 SHA1 cc589b31277e5bb6322df0240389fa8423d8d942 SHA256 e0be8da02ea48eb6ad4dcb0d723bf2a619cc7ed57dd41f456018116fb05162f6
+AUX dist/23_solid_no_double_build.patch 838 SHA1 534aef07069b9b89ff3ff80619eb35f0fd588b61 SHA256 1ef6f6e7fe4b31b79126fd0cefaadab03f0e6a4bd9194fc8f4bee4750620c4ad
+AUX kdelibs-4.3.0-webkit-kpart-build-fix.patch 3134 SHA1 76d08f7050c35d5246c72f414c6b1caed4fe8829 SHA256 4ea5f5980db5658a16bc2eb98fe0a99f360fbe956ed4d89c7393122a8a64ce57
+AUX kdelibs-4.3.1-dom-docimpl-crash.patch 1547 SHA1 07eb02f50ca172eb9c9f10d675a98bb9647532a0 SHA256 fd3153f39f8fce96be1bb04b7a21308415d8b693b0adf7546ea1a8eec988f169
+AUX kdelibs-4.3.68-compilefix.patch 297 SHA1 bd8ca6647000570baa00b90f8dbdaa540ec9556b SHA256 69892c7984f29f36a4a50e6b4b958ae5c355d6deeab89f85a272b68316c83f8c
+DIST kdelibs-4.3.1.tar.bz2 10510833 SHA1 511532852caca9302c643fded4013ef1f57d5433 SHA256 a06ff50031cf14ba929ad2868b3f19434b7acfdcfbce75d87db625786fab615d
 DIST kdelibs-4.3.68.tar.lzma 10716877 RMD160 7da38bace696425fff05ad3aa0f8eb0764e5dd0d SHA1 2602032609cfc68de5980ca16e9acce1a20024ee SHA256 d8a7af3f318d142a97a4b6f9f7ab981a1f9bcda7986c27134827320abcf801a1
-EBUILD kdelibs-4.3.1-r1.ebuild 6405 RMD160 c1829c8df30e6cd3e0e76b53ddaed1bd6389e57d SHA1 0e71df96349d005a9458d2adac8667187e146b37 SHA256 9308c3b140f4dc29f9becf6bfdcf60d8a14bb181d96a6187e684775123829d0d
-EBUILD kdelibs-4.3.68.ebuild 6600 RMD160 70022416242f475a714cf153bbe64e014991c06c SHA1 8d724e02147eee165381d2b406fb3a2a53b3255c SHA256 5dcdcbca6a1efbe8b375b2e065e8e87523859c980545596a52ce479ce657878e
-EBUILD kdelibs-4.3.9999.ebuild 6259 RMD160 d33e62653936fc55ea5bf9f99bb9ccf89f1d3b4f SHA1 24401e82bf378ab9672f70eca63e000a7e810f56 SHA256 be67b89dd69082ef9de034c1ad1ea67917f278c2975fd2267d58ef4f69503773
-EBUILD kdelibs-9999.ebuild 6521 RMD160 6db92d53c961dad9f0fa08ab012c3ddfd72fa6cd SHA1 8c296ab8ae6b00dc600c9fbac0400679e80d6f09 SHA256 847bd23b7409a5deaf9563b7e65cc8710f3662f906895766cfd51df1548fba33
-MISC metadata.xml 310 RMD160 29952f07b1829170319534936d11d39f1f7896bb SHA1 90ad5d77993322d4c25338f4005aaa4b642961c3 SHA256 1ce0cd7403862637e6e913bee33bf9f54a176bd1466d168be748e997a663095a
+EBUILD kdelibs-4.3.1-r2.ebuild 6450 SHA1 db79aab8b641d19c409b7df7e84baf8d9fea3938 SHA256 b45c54f8319a28d6b6a6d5a5aa488d3ec4e5b0bd05ec298931729dfcd7c6cf4d
+EBUILD kdelibs-4.3.68.ebuild 6600 SHA1 8d724e02147eee165381d2b406fb3a2a53b3255c SHA256 5dcdcbca6a1efbe8b375b2e065e8e87523859c980545596a52ce479ce657878e
+EBUILD kdelibs-4.3.9999.ebuild 6259 SHA1 24401e82bf378ab9672f70eca63e000a7e810f56 SHA256 be67b89dd69082ef9de034c1ad1ea67917f278c2975fd2267d58ef4f69503773
+EBUILD kdelibs-9999.ebuild 6521 SHA1 8c296ab8ae6b00dc600c9fbac0400679e80d6f09 SHA256 847bd23b7409a5deaf9563b7e65cc8710f3662f906895766cfd51df1548fba33
+MISC metadata.xml 310 SHA1 90ad5d77993322d4c25338f4005aaa4b642961c3 SHA256 1ce0cd7403862637e6e913bee33bf9f54a176bd1466d168be748e997a663095a
diff --git a/kde-base/kdelibs/kdelibs-4.3.1-r1.ebuild b/kde-base/kdelibs/kdelibs-4.3.1-r1.ebuild
deleted file mode 100644
index 78f3083a45c..00000000000
--- a/kde-base/kdelibs/kdelibs-4.3.1-r1.ebuild
+++ /dev/null
@@ -1,228 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.3.1.ebuild,v 1.2 2009/09/07 02:34:08 jmbsvicetto Exp $
-
-EAPI="2"
-
-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="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
-LICENSE="LGPL-2.1"
-IUSE="3dnow acl alsa altivec bindist +bzip2 debug doc fam +handbook jpeg2k kerberos
-lzma mmx nls openexr +semantic-desktop spell sse sse2 ssl zeroconf"
-
-# needs the kate regression testsuite from svn
-RESTRICT="test"
-
-COMMONDEPEND="
-	>=app-misc/strigi-0.6.3[dbus,qt4]
-	dev-libs/libpcre
-	dev-libs/libxml2
-	dev-libs/libxslt
-	>=kde-base/automoc-0.9.87
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/giflib
-	media-libs/jpeg
-	media-libs/libpng
-	>=media-sound/phonon-4.4_pre[xcb]
-	sys-apps/dbus[X]
-	sys-libs/libutempter
-	sys-libs/zlib
-	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
-	>=x11-misc/shared-mime-info-0.60
-	acl? ( virtual/acl )
-	alsa? ( media-libs/alsa-lib )
-	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
-	)
-	semantic-desktop? ( >=dev-libs/soprano-2.3.0[dbus] )
-	spell? (
-		app-dicts/aspell-en
-		app-text/aspell
-		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 )
-"
-# Blockers added for !kdeprefix? due to packages from old versions,
-# removed in the meanwhile
-# kde-base/libplasma
-# kde-base/knewsticker
-# kde-base/kpercentage
-# kde-base/ktnef
-RDEPEND="${COMMONDEPEND}
-	!<=kde-base/kdebase-3.5.9-r4
-	!<=kde-base/kdebase-startkde-3.5.10
-	!<kde-base/kdelibs-3.5.10
-	!<=kde-misc/kdnssd-avahi-0.1.2:0
-	!x11-libs/qt-phonon
-	!kdeprefix? (
-		!kde-base/kitchensync:4.1[-kdeprefix]
-		!kde-base/knewsticker:4.1[-kdeprefix]
-		!kde-base/kpercentage:4.1[-kdeprefix]
-		!kde-base/ktnef:4.1[-kdeprefix]
-		!kde-base/libplasma[-kdeprefix]
-		!kde-base/libkworkspace:4.2[-kdeprefix]
-	)
-	>=app-crypt/gnupg-2.0.11
-	x11-apps/iceauth
-	x11-apps/rgb
-	>=x11-misc/xdg-utils-1.0.2-r3
-"
-PDEPEND="
-	>=kde-base/kde-env-${PV}:${SLOT}[kdeprefix=]
-	>=kde-base/kdebase-data-${PV}:${SLOT}[kdeprefix=]
-	>=kde-base/ktimezoned-${PV}:${SLOT}[kdeprefix=]
-"
-
-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"
-)
-
-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}|" \
-		-i kded/vfolder_menu.cpp || die "Sed on vfolder_menu.cpp failed."
-
-	# FIXME Remove experimental folder from CMakeLists - we have
-	# kde-base/libknotificationitem for now
-	sed -e "/macro_optional_add_subdirectory( experimental )/ s:^:#:" \
-		-i CMakeLists.txt || die "Failed to sed-out experimental."
-}
-
-src_configure() {
-	if use zeroconf; then
-		if has_version net-dns/avahi; then
-			mycmakeargs="${mycmakeargs} -DWITH_Avahi=ON -DWITH_DNSSD=OFF"
-		elif has_version net-misc/mDNSResponder; then
-			mycmakeargs="${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="${mycmakeargs} -DWITH_Avahi=OFF -DWITH_DNSSD=OFF"
-	fi
-	if use kdeprefix; then
-		HME=".kde${SLOT}"
-	else
-		HME=".kde4"
-	fi
-	mycmakeargs="${mycmakeargs}
-		-DWITH_HSPELL=OFF
-		-DKDE_DEFAULT_HOME=${HME}
-		$(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 semantic-desktop Soprano)
-		$(cmake-utils_use_with spell ASPELL)
-		$(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
-
-	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
-}
-
-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. Make sure also that multicast dns lookups are enabled by editing"
-		elog "the 'hosts:' line in /etc/nsswitch.conf to include 'mdns', e.g.:"
-		elog "	hosts: files mdns dns"
-		echo
-	fi
-	elog "Your homedir is set to "'${HOME}'"/${HME}"
-	elog
-	local config_path="${ROOT}usr/share/config"
-	[[ ${PREFIX} != "${ROOT}usr" ]] && config_path+=" ${PREFIX}/share/config"
-	elog "If you experience weird application behavior (missing texts, etc.) run as root:"
-	elog "# chmod 755 -R ${config_path}"
-
-	kde4-base_pkg_postinst
-}
-
-pkg_prerm() {
-	# Remove ksycoca4 global database
-	rm -f "${PREFIX}"/share/kde4/services/ksycoca4
-}
-
-pkg_postrm() {
-	fdo-mime_mime_database_update
-
-	kde4-base_pkg_postrm
-}