Missing return value checks. Use init script to restart cupsd. A couple of fixes from the KDE 3.5 branch.

Package-Manager: portage-2.1

4 files changed, 198 insertions, 16 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 74e667189ae8..614990a3d5f9 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.340 2006/06/09 01:02:18 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.341 2006/06/14 23:34:02 carlo Exp $
+
+*kdelibs-3.5.3-r2 (14 Jun 2006)
+
+  14 Jun 2006; Carsten Lohrke <carlo@gentoo.org> +kdelibs-3.5.3-r2.ebuild:
+  Missing return value checks. Use init script to restart cupsd. A couple of
+  fixes from the KDE 3.5 branch.
 
 *kdelibs-3.5.3-r1 (09 Jun 2006)
 
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index f01f024c1a22..8db9ed361360 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX kde3-dcopidlng.patch 681 RMD160 ed51b79d085abf13a6883a313c02fbe9fad946e0 SHA1 102b786b497b61e6bce22c67f2b505aaea6b5b03 SHA256 5ecc91e40a6e33b9f2a5057867409bc88e350f16595d02a756803c5e5d169bbe
 MD5 a5d3cb18c9572d8ca3dd06cbe5d226f1 files/kde3-dcopidlng.patch 681
 RMD160 ed51b79d085abf13a6883a313c02fbe9fad946e0 files/kde3-dcopidlng.patch 681
@@ -50,7 +47,8 @@ MD5 ecc0ec13ce3b06e94e35aa8e937e02bf files/post-3.4.3-kdelibs-kjs.diff 1570
 RMD160 95a341acfe20ac53f528c31be17e50dba2163f8d files/post-3.4.3-kdelibs-kjs.diff 1570
 SHA256 2031efa2a5e4a747d5e2630ccd0cae62d7413de025786069931c01b07fc5a724 files/post-3.4.3-kdelibs-kjs.diff 1570
 DIST kdelibs-3.3.2.tar.bz2 15623180 RMD160 66d8bf05cff7aaf875a640a08b1a259085385036 SHA256 1bb530480f1d55449a0ff3a1138d25ba4c49e983c6ddfd513f2f52a72579ccf4
-DIST kdelibs-3.4.3.tar.bz2 16877867 RMD160 3bf89c0694f0fbabe46ae75d49f3eaf651fc2a90 SHA256 9da649b27e5b94ce932bb5da1fe6096b1230d82405564e62486ca4f68437df39
+DIST kdelibs-3.4.3.tar.bz2 16877867 RMD160 3bf89c0694f0fbabe46ae75d49f3eaf651fc2a90 SHA1 ab701b90efc9cfe29e8e9c461d8b8c82357d8ef7 SHA256 9da649b27e5b94ce932bb5da1fe6096b1230d82405564e62486ca4f68437df39
+DIST kdelibs-3.5-patchset-01.tar.bz2 14393 RMD160 90ae68ec9051bfa074983c74cbcf25c1583dea7b SHA1 cbf9fc3e95a4a302b41a3c9a18c379a8e5b76a27 SHA256 b525c5ceabb278e4215634fa2eab2498d8b3573aad419bf2bc7007192fbabae6
 DIST kdelibs-3.5.2-patchset.tar.bz2 17026 RMD160 07093c155a11256ba8e0df3144899ca1696db063 SHA1 94c5dbeee9b4a93c4a85b20f5ed247b2b7cd447d SHA256 c3e4d921bfe963ab49a11081fbd5b0b8fe3d1190054a22bb3933c64d51becf04
 DIST kdelibs-3.5.2.tar.bz2 15442103 RMD160 29b4837837e68b47b74b2aefa4b29d2b9ad46414 SHA1 c895d3473307b90ebfd3c4d40b3813f9243d69fb SHA256 d0c252b7f14086f32e126761be55b6661dd9c9f7172f5eb369bd31c6ed19e14b
 DIST kdelibs-3.5.3.tar.bz2 15424888 RMD160 be39edfea7bfe1f0c0408be8fe9f37077954e545 SHA1 c8ceb087051e23f34ae10e0e9d5a228251134b1b SHA256 ff394fba46b353e3a1c27175788f428fa3561849b18ef744a1252c34bf09fdb9
@@ -77,14 +75,18 @@ EBUILD kdelibs-3.5.3-r1.ebuild 5031 RMD160 79bb6c7eb4cfa38faaee4db600b584c70b0a7
 MD5 10bee4286f79fbeb123d4d713db846f2 kdelibs-3.5.3-r1.ebuild 5031
 RMD160 79bb6c7eb4cfa38faaee4db600b584c70b0a72e2 kdelibs-3.5.3-r1.ebuild 5031
 SHA256 7ff66d011322466e85f38076240e020cf09a5bbf4d0d6f4636398744e85b3bea kdelibs-3.5.3-r1.ebuild 5031
+EBUILD kdelibs-3.5.3-r2.ebuild 4923 RMD160 a0e116dea487e78fb9f7a79908bf9c87f5665f76 SHA1 efc1caa43aae8f9c3bf03d8259bd17bf01978e6b SHA256 55cb667aaed1787b1c00f0322064c6c5a5bd8d1e372ff6c4985868f6c6134c73
+MD5 4b88a7e6b7461222533aebaa847fba4b kdelibs-3.5.3-r2.ebuild 4923
+RMD160 a0e116dea487e78fb9f7a79908bf9c87f5665f76 kdelibs-3.5.3-r2.ebuild 4923
+SHA256 55cb667aaed1787b1c00f0322064c6c5a5bd8d1e372ff6c4985868f6c6134c73 kdelibs-3.5.3-r2.ebuild 4923
 EBUILD kdelibs-3.5.3.ebuild 5043 RMD160 344e922bf3f8b8b06d5d1e82fd52ae13d1c03ba2 SHA1 e65d14a1fe27e851d6e5e5b6bedf45f05153e1d4 SHA256 e06988836ca8a8ef22491814dceb8c821877edcd9351ed1fb854d146c1c47f6c
 MD5 1adc9ca7dafe1df5175c6864d4bfe13d kdelibs-3.5.3.ebuild 5043
 RMD160 344e922bf3f8b8b06d5d1e82fd52ae13d1c03ba2 kdelibs-3.5.3.ebuild 5043
 SHA256 e06988836ca8a8ef22491814dceb8c821877edcd9351ed1fb854d146c1c47f6c kdelibs-3.5.3.ebuild 5043
-MISC ChangeLog 55543 RMD160 2af9b6a83af11dbf19f725249d98679559a2c38a SHA1 916918a79439f2682d30e8d7ff12b72f84464984 SHA256 913b241b2f8776ca60c62806e72fd8a0cc1c4bc46fc2424b4b553d37d6d3b599
-MD5 47f80654693548db517d375d0cd94c7e ChangeLog 55543
-RMD160 2af9b6a83af11dbf19f725249d98679559a2c38a ChangeLog 55543
-SHA256 913b241b2f8776ca60c62806e72fd8a0cc1c4bc46fc2424b4b553d37d6d3b599 ChangeLog 55543
+MISC ChangeLog 55758 RMD160 83c1742f2bf785906743acf68ecfbfe898a9ff97 SHA1 fe34485aeabfa63013890fa680c4d8589511ce7b SHA256 2647b46fb165ac54efddb566121b9f06e802086ac23d55ddb001f0ac42c03a16
+MD5 881ac371477f292f1c052c778fae1f4e ChangeLog 55758
+RMD160 83c1742f2bf785906743acf68ecfbfe898a9ff97 ChangeLog 55758
+SHA256 2647b46fb165ac54efddb566121b9f06e802086ac23d55ddb001f0ac42c03a16 ChangeLog 55758
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -104,10 +106,6 @@ SHA256 1c585fb7eaf1d266043e4000ddc3a22f90350e405c5c804b34c88d968d23ac89 files/di
 MD5 d22317a98a0074e1c584230ce1c064df files/digest-kdelibs-3.5.3-r1 542
 RMD160 12b4a97ab1b824399369046618522313e7020299 files/digest-kdelibs-3.5.3-r1 542
 SHA256 1c585fb7eaf1d266043e4000ddc3a22f90350e405c5c804b34c88d968d23ac89 files/digest-kdelibs-3.5.3-r1 542
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEiMiiAiZjviIA2XgRAjTNAKCY5/r2Qngb7MzFloJ4ErWjlsYy1ACePy/w
-BnYgyAHEhTeDJNGBJ0rR4+E=
-=mi2X
------END PGP SIGNATURE-----
+MD5 f4da53101447a8fadd5466a6f8e9e7b0 files/digest-kdelibs-3.5.3-r2 521
+RMD160 da6a794109c5cc3d13e690134378e4c2b47a21c9 files/digest-kdelibs-3.5.3-r2 521
+SHA256 3c6f1d693a23231a53762071351d2819f208a4af8126b7f9c8c6b261579d6efe files/digest-kdelibs-3.5.3-r2 521
diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.5.3-r2 b/kde-base/kdelibs/files/digest-kdelibs-3.5.3-r2
new file mode 100644
index 000000000000..9957a4f18cff
--- /dev/null
+++ b/kde-base/kdelibs/files/digest-kdelibs-3.5.3-r2
@@ -0,0 +1,6 @@
+MD5 aae266fea8290ecb842f92499af5b1c2 kdelibs-3.5-patchset-01.tar.bz2 14393
+RMD160 90ae68ec9051bfa074983c74cbcf25c1583dea7b kdelibs-3.5-patchset-01.tar.bz2 14393
+SHA256 b525c5ceabb278e4215634fa2eab2498d8b3573aad419bf2bc7007192fbabae6 kdelibs-3.5-patchset-01.tar.bz2 14393
+MD5 972c2c6855f912179bd7830bf2ed91d8 kdelibs-3.5.3.tar.bz2 15424888
+RMD160 be39edfea7bfe1f0c0408be8fe9f37077954e545 kdelibs-3.5.3.tar.bz2 15424888
+SHA256 ff394fba46b353e3a1c27175788f428fa3561849b18ef744a1252c34bf09fdb9 kdelibs-3.5.3.tar.bz2 15424888
diff --git a/kde-base/kdelibs/kdelibs-3.5.3-r2.ebuild b/kde-base/kdelibs/kdelibs-3.5.3-r2.ebuild
new file mode 100644
index 000000000000..3a891e3963e8
--- /dev/null
+++ b/kde-base/kdelibs/kdelibs-3.5.3-r2.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.3-r2.ebuild,v 1.1 2006/06/14 23:34:02 carlo 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-01.tar.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 cups doc jpeg2k kerberos legacyssl openexr spell ssl tiff
+zeroconf kernel_linux fam"
+
+# kde.eclass has kdelibs in DEPEND, and we can't have that in here.
+# so we recreate the entire DEPEND from scratch.
+
+# Added aspell-en as dependency to work around bug 131512.
+RDEPEND="$(qt_min_version 3.3.3)
+	arts? ( ~kde-base/arts-${PV} )
+	app-arch/bzip2
+	>=media-libs/freetype-2
+	media-libs/fontconfig
+	>=dev-libs/libxslt-1.1.15
+	>=dev-libs/libxml2-2.6.6
+	>=dev-libs/libpcre-4.2
+	media-libs/libart_lgpl
+	net-dns/libidn
+	acl? ( kernel_linux? ( sys-apps/acl ) )
+	ssl? ( >=dev-libs/openssl-0.9.7d )
+	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 )
+	spell? ( || (  ( app-text/aspell app-dicts/aspell-en )
+	              app-text/ispell ) )
+	zeroconf? ( net-misc/mDNSResponder )
+	fam? ( virtual/fam )
+	virtual/ghostscript"
+
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	sys-devel/gettext
+	dev-util/pkgconfig"
+
+RDEPEND="${RDEPEND}
+	|| ( x11-apps/rgb virtual/x11 )"
+
+pkg_setup() {
+	if use legacyssl ; then
+		echo ""
+		eerror "Warning:"
+		ewarn "You have the legacyssl use flag enabled, which fixes issues with some broken"
+		ewarn "sites, but breaks others instead. It is strongly discouraged to use it."
+		ewarn "For more information, see bug #128922."
+		echo ""
+	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.2-kssl-3des.patch || die "Patch did not apply."
+	fi
+
+	if use cups && has_version '>=net-print/cups-1.2_pre'; then
+		cd "${S}"
+
+		EPATCH_EXCLUDE="kubuntu_39_cups12_compile_fixes.diff" \
+		EPATCH_SUFFIX="diff" \
+		EPATCH_MULTI_MSG="Applying KUbuntu patches for CUPS 1.2 support ..." \
+		EPATCH_FORCE="yes" \
+		epatch "${WORKDIR}/kdeprint-3.5.2-cups-1.2-patches/"
+	fi
+}
+
+src_compile() {
+	rm -f ${S}/configure
+
+	# hspell is disabled because it requires version 0.9 of hspell that
+	# is not in portage yet; leaving it to autodetection tries to use it
+	# and then fails because of missing required functions
+
+	myconf="--with-distribution=Gentoo
+	        $(use_enable fam libfam) $(use_enable kernel_linux dnotify)
+	        --with-libart --with-libidn --without-utempter
+	        $(use_with acl) $(use_with ssl)
+	        $(use_with alsa) $(use_with arts)
+	        $(use_with kerberos gssapi) $(use_with tiff)
+	        $(use_with jpeg2k jasper) $(use_with openexr)
+	        $(use_enable cups) $(use_enable zeroconf dnssd)
+	        --without-hspell"
+
+	if use spell && has_version app-text/aspell; then
+		myconf="${myconf} --with-aspell"
+	else
+		myconf="${myconf} --without-aspell"
+	fi
+
+	if has_version x11-apps/rgb; then
+		myconf="${myconf} --with-rgbfile=/usr/share/X11/rgb.txt"
+	fi
+
+	myconf="${myconf} --disable-fast-malloc"
+
+	# 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
+
+	export BINDNOW_FLAGS="$(bindnow-flags)"
+
+	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
+
+	if ! use arts ; then
+		dodir /etc/env.d
+
+		# List all the multilib libdirs
+		local libdirs
+		for libdir in $(get_all_libdirs); do
+			libdirs="${libdirs}:${PREFIX}/${libdir}"
+		done
+
+		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}
+CONFIG_PROTECT="${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown"
+EOF
+	fi
+
+}
+
+pkg_postinst() {
+	if use zeroconf; then
+		echo
+		einfo "To make zeroconf support available in KDE"
+		einfo "make sure that the 'mdnsd' daemon is running."
+		einfo "Make sure also that multicast dns lookups are"
+		einfo "enabled by editing the 'hosts:' line in"
+		einfo "/etc/nsswitch.conf to include 'mdns', e.g.:"
+		einfo "hosts: files mdns dns"
+		echo
+	fi
+}