Full auto: Version bump for KDE-4.1.3

(Portage version: 2.2_rc12/cvs/Linux 2.6.26-gentoo i686)

3 files changed, 251 insertions, 1 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index adf0b9674724..cbf452474547 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,12 @@
 # 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.546 2008/10/21 09:56:10 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.547 2008/11/09 02:16:44 scarabeus Exp $
+
+*kdelibs-4.1.3 (08 Nov 2008)
+
+  08 Nov 2008; Tomas Chvatal <scarabeus@gentoo.org>
+  +files/4.1.3-cmake-config.patch, +kdelibs-4.1.3.ebuild:
+  Version bump.
 
   21 Oct 2008; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   -kdelibs-4.0.4.ebuild, -kdelibs-4.0.5.ebuild:
diff --git a/kde-base/kdelibs/files/4.1.3-cmake-config.patch b/kde-base/kdelibs/files/4.1.3-cmake-config.patch
new file mode 100644
index 000000000000..af6d7f6f053a
--- /dev/null
+++ b/kde-base/kdelibs/files/4.1.3-cmake-config.patch
@@ -0,0 +1,45 @@
+--- cmake/modules/FindKDE4Internal.cmake.old	2008-11-06 00:48:03.000000000 +0100
++++ cmake/modules/FindKDE4Internal.cmake	2008-11-06 00:49:11.000000000 +0100
+@@ -953,19 +953,16 @@
+ 
+ 
+ if (CMAKE_COMPILER_IS_GNUCXX)
+-   if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 2.5)
+-      set (CMAKE_CONFIGURATION_TYPES ${CMAKE_CONFIGURATION_TYPES} "Debugfull")
+-   endif("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 2.5)
+ 
+    set (KDE4_ENABLE_EXCEPTIONS -fexceptions)
+    # Select flags.
+    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")
+-   set(CMAKE_CXX_FLAGS_RELEASE        "-O2 -DNDEBUG -DQT_NO_DEBUG")
++   set(CMAKE_CXX_FLAGS_RELEASE        "-DNDEBUG -DQT_NO_DEBUG")
+    set(CMAKE_CXX_FLAGS_DEBUG          "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline")
+    set(CMAKE_CXX_FLAGS_DEBUGFULL      "-g3 -fno-inline")
+    set(CMAKE_CXX_FLAGS_PROFILE        "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
+    set(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g")
+-   set(CMAKE_C_FLAGS_RELEASE          "-O2 -DNDEBUG -DQT_NO_DEBUG")
++   set(CMAKE_C_FLAGS_RELEASE          "-DNDEBUG -DQT_NO_DEBUG")
+    set(CMAKE_C_FLAGS_DEBUG            "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline")
+    set(CMAKE_C_FLAGS_DEBUGFULL        "-g3 -fno-inline")
+    set(CMAKE_C_FLAGS_PROFILE          "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
+@@ -1064,18 +1061,14 @@
+ 
+ if (CMAKE_C_COMPILER MATCHES "icc")
+ 
+-   if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 2.5)
+-      set (CMAKE_CONFIGURATION_TYPES ${CMAKE_CONFIGURATION_TYPES} "Debugfull")
+-   endif("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 2.5)
+-
+    set (KDE4_ENABLE_EXCEPTIONS -fexceptions)
+    # Select flags.
+    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")
+-   set(CMAKE_CXX_FLAGS_RELEASE        "-O2 -DNDEBUG -DQT_NO_DEBUG")
++   set(CMAKE_CXX_FLAGS_RELEASE        "-DNDEBUG -DQT_NO_DEBUG")
+    set(CMAKE_CXX_FLAGS_DEBUG          "-O2 -g -fno-inline -noalign")
+    set(CMAKE_CXX_FLAGS_DEBUGFULL      "-g -fno-inline -noalign")
+    set(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g")
+-   set(CMAKE_C_FLAGS_RELEASE          "-O2 -DNDEBUG -DQT_NO_DEBUG")
++   set(CMAKE_C_FLAGS_RELEASE          "-DNDEBUG -DQT_NO_DEBUG")
+    set(CMAKE_C_FLAGS_DEBUG            "-O2 -g -fno-inline -noalign")
+    set(CMAKE_C_FLAGS_DEBUGFULL        "-g -fno-inline -noalign")
+ 
diff --git a/kde-base/kdelibs/kdelibs-4.1.3.ebuild b/kde-base/kdelibs/kdelibs-4.1.3.ebuild
new file mode 100644
index 000000000000..e65d316e9602
--- /dev/null
+++ b/kde-base/kdelibs/kdelibs-4.1.3.ebuild
@@ -0,0 +1,199 @@
+# 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-4.1.3.ebuild,v 1.1 2008/11/09 02:16:44 scarabeus Exp $
+
+EAPI="2"
+
+CPPUNIT_REQUIRED="optional"
+OPENGL_REQUIRED="optional"
+inherit kde4-base
+
+DESCRIPTION="KDE libraries needed by all KDE programs."
+HOMEPAGE="http://www.kde.org/"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="3dnow acl alsa altivec bindist +bzip2 debug doc fam htmlhandbook jpeg2k
+kerberos mmx nls openexr +semantic-desktop spell sse sse2 ssl zeroconf"
+LICENSE="LGPL-2.1"
+RESTRICT="test"
+
+COMMONDEPEND="
+	!<kde-base/kdebase-3.5.7-r6
+	!<kde-base/kdebase-startkde-3.5.7-r1
+	!=kde-base/kdebase-3.5.8
+	!=kde-base/kdebase-3.5.8-r1
+	!=kde-base/kdebase-3.5.8-r2
+	!=kde-base/kdebase-startkde-3.5.8
+	!kdeprefix? ( !<=kde-misc/kdnssd-avahi-0.1.2:0 )
+	>=app-misc/strigi-0.5.9
+	>=dev-libs/libxml2-2.6.6
+	>=dev-libs/libxslt-1.1.17
+	media-libs/fontconfig
+	>=media-libs/freetype-2
+	media-libs/giflib
+	media-libs/jpeg
+	media-libs/libpng
+	>=media-sound/phonon-4.2.0
+	>=sys-apps/dbus-0.91[X]
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXcursor
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXft
+	x11-libs/libXpm
+	x11-libs/libXrender
+	x11-libs/libXtst
+	>=x11-misc/shared-mime-info-0.20
+	acl? ( kernel_linux? ( sys-apps/acl ) )
+	alsa? ( >=media-libs/alsa-lib-1.0.14a[midi] )
+	fam? ( virtual/fam )
+	jpeg2k? ( media-libs/jasper )
+	kerberos? ( virtual/krb5 )
+	nls? ( virtual/libintl )
+	openexr? ( >=media-libs/openexr-1.2.2-r2 media-libs/ilmbase )
+	opengl? ( virtual/opengl )
+	>=dev-libs/libpcre-4.5
+	semantic-desktop? ( >=dev-libs/soprano-2.1 )
+	spell? ( app-text/aspell app-dicts/aspell-en app-text/enchant )
+	ssl? ( >=dev-libs/openssl-0.9.7d )
+	zeroconf? ( || ( net-dns/avahi[mdnsresponder-compat]
+		!bindist? ( net-misc/mDNSResponder ) ) )
+"
+
+DEPEND="${COMMONDEPEND}
+	doc? ( app-doc/doxygen )
+	sys-devel/gettext
+"
+
+RDEPEND="${COMMONDEPEND}
+	x11-apps/rgb
+	x11-apps/iceauth
+"
+
+PATCHES=( "${FILESDIR}/${PN}-4.1.1-cmake-modules.patch" "${FILESDIR}/${PV}-cmake-config.patch" )
+
+src_configure() {
+	if use zeroconf; then
+		if has_version net-dns/avahi; then
+			mycmakeargs="${mycmakeargs} -DWITH_Avahi=ON -DWITH_DNSSD=OFF"
+		elif has_version net-misc/mDNSResponder; then
+			mycmakeargs="${mycmakeargs} -DWITH_Avahi=OFF -DWITH_DNSSD=ON"
+		else
+			die "USE=\"zeroconf\" enabled but neither net-dns/avahi nor net-misc/mDNSResponder were found."
+		fi
+	fi
+	if use kdeprefix; then
+		HME=".kde${SLOT}"
+	else
+		HME=".kde4"
+	fi
+	mycmakeargs="${mycmakeargs}
+		-DWITH_HSPELL=OFF
+		-DKDE_DEFAULT_HOME=${HME}
+		$(cmake-utils_has 3dnow X86_3DNOW)
+		$(cmake-utils_has altivec PPC_ALTIVEC)
+		$(cmake-utils_has mmx X86_MMX)
+		$(cmake-utils_has sse X86_SSE)
+		$(cmake-utils_has sse2 X86_SSE2)
+		$(cmake-utils_use_with acl ACL)
+		$(cmake-utils_use_with alsa Alsa)
+		$(cmake-utils_use_with bzip2 BZip2)
+		$(cmake-utils_use_with fam FAM)
+		$(cmake-utils_use_with jpeg2k Jasper)
+		$(cmake-utils_use_with kerberos GSSAPI)
+		$(cmake-utils_use_with nls Libintl)
+		$(cmake-utils_use_with openexr OpenEXR)
+		$(cmake-utils_use_with opengl OpenGL)
+		$(cmake-utils_use_with semantic-desktop Soprano)
+		$(cmake-utils_use_with spell ASPELL)
+		$(cmake-utils_use_with spell ENCHANT)
+		$(cmake-utils_use_with ssl OpenSSL)
+	"
+	kde4-base_src_configure
+}
+
+src_compile() {
+	kde4-base_src_compile
+
+	# The building of apidox is not managed anymore by the build system
+	if use doc; then
+		einfo "Building API documentation"
+		cd "${S}"/doc/api/
+		./doxygen.sh "${S}" || die "APIDOX generation failed"
+	fi
+}
+
+src_install() {
+	kde4-base_src_install
+
+	if use doc; then
+		einfo "Installing API documentation. This could take a bit of time."
+		cd "${S}"/doc/api/
+		docinto /HTML/en/kdelibs-apidox
+		dohtml -r ${P}-apidocs/* || die "Install phase of KDE4 API Documentation failed"
+	fi
+
+	dodir /etc/env.d
+	dodir /etc/revdep-rebuild
+
+	# List all the multilib libdirs
+	local _libdir _libdirs
+	for _libdir in $(get_all_libdirs); do
+		_libdirs="${_libdirs}:${PREFIX}/${_libdir}"
+	done
+	_libdirs=${_libdirs#:}
+
+	if use kdeprefix; then
+		cat <<-EOF > "${T}"/43kdepaths-${SLOT} # number goes down with version
+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
+XDG_DATA_DIRS="/usr/share:${PREFIX}/share:/usr/local/share"
+COLON_SEPARATED="XDG_DATA_DIRS"
+EOF
+		doenvd "${T}"/43kdepaths-${SLOT}
+
+		# make sure 'source /etc/profile' doesn't hose the PATH
+		dodir /etc/profile.d
+		cat <<-'EOF' > "${D}"/etc/profile.d/44kdereorderpaths-${SLOT}.sh
+if [ -n "${KDEDIR}" ]; then
+	export PATH=${KDEDIR}/bin:$(echo ${PATH} | sed "s#${KDEDIR}/s\?bin:##g")
+	export ROOTPATH=${KDEDIR}/sbin:${KDEDIR}/bin:$(echo ${PATH} | sed "s#${KDEDIR}/s\?bin:##g")
+fi
+EOF
+
+		cat <<-EOF > "${D}/etc/revdep-rebuild/50-kde-${SLOT}"
+SEARCH_DIRS="${PREFIX}/bin ${PREFIX}/lib*"
+EOF
+	else # Much simpler for the FHS compliant -kdeprefix install
+		cat <<-EOF > "${T}"/43kdepaths # number goes down with version
+CONFIG_PROTECT="/usr/share/config"
+#KDE_IS_PRELINKED=1
+XDG_DATA_DIRS="/usr/share:/usr/local/share"
+COLON_SEPARATED="XDG_DATA_DIRS"
+		EOF
+		doenvd "${T}"/43kdepaths
+	fi
+	# Ensure that the correct permissions are set on ${PREFIX}/share/config
+	chmod 755 "${D}"/"${PREFIX}"/share/config
+}
+
+pkg_postinst() {
+	if use zeroconf; then
+		echo
+		elog "To make zeroconf support available in KDE make sure that the 'mdnsd' daemon"
+		elog "is running. Make sure also that multicast dns lookups are enabled by editing"
+		elog "the 'hosts:' line in /etc/nsswitch.conf to include 'mdns', e.g.:"
+		elog "	hosts: files mdns dns"
+		echo
+	fi
+
+	kde4-base_pkg_postinst
+}