fix orbit deps & cleanout

16 files changed, 6 insertions, 315 deletions

diff --git a/dev-util/anjuta/Manifest b/dev-util/anjuta/Manifest
index de5bd7a6c6f3..adca227d4ed6 100644
--- a/dev-util/anjuta/Manifest
+++ b/dev-util/anjuta/Manifest
@@ -1,21 +1,8 @@
-MD5 ac019d25bf186f39227efd471e31240f anjuta-1.2.2-r1.ebuild 1456
-MD5 9a498950f5bdcd62344264ee2c07edf5 anjuta-1.2.1.ebuild 1378
-MD5 4177a2cee000ffb53097b361ea1abee1 anjuta-1.0.2.ebuild 1219
-MD5 6838cfff940142e0ab391f5cc8c56258 anjuta-1.2.1-r1.ebuild 1580
-MD5 4463e6c0396118a605357deb7b5545cb anjuta-1.2.0.ebuild 1358
-MD5 939dc2d97f05e5cc55d7d4964a83cdbc anjuta-1.2.0-r1.ebuild 1436
-MD5 63053d78de567c1ced77c8618880121b anjuta-1.2.2.ebuild 1466
+MD5 c318a997173994e7fce1696c2f0a5e78 anjuta-1.2.2-r1.ebuild 1451
+MD5 3558e80ff311882c03f7efc23d3841b5 anjuta-1.0.2.ebuild 1212
 MD5 bd65f3b2bab084580d958fda02a67f4a ChangeLog 5225
 MD5 d15fb5815497bed48e1b2479573388a7 metadata.xml 214
-MD5 2be0d20dddfe8337dd643fd7d45d61c3 files/anjuta-1.2.0.globaltagfix.diff.gz 217
 MD5 e85b6f172c9060236ecad97dd8d434e8 files/digest-anjuta-1.0.2 65
-MD5 b0a44b11bc057a2ca046442055e5bd76 files/digest-anjuta-1.2.0 65
-MD5 96da963356329dc0b96562dbf30ba0cd files/digest-anjuta-1.2.1 65
-MD5 59468c68592ef02f4549bf1347508779 files/digest-anjuta-1.2.2 65
-MD5 9e4dc19186e833fd1022c8ebd3932920 files/anjuta-1.2.1.pass.proper.aclocal.args.diff.gz 292
-MD5 46b29648047d8b6f398457e635e08d92 files/anjuta-1.2.1.fix.cmp.usage.diff.gz 643
 MD5 c9ce5f38f8687ffa06796a4ab3e9c081 files/anjuta-1.2.2-64bit.patch 2711
 MD5 14e73ac6e0c7c2dd18f51c92bbea0f0d files/anjuta-1.2.0_xim.patch 5241
-MD5 b0a44b11bc057a2ca046442055e5bd76 files/digest-anjuta-1.2.0-r1 65
-MD5 96da963356329dc0b96562dbf30ba0cd files/digest-anjuta-1.2.1-r1 65
 MD5 59468c68592ef02f4549bf1347508779 files/digest-anjuta-1.2.2-r1 65
diff --git a/dev-util/anjuta/anjuta-1.0.2.ebuild b/dev-util/anjuta/anjuta-1.0.2.ebuild
index 459a8603e782..5066dc20635b 100644
--- a/dev-util/anjuta/anjuta-1.0.2.ebuild
+++ b/dev-util/anjuta/anjuta-1.0.2.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-util/anjuta/anjuta-1.0.2.ebuild,v 1.10 2004/07/14 22:35:29 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/anjuta/anjuta-1.0.2.ebuild,v 1.11 2004/08/21 16:05:46 foser Exp $
 
 IUSE="nls"
 DESCRIPTION="A versatile Integrated Development Environment (IDE) for C and C++."
@@ -12,7 +12,7 @@ LICENSE="GPL-2"
 KEYWORDS="x86 ~ppc sparc"
 
 RDEPEND="=gnome-base/libglade-0*
-	>=gnome-base/ORBit-0.5.0
+	=gnome-base/orbit-0*
 	>=gnome-base/gnome-print-0.35
 	=gnome-base/gnome-vfs-1.0*
 	>=gnome-base/bonobo-1.0
diff --git a/dev-util/anjuta/anjuta-1.2.0-r1.ebuild b/dev-util/anjuta/anjuta-1.2.0-r1.ebuild
deleted file mode 100644
index 2ee25bf10e98..000000000000
--- a/dev-util/anjuta/anjuta-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/anjuta/anjuta-1.2.0-r1.ebuild,v 1.2 2004/06/25 02:19:06 agriffis Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="A versatile IDE for GNOME"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://anjuta.sourceforge.net/"
-
-IUSE=""
-SLOT="0"
-LICENSE="GPL-2"
-# Future versions will work with 64-bit archs, but 1.2.0 doesn't
-KEYWORDS="x86 ~ppc"
-
-RDEPEND=">=dev-libs/glib-2.0.6
-	>=x11-libs/gtk+-2.0.8
-	>=gnome-base/ORBit2-2.4
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnome-2.0.2
-	>=gnome-base/libgnomeui-2.0.2
-	>=gnome-base/libgnomeprint-2.0.1
-	>=gnome-base/libgnomeprintui-2.0.1
-	>=gnome-base/gnome-vfs-2.0.2
-	>=gnome-base/libbonobo-2
-	>=gnome-base/libbonoboui-2.0.1
-	>=x11-libs/vte-0.9
-	>=dev-libs/libxml2-2.4.23
-	>=x11-libs/pango-1.1.1
-	dev-libs/libpcre
-	app-text/scrollkeeper"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-DOCS="AUTHORS COPYING ChangeLog FUTURE NEWS README THANKS TODO"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}_xim.patch
-	cd ${S}/global-tags
-	epatch ${FILESDIR}/anjuta-1.2.0.globaltagfix.diff.gz
-}
-
-pkg_postinst() {
-
-	gnome2_pkg_postinst
-
-	einfo "Some project templates may require additional development"
-	einfo "libraries to function correctly. It goes beyond the scope"
-	einfo "of this ebuild to provide them."
-
-}
diff --git a/dev-util/anjuta/anjuta-1.2.0.ebuild b/dev-util/anjuta/anjuta-1.2.0.ebuild
deleted file mode 100644
index 8ed4e6f9e318..000000000000
--- a/dev-util/anjuta/anjuta-1.2.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/anjuta/anjuta-1.2.0.ebuild,v 1.6 2004/06/25 02:19:06 agriffis Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="A versatile IDE for GNOME"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://anjuta.sourceforge.net/"
-
-IUSE=""
-SLOT="0"
-LICENSE="GPL-2"
-# Future versions will work with 64-bit archs, but 1.2.0 doesn't
-KEYWORDS="x86 ~ppc"
-
-RDEPEND=">=dev-libs/glib-2.0.6
-	>=x11-libs/gtk+-2.0.8
-	>=gnome-base/ORBit2-2.4
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnome-2.0.2
-	>=gnome-base/libgnomeui-2.0.2
-	>=gnome-base/libgnomeprint-2.0.1
-	>=gnome-base/libgnomeprintui-2.0.1
-	>=gnome-base/gnome-vfs-2.0.2
-	>=gnome-base/libbonobo-2
-	>=gnome-base/libbonoboui-2.0.1
-	>=x11-libs/vte-0.9
-	>=dev-libs/libxml2-2.4.23
-	>=x11-libs/pango-1.1.1
-	dev-libs/libpcre
-	app-text/scrollkeeper"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-DOCS="AUTHORS COPYING ChangeLog FUTURE NEWS README THANKS TODO"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}_xim.patch
-}
-
-pkg_postinst() {
-
-	gnome2_pkg_postinst
-
-	einfo "Some project templates may require additional development"
-	einfo "libraries to function correctly. It goes beyond the scope"
-	einfo "of this ebuild to provide them."
-
-}
diff --git a/dev-util/anjuta/anjuta-1.2.1-r1.ebuild b/dev-util/anjuta/anjuta-1.2.1-r1.ebuild
deleted file mode 100644
index 246a9bd6e9ee..000000000000
--- a/dev-util/anjuta/anjuta-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/anjuta/anjuta-1.2.1-r1.ebuild,v 1.3 2004/06/25 02:19:06 agriffis Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="A versatile IDE for GNOME"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://anjuta.sourceforge.net/"
-
-IUSE=""
-SLOT="0"
-LICENSE="GPL-2"
-# Future versions will work with 64-bit archs, but 1.2.0 doesn't
-KEYWORDS="~x86 ~ppc sparc ~amd64"
-
-RDEPEND=">=dev-libs/glib-2.0.6
-	>=x11-libs/gtk+-2.0.8
-	>=gnome-base/ORBit2-2.4
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnome-2.0.2
-	>=gnome-base/libgnomeui-2.0.2
-	>=gnome-base/libgnomeprint-2.0.1
-	>=gnome-base/libgnomeprintui-2.0.1
-	>=gnome-base/gnome-vfs-2.0.2
-	>=gnome-base/libbonobo-2
-	>=gnome-base/libbonoboui-2.0.1
-	>=x11-libs/vte-0.9
-	>=dev-libs/libxml2-2.4.23
-	>=x11-libs/pango-1.1.1
-	dev-libs/libpcre
-	app-text/scrollkeeper"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-DOCS="AUTHORS COPYING ChangeLog FUTURE NEWS README THANKS TODO"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-#       epatch ${FILESDIR}/${P}_xim.patch
-	epatch ${FILESDIR}/anjuta-1.2.1.fix.cmp.usage.diff.gz
-	epatch ${FILESDIR}/anjuta-1.2.1.pass.proper.aclocal.args.diff.gz
-
-	cd ${S}/global-tags
-	epatch ${FILESDIR}/anjuta-1.2.0.globaltagfix.diff.gz
-}
-
-pkg_postinst() {
-
-	gnome2_pkg_postinst
-
-	einfo "Some project templates may require additional development"
-	einfo "libraries to function correctly. It goes beyond the scope"
-	einfo "of this ebuild to provide them."
-
-}
diff --git a/dev-util/anjuta/anjuta-1.2.1.ebuild b/dev-util/anjuta/anjuta-1.2.1.ebuild
deleted file mode 100644
index bfc8ff13c070..000000000000
--- a/dev-util/anjuta/anjuta-1.2.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/anjuta/anjuta-1.2.1.ebuild,v 1.4 2004/06/25 02:19:06 agriffis Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="A versatile IDE for GNOME"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://anjuta.sourceforge.net/"
-
-IUSE=""
-SLOT="0"
-LICENSE="GPL-2"
-# Future versions will work with 64-bit archs, but 1.2.0 doesn't
-KEYWORDS="~x86 ~ppc sparc ~amd64"
-
-RDEPEND=">=dev-libs/glib-2.0.6
-	>=x11-libs/gtk+-2.0.8
-	>=gnome-base/ORBit2-2.4
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnome-2.0.2
-	>=gnome-base/libgnomeui-2.0.2
-	>=gnome-base/libgnomeprint-2.0.1
-	>=gnome-base/libgnomeprintui-2.0.1
-	>=gnome-base/gnome-vfs-2.0.2
-	>=gnome-base/libbonobo-2
-	>=gnome-base/libbonoboui-2.0.1
-	>=x11-libs/vte-0.9
-	>=dev-libs/libxml2-2.4.23
-	>=x11-libs/pango-1.1.1
-	dev-libs/libpcre
-	app-text/scrollkeeper"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-DOCS="AUTHORS COPYING ChangeLog FUTURE NEWS README THANKS TODO"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-#src_unpack() {
-#	unpack ${A}
-#
-#	cd ${S}
-#	epatch ${FILESDIR}/${P}_xim.patch
-#}
-
-pkg_postinst() {
-
-	gnome2_pkg_postinst
-
-	einfo "Some project templates may require additional development"
-	einfo "libraries to function correctly. It goes beyond the scope"
-	einfo "of this ebuild to provide them."
-
-}
diff --git a/dev-util/anjuta/anjuta-1.2.2-r1.ebuild b/dev-util/anjuta/anjuta-1.2.2-r1.ebuild
index 953a6f80e449..9667a217c3d4 100644
--- a/dev-util/anjuta/anjuta-1.2.2-r1.ebuild
+++ b/dev-util/anjuta/anjuta-1.2.2-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/dev-util/anjuta/anjuta-1.2.2-r1.ebuild,v 1.1 2004/07/03 14:07:16 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/anjuta/anjuta-1.2.2-r1.ebuild,v 1.2 2004/08/21 16:05:46 foser Exp $
 
 inherit eutils gnome2
 
@@ -16,7 +16,7 @@ KEYWORDS="x86 ~ppc sparc ~amd64"
 
 RDEPEND=">=dev-libs/glib-2.0.6
 	>=x11-libs/gtk+-2.0.8
-	>=gnome-base/ORBit2-2.4
+	>=gnome-base/orbit-2.4
 	>=gnome-base/libglade-2
 	>=gnome-base/libgnome-2.0.2
 	>=gnome-base/libgnomeui-2.0.2
diff --git a/dev-util/anjuta/anjuta-1.2.2.ebuild b/dev-util/anjuta/anjuta-1.2.2.ebuild
deleted file mode 100644
index 90729b8bfdcd..000000000000
--- a/dev-util/anjuta/anjuta-1.2.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/anjuta/anjuta-1.2.2.ebuild,v 1.6 2004/07/03 13:20:06 kugelfang Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="A versatile IDE for GNOME"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://anjuta.sourceforge.net/"
-
-IUSE=""
-SLOT="0"
-LICENSE="GPL-2"
-# Future versions will work with 64-bit archs, but 1.2.0 doesn't
-KEYWORDS="x86 ~ppc sparc ~amd64"
-
-RDEPEND=">=dev-libs/glib-2.0.6
-	>=x11-libs/gtk+-2.0.8
-	>=gnome-base/ORBit2-2.4
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnome-2.0.2
-	>=gnome-base/libgnomeui-2.0.2
-	>=gnome-base/libgnomeprint-2.0.1
-	>=gnome-base/libgnomeprintui-2.0.1
-	>=gnome-base/gnome-vfs-2.0.2
-	>=gnome-base/libbonobo-2
-	>=gnome-base/libbonoboui-2.0.1
-	>=x11-libs/vte-0.9
-	>=dev-libs/libxml2-2.4.23
-	>=x11-libs/pango-1.1.1
-	dev-libs/libpcre
-	app-text/scrollkeeper"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-DOCS="AUTHORS COPYING ChangeLog FUTURE NEWS README THANKS TODO"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-#lets see if this plays nice this version
-#	epatch ${FILESDIR}/${P}_xim.patch
-
-	use amd64 && epatch ${FILESDIR}/${P}-64bit.patch
-}
-
-pkg_postinst() {
-
-	gnome2_pkg_postinst
-
-	einfo "Some project templates may require additional development"
-	einfo "libraries to function correctly. It goes beyond the scope"
-	einfo "of this ebuild to provide them."
-
-}
diff --git a/dev-util/anjuta/files/anjuta-1.2.0.globaltagfix.diff.gz b/dev-util/anjuta/files/anjuta-1.2.0.globaltagfix.diff.gz
deleted file mode 100644
index f89640ea9a26..000000000000
--- a/dev-util/anjuta/files/anjuta-1.2.0.globaltagfix.diff.gz
+++ /dev/null
diff --git a/dev-util/anjuta/files/anjuta-1.2.1.fix.cmp.usage.diff.gz b/dev-util/anjuta/files/anjuta-1.2.1.fix.cmp.usage.diff.gz
deleted file mode 100644
index 667b4291a439..000000000000
--- a/dev-util/anjuta/files/anjuta-1.2.1.fix.cmp.usage.diff.gz
+++ /dev/null
diff --git a/dev-util/anjuta/files/anjuta-1.2.1.pass.proper.aclocal.args.diff.gz b/dev-util/anjuta/files/anjuta-1.2.1.pass.proper.aclocal.args.diff.gz
deleted file mode 100644
index 96cd41884185..000000000000
--- a/dev-util/anjuta/files/anjuta-1.2.1.pass.proper.aclocal.args.diff.gz
+++ /dev/null
diff --git a/dev-util/anjuta/files/digest-anjuta-1.2.0 b/dev-util/anjuta/files/digest-anjuta-1.2.0
deleted file mode 100644
index d6c78cfad69f..000000000000
--- a/dev-util/anjuta/files/digest-anjuta-1.2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5ba4547bd71dd9c6d19006913623680e anjuta-1.2.0.tar.gz 7738588
diff --git a/dev-util/anjuta/files/digest-anjuta-1.2.0-r1 b/dev-util/anjuta/files/digest-anjuta-1.2.0-r1
deleted file mode 100644
index d6c78cfad69f..000000000000
--- a/dev-util/anjuta/files/digest-anjuta-1.2.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5ba4547bd71dd9c6d19006913623680e anjuta-1.2.0.tar.gz 7738588
diff --git a/dev-util/anjuta/files/digest-anjuta-1.2.1 b/dev-util/anjuta/files/digest-anjuta-1.2.1
deleted file mode 100644
index a4ee3c2f7900..000000000000
--- a/dev-util/anjuta/files/digest-anjuta-1.2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f74a86d4541e0f55115be9de66d8c2c4 anjuta-1.2.1.tar.gz 8013051
diff --git a/dev-util/anjuta/files/digest-anjuta-1.2.1-r1 b/dev-util/anjuta/files/digest-anjuta-1.2.1-r1
deleted file mode 100644
index a4ee3c2f7900..000000000000
--- a/dev-util/anjuta/files/digest-anjuta-1.2.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f74a86d4541e0f55115be9de66d8c2c4 anjuta-1.2.1.tar.gz 8013051
diff --git a/dev-util/anjuta/files/digest-anjuta-1.2.2 b/dev-util/anjuta/files/digest-anjuta-1.2.2
deleted file mode 100644
index 1276bcb03e27..000000000000
--- a/dev-util/anjuta/files/digest-anjuta-1.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a30858dba0b902064d0d702cedfdc84f anjuta-1.2.2.tar.gz 8556051