[gentoo-commits] gentoo-x86 commit in kde-base/kdelibs: ChangeLog kdelibs-3.5.10-r6.ebuild

[Theo Chatzimichos (tampakrap)]

tampakrap    09/05/29 23:39:06

  Modified:             ChangeLog
  Added:                kdelibs-3.5.10-r6.ebuild
  Log:
  Revision bump:
  add patch for kjs when compiled with gcc-4.4, thanks to Robert Forster, bug 270926
  remove symlink that causes doxygen to hang, bug 264767
  add patch for khtml, bug 243476
  restored (updated with kdeprefix) patch to handle kde4 apps in kde3 menu, removed kdeglobals as it completely screws kde3 session when kde4 is installed
  in /usr, by reavertm
  (Portage version: 2.2_rc33/cvs/Linux x86_64)

Revision  Changes    Path
1.598                kde-base/kdelibs/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/ChangeLog?rev=1.598&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/ChangeLog?rev=1.598&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/ChangeLog?r1=1.597&r2=1.598

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v
retrieving revision 1.597
retrieving revision 1.598
diff -u -r1.597 -r1.598
--- ChangeLog	29 May 2009 19:52:59 -0000	1.597
+++ ChangeLog	29 May 2009 23:39:06 -0000	1.598
@@ -1,6 +1,21 @@
 # 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.597 2009/05/29 19:52:59 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.598 2009/05/29 23:39:06 tampakrap Exp $
+
+*kdelibs-3.5.10-r6 (30 May 2009)
+
+  30 May 2009; Theo Chatzimichos <tampakrap@g.o>
+  -files/4.1.3-cmake-config.patch, +kdelibs-3.5.10-r6.ebuild,
+  files/kdelibs-3.5.10-kde4-apps.patch, +files/kdelibs-3.5.10-khtml.patch,
+  +files/kdelibs-3.5.10-kjs-gcc44.patch:
+  Revision bump:
+  add patch for kjs when compiled with gcc-4.4, thanks to Robert Forster,
+  bug 270926
+  remove symlink that causes doxygen to hang, bug 264767
+  add patch for khtml, bug 243476
+  restored (updated with kdeprefix) patch to handle kde4 apps in kde3 menu,
+  removed kdeglobals as it completely screws kde3 session when kde4 is
+  installed in /usr, by reavertm
 
   29 May 2009; Diego E. Pettenò <flameeyes@g.o>
   kdelibs-3.5.9.ebuild, kdelibs-3.5.9-r1.ebuild, kdelibs-3.5.9-r2.ebuild,



1.1                  kde-base/kdelibs/kdelibs-3.5.10-r6.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.10-r6.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.10-r6.ebuild?rev=1.1&content-type=text/plain

Index: kdelibs-3.5.10-r6.ebuild
===================================================================
# 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-r6.ebuild,v 1.1 2009/05/29 23:39:06 tampakrap 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="
	!=kde-base/artsplugin-mpeglib-3.5*
	!=kde-base/artsplugin-mpg123-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
	!kde-base/ksync
	!=kde-base/mpeglib-3.5*
	app-arch/bzip2
	>=dev-libs/libxslt-1.1.16
	>=dev-libs/libxml2-2.6.6
	>=dev-libs/libpcre-6.6
	>=dev-libs/openssl-0.9.7d
	media-libs/fontconfig
	>=media-libs/freetype-2
	media-libs/libart_lgpl
	net-dns/libidn
	>=sys-apps/portage-2.1.2.11
	virtual/ghostscript
	x11-libs/libXext
	>=x11-libs/qt-3.3.3:3
	acl? (
		virtual/acl
	)
	alsa? ( media-libs/alsa-lib )
	arts? ( ~kde-base/arts-3.5.10 )
	!avahi? (
		!bindist? (
			!kde-misc/kdnssd-avahi
			net-misc/mDNSResponder
		)
	)
	cups? ( >=net-print/cups-1.1.19 )
	fam? ( virtual/fam )
	jpeg2k? ( media-libs/jasper )
	kerberos? ( virtual/krb5 )
	lua? ( dev-lang/lua )
	openexr? ( >=media-libs/openexr-1.2.2-r2 )
	spell? (
		>=app-dicts/aspell-en-6.0.0
		>=app-text/aspell-0.60.5
	)
	tiff? ( media-libs/tiff )
	utempter? ( sys-libs/libutempter )
"

DEPEND="${RDEPEND}
	sys-devel/gettext
	doc? ( app-doc/doxygen )
"
RDEPEND="${RDEPEND}
	!<=kde-base/kdebase-startkde-3.5.10-r3
	x11-apps/rgb
	x11-apps/iceauth
	>=x11-misc/xdg-utils-1.0.2-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

	# remove this symlink, bug 264767
	rm -f "${WORKDIR}/${P}"/kdeprint/kdeprint

	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"

	# patch that fixes kde4 in menus (adapted from archlinux)
	epatch "${FILESDIR}/${P}-kde4-apps.patch"

	#Fix glibc-2.10 compilation ( Bug 270404 )
	epatch "${FILESDIR}/${P}-glibc-2.10.patch"

	# bug 247817
	epatch "${FILESDIR}/${PN}-3.5-perl.xml.patch"

	# bug 270926
	epatch "${FILESDIR}/${P}-kjs-gcc44.patch"

	# bug 243476
	epatch "${FILESDIR}/${P}-khtml.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="${PREFIX}/${libdir}:${libdirs}"
	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}
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="${PREFIX}/share"
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
}