stable bump

10 files changed, 13 insertions, 80 deletions

diff --git a/app-pda/gnome-pilot-conduits/Manifest b/app-pda/gnome-pilot-conduits/Manifest
index 836ec93b8fed..6ac4459093a6 100644
--- a/app-pda/gnome-pilot-conduits/Manifest
+++ b/app-pda/gnome-pilot-conduits/Manifest
@@ -1,12 +1,11 @@
 MD5 3ac2ddba713508e9288eed504d423c5e ChangeLog 2767
 MD5 7948ed31bc37ebd470761022256edb3a gnome-pilot-conduits-0.9.ebuild 1043
-MD5 376f8fe81f0792b82d9bb5e2e6945c41 gnome-pilot-conduits-2.0.10.ebuild 783
+MD5 92f9be925766f403e818ac674de89a06 gnome-pilot-conduits-2.0.10-r1.ebuild 786
 MD5 f88e72f2cdd2ea2cd71ef30f9f28180b gnome-pilot-conduits-2.0.8.ebuild 606
 MD5 53c692211e1e8c185852d95e68de456f gnome-pilot-conduits-2.0.9.ebuild 606
 MD5 1e1031eae2f36a13b2cd73550a31d03d metadata.xml 175
-MD5 f406c783d79791255494ae3a6c814210 gnome-pilot-conduits-2.0.10-r1.ebuild 787
 MD5 76c98072408ae5c4e5a96245e5a20466 files/digest-gnome-pilot-conduits-0.9 77
-MD5 dfa62058be26fe2b26b39fef4de1658b files/digest-gnome-pilot-conduits-2.0.10 80
+MD5 dfa62058be26fe2b26b39fef4de1658b files/digest-gnome-pilot-conduits-2.0.10-r1 80
 MD5 44094ed3c6f7aff66a27ad28e49d3057 files/digest-gnome-pilot-conduits-2.0.8 79
 MD5 27875c7d6b54af33930cdfc0cee6c4bc files/digest-gnome-pilot-conduits-2.0.9 79
 MD5 c0f29f8ad2fa1877f8faa55abd1f4902 files/gnome-pilot-conduits-2.0.10-memofile.patch 1343
diff --git a/app-pda/gnome-pilot-conduits/files/digest-gnome-pilot-conduits-2.0.10 b/app-pda/gnome-pilot-conduits/files/digest-gnome-pilot-conduits-2.0.10
deleted file mode 100644
index 951998136df2..000000000000
--- a/app-pda/gnome-pilot-conduits/files/digest-gnome-pilot-conduits-2.0.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f6c0c608b04fabe6c83431ed2bda1ec3 gnome-pilot-conduits-2.0.10.tar.bz2 390631
diff --git a/app-pda/gnome-pilot-conduits/gnome-pilot-conduits-2.0.10-r1.ebuild b/app-pda/gnome-pilot-conduits/gnome-pilot-conduits-2.0.10-r1.ebuild
index 46dcf459eb57..1c22f5cb510a 100644
--- a/app-pda/gnome-pilot-conduits/gnome-pilot-conduits-2.0.10-r1.ebuild
+++ b/app-pda/gnome-pilot-conduits/gnome-pilot-conduits-2.0.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/gnome-pilot-conduits/gnome-pilot-conduits-2.0.10-r1.ebuild,v 1.1 2003/09/20 14:54:29 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/gnome-pilot-conduits/gnome-pilot-conduits-2.0.10-r1.ebuild,v 1.2 2003/10/08 09:54:49 liquidx Exp $
 
 inherit gnome2
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.eskil.org/gnome-pilot/"
 IUSE=""
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="x86 ~sparc"
 
 RDEPEND=">=gnome-base/libgnome-2.0
 	>=app-pda/gnome-pilot-${PVR}
diff --git a/app-pda/gnome-pilot-conduits/gnome-pilot-conduits-2.0.10.ebuild b/app-pda/gnome-pilot-conduits/gnome-pilot-conduits-2.0.10.ebuild
deleted file mode 100644
index 8bfb588a827f..000000000000
--- a/app-pda/gnome-pilot-conduits/gnome-pilot-conduits-2.0.10.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/gnome-pilot-conduits/gnome-pilot-conduits-2.0.10.ebuild,v 1.3 2003/09/20 14:54:29 liquidx Exp $
-
-inherit gnome2
-
-DESCRIPTION="Gnome Pilot Conduits"
-HOMEPAGE="http://www.eskil.org/gnome-pilot/"
-
-IUSE=""
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc"
-
-RDEPEND=">=gnome-base/libgnome-2.0
-	>=app-pda/gnome-pilot-${PV}
-	>=dev-libs/libxml2-2.5"
-
-DEPEND="sys-devel/gettext
-	dev-util/pkgconfig
-	${RDEPEND}"
-
-G2CONF="${G2CONF} --enable-pilotlinktest"
-SCROLLKEEPER_UPDATE="0"
-
-src_unpack() {
-	unpack ${A}
-	# patch to fix memo file syncing
-	# http://bugzilla.gnome.org/show_bug.cgi?id=114361
-	epatch ${FILESDIR}/${P}-memofile.patch
-}
diff --git a/app-pda/gnome-pilot/Manifest b/app-pda/gnome-pilot/Manifest
index 4e0950a98ee3..11d86eb0eb52 100644
--- a/app-pda/gnome-pilot/Manifest
+++ b/app-pda/gnome-pilot/Manifest
@@ -1,15 +1,14 @@
 MD5 4a0d608e79980a938a35db134c249350 ChangeLog 4684
 MD5 71d7685c732d5128ef90220a059ba33d gnome-pilot-0.1.65-r5.ebuild 1214
 MD5 7e664f878e51c4552029f907c161c95b gnome-pilot-0.1.71.ebuild 1365
-MD5 f856fb8d962cef26d6a5337ac35f8952 gnome-pilot-2.0.10.ebuild 864
+MD5 f9ac7c554c6618ccb91b8c7b1ab8bdd9 gnome-pilot-2.0.10-r1.ebuild 1037
 MD5 9899f463a5192c4a876862d7fe9b2930 gnome-pilot-2.0.9.ebuild 1326
 MD5 1e1031eae2f36a13b2cd73550a31d03d metadata.xml 175
-MD5 f56e25bbbc97f0c3e1b9886d323165a0 gnome-pilot-2.0.10-r1.ebuild 1038
 MD5 6dd42dbe52e081c7ac130b8303cd84ac files/digest-gnome-pilot-0.1.65-r5 71
 MD5 327dd488b418afec2cac40f6b8bbbcd7 files/digest-gnome-pilot-0.1.71 71
-MD5 4c1bf3e985e3e12a7196902b013f314c files/digest-gnome-pilot-2.0.10 71
+MD5 4c1bf3e985e3e12a7196902b013f314c files/digest-gnome-pilot-2.0.10-r1 71
 MD5 7283428c0134d68479d562b313752de6 files/digest-gnome-pilot-2.0.9 70
 MD5 df4f6d9882436059cee414d0fb7d91ae files/gnome-pilot-0.1.70-usb.patch 1122
 MD5 de42a13e198e82cd8d8c5f77bc1a1705 files/gnome-pilot-2.0.1-pisock.patch 450
-MD5 f50c6d977f5c1c3729bb88a763356de4 files/gnome-pilot-gentoo.diff 4186
 MD5 0e6853fd3f1027a38152ea0085dc8f6e files/gnome-pilot-2.0.10-memofile.patch 16432
+MD5 f50c6d977f5c1c3729bb88a763356de4 files/gnome-pilot-gentoo.diff 4186
diff --git a/app-pda/gnome-pilot/files/digest-gnome-pilot-2.0.10 b/app-pda/gnome-pilot/files/digest-gnome-pilot-2.0.10
deleted file mode 100644
index 5d9552fba37d..000000000000
--- a/app-pda/gnome-pilot/files/digest-gnome-pilot-2.0.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 840ed31beddf1398ea4bb3c01b6caa70 gnome-pilot-2.0.10.tar.bz2 710069
diff --git a/app-pda/gnome-pilot/gnome-pilot-2.0.10-r1.ebuild b/app-pda/gnome-pilot/gnome-pilot-2.0.10-r1.ebuild
index cba99ecf356f..149fcb187e38 100644
--- a/app-pda/gnome-pilot/gnome-pilot-2.0.10-r1.ebuild
+++ b/app-pda/gnome-pilot/gnome-pilot-2.0.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/gnome-pilot/gnome-pilot-2.0.10-r1.ebuild,v 1.1 2003/09/20 14:44:30 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/gnome-pilot/gnome-pilot-2.0.10-r1.ebuild,v 1.2 2003/10/08 09:53:48 liquidx Exp $
 
 inherit gnome2 eutils
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.gnome.org/gnome-pilot/"
 IUSE=""
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="x86 ~sparc"
 
 RDEPEND=">=gnome-base/libgnome-2.0.0
 	>=gnome-base/libgnomeui-2.0.0
diff --git a/app-pda/gnome-pilot/gnome-pilot-2.0.10.ebuild b/app-pda/gnome-pilot/gnome-pilot-2.0.10.ebuild
deleted file mode 100644
index 94219e4d4536..000000000000
--- a/app-pda/gnome-pilot/gnome-pilot-2.0.10.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/gnome-pilot/gnome-pilot-2.0.10.ebuild,v 1.4 2003/09/12 19:31:11 liquidx Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="Gnome Pilot apps"
-HOMEPAGE="http://www.gnome.org/gnome-pilot/"
-
-IUSE=""
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc"
-
-RDEPEND=">=gnome-base/libgnome-2.0.0
-	>=gnome-base/libgnomeui-2.0.0
-	>=gnome-base/libglade-2.0.0
-	>=gnome-base/ORBit2-2.6.0
-	>=gnome-base/libbonobo-2.0.0
-	>=gnome-base/gnome-panel-2.0
-	>=gnome-base/gconf-2.0
-	>=dev-util/gob-2.0.5
-	>=app-pda/pilot-link-0.11.7"
-
-DEPEND="sys-devel/gettext
-		>=dev-lang/perl-5.6.0
-		${RDEPEND}"
-
-G2CONF="${G2CONF} --enable-usb --enable-network --enable-pilotlinktest"
-
-DOCS="AUTHORS COPYING* ChangeLog README NEWS"
-SCROLLKEEPER_UPDATE="0"
diff --git a/app-pda/pilot-link/Manifest b/app-pda/pilot-link/Manifest
index 1ade947cdbe5..3dc208a7ba75 100644
--- a/app-pda/pilot-link/Manifest
+++ b/app-pda/pilot-link/Manifest
@@ -3,10 +3,10 @@ MD5 075fea99b82d61028585dc3e42f00466 metadata.xml 156
 MD5 cf6208085f6d78cfbbd5da627a6d91cc pilot-link-0.11.3.ebuild 1133
 MD5 ceeeb2cbcd65db181acacf84463f107e pilot-link-0.11.5-r2.ebuild 2796
 MD5 b2ff3e2df30559c1a46f1cd92caffe1a pilot-link-0.11.7-r1.ebuild 1809
-MD5 3ba5a7d11f770e81a27cb304bfab2425 pilot-link-0.11.8.ebuild 1887
+MD5 b2bbfef4a92a8dec7b7dab61a8ea7589 pilot-link-0.11.8.ebuild 1885
 MD5 4ed5cde53dbd9e15bb794538763b55eb files/digest-pilot-link-0.11.3 70
 MD5 6d5485ccfa72ceeae0193839586e7252 files/digest-pilot-link-0.11.5-r2 70
 MD5 6ba6541a846ca65d5b4985c0b3e63707 files/digest-pilot-link-0.11.7-r1 70
-MD5 469bfe2e33b13b930be59dea48e25719 files/perlpatch.diff 702
 MD5 c7eea8e9fc52ce118ca126979309da45 files/digest-pilot-link-0.11.8 70
+MD5 469bfe2e33b13b930be59dea48e25719 files/perlpatch.diff 702
 MD5 90560348093b5a7b47849896f35b4d54 files/pilot-link-0.11.8-javapath.patch 562
diff --git a/app-pda/pilot-link/pilot-link-0.11.8.ebuild b/app-pda/pilot-link/pilot-link-0.11.8.ebuild
index c07b3abedb2f..8d5c5596bac1 100644
--- a/app-pda/pilot-link/pilot-link-0.11.8.ebuild
+++ b/app-pda/pilot-link/pilot-link-0.11.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/pilot-link/pilot-link-0.11.8.ebuild,v 1.2 2003/09/09 15:46:24 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/pilot-link/pilot-link-0.11.8.ebuild,v 1.3 2003/10/08 09:51:44 liquidx Exp $
 
 inherit perl-module
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.pilot-link.org/"
 
 SLOT="0"
 LICENSE="GPL-2 | LGPL-2"
-KEYWORDS="~x86 ~ppc ~sparc alpha"
+KEYWORDS="x86 ~ppc ~sparc alpha"
 IUSE="perl java tcltk python png readline"
 
 DEPEND="virtual/glibc