Artifical bump to avoid blocks in kde-env. (force due to not synced cvs)

Package-Manager: portage-2.2_rc31/cvs/Linux i686
RepoMan-Options: --force

4 files changed, 271 insertions, 24 deletions

diff --git a/kde-base/kde-env/Manifest b/kde-base/kde-env/Manifest
index 07f67b3b0eec..d52b1e9b8b9c 100644
--- a/kde-base/kde-env/Manifest
+++ b/kde-base/kde-env/Manifest
@@ -1,13 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-EBUILD kde-env-4.2.3.ebuild 3110 RMD160 1cb5e6e80b79f6ad03c3e803d12e795958f6d389 SHA1 4d5c04e956059d5d9db56396e23fef4c15a71de1 SHA256 715f4692813990172d19cd268606465761a3c88f2c00e82c80f50005314e212c
-MISC ChangeLog 451 RMD160 919012be2c74e7a894cc4a2fac6f24ccf2abe615 SHA1 7202403052812c9018612d5b3494dc7a87072b57 SHA256 5984e69a7a835d94f7332760942f3d56ed2255a5656e3dae287fde59acec4bae
+EBUILD kde-env-4.2.3.ebuild 3143 RMD160 1dd2a9d8e789dc3010fd819896506f7f5c0849cb SHA1 e3a097f98f076600be95ff6c9991aa3953903e62 SHA256 1f1c988970d91e59fbd3a79b6a39efa776fc3ab31cc988b83878eef823e86ee3
+MISC ChangeLog 570 RMD160 dc706281642dfbfbd3d47b50efd3f4a839353784 SHA1 17d4da5b859e3a550e63041a560e27c8062ac197 SHA256 27f6f7ad55449cef7b254f70cae3575f5fc886059ed6e7ca0624c8064c2aa20a
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkoCitkACgkQ5BmOA85PVLhADACfVcSeuPW5SRtLf/3YqY0jmMFK
-ALUAnRvf1WSOfAbi9+ItEcl0jUfvR9rK
-=875c
------END PGP SIGNATURE-----
diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 1f588e5485c8..275b424072fc 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.589 2009/05/07 22:15:18 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.590 2009/05/08 10:32:05 scarabeus Exp $
+
+*kdelibs-3.5.10-r3 (08 May 2009)
+
+  08 May 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  +kdelibs-3.5.10-r3.ebuild:
+  Artifical bump to avoid blocks in kde-env.
 
   07 May 2009; Alexey Shvetsov <alexxy@gentoo.org> kdelibs-4.2.3.ebuild,
   +files/kdelibs-4.2.3-halbattery_backport_fix.patch:
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index ed821d2ba787..36e839bad7ac 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 4.1.3-cmake-config.patch 2356 RMD160 14f14e29038735ef105893d53cf1b3771e54ee22 SHA1 e69d8449c52df48408401e62b2acba4a6d60bd7f SHA256 06f7513ebb6d9a0507191f81ddf93f7abd47a4c2a300be22756a16425f9f1904
 AUX 4.2.0-kcatalog.patch 1607 RMD160 a2428826cf1c80686fdb722b017ad4e5cec54089 SHA1 abe3912ace63838a267132b8d5cf95f316c7f7e3 SHA256 85af0df96f19f0d9faab1d6967f8d3736e3480b354ebfb11db5b44ef59041ae6
 AUX 4.2.0-kded.patch 2435 RMD160 66b98f6b532b2b45a4d7539b95088b473a3fe90d SHA1 89a3845b5ca33038cdbaa7a3a4bc2a12eb53bbc9 SHA256 4addbe384870d8ba2bdcb715b7b0fecc9b956201ba87e1c772e939b63e7cd538
@@ -40,6 +37,7 @@ DIST kdelibs-4.2.2.tar.bz2 10051297 RMD160 a8d1e48f3e7a9ad8dae83fd9450e027a2d89e
 DIST kdelibs-4.2.3.tar.bz2 10029005 RMD160 61e36718a7e86be182fd777aa7250208d92fbfd9 SHA1 c4cde3ea347d89d79ffdead203c85b1c2d1f8757 SHA256 a2f2b4b70589a8148c799fefd9f61f2c42ee14a174ae8dc1c396036bf9c23304
 EBUILD kdelibs-3.5.10-r1.ebuild 7357 RMD160 e0eb6cb759364250a3af86c27e9e889d1fb75c83 SHA1 3a5f7de8c1c2e0d9cb75ae6dcb40a6b69b592d85 SHA256 bc1e5de882bf0bd01e96c99e7febe958efa8f42a056770da3c1ecbb1ab67c065
 EBUILD kdelibs-3.5.10-r2.ebuild 7940 RMD160 4b0e949c8b6c384d4eef29e67110feda59f2fb7a SHA1 58236927873f5d88aefde37467b075d096b526e6 SHA256 728b02e8db78c8cc5cf01856c396ed190937ab3e74cbec4e752c217792ef1a39
+EBUILD kdelibs-3.5.10-r3.ebuild 7940 RMD160 f73568735fea4e7f273c9dde111eb3c8ed6500c1 SHA1 aa5d79c9be3dc6d9e6e3748b61fb685831bcfd0e SHA256 0607e2f89603db622857479e9800baaad2b37f52d80922b9bc09e4a4bfc2527d
 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
@@ -48,12 +46,5 @@ EBUILD kdelibs-3.5.9.ebuild 6042 RMD160 5402e42899c0e55787f8b7f5650143dcbc4410d7
 EBUILD kdelibs-4.2.2-r1.ebuild 7139 RMD160 0d527fa084afa40671631e1f33b10d7951b5697a SHA1 4107b28613c3c1f0837a5f9599ed9a367c6e6fe2 SHA256 804b45e952bf1aebd79a0ffac89cc96fd558da731d7d74fcfcd6161154950a3b
 EBUILD kdelibs-4.2.2.ebuild 7136 RMD160 0422951dd81f8a0c2ace4d942915688f5b17182f SHA1 cc3eaaa9163e3ed4d17f99bea721ebd6f6ff17b9 SHA256 981bf12799595b264c2c703436d13c18c8e9226686252253e7127b4df32e2372
 EBUILD kdelibs-4.2.3.ebuild 5993 RMD160 d58d07310e6b2c2b6ea9e21d26cdc4d393d353b7 SHA1 27eeafb1c810e861bc2d4db22a2c3d8d295bd1ce SHA256 709ed77fe529d92d952c7c3a418299ead740371d4e851c68813318eb3fdb0104
-MISC ChangeLog 97313 RMD160 a3bafc7a73be63f7b09e1290e0cef689319fea1c SHA1 613083f41795f0d5ff63f88ff6edae87550a915f SHA256 770152fcc8b48ab378c8b005ac94043aecb9b3a87244db94a0990a4366e8e283
+MISC ChangeLog 97477 RMD160 7aa240af9773918b0f3e8c9b7b02a72634dffba7 SHA1 3522a7c90f1d4acc13bd64f4a55241f54f626345 SHA256 a0cec1271ab98d1b4584e6f408c5e5f20ae439f55cdf82524331003a7a66be37
 MISC metadata.xml 441 RMD160 e57f70d613371f6611dd4b9836dcc2d782b37dff SHA1 a9ccd73256be801916ce41b1e40269bc094587eb SHA256 e9b96a886144e7453b3cf5f6361e14b2f35a448f24a10c00074ce00c5a179caf
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkoDXYcACgkQ5BmOA85PVLiw7QCfXPNaSsfDfP4BXklq0+kTgNi4
-zWsAn2fNGpSPcmOZAhJm8Af2ju2dkN7r
-=C1CK
------END PGP SIGNATURE-----
diff --git a/kde-base/kdelibs/kdelibs-3.5.10-r3.ebuild b/kde-base/kdelibs/kdelibs-3.5.10-r3.ebuild
new file mode 100644
index 000000000000..e20957d637a5
--- /dev/null
+++ b/kde-base/kdelibs/kdelibs-3.5.10-r3.ebuild
@@ -0,0 +1,260 @@
+# 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-3.5.10-r3.ebuild,v 1.1 2009/05/08 10:32:05 scarabeus Exp $
+
+EAPI="1"
+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-15.tar.bz2
+	mirror://gentoo/kde-3.5.9-seli-xinerama.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="3.5"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~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="x11-libs/libXext
+	arts? ( ~kde-base/arts-3.5.10 )
+	app-arch/bzip2
+	>=dev-libs/openssl-0.9.7d
+	>=dev-libs/libxslt-1.1.16
+	>=dev-libs/libxml2-2.6.6
+	>=dev-libs/libpcre-6.6
+	media-libs/fontconfig
+	>=media-libs/freetype-2
+	media-libs/libart_lgpl
+	net-dns/libidn
+	>=x11-libs/qt-3.3.3:3
+	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 )
+	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
+	!=kde-base/artsplugin-mpeglib-3.5*
+	!=kde-base/artsplugin-mpg123-3.5*
+	!=kde-base/mpeglib-3.5*
+	!kde-base/kdeaccessibility
+	!kde-base/kdeaddons
+	!kde-base/kdeadmin
+	!kde-base/kdeartwork
+	!kde-base/kdebase
+	!kde-base/kdeedu
+	!kde-base/kdegames
+	!kde-base/kdegraphics
+	!kde-base/kde
+	!kde-base/kdemultimedia
+	!kde-base/kdenetwork
+	!kde-base/kdepim
+	!kde-base/kdesdk
+	!kde-base/kdetoys
+	!kde-base/kdeutils
+	!kde-base/kdewebdev"
+
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	sys-devel/gettext"
+
+RDEPEND="${RDEPEND}
+	x11-apps/rgb
+	x11-apps/iceauth
+	!<=kde-base/kdebase-startkde-3.5.10-r3"
+
+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 by Lubos Lunak.
+	# http://ktown.kde.org/~seli/xinerama/
+	epatch "${WORKDIR}/${PN}-xinerama.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
+		emake apidox || die
+	fi
+}
+
+src_install() {
+	kde_src_install
+
+	if use doc; then
+		emake 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
+
+	# KDE implies that the install path is listed first in KDEDIRS and the user
+	# directory (implicitly added) to be the last entry. Doing otherwise breaks
+	# certain functionality. Do not break this (once again *sigh*), but read the code.
+	# KDE saves the installed path implicitly and so this is not needed, /usr
+	# is set in ${PREFIX}/share/config/kdeglobals and so KDEDIRS is not needed.
+	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"
+#KDE_IS_PRELINKED=1
+# Excessive flushing to disk as in releases before KDE 3.5.10. Usually you don't want that.
+#KDE_EXTRA_FSYNC=1
+XDG_DATA_DIRS="/usr/share:${PREFIX}/share:/usr/local/share"
+COLON_SEPARATED="XDG_DATA_DIRS"
+EOF
+
+	# kdeglobals needed to make third party apps installed in /usr work
+	# Moved from kdebase-startkde-3.5.10-r3
+	cat <<EOF > "${D}/${PREFIX}/share/config/kdeglobals"
+[Directories][\$i]
+dir_lib=/usr/$(get_libdir)
+dir_apps=/usr/share/applnk
+dir_data=/usr/share/apps
+dir_icon=/usr/share/icons
+dir_module=/usr/$(get_libdir)/kde3
+dir_config=/usr/share/config
+dir_kcfg=/usr/share/config.kcfg
+dir_exe=/usr/bin
+dir_mime=/usr/share/mimelnk
+dir_services=/usr/share/services
+dir_servicetypes=/usr/share/servicetypes
+dir_templates=/usr/share/templates
+EOF
+
+	# Install shell script to run KDE 3 applications from outside of the KDE 3 desktop
+	# See http://lists.kde.org/?t=120569055200005&r=1&w=2 for reference
+
+	# List all the multilib libdirs
+	local _libdir _libdirs
+	for _libdir in $(get_all_libdirs); do
+		_libdirs="${_libdirs}:${PREFIX}/${_libdir}"
+	done
+	_libdirs=${_libdirs#:}
+
+	# Merge KDE prefix and LDPATH
+	sed -e "s#@REPLACE_PREFIX@#${PREFIX}#" \
+		-e  "s#@REPLACE_LIBS@#${_libdirs}#" \
+		-i "${WORKDIR}/patches/kde3" || die "sed failed"
+	dobin "${WORKDIR}/patches/kde3"
+
+	# 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
+}