fix orbit deps & cleanup

6 files changed, 4 insertions, 182 deletions

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