Adding 3.5.8-r4 back since kde-base/pykde-3.5.5-r2 and others still need it.

Package-Manager: portage-2.2_pre7/cvs/Linux 2.6.25-gentoo-r4 AMD Athlon(tm) 64 X2 Dual Core Processor 4200+
RepoMan-Options: --force

3 files changed, 215 insertions, 5 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 71e14ea3e32d..8076f44090e1 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.536 2008/06/07 11:30:03 keytoaster Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.537 2008/06/08 15:03:04 keytoaster Exp $
+
+  08 Jun 2008; Tobias Heinlein <keytoaster@gentoo.org>
+  +kdelibs-3.5.8-r4.ebuild:
+  Adding 3.5.8-r4 back since kde-base/pykde-3.5.5-r2 and others still need
+  it.
 
   07 Jun 2008; Tobias Heinlein <keytoaster@gentoo.org> ChangeLog:
   Removed old versions.
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 9d375578a47e..cde19c7537d1 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -13,9 +13,11 @@ AUX kdelibs-4.0.3-CVS-2008-1670.patch 739 RMD160 348782a28e75435c4b36548879d2d8d
 DIST kde-3.5.9-seli-xinerama.tar.bz2 15150 RMD160 09f9dc74e52d1507a73d1140654021d2baedde3a SHA1 cb8eaba630ee7c8f93c634512d52a9d1603d5405 SHA256 769b0135b327b3274aa45d78ae882811073041fdbfd55267106b1a3f42115966
 DIST kdelibs-3.5-patchset-14.tar.bz2 23248 RMD160 223ad8aa6d3dab3a6e23a89e00eaf2e90bab399e SHA1 5d50fff6b6a26d8abffa4dda7360b42e0fc29eac SHA256 50d1517fbb3b70890b1858533a77fb0e6e1e72612e155ebe5350e8fea7405273
 DIST kdelibs-3.5.8-seli-xinerama.patch.bz2 5230 RMD160 26efc6620d176414b3b771145a7c00db11c3df6b SHA1 4f4daaa60fbf0c3c582400f33833b9d73c26af4a SHA256 389a31d7e3f44eca5984842d66fa19a8a9f6f11fd6dac134cfd1e4d24e7fb174
+DIST kdelibs-3.5.8.tar.bz2 15557343 RMD160 e3524ca8613fca338a0530213e921fbfae56e866 SHA1 b524a5d9969e7319bb5ffb926a39fd6afb39b2ed SHA256 779f563fdf0385b973f2238f04d82b5729aefe1c949e4d29482b6bb170aa3fe6
 DIST kdelibs-3.5.9.tar.bz2 15568675 RMD160 9ac02bf2314de387b2aa9664703c72b0613fcbb3 SHA1 b8197d94075a54f90f08a9ef7bed95ccf53e12ad SHA256 4f92553f3ff50de87a83435fce3bae440c43f0d37a8e80a1736d007f80d8f755
 DIST kdelibs-4.0.4.tar.bz2 9073446 RMD160 4ec08b749c0a3e24a81d2df6f3ec83c468a97d42 SHA1 2d8e98a2ffdd1fb5b160a9facfb7f493af48b934 SHA256 215e8dc50dc6f1625fa40b029c9c6e2ba9ca775a9ac5438759a4f3b5a551d8b9
 DIST kdelibs-4.0.5.tar.bz2 9115367 RMD160 9dd1bd6908722fe2ec5ac6415beb4a4d246df343 SHA1 df7d4175c81fa1cb842f437824e42137a0f7f28c SHA256 1dce80bec72eb560f76b3f274876605b55b5197ff19f282d62d1664e51652357
+EBUILD kdelibs-3.5.8-r4.ebuild 6091 RMD160 3cf192a50a25addbd86acdc4386bdd6904c7b73d SHA1 9021fd57c849c7e048e0c20532eb5d1cc0f7879f SHA256 bdbc232bf58d799eb5f822f2aa093f47124abd6604a9e865b2340ded05b403cf
 EBUILD kdelibs-3.5.9-r1.ebuild 6129 RMD160 5c3374dc64c90656d6cf8f30c7bcf8a95f5f3eeb SHA1 1d307fac7d9a6644d275cd0ccb8be566f01ddc1b SHA256 2f2d844853ed90df74a4c90ebf5f9cdc3e7c4aaf8f906437b09bfa84cf7f6e41
 EBUILD kdelibs-3.5.9-r2.ebuild 6205 RMD160 a751f94f3026c1233e3ed10a110d950e60620f12 SHA1 886b2e2ac989d6f5934f28d7a7accb4bef5e5a35 SHA256 0fab24586d56dc98b53a4cbe934f2ac565b3a55580c206db4c28b19c3076f594
 EBUILD kdelibs-3.5.9-r3.ebuild 6285 RMD160 0946a13cebba7c34600acaee2cb1b9be6341c797 SHA1 55f98208b2c6304f7e9126bb8e695987037fe934 SHA256 654c8b45e36dde370d9c6609a36f45f5eec216a204c3b6048fcc8d44d8658652
@@ -23,12 +25,12 @@ EBUILD kdelibs-3.5.9-r4.ebuild 6370 RMD160 75c38e396b898acf3f90dc1533b500b7698c8
 EBUILD kdelibs-3.5.9.ebuild 6042 RMD160 5402e42899c0e55787f8b7f5650143dcbc4410d7 SHA1 721388ab5fa4ee455bdadb189afa021bd336fc16 SHA256 f7acb5abb483ebeeaee7a8636073b85d4ea0b7e9badcd8f8073d5ac8dcd2167b
 EBUILD kdelibs-4.0.4.ebuild 6106 RMD160 359d839f456bccae1744e69e208433c4308c6287 SHA1 827e17ac4eda6a511a3af0e2798c89f8eca35ac2 SHA256 169991e54aff16bac9ade88269da7ce20dfbb60b80b68cb19b06fdbea4536755
 EBUILD kdelibs-4.0.5.ebuild 6112 RMD160 7d16be93f8556088cfbdb71f45a8bb4253944a0f SHA1 ff8c5cc2d6146e3c8d320d17df39784e049802f6 SHA256 00339d01839c54f949d9f267a40cc8ac08566b6b5a832c213d6565054af3f248
-MISC ChangeLog 88245 RMD160 9725e47c658f2b4cb73336f1159e1f3d03ec347e SHA1 0682ffb5a426223c0de620df7d266aefea28b86e SHA256 0df44a6483def79bc0b18ca9b8d4af614e7155f2d1b523620275fcd3ea104b64
+MISC ChangeLog 88410 RMD160 5ef9838248189b1edd5150209aa0244689d71705 SHA1 d534af1a4c6d66ac11d2ef881a041fecad37daae SHA256 ccc78e7d33da232cf244f71ecbc0763333bdc15d454f6738283f24ed776b407a
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhKcd8ACgkQKfQzuokD2IrfswCgmftgCg2wYZ0MzsiEvLSNUeXO
-iVUAn2P69lh/DKDU2Vftej37L5E8aW5Z
-=FQWf
+iEYEARECAAYFAkhL9LcACgkQKfQzuokD2IrjmQCeMUTSpwBGFGPBotXR5ZdjLcpC
+d5wAoJob69DyVYdoQy6M8uA5iGVm3MJJ
+=zvyY
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdelibs/kdelibs-3.5.8-r4.ebuild b/kde-base/kdelibs/kdelibs-3.5.8-r4.ebuild
new file mode 100644
index 000000000000..257b4a2784dd
--- /dev/null
+++ b/kde-base/kdelibs/kdelibs-3.5.8-r4.ebuild
@@ -0,0 +1,203 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.8-r4.ebuild,v 1.3 2008/06/08 15:03:04 keytoaster Exp $
+
+inherit kde flag-o-matic eutils multilib
+set-kdedir 3.5
+
+DESCRIPTION="KDE libraries needed by all KDE programs."
+HOMEPAGE="http://www.kde.org/"
+SRC_URI="mirror://kde/stable/${PV}/src/${P}.tar.bz2
+	mirror://gentoo/kdelibs-3.5-patchset-14.tar.bz2
+	mirror://gentoo/${P}-seli-xinerama.patch.bz2"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="3.5"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE="acl alsa arts bindist branding cups doc jpeg2k kerberos legacyssl utempter openexr spell tiff
+	avahi kernel_linux fam lua kdehiddenvisibility"
+
+# Added aspell-en as dependency to work around bug 131512.
+# Made openssl and zeroconf mandatory dependencies, see bug #172972 and #175984
+RDEPEND="$(qt_min_version 3.3.3)
+	arts? ( >=kde-base/arts-3.5.5 )
+	app-arch/bzip2
+	>=media-libs/freetype-2
+	media-libs/fontconfig
+	>=dev-libs/libxslt-1.1.16
+	>=dev-libs/libxml2-2.6.6
+	>=dev-libs/libpcre-6.6
+	media-libs/libart_lgpl
+	net-dns/libidn
+	>=dev-libs/openssl-0.9.7d
+	acl? ( kernel_linux? ( sys-apps/acl ) )
+	alsa? ( media-libs/alsa-lib )
+	cups? ( >=net-print/cups-1.1.19 )
+	tiff? ( media-libs/tiff )
+	kerberos? ( virtual/krb5 )
+	jpeg2k? ( media-libs/jasper )
+	openexr? ( >=media-libs/openexr-1.2.2-r2 )
+	!avahi? ( !bindist? ( net-misc/mDNSResponder !kde-misc/kdnssd-avahi ) )
+	fam? ( virtual/fam )
+	virtual/ghostscript
+	utempter? ( sys-libs/libutempter )
+	!kde-base/kde-env
+	lua? ( dev-lang/lua )
+	spell? ( >=app-text/aspell-0.60.5 >=app-dicts/aspell-en-6.0.0 )
+	>=sys-apps/portage-2.1.2.11
+	!kde-base/ksync"
+
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	sys-devel/gettext"
+
+RDEPEND="${RDEPEND}
+	x11-apps/rgb
+	x11-apps/iceauth"
+
+PDEPEND="avahi? ( kde-misc/kdnssd-avahi )
+		bindist? ( kde-misc/kdnssd-avahi )"
+
+# Testing code is rather broken and merely for developer purposes, so disable it.
+RESTRICT="test"
+
+pkg_setup() {
+	if use legacyssl ; then
+		echo ""
+		elog "You have the legacyssl use flag enabled, which fixes issues with some broken"
+		elog "sites, but breaks others instead. It is strongly discouraged to use it."
+		elog "For more information, see bug #128922."
+		echo ""
+	fi
+
+	if ! use utempter ; then
+		echo ""
+		elog "On some setups, which rely on the correct update of utmp records, not using"
+		elog "utempter might not update them correctly. If you experience unexpected"
+		elog "behaviour, try to rebuild kde-base/kdelibs with utempter use-flag enabled."
+		echo ""
+	fi
+
+	if use alsa && ! built_with_use --missing true media-libs/alsa-lib midi; then
+		eerror "The alsa USE flag in this package enables ALSA support"
+		eerror "for libkmid, KDE midi library."
+		eerror "For this reason, you have to merge media-libs/alsa-lib"
+		eerror "with the midi USE flag enabled, or disable alsa USE flag"
+		eerror "for this package."
+		die "Missing midi USE flag on media-libs/alsa-lib"
+	fi
+}
+
+src_unpack() {
+	kde_src_unpack
+
+	if use legacyssl ; then
+		# This patch won't be included upstream, see bug #128922.
+		epatch "${WORKDIR}/patches/kdelibs_3.5.4-kssl-3des.patch"
+	fi
+
+	if use utempter ; then
+		# Bug #135818 is the eternal reference.
+		epatch "${WORKDIR}/patches/kdelibs-3.5_libutempter.patch"
+	fi
+
+	if use branding ; then
+		# Add "(Gentoo)" to khtml user agent.
+		epatch "${WORKDIR}/patches/kdelibs_3.5-cattlebrand.diff"
+	fi
+
+	# Xinerama patch from Lubos Lunak.
+	# http://ktown.kde.org/~seli/xinerama/
+	epatch "${WORKDIR}/${P}-seli-xinerama.patch"
+
+	# Security bug 218933
+	epatch "${FILESDIR}/${P}-kinit-CVE-2008-1671.patch"
+}
+
+src_compile() {
+	rm -f "${S}/configure"
+
+	myconf="--with-distribution=Gentoo --disable-fast-malloc
+			--with-libart --with-libidn --with-ssl
+			--without-hspell
+			$(use_enable fam libfam) $(use_enable kernel_linux dnotify)
+			$(use_with acl) $(use_with alsa)
+			$(use_with arts) $(use_enable cups)
+			$(use_with kerberos gssapi) $(use_with tiff)
+			$(use_with jpeg2k jasper) $(use_with openexr)
+			$(use_with utempter) $(use_with lua)
+			$(use_enable kernel_linux sendfile) --enable-mitshm
+			$(use_with spell aspell)"
+
+	if use avahi || use bindist ; then
+		myconf="${myconf} --disable-dnssd"
+	else
+		myconf="${myconf} --enable-dnssd"
+	fi
+
+	if has_version x11-apps/rgb; then
+		myconf="${myconf} --with-rgbfile=/usr/share/X11/rgb.txt"
+	fi
+
+	# fix bug 58179, bug 85593
+	# kdelibs-3.4.0 needed -fno-gcse; 3.4.1 needs -mminimal-toc; this needs a
+	# closer look... - corsair
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# work around bug #120858, gcc 3.4.x -Os miscompilation
+	use x86 && replace-flags "-Os" "-O2" # see bug #120858
+
+	replace-flags "-O3" "-O2" # see bug #148180
+
+	kde_src_compile
+
+	if use doc; then
+		make apidox || die
+	fi
+}
+
+src_install() {
+	kde_src_install
+
+	if use doc; then
+		make DESTDIR="${D}" install-apidox || die
+	fi
+
+	# Needed to create lib -> lib64 symlink for amd64 2005.0 profile
+	if [ "${SYMLINK_LIB}" = "yes" ]; then
+		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) ${KDEDIR}/lib
+	fi
+
+	# Get rid of the disabled version of the kdnsd libraries
+	if use avahi || use bindist ; then
+		rm -rf "${D}/${PREFIX}"/$(get_libdir)/libkdnssd.*
+	fi
+
+	dodir /etc/env.d
+
+	# List all the multilib libdirs
+	local libdirs
+	for libdir in $(get_all_libdirs); do
+		libdirs="${libdirs}:${PREFIX}/${libdir}"
+	done
+
+	# Please note that the KDE install path has to be the last value in KDEDIRS.
+	cat <<EOF > "${D}"/etc/env.d/45kdepaths-${SLOT} # number goes down with version upgrade
+PATH=${PREFIX}/bin
+ROOTPATH=${PREFIX}/sbin:${PREFIX}/bin
+LDPATH=${libdirs:1}
+MANPATH=${PREFIX}/share/man
+CONFIG_PROTECT="${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown /usr/share/config"
+KDEDIRS="/usr:/usr/local:${PREFIX}"
+#KDE_IS_PRELINKED=1
+XDG_DATA_DIRS="/usr/share:${PREFIX}/share:/usr/local/share"
+COLON_SEPARATED="XDG_DATA_DIRS"
+EOF
+
+	# Make sure the target for the revdep-rebuild stuff exists. Fixes bug 184441.
+	dodir /etc/revdep-rebuild
+
+cat <<EOF > "${D}"/etc/revdep-rebuild/50-kde3
+SEARCH_DIRS="${PREFIX}/bin ${PREFIX}/lib*"
+EOF
+}