7 files changed, 22 insertions, 55 deletions
diff --git a/gnome-base/orbit/ChangeLog b/gnome-base/orbit/ChangeLog
index 9bdcc667a161..d1070d7da01e 100644
--- a/gnome-base/orbit/ChangeLog
+++ b/gnome-base/orbit/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/orbit
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/ChangeLog,v 1.30 2005/07/31 22:11:54 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/ChangeLog,v 1.31 2005/08/16 20:33:40 leonardop Exp $
+
+*orbit-2.12.3 (16 Aug 2005)
+
+  16 Aug 2005; Leonardo Boshell <leonardop@gentoo.org> +orbit-2.12.3.ebuild:
+  New version. Added 'static' USE flag.
 
   31 Jul 2005; John N. Laliberte <allanonjl@gentoo.org> orbit-2.12.0.ebuild:
   Add back indent for 2.12.0 only, this version still needs it.
diff --git a/gnome-base/orbit/Manifest b/gnome-base/orbit/Manifest
index cb9284f25c6f..7e04a421514b 100644
--- a/gnome-base/orbit/Manifest
+++ b/gnome-base/orbit/Manifest
@@ -1,11 +1,10 @@
-MD5 e3a8dc018eb029f302884b2fc80adf56 orbit-2.12.2.ebuild 1017
-MD5 6f6fa3795d0324df35315d2215d55248 orbit-0.5.17.ebuild 1650
-MD5 d40a858ca12ad21c80148cd58630a1ee orbit-2.12.1.ebuild 1017
 MD5 0a9b18b7f437b0af16d9339c835dd22a ChangeLog 3508
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 f97863fe20a93ca009cce12093900e94 orbit-2.12.0.ebuild 1129
+MD5 6f6fa3795d0324df35315d2215d55248 orbit-0.5.17.ebuild 1650
+MD5 ed3bb40eb7415c1ebbb5092aeccf9db9 orbit-2.12.3.ebuild 1020
+MD5 e3a8dc018eb029f302884b2fc80adf56 orbit-2.12.2.ebuild 1017
+MD5 f648c361f5f60813331c9adfa5e2d7ab .orbit-2.12.3.ebuild.swp 12288
 MD5 51bfc1efb763de186ee1b1f1e594891a files/digest-orbit-0.5.17 66
-MD5 56089adf3d4cbee72a699b2f8ade07ca files/digest-orbit-2.12.0 66
-MD5 37466577b20f8ae228826573b3346263 files/digest-orbit-2.12.1 66
+MD5 855e570b505cfbb5e8748ba5baf471bc files/digest-orbit-2.12.3 66
 MD5 66a18f0f92e9cd0f658690bf1e5c862c files/digest-orbit-2.12.2 66
 MD5 7105f3bdc076c48f0458e20ea8eaba34 files/orbit-0.5.17-m4.patch 472
diff --git a/gnome-base/orbit/files/digest-orbit-2.12.0 b/gnome-base/orbit/files/digest-orbit-2.12.0
deleted file mode 100644
index 522287755a59..000000000000
--- a/gnome-base/orbit/files/digest-orbit-2.12.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d7f0c2b9bee73b89978a9968c10f81fe ORBit2-2.12.0.tar.bz2 666898
diff --git a/gnome-base/orbit/files/digest-orbit-2.12.1 b/gnome-base/orbit/files/digest-orbit-2.12.1
deleted file mode 100644
index 6ebd5b71d847..000000000000
--- a/gnome-base/orbit/files/digest-orbit-2.12.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 30ede62e194f692f2dd3daa09c752196 ORBit2-2.12.1.tar.bz2 675822
diff --git a/gnome-base/orbit/files/digest-orbit-2.12.3 b/gnome-base/orbit/files/digest-orbit-2.12.3
new file mode 100644
index 000000000000..fb0b6d82783a
--- /dev/null
+++ b/gnome-base/orbit/files/digest-orbit-2.12.3
@@ -0,0 +1 @@
+MD5 cf3b29a2120260bb86995ef10e05e3b8 ORBit2-2.12.3.tar.bz2 678366
diff --git a/gnome-base/orbit/orbit-2.12.0.ebuild b/gnome-base/orbit/orbit-2.12.0.ebuild
deleted file mode 100644
index 7a640e6798a6..000000000000
--- a/gnome-base/orbit/orbit-2.12.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/orbit-2.12.0.ebuild,v 1.13 2005/07/31 22:11:54 allanonjl Exp $
-
-inherit gnome2 eutils
-
-MY_P="ORBit2-${PV}"
-PVP=(${PV//[-\._]/ })
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="ORBit2 is a high-performance CORBA ORB"
-HOMEPAGE="http://www.gnome.org/"
-SRC_URI="mirror://gnome/sources/ORBit2/${PVP[0]}.${PVP[1]}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ~ppc64 sparc x86"
-IUSE="doc ssl"
-
-RDEPEND=">=dev-libs/glib-2
-	>=dev-libs/popt-1.5
-	>=dev-libs/libIDL-0.8.2
-	dev-util/indent
-	ssl? ( >=dev-libs/openssl-0.9.6 )"
-
-#libIDL dep in configure.in is wrong
-#needs at least 0.8.2, see bug #73521 <joem@gentoo.org>
-
-# FIXME linc is now integrated, but a block isn't necessary
-# and probably complicated FIXME
-
-# FIXME ssl is optional, but not switchable
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.14
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-USE_DESTDIR="1"
-
-DOCS="AUTHORS ChangeLog README HACKING NEWS TODO MAINTAINERS"
diff --git a/gnome-base/orbit/orbit-2.12.1.ebuild b/gnome-base/orbit/orbit-2.12.3.ebuild
index f35e9c89351b..a15c8ed088ef 100644
--- a/gnome-base/orbit/orbit-2.12.1.ebuild
+++ b/gnome-base/orbit/orbit-2.12.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/orbit-2.12.1.ebuild,v 1.9 2005/07/30 12:30:26 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/orbit-2.12.3.ebuild,v 1.1 2005/08/16 20:33:40 leonardop Exp $
 
-inherit gnome2 eutils
+inherit gnome2
 
 MY_P="ORBit2-${PV}"
 PVP=(${PV//[-\._]/ })
@@ -14,8 +14,8 @@ SRC_URI="mirror://gnome/sources/ORBit2/${PVP[0]}.${PVP[1]}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ~ppc64 sparc x86"
-IUSE="doc ssl"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc ssl static"
 
 RDEPEND=">=dev-libs/glib-2
 	>=dev-libs/popt-1.5
@@ -34,4 +34,9 @@ DEPEND="${RDEPEND}
 MAKEOPTS="${MAKEOPTS} -j1"
 USE_DESTDIR="1"
 
-DOCS="AUTHORS ChangeLog README HACKING NEWS TODO MAINTAINERS"
+DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README TODO"
+
+
+pkg_setup() {
+	G2CONF="$(use_enable static)"
+}