From 31e9a0d1486a0721521022469ceeea055d96addf Mon Sep 17 00:00:00 2001
From: Daniel Gryniewicz <dang@gentoo.org>
Date: Wed, 28 Feb 2007 19:39:31 +0000
Subject: [PATCH] Add scrollkeeper dep; bug #168704 Package-Manager:
 portage-2.1.2-r12

---
 dev-util/meld/ChangeLog         |  5 ++++-
 dev-util/meld/Manifest          | 24 ++++++++++++------------
 dev-util/meld/meld-1.1.4.ebuild |  7 +++++--
 3 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog
index f12f29d23054..2e17db25af9b 100644
--- a/dev-util/meld/ChangeLog
+++ b/dev-util/meld/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-util/meld
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.54 2007/02/03 22:34:41 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.55 2007/02/28 19:39:31 dang Exp $
+
+  28 Feb 2007; Daniel Gryniewicz <dang@gentoo.org> meld-1.1.4.ebuild:
+  Add scrollkeeper dep; bug #168704
 
   03 Feb 2007; Mart Raudsepp <leio@gentoo.org> -meld-1.1.3.ebuild:
   Remove old
diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index c4b21e83586c..3f925f7898ba 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -6,14 +6,14 @@ MD5 3ec863ae5648587f525dddd4cc614557 files/fix-po.patch 4005
 RMD160 1f34be3c97b5af335a46781be36bba6fb951b531 files/fix-po.patch 4005
 SHA256 6977f8fb96fbb1320e46beab7c9ddce0253b553de91c975f540a884bafd7f99b files/fix-po.patch 4005
 DIST meld-1.1.4.tar.bz2 599912 RMD160 ae327557458cae31660d3c30bcd6640f0406f1fa SHA1 52f51e5825b4e2bb56594a9f4e180908e714848f SHA256 040c7a633b8abfe646425be4835790d4515952ce0e2ffe8523c36751d93a472f
-EBUILD meld-1.1.4.ebuild 1306 RMD160 f2d5380b334cbb8fc29265bd20e03362dc5ef1fc SHA1 4fda98526897cd82ee87424b9cc7ddc8c2bf2488 SHA256 71f9326e8dc3bff91f1f630e35e6ab5fc60f1766c36d02e59fb02c6fc019070c
-MD5 bccb07416cc84d67a789e943d0d5ac90 meld-1.1.4.ebuild 1306
-RMD160 f2d5380b334cbb8fc29265bd20e03362dc5ef1fc meld-1.1.4.ebuild 1306
-SHA256 71f9326e8dc3bff91f1f630e35e6ab5fc60f1766c36d02e59fb02c6fc019070c meld-1.1.4.ebuild 1306
-MISC ChangeLog 7766 RMD160 c03fe15eaa739280ea88058a8286e863b2c6f964 SHA1 b6384710efd8973b0b13d1b84ef657c6f0ea1fb7 SHA256 3041e7c400bcf2a63f247691c1ca77ea541ed767191aadb454c89adc451873a8
-MD5 26c18a328275ae63075e6d9ae585104a ChangeLog 7766
-RMD160 c03fe15eaa739280ea88058a8286e863b2c6f964 ChangeLog 7766
-SHA256 3041e7c400bcf2a63f247691c1ca77ea541ed767191aadb454c89adc451873a8 ChangeLog 7766
+EBUILD meld-1.1.4.ebuild 1349 RMD160 f5051fa5604a71aa8ce447a54797881d9de941ae SHA1 a1f4394e63f86f113d9e7f20fc5b6bd7099e3d4b SHA256 79d2312d2714ff7cbf6a7d9d67febb9837f0c120c641085a568451f06cf62f54
+MD5 d895068bd7c5c9e64c1da8935d6d0cd8 meld-1.1.4.ebuild 1349
+RMD160 f5051fa5604a71aa8ce447a54797881d9de941ae meld-1.1.4.ebuild 1349
+SHA256 79d2312d2714ff7cbf6a7d9d67febb9837f0c120c641085a568451f06cf62f54 meld-1.1.4.ebuild 1349
+MISC ChangeLog 7873 RMD160 985a971956d50ba91472f86af93b69f359f5ce6c SHA1 3496e643699fe0b48b88c2e681fb5a78a95e63ed SHA256 ccec62d46987dfaa7908eb0ac382105b34b02fa36565b4b9cbb42fda6513bdd5
+MD5 659db5b9ca4d67d0b267c7ffa8ba2cf7 ChangeLog 7873
+RMD160 985a971956d50ba91472f86af93b69f359f5ce6c ChangeLog 7873
+SHA256 ccec62d46987dfaa7908eb0ac382105b34b02fa36565b4b9cbb42fda6513bdd5 ChangeLog 7873
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -22,9 +22,9 @@ MD5 366840d5e7f0bca6e5e1d56724dd6757 files/digest-meld-1.1.4 235
 RMD160 b7f6be12a22bf89fc13e6896ef35887ab184b86a files/digest-meld-1.1.4 235
 SHA256 0dc9c9acd57e433dd314f227d209444c7cd750c56d9a77ced153cbcadec5671f files/digest-meld-1.1.4 235
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
+Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFFxQ3OkeYb6olFHJcRAgHjAJ9Ijx6XUF9XuRql8B03DZeFz+dPTgCg9xtm
-+0xEEKZvZDt6ZxhTfnPQMAw=
-=FK/b
+iD8DBQFF5dnJomPajV0RnrERAuPlAJ0e00ZYHGzzunJUQ9DxLN7ypFgVjwCeNvEg
+EiLYX2chlM6eTO4jKo3bxqM=
+=0lPV
 -----END PGP SIGNATURE-----
diff --git a/dev-util/meld/meld-1.1.4.ebuild b/dev-util/meld/meld-1.1.4.ebuild
index cb5bc2afa992..be20be8551b4 100644
--- a/dev-util/meld/meld-1.1.4.ebuild
+++ b/dev-util/meld/meld-1.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.1.4.ebuild,v 1.12 2007/02/03 21:38:27 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.1.4.ebuild,v 1.13 2007/02/28 19:39:31 dang Exp $
 
 inherit python gnome2 eutils
 
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 ia64 ppc sparc x86"
 IUSE="doc gnome"
 
-DEPEND=">=dev-lang/python-2.3
+RDEPEND=">=dev-lang/python-2.3
 	>=gnome-base/libglade-2
 	>=gnome-base/libgnome-2
 	>=dev-python/gnome-python-2.6.0
@@ -20,6 +20,9 @@ DEPEND=">=dev-lang/python-2.3
 	>=dev-python/pyorbit-1.99.0
 	gnome? ( dev-python/gnome-python-desktop )"
 
+DEPEND="${RDEPEND}
+	app-text/scrollkeeper"
+
 DOCS="AUTHORS README.CVS changelog help/"
 
 src_unpack() {
-- 
2.26.2