summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2015-01-29 00:32:00 +0000
committerJohannes Huber <johu@gentoo.org>2015-01-29 00:32:00 +0000
commit73dfb84beb73d070d2c7a051105fd5476fcb4c69 (patch)
tree84bd8e25cffa5a2340a6ef7b1afd184739229251 /net-ftp
parentAdjust dependencies to handle merged plugins in >=app-crypt/qca-2.1. (diff)
downloadhistorical-73dfb84beb73d070d2c7a051105fd5476fcb4c69.tar.gz
historical-73dfb84beb73d070d2c7a051105fd5476fcb4c69.tar.bz2
historical-73dfb84beb73d070d2c7a051105fd5476fcb4c69.zip
Adjust use dependencies to handle >=app-crypt/qca-2.1.
Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0xF3CFD2BD
Diffstat (limited to 'net-ftp')
-rw-r--r--net-ftp/oneclickftp/ChangeLog7
-rw-r--r--net-ftp/oneclickftp/Manifest34
-rw-r--r--net-ftp/oneclickftp/oneclickftp-0.5.1.ebuild7
3 files changed, 25 insertions, 23 deletions
diff --git a/net-ftp/oneclickftp/ChangeLog b/net-ftp/oneclickftp/ChangeLog
index de324fd6cc59..c69d73ac14e0 100644
--- a/net-ftp/oneclickftp/ChangeLog
+++ b/net-ftp/oneclickftp/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-ftp/oneclickftp
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/oneclickftp/ChangeLog,v 1.3 2013/03/02 22:51:01 hwoarang Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/oneclickftp/ChangeLog,v 1.4 2015/01/29 00:31:57 johu Exp $
+
+ 29 Jan 2015; Johannes Huber <johu@gentoo.org> oneclickftp-0.5.1.ebuild:
+ Adjust use dependencies to handle >=app-crypt/qca-2.1.
02 Mar 2013; Markos Chandras <hwoarang@gentoo.org> oneclickftp-0.5.1.ebuild:
Move Qt dependencies to the new category
diff --git a/net-ftp/oneclickftp/Manifest b/net-ftp/oneclickftp/Manifest
index 1c5c2407330e..fc34f3120ea3 100644
--- a/net-ftp/oneclickftp/Manifest
+++ b/net-ftp/oneclickftp/Manifest
@@ -3,25 +3,23 @@ Hash: SHA256
AUX oneclickftp-0.5.1-qt47.patch 679 SHA256 fcccb44c76d84cf08ecb3cb344a247d5846f4c2431b2db62e228eedd415751f0 SHA512 238f0ccac1149f3324dac6c3c48e6616da4a8ba60e940a71eda997dea087b07e32cf239dd999c2fef3e3840a085665d4256b94b31a4616946bf80679a2d75a45 WHIRLPOOL db308a9fed32cefcc4336ba8f076127a46d3bead403ae54b768f91c9a2d4307bb99be33ae9eaae64d4fcc67e3a25bcfbd6e8bdfd85d108584a083c901374a0ab
DIST oneclickftp-0.5.1.tar.gz 109759 SHA256 91a36cd7c2fb53e7ca6e7bef4d7ff62cf2c72967b242290184b4530326bd39b5
-EBUILD oneclickftp-0.5.1.ebuild 718 SHA256 aa49135c261edb40d92fa8d9638c14d594aea6b236e8decfda0ddca449b27d41 SHA512 a98178d2ccf4cd57d88040269843c1a6306f5cf6376999a37ddcd90d6fa09d14ca1b0f0e39b1d55e0ee53dd0b64f2cf88d352fac2cbbeae68ef2e89f156c5661 WHIRLPOOL 51c3320cde51908cf2b27ae5a384e95eadb2d90798e28a9937ee1ac1506d5cb0c50fc7143327a04811462342390c8203e219627341a520f78afc1564da1da455
-MISC ChangeLog 634 SHA256 cda481118d3a401ab059cf44c60ce39d17c67f2f8b1c245f7d5853c808688601 SHA512 21d270fd223c7db35a4e4dc06b949a3081cbc248718b27e4f1cb437d0143dbb1682345caf73a610bef4e77e4996c9e50250b4dee1d939b84e4e3077dc3c45d66 WHIRLPOOL e240b9c309778fc99fd9a770b1710008bc40da67514514f2bc8434fcf87afb437ccdb79cec5e8d7f1155cad6a8502ca39b0942bf681fd35e8f9cf0d83ed3ec8f
+EBUILD oneclickftp-0.5.1.ebuild 742 SHA256 fdc096c7c9de3076415759cca57ec933654f305787316f562bf31f15dba17bd2 SHA512 0bf8866edf1df616dfb4061f3d9b1958c72e5270bcb3068e2a99b8c0fd5593ce9d5fc27b4b0a887a63b964103bdbf59457643cf5c3bd6a4b8772b826a59ca246 WHIRLPOOL 9cf36f134cb56e89abaf3cd6dacffa0f279f8fd5a6ee97734dd6430b04a0b642ff26879511dae633ee58507b02c223f3ca43b001ee6c8269e5513eb9634e7732
+MISC ChangeLog 762 SHA256 c4b4759841c396ecc8407789d069c52c882565570281f5d5bed5f82d0ec662a1 SHA512 e57ebf8f6520c1381b7ad0367ba60bb480195ba2da071f09452a2f1d52d369a2c2aff9b25689d13f10d416dad8a930cbfe6c87550bed9e399dbff39ce123f577 WHIRLPOOL 2764553615868e5340348cc7e5ac7b43fb58b49429458aa06040e68ece48a45cbaa893d425e0877965627957e6bf9cbed92fa76ba31687d7e690b6ede9380fc6
MISC metadata.xml 157 SHA256 a2ffc792d4df94c3f8088e329c4bf74804540c2797f3e24ab0030acbdfd4b535 SHA512 9f259ee8df00db96dd396c6c886624c53728c3e26f28071cc1f9a286798271cdfac3485a081d308c93ff3067cb6568f9ea55ca164334abeee776491307244213 WHIRLPOOL bcb16b3d9ab21125e5581aed1225d2b399015d76bc7c6f9deae53e2e38fffdc47e0b5aae9bd632e85db242a37b4de5aa05d6f97c087cad085df9390530a0a597
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
-iQJ8BAEBCABmBQJRMoJUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88M+wP/iLHMKWfokGPw3iPmRA43C3n
-I9Vy6i5FFLxosKbmtB2FX56CSOU6dtsq17a4sMtvtnIuV0TR0j0u6FcFIT7gw52p
-N9Xk4F4PzZDWcfjDtQhZk/KrVh/3nOpujUX5nw0IONyDe8vhDbQ/5nyLnRK2xB8y
-jfdK8regho0Ve/OQqMCBfKAjR+etHi2HBOxFzufdCpm0fjKXuN5QlOyYSLRbcEqD
-KtgCb5/jSHwFo9/UpJEKWQ/Hq+TVoAiTqIKohi6OIL0YNc18lTcexeuYlJX9vkIq
-fy8R2Ay7gtjm5jPYrJZnl9+scJFu3lf39cw59/8hlRuA+pmj2ldnK9+FqyICfjL8
-oPkCWUBQL7tG+RnPI5NoQy6r6oLIqi/OwHke+/c7Nprb3tc/wjt+chmLNld5y2f0
-rngXkvw4CAo02G7gCSW522sQNNwMAOX/qPF6LFoH/go2HoqC7dX2eRKZVKurzj+X
-uvEjsONtUT/IJnxq5RpY3S6N4Wka/OeQ6oaxqG5p3kczGFmMOTr1mBfFBwtbnYr3
-oG8bJ91DSQxHPSFMi0kRsPk08keKn4X2GAf1K3cDBr9Qoyo2a7cxHeZ5esnz9qVb
-GYdDdaZQLCUL/9P+JxD/f0ASstzu41v1gWTKuSRJjrz0aWB82nfP554/vrcnPkF+
-p1xQPeU7YOSYsmgoZvS0
-=/kV8
+iQIcBAEBCAAGBQJUyX9+AAoJEGVpnaTzz9K9hDEP/R33lwKF6+9jQwHBRe0VVGJd
+Zz+ARyZEwvrbce0o6mqM2Nzv02soXZ8CM9xr2mNDW44QC6kKMOG3AnXtNqCiTgjD
+widL3JJjAbIpnXDgGWmiww1WACci1rmleZxSCRCeQrxn1WS8tX2R1Ugql/UZCNVQ
+eEOdfblKhcacNa6rPr42TTZ199Jth5qQKbMaCl4EcpR/PJcnfFXI4m0zWMDC6Iz/
+3KmLzY5hm280wmahM/COAWVs+HbUShU7LjGiGiNKn7CmSa2oBGRArw1wVnPtffzp
+2TgGPB1o1YqXkx2G4oztIRLFdQjl7a9vvPoGal+AgXWzbFX9wgL5DB9U9ibbgnVO
+QpSA7vSipJQA5Vx7GoM6fiLLsOtGx8+2ZjcuQHhjdYt4JDAnFHI9qARaeloq0EqM
+8k9CSd+ca629zcbEPk7/y83sI6DiZ3jj1dKKNiEHt1ppz4HJ4Aoh6vh3w8zHBV+y
+6+wnnbehwArShxVwZfPcWvBm8uKS2BCl3dQWTHGBaezbUjw5LCI4A+2iZF0YjmFj
+6gYBWfCwTMqdhRGw1t0rPJSSRYI8/TlAXpTvgrNW/j4BQMSTKPgLk9xWfOoZp7wF
+SVT7n1ou6HdQyK9TGnSxwqKw7QlsMlCijIf2wX+Sg3BNTqx0srtqh9jRYjQYM7o0
+w72jRCGbwLfGGJy6Zp6j
+=UpKs
-----END PGP SIGNATURE-----
diff --git a/net-ftp/oneclickftp/oneclickftp-0.5.1.ebuild b/net-ftp/oneclickftp/oneclickftp-0.5.1.ebuild
index e07014dcc236..d1c2ee2915f0 100644
--- a/net-ftp/oneclickftp/oneclickftp-0.5.1.ebuild
+++ b/net-ftp/oneclickftp/oneclickftp-0.5.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/oneclickftp/oneclickftp-0.5.1.ebuild,v 1.3 2013/03/02 22:51:01 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/oneclickftp/oneclickftp-0.5.1.ebuild,v 1.4 2015/01/29 00:31:57 johu Exp $
EAPI=2
inherit eutils qt4-r2
@@ -14,7 +14,8 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
-DEPEND=">=app-crypt/qca-2
+DEPEND="
+ || ( app-crypt/qca:2 app-crypt/qca:2[qt4] )
dev-qt/qtgui:4"
PATCHES=(