diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-07-11 19:38:22 +0000 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-07-11 19:38:22 +0000 |
| commit | 9d44a079b876e00e71a26af1612dd241043c0545 (patch) | |
| tree | 810a30c3b8f21f0f33484c2669048bf09f555896 /kde-base/kdebase-kioslaves | |
| parent | version bump, depend on ncurses[static-libs?], bug #341733, move ncurses to L... (diff) | |
| download | gentoo-2-9d44a079b876e00e71a26af1612dd241043c0545.tar.gz gentoo-2-9d44a079b876e00e71a26af1612dd241043c0545.tar.bz2 gentoo-2-9d44a079b876e00e71a26af1612dd241043c0545.zip | |
Only build nfs ioslave if rpc/rpc.h exists, bug 371363. Backport from 4.7.
(Portage version: 2.1.10.4/cvs/Linux x86_64)
Diffstat (limited to 'kde-base/kdebase-kioslaves')
4 files changed, 29 insertions, 3 deletions
diff --git a/kde-base/kdebase-kioslaves/ChangeLog b/kde-base/kdebase-kioslaves/ChangeLog index bcea2a3e4147..02f6625f5bab 100644 --- a/kde-base/kdebase-kioslaves/ChangeLog +++ b/kde-base/kdebase-kioslaves/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for kde-base/kdebase-kioslaves # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/ChangeLog,v 1.226 2011/07/09 15:13:56 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/ChangeLog,v 1.227 2011/07/11 19:38:22 dilfridge Exp $ + + 11 Jul 2011; Andreas K. Huettel <dilfridge@gentoo.org> + kdebase-kioslaves-4.6.4.ebuild, +files/kdebase-kioslaves-4.6.4-nfs.patch, + kdebase-kioslaves-4.6.5.ebuild: + Only build nfs ioslave if rpc/rpc.h exists, bug 371363. Backport from 4.7. *kdebase-kioslaves-4.6.5 (09 Jul 2011) diff --git a/kde-base/kdebase-kioslaves/files/kdebase-kioslaves-4.6.4-nfs.patch b/kde-base/kdebase-kioslaves/files/kdebase-kioslaves-4.6.4-nfs.patch new file mode 100644 index 000000000000..2ffa81529cb8 --- /dev/null +++ b/kde-base/kdebase-kioslaves/files/kdebase-kioslaves-4.6.4-nfs.patch @@ -0,0 +1,17 @@ +diff --git a/kioslave/CMakeLists.txt b/kioslave/CMakeLists.txt +index 379ea2d..f3d5b00 100644 +--- a/kioslave/CMakeLists.txt ++++ b/kioslave/CMakeLists.txt +@@ -43,7 +43,11 @@ if(NOT WIN32) + add_subdirectory( floppy ) + add_subdirectory( finger ) + add_subdirectory( man ) +- add_subdirectory( nfs ) ++ check_include_files(rpc/rpc.h HAVE_RPC_RPC_H) ++ macro_log_feature(HAVE_RPC_RPC_H "rpc library" "library routines for remote procedure calls" "" FALSE "" "Needed to build the NFS kioslave") ++ if(HAVE_RPC_RPC_H) ++ add_subdirectory( nfs ) ++ endif(HAVE_RPC_RPC_H) + endif(NOT WIN32) + + if(SAMBA_FOUND OR WIN32 AND NOT WINCE) diff --git a/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.6.4.ebuild b/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.6.4.ebuild index 8b43181c62ac..2e4bb8e3f950 100644 --- a/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.6.4.ebuild +++ b/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.6.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.6.4.ebuild,v 1.1 2011/06/10 17:59:44 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.6.4.ebuild,v 1.2 2011/07/11 19:38:22 dilfridge Exp $ EAPI=4 @@ -37,6 +37,8 @@ KMEXTRA=" kdeeject " +PATCHES=( "${FILESDIR}/${PN}-4.6.4-nfs.patch" ) + src_configure() { mycmakeargs=( -DWITH_SLP=OFF diff --git a/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.6.5.ebuild b/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.6.5.ebuild index baa4c62f87a4..d322378a09ae 100644 --- a/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.6.5.ebuild +++ b/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.6.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.6.5.ebuild,v 1.1 2011/07/09 15:13:56 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.6.5.ebuild,v 1.2 2011/07/11 19:38:22 dilfridge Exp $ EAPI=4 @@ -37,6 +37,8 @@ KMEXTRA=" kdeeject " +PATCHES=( "${FILESDIR}/${PN}-4.6.4-nfs.patch" ) + src_configure() { mycmakeargs=( -DWITH_SLP=OFF |