summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarien Zwart <marienz@gentoo.org>2006-06-22 19:18:10 +0000
committerMarien Zwart <marienz@gentoo.org>2006-06-22 19:18:10 +0000
commitc48ab0de5b2ac8e2904f59e24f9f0e4daa868828 (patch)
tree8b467de18a363bac02b3845e17b8629ccba25171 /dev-python/twisted
parentWe *have* sqlite, so provide it. (diff)
downloadhistorical-c48ab0de5b2ac8e2904f59e24f9f0e4daa868828.tar.gz
historical-c48ab0de5b2ac8e2904f59e24f9f0e4daa868828.tar.bz2
historical-c48ab0de5b2ac8e2904f59e24f9f0e4daa868828.zip
Block twisted-docs (the manpages collide).
Package-Manager: portage-2.1.1_pre1-r1
Diffstat (limited to 'dev-python/twisted')
-rw-r--r--dev-python/twisted/ChangeLog6
-rw-r--r--dev-python/twisted/twisted-2.0.1.ebuild5
-rw-r--r--dev-python/twisted/twisted-2.1.0.ebuild5
-rw-r--r--dev-python/twisted/twisted-2.2.0.ebuild5
-rw-r--r--dev-python/twisted/twisted-2.4.0.ebuild5
5 files changed, 17 insertions, 9 deletions
diff --git a/dev-python/twisted/ChangeLog b/dev-python/twisted/ChangeLog
index bc466336c091..8bce3ff6afb1 100644
--- a/dev-python/twisted/ChangeLog
+++ b/dev-python/twisted/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-python/twisted
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/ChangeLog,v 1.72 2006/06/04 02:41:49 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/ChangeLog,v 1.73 2006/06/22 19:18:10 marienz Exp $
+
+ 22 Jun 2006; Marien Zwart <marienz@gentoo.org> twisted-2.0.1.ebuild,
+ twisted-2.1.0.ebuild, twisted-2.2.0.ebuild, twisted-2.4.0.ebuild:
+ Block twisted-docs (the manpages collide).
04 Jun 2006; Brent Baude <ranger@gentoo.org> twisted-2.4.0.ebuild:
Marking twisted-2.4.0 ppc64 stable to handle net-dns/avahi deps per Mr Bones
diff --git a/dev-python/twisted/twisted-2.0.1.ebuild b/dev-python/twisted/twisted-2.0.1.ebuild
index 4bb03549a5b6..34ccb78ec527 100644
--- a/dev-python/twisted/twisted-2.0.1.ebuild
+++ b/dev-python/twisted/twisted-2.0.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/twisted-2.0.1.ebuild,v 1.9 2006/05/29 17:53:11 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/twisted-2.0.1.ebuild,v 1.10 2006/06/22 19:18:10 marienz Exp $
inherit eutils distutils versionator
@@ -19,7 +19,8 @@ DEPEND=">=dev-lang/python-2.2
>=net-zope/zopeinterface-3.0.1
serial? ( dev-python/pyserial )
crypt? ( >=dev-python/pyopenssl-0.5.1 )
- gtk? ( >=dev-python/pygtk-1.99 )"
+ gtk? ( >=dev-python/pygtk-1.99 )
+ !dev-python/twisted-docs"
S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/twisted/twisted-2.1.0.ebuild b/dev-python/twisted/twisted-2.1.0.ebuild
index 8c1fee94752f..4ea8db86d353 100644
--- a/dev-python/twisted/twisted-2.1.0.ebuild
+++ b/dev-python/twisted/twisted-2.1.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/twisted-2.1.0.ebuild,v 1.7 2006/04/09 23:39:19 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/twisted-2.1.0.ebuild,v 1.8 2006/06/22 19:18:10 marienz Exp $
inherit eutils distutils versionator
@@ -19,7 +19,8 @@ DEPEND=">=dev-lang/python-2.2
>=net-zope/zopeinterface-3.0.1
serial? ( dev-python/pyserial )
crypt? ( >=dev-python/pyopenssl-0.5.1 )
- gtk? ( >=dev-python/pygtk-1.99 )"
+ gtk? ( >=dev-python/pygtk-1.99 )
+ !dev-python/twisted-docs"
S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/twisted/twisted-2.2.0.ebuild b/dev-python/twisted/twisted-2.2.0.ebuild
index 19c77a2e5630..3293cdf64657 100644
--- a/dev-python/twisted/twisted-2.2.0.ebuild
+++ b/dev-python/twisted/twisted-2.2.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/twisted-2.2.0.ebuild,v 1.6 2006/05/12 18:55:02 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/twisted-2.2.0.ebuild,v 1.7 2006/06/22 19:18:10 marienz Exp $
inherit eutils distutils versionator
@@ -19,7 +19,8 @@ DEPEND=">=dev-lang/python-2.3
>=net-zope/zopeinterface-3.0.1
serial? ( dev-python/pyserial )
crypt? ( >=dev-python/pyopenssl-0.5.1 )
- gtk? ( >=dev-python/pygtk-1.99 )"
+ gtk? ( >=dev-python/pygtk-1.99 )
+ !dev-python/twisted-docs"
S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/twisted/twisted-2.4.0.ebuild b/dev-python/twisted/twisted-2.4.0.ebuild
index f974cf15929f..4e9c520bed94 100644
--- a/dev-python/twisted/twisted-2.4.0.ebuild
+++ b/dev-python/twisted/twisted-2.4.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/twisted-2.4.0.ebuild,v 1.2 2006/06/04 02:41:49 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/twisted-2.4.0.ebuild,v 1.3 2006/06/22 19:18:10 marienz Exp $
inherit eutils distutils versionator
@@ -19,7 +19,8 @@ DEPEND=">=dev-lang/python-2.3
>=net-zope/zopeinterface-3.0.1
serial? ( dev-python/pyserial )
crypt? ( >=dev-python/pyopenssl-0.5.1 )
- gtk? ( >=dev-python/pygtk-1.99 )"
+ gtk? ( >=dev-python/pygtk-1.99 )
+ !dev-python/twisted-docs"
S="${WORKDIR}/${MY_P}"