Some external applications need FindXine.cmake. Therefore upstream moved it to kdelibs in trunk. Doing the same for :kde-4 (bug #209701).

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

4 files changed, 286 insertions, 5 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index bd78ad607e68..efd65560dbf4 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,13 @@
 # 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.508 2008/02/07 00:12:40 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.509 2008/02/15 23:49:33 zlin Exp $
+
+*kdelibs-4.0.1-r1 (15 Feb 2008)
+
+  15 Feb 2008; Bo Ørsted Andresen <zlin@gentoo.org> +files/FindXine.cmake,
+  +kdelibs-4.0.1-r1.ebuild:
+  Some external applications need FindXine.cmake. Therefore upstream moved it
+  to kdelibs in trunk. Doing the same for :kde-4 (bug #209701).
 
 *kdelibs-4.0.1 (06 Feb 2008)
 
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index e29cc614da4f..420056c38dbb 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA1
 
 AUX CVE-2007-1564-kdelibs-3.5.6.diff 2835 RMD160 894a9c5f51da21022b9448da957893a57384c065 SHA1 a296f0dff11007f835bdbca23b259ad8483aa4c9 SHA256 2def5a86817220df9c701d9ad22059c9ef884273a44fee3e12d7b269d8b8e52c
+AUX FindXine.cmake 2627 RMD160 e680a4c0998dd0354e429c9e755a00e0ab83c6c0 SHA1 e638a8cf1ab6889c5734cd54879dad808a549d92 SHA256 73c7030144d889d1065fc4bdaf9c640cb04ce40a9a15b8fafeeefbdf1c35e798
 AUX e-tempdir.patch 1413 RMD160 f0a369f929c18770d66a54b605dad8c99d03367c SHA1 779714956d94366a3b05514df19e21b4b3434f5c SHA256 1a7e888cd5173b68039717030119e3ab479675fed8f9df4b5e1d98869d89235a
 AUX kdelibs-3.5.5-CVE-2007-0537.patch 1232 RMD160 a15192ccbbb27c323de2188b2a5a945c253b53ac SHA1 4c7f05af310bda28f97117e72b08ebb18a36252b SHA256 f83289c67c66de5d6afe78d1149d2f28514d0ce26841c36a67efdd1d2f7f451d
 AUX kdelibs-3.5.5-kate-cstyle-indenter-fix.diff 1544 RMD160 cb5fea95022dd92b448a8bf2b8e7ea49e9f3225d SHA1 5689ec3ca0c562663bc64b4458dcd1eafade8a38 SHA256 b4364d77149ef699b7724c1102a08a0240df5e19c2b0b1202459b8f97cf8268b
@@ -53,13 +54,14 @@ EBUILD kdelibs-3.5.8-r3.ebuild 6052 RMD160 cdd77b3ae267290423d98fa6e6affb2d9e14d
 EBUILD kdelibs-3.5.8.ebuild 5971 RMD160 550508c36f061d6826f0e5c2ab2891c83a56e8fc SHA1 ce4c0049ab32e4bfc17ea9939c067f3c060aa3f2 SHA256 3202468c475c995413d4ce172effa49cc49b5e822b16536f2adbe77919fc65c7
 EBUILD kdelibs-4.0.0-r1.ebuild 5914 RMD160 54b86eb23bbc0d0eba5b2d3ab7278916bc2d229b SHA1 ae7caadf47898cbf40560dc9d058f9011fb3f8f5 SHA256 5e86d8fece80ef0d720dc2cd9720da6be4b19ecac59caf278164732718d885b4
 EBUILD kdelibs-4.0.0.ebuild 5879 RMD160 a43827cc1699ca0d43095485752722bc55d28f3d SHA1 87fb1dad83dcf493d74ee8de6c32bed1052400d6 SHA256 9235cd2a84e9292ad30d773cd80b7d95b41350521cff0463bd2e64a2ce68ec06
+EBUILD kdelibs-4.0.1-r1.ebuild 6089 RMD160 8ca142125e560192f62f96b2fe270dd8f6308b66 SHA1 bc940d6df17c4844d6307d1b3814ca8e726c6bf1 SHA256 db51acc85988791d234272e0bec338966ab3173cd9a93fc2ed5609a4d57d185a
 EBUILD kdelibs-4.0.1.ebuild 5831 RMD160 a3e1d75b9c1b356a49cf303a01ec12347e37ff29 SHA1 b8b95876317982f0e5d4d4ea0d54fb2be20d85a6 SHA256 75abd8d4035f42150e98818f9c8aa0671e7947fa19060d146aad37ab9826c14c
-MISC ChangeLog 82393 RMD160 bd1c029531f2f1d02928dd2b396bae7ab0617ff3 SHA1 01322b0165b6aa7789384ae3dcf7579b907fce8e SHA256 1bcf247bcabe6377f09cc082d40eb3cd46dae279ddd2883ef52d5c150bbd84c5
+MISC ChangeLog 82667 RMD160 cc5649de850299cc602a43dbd5e45c1599aeb1da SHA1 b451badeb1acd34334d322cf8f12bb73895632af SHA256 f58a3a6d284d6f6573d789b1d0cd8ae36a139d8381eda2db4db5263562e96528
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHqk7VCkvF58q80IkRAskuAKCYXsjUIbJZq7aOBvlyO/LDMtiT/wCfUTmT
-TdgReezGpvEl1aip0jQvmJw=
-=rhVc
+iD8DBQFHtiTnfxJ68Jl1NeERAue6AJ471XpZumrbKxT0H8mrPZ+xm+n+hQCgwjL9
+kS7301Gb8I5GslDCPyyVzSE=
+=P08j
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdelibs/files/FindXine.cmake b/kde-base/kdelibs/files/FindXine.cmake
new file mode 100644
index 000000000000..65777ed8a201
--- /dev/null
+++ b/kde-base/kdelibs/files/FindXine.cmake
@@ -0,0 +1,69 @@
+# - Try to find the XINE  library
+# Once done this will define
+#
+#  XINE_FOUND - system has the XINE library
+#  XINE_VERSION - XINE version
+#  XINE_BUGFIX_VERSION - the XINE bugfix version
+#  XINE_INCLUDE_DIR - the XINE include directory
+#  XINE_LIBRARY - The libraries needed to use XINE
+#  XINE_XCB_FOUND - libxine can use XCB for video output
+
+# Copyright (c) 2006,2007 Laurent Montel, <montel@kde.org>
+# Copyright (c) 2006, Matthias Kretz, <kretz@kde.org>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+if (XINE_INCLUDE_DIR AND XINE_LIBRARY)
+  # Already in cache, be silent
+  set(Xine_FIND_QUIETLY TRUE)
+endif (XINE_INCLUDE_DIR AND XINE_LIBRARY)
+  IF (NOT WIN32)
+	INCLUDE(UsePkgConfig)
+	PKGCONFIG(libxine _LibXineIncDir _LibXineLinkDir _LibXineLinkFlags _LibXineCflags)
+	EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS "--variable=prefix libxine" OUTPUT_VARIABLE _LibXinePrefix)
+  ENDIF (NOT WIN32)
+FIND_PATH(XINE_INCLUDE_DIR NAMES xine.h 
+    PATHS 
+    ${_LibXineIncDir} 
+    NO_DEFAULT_PATH)
+
+FIND_LIBRARY(XINE_LIBRARY NAMES xine
+ PATHS
+  ${_LibXineLinkDir}
+ NO_DEFAULT_PATH
+)
+
+FIND_PROGRAM(XINECONFIG_EXECUTABLE NAMES xine-config PATHS
+   ${_LibXinePrefix}/bin
+)
+
+if (XINE_INCLUDE_DIR AND XINE_LIBRARY AND XINECONFIG_EXECUTABLE)
+   EXEC_PROGRAM(${XINECONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE XINE_VERSION)
+   macro_ensure_version(1.1.1 ${XINE_VERSION} XINE_VERSION_OK)
+   if (XINE_VERSION_OK)
+      set(XINE_FOUND TRUE)
+      string(REGEX REPLACE "[0-9].[0-9]." "" XINE_BUGFIX_VERSION ${XINE_VERSION})
+   endif (XINE_VERSION_OK)
+endif (XINE_INCLUDE_DIR AND XINE_LIBRARY AND XINECONFIG_EXECUTABLE)
+
+INCLUDE(CheckCSourceCompiles)
+SET(CMAKE_REQUIRED_INCLUDES ${XINE_INCLUDE_DIR})
+SET(CMAKE_REQUIRED_LIBRARIES ${XINE_LIBRARY})
+CHECK_C_SOURCE_COMPILES("#include <xine.h>\nint main()\n{\n  xine_open_video_driver(xine_new(), \"auto\", XINE_VISUAL_TYPE_XCB, NULL);\n  return 0;\n}\n" XINE_XCB_FOUND)
+
+if (XINE_FOUND)
+   if (NOT Xine_FIND_QUIETLY)
+      message(STATUS "Found XINE: ${XINE_LIBRARY}")
+   endif (NOT Xine_FIND_QUIETLY)
+   #   if(XINECONFIG_EXECUTABLE)
+   #      EXEC_PROGRAM(${XINECONFIG_EXECUTABLE} ARGS --plugindir RETURN_VALUE _return_VALUE OUTPUT_VARIABLE XINEPLUGINSDIR)
+   #      MESSAGE(STATUS "XINEPLUGINSDIR :<${XINEPLUGINSDIR}>")
+   #   endif(XINECONFIG_EXECUTABLE)
+else (XINE_FOUND)
+   if (Xine_FIND_REQUIRED)
+      message(FATAL_ERROR "Could NOT find XINE 1.1.1 or greater")
+   endif (Xine_FIND_REQUIRED)
+endif (XINE_FOUND)
+
+MARK_AS_ADVANCED(XINE_INCLUDE_DIR XINE_LIBRARY)
diff --git a/kde-base/kdelibs/kdelibs-4.0.1-r1.ebuild b/kde-base/kdelibs/kdelibs-4.0.1-r1.ebuild
new file mode 100644
index 000000000000..7727e4fdd66c
--- /dev/null
+++ b/kde-base/kdelibs/kdelibs-4.0.1-r1.ebuild
@@ -0,0 +1,203 @@
+# 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.1-r1.ebuild,v 1.1 2008/02/15 23:49:33 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 +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.20
+	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 )
+	>=dev-libs/libpcre-4.5
+	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"
+# 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 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
+
+	# Some external applications need FindXine.cmake. Therefore upstream moved it
+	# to kdelibs in trunk. Doing the same for :kde-4. See bug #209701.
+	insinto ${KDEDIR}/share/apps/cmake/modules/
+	doins "${FILESDIR}"/FindXine.cmake || die "doins FindXine failed."
+
+	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
+}