Fix dependencies

svn path=/sunrise/; revision=5471

diff --git a/app-text/pdf2oo/ChangeLog b/app-text/pdf2oo/ChangeLog
index 10d7e6e4352c155ddb79f7e87ef5e5bb73a3932c..4a16b84c920e8a4fdc0e1c949b70e65beb74aa37 100644 (file)
--- a/app-text/pdf2oo/ChangeLog
+++ b/app-text/pdf2oo/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for app-text/pdf2oo
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  19 Jan 2008; Jakub Moc <jakub@gentoo.org> pdf2oo-20070322.ebuild:
+  Fix dependencies
+
   18 Apr 2007; Markus Ullmann <jokey@gentoo.org> -pdf2oo-20060811.ebuild,
   pdf2oo-20070322.ebuild:
   Drop old and some cosmetics

diff --git a/app-text/pdf2oo/Manifest b/app-text/pdf2oo/Manifest
index b4fcda200df6e72a5e5eea91c133a27e7c84d0cc..69943e6df189c8757cde96aa4a14ea288f6103e9 100644 (file)
--- a/app-text/pdf2oo/Manifest
+++ b/app-text/pdf2oo/Manifest
@@ -1,4 +1,4 @@
 DIST pdf2oo-20070322.tar.gz 14786 RMD160 f4d0aebf808ef825975dd53d97a19bdefb40343a SHA1 9697bc9932ed0c4b8e49ecc8b2632ecf0afe2449 SHA256 c3c75e5b7f6644d5b04e5b59eb3fd950be7bede3a5de71a488fb1eabe7c80d5a
-EBUILD pdf2oo-20070322.ebuild 613 RMD160 e8f0c061b0efedb883df3c6681efdad05051226c SHA1 8a716266cab3499741c75f6c8118431c567ae784 SHA256 610749f247753d9ce7d464bd2a43a43cbe788e6786d32ea463d38b36c0698c2e
-MISC ChangeLog 459 RMD160 e2f74ce98cb4084108471337425cf6915faaec57 SHA1 70577e0d6077dcac1894652f39cde9ba0ca1d778 SHA256 2c11201efb2b214d8ece90f88c8c777671695d09c7ca577e09f96b0a425c5870
+EBUILD pdf2oo-20070322.ebuild 666 RMD160 463c5680ef77256747502db73750ea0cfa056aa1 SHA1 004ebfc6296f7445718ea8c4732b2b1670054c2b SHA256 23aa8aba05bfa7883c4c5ce04c3423b39d62b260a2a23fcb42e55a45310ffc95
+MISC ChangeLog 547 RMD160 c4f2d5a53fc545ba1759d3bb983aa05fd6a026cd SHA1 c2c72aee48e05bb552a750bb690d6b19c63ac0da SHA256 fb0000aca347ab112b6f79ca5d3c620160aa6f39b55fc9351a3d57d3288a21e0
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42

diff --git a/app-text/pdf2oo/pdf2oo-20070322.ebuild b/app-text/pdf2oo/pdf2oo-20070322.ebuild
index 787f1e4d738a8068217a26b355650c980460aa12..d785429437f21a23fd3eeb5e26538de305c3f511 100644 (file)
--- a/app-text/pdf2oo/pdf2oo-20070322.ebuild
+++ b/app-text/pdf2oo/pdf2oo-20070322.ebuild
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+EAPI="1"
+
 DESCRIPTION="Converts pdf files to odf"
 HOMEPAGE="http://sourceforge.net/projects/pdf2oo/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
@@ -11,16 +13,13 @@ SLOT="0"
 KEYWORDS="~x86"
 IUSE="kde"
 
+# will not work with KDE4, uses DCOP
 DEPEND=""
 RDEPEND=">=app-text/poppler-0.5.3
        >=media-gfx/imagemagick-6.2.8.0
        >=app-arch/zip-2.31
-       kde? (
-               || (
-                       ( >=kde-base/kdialog-3.5.0 >=kde-base/kommander-3.5.2 )
-                       kde-base/kdebase
-               )
-               >=kde-base/kdelibs-3.5.2-r6 )"
+       kde? ( || ( ( >=kde-base/kdialog-3.5.0:3.5 >=kde-base/kommander-3.5.2:3.5 ) kde-base/kdebase:3.5 )
+               >=kde-base/kdelibs-3.5.2-r6:3.5 )"
 
 S="${WORKDIR}/${PN}"