kftpgrabber:

- SLOT to 0
- fixed inherit - it NEEDS to be kde4-base (otherwise it would
  break any other kde4-base stuff from extragear/network - like ktorrent)

9 files changed, 46 insertions, 12 deletions

diff --git a/Documentation/package.keywords/kde-3.5.keywords b/Documentation/package.keywords/kde-3.5.keywords
index 6197ea6707b..6edb433324e 100644
--- a/Documentation/package.keywords/kde-3.5.keywords
+++ b/Documentation/package.keywords/kde-3.5.keywords
@@ -1,4 +1,4 @@
-# Alex Alexander (wired) <alex.alexander@gmail.com> (12 Mar 2009)
+# Maciej Mrozowski (reavertm) <reavertm@poczta.fm> (12 Mar 2009)
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # Combined KDE 3.5 package.keywords file.
 kde-base/ksayit:3.5
diff --git a/Documentation/package.keywords/kde-live.keywords b/Documentation/package.keywords/kde-live.keywords
index 1f18fb2eb27..865b37b91c2 100644
--- a/Documentation/package.keywords/kde-live.keywords
+++ b/Documentation/package.keywords/kde-live.keywords
@@ -293,6 +293,7 @@
 ~media-video/kaffeine-9999 **
 ~media-video/kmplayer-9999 **
 ~media-video/kplayer-9999 **
+~net-ftp/kftpgrabber-9999 **
 ~net-im/kmess-9999 **
 ~net-libs/decibel-9999 **
 ~net-libs/telepathy-qt-9999 **
diff --git a/Documentation/package.unmask/kde-live b/Documentation/package.unmask/kde-live
index 728014e8715..a2193b76692 100644
--- a/Documentation/package.unmask/kde-live
+++ b/Documentation/package.unmask/kde-live
@@ -1,4 +1,4 @@
-# Alex Alexander (wired) <alex.alexander@gmail.com> (12 Mar 2009)
+# Maciej Mrozowski (reavertm) <reavertm@poczta.fm> (12 Mar 2009)
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # Live packages are masked by default.
 # Edit Documentation/package.unmask/kde-live.d/ files instead.
@@ -149,7 +149,7 @@ media-tv/kdetv:live
 media-video/kaffeine:live
 media-video/kmplayer:live
 media-video/kplayer:live
-net-ftp/kftpgrabber:live
+=net-ftp/kftpgrabber-9999
 net-im/kmess:live
 net-misc/smb4k:live
 =net-libs/decibel-9999
diff --git a/net-ftp/kftpgrabber/ChangeLog b/net-ftp/kftpgrabber/ChangeLog
index de737caaed8..036e9ce0c8e 100644
--- a/net-ftp/kftpgrabber/ChangeLog
+++ b/net-ftp/kftpgrabber/ChangeLog
@@ -2,9 +2,13 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  12 Mar 2009; Maciej Mrozowski (reavertm) <reavertm@poczta.fm>
+  +files/kftpgrabber-add-LibSSH2.cmake.patch, kftpgrabber-9999.ebuild:
+  SLOT to 0, fixed inherit - it NEEDS to be kde4-base (otherwise it would
+  break any other kde4-base stuff from extragear/network - like ktorrent)
+
 *kftpgrabber-9999 (11 Mar 2009)
 
   11 Mar 2009; Alex Alexander (wired) <alex.alexander@gmail.com>
   +kftpgrabber-9999.ebuild:
   new ebuild for kftpgrabber:live
-
diff --git a/net-ftp/kftpgrabber/Manifest b/net-ftp/kftpgrabber/Manifest
index e993d235b33..9619e982145 100644
--- a/net-ftp/kftpgrabber/Manifest
+++ b/net-ftp/kftpgrabber/Manifest
@@ -1,3 +1,4 @@
-EBUILD kftpgrabber-9999.ebuild 370 RMD160 9ead733f9a54d24cc913eec2ccdd91d88a778c78 SHA1 5efee7998868a369519a2038d51863adc41f81af SHA256 9fae72906d566b01268602562fc579ff4966fb498b168e20ec0888dd4d6d0229
-MISC ChangeLog 281 RMD160 b8914933752ece5e9c2caed77d68fe9c045fcbc9 SHA1 083d73840fe3340daf3713c6011bff3783ec858b SHA256 5d9ed1cdfb880fb005bd6fdbe9cacee2ec9feb8b14911f434daa535aab2fb804
+AUX kftpgrabber-add-LibSSH2.cmake.patch 858 RMD160 a01fe2ff0acd95a4b5d9e5f3a77a58054b186ac3 SHA1 3defcdcae9b855d249a6323c7fa9a25e18412039 SHA256 e8b3a3226e03e15f655bb3e1d0a3923ce942561013dcbfbf613cbae209a29b99
+EBUILD kftpgrabber-9999.ebuild 424 RMD160 778f31e882dda9ba09cee621e70477bffe7f7f45 SHA1 d7aadda4e5e725989c314fecc3a2a394a1ac65d1 SHA256 dc3a851e8cdce9ca29880eb3b72dfb0ea80df239691ec5d84e3b2321581a4462
+MISC ChangeLog 564 RMD160 61c9964282855a32725cc7768e57da5fddc53b52 SHA1 bcbd9ebb197e285dffb53e6fb6b328174907a72c SHA256 627fb4c246e0d7884601cb66083aa8068a0525b9f9763bd6c8c5df82e1d23867
 MISC metadata.xml 158 RMD160 7344d8189b297bc3aaa35226811d79c8dacb9f6f SHA1 4f1871fb2f1f05defed13aa3d8fd3d0e65788b5e SHA256 b1f2af69cc9a002750dfc0abd0f1dc63431290bebbabd4a17169dd3d4dbe89a2
diff --git a/net-ftp/kftpgrabber/files/kftpgrabber-add-LibSSH2.cmake.patch b/net-ftp/kftpgrabber/files/kftpgrabber-add-LibSSH2.cmake.patch
new file mode 100644
index 00000000000..f92378ccf97
--- /dev/null
+++ b/net-ftp/kftpgrabber/files/kftpgrabber-add-LibSSH2.cmake.patch
@@ -0,0 +1,26 @@
+Index: cmake/modules/FindLibSSH2.cmake
+===================================================================
+--- cmake/modules/FindLibSSH2.cmake	(revision 0)
++++ cmake/modules/FindLibSSH2.cmake	(revision 0)
+@@ -0,0 +1,21 @@
++# - Try to find the libssh2 library
++# Once done this will define
++#
++# LIBSSH2_FOUND - system has the libssh2 library
++# LIBSSH2_INCLUDE_DIR - the libssh2 include directory
++# LIBSSH2_LIBRARY - the libssh2 library name
++
++if (LIBSSH2_INCLUDE_DIR AND LIBSSH2_LIBRARY)
++  set(LibSSH2_FIND_QUIETLY TRUE)
++endif (LIBSSH2_INCLUDE_DIR AND LIBSSH2_LIBRARY)
++
++FIND_PATH(LIBSSH2_INCLUDE_DIR libssh2.h
++)
++
++FIND_LIBRARY(LIBSSH2_LIBRARY NAMES ssh2
++)
++
++include(FindPackageHandleStandardArgs)
++FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibSSH2 DEFAULT_MSG LIBSSH2_INCLUDE_DIR LIBSSH2_LIBRARY )
++
++MARK_AS_ADVANCED(LIBSSH2_INCLUDE_DIR LIBSSH2_LIBRARY)
diff --git a/net-ftp/kftpgrabber/kftpgrabber-9999.ebuild b/net-ftp/kftpgrabber/kftpgrabber-9999.ebuild
index 4a3acf072a2..047944e1f88 100644
--- a/net-ftp/kftpgrabber/kftpgrabber-9999.ebuild
+++ b/net-ftp/kftpgrabber/kftpgrabber-9999.ebuild
@@ -5,17 +5,19 @@
 EAPI="2"
 
 KMNAME="extragear/network"
-inherit kde4-meta
+inherit kde4-base
 
 DESCRIPTION="FTP client for K Desktop Environment"
 HOMEPAGE="http://www.kftp.org"
 
 LICENSE="GPL-2 LGPL-2"
 KEYWORDS=""
-SLOT="live"
+SLOT="0"
 IUSE="debug"
 
 DEPEND="
 	net-libs/libssh2
 "
 RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-add-LibSSH2.cmake.patch" )
diff --git a/profiles/package.mask b/profiles/package.mask
index f389dd12a2a..bf58bc5c7a6 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,4 +1,4 @@
-# Alex Alexander (wired) <alex.alexander@gmail.com> (12 Mar 2009)
+# Maciej Mrozowski (reavertm) <reavertm@poczta.fm> (12 Mar 2009)
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # Edit profiles/package.mask.d/ files instead.
 
@@ -249,7 +249,7 @@
 ~kde-base/umbrello-4.2.65
 ~kde-base/kde-l10n-4.2.65
 
-# Alex Alexander (wired) <alex.alexander@gmail.com> (12 Mar 2009)
+# Maciej Mrozowski (reavertm) <reavertm@poczta.fm> (12 Mar 2009)
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # Live packages are masked by default.
 # Edit Documentation/package.unmask/kde-live.d/ files instead.
@@ -400,7 +400,7 @@ media-tv/kdetv:live
 media-video/kaffeine:live
 media-video/kmplayer:live
 media-video/kplayer:live
-net-ftp/kftpgrabber:live
+=net-ftp/kftpgrabber-9999
 net-im/kmess:live
 net-misc/smb4k:live
 =net-libs/decibel-9999
diff --git a/sets/kde-extras-live b/sets/kde-extras-live
index 771cff3044e..aedb1d11b08 100644
--- a/sets/kde-extras-live
+++ b/sets/kde-extras-live
@@ -20,7 +20,7 @@ media-tv/kdetv:live
 media-video/kaffeine:live
 media-video/kmplayer:live
 media-video/kplayer:live
-net-ftp/kftpgrabber:live
+=net-ftp/kftpgrabber-9999
 net-im/kmess:live
 net-misc/smb4k:live
 =net-libs/decibel-9999