diff --git a/dev-python/lxml/licenses/PSF-2 b/dev-python/lxml/licenses/PSF-2 new file mode 100644 index 000000000..b707c33e7 --- /dev/null +++ b/dev-python/lxml/licenses/PSF-2 @@ -0,0 +1,195 @@ +Python License (Python-2.0) +Python License, Version 2 (Python-2.0) + +PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2 +-------------------------------------------- + +1. This LICENSE AGREEMENT is between the Python Software Foundation +("PSF"), and the Individual or Organization ("Licensee") accessing and +otherwise using this software ("Python") in source or binary form and +its associated documentation. + +2. Subject to the terms and conditions of this License Agreement, PSF +hereby grants Licensee a nonexclusive, royalty-free, world-wide +license to reproduce, analyze, test, perform and/or display publicly, +prepare derivative works, distribute, and otherwise use Python +alone or in any derivative version, provided, however, that PSF's +License Agreement and PSF's notice of copyright, i.e., "Copyright (c) +2001, 2002, 2003, 2004, 2005, 2006 Python Software Foundation; All Rights +Reserved" are retained in Python alone or in any derivative version +prepared by Licensee. + +3. In the event Licensee prepares a derivative work that is based on +or incorporates Python or any part thereof, and wants to make +the derivative work available to others as provided herein, then +Licensee hereby agrees to include in any such work a brief summary of +the changes made to Python. + +4. PSF is making Python available to Licensee on an "AS IS" +basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR +IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND +DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS +FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT +INFRINGE ANY THIRD PARTY RIGHTS. + +5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON +FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS +A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON, +OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. + +6. This License Agreement will automatically terminate upon a material +breach of its terms and conditions. + +7. Nothing in this License Agreement shall be deemed to create any +relationship of agency, partnership, or joint venture between PSF and +Licensee. This License Agreement does not grant permission to use PSF +trademarks or trade name in a trademark sense to endorse or promote +products or services of Licensee, or any third party. + +8. By copying, installing or otherwise using Python, Licensee +agrees to be bound by the terms and conditions of this License +Agreement. + +BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0 +------------------------------------------- + +BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1 + +1. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an +office at 160 Saratoga Avenue, Santa Clara, CA 95051, and the +Individual or Organization ("Licensee") accessing and otherwise using +this software in source or binary form and its associated +documentation ("the Software"). + +2. Subject to the terms and conditions of this BeOpen Python License +Agreement, BeOpen hereby grants Licensee a non-exclusive, +royalty-free, world-wide license to reproduce, analyze, test, perform +and/or display publicly, prepare derivative works, distribute, and +otherwise use the Software alone or in any derivative version, +provided, however, that the BeOpen Python License is retained in the +Software, alone or in any derivative version prepared by Licensee. + +3. BeOpen is making the Software available to Licensee on an "AS IS" +basis. BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR +IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND +DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS +FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT +INFRINGE ANY THIRD PARTY RIGHTS. + +4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE +SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS +AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY +DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. + +5. This License Agreement will automatically terminate upon a material +breach of its terms and conditions. + +6. This License Agreement shall be governed by and interpreted in all +respects by the law of the State of California, excluding conflict of +law provisions. Nothing in this License Agreement shall be deemed to +create any relationship of agency, partnership, or joint venture +between BeOpen and Licensee. This License Agreement does not grant +permission to use BeOpen trademarks or trade names in a trademark +sense to endorse or promote products or services of Licensee, or any +third party. As an exception, the "BeOpen Python" logos available at +http://www.pythonlabs.com/logos.html may be used according to the +permissions granted on that web page. + +7. By copying, installing or otherwise using the software, Licensee +agrees to be bound by the terms and conditions of this License +Agreement. + +CNRI OPEN SOURCE LICENSE AGREEMENT (for Python 1.6b1) +-------------------------------------------------- + +IMPORTANT: PLEASE READ THE FOLLOWING AGREEMENT CAREFULLY. + +BY CLICKING ON "ACCEPT" WHERE INDICATED BELOW, OR BY COPYING, +INSTALLING OR OTHERWISE USING PYTHON 1.6, beta 1 SOFTWARE, YOU ARE +DEEMED TO HAVE AGREED TO THE TERMS AND CONDITIONS OF THIS LICENSE +AGREEMENT. + +1. This LICENSE AGREEMENT is between the Corporation for National +Research Initiatives, having an office at 1895 Preston White Drive, +Reston, VA 20191 ("CNRI"), and the Individual or Organization +("Licensee") accessing and otherwise using Python 1.6, beta 1 +software in source or binary form and its associated documentation, +as released at the www.python.org Internet site on August 4, 2000 +("Python 1.6b1"). + +2. Subject to the terms and conditions of this License Agreement, CNRI +hereby grants Licensee a non-exclusive, royalty-free, world-wide +license to reproduce, analyze, test, perform and/or display +publicly, prepare derivative works, distribute, and otherwise use +Python 1.6b1 alone or in any derivative version, provided, however, +that CNRIs License Agreement is retained in Python 1.6b1, alone or +in any derivative version prepared by Licensee. + +Alternately, in lieu of CNRIs License Agreement, Licensee may +substitute the following text (omitting the quotes): "Python 1.6, +beta 1, is made available subject to the terms and conditions in +CNRIs License Agreement. This Agreement may be located on the +Internet using the following unique, persistent identifier (known +as a handle): 1895.22/1011. This Agreement may also be obtained +from a proxy server on the Internet using the +URL:http://hdl.handle.net/1895.22/1011". + +3. In the event Licensee prepares a derivative work that is based on +or incorporates Python 1.6b1 or any part thereof, and wants to make +the derivative work available to the public as provided herein, +then Licensee hereby agrees to indicate in any such work the nature +of the modifications made to Python 1.6b1. + +4. CNRI is making Python 1.6b1 available to Licensee on an "AS IS" +basis. CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR +IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND +DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR +FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 1.6b1 +WILL NOT INFRINGE ANY THIRD PARTY RIGHTS. + +5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE +SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR +LOSS AS A RESULT OF USING, MODIFYING OR DISTRIBUTING PYTHON 1.6b1, +OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY +THEREOF. + +6. This License Agreement will automatically terminate upon a material +breach of its terms and conditions. + +7. This License Agreement shall be governed by and interpreted in all +respects by the law of the State of Virginia, excluding conflict of +law provisions. Nothing in this License Agreement shall be deemed +to create any relationship of agency, partnership, or joint venture +between CNRI and Licensee. This License Agreement does not grant +permission to use CNRI trademarks or trade name in a trademark +sense to endorse or promote products or services of Licensee, or +any third party. + +8. By clicking on the "ACCEPT" button where indicated, or by copying, +installing or otherwise using Python 1.6b1, Licensee agrees to be +bound by the terms and conditions of this License Agreement. + +ACCEPT + +CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2 +-------------------------------------------------- + +Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam, +The Netherlands. All rights reserved. + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, +provided that the above copyright notice appear in all copies and that +both that copyright notice and this permission notice appear in +supporting documentation, and that the name of Stichting Mathematisch +Centrum or CWI not be used in advertising or publicity pertaining to +distribution of the software without specific, written prior +permission. + +STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO +THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE +FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT +OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/dev-python/lxml/lxml-3.7.2.recipe b/dev-python/lxml/lxml-4.2.1.recipe similarity index 77% rename from dev-python/lxml/lxml-3.7.2.recipe rename to dev-python/lxml/lxml-4.2.1.recipe index f27bd0b1f..25800ee41 100644 --- a/dev-python/lxml/lxml-3.7.2.recipe +++ b/dev-python/lxml/lxml-4.2.1.recipe @@ -1,18 +1,19 @@ SUMMARY="A Pythonic binding for the libxml2 and libxslt libraries" -DESCRIPTION=" The lxml XML toolkit is unique in that it combines the speed \ +DESCRIPTION="The lxml XML toolkit is unique in that it combines the speed \ and XML feature completeness of the libxml2 and libxslt libraries with the \ simplicity of a native Python API, mostly compatible but superior to the \ -well-known ElementTree API. -The latest release works with all CPython versions from 2.4 to 3.3." +well-known ElementTree API." HOMEPAGE="http://lxml.de/ - http://pypi.python.org/pypi/lxml/" -COPYRIGHT="2003-2010 Gustavo Niemeyer" -#FIXME: check exact license -#gentoo says: LICENSE="BSD ElementTree GPL-2 PSF-2" -LICENSE="GNU GPL v2" + https://pypi.python.org/pypi/lxml/" +COPYRIGHT="2003-2010 Gustavo Niemeyer + 2003 Shuttleworth Foundation + 2004 Infrae" +LICENSE="BSD (3-clause) + GNU GPL v2 + PSF-2" REVISION="1" SOURCE_URI="http://lxml.de/files/lxml-$portVersion.tgz" -CHECKSUM_SHA256="59d9176360dbc3919e9d4bfca85c1ca64ab4f4ee00e6f119d7150ba887e3410a" +CHECKSUM_SHA256="e2629cdbcad82b83922a3488937632a4983ecc0fed3e5cfbf430d069382eeb9b" ARCHITECTURES="x86 x86_gcc2 x86_64" diff --git a/dev-python/lxml/patches/lxml-3.7.2.patchset b/dev-python/lxml/patches/lxml-3.7.2.patchset deleted file mode 100644 index b9fabe6cc..000000000 --- a/dev-python/lxml/patches/lxml-3.7.2.patchset +++ /dev/null @@ -1,31 +0,0 @@ -From 72985b29a3f51785c7fb070080861c815e6d3edd Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= -Date: Tue, 29 Jul 2014 01:50:29 +0200 -Subject: [PATCH] Fix Haiku build (no libm) - -GRMBL !$*^= hardcoding ---- - setupinfo.py | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/setupinfo.py b/setupinfo.py -index 4a1d150..4a5746d 100644 ---- a/setupinfo.py -+++ b/setupinfo.py -@@ -186,9 +186,11 @@ def libraries(): - libs = ['%s_a' % lib for lib in libs] - libs.extend(['zlib', 'WS2_32']) - elif OPTION_STATIC: -- libs = ['z', 'm'] -+ libs = ['z'] - else: -- libs = ['xslt', 'exslt', 'xml2', 'z', 'm'] -+ libs = ['xslt', 'exslt', 'xml2', 'z'] -+ if sys.platform[0:5] not in ('haiku','win32'): -+ libs.append('m') - return libs - - def library_dirs(static_library_dirs): --- -1.8.3.4 - diff --git a/dev-python/lxml/patches/python_lxml-3.6.0.patchset b/dev-python/lxml/patches/python_lxml-3.6.0.patchset deleted file mode 100644 index b9fabe6cc..000000000 --- a/dev-python/lxml/patches/python_lxml-3.6.0.patchset +++ /dev/null @@ -1,31 +0,0 @@ -From 72985b29a3f51785c7fb070080861c815e6d3edd Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= -Date: Tue, 29 Jul 2014 01:50:29 +0200 -Subject: [PATCH] Fix Haiku build (no libm) - -GRMBL !$*^= hardcoding ---- - setupinfo.py | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/setupinfo.py b/setupinfo.py -index 4a1d150..4a5746d 100644 ---- a/setupinfo.py -+++ b/setupinfo.py -@@ -186,9 +186,11 @@ def libraries(): - libs = ['%s_a' % lib for lib in libs] - libs.extend(['zlib', 'WS2_32']) - elif OPTION_STATIC: -- libs = ['z', 'm'] -+ libs = ['z'] - else: -- libs = ['xslt', 'exslt', 'xml2', 'z', 'm'] -+ libs = ['xslt', 'exslt', 'xml2', 'z'] -+ if sys.platform[0:5] not in ('haiku','win32'): -+ libs.append('m') - return libs - - def library_dirs(static_library_dirs): --- -1.8.3.4 -