fix orbit deps & cleanup

16 files changed, 8 insertions, 188 deletions

diff --git a/dev-cpp/gnomemm/files/digest-gnomemm-1.2.3-r1 b/dev-cpp/gnomemm/files/digest-gnomemm-1.2.3-r1
deleted file mode 100644
index c6e82800d7bd..000000000000
--- a/dev-cpp/gnomemm/files/digest-gnomemm-1.2.3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b14e7dac79e5dc8c52b4e52e32335451 gnomemm-1.2.3.tar.gz 328080
diff --git a/dev-cpp/gnomemm/gnomemm-1.2.3-r1.ebuild b/dev-cpp/gnomemm/gnomemm-1.2.3-r1.ebuild
deleted file mode 100644
index a980aea71ccb..000000000000
--- a/dev-cpp/gnomemm/gnomemm-1.2.3-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gnomemm/gnomemm-1.2.3-r1.ebuild,v 1.15 2004/06/24 21:48:35 agriffis Exp $
-
-inherit gcc eutils
-
-DESCRIPTION="C++ binding for the GNOME libraries"
-SRC_URI="mirror://sourceforge/gtkmm/${P}.tar.gz"
-HOMEPAGE="http://gtkmm.sourceforge.net/"
-
-IUSE=""
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="ppc x86 sparc alpha hppa amd64 ia64"
-
-DEPEND="=dev-cpp/gtkmm-1.2*
-	>=gnome-base/gnome-libs-1.4
-	>=gnome-base/ORBit-0.5.11
-	=sys-libs/db-1*"
-
-
-src_unpack() {
-	unpack ${A} ; cd ${S}
-	# http://bugzilla.gnome.org/show_bug.cgi?id=121307 gcc 3.3.x (#27061)
-	epatch ${FILESDIR}/${P}-gcc33.patch
-}
-
-src_compile() {
-	econf || die "econf failed"
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS COPYING ChangeLog NEWS README* TODO
-}
diff --git a/dev-cpp/gnomemm/gnomemm-1.2.4.ebuild b/dev-cpp/gnomemm/gnomemm-1.2.4.ebuild
index 3dd09a2a004e..f9680ec6046c 100644
--- a/dev-cpp/gnomemm/gnomemm-1.2.4.ebuild
+++ b/dev-cpp/gnomemm/gnomemm-1.2.4.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/dev-cpp/gnomemm/gnomemm-1.2.4.ebuild,v 1.2 2004/06/24 21:48:35 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gnomemm/gnomemm-1.2.4.ebuild,v 1.3 2004/08/21 15:52:07 foser Exp $
 
 inherit gcc eutils
 
@@ -15,7 +15,7 @@ KEYWORDS="ppc x86 sparc alpha hppa amd64 ia64"
 
 DEPEND="=dev-cpp/gtkmm-1.2*
 	>=gnome-base/gnome-libs-1.4
-	>=gnome-base/ORBit-0.5.11
+	=gnome-base/orbit-0*
 	=sys-libs/db-1*"
 
 
diff --git a/dev-cpp/libbonobomm/files/digest-libbonobomm-1.3.5 b/dev-cpp/libbonobomm/files/digest-libbonobomm-1.3.5
deleted file mode 100644
index b6a0ebbef995..000000000000
--- a/dev-cpp/libbonobomm/files/digest-libbonobomm-1.3.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e6660db6d394b3bb37d2c7bcb4af5457 libbonobomm-1.3.5.tar.gz 268026
diff --git a/dev-cpp/libbonobomm/files/digest-libbonobomm-1.3.7 b/dev-cpp/libbonobomm/files/digest-libbonobomm-1.3.7
deleted file mode 100644
index dcb013a5f160..000000000000
--- a/dev-cpp/libbonobomm/files/digest-libbonobomm-1.3.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 892177c19965c4a33776684c5ee1df0a libbonobomm-1.3.7.tar.gz 330107
diff --git a/dev-cpp/libbonobomm/libbonobomm-1.3.5.ebuild b/dev-cpp/libbonobomm/libbonobomm-1.3.5.ebuild
deleted file mode 100644
index 6a5cf850d0e9..000000000000
--- a/dev-cpp/libbonobomm/libbonobomm-1.3.5.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libbonobomm/libbonobomm-1.3.5.ebuild,v 1.7 2004/07/13 23:40:45 khai Exp $
-
-inherit gnome2
-
-DESCRIPTION="C++ bindings for libbonobo"
-SRC_URI="mirror://sourceforge/gtkmm/${P}.tar.gz"
-HOMEPAGE="http://gtkmm.sourceforge.net/"
-
-IUSE=""
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="~x86 ~ppc ~sparc"
-
-RDEPEND=">=gnome-base/libbonobo-2.0
-	>=gnome-base/ORBit2-2
-	=dev-cpp/gtkmm-2.2*
-	>=dev-cpp/orbitcpp-1.3.5"
-
-DEPEND=">=dev-util/pkgconfig-0.12.0
-	${RDEPEND}"
-
-# Needed for 2.0.0, it misses some make/libtool magic
-export SED=sed
-
-DOCS="AUTHORS COPYING ChangeLog NEWS README TODO INSTALL"
diff --git a/dev-cpp/libbonobomm/libbonobomm-1.3.7.ebuild b/dev-cpp/libbonobomm/libbonobomm-1.3.7.ebuild
deleted file mode 100644
index 67d840f99a1d..000000000000
--- a/dev-cpp/libbonobomm/libbonobomm-1.3.7.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libbonobomm/libbonobomm-1.3.7.ebuild,v 1.6 2004/07/13 23:40:45 khai Exp $
-
-inherit gnome2
-
-DESCRIPTION="C++ bindings for libbonobo"
-SRC_URI="mirror://sourceforge/gtkmm/${P}.tar.gz"
-HOMEPAGE="http://gtkmm.sourceforge.net/"
-
-IUSE=""
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="~x86 ~ppc ~sparc"
-
-RDEPEND=">=gnome-base/libbonobo-2.0
-	>=gnome-base/ORBit2-2
-	=dev-cpp/gtkmm-2.2*
-	>=dev-cpp/orbitcpp-1.3.7"
-
-DEPEND=">=dev-util/pkgconfig-0.12.0
-	${RDEPEND}"
-
-DOCS="AUTHORS COPYING ChangeLog NEWS README INSTALL"
diff --git a/dev-cpp/libbonobomm/libbonobomm-1.3.8.ebuild b/dev-cpp/libbonobomm/libbonobomm-1.3.8.ebuild
index a689f443fd3a..65961f5eff3b 100644
--- a/dev-cpp/libbonobomm/libbonobomm-1.3.8.ebuild
+++ b/dev-cpp/libbonobomm/libbonobomm-1.3.8.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/dev-cpp/libbonobomm/libbonobomm-1.3.8.ebuild,v 1.3 2004/07/13 23:40:45 khai Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libbonobomm/libbonobomm-1.3.8.ebuild,v 1.4 2004/08/21 15:52:08 foser Exp $
 
 inherit gnome2
 
@@ -13,7 +13,7 @@ LICENSE="LGPL-2.1"
 KEYWORDS="~x86 ~ppc ~sparc"
 
 RDEPEND=">=gnome-base/libbonobo-2.0
-	>=gnome-base/ORBit2-2
+	>=gnome-base/orbit-2
 	=dev-cpp/gtkmm-2.2*
 	>=dev-cpp/orbitcpp-1.3.8"
 
diff --git a/dev-cpp/libbonobouimm/files/digest-libbonobouimm-1.3.5 b/dev-cpp/libbonobouimm/files/digest-libbonobouimm-1.3.5
deleted file mode 100644
index c074f483eeef..000000000000
--- a/dev-cpp/libbonobouimm/files/digest-libbonobouimm-1.3.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8a162b3b91568ff78a5125b4127eaa55 libbonobouimm-1.3.5.tar.gz 264645
diff --git a/dev-cpp/libbonobouimm/libbonobouimm-1.3.5.ebuild b/dev-cpp/libbonobouimm/libbonobouimm-1.3.5.ebuild
deleted file mode 100644
index 22f410ee34ca..000000000000
--- a/dev-cpp/libbonobouimm/libbonobouimm-1.3.5.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libbonobouimm/libbonobouimm-1.3.5.ebuild,v 1.5 2004/06/24 21:49:37 agriffis Exp $
-
-inherit gnome2
-
-DESCRIPTION="C++ bindings for libbonoboui"
-SRC_URI="mirror://sourceforge/gtkmm/${P}.tar.gz"
-HOMEPAGE="http://gtkmm.sourceforge.net/"
-
-IUSE=""
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="~x86 ~ppc ~sparc"
-
-RDEPEND=">=gnome-base/libbonobo-2.0
-	>=gnome-base/libbonoboui-2.0
-	>=gnome-base/ORBit2-2
-	>=dev-cpp/gtkmm-2.0.0
-	>=dev-cpp/orbitcpp-1.3.5
-	>=dev-cpp/libbonobomm-1.3.5"
-
-DEPEND=">=dev-util/pkgconfig-0.12.0
-	${RDEPEND}"
-
-# Needed for 2.0.0, it misses some make/libtool magic
-export SED=sed
-
-DOCS="AUTHORS COPYING ChangeLog NEWS README TODO INSTALL"
diff --git a/dev-cpp/libbonobouimm/libbonobouimm-1.3.6.ebuild b/dev-cpp/libbonobouimm/libbonobouimm-1.3.6.ebuild
index 7e68d6311acc..8943cb071593 100644
--- a/dev-cpp/libbonobouimm/libbonobouimm-1.3.6.ebuild
+++ b/dev-cpp/libbonobouimm/libbonobouimm-1.3.6.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/dev-cpp/libbonobouimm/libbonobouimm-1.3.6.ebuild,v 1.4 2004/06/24 21:49:37 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libbonobouimm/libbonobouimm-1.3.6.ebuild,v 1.5 2004/08/21 15:52:08 foser Exp $
 
 inherit gnome2
 
@@ -15,7 +15,7 @@ KEYWORDS="~x86 ~ppc ~sparc"
 
 RDEPEND=">=gnome-base/libbonobo-2.0
 	>=gnome-base/libbonoboui-2.0
-	>=gnome-base/ORBit2-2
+	>=gnome-base/orbit-2
 	>=dev-cpp/gtkmm-2.0.0
 	>=dev-cpp/libbonobomm-1.3.6"
 
diff --git a/dev-cpp/orbitcpp/files/digest-orbitcpp-1.3.6 b/dev-cpp/orbitcpp/files/digest-orbitcpp-1.3.6
deleted file mode 100644
index b972b4364c5d..000000000000
--- a/dev-cpp/orbitcpp/files/digest-orbitcpp-1.3.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5dbfd25232aa3b079ffbee9fd5641348 orbitcpp-1.3.6.tar.bz2 273707
diff --git a/dev-cpp/orbitcpp/files/digest-orbitcpp-1.3.7 b/dev-cpp/orbitcpp/files/digest-orbitcpp-1.3.7
deleted file mode 100644
index 9d9204936dba..000000000000
--- a/dev-cpp/orbitcpp/files/digest-orbitcpp-1.3.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 14a23ca4a09a9eea7a2b42d70662d015 orbitcpp-1.3.7.tar.bz2 280213
diff --git a/dev-cpp/orbitcpp/orbitcpp-1.3.6.ebuild b/dev-cpp/orbitcpp/orbitcpp-1.3.6.ebuild
deleted file mode 100644
index 2fbf6bfdf0d5..000000000000
--- a/dev-cpp/orbitcpp/orbitcpp-1.3.6.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/orbitcpp/orbitcpp-1.3.6.ebuild,v 1.4 2004/06/24 21:50:58 agriffis Exp $
-
-inherit gnome.org
-
-DESCRIPTION="C++ Bindings for ORBit2"
-HOMEPAGE="http://orbitcpp.sourceforge.net/"
-LICENSE="LGPL-2.1"
-
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-RDEPEND=">=gnome-base/ORBit2-2.5
-	>=dev-libs/libIDL-0.7.4"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_compile() {
-	econf || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dosym /usr/lib/libORBit-2-cpp.so.6.0.0 /usr/lib/libORBit-2-cpp.so.5
-}
diff --git a/dev-cpp/orbitcpp/orbitcpp-1.3.7.ebuild b/dev-cpp/orbitcpp/orbitcpp-1.3.7.ebuild
deleted file mode 100644
index 74112816f9c0..000000000000
--- a/dev-cpp/orbitcpp/orbitcpp-1.3.7.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/orbitcpp/orbitcpp-1.3.7.ebuild,v 1.5 2004/06/24 21:50:58 agriffis Exp $
-
-inherit gnome.org
-
-DESCRIPTION="C++ Bindings for ORBit2"
-HOMEPAGE="http://orbitcpp.sourceforge.net/"
-LICENSE="LGPL-2.1"
-
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc"
-IUSE=""
-
-RDEPEND=">=gnome-base/ORBit2-2.5
-	>=dev-libs/libIDL-0.7.4"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_compile() {
-	econf || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dosym /usr/lib/libORBit-2-cpp.so.6.0.0 /usr/lib/libORBit-2-cpp.so.5
-}
diff --git a/dev-cpp/orbitcpp/orbitcpp-1.3.9.ebuild b/dev-cpp/orbitcpp/orbitcpp-1.3.9.ebuild
index b3c14e4ccb6b..b25a838bb177 100644
--- a/dev-cpp/orbitcpp/orbitcpp-1.3.9.ebuild
+++ b/dev-cpp/orbitcpp/orbitcpp-1.3.9.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/dev-cpp/orbitcpp/orbitcpp-1.3.9.ebuild,v 1.3 2004/08/09 20:27:47 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/orbitcpp/orbitcpp-1.3.9.ebuild,v 1.4 2004/08/21 15:52:08 foser Exp $
 
 inherit gnome.org
 
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~amd64"
 IUSE=""
 
-RDEPEND=">=gnome-base/ORBit2-2.5
+RDEPEND=">=gnome-base/orbit-2.5
 	>=dev-libs/libIDL-0.7.4"
 
 DEPEND="${RDEPEND}