Revert revision bump, requested by Matt Summers (quantumsummers) from hardened.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xF3CFD2BD

3 files changed, 19 insertions, 318 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 942e10503397..b3abc3835bed 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.986 2014/03/14 12:40:57 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.987 2014/03/17 22:14:11 johu Exp $
+
+  17 Mar 2014; Johannes Huber <johu@gentoo.org> -kdelibs-4.12.3-r1.ebuild:
+  Revert revision bump, requested by Matt Summers (quantumsummers) from
+  hardened.
 
 *kdelibs-4.12.3-r1 (14 Mar 2014)
 
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index e01c52da9e2e..52eef46e0796 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -14,25 +14,24 @@ AUX kdelibs-4.9.3-werror.patch 1521 SHA256 0dbcfe622041387fddac550c37b30bfd5cf36
 DIST kdelibs-4.11.5.tar.xz 11832556 SHA256 f07254a67cf0a6d4aff96266b3bd86b9f8655598798c7749e98ad789e38eb3bd SHA512 f43cc472c37c38fb0cd2167407f4d2d29f9bea2bc34c284a62881618b500fea6dd0e52d0e1589eb2ba65fdf583f0bd41d812aacc718e5393f1b5f1ce9b258cf0 WHIRLPOOL 0f3c1f99f4212d7a6dca1c3f9db8f189a367224710146c44b17132cb994b66415e6b89dd3eca904bb4371ca4060d10c92b87510b7e98039de0aeff5734e425f1
 DIST kdelibs-4.12.3.tar.xz 11552124 SHA256 9d64413909096dafddd0ce070b5c18622f13f997640fbd3fd451c5f8c57852fb SHA512 ecf812c1a2dbd6585746d0e9274aaeaeb79de94060b530beeeac2c4208c4b117fcac7d13edd55cecc1c9c94003f40e79b6412cc6ecf18d58474f5fb3f9c98ff6 WHIRLPOOL 50ba52bee53882ab10bfd01f7493eae6ba83550c8130ab1608bc1abcf69ed17ec62f32c21a91f466b915651cdace8a73998f18e33157d6079851d8a04bed9636
 EBUILD kdelibs-4.11.5.ebuild 8612 SHA256 b24bcf279d245608c314626206a209714b243f144e5eea153bb2111caf0b613f SHA512 ff76fe49798ae3c1cdaf3130825a245e2c849866adab0676caf1d9ce307cbaafabda6d692917f940c23aa5c14fd9dad76268a8724fd41bdeb6ed2470e35556e3 WHIRLPOOL 139d984c285230184dab3a34f29302ed2e7f71ddee7ca76a09beaad94add241f535b5baa62b179352304845419b216a8b8cf760d54d8778d482a4798a6af15c6
-EBUILD kdelibs-4.12.3-r1.ebuild 8605 SHA256 f9ff50f8c9711d8744ce2e03231ea7715a7324b7e2803b63ad1550e0a3819702 SHA512 ff6372b81f2a301092b762d2733054914d506cda8d43e1667b412dd05b7b0bce7e42bc9f04448df0124216399bb4bcfacc10290f175ae39cc986295104f71545 WHIRLPOOL 9ad4e9259e9f280fa6791fafaf29c1652d1a9662e3ef1b3615ecfd8f8fc4dcd508ecdf37e36a59b47d6acc442d0979c346bb04a8c764b783d16f49d227df088a
 EBUILD kdelibs-4.12.3.ebuild 8540 SHA256 75de8f1a948b64d7cddd04f92524f43f54a995ef0818faf31de693d5f343dfb7 SHA512 ca78cfebdd70e2424def3d325db2026b76b342e3d7fa5cf0b02960f8260dd6384aa85d5bfcc88c186d03aa044699105fb5d4c068f58731cfc68c0d2290e633be WHIRLPOOL f81535e3a07ab4b72cb200119254734beafc6650aaebac647811ca4a83203674398bda647ceaf1a3bf59996d5a7aa90975add869b834813d49cbe28d2100cefb
-MISC ChangeLog 53053 SHA256 73a6b003524729d667dbdd8e7a80d630189731d1a8eb78d452e8ebe197354aeb SHA512 b564c4b41570fdc090cc814ce3191a88fcd053fb881922a5081e72b20fb5e5217be54963bb0873a19a2788ceb1a15f3f67aad055e50026980f03a179b96b8f6a WHIRLPOOL 44d9db59cfd2391acfe24cbbb6668166e47696393f74771cc668da7ff8108a0d0177b990c29cb2a01d92fc4dd0ecc2bc26ce97628822a59c1d80f5fb32a8fc3e
+MISC ChangeLog 53213 SHA256 cade087faf8be73e84098dd92cf9efc448c0075b4d2455de84a2ce1a51d7592c SHA512 de8f9a151080da0ec5fa7bf8dc24fa848f85019bb1dc93a6dfc5701cb63e3fa64ea1a2f5a64b26eeb93376d06288c53a178296a2685a6d9349205ded16f5f104 WHIRLPOOL d6ef0997fa7b9717ba18f91c0cf5b01419b4d9e9ecbc76db795ca76dfa23812b10a47457fc7255e0b79df693d7507b1606871e4fc734fd471814d8871518cc50
 MISC ChangeLog-2009 110608 SHA256 845ba7764dc9cabd4753d146e82cc0347a0dbbe21a76a4aab453106e7d70ba1f SHA512 c643c3bd742f1c2c4322217b4d9f2992310e9bf86f585ef687cf68f54ed2a86d2950f7f3c3fc5021a2dd472b6db39e17415ca6cde478e4ef4f91317a116889b5 WHIRLPOOL 8dd58bffc294a811176bc3f9882a0fa8a12c02fcdd692bacfccfc9745646d5062d3980553388fcdc835bbbecefd0783f029d07a5999e7208ceece5a93fa36893
 MISC metadata.xml 391 SHA256 fc53374fd33574da578cb1d31e89f7cbdee57aff3cbf5d7284e778edbce2acc0 SHA512 6c6a2d72311cd226b6f8b4b971bcf3547c43b54148b7286849f37ed1d586984aa39642e83f69034d942c4e478fa41ba7d815a13a0eb01f8ed5b74b3552270c69 WHIRLPOOL 9313efac3ba14c2b1b75703071bde802b41027e46d511bc8cf3efa055cf6967758aac541d60bf10a10e24c96b6f2109e848d12950cf802398d6563290c8c2039
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTIvjbAAoJEGVpnaTzz9K9u7gQAK28Cm7+vv/BKDwm3E8VJ3oy
-uh32GiK5Sa6mvrpROCa4h0iMWhPH+rlvL0OT6FMHL4sphZA0DxdUQEtLunepzVus
-ooRbOkGhjhOldUya95d+0Lo1gqu5UpIva8USrothnOoGAk7dx+wgSFWCmxD1ydyO
-VPjMovmYqyardtLd8d5vICEbW5ktVWRjXgfyLpRE2wNybC94DarpuaI1AnU45oSi
-fI16TySlwoRgEpQJooVaHh0dh2Q1Fo+RH6UgeRFYrGaXGHYtD2snXcWdKH44UO23
-atkhTn+4yfRUScD5xU1hc/IYaJDtjffWdIOAA1mTk6fpxwJD4PbdZgYLV4FM3njf
-sfaBpkI+6/BtKwe1FDhO8Opu0tUQAkuvrpU5I7FP8echSZ9zd7rgglNoTQLu7gI0
-f/3YfDA98v0nGVsRuvJg/YbC5VNRWIAatDHd9qec7ovEiK95Urt4AxYjYUweDuRM
-WkrOG8xmw49FYB158gEANZ+zFO9WCQt4U4X2iac+cYnuoI/SBA4VXistjM55QWqn
-JxACuPSRnkcTRQex/tFyHUuKusNW+tMFtiCCH3yN3AwAsljOKoRXzdyr1FOSqluJ
-3ToJk9ejV1uDMIzrqWoTWf+/0XkqFJZaMj+hqChpl5asCUeO+SvrDFANJNwUk4gl
-NJ3SJwxBsY5lzmOU0HAG
-=069b
+iQIcBAEBCAAGBQJTJ2WdAAoJEGVpnaTzz9K9j+8QALzrS7cSDobYjHQTKcfKJ85/
+CnXzVh/COV5bhBLOLg/tV9sl4WbDXUkgs+82+GZM7Kes7b7mWRzaP7buV9N76dDL
+1ikLFX8qhcuNcm3CtCZv+kDoGmeS3I9NVJknCS1OmIlvCzjR4FF8hV/xW5s2ltI7
+hSkanQfJ+U9dtQ68+aZYEGSq87tqPtdJYxseCtz+nRBhnX622ENJD0tUEBhIw1lS
+nM1OlV87JIlEh8nYfup8hUguJprZL2NI/83XycneZrUFcht15FpYCghEr9YILPtC
+5oWUd02cNEPhG3i+aKnrfFnI96dm3Sbt1ewQj6tJNHZ+A+xY9XKOM2XpUe5bPjtR
+iJ94pyaqsLoep1UnV+1/3rI25ybu4nXPXdBhW0jp+bdCESvU28nEr1G7EfZFQeai
+MdF2IqQ69lrqeC8T4KNH6vYfThBWcsIcadMOovRKk7wAB9KYCaJAXDzZn00mc0GM
+98tlnitE6WTb0Vfh5n0Ofl0nkpWjlKcrWj0Xo41K/m/3vKg7N8Nc8anf3UrmjJOU
+uwNJ9awNvT/q+l1WMWNGXiza4GLaJCsxYP90pfp2HXjPipuug6KZfM99tEtewCz3
+xHlXTNrdDcEchD1BGXf9Flqv9wENQcXQkp+8v6asukexifeCwRfzlKiautnWuV3m
+DhIYDIjhzd/Zt0Ctino+
+=b5nP
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdelibs/kdelibs-4.12.3-r1.ebuild b/kde-base/kdelibs/kdelibs-4.12.3-r1.ebuild
deleted file mode 100644
index 3ff61e4178bf..000000000000
--- a/kde-base/kdelibs/kdelibs-4.12.3-r1.ebuild
+++ /dev/null
@@ -1,302 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.12.3-r1.ebuild,v 1.1 2014/03/14 12:40:57 johu Exp $
-
-EAPI=5
-
-CPPUNIT_REQUIRED="optional"
-DECLARATIVE_REQUIRED="always"
-OPENGL_REQUIRED="optional"
-KDE_HANDBOOK="optional"
-inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic pax-utils
-
-EGIT_BRANCH="KDE/4.12"
-
-DESCRIPTION="KDE libraries needed by all KDE programs."
-
-KEYWORDS=" ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-LICENSE="LGPL-2.1"
-IUSE="3dnow acl alsa altivec +bzip2 debug doc fam 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.7.7
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xsl-stylesheets
-	>=dev-libs/libattica-0.4.2
-	>=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:0=
-	>=media-libs/phonon-4.4.3
-	sys-libs/zlib
-	virtual/jpeg:0
-	>=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
-				>=sys-freebsd/freebsd-lib-9.0
-			)
-		)
-	)
-	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.11.0
-		>=dev-libs/soprano-2.9.0[dbus,raptor,redland]
-	)
-	spell? ( app-text/enchant )
-	ssl? ( dev-libs/openssl )
-	udev? ( virtual/udev )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-"
-DEPEND="${COMMONDEPEND}
-	doc? ( app-doc/doxygen )
-	nls? ( virtual/libintl )
-"
-RDEPEND="${COMMONDEPEND}
-	!dev-qt/qtphonon
-	!<=kde-base/plasma-workspace-4.7.1:4
-	!<=kde-base/kcontrol-4.4.50:4
-	>=app-crypt/gnupg-2.0.11
-	app-misc/ca-certificates
-	$(add_kdebase_dep kde-env)
-	sys-apps/dbus[X]
-	!aqua? (
-		udisks? ( sys-fs/udisks:2 )
-		x11-apps/iceauth
-		x11-apps/rgb
-		>=x11-misc/xdg-utils-1.0.2-r3
-		upower? ( sys-power/upower )
-	)
-	udev? ( app-misc/media-player-info )
-"
-PDEPEND="
-	$(add_kdebase_dep katepart)
-	|| (
-		$(add_kdebase_dep kfmclient)
-		x11-misc/xdg-utils
-	)
-	handbook? ( $(add_kdebase_dep khelpcenter) )
-	policykit? (
-		>=sys-auth/polkit-kde-agent-0.99
-	)
-	semantic-desktop? (
-		$(add_kdebase_dep nepomuk-core)
-		$(add_kdebase_dep nepomuk-widgets)
-	)
-"
-
-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.2-armlinking.patch"
-	"${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch"
-	"${FILESDIR}/${PN}-4.8.1-norpath.patch"
-	"${FILESDIR}/${PN}-4.9.3-werror.patch"
-	"${FILESDIR}/${PN}-4.10.0-udisks.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
-
-	# 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
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DWITH_HSPELL=OFF
-		-DWITH_ASPELL=OFF
-		-DWITH_DNSSD=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 udisks SOLID_UDISKS2)
-		$(cmake-utils_use_with zeroconf Avahi)
-	)
-	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
-
-	# bug 473842
-	pax-mark m "${ED}"/usr/bin/kdeinit4
-
-	# 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 avahi 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
-
-	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
-}