move gtk+ apps to /usr and use gtk+-1.2.10-r4, #3

12 files changed, 21 insertions, 87 deletions

diff --git a/dev-python/bonobo-python/bonobo-python-0.2.0.ebuild b/dev-python/bonobo-python/bonobo-python-0.2.0-r1.ebuild
index 57d80ae5fc1d..653aab6558c0 100644
--- a/dev-python/bonobo-python/bonobo-python-0.2.0.ebuild
+++ b/dev-python/bonobo-python/bonobo-python-0.2.0-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Mikael Hallendal <micke@hallendal.net>
-# $Header: /var/cvsroot/gentoo-x86/dev-python/bonobo-python/bonobo-python-0.2.0.ebuild,v 1.1 2001/08/22 19:18:30 hallski Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bonobo-python/bonobo-python-0.2.0-r1.ebuild,v 1.1 2001/10/06 11:24:06 azarah Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -9,16 +9,16 @@ DESCRIPTION="Bonobo bindings for Python"
 SRC_URI="http://theta.lajnux.nu/bonobo-python/download/${A}"
 HOMEPAGE="http://theta.lajnux.nu/bonobo-python/"
 
-DEPEND=">=x11-libs/gtk+-1.2.6
-	>=gnome-base/bonobo-1.0.0
-	>=dev-python/gnome-python-1.3.1
-	>=dev-python/orbit-python-0.3.0
+DEPEND=">=x11-libs/gtk+-1.2.10-r4
+	>=gnome-base/bonobo-1.0.9-r1
+	>=dev-python/gnome-python-1.4.1-r2
+	>=dev-python/orbit-python-0.3.0-r1
 	virtual/python"
 
 src_compile() {
   PYTHON="/usr/bin/python" try ./configure --host=${CHOST} --prefix=/usr  \
-	--with-libIDL-prefix=/opt/gnome --with-orbit-prefix=/opt/gnome 	  \
-	--with-oaf-prefix=/opt/gnome
+	--with-libIDL-prefix=/usr --with-orbit-prefix=/usr 	  \
+	--with-oaf-prefix=/usr
   try make
 }
 
diff --git a/dev-python/bonobo-python/files/digest-bonobo-python-0.2.0 b/dev-python/bonobo-python/files/digest-bonobo-python-0.2.0-r1
index 9926ab43a21b..9926ab43a21b 100644
--- a/dev-python/bonobo-python/files/digest-bonobo-python-0.2.0
+++ b/dev-python/bonobo-python/files/digest-bonobo-python-0.2.0-r1
diff --git a/dev-python/gnome-python/files/digest-gnome-python-1.4.1-r1 b/dev-python/gnome-python/files/digest-gnome-python-1.4.1-r1
deleted file mode 100644
index 821fcc40a094..000000000000
--- a/dev-python/gnome-python/files/digest-gnome-python-1.4.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 52f8b5ef4cbdaba3c00c08e28702be69 gnome-python-1.4.1.tar.gz
diff --git a/dev-python/gnome-python/files/digest-gnome-python-1.4.1 b/dev-python/gnome-python/files/digest-gnome-python-1.4.1-r2
index 821fcc40a094..821fcc40a094 100644
--- a/dev-python/gnome-python/files/digest-gnome-python-1.4.1
+++ b/dev-python/gnome-python/files/digest-gnome-python-1.4.1-r2
diff --git a/dev-python/gnome-python/gnome-python-1.4.1-r1.ebuild b/dev-python/gnome-python/gnome-python-1.4.1-r2.ebuild
index bd76e0072e82..3a5c24775b7c 100644
--- a/dev-python/gnome-python/gnome-python-1.4.1-r1.ebuild
+++ b/dev-python/gnome-python/gnome-python-1.4.1-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-python/gnome-python/gnome-python-1.4.1-r1.ebuild,v 1.2 2001/10/03 19:49:25 hallski Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gnome-python/gnome-python-1.4.1-r2.ebuild,v 1.1 2001/10/06 11:24:06 azarah Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -10,11 +10,11 @@ SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/latest/sources/"${A}
 HOMEPAGE="http://www.gnome.org"
 
 DEPEND="virtual/python
-	>=x11-libs/gtk+-1.2.6
-	>=media-libs/imlib-1.8.10
-	gnome? ( >=gnome-base/gnome-core-1.4.0 
-		 >=gnome-base/libglade-0.16 )
-        opengl? ( >=x11-libs/gtkglarea-1.2.2 )"
+	>=x11-libs/gtk+-1.2.10-r4
+	>=media-libs/imlib-1.9.10-r1
+	gnome? ( >=gnome-base/gnome-core-1.4.0.4-r1 
+		 >=gnome-base/libglade-0.17-r1 )
+        opengl? ( >=x11-libs/gtkglarea-1.2.2-r1 )"
 
 src_compile() {
 
diff --git a/dev-python/gnome-python/gnome-python-1.4.1.ebuild b/dev-python/gnome-python/gnome-python-1.4.1.ebuild
deleted file mode 100644
index 6d9700e40c5b..000000000000
--- a/dev-python/gnome-python/gnome-python-1.4.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-python/gnome-python/gnome-python-1.4.1.ebuild,v 1.4 2001/06/04 21:57:52 achim Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="gnome-python"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/latest/sources/"${A}
-HOMEPAGE="http://www.gnome.org"
-
-DEPEND=">=gnome-base/gnome-core-1.4.0
-        opengl? ( >=x11-libs/gtkglarea-1.2.2 )
-	virtual/python"
-
-src_compile() {
-  PYTHON="/usr/bin/python" try ./configure --host=${CHOST} --prefix=/usr \
-    --with-gnome
-  try make
-}
-
-src_install() {
-  try make prefix=${D}/usr install
-  dodoc AUTHORS COPYING* ChangeLog NEWS
-  dodoc README*
-  cd ${S}/pygnome ; docinto pygnome
-  dodoc COPYING
-  cd ${S}/pygtk ; docinto pygtk
-  dodoc AUTHORS COPYING ChangeLog MAPPING NEWS README
-}
-
-
-
-
diff --git a/dev-python/orbit-python/files/digest-orbit-python-0.2.0 b/dev-python/orbit-python/files/digest-orbit-python-0.2.0
deleted file mode 100644
index e88307ff590b..000000000000
--- a/dev-python/orbit-python/files/digest-orbit-python-0.2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 56ebe0f2c9194e338c48b7f931003722 orbit-python-0.2.0.tar.gz
diff --git a/dev-python/orbit-python/files/digest-orbit-python-0.3.0 b/dev-python/orbit-python/files/digest-orbit-python-0.3.0-r1
index f3f386ff298e..f3f386ff298e 100644
--- a/dev-python/orbit-python/files/digest-orbit-python-0.3.0
+++ b/dev-python/orbit-python/files/digest-orbit-python-0.3.0-r1
diff --git a/dev-python/orbit-python/orbit-python-0.2.0.ebuild b/dev-python/orbit-python/orbit-python-0.2.0.ebuild
deleted file mode 100644
index 73c2f72f1cc2..000000000000
--- a/dev-python/orbit-python/orbit-python-0.2.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Mikael Hallendal <micke@hallendal.net>
-# $Header: /var/cvsroot/gentoo-x86/dev-python/orbit-python/orbit-python-0.2.0.ebuild,v 1.1 2001/07/02 19:48:59 hallski Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="ORBit bindings for Python"
-SRC_URI="http://orbit-python.sault.org/${A}"
-HOMEPAGE="http://orbit-python.sault.org/"
-
-DEPEND=">=dev-libs/glib-1.1.4
-	>=gnome-base/ORBit-0.5.1
-	virtual/python"
-
-src_compile() {
-  PYTHON="/usr/bin/python" try ./configure --host=${CHOST} --prefix=/usr \
-	--with-libIDL-prefix=/opt/gnome --with-orbit-prefix=/opt/gnome
-  try make
-}
-
-src_install() {
-  try make DESTDIR=${D} install
-  dodoc AUTHORS COPYING ChangeLog NEWS
-  dodoc README TODO
-}
-
-
-
-
diff --git a/dev-python/orbit-python/orbit-python-0.3.0.ebuild b/dev-python/orbit-python/orbit-python-0.3.0-r1.ebuild
index 494e63c72a4e..ed71456c04bf 100644
--- a/dev-python/orbit-python/orbit-python-0.3.0.ebuild
+++ b/dev-python/orbit-python/orbit-python-0.3.0-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Mikael Hallendal <micke@hallendal.net>
-# $Header: /var/cvsroot/gentoo-x86/dev-python/orbit-python/orbit-python-0.3.0.ebuild,v 1.1 2001/08/22 19:19:09 hallski Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/orbit-python/orbit-python-0.3.0-r1.ebuild,v 1.1 2001/10/06 11:24:06 azarah Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -9,13 +9,13 @@ DESCRIPTION="ORBit bindings for Python"
 SRC_URI="http://orbit-python.sault.org/files/${A}"
 HOMEPAGE="http://orbit-python.sault.org/"
 
-DEPEND=">=dev-libs/glib-1.1.4
-	>=gnome-base/ORBit-0.5.7
+DEPEND=">=dev-libs/glib-1.2.10
+	>=gnome-base/ORBit-0.5.10-r1
 	virtual/python"
 
 src_compile() {
   PYTHON="/usr/bin/python" try ./configure --host=${CHOST} --prefix=/usr \
-	--with-libIDL-prefix=/opt/gnome --with-orbit-prefix=/opt/gnome
+	--with-libIDL-prefix=/usr --with-orbit-prefix=/usr
   try make
 }
 
diff --git a/dev-python/pygtk/files/digest-pygtk-0.6.8 b/dev-python/pygtk/files/digest-pygtk-0.6.8-r1
index 9f4a5711d86a..9f4a5711d86a 100644
--- a/dev-python/pygtk/files/digest-pygtk-0.6.8
+++ b/dev-python/pygtk/files/digest-pygtk-0.6.8-r1
diff --git a/dev-python/pygtk/pygtk-0.6.8.ebuild b/dev-python/pygtk/pygtk-0.6.8-r1.ebuild
index 77b0c6712462..3d3f4064794f 100644
--- a/dev-python/pygtk/pygtk-0.6.8.ebuild
+++ b/dev-python/pygtk/pygtk-0.6.8-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Karl Trygve Kalleberg <karltk@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/pygtk-0.6.8.ebuild,v 1.1 2001/09/25 15:56:29 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/pygtk-0.6.8-r1.ebuild,v 1.1 2001/10/06 11:24:06 azarah Exp $
 
 S=${WORKDIR}/${P}
 
@@ -12,15 +12,15 @@ SRC_URI="ftp://ftp.gtk.org/pub/gtk/python/pygtk-0.6.8.tar.gz"
 HOMEPAGE="http://www.daa.com.au/~james/pygtk/"
 
 DEPEND="virtual/python
-        >=gnome-base/libglade-0.16
-        >=x11-libs/gtk+-1.2.8"
+        >=gnome-base/libglade-0.17-r1
+        >=x11-libs/gtk+-1.2.10-r4"
 
 src_compile() {
 
 	./configure --infodir=/usr/share/info \
 	            --mandir=/usr/share/man \
 	            --prefix=/usr \
-	            --with-libglade-config=/opt/gnome/bin/libglade-config \
+	            --with-libglade-config=/usr/bin/libglade-config \
 	            --host=${CHOST} || die
 	emake || die
 }