Patch FindFlac.cmake. This is needed for kdemultimedia-kioslaves when built with USE="encode flac" and using flac > 1.1.2 (which is all there is in the tree).

Package-Manager: portage-2.1.4
RepoMan-Options: --force

5 files changed, 273 insertions, 5 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 8441c9c608ad..7b64e7b73661 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,14 @@
 # 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.499 2008/01/18 22:11:23 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.500 2008/01/28 00:34:34 zlin Exp $
+
+*kdelibs-4.0.0-r1 (27 Jan 2008)
+
+  27 Jan 2008; Bo Ørsted Andresen <zlin@gentoo.org>
+  +files/kdelibs-4.0.0-flac-1.1.3.patch, +kdelibs-4.0.0-r1.ebuild:
+  Patch FindFlac.cmake. This is needed for kdemultimedia-kioslaves when built
+  with USE="encode flac" and using flac > 1.1.2 (which is all there is in the
+  tree).
 
   18 Jan 2008; Ingmar Vanhassel <ingmar@gentoo.org> kdelibs-4.0.0.ebuild:
   Revert my previous commit.
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 65732eeb87de..9a17d74bc8f6 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX CVE-2007-1564-kdelibs-3.5.6.diff 2835 RMD160 894a9c5f51da21022b9448da957893a57384c065 SHA1 a296f0dff11007f835bdbca23b259ad8483aa4c9 SHA256 2def5a86817220df9c701d9ad22059c9ef884273a44fee3e12d7b269d8b8e52c
 MD5 62872147c2d369feb3d9077e9b32b03d files/CVE-2007-1564-kdelibs-3.5.6.diff 2835
 RMD160 894a9c5f51da21022b9448da957893a57384c065 files/CVE-2007-1564-kdelibs-3.5.6.diff 2835
@@ -62,6 +65,10 @@ AUX kdelibs-4.0.0-alsa-optional.patch 1742 RMD160 ea660d1148488fdac27970587535ec
 MD5 debf591075a3c6fe8fdbdeb29a772ac6 files/kdelibs-4.0.0-alsa-optional.patch 1742
 RMD160 ea660d1148488fdac27970587535ec29acd3878f files/kdelibs-4.0.0-alsa-optional.patch 1742
 SHA256 b9107dd43916c015a9392ada81bdfebeff91d2c136eeaa01fb1c89ddd89fd914 files/kdelibs-4.0.0-alsa-optional.patch 1742
+AUX kdelibs-4.0.0-flac-1.1.3.patch 1465 RMD160 45c12cbce55bca381929611396449cd7882b5117 SHA1 ffdca39f3eb7932ccaf2263ee2f8ba7a2f15bedc SHA256 b6d5ed0fe25a0d12bd250ec85400982d0f881f5daba0b5a7677dfeaa01137b38
+MD5 084af0fff75c045545c680ba613f9507 files/kdelibs-4.0.0-flac-1.1.3.patch 1465
+RMD160 45c12cbce55bca381929611396449cd7882b5117 files/kdelibs-4.0.0-flac-1.1.3.patch 1465
+SHA256 b6d5ed0fe25a0d12bd250ec85400982d0f881f5daba0b5a7677dfeaa01137b38 files/kdelibs-4.0.0-flac-1.1.3.patch 1465
 AUX konqueror-3.5.7-185603-spoofing.diff 1099 RMD160 4c870aa06611163ebcd57a1a0857f9decbbe5620 SHA1 de60f5f62aceb5faf522e22c5fa160bf08e80fe3 SHA256 bc74315716148b4b088de127ff3586680698ced775c3fe5792597f09e8f732d6
 MD5 4c0fb2576875ded606f276421fc49752 files/konqueror-3.5.7-185603-spoofing.diff 1099
 RMD160 4c870aa06611163ebcd57a1a0857f9decbbe5620 files/konqueror-3.5.7-185603-spoofing.diff 1099
@@ -134,14 +141,18 @@ EBUILD kdelibs-3.5.8.ebuild 5971 RMD160 550508c36f061d6826f0e5c2ab2891c83a56e8fc
 MD5 832f29cc7666ce4dd82b229e40a9a4bb kdelibs-3.5.8.ebuild 5971
 RMD160 550508c36f061d6826f0e5c2ab2891c83a56e8fc kdelibs-3.5.8.ebuild 5971
 SHA256 3202468c475c995413d4ce172effa49cc49b5e822b16536f2adbe77919fc65c7 kdelibs-3.5.8.ebuild 5971
+EBUILD kdelibs-4.0.0-r1.ebuild 5914 RMD160 54b86eb23bbc0d0eba5b2d3ab7278916bc2d229b SHA1 ae7caadf47898cbf40560dc9d058f9011fb3f8f5 SHA256 5e86d8fece80ef0d720dc2cd9720da6be4b19ecac59caf278164732718d885b4
+MD5 1e546afdec6ec637ea32652d6f32ed56 kdelibs-4.0.0-r1.ebuild 5914
+RMD160 54b86eb23bbc0d0eba5b2d3ab7278916bc2d229b kdelibs-4.0.0-r1.ebuild 5914
+SHA256 5e86d8fece80ef0d720dc2cd9720da6be4b19ecac59caf278164732718d885b4 kdelibs-4.0.0-r1.ebuild 5914
 EBUILD kdelibs-4.0.0.ebuild 5879 RMD160 a43827cc1699ca0d43095485752722bc55d28f3d SHA1 87fb1dad83dcf493d74ee8de6c32bed1052400d6 SHA256 9235cd2a84e9292ad30d773cd80b7d95b41350521cff0463bd2e64a2ce68ec06
 MD5 5399f9c848d7ecf6deadd01a0dda90d3 kdelibs-4.0.0.ebuild 5879
 RMD160 a43827cc1699ca0d43095485752722bc55d28f3d kdelibs-4.0.0.ebuild 5879
 SHA256 9235cd2a84e9292ad30d773cd80b7d95b41350521cff0463bd2e64a2ce68ec06 kdelibs-4.0.0.ebuild 5879
-MISC ChangeLog 81015 RMD160 bee145e64e4a2423e6d70ff0b092018ccac15037 SHA1 707d084066466dd0387608c1eee66d4b22890a25 SHA256 a460fbb01bcb9b2305b8882dfab27e413b8ed2cae638e9259b8b12d611159b74
-MD5 9fe260d53701c723757f4ad059dcd09f ChangeLog 81015
-RMD160 bee145e64e4a2423e6d70ff0b092018ccac15037 ChangeLog 81015
-SHA256 a460fbb01bcb9b2305b8882dfab27e413b8ed2cae638e9259b8b12d611159b74 ChangeLog 81015
+MISC ChangeLog 81332 RMD160 0d0b2697b9b0ba6268892c5451448fbbb083ffe9 SHA1 2390b8b16419bef8d313955f0266d2b85a0cac5e SHA256 9c793cd6496c71957b6b74e00cd84a6a64c8b096997cb471ee9f2ffeb4a1b249
+MD5 97fc449a7c19de4f3f730e5d968b9144 ChangeLog 81332
+RMD160 0d0b2697b9b0ba6268892c5451448fbbb083ffe9 ChangeLog 81332
+SHA256 9c793cd6496c71957b6b74e00cd84a6a64c8b096997cb471ee9f2ffeb4a1b249 ChangeLog 81332
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -188,3 +199,13 @@ SHA256 c359ed89542b45786ac6459ded087eea00405a7251207bc43532c1605c9c559a files/di
 MD5 dc4770c051053caca00217dc76c4c67f files/digest-kdelibs-4.0.0 247
 RMD160 464ef5799c047abc3ef01d5bc5cb6fce72021143 files/digest-kdelibs-4.0.0 247
 SHA256 68f961a23faf21f4b0e3cf3971ddde2ee1a9e934bf033a8839c95098864865c1 files/digest-kdelibs-4.0.0 247
+MD5 dc4770c051053caca00217dc76c4c67f files/digest-kdelibs-4.0.0-r1 247
+RMD160 464ef5799c047abc3ef01d5bc5cb6fce72021143 files/digest-kdelibs-4.0.0-r1 247
+SHA256 68f961a23faf21f4b0e3cf3971ddde2ee1a9e934bf033a8839c95098864865c1 files/digest-kdelibs-4.0.0-r1 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHnSMRfxJ68Jl1NeERApe2AKDUpwYuGe8zPH1nYB2dHf58fKakOQCdFxFD
+m4r8Joo9pq8wT1fnKbEtOqs=
+=FPSO
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdelibs/files/digest-kdelibs-4.0.0-r1 b/kde-base/kdelibs/files/digest-kdelibs-4.0.0-r1
new file mode 100644
index 000000000000..8813a25e297c
--- /dev/null
+++ b/kde-base/kdelibs/files/digest-kdelibs-4.0.0-r1
@@ -0,0 +1,3 @@
+MD5 79d0f83ca81fc4a135663943340c0b8f kdelibs-4.0.0.tar.bz2 9047472
+RMD160 9261a9138069d2ad85a47d9b86ba528a6fb58f77 kdelibs-4.0.0.tar.bz2 9047472
+SHA256 ea6700bd200725bca504214f5e186487ad62894879e534cf6955d049c6cacc2d kdelibs-4.0.0.tar.bz2 9047472
diff --git a/kde-base/kdelibs/files/kdelibs-4.0.0-flac-1.1.3.patch b/kde-base/kdelibs/files/kdelibs-4.0.0-flac-1.1.3.patch
new file mode 100644
index 000000000000..130f69ba4ba2
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-4.0.0-flac-1.1.3.patch
@@ -0,0 +1,36 @@
+Index: kdelibs/cmake/modules/FindFlac.cmake
+===================================================================
+--- kdelibs/cmake/modules/FindFlac.cmake        (revision 749960)
++++ kdelibs/cmake/modules/FindFlac.cmake        (working copy)
+@@ -5,6 +5,9 @@
+ #  FLAC_INCLUDE_DIR - the Flac include directory
+ #  FLAC_LIBRARIES - Link these to use Flac
+ #  FLAC_OGGFLAC_LIBRARIES - Link these to use OggFlac
++#
++# No version checking is done - use FLAC_API_VERSION_CURRENT to
++# conditionally compile version-dependent code
+ 
+ # Copyright (c) 2006, Laurent Montel, <montel@kde.org>
+ # Copyright (c) 2006, Alexander Neundorf, <neundorf@kde.org>
+@@ -23,18 +26,16 @@ FIND_LIBRARY(FLAC_LIBRARIES NAMES FLAC )
+ 
+ FIND_LIBRARY(FLAC_OGG_LIBRARY NAMES OggFLAC)
+ 
+-check_library_exists(FLAC FLAC__stream_encoder_set_write_callback "" HAVE_STREAM_ENCODER_WRITE_CALLBACK)
+-
+ 
+ 
+-IF(FLAC_INCLUDE_DIR AND FLAC_LIBRARIES AND HAVE_STREAM_ENCODER_WRITE_CALLBACK)
++IF(FLAC_INCLUDE_DIR AND FLAC_LIBRARIES)
+    SET(FLAC_FOUND TRUE)
+    IF (FLAC_OGG_LIBRARY)
+       SET(FLAC_OGGFLAC_LIBRARIES ${FLAC_OGG_LIBRARY} ${FLAC_LIBRARIES})
+    ENDIF (FLAC_OGG_LIBRARY)
+-ELSE(FLAC_INCLUDE_DIR AND FLAC_LIBRARIES AND HAVE_STREAM_ENCODER_WRITE_CALLBACK)
++ELSE(FLAC_INCLUDE_DIR AND FLAC_LIBRARIES)
+    SET(FLAC_FOUND FALSE)
+-ENDIF(FLAC_INCLUDE_DIR AND FLAC_LIBRARIES AND HAVE_STREAM_ENCODER_WRITE_CALLBACK)
++ENDIF(FLAC_INCLUDE_DIR AND FLAC_LIBRARIES)
+ 
+ IF(FLAC_FOUND)
+    IF(NOT Flac_FIND_QUIETLY)
diff --git a/kde-base/kdelibs/kdelibs-4.0.0-r1.ebuild b/kde-base/kdelibs/kdelibs-4.0.0-r1.ebuild
new file mode 100644
index 000000000000..f5555a913a0a
--- /dev/null
+++ b/kde-base/kdelibs/kdelibs-4.0.0-r1.ebuild
@@ -0,0 +1,200 @@
+# 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.0.0-r1.ebuild,v 1.1 2008/01/28 00:34:34 zlin Exp $
+
+EAPI="1"
+
+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 opengl +pcre +semantic-desktop spell sse sse2 ssl test zeroconf"
+LICENSE="GPL-2 LGPL-2"
+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
+	>=app-misc/strigi-0.5.7
+	>=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
+	>=sys-apps/dbus-0.91
+	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.18
+	acl? ( kernel_linux? ( sys-apps/acl ) )
+	alsa? ( >=media-libs/alsa-lib-1.0.14a )
+	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 )
+	pcre? ( >=dev-libs/libpcre-4.2 )
+	semantic-desktop? ( >=dev-libs/soprano-2.0.0 )
+	spell? ( app-text/aspell app-dicts/aspell-en app-text/enchant )
+	ssl? ( >=dev-libs/openssl-0.9.7d )
+	zeroconf? ( || ( net-dns/avahi
+		!bindist? ( net-misc/mDNSResponder ) ) )
+"
+
+DEPEND="${COMMONDEPEND}
+	doc? ( app-doc/doxygen )
+	sys-devel/gettext"
+
+RDEPEND="${COMMONDEPEND}
+	x11-apps/rgb
+	x11-apps/iceauth"
+
+# Patch to respect the sandbox when cmake tries to create symlinks,
+# or executes an external program that tries to write files.
+PATCHES="${FILESDIR}/e-tempdir.patch
+${FILESDIR}/${P}-X11-optional.patch
+${FILESDIR}/${P}-alsa-optional.patch
+${FILESDIR}/${P}-flac-1.1.3.patch"
+# Create CMake switches to make Xcomposite, Xinerama & Xscreensaver optional.
+
+pkg_setup() {
+	KDE4_BUILT_WITH_USE_CHECK="--missing true sys-apps/dbus X"
+	use alsa && KDE4_BUILT_WITH_USE_CHECK="${KDE4_BUILT_WITH_USE_CHECK}
+		--missing true media-libs/alsa-lib midi"
+	if use zeroconf && has_version net-dns/avahi; then
+		KDE4_BUILT_WITH_USE_CHECK="${KDE4_BUILT_WITH_USE_CHECK}
+			net-dns/avahi mdnsresponder-compat"
+	fi
+
+	kde4-base_pkg_setup
+}
+
+src_compile() {
+	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
+
+	mycmakeargs="${mycmakeargs}
+		-DWITH_HSPELL=OFF
+		$(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 pcre PCRE)
+		$(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_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#:}
+
+	cat <<-EOF > "${T}"/44kdepaths-${SLOT} # number goes down with version bump
+	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"
+	KDEDIRS="/usr:/usr/local:${PREFIX}"
+	#KDE_IS_PRELINKED=1
+	XDG_DATA_DIRS="/usr/share:${PREFIX}/share:/usr/local/share"
+	COLON_SEPARATED="XDG_DATA_DIRS"
+	EOF
+	doenvd "${T}"/44kdepaths-${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
+}
+
+src_test() {
+	# FIXME: Disable kate tests
+	mycmakeargs="${mycmakeargs}
+		-DKHTML_BUILD_TESTREGRESSION=ON"
+	kde4-base_src_test
+}
+
+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
+}