gnome 2.6 commit

15 files changed, 23 insertions, 162 deletions

diff --git a/gnome-base/libbonobo/ChangeLog b/gnome-base/libbonobo/ChangeLog
index 7be8b2c57fba..8187c703c587 100644
--- a/gnome-base/libbonobo/ChangeLog
+++ b/gnome-base/libbonobo/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/libbonobo
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libbonobo/ChangeLog,v 1.46 2004/03/09 23:23:00 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libbonobo/ChangeLog,v 1.47 2004/03/19 16:09:45 foser Exp $
+
+*libbonobo-2.6.0 (19 Mar 2004)
+
+  19 Mar 2004; foser <foser@gentoo.org> libbonobo-2.6.0.ebuild :
+  Gnome 2.6 commit
 
   09 Mar 2004; <agriffis@gentoo.org> libbonobo-2.4.3.ebuild:
   stable on alpha and ia64
diff --git a/gnome-base/libbonobo/Manifest b/gnome-base/libbonobo/Manifest
index d630c32b520a..08270976e23d 100644
--- a/gnome-base/libbonobo/Manifest
+++ b/gnome-base/libbonobo/Manifest
@@ -1,13 +1,14 @@
-MD5 78133dc2a24d5bcc25682d579708bbe2 libbonobo-2.0.0-r1.ebuild 824
-MD5 40bbcf72e5f5aef021aef9a996d9f193 libbonobo-2.2.1.ebuild 707
 MD5 418925b93c7de5104f2ece803a391e22 libbonobo-2.2.2.ebuild 720
-MD5 e547b8a3b1bff1214e7f9881edf242e1 libbonobo-2.2.3.ebuild 701
+MD5 7edbddb9d00110082ba8c1052ff54e7b libbonobo-2.4.3.ebuild 771
 MD5 3b37432dac31e5b326b360726c175b1e libbonobo-2.4.0.ebuild 731
-MD5 a3ecb2f2529d84d5d90c4e4a2d4ce3d3 libbonobo-2.4.1.ebuild 730
+MD5 40bbcf72e5f5aef021aef9a996d9f193 libbonobo-2.2.1.ebuild 707
 MD5 042897bcd7d4f9a6599d81f0433a2e0b libbonobo-2.4.2.ebuild 764
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 e547b8a3b1bff1214e7f9881edf242e1 libbonobo-2.2.3.ebuild 701
+MD5 4f2ebc48e5e6be1aa4129c90dfeb9048 libbonobo-2.6.0.ebuild 713
 MD5 e5d218cf3802a2170df0c578e30cddfe ChangeLog 5098
-MD5 7edbddb9d00110082ba8c1052ff54e7b libbonobo-2.4.3.ebuild 771
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 a3ecb2f2529d84d5d90c4e4a2d4ce3d3 libbonobo-2.4.1.ebuild 730
+MD5 78133dc2a24d5bcc25682d579708bbe2 libbonobo-2.0.0-r1.ebuild 824
 MD5 e23f2f45a545cf4aad4d06204b8c30cb files/digest-libbonobo-2.0.0-r1 68
 MD5 e187b58f66aa7516c0f1a1cb6a6d21ac files/digest-libbonobo-2.2.1 68
 MD5 6f8198a3a1eab35c1c41e684d9eade65 files/digest-libbonobo-2.2.2 68
@@ -16,3 +17,4 @@ MD5 459e143116e6c24cb2b8ba09ecbee242 files/digest-libbonobo-2.4.0 69
 MD5 b687f79d60ac9b476915a8a986442731 files/digest-libbonobo-2.4.1 69
 MD5 828bf9459d163e0c2813b0a44632431a files/digest-libbonobo-2.4.2 69
 MD5 fd8f9a004c154106e0b886f3b045e4d0 files/digest-libbonobo-2.4.3 69
+MD5 d00579a88148c3e02f1885ca96bdec7b files/digest-libbonobo-2.6.0 69
diff --git a/gnome-base/libbonobo/files/digest-libbonobo-2.0.0-r1 b/gnome-base/libbonobo/files/digest-libbonobo-2.0.0-r1
deleted file mode 100644
index a64bedf5af6b..000000000000
--- a/gnome-base/libbonobo/files/digest-libbonobo-2.0.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fee1e4af2e5f04a7f6bcce6c066de957 libbonobo-2.0.0.tar.bz2 470293
diff --git a/gnome-base/libbonobo/files/digest-libbonobo-2.2.1 b/gnome-base/libbonobo/files/digest-libbonobo-2.2.1
deleted file mode 100644
index dbdc4aaec2a4..000000000000
--- a/gnome-base/libbonobo/files/digest-libbonobo-2.2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3aab63a34cbadbd07e0e75c2cf8b2ade libbonobo-2.2.1.tar.bz2 570648
diff --git a/gnome-base/libbonobo/files/digest-libbonobo-2.2.2 b/gnome-base/libbonobo/files/digest-libbonobo-2.2.2
deleted file mode 100644
index 35456a32a098..000000000000
--- a/gnome-base/libbonobo/files/digest-libbonobo-2.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1fd7c140e54f3e079fc5d0b5ad8d5811 libbonobo-2.2.2.tar.bz2 598631
diff --git a/gnome-base/libbonobo/files/digest-libbonobo-2.2.3 b/gnome-base/libbonobo/files/digest-libbonobo-2.2.3
deleted file mode 100644
index e9ae4a73a2ed..000000000000
--- a/gnome-base/libbonobo/files/digest-libbonobo-2.2.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 706e3f722dc5ece02ae27c14984d9810 libbonobo-2.2.3.tar.bz2 576647
diff --git a/gnome-base/libbonobo/files/digest-libbonobo-2.4.1 b/gnome-base/libbonobo/files/digest-libbonobo-2.4.1
deleted file mode 100644
index 70e93f555fb3..000000000000
--- a/gnome-base/libbonobo/files/digest-libbonobo-2.4.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d3c2aed5a376f171c608f2c9f4866caf libbonobo-2.4.1.tar.bz2 1360447
diff --git a/gnome-base/libbonobo/files/digest-libbonobo-2.4.2 b/gnome-base/libbonobo/files/digest-libbonobo-2.4.2
deleted file mode 100644
index ddd7374ce206..000000000000
--- a/gnome-base/libbonobo/files/digest-libbonobo-2.4.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 78200cc6ed588c93f0d29177a5f3e003 libbonobo-2.4.2.tar.bz2 1359309
diff --git a/gnome-base/libbonobo/files/digest-libbonobo-2.6.0 b/gnome-base/libbonobo/files/digest-libbonobo-2.6.0
new file mode 100644
index 000000000000..494e460f812b
--- /dev/null
+++ b/gnome-base/libbonobo/files/digest-libbonobo-2.6.0
@@ -0,0 +1 @@
+MD5 078942cb9c6a1a31f93958e993353f45 libbonobo-2.6.0.tar.bz2 1059444
diff --git a/gnome-base/libbonobo/libbonobo-2.0.0-r1.ebuild b/gnome-base/libbonobo/libbonobo-2.0.0-r1.ebuild
deleted file mode 100644
index 696666374b97..000000000000
--- a/gnome-base/libbonobo/libbonobo-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libbonobo/libbonobo-2.0.0-r1.ebuild,v 1.12 2004/02/18 13:43:05 agriffis Exp $
-
-IUSE="doc"
-
-inherit gnome2
-
-S=${WORKDIR}/${P}
-DESCRIPTION="a CORBA framework "
-SRC_URI="mirror://gnome/2.0.0/sources/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://www.gnome.org/"
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha"
-LICENSE="LGPL-2.1 GPL-2"
-
-RDEPEND=">=dev-libs/glib-2.0.0
-	>=gnome-base/ORBit2-2.4.0
-	>=gnome-base/bonobo-activation-1.0.0"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.17
-	doc? ( >=dev-util/gtk-doc-0.9-r2 )"
-
-DOCS="AUTHORS COPYING* ChangeLog INSTALL NEWS README TODO"
-src_compile () {
-	gnome2_src_configure
-	make || die "serial make failure"
-
-}
-
diff --git a/gnome-base/libbonobo/libbonobo-2.2.1.ebuild b/gnome-base/libbonobo/libbonobo-2.2.1.ebuild
deleted file mode 100644
index 1f7298343f1e..000000000000
--- a/gnome-base/libbonobo/libbonobo-2.2.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libbonobo/libbonobo-2.2.1.ebuild,v 1.5 2004/02/18 13:43:05 agriffis Exp $
-
-IUSE="doc"
-
-inherit gnome2
-
-S=${WORKDIR}/${P}
-DESCRIPTION="a CORBA framework "
-HOMEPAGE="http://www.gnome.org/"
-SLOT="0"
-KEYWORDS="x86 ppc ~alpha sparc"
-LICENSE="LGPL-2.1 GPL-2"
-
-RDEPEND=">=dev-libs/glib-2.0.1
-	>=gnome-base/ORBit2-2.4.0
-	>=gnome-base/bonobo-activation-1"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.17
-	doc? ( >=dev-util/gtk-doc-0.10 )"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-DOCS="AUTHORS COPYING* ChangeLog INSTALL NEWS README TODO"
diff --git a/gnome-base/libbonobo/libbonobo-2.2.2.ebuild b/gnome-base/libbonobo/libbonobo-2.2.2.ebuild
deleted file mode 100644
index 47827fec0bd8..000000000000
--- a/gnome-base/libbonobo/libbonobo-2.2.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libbonobo/libbonobo-2.2.2.ebuild,v 1.5 2004/02/18 13:43:05 agriffis Exp $
-
-IUSE="doc"
-
-inherit gnome2
-
-S=${WORKDIR}/${P}
-DESCRIPTION="a CORBA framework "
-HOMEPAGE="http://www.gnome.org/"
-SLOT="0"
-KEYWORDS="x86 ~ppc ~alpha ~sparc hppa amd64"
-LICENSE="LGPL-2.1 GPL-2"
-
-RDEPEND=">=dev-libs/glib-2.0.1
-	>=gnome-base/ORBit2-2.4.0
-	>=gnome-base/bonobo-activation-1"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.17
-	doc? ( >=dev-util/gtk-doc-0.10 )"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-DOCS="AUTHORS COPYING* ChangeLog INSTALL NEWS README TODO"
diff --git a/gnome-base/libbonobo/libbonobo-2.2.3.ebuild b/gnome-base/libbonobo/libbonobo-2.2.3.ebuild
deleted file mode 100644
index c2fb502fde31..000000000000
--- a/gnome-base/libbonobo/libbonobo-2.2.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libbonobo/libbonobo-2.2.3.ebuild,v 1.7 2004/02/18 13:43:05 agriffis Exp $
-
-IUSE="doc"
-
-inherit gnome2
-
-S=${WORKDIR}/${P}
-DESCRIPTION="The GNOME CORBA framework"
-HOMEPAGE="http://www.gnome.org/"
-SLOT="0"
-KEYWORDS="x86 ppc alpha ~sparc ~hppa ~amd64"
-LICENSE="LGPL-2.1 GPL-2"
-
-RDEPEND=">=dev-libs/glib-2.0.1
-	>=gnome-base/ORBit2-2.4.0
-	>=gnome-base/bonobo-activation-1"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	doc? ( >=dev-util/gtk-doc-0.10 )"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-DOCS="AUTHORS COPYING* ChangeLog INSTALL NEWS README TODO"
diff --git a/gnome-base/libbonobo/libbonobo-2.4.2.ebuild b/gnome-base/libbonobo/libbonobo-2.4.2.ebuild
deleted file mode 100644
index 526045b2cc83..000000000000
--- a/gnome-base/libbonobo/libbonobo-2.4.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libbonobo/libbonobo-2.4.2.ebuild,v 1.6 2004/01/29 04:46:51 agriffis Exp $
-
-inherit gnome2
-
-DESCRIPTION="GNOME CORBA framework "
-HOMEPAGE="http://www.gnome.org/"
-
-IUSE="doc"
-SLOT="0"
-KEYWORDS="x86 ppc alpha sparc hppa ~amd64 ia64"
-LICENSE="LGPL-2.1 GPL-2"
-
-RDEPEND=">=dev-libs/glib-2.0.1
-	>=gnome-base/ORBit2-2.8
-	>=dev-libs/libxml2-2.4.20
-	!gnome-base/bonobo-activation"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.17
-	doc? ( >=dev-util/gtk-doc-0.10 )"
-
-# comment out next bump (#31708)
-MAKEOPTS="${MAKEOPTS} -j1"
-
-DOCS="AUTHORS COPYING* ChangeLog INSTALL NEWS README TODO"
diff --git a/gnome-base/libbonobo/libbonobo-2.4.1.ebuild b/gnome-base/libbonobo/libbonobo-2.6.0.ebuild
index 285e6e1fa326..de8026693008 100644
--- a/gnome-base/libbonobo/libbonobo-2.4.1.ebuild
+++ b/gnome-base/libbonobo/libbonobo-2.6.0.ebuild
@@ -1,27 +1,26 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libbonobo/libbonobo-2.4.1.ebuild,v 1.3 2004/02/18 13:43:05 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libbonobo/libbonobo-2.6.0.ebuild,v 1.1 2004/03/19 16:09:45 foser Exp $
 
 inherit gnome2
 
-DESCRIPTION="GNOME CORBA framework "
+DESCRIPTION="GNOME CORBA framework"
 HOMEPAGE="http://www.gnome.org/"
 
 IUSE="doc"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc hppa ~amd64"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64 ~ia64 ~mips"
 LICENSE="LGPL-2.1 GPL-2"
 
-RDEPEND=">=dev-libs/glib-2.0.1
-	>=gnome-base/ORBit2-2.8
+RDEPEND=">=dev-libs/glib-2.3.2
+	>=gnome-base/ORBit2-2.9.2
 	>=dev-libs/libxml2-2.4.20
+	dev-libs/popt
 	!gnome-base/bonobo-activation"
 
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.17
-	doc? ( >=dev-util/gtk-doc-0.10 )"
-
-MAKEOPTS="${MAKEOPTS} -j1"
+	>=dev-util/intltool-0.29
+	doc? ( >=dev-util/gtk-doc-1 )"
 
 DOCS="AUTHORS COPYING* ChangeLog INSTALL NEWS README TODO"