Add missing scrollkeeper dependency, bug #285596. Clean up old revisions

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

7 files changed, 34 insertions, 115 deletions

diff --git a/app-pda/gnome-pilot-conduits/Manifest b/app-pda/gnome-pilot-conduits/Manifest
index 60326ce213e8..10e4b4e2b734 100644
--- a/app-pda/gnome-pilot-conduits/Manifest
+++ b/app-pda/gnome-pilot-conduits/Manifest
@@ -1,6 +1,14 @@
-DIST gnome-pilot-conduits-2.0.16.tar.bz2 480866 RMD160 f6416ca677396534c27dabbe1a513eb93587129d SHA1 0022f0279526a3b82a0ebd96d4584846fe71360a SHA256 15c040c9fa863e8d99b7f8dafc3971ec9feefbd3330f7af9ad81d81ab0447d51
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST gnome-pilot-conduits-2.0.17.tar.bz2 493857 RMD160 159ca33f36c235eb27d3129934aebfe2e331b842 SHA1 d6ed00c379a3accd192987fd1232610b603bbd52 SHA256 94cf49ab14f6c025abde9d5082657385e88b44898fe60c34981c1c2765a921c3
-EBUILD gnome-pilot-conduits-2.0.16.ebuild 796 RMD160 03966490bfc0fb082a89b36ca7e34840cef6a7e3 SHA1 57f62698ffa25b83519993fc9008987a27676f0f SHA256 0469cf231de359b3206bfc9f0025efe9b3d25dd2fb7c0af91258a5fcb4f61ef9
 EBUILD gnome-pilot-conduits-2.0.17.ebuild 797 RMD160 d07e927bee5dea585e5ab5d5614a39c5cd4f46c8 SHA1 ab21f7b5a903dcd062ad40435ce0da6f5de82706 SHA256 a8cd5d6fbee57e57bfc2bdf6898ba9d84a34eead6b60bb2dffad0ac3056fc1df
-MISC ChangeLog 7909 RMD160 a6c0171102aaa5b964838cb3792039e5711d9d92 SHA1 91f5500fcdf5159573db65b03343e3c5c6a4a65a SHA256 89c8c5031bb07629e021143e12c0cad3e2c8310e7a3fa0e81acff03647d0bc5f
+MISC ChangeLog 8024 RMD160 135ced70c98198db7b5ab496b1b68c4cd90c5378 SHA1 2c65ff2b57402e76eaeb0381527d9bfc5871f8d4 SHA256 16023b20a0118b14bd87b45a7b8205a163bdfa230630328aeef57bd5ccd5c442
 MISC metadata.xml 175 RMD160 5a758a9c6be5886bcabe17412a27ddb9c4c1a091 SHA1 5f39f2aee5dc458e1f1184425ff00a600cfbeb93 SHA256 ad69c13297c0e440519a25f99fdcefd579e75f58d652bb174055ae0c827b8543
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkq/964ACgkQ1fmVwcYIWAaYRwCglAykUsYqh1r2C6DlMiN1IpKA
+9NcAn1kQwPqH42I0pq78YJ8Yx2CtTGxW
+=6Fq8
+-----END PGP SIGNATURE-----
diff --git a/app-pda/gnome-pilot/ChangeLog b/app-pda/gnome-pilot/ChangeLog
index 691521d1159d..3adc3ccafee8 100644
--- a/app-pda/gnome-pilot/ChangeLog
+++ b/app-pda/gnome-pilot/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-pda/gnome-pilot
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/gnome-pilot/ChangeLog,v 1.56 2009/08/23 10:53:17 mrpouet Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/gnome-pilot/ChangeLog,v 1.57 2009/09/27 23:38:25 eva Exp $
+
+  27 Sep 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-pilot-2.0.16-r1.ebuild, -files/gnome-pilot-2.0.16-hal-0.5.11.patch,
+  gnome-pilot-2.0.17.ebuild, gnome-pilot-2.0.17-r1.ebuild:
+  Add missing scrollkeeper dependency, bug #285596. Clean up old revisions
 
 *gnome-pilot-2.0.17-r1 (23 Aug 2009)
 
diff --git a/app-pda/gnome-pilot/Manifest b/app-pda/gnome-pilot/Manifest
index 203398a758e7..87610cc5865b 100644
--- a/app-pda/gnome-pilot/Manifest
+++ b/app-pda/gnome-pilot/Manifest
@@ -1,10 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gnome-pilot-2.0.15-as-needed.patch 615 RMD160 fbe474f52251eba860153a17e94db2d39c78f0f0 SHA1 f8047494624457716886dd2463a8a9a6810dae30 SHA256 2772c7d38cffa91473612671b2f859b2c922c2952690e06ba3cf6df2cceb9dd3
-AUX gnome-pilot-2.0.16-hal-0.5.11.patch 1253 RMD160 2bf5f22787d3abec7db8dccce2cf4b953bcd8fb2 SHA1 5fdefcb86f24b27159f1a08f81cda1885e395b60 SHA256 8edab795c9bc9536f66d4fc69026ba8429d92cbee285913ec51ed489994b15ec
 AUX gnome-pilot-2.0.17-invisible-applet.patch 3837 RMD160 bd7197d499c9d6159aedb93df8ca079498c70a0c SHA1 86a89daf3dfa7831e7498c43e1d85ff27a974539 SHA256 5f32c00548264b5926e43302b9c099f139dc90ccc1b9eb866837dbdff9ff55de
-DIST gnome-pilot-2.0.16.tar.bz2 829677 RMD160 13c0fec7ab9ed987e5c80d8ceaf68e0eea47ea42 SHA1 2a80852b09f41b55df16c7f1130e6d437bfe4dee SHA256 3ae8da427269a122e72aca025b01fc5f5c5a402efadd0e98e107d8a9453f6a56
 DIST gnome-pilot-2.0.17.tar.bz2 837105 RMD160 bbd3f94a1e9edb99a10d698272ae0c7bb48dd643 SHA1 2d56b0b642293967de3ee6a93d2ae67c2562e367 SHA256 ef157162c6963289855493d07de4956b43753909082299bb59791c8a8436211a
-EBUILD gnome-pilot-2.0.16-r1.ebuild 1614 RMD160 a0a9a4a56248025235f8f3159bdf42c5ab0a2155 SHA1 0ae2a0987ab668a66056a1db44d31b82c7893931 SHA256 692ca74a6f4b6ffed3578ac96d259d3a216273a69b3837d8c32199a666be73d4
-EBUILD gnome-pilot-2.0.17-r1.ebuild 1750 RMD160 c9a4c242efa361529482a959f416a0f807a72de2 SHA1 1439991962e0286e3552b21ab86a5457e4148e37 SHA256 e86dfe292d30081186fbadd8c6baf0c06403b810b036a8eea14f6fc93802dedc
-EBUILD gnome-pilot-2.0.17.ebuild 1543 RMD160 f27a3c1e2c6bad8ee8e0e2aac97874c43bd2acfd SHA1 a67225d7a9eb79b15dc69ceb8cccc2066220720b SHA256 7631011832bb1e98e3e94d14c95564ebb17705c76fc70ec634b5fdd821750aea
-MISC ChangeLog 13416 RMD160 632112c60b36c37e4edf9181f578c9cff568847e SHA1 033990bb0ae511ae3ed4f429d8a13dbb6c721aef SHA256 12763d059c85f3a4711657d123a27f16e73db590a25c3be729a5d150666bfce5
+EBUILD gnome-pilot-2.0.17-r1.ebuild 1778 RMD160 a92845044a5dda47e810c9b2ced17b19ad876c56 SHA1 7d5e3475cc639075ffb56dde268ebecfa3988984 SHA256 9f2b96867b9c9d7631a606da7504648ecb24d9d6fea9ddb1db9c169ff360e5e4
+EBUILD gnome-pilot-2.0.17.ebuild 1571 RMD160 d51a09c815a3f92991ad8c889abb187fa02e0c8b SHA1 fa21bba60da7a0456a3e23f7b59dae2d33658046 SHA256 cc6c249737b58571d79a0bf79457fda8c1158eb72e82b0af0927f3ed997c110c
+MISC ChangeLog 13678 RMD160 0de119a2071717d8d799b0e3ceaaf4fb1494997f SHA1 f93ec1ae436aacae99421dcc0e3b2b99ac239599 SHA256 487ab59df34fae21c226ef08ad1e717d1b654c1c33d424fde645229b02e5ee75
 MISC metadata.xml 175 RMD160 5a758a9c6be5886bcabe17412a27ddb9c4c1a091 SHA1 5f39f2aee5dc458e1f1184425ff00a600cfbeb93 SHA256 ad69c13297c0e440519a25f99fdcefd579e75f58d652bb174055ae0c827b8543
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkq/93cACgkQ1fmVwcYIWAa5CgCfeB2+wZd4OCp77ImwaZNo0erf
+CnYAoKLBTAMn40XR0Af27PKCneE0Ym5s
+=RUMX
+-----END PGP SIGNATURE-----
diff --git a/app-pda/gnome-pilot/files/gnome-pilot-2.0.16-hal-0.5.11.patch b/app-pda/gnome-pilot/files/gnome-pilot-2.0.16-hal-0.5.11.patch
deleted file mode 100644
index df0042899780..000000000000
--- a/app-pda/gnome-pilot/files/gnome-pilot-2.0.16-hal-0.5.11.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- gpilotd/gpilotd.c-old	2008-07-13 21:52:04.000000000 +1000
-+++ gpilotd/gpilotd.c	2008-07-13 21:53:30.000000000 +1000
-@@ -1079,7 +1079,7 @@
- hal_device_added (LibHalContext *ctx, const char *udi)
- {
- 	gboolean visor_net = FALSE;
--	char *bus, *match_str;
-+	char *bus, *platform, *match_str;
- 	int vendor_id, product_id, i;
- 	GPilotDevice *device;
- 	DBusError error;
-@@ -1090,15 +1090,23 @@
- 
- 	load_devices_xml ();
- 
--	/* HAL match rule: we look for info.bus == 'usb_device'
-+	/* HAL match rule: we look for pda.platform == 'palm'
-+	 * (or the legacy info.bus == 'usb_device')
- 	 * and then try to match the usb_device.product_id and usb_device.vendor_id
- 	 * against the list in devices.xml.
- 	 */
--	if (!(bus = libhal_device_get_property_string (hal_ctx, udi, "info.bus", NULL)))
-+	if (platform = libhal_device_get_property_string (hal_ctx, udi, "pda.platform", NULL)) {
-+	    if (strcmp (platform, "palm") != 0) {
-+		libhal_free_string (platform);
- 		return;
--	if (strcmp (bus, "usb_device") != 0) {
-+	    }
-+	} else if (bus = libhal_device_get_property_string (hal_ctx, udi, "info.bus", NULL)) {
-+	    if (strcmp (bus, "usb_device") != 0) {
- 		libhal_free_string (bus);
- 		return;
-+	    }
-+	} else {
-+	    return;
- 	}
- 
- 	dbus_error_init (&error);
diff --git a/app-pda/gnome-pilot/gnome-pilot-2.0.16-r1.ebuild b/app-pda/gnome-pilot/gnome-pilot-2.0.16-r1.ebuild
deleted file mode 100644
index af2018f18da4..000000000000
--- a/app-pda/gnome-pilot/gnome-pilot-2.0.16-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/gnome-pilot/gnome-pilot-2.0.16-r1.ebuild,v 1.5 2009/02/22 21:31:25 eva Exp $
-
-inherit gnome2 eutils autotools
-
-DESCRIPTION="Gnome Palm Pilot and Palm OS Device Syncing Library"
-HOMEPAGE="http://live.gnome.org/GnomePilot"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE="hal"
-
-RDEPEND=">=gnome-base/libgnome-2.0.0
-	>=gnome-base/libgnomeui-2.0.0
-	>=gnome-base/libglade-2.0.0
-	>=gnome-base/orbit-2.6.0
-	>=gnome-base/libbonobo-2.0.0
-	>=gnome-base/gnome-panel-2.0
-	>=gnome-base/gconf-2.0
-	dev-libs/libxml2
-	>=app-pda/pilot-link-0.11.7
-	hal? (
-		dev-libs/dbus-glib
-		>=sys-apps/hal-0.5.4
-	)"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/gob-2.0.5
-	>=dev-lang/perl-5.6.0
-	dev-util/intltool"
-
-DOCS="AUTHORS COPYING* ChangeLog README NEWS"
-SCROLLKEEPER_UPDATE="0"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--enable-usb
-		--enable-network
-		--enable-pilotlinktest
-		$(use_with hal)"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	echo "libgpilotdCM/gnome-pilot-conduit-management.c" >> po/POTFILES.in
-
-	# Fix --as-needed
-	epatch "${FILESDIR}/${PN}-2.0.15-as-needed.patch"
-
-	# Fix use with hal-0.5.11
-	epatch "${FILESDIR}/${P}-hal-0.5.11.patch"
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-}
-
-pkg_postinst() {
-	if ! built_with_use --missing false app-pda/pilot-link bluetooth; then
-		elog "if you want bluetooth support, please rebuild app-pda/pilot-link"
-		elog "echo 'app-pda/pilot-link bluetooth >> /etc/portage/package.use"
-	fi
-}
diff --git a/app-pda/gnome-pilot/gnome-pilot-2.0.17-r1.ebuild b/app-pda/gnome-pilot/gnome-pilot-2.0.17-r1.ebuild
index 3a14ef66c553..85e1b856e0c4 100644
--- a/app-pda/gnome-pilot/gnome-pilot-2.0.17-r1.ebuild
+++ b/app-pda/gnome-pilot/gnome-pilot-2.0.17-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/gnome-pilot/gnome-pilot-2.0.17-r1.ebuild,v 1.1 2009/08/23 10:53:17 mrpouet Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/gnome-pilot/gnome-pilot-2.0.17-r1.ebuild,v 1.2 2009/09/27 23:38:25 eva Exp $
 
 inherit gnome2 eutils autotools
 
@@ -29,6 +29,7 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 	>=dev-util/gob-2.0.5
 	>=dev-lang/perl-5.6.0
+	>=app-text/scrollkeeper-0.3.14
 	dev-util/intltool"
 
 DOCS="AUTHORS COPYING* ChangeLog README NEWS"
diff --git a/app-pda/gnome-pilot/gnome-pilot-2.0.17.ebuild b/app-pda/gnome-pilot/gnome-pilot-2.0.17.ebuild
index 09d9efd0aa9e..8242c8330c35 100644
--- a/app-pda/gnome-pilot/gnome-pilot-2.0.17.ebuild
+++ b/app-pda/gnome-pilot/gnome-pilot-2.0.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/gnome-pilot/gnome-pilot-2.0.17.ebuild,v 1.5 2009/06/02 17:13:08 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/gnome-pilot/gnome-pilot-2.0.17.ebuild,v 1.6 2009/09/27 23:38:25 eva Exp $
 
 inherit gnome2 eutils autotools
 
@@ -29,6 +29,7 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 	>=dev-util/gob-2.0.5
 	>=dev-lang/perl-5.6.0
+	>=app-text/scrollkeeper-0.3.14
 	dev-util/intltool"
 
 DOCS="AUTHORS COPYING* ChangeLog README NEWS"