We aren't compatible with wv-1.2.0 yet, so depend on 1.0.3-r1 for now (will be proper...

Package-Manager: portage-1.589-cvs

diff --git a/app-misc/beagle/ChangeLog b/app-misc/beagle/ChangeLog
index 4127f50c0713d1b94dc7e5a1b5c43a52a9fc4e03..0e30ce69518380140fb4a38bf521c7c0c32bb7c5 100644 (file)
--- a/app-misc/beagle/ChangeLog
+++ b/app-misc/beagle/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/beagle
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/beagle/ChangeLog,v 1.2 2005/10/25 17:01:02 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/beagle/ChangeLog,v 1.3 2005/11/03 17:20:22 dsd Exp $
+
+  03 Nov 2005; Daniel Drake <dsd@gentoo.org> beagle-0.1.1.ebuild:
+  We aren't compatible with wv-1.2.0 yet, so depend on 1.0.3-r1 for now (will
+  be properly fixed in next beagle release).
 
   25 Oct 2005; Daniel Drake <dsd@gentoo.org> beagle-0.1.1.ebuild:
   Stop using gnome2 eclass. Use emake -j1 to prevent compilation errors -

diff --git a/app-misc/beagle/Manifest b/app-misc/beagle/Manifest
index 97695136754d09dc8116810386b7b856d3d67cee..ca14329885f852cf2a8fef3b538acd7f10322ceb 100644 (file)
--- a/app-misc/beagle/Manifest
+++ b/app-misc/beagle/Manifest
@@ -1,6 +1,16 @@
-MD5 9bd252b5a2edd31b4823eec66f9cf1e5 ChangeLog 637
-MD5 e41d95d4e4a1258a16dc37965422aaab beagle-0.1.1.ebuild 3011
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 fb8b8285ab91559ca250d8c3c8c07036 beagle-0.1.1.ebuild 3097
+MD5 866bee4774fa5865875cfb36349b2163 ChangeLog 827
+MD5 43c872252a620e391c449e150e344a3a metadata.xml 224
 MD5 3375984ea7d16737cd465bae6ed3d928 files/beagle-0.1.1-null-task-source.patch 1347
 MD5 9c5c2f0ad3f959022b402ddba4dc671d files/beagle-0.1.1-uri-serialization.patch 2704
 MD5 4840546d3689482f55c682ef01d4807b files/digest-beagle-0.1.1 66
-MD5 43c872252a620e391c449e150e344a3a metadata.xml 224
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDakcQTOXg++0VvJQRAnqvAJ9nrs7Qf1kHhSx/mVG1W9GHim8lGACeK1VI
+Iy9hhQWbCZUW+nOjT9hZqXw=
+=k8M2
+-----END PGP SIGNATURE-----

diff --git a/app-misc/beagle/beagle-0.1.1.ebuild b/app-misc/beagle/beagle-0.1.1.ebuild
index d7f639150b32b197fbefbf25341bad4a2bae2c10..e5d2a8234fcff67fb4da86b26aec2dfa36b42aa8 100644 (file)
--- a/app-misc/beagle/beagle-0.1.1.ebuild
+++ b/app-misc/beagle/beagle-0.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/beagle/beagle-0.1.1.ebuild,v 1.3 2005/11/03 07:46:14 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/beagle/beagle-0.1.1.ebuild,v 1.4 2005/11/03 17:20:22 dsd Exp $
 
 inherit gnome.org eutils mono
 
@@ -30,7 +30,7 @@ RDEPEND=">=dev-lang/mono-1.1.9.1
        >=dev-libs/atk-1.2.4
        >=media-libs/libexif-0.6.0
        >=dev-libs/libxml2-2.6.19
-       wv? ( >=app-text/wv-1.0.3-r1 )
+       wv? ( =app-text/wv-1.0.3-r1 )
        chm? ( app-doc/chmlib )
        pdf? ( app-text/xpdf )
        spreadsheet? ( >=app-office/gnumeric-1.4.3-r3 )
@@ -80,6 +80,9 @@ src_unpack() {
 
        # Fix handling of filenames
        epatch ${FILESDIR}/${P}-uri-serialization.patch
+
+       # We aren't compatible with wv-1.2.0 yet
+       sed -i -e 's/wv-1.0/wv-1.0 < 1.2.0/g' configure
 }
 
 src_compile() {