Fix zip/gz related dependencies

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 15 insertions, 14 deletions

diff --git a/kde-base/ark/ChangeLog b/kde-base/ark/ChangeLog
index 85333455fb5f..f0b632ae816e 100644
--- a/kde-base/ark/ChangeLog
+++ b/kde-base/ark/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/ark
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ark/ChangeLog,v 1.166 2010/08/16 19:06:04 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ark/ChangeLog,v 1.167 2010/08/16 19:18:03 reavertm Exp $
+
+  16 Aug 2010; Maciej Mrozowski <reavertm@gentoo.org> ark-4.4.5.ebuild,
+  ark-4.4.5-r1.ebuild:
+  Fix zip/gz related dependencies
 
 *ark-4.4.5-r1 (16 Aug 2010)
 
diff --git a/kde-base/ark/Manifest b/kde-base/ark/Manifest
index 15ab9b322d95..fc9c720ac18d 100644
--- a/kde-base/ark/Manifest
+++ b/kde-base/ark/Manifest
@@ -1,6 +1,6 @@
 AUX ark-4.4.5-cli7zip.patch 480 RMD160 57369a955bff3038ad0c105eea0179bbb795a030 SHA1 27e94998d9fc7521dde5c09b35ff915dbadcab73 SHA256 b053da2d2844ae532fa62058ca81332fbef10b8fe3114209dc8382e0f9760743
 DIST kdeutils-4.4.5.tar.bz2 2694008 RMD160 d8f9014fcd27548a33d10138135a8789d8fd49d6 SHA1 c092cfbb46719d89a5718735dc81ca75c0176e45 SHA256 07ef7d4bab6e919eac89ff0c948410266b120773300a7aa05119d0b23d312495
-EBUILD ark-4.4.5-r1.ebuild 856 RMD160 a88859b4927e9864d1f33b25ddd041d367728a80 SHA1 c6818135ac2a01a4b334d2041b7e0345304057b3 SHA256 f93a166c512fb4d8d36707e8dd142118ae53db16927ae3fd183c5d5e008af8da
-EBUILD ark-4.4.5.ebuild 804 RMD160 498f7e3370cc9c26b864db5222a90d184dbafb99 SHA1 ff5494a66af9675d8a95450ce0aeaa45e9a75b64 SHA256 f96402159df42f1904b3dfab15eaa36b98de2c7d37f18794356ab1f6500a6e72
-MISC ChangeLog 18889 RMD160 6d55fb43f03ed8b52e9e33f4e3f01c222940bbee SHA1 68ddc058dfad8c66e818d8076b470d5b6519ccf0 SHA256 65bd24f26ac94ad458eae99ad4fff22ff4a75b0776824e3c28fc03da9918a2e9
-MISC metadata.xml 381 RMD160 c30a3b9455946839d0a4b7d2261d6dfec597a476 SHA1 0445b8ab3f9938b209437e6a2f2fe27ad3b89dbf SHA256 895b3ed7f652563c376e59cdb10a6646681adc3608f37dbceace0381ae7141df
+EBUILD ark-4.4.5-r1.ebuild 798 RMD160 2c315add6fec202ef02a6cee60f3c09e9c9f6600 SHA1 58561013bc8f46ffa3316c318c8913791747f552 SHA256 a51539f6a4d26ede804d6696a8f323e538f5c4cdec9c4d6b0b5caa4d73be4e8c
+EBUILD ark-4.4.5.ebuild 745 RMD160 a006640d8220bc90a5a21cdb16d343a73c60db02 SHA1 2601fb8a82de27006f7672013338d2f8509d801e SHA256 d4e457c12f7d04ce75351abae317b97f73c832ec34402fe59e2a03d85894b60b
+MISC ChangeLog 19019 RMD160 233ec795df6cd482841f65fa2b1dda1af030d563 SHA1 7856182536389bfffdff2a09b23ce05f6238799d SHA256 48bcd1a71c867df598842abf3ef7bf46d2d6652b84f2012d23ec56cb6067ab5c
+MISC metadata.xml 322 RMD160 334b5bc3257b4dfc3a35949d97b708ce0433d0bd SHA1 c79f836aa62d561541e3532e7ff3d2e25bd1e08a SHA256 bb0e30b110fd06fa41201b1eaeb6505004a9ba745fd5ff9776873fc25137e41b
diff --git a/kde-base/ark/ark-4.4.5-r1.ebuild b/kde-base/ark/ark-4.4.5-r1.ebuild
index cd9173f9baf6..c3c7c070af2c 100644
--- a/kde-base/ark/ark-4.4.5-r1.ebuild
+++ b/kde-base/ark/ark-4.4.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ark/ark-4.4.5-r1.ebuild,v 1.1 2010/08/16 19:06:04 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ark/ark-4.4.5-r1.ebuild,v 1.2 2010/08/16 19:18:03 reavertm Exp $
 
 EAPI="3"
 
@@ -9,13 +9,13 @@ inherit kde4-meta
 
 DESCRIPTION="KDE Archiving tool"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+archive +bzip2 debug +handbook lzma zip"
+IUSE="+archive +bzip2 debug +handbook lzma"
 
 DEPEND="
 	$(add_kdebase_dep libkonq)
+	sys-libs/zlib
 	archive? ( >=app-arch/libarchive-2.6.1[bzip2?,lzma?,zlib] )
 	lzma? ( app-arch/xz-utils )
-	zip? ( >=dev-libs/libzip-0.8 )
 "
 RDEPEND="${DEPEND}"
 
@@ -28,7 +28,6 @@ src_configure() {
 		$(cmake-utils_use_with archive LibArchive)
 		$(cmake-utils_use_with bzip2 BZip2)
 		$(cmake-utils_use_with lzma LibLZMA)
-		$(cmake-utils_use_with zip LibZip)
 	)
 	kde4-meta_src_configure
 }
diff --git a/kde-base/ark/ark-4.4.5.ebuild b/kde-base/ark/ark-4.4.5.ebuild
index 57150a85dfb7..c046575b897f 100644
--- a/kde-base/ark/ark-4.4.5.ebuild
+++ b/kde-base/ark/ark-4.4.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ark/ark-4.4.5.ebuild,v 1.5 2010/08/09 17:34:27 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ark/ark-4.4.5.ebuild,v 1.6 2010/08/16 19:18:03 reavertm Exp $
 
 EAPI="3"
 
@@ -9,13 +9,13 @@ inherit kde4-meta
 
 DESCRIPTION="KDE Archiving tool"
 KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="+archive +bzip2 debug +handbook lzma zip"
+IUSE="+archive +bzip2 debug +handbook lzma"
 
 DEPEND="
 	$(add_kdebase_dep libkonq)
+	sys-libs/zlib
 	archive? ( >=app-arch/libarchive-2.6.1[bzip2?,lzma?,zlib] )
 	lzma? ( app-arch/xz-utils )
-	zip? ( >=dev-libs/libzip-0.8 )
 "
 RDEPEND="${DEPEND}"
 
@@ -24,7 +24,6 @@ src_configure() {
 		$(cmake-utils_use_with archive LibArchive)
 		$(cmake-utils_use_with bzip2 BZip2)
 		$(cmake-utils_use_with lzma LibLZMA)
-		$(cmake-utils_use_with zip LibZip)
 	)
 	kde4-meta_src_configure
 }
diff --git a/kde-base/ark/metadata.xml b/kde-base/ark/metadata.xml
index b294f14dbc59..d36a453faa8c 100644
--- a/kde-base/ark/metadata.xml
+++ b/kde-base/ark/metadata.xml
@@ -4,7 +4,6 @@
 <use>
 	<flag name="archive">Enable support for a variety of archive formats through libarchive</flag>
 	<flag name="lzma">Enable LZMA/XZ archive support</flag>
-	<flag name="zip">Enable zip support through LibZip</flag>
 </use>
 <herd>kde</herd>
 </pkgmetadata>