fix -py21 dependency

12 files changed, 26 insertions, 51 deletions

diff --git a/net-zope/extfile/ChangeLog b/net-zope/extfile/ChangeLog
index 7769f521f56a..4be13a1a84e0 100644
--- a/net-zope/extfile/ChangeLog
+++ b/net-zope/extfile/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-zope/extfile
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/extfile/ChangeLog,v 1.6 2004/07/19 22:24:55 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/extfile/ChangeLog,v 1.7 2004/10/23 22:44:34 lanius Exp $
+
+  24 Oct 2004; Heinrich Wendel <lanius@gentoo.org>
+  -extfile-1.2.0_beta1.ebuild, extfile-1.2.0_beta2.ebuild:
+  fix -py21 dependency
 
   19 Jul 2004; Bryan Østergaard <kloeri@gentoo.org>
   extfile-1.2.0_beta1.ebuild, extfile-1.2.0_beta2.ebuild:
diff --git a/net-zope/extfile/extfile-1.2.0_beta1.ebuild b/net-zope/extfile/extfile-1.2.0_beta1.ebuild
deleted file mode 100644
index a09851ff2c49..000000000000
--- a/net-zope/extfile/extfile-1.2.0_beta1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/extfile/extfile-1.2.0_beta1.ebuild,v 1.5 2004/07/19 22:24:55 kloeri Exp $
-
-inherit zproduct
-PV_NEW=${PV/_beta/b}
-
-DESCRIPTION="Zope proxy objects for files on the filesystem"
-HOMEPAGE="http://www.zope.org/Members/shh/ExtFile"
-SRC_URI="${HOMEPAGE}/ExtFile-${PV_NEW}.tar.gz"
-LICENSE="ZPL"
-KEYWORDS="x86 ~ppc"
-RDEPEND=">=dev-python/imaging-py21-1.1.3
-	${RDEPEND}"
-
-ZPROD_LIST="ExtFile"
diff --git a/net-zope/extfile/extfile-1.2.0_beta2.ebuild b/net-zope/extfile/extfile-1.2.0_beta2.ebuild
index f631089469e1..8809dc4009c1 100644
--- a/net-zope/extfile/extfile-1.2.0_beta2.ebuild
+++ b/net-zope/extfile/extfile-1.2.0_beta2.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/net-zope/extfile/extfile-1.2.0_beta2.ebuild,v 1.5 2004/07/19 22:24:55 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/extfile/extfile-1.2.0_beta2.ebuild,v 1.6 2004/10/23 22:44:34 lanius Exp $
 
 inherit zproduct
 PV_NEW=${PV/_beta/b}
@@ -10,7 +10,8 @@ HOMEPAGE="http://www.zope.org/Members/shh/ExtFile"
 SRC_URI="${HOMEPAGE}/ExtFile-${PV_NEW}.tar.gz"
 LICENSE="ZPL"
 KEYWORDS="x86 ~ppc"
-RDEPEND=">=dev-python/imaging-py21-1.1.3
+RDEPEND=">=dev-python/imaging-1.1.3
 	${RDEPEND}"
 
 ZPROD_LIST="ExtFile"
+IUSE=""
diff --git a/net-zope/extfile/files/digest-extfile-1.2.0_beta1 b/net-zope/extfile/files/digest-extfile-1.2.0_beta1
deleted file mode 100644
index d0ef45a2031f..000000000000
--- a/net-zope/extfile/files/digest-extfile-1.2.0_beta1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 1f4d818ab3dc9428ec4b8c84801205da /extfile-1.2.0_beta1.ebuild 542
-MD5 b75fb8de51591b1fa84ae71f283a99a8 ExtFile-1.2.0b1.tar.gz 45267
diff --git a/net-zope/zmysqlda/ChangeLog b/net-zope/zmysqlda/ChangeLog
index 7989b4a17ddc..f0b66cdc2ea9 100644
--- a/net-zope/zmysqlda/ChangeLog
+++ b/net-zope/zmysqlda/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-zope/zmysqlda
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zmysqlda/ChangeLog,v 1.5 2004/06/25 01:26:33 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zmysqlda/ChangeLog,v 1.6 2004/10/23 22:42:39 lanius Exp $
+
+  24 Oct 2004; Heinrich Wendel <lanius@gentoo.org> zmysqlda-2.0.8.ebuild:
+  fix -py21 dependency
 
   19 Jan 2004; Heinrich Wendel <lanius@gentoo.org> zmysqlda-2.0.8-r1.ebuild:
   remove this version again, the patch caused breakage
diff --git a/net-zope/zmysqlda/Manifest b/net-zope/zmysqlda/Manifest
index 95f54853584e..808f32395b89 100644
--- a/net-zope/zmysqlda/Manifest
+++ b/net-zope/zmysqlda/Manifest
@@ -1,4 +1,4 @@
-MD5 99eb67b28613e1694137cd8b1fb41772 zmysqlda-2.0.8.ebuild 579
-MD5 76f1b8e16fb2d1bdf588da2a75baab7c ChangeLog 713
+MD5 fd4600f5a2d996414a3f78516138584b zmysqlda-2.0.8.ebuild 581
+MD5 c96ea69a9a00f9385114d1d5ca6570a3 ChangeLog 811
 MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
-MD5 989397e8bf1fbbb3a66170edef51e4fb files/digest-zmysqlda-2.0.8 129
+MD5 e9a7a5cd66f90aedf983fdfcef9f2c36 files/digest-zmysqlda-2.0.8 65
diff --git a/net-zope/zmysqlda/files/digest-zmysqlda-2.0.8 b/net-zope/zmysqlda/files/digest-zmysqlda-2.0.8
index a7e9c5faa3e8..369742138c35 100644
--- a/net-zope/zmysqlda/files/digest-zmysqlda-2.0.8
+++ b/net-zope/zmysqlda/files/digest-zmysqlda-2.0.8
@@ -1,2 +1 @@
-MD5 4c441a145fc66fd9060a4255c4089003 /zmysqlda-2.0.8.ebuild 588
 MD5 74332272e53b13c6b19d3185d575699c ZMySQLDA-2.0.8.tar.gz 12442
diff --git a/net-zope/zmysqlda/zmysqlda-2.0.8.ebuild b/net-zope/zmysqlda/zmysqlda-2.0.8.ebuild
index 2b088a3a1ffc..5d58646e948e 100644
--- a/net-zope/zmysqlda/zmysqlda-2.0.8.ebuild
+++ b/net-zope/zmysqlda/zmysqlda-2.0.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/net-zope/zmysqlda/zmysqlda-2.0.8.ebuild,v 1.5 2004/06/25 01:26:33 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zmysqlda/zmysqlda-2.0.8.ebuild,v 1.6 2004/10/23 22:42:39 lanius Exp $
 
 inherit zproduct
 S="${WORKDIR}/lib/python/Products/"
@@ -10,8 +10,8 @@ HOMEPAGE="http://sourceforge.net/projects/mysql-python"
 SRC_URI="mirror://sourceforge/mysql-python/ZMySQLDA-${PV}.tar.gz"
 LICENSE="GPL-2 | CNRI"
 KEYWORDS="x86 ~ppc"
-RDEPEND=">=dev-python/mysql-python-py21-0.9.2
+RDEPEND=">=dev-python/mysql-python-0.9.2
 	${RDEPEND}"
 
 ZPROD_LIST="ZMySQLDA"
-
+IUSE=""
diff --git a/net-zope/zphotoslides/ChangeLog b/net-zope/zphotoslides/ChangeLog
index a749852b691f..9b687bd49b4b 100644
--- a/net-zope/zphotoslides/ChangeLog
+++ b/net-zope/zphotoslides/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-zope/zphotoslides
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zphotoslides/ChangeLog,v 1.4 2004/07/19 22:26:14 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zphotoslides/ChangeLog,v 1.5 2004/10/23 22:43:41 lanius Exp $
+
+  24 Oct 2004; Heinrich Wendel <lanius@gentoo.org> zphotoslides-1.1-r1.ebuild,
+  -zphotoslides-1.1.ebuild:
+  fix -py21 dependency
 
   19 Jul 2004; Bryan Østergaard <kloeri@gentoo.org>
   zphotoslides-1.1-r1.ebuild, zphotoslides-1.1.ebuild:
diff --git a/net-zope/zphotoslides/files/digest-zphotoslides-1.1 b/net-zope/zphotoslides/files/digest-zphotoslides-1.1
deleted file mode 100644
index 85b1c8046ebc..000000000000
--- a/net-zope/zphotoslides/files/digest-zphotoslides-1.1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 98f6d650f4281b93be4169e4f32a8a51 /zphotoslides-1.1.ebuild 604
-MD5 67b8e58f2b067d39fcae2d90b7a9070a ZPhotoSlides-1.1.tar.gz 347244
diff --git a/net-zope/zphotoslides/zphotoslides-1.1-r1.ebuild b/net-zope/zphotoslides/zphotoslides-1.1-r1.ebuild
index 54a57fb58d2e..9c5f1940c276 100644
--- a/net-zope/zphotoslides/zphotoslides-1.1-r1.ebuild
+++ b/net-zope/zphotoslides/zphotoslides-1.1-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/net-zope/zphotoslides/zphotoslides-1.1-r1.ebuild,v 1.4 2004/07/19 22:26:14 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zphotoslides/zphotoslides-1.1-r1.ebuild,v 1.5 2004/10/23 22:43:41 lanius Exp $
 
 inherit zproduct
 
@@ -10,9 +10,10 @@ SRC_URI="mirror://sourceforge/zphotoslides/ZPhotoSlides-${PV}b.tar.gz"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc"
 
-RDEPEND=">=dev-python/imaging-py21-1.1.3
+RDEPEND=">=dev-python/imaging-1.1.3
 	>=net-zope/localfs-1.0.0
 	${RDEPEND}"
 
 ZPROD_LIST="ZPhotoSlides"
 DOTTXT_PROTECT="country-codes.txt ${DOTTXT_PROTECT}"
+IUSE=""
diff --git a/net-zope/zphotoslides/zphotoslides-1.1.ebuild b/net-zope/zphotoslides/zphotoslides-1.1.ebuild
deleted file mode 100644
index 973bb51ad5b9..000000000000
--- a/net-zope/zphotoslides/zphotoslides-1.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zphotoslides/zphotoslides-1.1.ebuild,v 1.4 2004/07/19 22:26:14 kloeri Exp $
-
-inherit zproduct
-
-DESCRIPTION="Present your photos quickly in zope."
-HOMEPAGE="http://www.zope.org/Members/p3b/ZPhotoSlides"
-SRC_URI="${HOMEPAGE}/ZPhotoSlides-${PV}.tar.gz"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
-RDEPEND=">=dev-python/imaging-py21-1.1.3
-	>=net-zope/localfs-1.0.0
-	${RDEPEND}"
-
-ZPROD_LIST="ZPhotoSlides"
-DOTTXT_PROTECT="country-codes.txt ${DOTTXT_PROTECT}"