Version bump

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.25-gentoo-r7 x86_64

7 files changed, 233 insertions, 11 deletions

diff --git a/dev-python/basemap/ChangeLog b/dev-python/basemap/ChangeLog
index 8de9419469fd..9d1096730a2e 100644
--- a/dev-python/basemap/ChangeLog
+++ b/dev-python/basemap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/basemap
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/basemap/ChangeLog,v 1.10 2008/12/05 12:06:46 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/basemap/ChangeLog,v 1.11 2008/12/11 19:30:34 bicatali Exp $
+
+*basemap-0.99.2 (11 Dec 2008)
+
+  11 Dec 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/basemap-0.99.2-syslib.patch, +basemap-0.99.2.ebuild:
+  Version bump
 
   05 Dec 2008; Sébastien Fabbro <bicatali@gentoo.org>
   basemap-0.9.9-r1.ebuild, -basemap-0.99.ebuild, basemap-0.99.1.ebuild:
diff --git a/dev-python/basemap/basemap-0.99.2.ebuild b/dev-python/basemap/basemap-0.99.2.ebuild
new file mode 100644
index 000000000000..7435b4ec68fe
--- /dev/null
+++ b/dev-python/basemap/basemap-0.99.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/basemap/basemap-0.99.2.ebuild,v 1.1 2008/12/11 19:30:34 bicatali Exp $
+
+inherit eutils distutils
+
+DESCRIPTION="matplotlib toolkit to plot map projections"
+HOMEPAGE="http://matplotlib.sourceforge.net/matplotlib.toolkits.basemap.basemap.html"
+SRC_URI="mirror://sourceforge/matplotlib/${P}.tar.gz"
+
+IUSE="examples"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+LICENSE="MIT GPL-2"
+
+CDEPEND="sci-libs/shapelib
+	>=dev-python/matplotlib-0.98
+	>=sci-libs/geos-2.2.3"
+
+DEPEND="${CDEPEND}
+	dev-python/setuptools"
+
+RDEPEND="${CDEPEND}
+	dev-python/pupynere
+	dev-python/dap"
+
+DOCS="FAQ API_CHANGES"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# patch to use shapelib and geos system libraries
+	# proj is unfortunately an internal patched version (bug #209895)
+	epatch "${FILESDIR}"/${PN}-0.99.2-syslib.patch
+	rm -f lib/mpl_toolkits/basemap/pupynere.py || die
+}
+
+src_test() {
+	cd build/lib*
+	PYTHONPATH=. python mpl_toolkits/basemap/test.py || die
+}
+
+src_install() {
+	distutils_src_install --install-data=/usr/share/${PN}
+	rm -f "${D}"/usr/lib*/python*/site-packages/mpl_toolkits/__init__.py
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples || die
+	fi
+}
diff --git a/dev-python/basemap/files/basemap-0.99.2-syslib.patch b/dev-python/basemap/files/basemap-0.99.2-syslib.patch
new file mode 100644
index 000000000000..a56e6cb070aa
--- /dev/null
+++ b/dev-python/basemap/files/basemap-0.99.2-syslib.patch
@@ -0,0 +1,36 @@
+--- setup.py.orig	2008-12-11 17:11:01.000000000 +0000
++++ setup.py	2008-12-11 17:15:58.000000000 +0000
+@@ -16,7 +16,7 @@
+     DBFUpdateHeader is available, we scan shapefil.h for the string
+     'DBFUpdateHeader'.
+     """
+-    f = open(convert_path("pyshapelib/shapelib/shapefil.h"))
++    f = open(convert_path("/usr/include/libshp/shapefil.h"))
+     contents = f.read()
+     f.close()
+     if contents.find("DBFUpdateHeader") >= 0:
+@@ -105,17 +105,16 @@
+ package_dirs['dbflib'] = os.path.join('lib','dbflib')
+ extensions = extensions + \
+          [Extension("shapelibc",
+-                    ["pyshapelib/shapelib_wrap.c",
+-                     "pyshapelib/shapelib/shpopen.c",
+-                     "pyshapelib/shapelib/shptree.c"],
+-                    include_dirs = ["pyshapelib/shapelib"]),
++                    ["pyshapelib/shapelib_wrap.c"],
++                    include_dirs = ["/usr/include/libshp"],
++                    libraries = ["shp"]),
+           Extension("shptree",
+                     ["pyshapelib/shptreemodule.c"],
+-                    include_dirs = ["pyshapelib/shapelib"]),
++                    include_dirs = ["/usr/include/libshp"]),
+           Extension("dbflibc",
+-                    ["pyshapelib/dbflib_wrap.c",
+-                     "pyshapelib/shapelib/dbfopen.c"],
+-                    include_dirs = ["pyshapelib/shapelib"],
++                    ["pyshapelib/dbflib_wrap.c"],
++                    include_dirs = ["/usr/include/libshp"],
++                    libraries = ["shp"],
+                     define_macros = dbf_macros()) ]
+ 
+ # check setup.cfg file to see how to install auxilliary packages.
diff --git a/dev-python/dap/ChangeLog b/dev-python/dap/ChangeLog
index 102be5c80a10..4dde85dc1b9d 100644
--- a/dev-python/dap/ChangeLog
+++ b/dev-python/dap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/dap
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/dap/ChangeLog,v 1.4 2008/08/06 20:26:10 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/dap/ChangeLog,v 1.5 2008/12/11 19:26:58 bicatali Exp $
+
+*dap-2.2.6.6 (11 Dec 2008)
+
+  11 Dec 2008; Sébastien Fabbro <bicatali@gentoo.org> -dap-2.2.6.3.ebuild,
+  +dap-2.2.6.6.ebuild:
+  Version bump
 
   06 Aug 2008; Jesus Rivero <neurogeek@gentoo.org> metadata.xml:
   add GLEP 56 USE flag desc from use.local.desc
diff --git a/dev-python/dap/dap-2.2.6.3.ebuild b/dev-python/dap/dap-2.2.6.6.ebuild
index af68d6b1586a..4cde29d813fc 100644
--- a/dev-python/dap/dap-2.2.6.3.ebuild
+++ b/dev-python/dap/dap-2.2.6.6.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/dap/dap-2.2.6.3.ebuild,v 1.4 2008/07/02 16:55:11 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/dap/dap-2.2.6.6.ebuild,v 1.1 2008/12/11 19:26:58 bicatali Exp $
 
-inherit distutils
+inherit eutils distutils
 
 DESCRIPTION="Data Access Protocol client and server"
 HOMEPAGE="http://pydap.org"
@@ -24,9 +24,8 @@ DEPEND="${RDEPEND}
 
 DOCS="docs/bugs docs/Changelog docs/history"
 
-#src_unpack() {
-#	distutils_src_unpack
-#	cd "${S}"
-	# removing namespaces in order to avoid annoying warning
-#	sed -i -e '/namespace_packages/d' setup.py
-#}
+src_install() {
+	distutils_src_install
+	dosed -i -e '1idap' \
+		/usr/$(get_libdir)/python*/site-packages/dap-*.egg-info/namespace_packages.txt || die
+}
diff --git a/dev-python/matplotlib/ChangeLog b/dev-python/matplotlib/ChangeLog
index ea588230caa8..a5629796137c 100644
--- a/dev-python/matplotlib/ChangeLog
+++ b/dev-python/matplotlib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/matplotlib
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/ChangeLog,v 1.51 2008/10/10 08:44:05 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/ChangeLog,v 1.52 2008/12/11 19:28:24 bicatali Exp $
+
+*matplotlib-0.98.4 (11 Dec 2008)
+
+  11 Dec 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  +matplotlib-0.98.4.ebuild:
+  Version bump
 
   10 Oct 2008; Sébastien Fabbro <bicatali@gentoo.org>
   matplotlib-0.91.2.ebuild, matplotlib-0.91.4.ebuild,
diff --git a/dev-python/matplotlib/matplotlib-0.98.4.ebuild b/dev-python/matplotlib/matplotlib-0.98.4.ebuild
new file mode 100644
index 000000000000..d1596c1dee6f
--- /dev/null
+++ b/dev-python/matplotlib/matplotlib-0.98.4.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-0.98.4.ebuild,v 1.1 2008/12/11 19:28:24 bicatali Exp $
+
+WX_GTK_VER=2.8
+EAPI=2
+inherit eutils distutils wxwidgets
+
+PDOC="users_guide_${PV}"
+
+DESCRIPTION="Pure python plotting library with matlab like syntax"
+HOMEPAGE="http://matplotlib.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	doc? ( http://matplotlib.sourceforge.net/Matplotlib.pdf -> ${PDOC}.pdf )"
+
+IUSE="cairo doc examples fltk gtk latex qt3 qt4 tk wxwindows"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+LICENSE="PYTHON BSD stix bakoma"
+
+DEPEND=">=dev-python/numpy-1.1
+	>=media-libs/freetype-2
+	media-libs/libpng
+	dev-python/pytz
+	dev-python/python-dateutil
+	gtk? ( dev-python/pygtk )
+	tk? ( dev-lang/python[tk] )
+	wxwindows? ( dev-python/wxpython:2.8 )"
+
+RDEPEND="${DEPEND}
+	|| ( media-fonts/ttf-bitstream-vera media-fonts/dejavu )
+	latex? ( virtual/latex-base
+		virtual/ghostscript
+		app-text/dvipng
+		app-text/poppler )
+	cairo? ( dev-python/pycairo )
+	fltk?  ( dev-python/pyfltk )
+	qt3?   ( dev-python/PyQt )
+	qt4?   ( dev-python/PyQt4 )"
+
+DOCS="INTERACTIVE"
+
+use_setup() {
+	local uword="${2}"
+	[ -z "${2}" ] && uword="${1}"
+	if use ${1}; then
+		echo "${uword} = True"
+		echo "${uword}agg = True"
+	else
+		echo "${uword} = False"
+		echo "${uword}agg = False"
+	fi
+}
+
+src_prepare() {
+	# create setup.cfg (see setup.cfg.template for any changes)
+	cat > setup.cfg <<-EOF
+		[provide_packages]
+		pytz = False
+		dateutil = False
+		configobj = False
+		enthought.traits = False
+		[gui_support]
+		$(use_setup gtk)
+		$(use_setup tk)
+		$(use_setup wxwindows wx)
+		$(use_setup qt3 qt)
+		$(use_setup qt4)
+		$(use_setup fltk)
+		$(use_setup cairo)
+	EOF
+
+	# sed to avoid checks needing a X display
+	sed -i \
+		-e "s/check_for_gtk()/$(use gtk && echo True || echo False)/" \
+		-e "s/check_for_tk()/$(use tk && echo True || echo False)/" \
+		setup.py || die "sed setup.py failed"
+
+	# respect FHS: put mpl-data in /usr/share/matplotlib
+	# and config files in /etc/matplotlib
+	sed -i \
+		-e "/'mpl-data\/matplotlibrc',/d" \
+		-e "/'mpl-data\/matplotlib.conf',/d" \
+		-e "s:'lib/matplotlib/mpl-data/matplotlibrc':'matplotlibrc':" \
+		-e "s:'lib/matplotlib/mpl-data/matplotlib.conf':'matplotlib.conf':" \
+		setup.py \
+		|| die "sed setup.py for FHS failed"
+
+	sed -i \
+		-e "s:path =  get_data_path():path = '/etc/matplotlib':" \
+		-e "s:os.path.dirname(__file__):'/usr/share/${PN}':g"  \
+		lib/matplotlib/{__init__,config/cutils}.py \
+		|| die "sed init for FHS failed"
+
+	# remove vera fonts (they are now a dependency)
+	cd lib/matplotlib/mpl-data
+	rm -f ttf/Vera*.ttf ttf/*.TXT ttf/local.conf pdfcorefonts/readme.txt
+}
+
+src_install() {
+	distutils_src_install
+
+	# respect FHS
+	dodir /usr/share/${PN}
+	mv "${D}"/usr/*/*/site-packages/${PN}/{mpl-data,backends/Matplotlib.nib} \
+		"${D}"/usr/share/${PN} || die "failed renaming"
+
+	insinto /etc/matplotlib
+	doins matplotlibrc matplotlib.conf \
+		|| die "installing config files failed"
+
+	insinto /usr/share/doc/${PF}
+	if use doc; then
+		doins "${DISTDIR}"/${PDOC}.pdf || die
+	fi
+	if use examples; then
+		doins -r examples || die
+	fi
+}