Fix up dependencies a bit...

svn path=/sunrise/; revision=5833

diff --git a/app-cdr/acetoneiso2/ChangeLog b/app-cdr/acetoneiso2/ChangeLog
index c524f573f40551fb8aaf69a264002db4e5eb6cdd..a14702fd9b5d4261e6830e9ce2479dd2216ca190 100644 (file)
--- a/app-cdr/acetoneiso2/ChangeLog
+++ b/app-cdr/acetoneiso2/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  16 Mar 2008; Jakub Moc <jakub@gentoo.org> acetoneiso2-2.0.1.ebuild:
+  Fix up dependencies a bit...
+
   12 Mar 2008; (Tommy[D]) tommy100@gmx.de -acetoneiso2-2.0.0.ebuild:
   Really drop it
 

diff --git a/app-cdr/acetoneiso2/Manifest b/app-cdr/acetoneiso2/Manifest
index 8faed9a88c76d8a173d858a5a22a5d0df83448a5..997992c6f341b74043c4c30801a9dcc6b50c3a9b 100644 (file)
--- a/app-cdr/acetoneiso2/Manifest
+++ b/app-cdr/acetoneiso2/Manifest
@@ -1,4 +1,4 @@
 DIST acetoneiso2_2.0.1-source.tar.gz 1078569 RMD160 68a3bd4c56e1324183ab7458e08e52f653971d9b SHA1 db3e28e77db916ba6b0f4d45d69406de00a9ba14 SHA256 85544073bdfc74dd359e76b413dad843007116098685291cb69f88cae73d4f73
-EBUILD acetoneiso2-2.0.1.ebuild 861 RMD160 467142cd7367dd90224f9d3553c65aac5b457b6d SHA1 e525fe7b1cb16fc5ffb9430a93f5de7dc0fd74f2 SHA256 59236baec9fc1d3d9e5194a8485a136acbc4b4b8b5c7deb34c8033f9eb5aa273
-MISC ChangeLog 1355 RMD160 a4b75d3746ae63eff44614bbcb9f4ac990f6d023 SHA1 15a1d70c7f6a2aed1b0b8fe5f11ab5878c44a197 SHA256 fc90abd252a52ca549db42f44b7d0636b68f5bedd42368de57c6939336e812cd
+EBUILD acetoneiso2-2.0.1.ebuild 871 RMD160 e956ffa18cc6351f0b257bb31ac72c2976b4f6ea SHA1 e805789eb86ba74a42e550305da0987c6902bbec SHA256 6a6500a1e3092d7d42ee3d3af677157ce9855739bea6dad343ee4c50204ac678
+MISC ChangeLog 1457 RMD160 0f6162dda9406e76c9ffdd2f84dfe1bc9afb65b7 SHA1 fdf4decb11cb4990a41fb73f426891abc1dd5241 SHA256 afdcde19554b64066a0fe2a96d5314537d7cefe45d0db5f1b109ce53b4e8d95a
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42

diff --git a/app-cdr/acetoneiso2/acetoneiso2-2.0.1.ebuild b/app-cdr/acetoneiso2/acetoneiso2-2.0.1.ebuild
index dcffaa4ca53d81a887dfa52b893772cca0c4bbf7..bd7f5be417b4f4b2f05e2d4cc79333f2b9e6ed2f 100644 (file)
--- a/app-cdr/acetoneiso2/acetoneiso2-2.0.1.ebuild
+++ b/app-cdr/acetoneiso2/acetoneiso2-2.0.1.ebuild
@@ -3,7 +3,6 @@
 # $Header: $
 
 EAPI=1
-
 inherit qt4
 
 DESCRIPTION="Graphical tool to do a lot things with image files like extracting, mounting, encrypting."
@@ -13,19 +12,17 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}-source.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="cdr crypt"
+IUSE="7zip cdr crypt"
 
-DEPEND="
-       x11-libs/qt:4
-       cdr? ( || ( app-cdr/cdrtools app-cdr/cdrkit )
-       app-cdr/cdrdao )
-       app-arch/p7zip
+DEPEND="x11-libs/qt:4
        || ( kde-base/konqueror gnome-base/nautilus kde-base/kdebase )
-       crypt? ( >=app-crypt/gnupg-2 )
        sys-fs/fuse
        sys-fs/fuseiso"
 
-RDEPEND=${DEPEND}
+RDEPEND="${DEPEND}
+       7zip? ( app-arch/p7zip )
+       cdr? ( virtual/cdrtools app-cdr/cdrdao )
+       crypt? ( >=app-crypt/gnupg-2 app-crypt/pinentry )"
 
 S="${WORKDIR}"/${PN}/src/