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

(Portage version: 2.2_rc42/cvs/Linux x86_64)

5 files changed, 10 insertions, 106 deletions

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/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"