Version bump

(Portage version: 2.2.01.21890-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)

3 files changed, 0 insertions, 164 deletions

diff --git a/dev-python/matplotlib/files/matplotlib-1.0.1-libpng15.patch b/dev-python/matplotlib/files/matplotlib-1.0.1-libpng15.patch
deleted file mode 100644
index 2cd7d4f5037e..000000000000
--- a/dev-python/matplotlib/files/matplotlib-1.0.1-libpng15.patch
+++ /dev/null
@@ -1,71 +0,0 @@
---- src/_png.cpp.old	2010-10-12 18:14:42.000000000 +0200
-+++ src/_png.cpp	2011-02-12 01:33:14.000000000 +0100
-@@ -350,10 +350,10 @@
-     png_set_sig_bytes(png_ptr, 8);
-     png_read_info(png_ptr, info_ptr);
- 
--    png_uint_32 width = info_ptr->width;
--    png_uint_32 height = info_ptr->height;
-+    png_uint_32 width, height;
-+    int bit_depth, color_type;
- 
--    int bit_depth = info_ptr->bit_depth;
-+    png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, NULL, NULL, NULL);
- 
-     // Unpack 1, 2, and 4-bit images
-     if (bit_depth < 8)
-@@ -361,7 +361,7 @@
- 
-     // If sig bits are set, shift data
-     png_color_8p sig_bit;
--    if ((info_ptr->color_type != PNG_COLOR_TYPE_PALETTE) &&
-+    if ((color_type != PNG_COLOR_TYPE_PALETTE) &&
-         png_get_sBIT(png_ptr, info_ptr, &sig_bit))
-     {
-         png_set_shift(png_ptr, sig_bit);
-@@ -374,19 +374,20 @@
-     }
- 
-     // Convert palletes to full RGB
--    if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-+    if (color_type == PNG_COLOR_TYPE_PALETTE)
-     {
-         png_set_palette_to_rgb(png_ptr);
-     }
- 
-     // If there's an alpha channel convert gray to RGB
--    if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
-+    if (color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
-     {
-         png_set_gray_to_rgb(png_ptr);
-     }
- 
-     png_set_interlace_handling(png_ptr);
-     png_read_update_info(png_ptr, info_ptr);
-+    color_type = png_get_color_type(png_ptr, info_ptr);
- 
-     /* read file */
-     if (setjmp(png_jmpbuf(png_ptr)))
-@@ -408,11 +409,11 @@
-     npy_intp dimensions[3];
-     dimensions[0] = height;  //numrows
-     dimensions[1] = width;   //numcols
--    if (info_ptr->color_type & PNG_COLOR_MASK_ALPHA)
-+    if (color_type & PNG_COLOR_MASK_ALPHA)
-     {
-         dimensions[2] = 4;     //RGBA images
-     }
--    else if (info_ptr->color_type & PNG_COLOR_MASK_COLOR)
-+    else if (color_type & PNG_COLOR_MASK_COLOR)
-     {
-         dimensions[2] = 3;     //RGB images
-     }
-@@ -421,7 +422,7 @@
-         dimensions[2] = 1;     //Greyscale images
-     }
-     //For gray, return an x by y array, not an x by y by 1
--    int num_dims  = (info_ptr->color_type & PNG_COLOR_MASK_COLOR) ? 3 : 2;
-+    int num_dims  = (color_type & PNG_COLOR_MASK_COLOR) ? 3 : 2;
- 
-     double max_value = (1 << ((bit_depth < 8) ? 8 : bit_depth)) - 1;
-     PyArrayObject *A = (PyArrayObject *) PyArray_SimpleNew(
diff --git a/dev-python/matplotlib/files/matplotlib-1.0.1-linux3.patch b/dev-python/matplotlib/files/matplotlib-1.0.1-linux3.patch
deleted file mode 100644
index 8efe5ce11f24..000000000000
--- a/dev-python/matplotlib/files/matplotlib-1.0.1-linux3.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- setupext.py.orig	2011-08-09 06:33:33.000000000 +0100
-+++ setupext.py	2011-08-09 06:34:26.000000000 +0100
-@@ -54,6 +54,7 @@
-     'linux2-mips' : ['/usr/local', '/usr'],
-     'linux2-sparc' : ['/usr/local', '/usr'],
-     'linux2' : ['/usr/local', '/usr'],
-+    'linux3' : ['/usr/local', '/usr'],
-     'linux'  : ['/usr/local', '/usr',],
-     'cygwin' : ['/usr/local', '/usr',],
-     '_darwin' : ['/sw/lib/freetype2', '/sw/lib/freetype219', '/usr/local',
---- examples/api/font_file.py.orig	2011-08-09 06:30:37.000000000 +0100
-+++ examples/api/font_file.py	2011-08-09 06:31:12.000000000 +0100
-@@ -17,7 +17,7 @@
- 
- if sys.platform == 'win32':
-     fpath = 'C:\\Windows\\Fonts\\Tahoma.ttf'
--elif sys.platform == 'linux2':
-+elif sys.platform.startswith('linux'):
-     fonts = ['/usr/share/fonts/truetype/freefont/FreeSansBoldOblique.ttf',
-       '/usr/share/fonts/truetype/ttf-liberation/LiberationSans-BoldItalic.ttf',
-       '/usr/share/fonts/truetype/msttcorefonts/Comic_Sans_MS.ttf',
diff --git a/dev-python/matplotlib/files/matplotlib-1.0.1-sphinx.patch b/dev-python/matplotlib/files/matplotlib-1.0.1-sphinx.patch
deleted file mode 100644
index 5311b9cdf043..000000000000
--- a/dev-python/matplotlib/files/matplotlib-1.0.1-sphinx.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -Nur matplotlib-1.0.1.orig/doc/api/api_changes.rst matplotlib-1.0.1/doc/api/api_changes.rst
---- matplotlib-1.0.1.orig/doc/api/api_changes.rst	2011-02-23 23:41:55.000000000 +0000
-+++ matplotlib-1.0.1/doc/api/api_changes.rst	2011-02-23 23:42:24.000000000 +0000
-@@ -540,7 +540,7 @@
- 
-   * :meth:`draw_markers(self, gc, marker_path, marker_trans, path,
-     trans, rgbFace)
--    <matplotlib.backend_bases.RendererBase.draw_markers`
-+    <matplotlib.backend_bases.RendererBase.draw_markers>`
- 
-   * :meth:`draw_path_collection(self, master_transform, cliprect,
-     clippath, clippath_trans, paths, all_transforms, offsets,
-diff -Nur matplotlib-1.0.1.orig/lib/matplotlib/sphinxext/plot_directive.py matplotlib-1.0.1/lib/matplotlib/sphinxext/plot_directive.py
---- matplotlib-1.0.1.orig/lib/matplotlib/sphinxext/plot_directive.py	2011-02-23 23:41:55.000000000 +0000
-+++ matplotlib-1.0.1/lib/matplotlib/sphinxext/plot_directive.py	2011-02-23 23:42:37.000000000 +0000
-@@ -346,7 +346,7 @@
-         del options['nofigs']
- 
-     formats = setup.config.plot_formats
--    if type(formats) == str:
-+    if isinstance(formats, basestring):
-         formats = eval(formats)
- 
-     fname = os.path.basename(plot_path)
-diff -Nur matplotlib-1.0.1.orig/lib/mpl_toolkits/axes_grid1/axes_divider.py matplotlib-1.0.1/lib/mpl_toolkits/axes_grid1/axes_divider.py
---- matplotlib-1.0.1.orig/lib/mpl_toolkits/axes_grid1/axes_divider.py	2011-02-23 23:41:55.000000000 +0000
-+++ matplotlib-1.0.1/lib/mpl_toolkits/axes_grid1/axes_divider.py	2011-02-23 23:42:31.000000000 +0000
-@@ -172,12 +172,12 @@
-     def locate(self, nx, ny, nx1=None, ny1=None, renderer=None):
-         """
- 
--        :param nx, nx1: Integers specifying the column-position of the
-+        :param nx,nx1: Integers specifying the column-position of the
-           cell. When nx1 is None, a single nx-th column is
-           specified. Otherwise location of columns spanning between nx
-           to nx1 (but excluding nx1-th column) is specified.
- 
--        :param ny, ny1: same as nx and nx1, but for row positions.
-+        :param ny,ny1: same as nx and nx1, but for row positions.
-         """
- 
- 
-@@ -222,12 +222,12 @@
-         (:class:`mpl_toolkits.axes_grid.axes_divider.AxesLocator`) for
-         specified cell.
- 
--        :param nx, nx1: Integers specifying the column-position of the
-+        :param nx,nx1: Integers specifying the column-position of the
-           cell. When nx1 is None, a single nx-th column is
-           specified. Otherwise location of columns spanning between nx
-           to nx1 (but excluding nx1-th column) is specified.
- 
--        :param ny, ny1: same as nx and nx1, but for row positions.
-+        :param ny,ny1: same as nx and nx1, but for row positions.
-         """
-         return AxesLocator(self, nx, ny, nx1, ny1)
- 
-@@ -242,12 +242,12 @@
-         """
-         :param axes_divider: An instance of AxesDivider class.
- 
--        :param nx, nx1: Integers specifying the column-position of the
-+        :param nx,nx1: Integers specifying the column-position of the
-           cell. When nx1 is None, a single nx-th column is
-           specified. Otherwise location of columns spanning between nx
-           to nx1 (but excluding nx1-th column) is is specified.
- 
--        :param ny, ny1: same as nx and nx1, but for row positions.
-+        :param ny,ny1: same as nx and nx1, but for row positions.
-         """
-         self._axes_divider = axes_divider
-