Remove old.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

3 files changed, 12 insertions, 328 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 2524de44e886..5ed8cd8d7a66 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.822 2012/01/29 01:25:58 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.823 2012/01/29 01:27:40 johu Exp $
+
+  29 Jan 2012; Johannes Huber <johu@gentoo.org> -kdelibs-4.8.0.ebuild:
+  Remove old.
 
 *kdelibs-4.8.0-r1 (29 Jan 2012)
 
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index aad33429ef2b..265b75ef7e61 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -32,18 +32,17 @@ EBUILD kdelibs-4.7.4-r10.ebuild 9268 RMD160 d73da9f0a53f78bdb6582774eaf3658c8910
 EBUILD kdelibs-4.7.4-r11.ebuild 9312 RMD160 4d0c447a6fb90ae44fbce3441e5898175eccccb2 SHA1 7cd21e8a95918d424c1e91406ccadf374a61ba37 SHA256 9863b08377b8020200e02e9c2fc86b5d06641897457174fe3f1d3043e8583bc7
 EBUILD kdelibs-4.7.4.ebuild 9249 RMD160 9a8921925b3ee30f0d5d7979e4886d4cda78468a SHA1 f477bc2bfba4b3d72fa558960a7b6f3e862d6fe0 SHA256 4549b9b9966c78b10ea2a92488605081b244275dd917ce627ee6dbdae16ea755
 EBUILD kdelibs-4.8.0-r1.ebuild 9360 RMD160 ab8b82117a64f33640d2f0beff3cac4f32110452 SHA1 6a41b7e6ad4513e0d205bdec2e09ddde54245a11 SHA256 1b53ff7b3e5e871da02c6626b991e1f9ffc2d742f4f790ee4738aff5685fcaf3
-EBUILD kdelibs-4.8.0.ebuild 9313 RMD160 3cc4707b21e89a98717ffcc466e566889eec8804 SHA1 1db9ef79e00b189fc0a8b5fd379942c9ac16903e SHA256 04ad04ac4a25650e57e2285e0cb21f49e8beec51bd94d0f7b1350036ef40b788
-MISC ChangeLog 27560 RMD160 4011daf60d6671edec97cb40bc2bc26217f3b8f7 SHA1 322dd31d57783d48532be7bc03632524376540ee SHA256 a2f5f4c65d332ff09384571e496dd67c739a347d1f97f742053321277352bac4
+MISC ChangeLog 27646 RMD160 afb00624ef7bc4574e7bbce519e0908b5e764ce6 SHA1 54339a6d948ebe68f9cd2508d8c89772bddb1426 SHA256 b5d70764189d8b985fd5104bededff1224af021c46835b28f9a304b62b6f2e04
 MISC ChangeLog-2009 110608 RMD160 9dfb93acebe4df4b7bbbca589c1bacd7033ec36c SHA1 c5fbfedfb78a157dd182606b0056b376bd3353d6 SHA256 845ba7764dc9cabd4753d146e82cc0347a0dbbe21a76a4aab453106e7d70ba1f
 MISC metadata.xml 443 RMD160 765aa5080e9ecee24e26f5b8a5168e674db2ffd2 SHA1 82f77d1dc84732dbedcdebbac460896bd6b5484b SHA256 79624eb4920e9849ea5ce593a5adc8c7e45cd9670f9f63a64cf00a637de2d701
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPJJ/wAAoJEO+t9ga+3I3atx4IAK/XZ26pslSq7DwNdxPQtZR4
-TGScVmLSkMpsoWGNx/kewTgk2QUuiLNjkH0sJIawcgtdbmN2O9FtlgrHXwVTTXXS
-UeHAvAXGggi5LO4PSNjM9qE3p7kAzKI0l+3EJSma9Yy7NH2f3fA/MfdiJZKywnGN
-BeRHR6xyJHB04cIUvrLjSHF6zXWVJ08fndkfMKW2+DwxzHvbrMpUmaSW85YJ7ew1
-sN26ShjLRtTMWK4Ai7X1qIPPg0GLHUFzb4Y/PtbIVUXx4lO5YD6xiJka1eRjPkhf
-hHNaBsGeJ0hdhpH8nM2nR+vO2nR8C6ujD7CI4dIfbZ3N9Guh37OcIr6Tr77//18=
-=fHiX
+iQEcBAEBCgAGBQJPJKBPAAoJEO+t9ga+3I3ayb8H/izfIMXzsfzPRWYLS/qwptUd
+Ep2aqlyomL5zmwn9INnpxMUM2eNwQUCG7v9WnQtSrSQ1Ke+JQ/+YNlXaC76Rr4wz
+I+4B4jciTpJ6V/BZujfo97LcOU97HEBijMfKAIFwntB4K6hySMmFJ1XuwvaaFqw7
+Lla5AX98GV21FyvTDvv2ual13zYTTf8aFr+NCXTrZQxto8ThfmAbdbzQZUUiQFZD
+sykVOiT7RNd/7eXggGTIw9tgqzcd8LIhfkquFD++3InUnSNxBRb/JLHFjb7If2U2
+pbkhvsephJ0pqjE9uc+rwqNONXKpqiXCqhwaj+ZDUwc9uIhPnu9lQiVf5fF4ytM=
+=Cgol
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdelibs/kdelibs-4.8.0.ebuild b/kde-base/kdelibs/kdelibs-4.8.0.ebuild
deleted file mode 100644
index e20417439aa1..000000000000
--- a/kde-base/kdelibs/kdelibs-4.8.0.ebuild
+++ /dev/null
@@ -1,318 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.8.0.ebuild,v 1.2 2012/01/25 23:01:47 johu Exp $
-
-EAPI=4
-
-CPPUNIT_REQUIRED="optional"
-DECLARATIVE_REQUIRED="always"
-OPENGL_REQUIRED="optional"
-KDE_SCM="git"
-inherit kde4-base fdo-mime toolchain-funcs
-
-# The "master" branch is out of date, so use KDE/4.8 per upstream's
-# recommendation.
-EGIT_BRANCH="KDE/4.8"
-
-DESCRIPTION="KDE libraries needed by all KDE programs."
-HOMEPAGE="http://www.kde.org/"
-
-KEYWORDS="~amd64 ~x86 ~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.7
-	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 )
-	openexr? (
-		media-libs/openexr
-		media-libs/ilmbase
-	)
-	policykit? ( >=sys-auth/polkit-qt-0.103.0 )
-	semantic-desktop? (
-		>=dev-libs/shared-desktop-ontologies-0.8.1
-		>=dev-libs/soprano-2.7.3[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}
-	!x11-libs/qt-phonon
-	>=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 katepart)
-	|| ( ( $(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) )
-"
-
-# Force the upgrade of plasma-workspace to a version that explicitly depends on kactivities
-add_blocker plasma-workspace 4.7.1
-
-# file collision, bug 394991
-add_blocker kcontrol 4.4.50
-
-PATCHES=(
-	"${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch"
-	"${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch"
-	"${FILESDIR}/${PN}-4.7.96-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
-		-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
-}