From ebc5a032331dd707f1f9f3d0eda40c3f2cbf570c Mon Sep 17 00:00:00 2001 From: Maciej Mrozowski Date: Fri, 26 Mar 2010 22:37:55 +0000 Subject: Fixed bug 307659, automagic slp dependency (only system without --as-needed affected) (Portage version: 2.2_rc67/cvs/Linux x86_64) --- kde-base/kdebase-kioslaves/ChangeLog | 9 +++- .../kdebase-kioslaves-4.4.1-r1.ebuild | 63 ++++++++++++++++++++++ .../kdebase-kioslaves-4.4.1.ebuild | 62 --------------------- 3 files changed, 71 insertions(+), 63 deletions(-) create mode 100644 kde-base/kdebase-kioslaves/kdebase-kioslaves-4.4.1-r1.ebuild delete mode 100644 kde-base/kdebase-kioslaves/kdebase-kioslaves-4.4.1.ebuild (limited to 'kde-base') diff --git a/kde-base/kdebase-kioslaves/ChangeLog b/kde-base/kdebase-kioslaves/ChangeLog index ce5c85e288d2..d1a0cb0af5e1 100644 --- a/kde-base/kdebase-kioslaves/ChangeLog +++ b/kde-base/kdebase-kioslaves/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for kde-base/kdebase-kioslaves # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/ChangeLog,v 1.189 2010/03/11 18:34:06 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/ChangeLog,v 1.190 2010/03/26 22:37:55 reavertm Exp $ + +*kdebase-kioslaves-4.4.1-r1 (26 Mar 2010) + + 26 Mar 2010; Maciej Mrozowski + -kdebase-kioslaves-4.4.1.ebuild, +kdebase-kioslaves-4.4.1-r1.ebuild: + Fixed bug 307659, automagic slp dependency (only system without + --as-needed affected) 11 Mar 2010; Brent Baude kdebase-kioslaves-4.3.5-r1.ebuild: diff --git a/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.4.1-r1.ebuild b/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.4.1-r1.ebuild new file mode 100644 index 000000000000..9e4435264fe1 --- /dev/null +++ b/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.4.1-r1.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2010 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.4.1-r1.ebuild,v 1.1 2010/03/26 22:37:55 reavertm Exp $ + +EAPI="3" + +KMNAME="kdebase-runtime" +KMMODULE="kioslave" +inherit kde4-meta + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +DESCRIPTION="kioslave: the kde VFS framework - kioslave plugins present a filesystem-like view of arbitrary data" +IUSE="+bzip2 exif debug lzma +handbook openexr samba +sftp" + +# tests hang, last checked for 4.2.96 +RESTRICT="test" + +DEPEND=" + !aqua? ( x11-libs/libXcursor ) + bzip2? ( app-arch/bzip2 ) + exif? ( media-gfx/exiv2 ) + lzma? ( app-arch/xz-utils ) + openexr? ( media-libs/openexr ) + samba? ( + || ( + =net-fs/samba-3.0* + >=net-fs/samba-libs-3.4[smbclient] + ) + ) + sftp? ( >=net-libs/libssh-0.4.0[sftp] ) +" +RDEPEND="${DEPEND} + $(add_kdebase_dep kdelibs 'bzip2?,lzma?') + $(add_kdebase_dep kdialog) + virtual/ssh + !aqua? ( !kernel_SunOS? ( virtual/eject ) ) +" + +KMEXTRA=" + kioexec + kdeeject +" + +src_configure() { + mycmakeargs=( + -DWITH_SLP=OFF + $(cmake-utils_use_with bzip2 BZip2) + $(cmake-utils_use_with exif Exiv2) + $(cmake-utils_use_with lzma LibLZMA) + $(cmake-utils_use_with openexr OpenEXR) + $(cmake-utils_use_with samba) + $(cmake-utils_use_with sftp LibSSH) + ) + kde4-meta_src_configure +} + +pkg_postinst() { + echo + elog "Note that if you upgrade strigi, you have to rebuild this package." + echo + + kde4-meta_pkg_postinst +} diff --git a/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.4.1.ebuild b/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.4.1.ebuild deleted file mode 100644 index 9caa4af93036..000000000000 --- a/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.4.1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2010 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.4.1.ebuild,v 1.1 2010/03/02 16:15:29 tampakrap Exp $ - -EAPI="3" - -KMNAME="kdebase-runtime" -KMMODULE="kioslave" -inherit kde4-meta - -DESCRIPTION="kioslave: the kde VFS framework - kioslave plugins present a filesystem-like view of arbitrary data" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="+bzip2 exif debug lzma +handbook openexr samba +sftp" - -# tests hang, last checked for 4.2.96 -RESTRICT="test" - -DEPEND=" - !aqua? ( x11-libs/libXcursor ) - bzip2? ( app-arch/bzip2 ) - exif? ( media-gfx/exiv2 ) - lzma? ( app-arch/xz-utils ) - openexr? ( media-libs/openexr ) - samba? ( - || ( - =net-fs/samba-3.0* - >=net-fs/samba-libs-3.4[smbclient] - ) - ) - sftp? ( >=net-libs/libssh-0.4.0[sftp] ) -" -RDEPEND="${DEPEND} - $(add_kdebase_dep kdelibs 'bzip2?,lzma?') - $(add_kdebase_dep kdialog) - virtual/ssh - !aqua? ( !kernel_SunOS? ( virtual/eject ) ) -" - -KMEXTRA=" - kioexec - kdeeject -" - -src_configure() { - mycmakeargs=( - $(cmake-utils_use_with bzip2 BZip2) - $(cmake-utils_use_with exif Exiv2) - $(cmake-utils_use_with lzma LibLZMA) - $(cmake-utils_use_with openexr OpenEXR) - $(cmake-utils_use_with samba) - $(cmake-utils_use_with sftp LibSSH) - ) - kde4-meta_src_configure -} - -pkg_postinst() { - echo - elog "Note that if you upgrade strigi, you have to rebuild this package." - echo - - kde4-meta_pkg_postinst -} -- cgit v1.2.3-65-gdbad