diff options
author | Gregorio Guidi <greg_g@gentoo.org> | 2005-08-24 23:10:17 +0000 |
---|---|---|
committer | Gregorio Guidi <greg_g@gentoo.org> | 2005-08-24 23:10:17 +0000 |
commit | 692bf12e72aa4ab348cdb99e87d3071522ae2569 (patch) | |
tree | 182ff2a8acbf4eb6914c8fa74086fac8d0afb4a0 /kde-base | |
parent | Marked ~amd64, thanks to Erik Musick and darktama for testing (diff) | |
download | gentoo-2-692bf12e72aa4ab348cdb99e87d3071522ae2569.tar.gz gentoo-2-692bf12e72aa4ab348cdb99e87d3071522ae2569.tar.bz2 gentoo-2-692bf12e72aa4ab348cdb99e87d3071522ae2569.zip |
KDE 3.5 prerelease.
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'kde-base')
-rw-r--r-- | kde-base/arts/ChangeLog | 7 | ||||
-rw-r--r-- | kde-base/arts/arts-3.5_alpha1.ebuild | 91 | ||||
-rw-r--r-- | kde-base/arts/files/digest-arts-3.5_alpha1 | 1 | ||||
-rw-r--r-- | kde-base/kdeaccessibility/ChangeLog | 8 | ||||
-rw-r--r-- | kde-base/kdeaccessibility/files/digest-kdeaccessibility-3.5_alpha1 | 1 | ||||
-rw-r--r-- | kde-base/kdeaccessibility/kdeaccessibility-3.5_alpha1.ebuild | 32 | ||||
-rw-r--r-- | kde-base/kdebase/ChangeLog | 9 | ||||
-rw-r--r-- | kde-base/kdebase/files/digest-kdebase-3.5_alpha1 | 1 | ||||
-rw-r--r-- | kde-base/kdebase/files/kdebase-3.5-configure-openexr.patch | 22 | ||||
-rw-r--r-- | kde-base/kdebase/files/kdebase-3.5-startkde-gentoo.patch | 45 | ||||
-rw-r--r-- | kde-base/kdebase/kdebase-3.5_alpha1.ebuild | 133 | ||||
-rw-r--r-- | kde-base/kdelibs/ChangeLog | 8 | ||||
-rw-r--r-- | kde-base/kdelibs/files/digest-kdelibs-3.5_alpha1 | 1 | ||||
-rw-r--r-- | kde-base/kdelibs/files/kdelibs-3.5_alpha1-crash.patch | 25 | ||||
-rw-r--r-- | kde-base/kdelibs/kdelibs-3.5_alpha1.ebuild | 117 |
15 files changed, 497 insertions, 4 deletions
diff --git a/kde-base/arts/ChangeLog b/kde-base/arts/ChangeLog index 8af3d15bab2c..ee7f21adc926 100644 --- a/kde-base/arts/ChangeLog +++ b/kde-base/arts/ChangeLog @@ -1,10 +1,15 @@ # ChangeLog for kde-base/arts # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/ChangeLog,v 1.176 2005/08/23 22:46:01 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/ChangeLog,v 1.177 2005/08/24 23:06:11 greg_g Exp $ 23 Aug 2005; Aron Griffis <agriffis@gentoo.org> arts-3.4.1-r2.ebuild: stable on ia64 +*arts-3.5_alpha1 (24 Aug 2005) + + 24 Aug 2005; Gregorio Guidi <greg_g@gentoo.org> +arts-3.5_alpha1.ebuild: + KDE 3.5 prerelease. + 29 Jul 2005; Dan Armak <danarmak@gentoo.org> arts-3.4.2.ebuild: Apply the cpu overload patch in 3.4.2 too. diff --git a/kde-base/arts/arts-3.5_alpha1.ebuild b/kde-base/arts/arts-3.5_alpha1.ebuild new file mode 100644 index 000000000000..96bb0ac60db7 --- /dev/null +++ b/kde-base/arts/arts-3.5_alpha1.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/arts-3.5_alpha1.ebuild,v 1.1 2005/08/24 23:06:11 greg_g Exp $ + +inherit kde flag-o-matic eutils +set-kdedir 3.5 + +#MY_PV=${PV/#3/1} +MY_PV=1.4.90 + +S=${WORKDIR}/${PN}-${MY_PV} + +DESCRIPTION="aRts, the KDE sound (and all-around multimedia) server/output manager" +HOMEPAGE="http://multimedia.kde.org/" +#SRC_URI="mirror://kde/stable/${PV}/src/${P}.tar.bz2" +SRC_URI="mirror://kde/unstable/${PV/_/-}/src/${PN}-${MY_PV}.tar.bz2" +LICENSE="GPL-2 LGPL-2" + +SLOT="3.5" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="alsa esd artswrappersuid jack mp3 nas hardened vorbis" + +RDEPEND="$(qt_min_version 3.3) + >=dev-libs/glib-2 + alsa? ( media-libs/alsa-lib ) + vorbis? ( media-libs/libogg + media-libs/libvorbis ) + esd? ( media-sound/esound ) + jack? ( media-sound/jack-audio-connection-kit ) + mp3? ( media-libs/libmad ) + nas? ( media-libs/nas ) + media-libs/audiofile" + +DEPEND="${RDEPEND} + dev-util/pkgconfig" + +src_unpack() { + kde_src_unpack + epatch "${FILESDIR}/arts-1.3.2-alsa-bigendian.patch" + + if (is-flag -fstack-protector || is-flag -fstack-protector-all || use hardened); then + epatch ${FILESDIR}/arts-1.4-mcopidl.patch + make -f admin/Makefile.common || die + fi +} + +src_compile() { + myconf="$(use_enable alsa) $(use_enable vorbis) + $(use_enable mp3 libmad) $(use_with jack) + $(use_with esd) $(use_with nas) + --with-audiofile --without-mas" + + #fix bug 13453 + filter-flags -foptimize-sibling-calls + + #fix bug 41980 + use sparc && filter-flags -fomit-frame-pointer + + kde_src_compile +} + +src_install() { + kde_src_install + + # moved here from kdelibs so that when arts is installed + # without kdelibs it's still in the path. + # List all the multilib libdirs + local libdirs + for libdir in $(get_all_libdirs); do + libdirs="${libdirs}:${PREFIX}/${libdir}" + done + + dodir /etc/env.d +echo "PATH=${PREFIX}/bin +ROOTPATH=${PREFIX}/sbin:${PREFIX}/bin +LDPATH=${libdirs:1} +CONFIG_PROTECT=\"${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown\"" > ${D}/etc/env.d/45kdepaths-3.4 # number goes down with version upgrade + + # used for realtime priority, but off by default as it is a security hazard + use artswrappersuid && chmod u+s ${D}/${PREFIX}/bin/artswrapper +} + +pkg_postinst() { + if ! use artswrappersuid ; then + einfo "Run chmod u+s ${PREFIX}/bin/artswrapper to let artsd use realtime priority" + einfo "and so avoid possible skips in sound. However, on untrusted systems this" + einfo "creates the possibility of a DoS attack that'll use 100% cpu at realtime" + einfo "priority, and so is off by default. See bug #7883." + einfo "Or, you can set the local artswrappersuid USE flag to make the ebuild do this." + fi +} diff --git a/kde-base/arts/files/digest-arts-3.5_alpha1 b/kde-base/arts/files/digest-arts-3.5_alpha1 new file mode 100644 index 000000000000..5e47fb48b24c --- /dev/null +++ b/kde-base/arts/files/digest-arts-3.5_alpha1 @@ -0,0 +1 @@ +MD5 7a70822c9c6a6d2d1b253964db06fb6f arts-1.4.90.tar.bz2 961068 diff --git a/kde-base/kdeaccessibility/ChangeLog b/kde-base/kdeaccessibility/ChangeLog index 35769b1915e1..f414ace73406 100644 --- a/kde-base/kdeaccessibility/ChangeLog +++ b/kde-base/kdeaccessibility/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for kde-base/kdeaccessibility # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility/ChangeLog,v 1.70 2005/07/28 12:59:54 greg_g Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility/ChangeLog,v 1.71 2005/08/24 23:10:17 greg_g Exp $ + +*kdeaccessibility-3.5_alpha1 (24 Aug 2005) + + 24 Aug 2005; Gregorio Guidi <greg_g@gentoo.org> + +kdeaccessibility-3.5_alpha1.ebuild: + KDE 3.5 prerelease. *kdeaccessibility-3.4.2 (28 Jul 2005) diff --git a/kde-base/kdeaccessibility/files/digest-kdeaccessibility-3.5_alpha1 b/kde-base/kdeaccessibility/files/digest-kdeaccessibility-3.5_alpha1 new file mode 100644 index 000000000000..9757c380d2ab --- /dev/null +++ b/kde-base/kdeaccessibility/files/digest-kdeaccessibility-3.5_alpha1 @@ -0,0 +1 @@ +MD5 f372b094bce16e9e06b6811c1bdd9324 kdeaccessibility-3.4.90.tar.bz2 8325023 diff --git a/kde-base/kdeaccessibility/kdeaccessibility-3.5_alpha1.ebuild b/kde-base/kdeaccessibility/kdeaccessibility-3.5_alpha1.ebuild new file mode 100644 index 000000000000..b97eacb7bba3 --- /dev/null +++ b/kde-base/kdeaccessibility/kdeaccessibility-3.5_alpha1.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility/kdeaccessibility-3.5_alpha1.ebuild,v 1.1 2005/08/24 23:10:17 greg_g Exp $ + +inherit kde-dist + +DESCRIPTION="KDE accessibility module" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86" +IUSE="alsa gstreamer" + +DEPEND="alsa? ( media-libs/alsa-lib ) + gstreamer? ( >=media-libs/gstreamer-0.8.7 + >=media-libs/gst-plugins-0.8.7 )" + +RDEPEND="${DEPEND} + || ( app-accessibility/festival + app-accessibility/epos + app-accessibility/flite + app-accessibility/freetts )" + +DEPEND="${DEPEND} + dev-util/pkgconfig" + +src_compile() { + local myconf="$(use_with alsa) $(use_with gstreamer)" + + # Compile without akode support until there's a + # standalone release of akode. + myconf="${myconf} --without-akode" + + kde_src_compile +} diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog index 442b6197223b..c53d2143099d 100644 --- a/kde-base/kdebase/ChangeLog +++ b/kde-base/kdebase/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for kde-base/kdebase # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.214 2005/08/06 10:27:24 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.215 2005/08/24 23:09:16 greg_g Exp $ + +*kdebase-3.5_alpha1 (24 Aug 2005) + + 24 Aug 2005; Gregorio Guidi <greg_g@gentoo.org> + +files/kdebase-3.5-configure-openexr.patch, + +files/kdebase-3.5-startkde-gentoo.patch, +kdebase-3.5_alpha1.ebuild: + KDE 3.5 prerelease. Add zeroconf support for ksysguardd. *kdebase-3.4.2-r1 (06 Aug 2005) diff --git a/kde-base/kdebase/files/digest-kdebase-3.5_alpha1 b/kde-base/kdebase/files/digest-kdebase-3.5_alpha1 new file mode 100644 index 000000000000..b6ccb0c038a8 --- /dev/null +++ b/kde-base/kdebase/files/digest-kdebase-3.5_alpha1 @@ -0,0 +1 @@ +MD5 ac84f1dfe79bae4fb77b37f95cebf973 kdebase-3.4.90.tar.bz2 23075673 diff --git a/kde-base/kdebase/files/kdebase-3.5-configure-openexr.patch b/kde-base/kdebase/files/kdebase-3.5-configure-openexr.patch new file mode 100644 index 000000000000..5573ab5c3563 --- /dev/null +++ b/kde-base/kdebase/files/kdebase-3.5-configure-openexr.patch @@ -0,0 +1,22 @@ +diff -Nur kdebase-3.4.90.orig/kioslave/thumbnail/configure.in.in kdebase-3.4.90/kioslave/thumbnail/configure.in.in +--- kdebase-3.4.90.orig/kioslave/thumbnail/configure.in.in 2005-08-06 11:46:58.000000000 +0200 ++++ kdebase-3.4.90/kioslave/thumbnail/configure.in.in 2005-08-21 12:39:44.000000000 +0200 +@@ -95,5 +95,17 @@ + AC_SUBST(EXR_FLAGS) + ]) + +-AC_FIND_LIBEXR ++AC_ARG_WITH(openexr, ++ [AS_HELP_STRING(--with-openexr, ++ [enable support for OpenEXR @<:@default=check@:>@])], ++ [], with_openexr=check) ++ ++if test "x$with_openexr" != xno; then ++ AC_FIND_LIBEXR ++ ++ if test "x$with_openexr" != xcheck && test -z "$LIB_EXR"; then ++ AC_MSG_FAILURE([--with-openexr was given, but test for OpenEXR failed]) ++ fi ++fi ++ + AM_CONDITIONAL(include_EXR_MODULES, test -n "$LIB_EXR") diff --git a/kde-base/kdebase/files/kdebase-3.5-startkde-gentoo.patch b/kde-base/kdebase/files/kdebase-3.5-startkde-gentoo.patch new file mode 100644 index 000000000000..2e1c2cbc033f --- /dev/null +++ b/kde-base/kdebase/files/kdebase-3.5-startkde-gentoo.patch @@ -0,0 +1,45 @@ +--- kdebase-3.4.90.orig/startkde 2005-08-06 11:48:55.000000000 +0200 ++++ kdebase-3.4.90/startkde 2005-08-21 12:44:13.000000000 +0200 +@@ -14,6 +14,42 @@ + exit 1 + fi + ++# Gentoo part: ++export PATH="/usr/kde/3.5/bin:${PATH}" ++ ++cd ${HOME} ++if [ -L .kde -o ! -d .kde ]; then ++ # handle ~/.kde* dirs - separate ones for separate KDEs ++ rm -f .kde ++ if [ ! -e .kde3.5 ]; then ++ # migrate old config files ++ if [ -e .kde3.4 ]; then ++ cp -r .kde3.4 .kde3.5 ++ elif [ -e .kde3.3 ]; then ++ cp -r .kde3.3 .kde3.5 ++ elif [ -e .kde3.2 ]; then ++ cp -r .kde3.2 .kde3.5 ++ else ++ mkdir .kde3.5 ++ fi ++ cd .kde3.5 ++ for file in share/apps/kdevdocumentation/search/htdig.conf \ ++ share/apps/kalarmd/clients \ ++ share/config/kresources/calendar/stdrc \ ++ share/config/*rc; do ++ if [ -e "${file}" ]; then ++ sed -i -e "s:$HOME/\.kde3\.[234]:$HOME/\.kde3\.5:g" \ ++ -e 's:$HOME/\.kde3\.[234]:$HOME/\.kde3\.5:g' \ ++ -e 's:/usr/kde/3\.[234]/:/usr/kde/3\.5/:g' \ ++ "${file}" ++ fi ++ done ++ cd ${HOME} ++ fi ++ ln -sf .kde3.5 .kde ++fi ++# Gentoo part ends ++ + # Set the background to plain grey. + # The standard X background is nasty, causing moire effects and exploding + # people's heads. We use colours from the standard KDE palette for those with diff --git a/kde-base/kdebase/kdebase-3.5_alpha1.ebuild b/kde-base/kdebase/kdebase-3.5_alpha1.ebuild new file mode 100644 index 000000000000..b3a84c9b98bb --- /dev/null +++ b/kde-base/kdebase/kdebase-3.5_alpha1.ebuild @@ -0,0 +1,133 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5_alpha1.ebuild,v 1.1 2005/08/24 23:09:16 greg_g Exp $ + +inherit kde-dist eutils + +DESCRIPTION="KDE base packages: the desktop, panel, window manager, konqueror..." + +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86" +IUSE="arts cups java ldap ieee1394 hal lm_sensors logitech-mouse openexr opengl pam samba ssl zeroconf" +# hal: enables hal backend for 'media:' ioslave + +DEPEND="arts? ( ~kde-base/arts-${PV} ) + >=media-libs/freetype-2 + media-libs/fontconfig + pam? ( kde-base/kdebase-pam ) + >=dev-libs/cyrus-sasl-2 + ldap? ( >=net-nds/openldap-2 ) + cups? ( net-print/cups ) + ssl? ( dev-libs/openssl ) + opengl? ( virtual/opengl ) + openexr? ( >=media-libs/openexr-1.2 ) + samba? ( >=net-fs/samba-3.0.4 ) + lm_sensors? ( sys-apps/lm_sensors ) + logitech-mouse? ( >=dev-libs/libusb-0.1.10a ) + ieee1394? ( sys-libs/libraw1394 ) + hal? ( >=sys-apps/dbus-0.33 + =sys-apps/hal-0.5* ) + zeroconf? ( net-misc/mDNSResponder )" + +RDEPEND="${DEPEND} + java? ( >=virtual/jre-1.4 ) + virtual/eject" + +DEPEND="${DEPEND} + dev-util/pkgconfig" + +src_unpack() { + kde_src_unpack + + epatch "${FILESDIR}/kdebase-3.5-startkde-gentoo.patch" + + # Configure patch. Not needed in beta1. + epatch "${FILESDIR}/kdebase-3.5-configure-openexr.patch" + + # For the configure patch. + make -f admin/Makefile.common || die +} + +src_compile() { + local myconf="--with-dpms + $(use_with arts) $(use_with ldap) + $(use_with opengl gl) $(use_with ssl) + $(use_with samba) $(use_with openexr) + $(use_with lm_sensors sensors) $(use_with logitech-mouse libusb) + $(use_with ieee1394 libraw1394) $(use_with hal) + $(use_enable zeroconf dnssd)" + + if use pam; then + myconf="${myconf} --with-pam=yes" + else + myconf="${myconf} --with-pam=no --with-shadow" + fi + + # the java test is problematic (see kde bug 100729) and + # useless. All that's needed for java applets to work is + # to have the 'java' executable in PATH. + myconf="${myconf} --without-java" + + kde_src_compile +} + +src_install() { + kde_src_install + cd ${S}/kdm && make DESTDIR=${D} GENKDMCONF_FLAGS="--no-old --no-backup --no-in-notice" install + + # startup and shutdown scripts + insinto ${KDEDIR}/env + doins ${FILESDIR}/agent-startup.sh + + exeinto ${KDEDIR}/shutdown + doexe ${FILESDIR}/agent-shutdown.sh + + # freedesktop environment variables + cat <<EOF > ${T}/xdg.sh +export XDG_DATA_DIRS="${KDEDIR}/share:/usr/share" +export XDG_CONFIG_DIRS="${KDEDIR}/etc/xdg" +EOF + insinto ${KDEDIR}/env + doins ${T}/xdg.sh + + # x11 session script + cat <<EOF > ${T}/kde-${SLOT} +#!/bin/sh +exec ${KDEDIR}/bin/startkde +EOF + exeinto /etc/X11/Sessions + doexe ${T}/kde-${SLOT} + + # freedesktop compliant session script + sed -e "s:@KDE_BINDIR@:${KDEDIR}/bin:g;s:Name=KDE:Name=KDE ${SLOT}:" \ + ${S}/kdm/kfrontend/sessions/kde.desktop.in > ${T}/kde-${SLOT}.desktop + insinto /usr/share/xsessions + doins ${T}/kde-${SLOT}.desktop + + # Customize the kdmrc configuration + sed -i -e "s:#SessionsDirs=:SessionsDirs=/usr/share/xsessions\n#SessionsDirs=:" \ + ${D}/${KDEDIR}/share/config/kdm/kdmrc || die + + rmdir ${D}/${KDEDIR}/share/templates/.source/emptydir +} + +pkg_postinst() { + # set the default kdm face icon if it's not already set by the system admin + if [ ! -e "${ROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon" ]; then + mkdir -p "${ROOT}${KDEDIR}/share/apps/kdm/faces" + cp "${ROOT}${KDEDIR}/share/apps/kdm/pics/users/default1.png" \ + "${ROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon" + fi + if [ ! -e "${ROOT}${KDEDIR}/share/apps/kdm/faces/root.face.icon" ]; then + mkdir -p "${ROOT}${KDEDIR}/share/apps/kdm/faces" + cp "${ROOT}${KDEDIR}/share/apps/kdm/pics/users/root1.png" \ + "${ROOT}${KDEDIR}/share/apps/kdm/faces/root.face.icon" + fi + + mkdir -p ${ROOT}${KDEDIR}/share/templates/.source/emptydir + + echo + einfo "To enable gpg-agent and/or ssh-agent in KDE sessions," + einfo "edit ${KDEDIR}/env/agent-startup.sh and" + einfo "${KDEDIR}/shutdown/agent-shutdown.sh" + echo +} diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog index 65c1c834a2ec..24750b10ee87 100644 --- a/kde-base/kdelibs/ChangeLog +++ b/kde-base/kdelibs/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for kde-base/kdelibs # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.267 2005/07/28 12:52:34 greg_g Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.268 2005/08/24 23:07:13 greg_g Exp $ + +*kdelibs-3.5_alpha1 (24 Aug 2005) + + 24 Aug 2005; Gregorio Guidi <greg_g@gentoo.org> + +files/kdelibs-3.5_alpha1-crash.patch, +kdelibs-3.5_alpha1.ebuild: + KDE 3.5 prerelease. *kdelibs-3.4.2 (28 Jul 2005) diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.5_alpha1 b/kde-base/kdelibs/files/digest-kdelibs-3.5_alpha1 new file mode 100644 index 000000000000..ff4e3b3d9fd7 --- /dev/null +++ b/kde-base/kdelibs/files/digest-kdelibs-3.5_alpha1 @@ -0,0 +1 @@ +MD5 5679ba3fd994f27eb0b4da6b4019cd05 kdelibs-3.4.90.tar.bz2 17359672 diff --git a/kde-base/kdelibs/files/kdelibs-3.5_alpha1-crash.patch b/kde-base/kdelibs/files/kdelibs-3.5_alpha1-crash.patch new file mode 100644 index 000000000000..8f42540a7a7e --- /dev/null +++ b/kde-base/kdelibs/files/kdelibs-3.5_alpha1-crash.patch @@ -0,0 +1,25 @@ +diff -Nur kdelibs-3.4.90.orig/dcop/dcopsignals.cpp kdelibs-3.4.90/dcop/dcopsignals.cpp +--- kdelibs-3.4.90.orig/dcop/dcopsignals.cpp 2005-08-06 11:49:03.000000000 +0200 ++++ kdelibs-3.4.90/dcop/dcopsignals.cpp 2005-08-24 13:22:35.000000000 +0200 +@@ -151,7 +151,7 @@ + + list->append( current ); + conn->signalConnectionList()->append(current); +- if (senderConn) ++ if (senderConn && senderConn != conn) + senderConn->signalConnectionList()->append(current); + return true; + } +diff -Nur kdelibs-3.4.90.orig/kded/kbuildsycoca.cpp kdelibs-3.4.90/kded/kbuildsycoca.cpp +--- kdelibs-3.4.90.orig/kded/kbuildsycoca.cpp 2005-08-06 11:49:39.000000000 +0200 ++++ kdelibs-3.4.90/kded/kbuildsycoca.cpp 2005-08-24 13:46:38.000000000 +0200 +@@ -547,7 +547,8 @@ + QDataStream str( &ksycocastamp ); + str << newTimestamp; + str << existingResourceDirs(); +- str << g_vfolder->allDirectories(); // Extra resource dirs ++ if (g_vfolder) ++ str << g_vfolder->allDirectories(); // Extra resource dirs + + // Recreate compatibility symlink + QString oldPath = oldSycocaPath(); diff --git a/kde-base/kdelibs/kdelibs-3.5_alpha1.ebuild b/kde-base/kdelibs/kdelibs-3.5_alpha1.ebuild new file mode 100644 index 000000000000..9a5849acc0cd --- /dev/null +++ b/kde-base/kdelibs/kdelibs-3.5_alpha1.ebuild @@ -0,0 +1,117 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5_alpha1.ebuild,v 1.1 2005/08/24 23:07:14 greg_g Exp $ + +inherit kde flag-o-matic eutils multilib +set-kdedir 3.5 + +MY_PV=3.4.90 +S=${WORKDIR}/${PN}-${MY_PV} + +DESCRIPTION="KDE libraries needed by all kde programs" +HOMEPAGE="http://www.kde.org/" +#SRC_URI="mirror://kde/stable/${PV}/src/${P}.tar.bz2" +SRC_URI="mirror://kde/unstable/${PV/_/-}/src/${PN}-${MY_PV}.tar.bz2" + +LICENSE="GPL-2 LGPL-2" +SLOT="3.5" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="alsa arts cups doc jpeg2k kerberos openexr spell ssl tiff zeroconf" + +# kde.eclass has kdelibs in DEPEND, and we can't have that in here. +# so we recreate the entire DEPEND from scratch. +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.4 + >=dev-libs/libxml2-2.6.6 + >=dev-libs/libpcre-4.2 + media-libs/libart_lgpl + net-dns/libidn + virtual/utempter + 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-text/ispell ) ) + zeroconf? ( net-misc/mDNSResponder ) + virtual/fam + virtual/ghostscript" + +DEPEND="${RDEPEND} + doc? ( app-doc/doxygen ) + sys-devel/gettext + dev-util/pkgconfig" + +src_unpack() { + kde_src_unpack + + # Fix crashes. Applied upstream. + epatch "${FILESDIR}/${P}-crash.patch" +} + +src_compile() { + myconf="--with-distribution=Gentoo + --enable-libfam $(use_enable kernel_linux dnotify) + --with-libart --with-libidn --with-utempter + $(use_with alsa) $(use_with arts) $(use_with ssl) + $(use_with kerberos gssapi) $(use_with tiff) + $(use_with jpeg2k jasper) $(use_with openexr) + $(use_enable cups) $(use_enable zeroconf dnssd)" + + if use spell && has_version app-text/aspell; then + myconf="${myconf} --with-aspell" + else + myconf="${myconf} --without-aspell" + fi + + use x86 && myconf="${myconf} --enable-fast-malloc=full" + + # 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" + + 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 + +} |