From: Marien Zwart Date: Thu, 24 Nov 2005 20:47:18 +0000 (+0000) Subject: Block pytz and python-dateutil (to be added to the tree soon) because of file collisi... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=91cae02f9c37a1ed181a5970210b8e79bb4188b1;p=gentoo.git Block pytz and python-dateutil (to be added to the tree soon) because of file collisions. Thanks to blubb@gentoo.org for spotting this. Package-Manager: portage-2.0.53_rc7 --- diff --git a/dev-python/matplotlib/ChangeLog b/dev-python/matplotlib/ChangeLog index a90de1757be1..c03c12192626 100644 --- a/dev-python/matplotlib/ChangeLog +++ b/dev-python/matplotlib/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-python/matplotlib # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/ChangeLog,v 1.15 2005/09/26 13:15:47 liquidx Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/ChangeLog,v 1.16 2005/11/24 20:47:18 marienz Exp $ + + 24 Nov 2005; Marien Zwart matplotlib-0.73.1.ebuild, + matplotlib-0.80-r1.ebuild, matplotlib-0.81.ebuild, matplotlib-0.82.ebuild: + Block pytz and python-dateutil (to be added to the tree soon) because of + file collisions. Thanks to blubb@gentoo.org for spotting this. 26 Sep 2005; Alastair Tse matplotlib-0.73.1.ebuild, matplotlib-0.80-r1.ebuild, matplotlib-0.81.ebuild, matplotlib-0.82.ebuild: diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest index 68bbfa552026..dc68ea00458f 100644 --- a/dev-python/matplotlib/Manifest +++ b/dev-python/matplotlib/Manifest @@ -1,20 +1,10 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 180b113d18879b53242e6e9d6b135906 ChangeLog 2751 -MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159 -MD5 eeb1b847846a589e5f39e97446729136 matplotlib-0.73.1.ebuild 1020 -MD5 da49507babaeb6c7222bc7f70d4e39d9 matplotlib-0.80-r1.ebuild 872 -MD5 3051b351ff7549577247f6547bd2535e matplotlib-0.81.ebuild 963 -MD5 129a03d23c673ffa8d6d6bda3b90e723 matplotlib-0.82.ebuild 1201 +MD5 34fb145a3f83c0aaca6d84db4a42272a ChangeLog 3044 MD5 29e58690d4283dec939607bc0cc32e44 files/digest-matplotlib-0.73.1 70 MD5 c0167eaa6285560f9d7be0cefac5b7c3 files/digest-matplotlib-0.80-r1 68 MD5 3285002ad0f706582bee43a5a6eae419 files/digest-matplotlib-0.81 68 MD5 0c147de52e946a218085b30cd23ee1e2 files/digest-matplotlib-0.82 68 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2 (GNU/Linux) - -iD8DBQFDN/8RTM53OX+9xmMRAvciAJ99h6l5qxg0uiiaGpbNFXufa+IZYACgvS8J -uMbY9AfmV1D6vy1H4wuWOdY= -=BOy0 ------END PGP SIGNATURE----- +MD5 7e49dbfb00fcc2e6f92bab923735057e matplotlib-0.73.1.ebuild 1069 +MD5 22994965e4f1bb3526f89644c8d19b17 matplotlib-0.80-r1.ebuild 921 +MD5 76685a361dccd043c3b95963ef680a6b matplotlib-0.81.ebuild 1012 +MD5 d9d53995932b6136c8cb34f7ade2a7b7 matplotlib-0.82.ebuild 1250 +MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159 diff --git a/dev-python/matplotlib/matplotlib-0.73.1.ebuild b/dev-python/matplotlib/matplotlib-0.73.1.ebuild index f139ce8a8595..373d5df24dd5 100644 --- a/dev-python/matplotlib/matplotlib-0.73.1.ebuild +++ b/dev-python/matplotlib/matplotlib-0.73.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-0.73.1.ebuild,v 1.4 2005/09/26 13:15:47 liquidx Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-0.73.1.ebuild,v 1.5 2005/11/24 20:47:18 marienz Exp $ inherit distutils virtualx @@ -15,7 +15,9 @@ LICENSE="PYTHON" DEPEND="virtual/python >=dev-python/numeric-22 - gtk? ( >=dev-python/pygtk-1.99.16 )" + gtk? ( >=dev-python/pygtk-1.99.16 ) + !dev-python/pytz + !dev-python/python-dateutil" src_compile() { export maketype="distutils_src_compile" diff --git a/dev-python/matplotlib/matplotlib-0.80-r1.ebuild b/dev-python/matplotlib/matplotlib-0.80-r1.ebuild index bd4c7d660319..e098ba2e2d8e 100644 --- a/dev-python/matplotlib/matplotlib-0.80-r1.ebuild +++ b/dev-python/matplotlib/matplotlib-0.80-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-0.80-r1.ebuild,v 1.3 2005/09/26 13:15:47 liquidx Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-0.80-r1.ebuild,v 1.4 2005/11/24 20:47:18 marienz Exp $ inherit distutils @@ -15,7 +15,9 @@ LICENSE="PYTHON" DEPEND="virtual/python >=dev-python/numeric-22 - gtk? ( >=dev-python/pygtk-1.99.16 )" + gtk? ( >=dev-python/pygtk-1.99.16 ) + !dev-python/pytz + !dev-python/python-dateutil" src_install() { distutils_src_install diff --git a/dev-python/matplotlib/matplotlib-0.81.ebuild b/dev-python/matplotlib/matplotlib-0.81.ebuild index 3a0f14725464..fd091a2c7fb2 100644 --- a/dev-python/matplotlib/matplotlib-0.81.ebuild +++ b/dev-python/matplotlib/matplotlib-0.81.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-0.81.ebuild,v 1.4 2005/09/26 13:15:47 liquidx Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-0.81.ebuild,v 1.5 2005/11/24 20:47:18 marienz Exp $ inherit distutils @@ -19,7 +19,9 @@ DEPEND="virtual/python >=media-libs/freetype-2.1.7 media-libs/libpng sys-libs/zlib - gtk? ( >=dev-python/pygtk-1.99.16 )" + gtk? ( >=dev-python/pygtk-1.99.16 ) + !dev-python/pytz + !dev-python/python-dateutil" src_install() { distutils_src_install diff --git a/dev-python/matplotlib/matplotlib-0.82.ebuild b/dev-python/matplotlib/matplotlib-0.82.ebuild index 6c90d3075fb7..ae74506de749 100644 --- a/dev-python/matplotlib/matplotlib-0.82.ebuild +++ b/dev-python/matplotlib/matplotlib-0.82.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-0.82.ebuild,v 1.2 2005/09/26 13:15:47 liquidx Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-0.82.ebuild,v 1.3 2005/11/24 20:47:18 marienz Exp $ inherit distutils @@ -21,7 +21,9 @@ DEPEND="virtual/python >=media-libs/freetype-2.1.7 media-libs/libpng sys-libs/zlib - gtk? ( >=dev-python/pygtk-1.99.16 )" + gtk? ( >=dev-python/pygtk-1.99.16 ) + !dev-python/pytz + !dev-python/python-dateutil" src_unpack() { unpack ${A}