fix orbit deps & cleanup

8 files changed, 7 insertions, 189 deletions

diff --git a/app-pda/gnome-pilot/Manifest b/app-pda/gnome-pilot/Manifest
index ea933d8082cd..308dd6a3d3f3 100644
--- a/app-pda/gnome-pilot/Manifest
+++ b/app-pda/gnome-pilot/Manifest
@@ -1,6 +1,6 @@
 MD5 db26cab929faaf5210f81f6ff7b4ea92 gnome-pilot-0.1.71.ebuild 1360
 MD5 9ded78d9d2412aa21752c81f86023812 gnome-pilot-0.1.65-r5.ebuild 1208
-MD5 564ac50d807cb8c40ca8a2fcd0ebfca5 gnome-pilot-2.0.10-r1.ebuild 1509
+MD5 a3faef0fc0e777f15badb625001dc2f6 gnome-pilot-2.0.10-r1.ebuild 1506
 MD5 de81030a791f1778b4a57aea03f8145a ChangeLog 5955
 MD5 1e1031eae2f36a13b2cd73550a31d03d metadata.xml 175
 MD5 df4f6d9882436059cee414d0fb7d91ae files/gnome-pilot-0.1.70-usb.patch 1122
diff --git a/app-pda/multisync/Manifest b/app-pda/multisync/Manifest
index fca33f0d3394..9a74d526f59e 100644
--- a/app-pda/multisync/Manifest
+++ b/app-pda/multisync/Manifest
@@ -1,13 +1,9 @@
-MD5 9b7a6d803973f5a667f38879f8c7deb5 multisync-0.82.ebuild 2170
-MD5 51dd304ecb2e616746c1355a55860241 multisync-0.81-r1.ebuild 2163
-MD5 bdec9ddad75702bc8b747d744f2a6f18 multisync-0.81.ebuild 2097
-MD5 63feae88b8d707c8d30e9cc78492cc6a multisync-0.80-r1.ebuild 2080
+MD5 1d181c487975ca6e588002fa9e58114e multisync-0.82.ebuild 2167
+MD5 c1151cf0ab6431e51c6dbd636397f675 multisync-0.81-r1.ebuild 2157
 MD5 14bb6ed4d453b958f1ed2077922fbada ChangeLog 2381
 MD5 8bf6f02e04d1b0ccf382064a2d1ee056 metadata.xml 331
-MD5 8ad3a49acbf349a211788f9fadd1285d files/digest-multisync-0.80-r1 69
 MD5 88fd786cd5f1c92e85f887a3d994639d files/digest-multisync-0.81-r1 68
 MD5 dd3fe0167fa09a793b91a0115253480f files/multisync-0.80-r1-gentoo.patch 842
 MD5 8dcfd4b620831bf876a1a0f84469597e files/multisync-0.82-bluetooth-sdp.patch 714
 MD5 9caf6f63fb6ecf15986fb4752ffd5ffa files/multisync-0.81-gentoo.patch 902
-MD5 88fd786cd5f1c92e85f887a3d994639d files/digest-multisync-0.81 68
 MD5 94a424df4dc4575edbb2a91c5ff4eaa3 files/digest-multisync-0.82 68
diff --git a/app-pda/multisync/files/digest-multisync-0.80-r1 b/app-pda/multisync/files/digest-multisync-0.80-r1
deleted file mode 100644
index 4b790b50cff8..000000000000
--- a/app-pda/multisync/files/digest-multisync-0.80-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f1b1ff5665d7de82b2a2948752b818c7 multisync-0.80-1.tar.gz 1592241
diff --git a/app-pda/multisync/files/digest-multisync-0.81 b/app-pda/multisync/files/digest-multisync-0.81
deleted file mode 100644
index 54ef7c33326b..000000000000
--- a/app-pda/multisync/files/digest-multisync-0.81
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e9091a2a1a364f2afb71149928a26c78 multisync-0.81.tar.bz2 1727892
diff --git a/app-pda/multisync/multisync-0.80-r1.ebuild b/app-pda/multisync/multisync-0.80-r1.ebuild
deleted file mode 100644
index a9734770960e..000000000000
--- a/app-pda/multisync/multisync-0.80-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/multisync/multisync-0.80-r1.ebuild,v 1.12 2004/07/13 18:20:47 agriffis Exp $
-
-inherit eutils
-
-MY_P="${PF/r1/1}"
-DESCRIPTION="Client to sync apps with WinCE or mobile devices"
-HOMEPAGE="http://multisync.sourceforge.net/"
-SRC_URI="mirror://sourceforge/multisync/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="evo gtk2 irmc ldap opie"
-# evo   - evolution plugin
-# irmc  - bluetooth/irmc/irda plugin ( local )
-# opie  - opie plugin                ( local )
-# ldap  - ldap plugin - experimental
-
-DEPEND="virtual/libc
-	>=gnome-base/libbonobo-2.2
-	>=gnome-base/libgnome-2.2
-	>=gnome-base/ORBit-0.5.17
-	>=dev-libs/openssl-0.9.6j
-	evo?  (
-		gtk2? (
-			=mail-client/evolution-1.4*
-			=x11-libs/gtk+-2* )
-		!gtk2? (
-			=mail-client/evolution-1.2*
-			=x11-libs/gtk+-1* )
-	)
-	irmc? ( >=sys-apps/irda-utils-0.9.15
-		>=net-wireless/bluez-utils-2.3
-		>=dev-libs/openobex-1.0.0 )
-	opie? ( >=net-misc/curl-7.10.5 )
-	ldap? ( >=net-nds/openldap-2.0.27 )"
-
-S=${WORKDIR}/${PF/-r1/}
-
-make_plugin_list() {
-	export PLUGINS="backup_plugin syncml_plugin"
-	use irmc && PLUGINS="${PLUGINS} irmc_sync"
-	use evo && PLUGINS="${PLUGINS} evolution_sync"
-	use opie && PLUGINS="${PLUGINS} opie_sync"
-	use ldap && PLUGINS="${PLUGINS} ldap_plugin"
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Fix the opie Makefile
-	cd ${S}
-	epatch ${FILESDIR}/${PF}-gentoo.patch
-}
-
-src_compile() {
-	make_plugin_list
-
-	einfo "Building Multisync with these plugins:"
-	for plugin_dir in ${PLUGINS}
-	do
-		einfo "      ${plugin_dir}"
-	done
-
-	cd ${S}
-	econf || die
-	make || die "Multisync make failed"
-
-	cd ${S}/plugins
-	for plugin_dir in ${PLUGINS}
-	do
-		cd ${S}/plugins/${plugin_dir}
-		econf || die "${plugin_dir} config failed!"
-		make || die "${plugin_dir} make failed!"
-	done
-}
-
-src_install() {
-	make_plugin_list
-	einstall || die "Multisync install failed!"
-	for plugin_dir in ${PLUGINS}
-	do
-		cd ${S}/plugins/${plugin_dir}
-		einstall || die "${plugin_dir} make failed!"
-	done
-}
diff --git a/app-pda/multisync/multisync-0.81-r1.ebuild b/app-pda/multisync/multisync-0.81-r1.ebuild
index ff9d6706e80d..44878b19bbb1 100644
--- a/app-pda/multisync/multisync-0.81-r1.ebuild
+++ b/app-pda/multisync/multisync-0.81-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/multisync/multisync-0.81-r1.ebuild,v 1.10 2004/07/01 11:46:44 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/multisync/multisync-0.81-r1.ebuild,v 1.11 2004/08/21 15:34:28 foser Exp $
 
 inherit eutils
 
@@ -24,7 +24,7 @@ DEPEND="virtual/libc
 	>=dev-libs/glib-2
 	>=gnome-base/gconf-2
 	>=gnome-base/gnome-vfs-2.2
-	>=gnome-base/ORBit2-2.8.2
+	>=gnome-base/orbit-2.8.2
 	>=dev-libs/openssl-0.9.6j
 	evo?  ( =mail-client/evolution-1.4* )
 	irmc? ( >=sys-apps/irda-utils-0.9.15
diff --git a/app-pda/multisync/multisync-0.81.ebuild b/app-pda/multisync/multisync-0.81.ebuild
deleted file mode 100644
index d06d07ee109b..000000000000
--- a/app-pda/multisync/multisync-0.81.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/multisync/multisync-0.81.ebuild,v 1.12 2004/08/17 13:35:06 agriffis Exp $
-
-inherit eutils
-
-DESCRIPTION="Client to sync apps with WinCE or mobile devices"
-HOMEPAGE="http://multisync.sourceforge.net/"
-SRC_URI="mirror://sourceforge/multisync/${PN}-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="evo gtk2 irmc ldap opie"
-# evo   - evolution plugin
-# irmc  - bluetooth/irmc/irda plugin ( local )
-# opie  - opie plugin                ( local )
-# ldap  - ldap plugin - experimental
-
-DEPEND="virtual/libc
-	>=gnome-base/libbonobo-2.2
-	>=gnome-base/libgnome-2.2
-	>=gnome-base/ORBit2-2.8.2
-	>=dev-libs/openssl-0.9.6j
-	evo?  (
-		gtk2? (
-			=mail-client/evolution-1.4*
-			=x11-libs/gtk+-2* )
-	    !gtk2? (
-			=mail-client/evolution-1.2*
-			=x11-libs/gtk+-1* )
-	)
-	irmc? ( >=sys-apps/irda-utils-0.9.15
-		>=net-wireless/bluez-utils-2.3
-		>=dev-libs/openobex-1.0.0 )
-	opie? ( >=net-misc/curl-7.10.5 )
-	ldap? ( >=net-nds/openldap-2.0.27
-		>=dev-libs/cyrus-sasl-2.1.4 )"
-
-S=${WORKDIR}/${PF/-r1/}
-
-make_plugin_list() {
-	export PLUGINS="backup_plugin syncml_plugin"
-	use irmc && PLUGINS="${PLUGINS} irmc_sync"
-	use evo && PLUGINS="${PLUGINS} evolution_sync"
-	use opie && PLUGINS="${PLUGINS} opie_sync"
-	use ldap && PLUGINS="${PLUGINS} ldap_plugin"
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Fix the opie Makefile
-	cd ${S}
-	epatch ${FILESDIR}/${PF}-gentoo.patch
-}
-
-src_compile() {
-	make_plugin_list
-
-	einfo "Building Multisync with these plugins:"
-	for plugin_dir in ${PLUGINS}
-	do
-		einfo "      ${plugin_dir}"
-	done
-
-	cd ${S}
-	econf || die
-	make || die "Multisync make failed"
-
-	cd ${S}/plugins
-	for plugin_dir in ${PLUGINS}
-	do
-		cd ${S}/plugins/${plugin_dir}
-		econf || die "${plugin_dir} config failed!"
-		make || die "${plugin_dir} make failed!"
-	done
-}
-
-src_install() {
-	make_plugin_list
-	einstall || die "Multisync install failed!"
-	for plugin_dir in ${PLUGINS}
-	do
-		cd ${S}/plugins/${plugin_dir}
-		einstall || die "${plugin_dir} make failed!"
-	done
-}
diff --git a/app-pda/multisync/multisync-0.82.ebuild b/app-pda/multisync/multisync-0.82.ebuild
index e34a1ba03c83..91cabb8cb2b0 100644
--- a/app-pda/multisync/multisync-0.82.ebuild
+++ b/app-pda/multisync/multisync-0.82.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/multisync/multisync-0.82.ebuild,v 1.4 2004/07/24 20:40:09 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/multisync/multisync-0.82.ebuild,v 1.5 2004/08/21 15:34:28 foser Exp $
 
 inherit eutils
 
@@ -23,7 +23,7 @@ DEPEND=">=gnome-base/libbonobo-2.2
 	>=dev-libs/glib-2
 	>=gnome-base/gconf-2
 	>=gnome-base/gnome-vfs-2.2
-	>=gnome-base/ORBit2-2.8.2
+	>=gnome-base/orbit-2.8.2
 	>=dev-libs/openssl-0.9.6j
 	evo?  ( =mail-client/evolution-1.4* )
 	irmc? ( >=sys-apps/irda-utils-0.9.15