From 282a03c8e8e7aa2b11e6e2f9d147d1691f00a222 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sun, 16 Apr 2017 23:10:32 +0200 Subject: [PATCH] dev-python: merge most python2 and python3 recipes. * adjust recipes depending on these, ie python_dateutil=>dateutil_python. * switch architectures to any for relevant python recipes. * bump versions for retext, argh, beautifulsoup, cssselect, dateutil, docutils, fonttools, html2text, httplib2, lxml, mechanize, mock, paramiko, pillow, pip, pygments, requests, twisted, urllib3, zope_interface. --- .../retext/patches/retext-7.0.0.patchset | 38 ++++++ ...etext-6.0.2.recipe => retext-7.0.0.recipe} | 17 +-- dev-python/argh/argh-0.26.1.recipe | 55 -------- dev-python/argh/argh-0.26.2.recipe | 62 +++++++++ .../beautifulsoup/beautifulsoup-4.4.1.recipe | 57 --------- .../beautifulsoup/beautifulsoup-4.5.3.recipe | 69 ++++++++++ dev-python/cssselect/cssselect-0.9.1.recipe | 48 ------- dev-python/cssselect/cssselect-1.0.1.recipe | 61 +++++++++ .../cython/python3_cython-0.25.2.recipe | 2 +- dev-python/cython/python_cython-0.25.2.recipe | 2 +- dev-python/dateutil/dateutil-2.6.0.recipe | 63 +++++++++ .../dateutil/python_dateutil-2.5.2.recipe | 51 -------- dev-python/docutils/docutils-0.12.recipe | 56 -------- dev-python/docutils/docutils-0.13.1.recipe | 101 +++++++++++++++ dev-python/ecdsa/ecdsa-0.13.recipe | 63 +++++++++ dev-python/ecdsa/python_ecdsa-0.13.recipe | 42 ------ dev-python/feedparser/feedparser-5.2.1.recipe | 56 ++++---- dev-python/fonttools/fonttools-3.10.0.recipe | 98 ++++++++++++++ .../fonttools/python3_fonttools-3.0.recipe | 53 -------- .../fonttools/python_fonttools-3.0.recipe | 55 -------- dev-python/gdata/gdata-2.0.18.recipe | 61 +++++---- .../html2text/html2text-2016.9.19.recipe | 77 +++++++++++ .../python_html2text-2016.4.2.recipe | 52 -------- dev-python/httplib2/httplib2-0.10.3.recipe | 66 ++++++++++ .../httplib2/python3_httplib2-0.9.2.recipe | 48 ------- .../httplib2/python_httplib2-0.9.2.recipe | 47 ------- .../imaging/python_imaging-1.1.7.recipe | 21 +-- dev-python/iniparse/iniparse-0.4.recipe | 20 ++- dev-python/lxml/lxml-3.7.2.recipe | 78 ++++++++++++ dev-python/lxml/patches/lxml-3.7.2.patchset | 31 +++++ dev-python/lxml/python_lxml-3.6.0.recipe | 62 --------- dev-python/mako/mako-1.0.3.recipe | 83 ++++++++++++ dev-python/mako/python3_mako-1.0.3.recipe | 56 -------- dev-python/mako/python_mako-1.0.3.recipe | 55 -------- dev-python/markdown/markdown-2.6.8.recipe | 82 ++++++++++++ .../markdown/python3_markdown-2.6.8.recipe | 51 -------- .../markdown/python_markdown-2.6.8.recipe | 51 -------- dev-python/markups/markups-2.0.0.recipe | 70 ++++++++++ .../markups/python3_markups-2.0.0.recipe | 50 -------- .../markups/python_markups-2.0.0.recipe | 49 ------- dev-python/mechanize/mechanize-0.3.1.recipe | 81 ++++++++++++ .../mechanize/python_mechanize-0.2.5.recipe | 69 ---------- dev-python/mock/mock-2.0.0.recipe | 88 +++++++++++++ dev-python/mock/python_mock-1.3.0.recipe | 57 --------- dev-python/numpy/python3_numpy-1.11.2.recipe | 2 +- dev-python/numpy/python_numpy-1.11.2.recipe | 2 +- dev-python/paramiko/paramiko-1.18.2.recipe | 66 ++++++++++ .../paramiko/python_paramiko-1.16.0.recipe | 45 ------- dev-python/pathtools/pathtools-0.1.2.recipe | 59 +++++---- dev-python/pillow/pillow-3.2.0.recipe | 84 ------------ dev-python/pillow/pillow-4.1.0.recipe | 120 ++++++++++++++++++ dev-python/pip/pip-9.0.0.recipe | 75 +++++++++++ dev-python/pip/python3_pip-7.0.3.recipe | 50 -------- dev-python/pycrypto/pycrypto-2.6.1.recipe | 64 ++++++---- dev-python/pygments/pygments-2.1.3.recipe | 58 --------- dev-python/pygments/pygments-2.2.0.recipe | 81 ++++++++++++ dev-python/pylzma/pylzma-0.4.8.recipe | 2 +- dev-python/pyqt/pyqt-5.7.1.recipe | 4 +- dev-python/pyqt/pyqt-5.8.2.recipe | 4 +- dev-python/pyyaml/pyyaml-3.11.recipe | 66 ---------- dev-python/pyyaml/pyyaml-3.12.recipe | 74 +++++++++++ .../requests/python3_requests-2.9.1.recipe | 49 ------- .../requests/python_requests-2.9.1.recipe | 48 ------- dev-python/requests/requests-2.13.0.recipe | 62 +++++++++ .../python3_setuptools-22.0.0.recipe | 48 ------- .../python3_setuptools-28.8.0.recipe | 52 -------- .../python_setuptools-22.0.0.recipe | 48 ------- .../setuptools/setuptools-28.8.0.recipe | 98 ++++++++++++++ .../twisted/patches/twisted-17.1.0.patchset | 59 +++++++++ ...ed-16.2.0.recipe => twisted-17.1.0.recipe} | 104 ++++++++++----- ...lib3-1.15.1.recipe => urllib3-1.20.recipe} | 56 ++++---- .../watchdog/python_watchdog-0.8.3.recipe | 52 -------- dev-python/watchdog/watchdog-0.8.3.recipe | 77 +++++++++++ .../licenses/ZPL 2.1 | 0 .../zope_interface-4.3.3.recipe | 73 +++++++++++ .../python_zope.interface-4.1.3.recipe | 42 ------ .../buildbot_slave-0.8.12.recipe | 2 +- .../buildbot_slave-0.9.5.recipe | 60 +++++++++ .../patches/buildbot_slave-0.9.5.patchset | 22 ++++ dev-util/gyp/gyp-git.recipe | 6 +- dev-util/meson/meson-0.39.1.recipe | 2 +- .../orphilia_dropbox-1.recipe | 12 +- media-video/openshot/openshot-2.0.7.recipe | 8 +- sys-libs/mesa/mesa-10.5.2.recipe | 2 +- sys-libs/mesa/mesa-11.0.1.recipe | 2 +- sys-libs/mesa/mesa-11.2.2.recipe | 2 +- sys-libs/mesa/mesa-12.0.4.recipe | 2 +- sys-libs/mesa/mesa-13.0.4.recipe | 2 +- sys-libs/mesa/mesa-17.0.3.recipe | 2 +- 89 files changed, 2389 insertions(+), 1913 deletions(-) create mode 100644 app-editors/retext/patches/retext-7.0.0.patchset rename app-editors/retext/{retext-6.0.2.recipe => retext-7.0.0.recipe} (82%) delete mode 100644 dev-python/argh/argh-0.26.1.recipe create mode 100644 dev-python/argh/argh-0.26.2.recipe delete mode 100644 dev-python/beautifulsoup/beautifulsoup-4.4.1.recipe create mode 100644 dev-python/beautifulsoup/beautifulsoup-4.5.3.recipe delete mode 100644 dev-python/cssselect/cssselect-0.9.1.recipe create mode 100644 dev-python/cssselect/cssselect-1.0.1.recipe create mode 100644 dev-python/dateutil/dateutil-2.6.0.recipe delete mode 100644 dev-python/dateutil/python_dateutil-2.5.2.recipe delete mode 100644 dev-python/docutils/docutils-0.12.recipe create mode 100644 dev-python/docutils/docutils-0.13.1.recipe create mode 100644 dev-python/ecdsa/ecdsa-0.13.recipe delete mode 100644 dev-python/ecdsa/python_ecdsa-0.13.recipe create mode 100644 dev-python/fonttools/fonttools-3.10.0.recipe delete mode 100644 dev-python/fonttools/python3_fonttools-3.0.recipe delete mode 100644 dev-python/fonttools/python_fonttools-3.0.recipe create mode 100644 dev-python/html2text/html2text-2016.9.19.recipe delete mode 100644 dev-python/html2text/python_html2text-2016.4.2.recipe create mode 100644 dev-python/httplib2/httplib2-0.10.3.recipe delete mode 100644 dev-python/httplib2/python3_httplib2-0.9.2.recipe delete mode 100644 dev-python/httplib2/python_httplib2-0.9.2.recipe create mode 100644 dev-python/lxml/lxml-3.7.2.recipe create mode 100644 dev-python/lxml/patches/lxml-3.7.2.patchset delete mode 100644 dev-python/lxml/python_lxml-3.6.0.recipe create mode 100644 dev-python/mako/mako-1.0.3.recipe delete mode 100644 dev-python/mako/python3_mako-1.0.3.recipe delete mode 100644 dev-python/mako/python_mako-1.0.3.recipe create mode 100644 dev-python/markdown/markdown-2.6.8.recipe delete mode 100644 dev-python/markdown/python3_markdown-2.6.8.recipe delete mode 100644 dev-python/markdown/python_markdown-2.6.8.recipe create mode 100644 dev-python/markups/markups-2.0.0.recipe delete mode 100644 dev-python/markups/python3_markups-2.0.0.recipe delete mode 100644 dev-python/markups/python_markups-2.0.0.recipe create mode 100644 dev-python/mechanize/mechanize-0.3.1.recipe delete mode 100644 dev-python/mechanize/python_mechanize-0.2.5.recipe create mode 100644 dev-python/mock/mock-2.0.0.recipe delete mode 100644 dev-python/mock/python_mock-1.3.0.recipe create mode 100644 dev-python/paramiko/paramiko-1.18.2.recipe delete mode 100644 dev-python/paramiko/python_paramiko-1.16.0.recipe delete mode 100644 dev-python/pillow/pillow-3.2.0.recipe create mode 100644 dev-python/pillow/pillow-4.1.0.recipe create mode 100644 dev-python/pip/pip-9.0.0.recipe delete mode 100644 dev-python/pip/python3_pip-7.0.3.recipe delete mode 100644 dev-python/pygments/pygments-2.1.3.recipe create mode 100644 dev-python/pygments/pygments-2.2.0.recipe delete mode 100644 dev-python/pyyaml/pyyaml-3.11.recipe create mode 100644 dev-python/pyyaml/pyyaml-3.12.recipe delete mode 100644 dev-python/requests/python3_requests-2.9.1.recipe delete mode 100644 dev-python/requests/python_requests-2.9.1.recipe create mode 100644 dev-python/requests/requests-2.13.0.recipe delete mode 100644 dev-python/setuptools/python3_setuptools-22.0.0.recipe delete mode 100644 dev-python/setuptools/python3_setuptools-28.8.0.recipe delete mode 100644 dev-python/setuptools/python_setuptools-22.0.0.recipe create mode 100644 dev-python/setuptools/setuptools-28.8.0.recipe create mode 100644 dev-python/twisted/patches/twisted-17.1.0.patchset rename dev-python/twisted/{python_twisted-16.2.0.recipe => twisted-17.1.0.recipe} (52%) rename dev-python/urllib3/{urllib3-1.15.1.recipe => urllib3-1.20.recipe} (51%) delete mode 100644 dev-python/watchdog/python_watchdog-0.8.3.recipe create mode 100644 dev-python/watchdog/watchdog-0.8.3.recipe rename dev-python/{zope.interface => zope-interface}/licenses/ZPL 2.1 (100%) create mode 100644 dev-python/zope-interface/zope_interface-4.3.3.recipe delete mode 100644 dev-python/zope.interface/python_zope.interface-4.1.3.recipe create mode 100644 dev-util/buildbot_slave/buildbot_slave-0.9.5.recipe create mode 100644 dev-util/buildbot_slave/patches/buildbot_slave-0.9.5.patchset diff --git a/app-editors/retext/patches/retext-7.0.0.patchset b/app-editors/retext/patches/retext-7.0.0.patchset new file mode 100644 index 000000000..0a06e4042 --- /dev/null +++ b/app-editors/retext/patches/retext-7.0.0.patchset @@ -0,0 +1,38 @@ +From 64086ebfcd26e89474df38e91430507d4ef0b03d Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Sat, 28 Jan 2017 11:43:21 +0100 +Subject: find_library() doesn't work on Haiku. + + +diff --git a/ReText/xsettings.py b/ReText/xsettings.py +index a5647a0..0fbfa4d 100644 +--- a/ReText/xsettings.py ++++ b/ReText/xsettings.py +@@ -53,15 +53,15 @@ class XSettingsParseError(XSettingsError): + + def get_raw_xsettings(display=0): + # initialize the libraries +- xcb_library_name = ctypes.util.find_library('xcb') +- if xcb_library_name is None: +- raise XSettingsError('Xcb library not found') +- xcb = ctypes.CDLL(xcb_library_name) +- +- c_library_name = ctypes.util.find_library('c') +- if c_library_name is None: +- raise XSettingsError('C library not found') +- c = ctypes.CDLL(c_library_name) ++ # xcb_library_name = ctypes.util.find_library('xcb') ++ # if xcb_library_name is None: ++ # raise XSettingsError('Xcb library not found') ++ xcb = ctypes.CDLL('libxcb.so.1') ++ ++ #c_library_name = ctypes.util.find_library('c') ++ #if c_library_name is None: ++ # raise XSettingsError('C library not found') ++ c = ctypes.CDLL('libroot.so') + + # set some args and return types + xcb.xcb_connect.argtypes = [ctypes.c_char_p, ctypes.POINTER(ctypes.c_int)] +-- +2.10.2 + diff --git a/app-editors/retext/retext-6.0.2.recipe b/app-editors/retext/retext-7.0.0.recipe similarity index 82% rename from app-editors/retext/retext-6.0.2.recipe rename to app-editors/retext/retext-7.0.0.recipe index c5d16cde9..39e99f515 100644 --- a/app-editors/retext/retext-6.0.2.recipe +++ b/app-editors/retext/retext-7.0.0.recipe @@ -7,11 +7,10 @@ COPYRIGHT="2011–2016 Dmitry Shachnev LICENSE="GNU GPL v3" REVISION="1" SOURCE_URI="$HOMEPAGE/archive/$portVersion.tar.gz" -CHECKSUM_SHA256="50c02d69ff6dca8863003e913a2acae7f3041e44ea96852e2dac303d435d1ca2" -PATCHES="retext-$portVersion.tar.gz" +CHECKSUM_SHA256="7df3fcdad1d1f9a046ae33591b54dd7a6894de64eb0370f2dabf4cd75eb66586" +PATCHES="retext-$portVersion.patchset" -ARCHITECTURES="!x86_gcc2 ?x86 x86_64" -SECONDARY_ARCHITECTURES="?x86" +ARCHITECTURES="any" PROVIDES=" retext$secondaryArchSuffix = $portVersion @@ -19,15 +18,17 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix - python3_markups - python3_pyqt + cmd:python3 + markdown_python3 + markups_python3 + pyqt_python3 lib:libxcb$secondaryArchSuffix " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - python3_pyqt >= 5 - python3_setuptools + pyqt_python3 >= 5 + setuptools_python3 " BUILD_PREREQUIRES=" cmd:python3 diff --git a/dev-python/argh/argh-0.26.1.recipe b/dev-python/argh/argh-0.26.1.recipe deleted file mode 100644 index 8c72f45f0..000000000 --- a/dev-python/argh/argh-0.26.1.recipe +++ /dev/null @@ -1,55 +0,0 @@ -SUMMARY="An unobtrusive argparse wrapper with natural syntax" -DESCRIPTION="Building a command-line interface? \ -Found yourself uttering "argh!" while struggling with the API of argparse? \ -Don't like the complexity but need the power? -Argh is a smart wrapper for argparse. Argparse is a very powerful tool; \ -Argh just makes it easy to use." -HOMEPAGE="https://pypi.python.org/pypi/argh" - -SOURCE_URI="https://pypi.python.org/packages/source/a/argh/argh-0.26.1.tar.gz" -CHECKSUM_SHA256="06a7442cb9130fb8806fe336000fcf20edf1f2f8ad205e7b62cec118505510db" -LICENSE="GNU LGPL v3" -COPYRIGHT="2010—2014 Andrey Mikhaylenko and contributors" -REVISION="1" - -ARCHITECTURES="x86 x86_gcc2 x86_64" - -SOURCE_DIR="argh-$portVersion" - -PROVIDES=" - argh = $portVersion - " - -REQUIRES=" - haiku - cmd:python - " - -BUILD_REQUIRES=" - haiku_devel - python_setuptools - " - -BUILD_PREREQUIRES=" - cmd:python - cmd:gcc - " - -BUILD() -{ - $portPackageLinksDir/cmd~python/bin/python setup.py build -} - -INSTALL() -{ - # GENERIC: all python_setuptools-based installs need this - python=$portPackageLinksDir/cmd~python/bin/python - pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3) - installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ - export PYTHONPATH=$installLocation:$PYTHONPATH - mkdir -p $installLocation - - $python setup.py install \ - --single-version-externally-managed \ - --root=/ --prefix=$prefix -} diff --git a/dev-python/argh/argh-0.26.2.recipe b/dev-python/argh/argh-0.26.2.recipe new file mode 100644 index 000000000..1c076c39a --- /dev/null +++ b/dev-python/argh/argh-0.26.2.recipe @@ -0,0 +1,62 @@ +SUMMARY="An unobtrusive argparse wrapper with natural syntax" +DESCRIPTION="Building a command-line interface? \ +Found yourself uttering "argh!" while struggling with the API of argparse? \ +Don't like the complexity but need the power? +Argh is a smart wrapper for argparse. Argparse is a very powerful tool; \ +Argh just makes it easy to use." +HOMEPAGE="https://pypi.python.org/pypi/argh" +COPYRIGHT="2010-2014 Andrey Mikhaylenko and contributors" +LICENSE="GNU LGPL v3" +REVISION="1" +SOURCE_URI="https://github.com/neithere/argh/archive/v$portVersion.tar.gz" +CHECKSUM_SHA256="eb5476ac788e5c4f5e01825455630218aba055c29240637988f4c99532e7bdb6" + +ARCHITECTURES="any" + +PROVIDES=" + $portName = $portVersion + " +REQUIRES=" + haiku + " + +BUILD_REQUIRES=" + haiku_devel + " + +PYTHON_PACKAGES=(python python3) +PYTHON_VERSIONS=(2.7 3.6) +for i in "${!PYTHON_PACKAGES[@]}"; do +pythonPackage=${PYTHON_PACKAGES[i]} +pythonVersion=${PYTHON_VERSIONS[$i]} +eval "PROVIDES_${pythonPackage}=\"\ + ${portName}_$pythonPackage = $portVersion\ + \"; \ +REQUIRES_$pythonPackage=\"\ + haiku\n\ + cmd:python$pythonVersion\ + \"" +BUILD_REQUIRES="$BUILD_REQUIRES + setuptools_$pythonPackage" +BUILD_PREREQUIRES="$BUILD_PREREQUIRES + cmd:python$pythonVersion" +done + +INSTALL() +{ + for i in "${!PYTHON_PACKAGES[@]}"; do + pythonPackage=${PYTHON_PACKAGES[i]} + pythonVersion=${PYTHON_VERSIONS[$i]} + + python=python$pythonVersion + installLocation=$prefix/lib/$python/vendor-packages/ + export PYTHONPATH=$installLocation:$PYTHONPATH + mkdir -p $installLocation + rm -rf build + $python setup.py build install \ + --root=/ --prefix=$prefix + + packageEntries $pythonPackage \ + $prefix/lib/python* + done +} diff --git a/dev-python/beautifulsoup/beautifulsoup-4.4.1.recipe b/dev-python/beautifulsoup/beautifulsoup-4.4.1.recipe deleted file mode 100644 index 847815071..000000000 --- a/dev-python/beautifulsoup/beautifulsoup-4.4.1.recipe +++ /dev/null @@ -1,57 +0,0 @@ -SUMMARY="Python library for iterating, searching, and modifying an HTML/XML parse tree" -DESCRIPTION=" - Beautiful Soup is a Python HTML/XML parser designed for quick - turnaround projects like screen-scraping. - Two features make it powerful: - it won't choke if you give it bad markup and it provides - a few simple methods and Pythonic idioms for navigating and - searching a parse tree: a toolkit for dissecting a document and - extracting what you need" -HOMEPAGE="https://bugs.launchpad.net/beautifulsoup/ - https://pypi.python.org/pypi/beautifulsoup4 - http://www.crummy.com/software/BeautifulSoup/bs4/" -COPYRIGHT="2004-2015 Leonard Richardson - 2006-2013 James Graham and other contributors" -LICENSE="MIT" -REVISION="1" -SOURCE_URI="https://pypi.python.org/packages/source/b/beautifulsoup4/beautifulsoup4-4.4.1.tar.gz" -CHECKSUM_SHA256="87d4013d0625d4789a4f56b8d79a04d5ce6db1152bb65f1d39744f7709a366b4" -SOURCE_DIR="beautifulsoup4-$portVersion" - -ARCHITECTURES="?x86 x86_gcc2 !x86_64" - -PROVIDES=" - beautifulsoup = $portVersion - " -REQUIRES=" - haiku - cmd:python - #python_setuptools - " - -BUILD_REQUIRES=" - haiku_devel - python_setuptools - " -BUILD_PREREQUIRES=" - cmd:python - " - -BUILD() -{ - $portPackageLinksDir/cmd~python/bin/python setup.py build -} - -INSTALL() -{ - # GENERIC: all python_setuptools-based installs need this - export PATH="$portPackageLinksDir/cmd~python/bin:$PATH" - pythonVersion=$(python --version 2>&1 | sed 's/Python //' | head -c3) - installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ - export PYTHONPATH=$installLocation:$PYTHONPATH - mkdir -p $installLocation - - python setup.py install \ - --single-version-externally-managed \ - --root=/ --prefix=$prefix -} diff --git a/dev-python/beautifulsoup/beautifulsoup-4.5.3.recipe b/dev-python/beautifulsoup/beautifulsoup-4.5.3.recipe new file mode 100644 index 000000000..ad1378fba --- /dev/null +++ b/dev-python/beautifulsoup/beautifulsoup-4.5.3.recipe @@ -0,0 +1,69 @@ +SUMMARY="Python library for iterating, searching, and modifying an HTML/XML parse tree" +DESCRIPTION=" + Beautiful Soup is a Python HTML/XML parser designed for quick + turnaround projects like screen-scraping. + Two features make it powerful: + it won't choke if you give it bad markup and it provides + a few simple methods and Pythonic idioms for navigating and + searching a parse tree: a toolkit for dissecting a document and + extracting what you need" +HOMEPAGE="https://bugs.launchpad.net/beautifulsoup/ + https://pypi.python.org/pypi/beautifulsoup4 + http://www.crummy.com/software/BeautifulSoup/bs4/" +COPYRIGHT="2004-2015 Leonard Richardson + 2006-2013 James Graham and other contributors" +LICENSE="MIT" +REVISION="1" +SOURCE_URI="https://pypi.python.org/packages/9b/a5/c6fa2d08e6c671103f9508816588e0fb9cec40444e8e72993f3d4c325936/beautifulsoup4-$portVersion.tar.gz" +CHECKSUM_SHA256="b21ca09366fa596043578fd4188b052b46634d22059e68dd0077d9ee77e08a3e" +SOURCE_DIR="beautifulsoup4-$portVersion" + +ARCHITECTURES="any" + +PROVIDES=" + $portName = $portVersion + " +REQUIRES=" + haiku + " + +BUILD_REQUIRES=" + haiku_devel + " + +PYTHON_PACKAGES=(python python3) +PYTHON_VERSIONS=(2.7 3.6) +for i in "${!PYTHON_PACKAGES[@]}"; do +pythonPackage=${PYTHON_PACKAGES[i]} +pythonVersion=${PYTHON_VERSIONS[$i]} +eval "PROVIDES_${pythonPackage}=\"\ + ${portName}_$pythonPackage = $portVersion\ + \"; \ +REQUIRES_$pythonPackage=\"\ + haiku\n\ + cmd:python$pythonVersion\ + \"" +BUILD_REQUIRES="$BUILD_REQUIRES + setuptools_$pythonPackage" +BUILD_PREREQUIRES="$BUILD_PREREQUIRES + cmd:python$pythonVersion" +done + +INSTALL() +{ + for i in "${!PYTHON_PACKAGES[@]}"; do + pythonPackage=${PYTHON_PACKAGES[i]} + pythonVersion=${PYTHON_VERSIONS[$i]} + + python=python$pythonVersion + installLocation=$prefix/lib/$python/vendor-packages/ + export PYTHONPATH=$installLocation:$PYTHONPATH + mkdir -p $installLocation + rm -rf build + $python setup.py build install \ + --root=/ --prefix=$prefix + + packageEntries $pythonPackage \ + $prefix/lib/python* + done +} diff --git a/dev-python/cssselect/cssselect-0.9.1.recipe b/dev-python/cssselect/cssselect-0.9.1.recipe deleted file mode 100644 index ce16870af..000000000 --- a/dev-python/cssselect/cssselect-0.9.1.recipe +++ /dev/null @@ -1,48 +0,0 @@ -SUMMARY="Parses CSS3 Selectors and translates them to XPath 1.0" -DESCRIPTION="cssselect parses CSS3 Selectors and translate them to XPath 1.0 \ -expressions. Such expressions can be used in lxml or another XPath \ -engine to find the matching elements in an XML or HTML document." -HOMEPAGE="https://pythonhosted.org/cssselect/ - https://pypi.python.org/pypi/cssselect" -COPYRIGHT="2007-2012 Ian Bicking and contributors" -LICENSE="BSD (3-clause)" -REVISION="1" -SOURCE_URI="https://pypi.python.org/packages/source/c/cssselect/cssselect-0.9.1.tar.gz" -CHECKSUM_SHA256="0535a7e27014874b27ae3a4d33e8749e345bdfa62766195208b7996bf1100682" - -ARCHITECTURES="x86 x86_gcc2 x86_64" - -PROVIDES=" - cssselect = $portVersion - " -REQUIRES=" - haiku - cmd:python - " - -BUILD_REQUIRES=" - haiku_devel - python_setuptools - " -BUILD_PREREQUIRES=" - cmd:python - " - -BUILD() -{ - $portPackageLinksDir/cmd~python/bin/python setup.py build -} - -INSTALL() -{ - # GENERIC: all python_setuptools-based installs need this - export PATH="$portPackageLinksDir/cmd~python/bin:$PATH" - pythonVersion=$(python --version 2>&1 | sed 's/Python //' | head -c3) - installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ - export PYTHONPATH=$installLocation:$PYTHONPATH - mkdir -p $installLocation - - python setup.py install \ - --single-version-externally-managed \ - --root=/ --prefix=$prefix -} diff --git a/dev-python/cssselect/cssselect-1.0.1.recipe b/dev-python/cssselect/cssselect-1.0.1.recipe new file mode 100644 index 000000000..4a7aabc14 --- /dev/null +++ b/dev-python/cssselect/cssselect-1.0.1.recipe @@ -0,0 +1,61 @@ +SUMMARY="Parses CSS3 Selectors and translates them to XPath 1.0" +DESCRIPTION="cssselect parses CSS3 Selectors and translate them to XPath 1.0 \ +expressions. Such expressions can be used in lxml or another XPath \ +engine to find the matching elements in an XML or HTML document." +HOMEPAGE="https://pythonhosted.org/cssselect/ + https://pypi.python.org/pypi/cssselect" +COPYRIGHT="2007-2012 Ian Bicking and contributors" +LICENSE="BSD (3-clause)" +REVISION="1" +SOURCE_URI="https://github.com/scrapy/cssselect/archive/v$portVersion.tar.gz" +CHECKSUM_SHA256="cdfa17ab5dc8818209f310a930b18d3035a4585ddd2c179e833036e2dde511c6" + +ARCHITECTURES="any" + +PROVIDES=" + $portName = $portVersion + " +REQUIRES=" + haiku + " + +BUILD_REQUIRES=" + haiku_devel + " + +PYTHON_PACKAGES=(python python3) +PYTHON_VERSIONS=(2.7 3.6) +for i in "${!PYTHON_PACKAGES[@]}"; do +pythonPackage=${PYTHON_PACKAGES[i]} +pythonVersion=${PYTHON_VERSIONS[$i]} +eval "PROVIDES_${pythonPackage}=\"\ + ${portName}_$pythonPackage = $portVersion\ + \"; \ +REQUIRES_$pythonPackage=\"\ + haiku\n\ + cmd:python$pythonVersion\ + \"" +BUILD_REQUIRES="$BUILD_REQUIRES + setuptools_$pythonPackage" +BUILD_PREREQUIRES="$BUILD_PREREQUIRES + cmd:python$pythonVersion" +done + +INSTALL() +{ + for i in "${!PYTHON_PACKAGES[@]}"; do + pythonPackage=${PYTHON_PACKAGES[i]} + pythonVersion=${PYTHON_VERSIONS[$i]} + + python=python$pythonVersion + installLocation=$prefix/lib/$python/vendor-packages/ + export PYTHONPATH=$installLocation:$PYTHONPATH + mkdir -p $installLocation + rm -rf build + $python setup.py build install \ + --root=/ --prefix=$prefix + + packageEntries $pythonPackage \ + $prefix/lib/python* + done +} diff --git a/dev-python/cython/python3_cython-0.25.2.recipe b/dev-python/cython/python3_cython-0.25.2.recipe index edffab8fd..2453f02c6 100644 --- a/dev-python/cython/python3_cython-0.25.2.recipe +++ b/dev-python/cython/python3_cython-0.25.2.recipe @@ -25,7 +25,7 @@ REQUIRES=" BUILD_REQUIRES=" haiku_devel - python3_setuptools + setuptools_python3 " BUILD_PREREQUIRES=" cmd:gcc diff --git a/dev-python/cython/python_cython-0.25.2.recipe b/dev-python/cython/python_cython-0.25.2.recipe index 9b3b5b8c7..2fc9aaa34 100644 --- a/dev-python/cython/python_cython-0.25.2.recipe +++ b/dev-python/cython/python_cython-0.25.2.recipe @@ -25,7 +25,7 @@ REQUIRES=" BUILD_REQUIRES=" haiku_devel - python_setuptools + setuptools_python " BUILD_PREREQUIRES=" cmd:gcc diff --git a/dev-python/dateutil/dateutil-2.6.0.recipe b/dev-python/dateutil/dateutil-2.6.0.recipe new file mode 100644 index 000000000..559897b28 --- /dev/null +++ b/dev-python/dateutil/dateutil-2.6.0.recipe @@ -0,0 +1,63 @@ +SUMMARY="Extensions to the standard Python datetime module" +DESCRIPTION="The dateutil module provides powerful extensions to the standard \ +datetime module, available in Python 2.3+." +HOMEPAGE="http://github.com/dateutil/dateutil/" +COPYRIGHT="2003-2010 Gustavo Niemeyer" +LICENSE="BSD (3-clause)" +REVISION="1" +SOURCE_URI="http://github.com/dateutil/dateutil/archive/$portVersion.tar.gz" +CHECKSUM_SHA256="3a027333eda28ad003f1a6c77cc0a46be06cb9e0790843dad6a1b619b102a181" + +ARCHITECTURES="any" + +PROVIDES=" + $portName = $portVersion + " +REQUIRES=" + haiku + " + +BUILD_REQUIRES=" + haiku_devel + " + +PYTHON_PACKAGES=(python python3) +PYTHON_VERSIONS=(2.7 3.6) +for i in "${!PYTHON_PACKAGES[@]}"; do +pythonPackage=${PYTHON_PACKAGES[i]} +pythonVersion=${PYTHON_VERSIONS[$i]} +eval "PROVIDES_${pythonPackage}=\"\ + ${portName}_$pythonPackage = $portVersion\ + \"; \ +REQUIRES_$pythonPackage=\"\ + haiku\n\ + cmd:python$pythonVersion\ + \"" +BUILD_REQUIRES="$BUILD_REQUIRES + setuptools_$pythonPackage" +BUILD_PREREQUIRES="$BUILD_PREREQUIRES + cmd:python$pythonVersion" +done + +REPLACES_python=" + python_dateutil + " + +INSTALL() +{ + for i in "${!PYTHON_PACKAGES[@]}"; do + pythonPackage=${PYTHON_PACKAGES[i]} + pythonVersion=${PYTHON_VERSIONS[$i]} + + python=python$pythonVersion + installLocation=$prefix/lib/$python/vendor-packages/ + export PYTHONPATH=$installLocation:$PYTHONPATH + mkdir -p $installLocation + rm -rf build + $python setup.py build install \ + --root=/ --prefix=$prefix + + packageEntries $pythonPackage \ + $prefix/lib/python* + done +} diff --git a/dev-python/dateutil/python_dateutil-2.5.2.recipe b/dev-python/dateutil/python_dateutil-2.5.2.recipe deleted file mode 100644 index 24e6af00b..000000000 --- a/dev-python/dateutil/python_dateutil-2.5.2.recipe +++ /dev/null @@ -1,51 +0,0 @@ -SUMMARY="Extensions to the standard Python datetime module" -DESCRIPTION="The dateutil module provides powerful extensions to the standard \ -datetime module, available in Python 2.3+." -HOMEPAGE="http://labix.org/python-dateutil" -COPYRIGHT="2003-2010 Gustavo Niemeyer" -#FIXME: check exact license -#XXX: 2.0 is "simplified BSD" (which one ?) -LICENSE="Python" -REVISION="1" -SOURCE_URI="http://github.com/dateutil/dateutil/archive/$portVersion.tar.gz" -CHECKSUM_SHA256="757e927693126f474a3a97eef0215f87edb318c04e4f6ee9ab407c9994f91d27" -SOURCE_DIR="dateutil-$portVersion" - -ARCHITECTURES="x86 x86_gcc2 x86_64" - -PROVIDES=" - python_dateutil = $portVersion - " -REQUIRES=" - haiku - cmd:python2 - #python_setuptools - " - -BUILD_REQUIRES=" - haiku_devel - python_setuptools - " -BUILD_PREREQUIRES=" - cmd:python2 - cmd:gcc - " - -BUILD() -{ - $portPackageLinksDir/cmd~python2/bin/python2 setup.py build -} - -INSTALL() -{ - # GENERIC: all python_setuptools-based installs need this - export PATH="$portPackageLinksDir/cmd~python2/bin:$PATH" - pythonVersion=$(python2 --version 2>&1 | sed 's/Python //' | head -c3) - installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ - export PYTHONPATH=$installLocation:$PYTHONPATH - mkdir -p $installLocation - - python2 setup.py install \ - --single-version-externally-managed \ - --root=/ --prefix=$prefix -} diff --git a/dev-python/docutils/docutils-0.12.recipe b/dev-python/docutils/docutils-0.12.recipe deleted file mode 100644 index 65844f42f..000000000 --- a/dev-python/docutils/docutils-0.12.recipe +++ /dev/null @@ -1,56 +0,0 @@ -SUMMARY="An open-source text processing system" -DESCRIPTION="Docutils is an open-source text processing system for processing \ -plaintext documentation into useful formats, such as HTML, LaTeX, man-pages, \ -open-document or XML. It includes reStructuredText, the easy to read, easy to \ -use, what-you-see-is-what-you-get plaintext markup language." -HOMEPAGE="http://docutils.sourceforge.net/" -COPYRIGHT="Günter Milde - John Gruber - Alex Fernández" -LICENSE="Public Domain - BSD (2-clause) - GNU GPL v3 - Python" -REVISION="1" -SOURCE_URI="http://sourceforge.net/projects/docutils/files/docutils/$portVersion/docutils-$portVersion.tar.gz" -CHECKSUM_SHA256="c7db717810ab6965f66c8cf0398a98c9d8df982da39b4cd7f162911eb89596fa" - -ARCHITECTURES="x86 x86_gcc2 x86_64" - -PROVIDES=" - docutils = $portVersion - cmd:rst2html.py = $portVersion - cmd:rst2latex.py = $portVersion - cmd:rst2man.py = $portVersion - cmd:rst2newlatex.py = $portVersion - cmd:rst2odt_prepstyles.py = $portVersion - cmd:rst2odt.py = $portVersion - cmd:rst2pseudoxml.py = $portVersion - cmd:rst2s5.py = $portVersion - cmd:rst2xetex.py = $portVersion - cmd:rst2xml.py = $portVersion - cmd:rstpep2html.py = $portVersion - " -REQUIRES=" - haiku - cmd:python2 - " - -BUILD_REQUIRES=" - haiku_devel - " -BUILD_PREREQUIRES=" - cmd:python2 - " - -BUILD() -{ - $portPackageLinksDir/cmd~python2/bin/python2 setup.py build -} - -INSTALL() -{ - $portPackageLinksDir/cmd~python2/bin/python2 setup.py install \ - --prefix="$prefix" \ - --force -} diff --git a/dev-python/docutils/docutils-0.13.1.recipe b/dev-python/docutils/docutils-0.13.1.recipe new file mode 100644 index 000000000..fe04eae09 --- /dev/null +++ b/dev-python/docutils/docutils-0.13.1.recipe @@ -0,0 +1,101 @@ +SUMMARY="An open-source text processing system" +DESCRIPTION="Docutils is an open-source text processing system for processing \ +plaintext documentation into useful formats, such as HTML, LaTeX, man-pages, \ +open-document or XML. It includes reStructuredText, the easy to read, easy to \ +use, what-you-see-is-what-you-get plaintext markup language." +HOMEPAGE="http://docutils.sourceforge.net/" +COPYRIGHT="Günter Milde + John Gruber + Alex Fernández" +LICENSE="Public Domain + BSD (2-clause) + GNU GPL v3 + Python" +REVISION="1" +SOURCE_URI="http://sourceforge.net/projects/docutils/files/docutils/$portVersion/docutils-$portVersion.tar.gz" +CHECKSUM_SHA256="718c0f5fb677be0f34b781e04241c4067cbd9327b66bdd8e763201130f5175be" + +ARCHITECTURES="any" + +PROVIDES=" + $portName = $portVersion + " +REQUIRES=" + haiku + " + +BUILD_REQUIRES=" + haiku_devel + " + +PYTHON_PACKAGES=(python python3) +PYTHON_VERSIONS=(2.7 3.6) +for i in "${!PYTHON_PACKAGES[@]}"; do +pythonPackage=${PYTHON_PACKAGES[i]} +pythonVersion=${PYTHON_VERSIONS[$i]} +eval "PROVIDES_${pythonPackage}=\"\ + ${portName}_$pythonPackage = $portVersion\ + \"; \ +REQUIRES_$pythonPackage=\"\ + haiku\n\ + cmd:python$pythonVersion\ + \"" +BUILD_REQUIRES="$BUILD_REQUIRES + setuptools_$pythonPackage" +BUILD_PREREQUIRES="$BUILD_PREREQUIRES + cmd:python$pythonVersion" +done + +PROVIDES_python="$PROVIDES_python + cmd:rst2html.py = $portVersion + cmd:rst2html5.py = $portVersion + cmd:rst2latex.py = $portVersion + cmd:rst2man.py = $portVersion + cmd:rst2newlatex.py = $portVersion + cmd:rst2odt_prepstyles.py = $portVersion + cmd:rst2odt.py = $portVersion + cmd:rst2pseudoxml.py = $portVersion + cmd:rst2s5.py = $portVersion + cmd:rst2xetex.py = $portVersion + cmd:rst2xml.py = $portVersion + cmd:rstpep2html.py = $portVersion + " +PROVIDES_python3="$PROVIDES_python3 + cmd:rst2html3.py = $portVersion + cmd:rst2html53.py = $portVersion + cmd:rst2latex3.py = $portVersion + cmd:rst2man3.py = $portVersion + cmd:rst2newlatex3.py = $portVersion + cmd:rst2odt_prepstyles3.py = $portVersion + cmd:rst2odt3.py = $portVersion + cmd:rst2pseudoxml3.py = $portVersion + cmd:rst2s53.py = $portVersion + cmd:rst2xetex3.py = $portVersion + cmd:rst2xml3.py = $portVersion + cmd:rstpep2html3.py = $portVersion + " + +INSTALL() +{ + for i in "${!PYTHON_PACKAGES[@]}"; do + pythonPackage=${PYTHON_PACKAGES[i]} + pythonVersion=${PYTHON_VERSIONS[$i]} + + python=python$pythonVersion + installLocation=$prefix/lib/$python/vendor-packages/ + export PYTHONPATH=$installLocation:$PYTHONPATH + mkdir -p $installLocation + rm -rf build + $python setup.py build install \ + --root=/ --prefix=$prefix + + if [ $pythonPackage != python ]; then + for f in $binDir/*.py; do + mv $f ${f%.py}3.py + done + fi + packageEntries $pythonPackage \ + $prefix/lib/python* \ + $binDir + done +} diff --git a/dev-python/ecdsa/ecdsa-0.13.recipe b/dev-python/ecdsa/ecdsa-0.13.recipe new file mode 100644 index 000000000..eb496b248 --- /dev/null +++ b/dev-python/ecdsa/ecdsa-0.13.recipe @@ -0,0 +1,63 @@ +SUMMARY="Pure python ECDSA implementation" +DESCRIPTION="ECDSA is a module for python 2.6 (or higher) that implements \ +the ECDSA cryptographic signature library." +HOMEPAGE="https://github.com/warner/python-ecdsa" +COPYRIGHT="2010 Brian Warner" +LICENSE="MIT" +REVISION="1" +SOURCE_URI="https://pypi.python.org/packages/source/e/ecdsa/ecdsa-$portVersion.tar.gz" +CHECKSUM_SHA256="64cf1ee26d1cde3c73c6d7d107f835fed7c6a2904aef9eac223d57ad800c43fa" + +ARCHITECTURES="any" + +PROVIDES=" + $portName = $portVersion + " +REQUIRES=" + haiku + " + +BUILD_REQUIRES=" + haiku_devel + " + +PYTHON_PACKAGES=(python python3) +PYTHON_VERSIONS=(2.7 3.6) +for i in "${!PYTHON_PACKAGES[@]}"; do +pythonPackage=${PYTHON_PACKAGES[i]} +pythonVersion=${PYTHON_VERSIONS[$i]} +eval "PROVIDES_${pythonPackage}=\"\ + ${portName}_$pythonPackage = $portVersion\ + \"; \ +REQUIRES_$pythonPackage=\"\ + haiku\n\ + cmd:python$pythonVersion\ + \"" +BUILD_REQUIRES="$BUILD_REQUIRES + setuptools_$pythonPackage" +BUILD_PREREQUIRES="$BUILD_PREREQUIRES + cmd:python$pythonVersion" +done + +REPLACES_python=" + python_ecdsa + " + +INSTALL() +{ + for i in "${!PYTHON_PACKAGES[@]}"; do + pythonPackage=${PYTHON_PACKAGES[i]} + pythonVersion=${PYTHON_VERSIONS[$i]} + + python=python$pythonVersion + installLocation=$prefix/lib/$python/vendor-packages/ + export PYTHONPATH=$installLocation:$PYTHONPATH + mkdir -p $installLocation + rm -rf build + $python setup.py build install \ + --root=/ --prefix=$prefix + + packageEntries $pythonPackage \ + $prefix/lib/python* + done +} diff --git a/dev-python/ecdsa/python_ecdsa-0.13.recipe b/dev-python/ecdsa/python_ecdsa-0.13.recipe deleted file mode 100644 index a3d556a90..000000000 --- a/dev-python/ecdsa/python_ecdsa-0.13.recipe +++ /dev/null @@ -1,42 +0,0 @@ -SUMMARY="Pure python ECDSA implementation" -DESCRIPTION="ECDSA is a module for python 2.6 (or higher) that implements \ -the ECDSA cryptographic signature library." -HOMEPAGE="https://github.com/warner/python-ecdsa" -COPYRIGHT="2010 Brian Warner" -LICENSE="MIT" -REVISION="1" -SOURCE_URI="https://pypi.python.org/packages/source/e/ecdsa/ecdsa-0.13.tar.gz" -CHECKSUM_SHA256="64cf1ee26d1cde3c73c6d7d107f835fed7c6a2904aef9eac223d57ad800c43fa" - -ARCHITECTURES="arm ppc x86 x86_gcc2 x86_64" - -SOURCE_DIR="ecdsa-${portVersion}" - -PROVIDES=" - python_ecdsa = $portVersion - " -REQUIRES=" - haiku - cmd:python - " - -BUILD_REQUIRES=" - haiku_devel - " - -BUILD_PREREQUIRES=" - cmd:python - cmd:sed - " - - -BUILD() -{ - python setup.py build -} - - -INSTALL() -{ - python setup.py install --prefix=$prefix -} diff --git a/dev-python/feedparser/feedparser-5.2.1.recipe b/dev-python/feedparser/feedparser-5.2.1.recipe index d6d680235..88ca6c4d6 100644 --- a/dev-python/feedparser/feedparser-5.2.1.recipe +++ b/dev-python/feedparser/feedparser-5.2.1.recipe @@ -8,43 +8,55 @@ COPYRIGHT="2010-2015 Kurt McKee LICENSE="BSD (2-clause) Python" REVISION="1" -SOURCE_URI="https://github.com/kurtmckee/feedparser/archive/5.2.1.tar.gz" +SOURCE_URI="https://github.com/kurtmckee/feedparser/archive/$portVersion.tar.gz" CHECKSUM_SHA256="09367f95e58b9c5f70da70061d3e7f397ed8ec5d3c970e231ef011ff62de462f" -ARCHITECTURES="?x86 x86_gcc2 ?x86_64" +ARCHITECTURES="any" PROVIDES=" - feedparser = $portVersion + $portName = $portVersion " REQUIRES=" haiku - cmd:python - #python_setuptools " BUILD_REQUIRES=" haiku_devel - python_setuptools - " -BUILD_PREREQUIRES=" - cmd:python " -BUILD() -{ - $portPackageLinksDir/cmd~python/bin/python setup.py build -} +PYTHON_PACKAGES=(python python3) +PYTHON_VERSIONS=(2.7 3.6) +for i in "${!PYTHON_PACKAGES[@]}"; do +pythonPackage=${PYTHON_PACKAGES[i]} +pythonVersion=${PYTHON_VERSIONS[$i]} +eval "PROVIDES_${pythonPackage}=\"\ + ${portName}_$pythonPackage = $portVersion\ + \"; \ +REQUIRES_$pythonPackage=\"\ + haiku\n\ + cmd:python$pythonVersion\ + \"" +BUILD_REQUIRES="$BUILD_REQUIRES + setuptools_$pythonPackage" +BUILD_PREREQUIRES="$BUILD_PREREQUIRES + cmd:python$pythonVersion" +done INSTALL() { - # GENERIC: all python_setuptools-based installs need this - export PATH="$portPackageLinksDir/cmd~python/bin:$PATH" - pythonVersion=$(python --version 2>&1 | sed 's/Python //' | head -c3) - installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ - export PYTHONPATH=$installLocation:$PYTHONPATH - mkdir -p $installLocation + for i in "${!PYTHON_PACKAGES[@]}"; do + pythonPackage=${PYTHON_PACKAGES[i]} + pythonVersion=${PYTHON_VERSIONS[$i]} - python setup.py install \ - --single-version-externally-managed \ - --root=/ --prefix=$prefix + python=python$pythonVersion + installLocation=$prefix/lib/$python/vendor-packages/ + export PYTHONPATH=$installLocation:$PYTHONPATH + mkdir -p $installLocation + rm -rf build + $python setup.py build install \ + --root=/ --prefix=$prefix + + packageEntries $pythonPackage \ + $prefix/lib/python* + done } diff --git a/dev-python/fonttools/fonttools-3.10.0.recipe b/dev-python/fonttools/fonttools-3.10.0.recipe new file mode 100644 index 000000000..1b04ac735 --- /dev/null +++ b/dev-python/fonttools/fonttools-3.10.0.recipe @@ -0,0 +1,98 @@ +SUMMARY="A library for manipulating fonts" +DESCRIPTION="FontTools is a library for manipulating fonts, written in Python.\ + It supports TrueType, OpenType, AFM and to an extent Type 1 and some \ +Mac-specific formats." +HOMEPAGE="https://github.com/behdad/fonttools" +COPYRIGHT="1999-2004 Just van Rossum, Letterror, The Netherlands." +LICENSE="FONTTOOLS" +REVISION="1" +SOURCE_URI="https://github.com/fonttools/fonttools/archive/$portVersion.tar.gz" +SOURCE_FILENAME="fonttools-$portVersion.tar.gz" +CHECKSUM_SHA256="91fbab7277017587d9c6bfaf6770cbf1b38983d02308eb3f948b7915e43ef6bb" + +ARCHITECTURES="any" + +PROVIDES=" + $portName = $portVersion + cmd:fonttools + cmd:pyftinspect + cmd:pyftmerge + cmd:pyftsubset + cmd:ttx + " +REQUIRES=" + haiku + " + +BUILD_REQUIRES=" + haiku_devel + " + +PYTHON_PACKAGES=(python python3) +PYTHON_VERSIONS=(2.7 3.6) +for i in "${!PYTHON_PACKAGES[@]}"; do +pythonPackage=${PYTHON_PACKAGES[i]} +pythonVersion=${PYTHON_VERSIONS[$i]} +eval "PROVIDES_${pythonPackage}=\"\ + ${portName}_$pythonPackage = $portVersion\ + \"; \ +REQUIRES_$pythonPackage=\"\ + haiku\n\ + cmd:python$pythonVersion\ + \"" +BUILD_REQUIRES="$BUILD_REQUIRES + setuptools_$pythonPackage" +BUILD_PREREQUIRES="$BUILD_PREREQUIRES + cmd:python$pythonVersion" +done + +PROVIDES_python="$PROVIDES_python + cmd:fonttools + cmd:pyftinspect + cmd:pyftmerge + cmd:pyftsubset + cmd:ttx + " +REPLACES_python=" + python_fonttools + " +PROVIDES_python3="$PROVIDES_python3 + cmd:fonttools3 + cmd:pyftinspect3 + cmd:pyftmerge3 + cmd:pyftsubset3 + cmd:ttx3 + " +REPLACES_python3=" + python3_fonttools + " + +INSTALL() +{ + for i in "${!PYTHON_PACKAGES[@]}"; do + pythonPackage=${PYTHON_PACKAGES[i]} + pythonVersion=${PYTHON_VERSIONS[$i]} + + python=python$pythonVersion + installLocation=$prefix/lib/$python/vendor-packages/ + export PYTHONPATH=$installLocation:$PYTHONPATH + mkdir -p $installLocation + rm -rf build + $python setup.py build install \ + --root=/ --prefix=$prefix + + if [ $pythonPackage != python ]; then + for f in $binDir/*; do + mv $f ${f}3 + done + fi + + packageEntries $pythonPackage \ + $prefix/lib/python* \ + $binDir + done + + mkdir -p $(dirname $manDir) + mv $prefix/share/man $manDir + rmdir $prefix/share +} diff --git a/dev-python/fonttools/python3_fonttools-3.0.recipe b/dev-python/fonttools/python3_fonttools-3.0.recipe deleted file mode 100644 index 4d29d2793..000000000 --- a/dev-python/fonttools/python3_fonttools-3.0.recipe +++ /dev/null @@ -1,53 +0,0 @@ -SUMMARY="A library for manipulating fonts" -DESCRIPTION="FontTools is a library for manipulating fonts, written in Python.\ - It supports TrueType, OpenType, AFM and to an extent Type 1 and some \ -Mac-specific formats." -HOMEPAGE="https://github.com/behdad/fonttools" -COPYRIGHT="1999-2004 Just van Rossum, Letterror, The Netherlands." -LICENSE="FONTTOOLS" -REVISION="2" -SOURCE_URI="https://github.com/behdad/fonttools/archive/$portVersion.tar.gz" -SOURCE_FILENAME="fonttools-$portVersion.tar.gz" -CHECKSUM_SHA256="3bc9141d608603faac3f800482feec78a550d0a94c29ff3850471dbe4ad9e941" -SOURCE_DIR="fonttools-$portVersion" -PYTHON_VERSION="3.6" - -ARCHITECTURES="x86 x86_gcc2 x86_64" - -PROVIDES=" - python3_fonttools = $portVersion - " -REQUIRES=" - haiku - cmd:python$PYTHON_VERSION - " - -BUILD_REQUIRES=" - python3_setuptools - " -BUILD_PREREQUIRES=" - haiku_devel - cmd:python$PYTHON_VERSION - cmd:gcc - " - -BUILD() -{ - $portPackageLinksDir/cmd~python$PYTHON_VERSION/bin/python3 setup.py build -} - -INSTALL() -{ - # GENERIC: all python_setuptools-based installs need this - python=$portPackageLinksDir/cmd~python$PYTHON_VERSION/bin/python3 - pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3) - installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ - export PYTHONPATH=$installLocation:$PYTHONPATH - mkdir -p $installLocation - - $python setup.py install \ - --prefix=$prefix - - # conflict with python_fonttools - rm -rf $binDir $prefix/share -} diff --git a/dev-python/fonttools/python_fonttools-3.0.recipe b/dev-python/fonttools/python_fonttools-3.0.recipe deleted file mode 100644 index a49e54b81..000000000 --- a/dev-python/fonttools/python_fonttools-3.0.recipe +++ /dev/null @@ -1,55 +0,0 @@ -SUMMARY="A library for manipulating fonts" -DESCRIPTION="FontTools is a library for manipulating fonts, written in Python.\ - It supports TrueType, OpenType, AFM and to an extent Type 1 and some \ -Mac-specific formats." -HOMEPAGE="https://github.com/behdad/fonttools" -COPYRIGHT="1999-2004 Just van Rossum, Letterror, The Netherlands." -LICENSE="FONTTOOLS" -REVISION="1" -SOURCE_URI="https://github.com/behdad/fonttools/archive/$portVersion.tar.gz" -SOURCE_FILENAME="fonttools-$portVersion.tar.gz" -CHECKSUM_SHA256="3bc9141d608603faac3f800482feec78a550d0a94c29ff3850471dbe4ad9e941" -SOURCE_DIR="fonttools-$portVersion" - -ARCHITECTURES="x86 x86_gcc2 x86_64" - -PROVIDES=" - python_fonttools = $portVersion - cmd:pyftmerge - cmd:pyftsubset - cmd:ttx - " -REQUIRES=" - haiku - cmd:python2 - " - -BUILD_REQUIRES=" - python_setuptools - " -BUILD_PREREQUIRES=" - haiku_devel - cmd:python2 - cmd:gcc - " - -BUILD() -{ - $portPackageLinksDir/cmd~python2/bin/python2 setup.py build -} - -INSTALL() -{ - # GENERIC: all python_setuptools-based installs need this - python=$portPackageLinksDir/cmd~python2/bin/python2 - pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3) - installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ - export PYTHONPATH=$installLocation:$PYTHONPATH - mkdir -p $installLocation - - $python setup.py install \ - --prefix=$prefix - - # we don't have pygtk - rm $binDir/pyftinspect -} diff --git a/dev-python/gdata/gdata-2.0.18.recipe b/dev-python/gdata/gdata-2.0.18.recipe index 893cfd9bc..deb0bc7f5 100644 --- a/dev-python/gdata/gdata-2.0.18.recipe +++ b/dev-python/gdata/gdata-2.0.18.recipe @@ -11,51 +11,58 @@ HOMEPAGE=" http://code.google.com/p/gdata-python-client/ http://pypi.python.org/pypi/gdata " -SOURCE_URI="https://pypi.python.org/packages/source/g/gdata/gdata-2.0.18.tar.gz" +SOURCE_URI="https://pypi.python.org/packages/source/g/gdata/gdata-$portVersion.tar.gz" CHECKSUM_SHA256="56e7d22de819c22b13ceb0fe1869729b4287f89ebbd4bb55380d7bcf61a1fdb6" LICENSE="Apache v2" COPYRIGHT="2006-2014 Google Inc." REVISION="1" -ARCHITECTURES="x86 x86_gcc2 x86_64" - -#SOURCE_DIR="PyYAML-$portVersion" +ARCHITECTURES="any" PROVIDES=" - gdata = $portVersion + $portName = $portVersion " - REQUIRES=" haiku - cmd:python " -#TODO: eventually depend on http://pyyaml.org/wiki/LibYAML BUILD_REQUIRES=" haiku_devel - cmd:sed - python_setuptools " -BUILD_PREREQUIRES=" - cmd:python - cmd:gcc - " - -BUILD() -{ - $portPackageLinksDir/cmd~python/bin/python setup.py build -} +PYTHON_PACKAGES=(python) +PYTHON_VERSIONS=(2.7) +for i in "${!PYTHON_PACKAGES[@]}"; do +pythonPackage=${PYTHON_PACKAGES[i]} +pythonVersion=${PYTHON_VERSIONS[$i]} +eval "PROVIDES_${pythonPackage}=\"\ + ${portName}_$pythonPackage = $portVersion\ + \"; \ +REQUIRES_$pythonPackage=\"\ + haiku\n\ + cmd:python$pythonVersion\ + \"" +BUILD_REQUIRES="$BUILD_REQUIRES + setuptools_$pythonPackage" +BUILD_PREREQUIRES="$BUILD_PREREQUIRES + cmd:python$pythonVersion" +done INSTALL() { - # GENERIC: all python_setuptools-based installs need this - python=$portPackageLinksDir/cmd~python/bin/python - pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3) - installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ - export PYTHONPATH=$installLocation:$PYTHONPATH - mkdir -p $installLocation + for i in "${!PYTHON_PACKAGES[@]}"; do + pythonPackage=${PYTHON_PACKAGES[i]} + pythonVersion=${PYTHON_VERSIONS[$i]} - $python setup.py install \ - --prefix=$prefix + python=python$pythonVersion + installLocation=$prefix/lib/$python/vendor-packages/ + export PYTHONPATH=$installLocation:$PYTHONPATH + mkdir -p $installLocation + rm -rf build + $python setup.py build install \ + --root=/ --prefix=$prefix + + packageEntries $pythonPackage \ + $prefix/lib/python* + done } diff --git a/dev-python/html2text/html2text-2016.9.19.recipe b/dev-python/html2text/html2text-2016.9.19.recipe new file mode 100644 index 000000000..2a7ae0a7e --- /dev/null +++ b/dev-python/html2text/html2text-2016.9.19.recipe @@ -0,0 +1,77 @@ +SUMMARY="Convert HTML to Markdown-formatted text" +DESCRIPTION=" + html2text is a Python script that converts a page of HTML into clean, + easy-to-read plain ASCII text. Better yet, that ASCII also happens to be + valid Markdown (a text-to-HTML format)." +HOMEPAGE="https://github.com/html2text/html2text.py + https://github.com/Alir3z4/html2text + https://pypi.python.org/pypi/html2text" +COPYRIGHT="2004-2008 Aaron Swartz" +LICENSE="GNU GPL v3" +REVISION="1" +SOURCE_URI="https://github.com/Alir3z4/html2text/archive/$portVersion.tar.gz" +CHECKSUM_SHA256="21c0237fae4f640eef53343a2965f44bfd907f0e1b956cd1171fb3884541767a" + +ARCHITECTURES="any" + +PROVIDES=" + $portName = $portVersion + " +REQUIRES=" + haiku + " + +BUILD_REQUIRES=" + haiku_devel + " + +PYTHON_PACKAGES=(python python3) +PYTHON_VERSIONS=(2.7 3.6) +for i in "${!PYTHON_PACKAGES[@]}"; do +pythonPackage=${PYTHON_PACKAGES[i]} +pythonVersion=${PYTHON_VERSIONS[$i]} +eval "PROVIDES_${pythonPackage}=\"\ + ${portName}_$pythonPackage = $portVersion\ + \"; \ +REQUIRES_$pythonPackage=\"\ + haiku\n\ + cmd:python$pythonVersion\ + \"" +BUILD_REQUIRES="$BUILD_REQUIRES + setuptools_$pythonPackage" +BUILD_PREREQUIRES="$BUILD_PREREQUIRES + cmd:python$pythonVersion" +done + +PROVIDES_python="$PROVIDES_python + cmd:html2text + " +REPLACES_python=" + python_html2text + " +PROVIDES_python3="$PROVIDES_python3 + cmd:html2text3 + " + +INSTALL() +{ + for i in "${!PYTHON_PACKAGES[@]}"; do + pythonPackage=${PYTHON_PACKAGES[i]} + pythonVersion=${PYTHON_VERSIONS[$i]} + + python=python$pythonVersion + installLocation=$prefix/lib/$python/vendor-packages/ + export PYTHONPATH=$installLocation:$PYTHONPATH + mkdir -p $installLocation + rm -rf build + $python setup.py build install \ + --root=/ --prefix=$prefix + + if [ $pythonPackage != python ]; then + mv $binDir/html2text $binDir/html2text3 + fi + packageEntries $pythonPackage \ + $prefix/lib/python* \ + $binDir + done +} diff --git a/dev-python/html2text/python_html2text-2016.4.2.recipe b/dev-python/html2text/python_html2text-2016.4.2.recipe deleted file mode 100644 index a4fe161f4..000000000 --- a/dev-python/html2text/python_html2text-2016.4.2.recipe +++ /dev/null @@ -1,52 +0,0 @@ -SUMMARY="Convert HTML to Markdown-formatted text" -DESCRIPTION=" - html2text is a Python script that converts a page of HTML into clean, - easy-to-read plain ASCII text. Better yet, that ASCII also happens to be - valid Markdown (a text-to-HTML format)." -HOMEPAGE="https://github.com/html2text/html2text.py - https://github.com/Alir3z4/html2text - https://pypi.python.org/pypi/html2text" -COPYRIGHT="2004-2008 Aaron Swartz" -LICENSE="GNU GPL v3" -REVISION="1" -SOURCE_URI="https://pypi.python.org/packages/source/h/html2text/html2text-$portVersion.tar.gz" -CHECKSUM_SHA256="32e5e49eb520335bae200a00e3cc981f1ade558930068e1bb2a6e3fb1504f951" -SOURCE_DIR="html2text-$portVersion" - -ARCHITECTURES="x86 x86_gcc2 x86_64" - -PROVIDES=" - python_html2text = $portVersion - " -REQUIRES=" - haiku - cmd:python2 - #python_setuptools - " - -BUILD_REQUIRES=" - haiku_devel - python_setuptools - " -BUILD_PREREQUIRES=" - cmd:python2 - " - -BUILD() -{ - $portPackageLinksDir/cmd~python2/bin/python2 setup.py build -} - -INSTALL() -{ - # GENERIC: all python_setuptools-based installs need this - export PATH="$portPackageLinksDir/cmd~python2/bin:$PATH" - pythonVersion=$(python2 --version 2>&1 | sed 's/Python //' | head -c3) - installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ - export PYTHONPATH=$installLocation:$PYTHONPATH - mkdir -p $installLocation - - python2 setup.py install \ - --single-version-externally-managed \ - --root=/ --prefix=$prefix -} diff --git a/dev-python/httplib2/httplib2-0.10.3.recipe b/dev-python/httplib2/httplib2-0.10.3.recipe new file mode 100644 index 000000000..d72b286ac --- /dev/null +++ b/dev-python/httplib2/httplib2-0.10.3.recipe @@ -0,0 +1,66 @@ +SUMMARY="A comprehensive HTTP library for the Python platform" +DESCRIPTION="httplib2 supports many features left out of other HTTP \ +libraries." +HOMEPAGE="https://github.com/httplib2/httplib2/" +COPYRIGHT="2006 Joe Gregorio" +LICENSE="MIT" +REVISION="1" +SOURCE_URI="$HOMEPAGE/archive/v$portVersion.tar.gz" +CHECKSUM_SHA256="d1bee28a68cc665c451c83d315e3afdbeb5391f08971dcc91e060d5ba16986f1" + +ARCHITECTURES="any" + +PROVIDES=" + $portName = $portVersion + " +REQUIRES=" + haiku + " + +BUILD_REQUIRES=" + haiku_devel + " + +PYTHON_PACKAGES=(python python3) +PYTHON_VERSIONS=(2.7 3.6) +for i in "${!PYTHON_PACKAGES[@]}"; do +pythonPackage=${PYTHON_PACKAGES[i]} +pythonVersion=${PYTHON_VERSIONS[$i]} +eval "PROVIDES_${pythonPackage}=\"\ + ${portName}_$pythonPackage = $portVersion\ + \"; \ +REQUIRES_$pythonPackage=\"\ + haiku\n\ + cmd:python$pythonVersion\ + \"" +BUILD_REQUIRES="$BUILD_REQUIRES + setuptools_$pythonPackage" +BUILD_PREREQUIRES="$BUILD_PREREQUIRES + cmd:python$pythonVersion" +done + +REPLACES_python=" + python_httplib2 + " +REPLACES_python3=" + python3_httplib2 + " + +INSTALL() +{ + for i in "${!PYTHON_PACKAGES[@]}"; do + pythonPackage=${PYTHON_PACKAGES[i]} + pythonVersion=${PYTHON_VERSIONS[$i]} + + python=python$pythonVersion + installLocation=$prefix/lib/$python/vendor-packages/ + export PYTHONPATH=$installLocation:$PYTHONPATH + mkdir -p $installLocation + rm -rf build + $python setup.py build install \ + --root=/ --prefix=$prefix + + packageEntries $pythonPackage \ + $prefix/lib/python* + done +} diff --git a/dev-python/httplib2/python3_httplib2-0.9.2.recipe b/dev-python/httplib2/python3_httplib2-0.9.2.recipe deleted file mode 100644 index 5e83764d9..000000000 --- a/dev-python/httplib2/python3_httplib2-0.9.2.recipe +++ /dev/null @@ -1,48 +0,0 @@ -SUMMARY="A comprehensive HTTP library for the Python platform" -DESCRIPTION="httplib2 supports many features left out of other HTTP \ -libraries." -HOMEPAGE="https://pypi.python.org/pypi/httplib2" -COPYRIGHT="2006 Joe Gregorio" -LICENSE="MIT" -REVISION="2" -SOURCE_URI="https://pypi.python.org/packages/source/h/httplib2/httplib2-$portVersion.tar.gz" -CHECKSUM_SHA256="c3aba1c9539711551f4d83e857b316b5134a1c4ddce98a875b7027be7dd6d988" -SOURCE_DIR="httplib2-$portVersion" -PYTHON_VERSION="3.6" - -ARCHITECTURES="x86 x86_gcc2 x86_64" - -PROVIDES=" - python3_httplib2 = $portVersion - " -REQUIRES=" - haiku - cmd:python$PYTHON_VERSION - " - -BUILD_REQUIRES=" - python3_setuptools - " -BUILD_PREREQUIRES=" - haiku_devel - cmd:python$PYTHON_VERSION - cmd:gcc - " - -BUILD() -{ - $portPackageLinksDir/cmd~python$PYTHON_VERSION/bin/python3 setup.py build -} - -INSTALL() -{ - # GENERIC: all python_setuptools-based installs need this - python=$portPackageLinksDir/cmd~python$PYTHON_VERSION/bin/python3 - pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3) - installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ - export PYTHONPATH=$installLocation:$PYTHONPATH - mkdir -p $installLocation - - $python setup.py install \ - --prefix=$prefix -} diff --git a/dev-python/httplib2/python_httplib2-0.9.2.recipe b/dev-python/httplib2/python_httplib2-0.9.2.recipe deleted file mode 100644 index a488308e7..000000000 --- a/dev-python/httplib2/python_httplib2-0.9.2.recipe +++ /dev/null @@ -1,47 +0,0 @@ -SUMMARY="A comprehensive HTTP library for the Python platform" -DESCRIPTION="httplib2 supports many features left out of other HTTP \ -libraries." -HOMEPAGE="https://pypi.python.org/pypi/httplib2" -COPYRIGHT="2006 Joe Gregorio" -LICENSE="MIT" -REVISION="1" -SOURCE_URI="https://pypi.python.org/packages/source/h/httplib2/httplib2-$portVersion.tar.gz" -CHECKSUM_SHA256="c3aba1c9539711551f4d83e857b316b5134a1c4ddce98a875b7027be7dd6d988" -SOURCE_DIR="httplib2-$portVersion" - -ARCHITECTURES="x86 x86_gcc2 x86_64" - -PROVIDES=" - python_httplib2 = $portVersion - " -REQUIRES=" - haiku - cmd:python2 - " - -BUILD_REQUIRES=" - python_setuptools - " -BUILD_PREREQUIRES=" - haiku_devel - cmd:python2 - cmd:gcc - " - -BUILD() -{ - $portPackageLinksDir/cmd~python2/bin/python2 setup.py build -} - -INSTALL() -{ - # GENERIC: all python_setuptools-based installs need this - python=$portPackageLinksDir/cmd~python2/bin/python2 - pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3) - installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ - export PYTHONPATH=$installLocation:$PYTHONPATH - mkdir -p $installLocation - - $python setup.py install \ - --prefix=$prefix -} diff --git a/dev-python/imaging/python_imaging-1.1.7.recipe b/dev-python/imaging/python_imaging-1.1.7.recipe index 4706ae1c6..7924ee66f 100644 --- a/dev-python/imaging/python_imaging-1.1.7.recipe +++ b/dev-python/imaging/python_imaging-1.1.7.recipe @@ -6,16 +6,16 @@ HOMEPAGE="http://www.pythonware.com/products/pil/" COPYRIGHT="1997-2011 by Secret Labs AB 1995-2011 by Fredrik Lundh" LICENSE="MIT" -REVISION="2" -SOURCE_URI="http://effbot.org/downloads/Imaging-1.1.7.tar.gz" +REVISION="3" +SOURCE_URI="http://effbot.org/downloads/Imaging-$portVersion.tar.gz" CHECKSUM_SHA256="895bc7c2498c8e1f9b99938f1a40dc86b3f149741f105cf7c7bd2e0725405211" -SOURCE_DIR="Imaging-1.1.7" +SOURCE_DIR="Imaging-$portVersion" PATCHES="python_imaging-$portVersion.patchset" -ARCHITECTURES="x86_gcc2" +ARCHITECTURES="x86_gcc2 x86 x86_64" PROVIDES=" - python_imaging$secondaryArchSuffix = $portVersion + python_imaging = $portVersion cmd:pilconvert.py cmd:pildriver.py cmd:pilfile.py @@ -23,8 +23,11 @@ PROVIDES=" cmd:pilprint.py " REQUIRES=" + haiku lib:libjpeg + lib:libpython2.7 lib:libz + cmd:python2.7 " BUILD_REQUIRES=" @@ -32,17 +35,17 @@ BUILD_REQUIRES=" devel:libz " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel + haiku_devel cmd:gcc - cmd:python + cmd:python2.7 " BUILD() { - python setup.py build_ext -i + python2.7 setup.py build_ext -i } INSTALL() { - python setup.py install --prefix=$prefix + python2.7 setup.py install --prefix=$prefix } diff --git a/dev-python/iniparse/iniparse-0.4.recipe b/dev-python/iniparse/iniparse-0.4.recipe index 6bf3add07..d49303f61 100644 --- a/dev-python/iniparse/iniparse-0.4.recipe +++ b/dev-python/iniparse/iniparse-0.4.recipe @@ -19,38 +19,36 @@ COPYRIGHT="2001-2008 Python Software Foundation 2004-2009 Paramjit Oberoi 2007 Tim Lauridsen" LICENSE="MIT" -REVISION="1" +REVISION="2" SOURCE_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/iniparse/iniparse-0.4.tar.gz" CHECKSUM_SHA256="abc1ee12d2cfb2506109072d6c21e40b6c75a3fe90a9c924327d80bc0d99c054" -SOURCE_DIR="iniparse-0.4" PATCHES="iniparse-0.4.patchset" -ARCHITECTURES="x86 ?x86_gcc2" -SECONDARY_ARCHITECTURES="x86 ?x86_gcc2" +ARCHITECTURES="any" PROVIDES=" - iniparse$secondaryArchSuffix = $portVersion + iniparse = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix - cmd:python$secondaryArchSuffix + haiku + cmd:python2 " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel + haiku_devel " BUILD_PREREQUIRES=" - cmd:python$secondaryArchSuffix + cmd:python2 " BUILD() { - $portPackageLinksDir/cmd~python/bin/python setup.py build + $portPackageLinksDir/cmd~python2/bin/python2 setup.py build } INSTALL() { - $portPackageLinksDir/cmd~python/bin/python setup.py install \ + $portPackageLinksDir/cmd~python2/bin/python2 setup.py install \ --prefix=$prefix \ --install-data=$docDir } diff --git a/dev-python/lxml/lxml-3.7.2.recipe b/dev-python/lxml/lxml-3.7.2.recipe new file mode 100644 index 000000000..f27bd0b1f --- /dev/null +++ b/dev-python/lxml/lxml-3.7.2.recipe @@ -0,0 +1,78 @@ +SUMMARY="A Pythonic binding for the libxml2 and libxslt libraries" +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." +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" +REVISION="1" +SOURCE_URI="http://lxml.de/files/lxml-$portVersion.tgz" +CHECKSUM_SHA256="59d9176360dbc3919e9d4bfca85c1ca64ab4f4ee00e6f119d7150ba887e3410a" + +ARCHITECTURES="x86 x86_gcc2 x86_64" + +PROVIDES=" + $portName = $portVersion + " +REQUIRES=" + haiku + " + +BUILD_REQUIRES=" + haiku_devel + devel:libxml2 + devel:libxslt + devel:libz + " +BUILD_PREREQUIRES=" + cmd:gcc + cmd:ld + " +PYTHON_PACKAGES=(python python3) +PYTHON_VERSIONS=(2.7 3.6) +for i in "${!PYTHON_PACKAGES[@]}"; do +pythonPackage=${PYTHON_PACKAGES[i]} +pythonVersion=${PYTHON_VERSIONS[$i]} +eval "PROVIDES_${pythonPackage}=\"\ + ${portName}_$pythonPackage = $portVersion\ + \"; \ +REQUIRES_$pythonPackage=\"\ + haiku\n\ + lib:libxml2\n\ + lib:libxslt\n\ + lib:libz\n\ + cmd:python$pythonVersion\ + \"" +BUILD_REQUIRES="$BUILD_REQUIRES + setuptools_$pythonPackage" +BUILD_PREREQUIRES="$BUILD_PREREQUIRES + cmd:python$pythonVersion" +done + +REPLACES_python=" + python_lxml + " + +INSTALL() +{ + for i in "${!PYTHON_PACKAGES[@]}"; do + pythonPackage=${PYTHON_PACKAGES[i]} + pythonVersion=${PYTHON_VERSIONS[$i]} + + python=python$pythonVersion + installLocation=$prefix/lib/$python/vendor-packages/ + export PYTHONPATH=$installLocation:$PYTHONPATH + mkdir -p $installLocation + rm -rf build + $python setup.py build install \ + --root=/ --prefix=$prefix + + packageEntries $pythonPackage \ + $prefix/lib/python* + done +} diff --git a/dev-python/lxml/patches/lxml-3.7.2.patchset b/dev-python/lxml/patches/lxml-3.7.2.patchset new file mode 100644 index 000000000..b9fabe6cc --- /dev/null +++ b/dev-python/lxml/patches/lxml-3.7.2.patchset @@ -0,0 +1,31 @@ +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/python_lxml-3.6.0.recipe b/dev-python/lxml/python_lxml-3.6.0.recipe deleted file mode 100644 index d63f405f2..000000000 --- a/dev-python/lxml/python_lxml-3.6.0.recipe +++ /dev/null @@ -1,62 +0,0 @@ -SUMMARY="A Pythonic binding for the libxml2 and libxslt libraries" -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." -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" -REVISION="1" -SOURCE_URI="http://lxml.de/files/lxml-$portVersion.tgz" -CHECKSUM_SHA256="9c74ca28a7f0c30dca8872281b3c47705e21217c8bc63912d95c9e2a7cac6bdf" -SOURCE_DIR="lxml-$portVersion" -PATCHES="python_lxml-$portVersion.patchset" - -ARCHITECTURES="x86 x86_gcc2 x86_64" - -PROVIDES=" - python_lxml = $portVersion - " -REQUIRES=" - haiku$secondaryArchSuffix - lib:libxml2$secondaryArchSuffix - lib:libxslt$secondaryArchSuffix - lib:libz$secondaryArchSuffix - cmd:python2 - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - devel:libxml2$secondaryArchSuffix - devel:libxslt$secondaryArchSuffix - devel:libz$secondaryArchSuffix - python_setuptools - " -BUILD_PREREQUIRES=" - cmd:python2 - cmd:gcc$secondaryArchSuffix - cmd:ld$secondaryArchSuffix - " - -BUILD() -{ - $portPackageLinksDir/cmd~python2/bin/python2 setup.py build -} - -INSTALL() -{ - # GENERIC: all python_setuptools-based installs need this - export PATH="$portPackageLinksDir/cmd~python2/bin:$PATH" - pythonVersion=$(python2 --version 2>&1 | sed 's/Python //' | head -c3) - installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ - export PYTHONPATH=$installLocation:$PYTHONPATH - mkdir -p $installLocation - - python2 setup.py install \ - --single-version-externally-managed \ - --root=/ --prefix=$prefix -} diff --git a/dev-python/mako/mako-1.0.3.recipe b/dev-python/mako/mako-1.0.3.recipe new file mode 100644 index 000000000..81890e493 --- /dev/null +++ b/dev-python/mako/mako-1.0.3.recipe @@ -0,0 +1,83 @@ +SUMMARY="Hyperfast and lightweight templating for the Python platform" +DESCRIPTION="Mako is a template library written in Python. It provides a \ +familiar, non-XML syntax which compiles into Python modules for maximum \ +performance. Mako's syntax and API borrows from the best ideas of many \ +others, including Django and Jinja2 templates, Cheetah, Myghty, and Genshi. + +Conceptually, Mako is an embedded Python (i.e. Python Server Page) language, \ +which refines the familiar ideas of componentized layout and inheritance to \ +produce one of the most straightforward and flexible models available, while \ +also maintaining close ties to Python calling and scoping semantics." +HOMEPAGE="http://www.makotemplates.org" +COPYRIGHT="2006-2015 the Mako authors and contributors" +LICENSE="MIT" +REVISION="1" +SOURCE_URI="https://pypi.python.org/packages/source/M/Mako/Mako-$portVersion.tar.gz" +CHECKSUM_SHA256="7644bc0ee35965d2e146dde31827b8982ed70a58281085fac42869a09764d38c" +SOURCE_DIR="Mako-$portVersion" + +ARCHITECTURES="any" + +PROVIDES=" + $portName = $portVersion + " +REQUIRES=" + haiku + " + +BUILD_REQUIRES=" + haiku_devel + " + +PYTHON_PACKAGES=(python python3) +PYTHON_VERSIONS=(2.7 3.6) +for i in "${!PYTHON_PACKAGES[@]}"; do +pythonPackage=${PYTHON_PACKAGES[i]} +pythonVersion=${PYTHON_VERSIONS[$i]} +eval "PROVIDES_${pythonPackage}=\"\ + ${portName}_$pythonPackage = $portVersion\ + \"; \ +REQUIRES_$pythonPackage=\"\ + haiku\n\ + cmd:python$pythonVersion\ + \"" +BUILD_REQUIRES="$BUILD_REQUIRES + setuptools_$pythonPackage" +BUILD_PREREQUIRES="$BUILD_PREREQUIRES + cmd:python$pythonVersion" +done + +PROVIDES_python="$PROVIDES_python + cmd:mako_render + " +REPLACES_python=" + python_mako + " +PROVIDES_python3="$PROVIDES_python3 + cmd:mako_render3 + " +REPLACES_python3=" + python3_mako + " + +INSTALL() +{ + for i in "${!PYTHON_PACKAGES[@]}"; do + pythonPackage=${PYTHON_PACKAGES[i]} + pythonVersion=${PYTHON_VERSIONS[$i]} + + python=python$pythonVersion + installLocation=$prefix/lib/$python/vendor-packages/ + export PYTHONPATH=$installLocation:$PYTHONPATH + mkdir -p $installLocation + rm -rf build + $python setup.py build install \ + --root=/ --prefix=$prefix + if [ $pythonPackage != python ]; then + mv $binDir/mako-render $binDir/mako-render3 + fi + packageEntries $pythonPackage \ + $prefix/lib/python* \ + $binDir + done +} diff --git a/dev-python/mako/python3_mako-1.0.3.recipe b/dev-python/mako/python3_mako-1.0.3.recipe deleted file mode 100644 index 1807eab8a..000000000 --- a/dev-python/mako/python3_mako-1.0.3.recipe +++ /dev/null @@ -1,56 +0,0 @@ -SUMMARY="Hyperfast and lightweight templating for the Python platform" -DESCRIPTION="Mako is a template library written in Python. It provides a \ -familiar, non-XML syntax which compiles into Python modules for maximum \ -performance. Mako's syntax and API borrows from the best ideas of many \ -others, including Django and Jinja2 templates, Cheetah, Myghty, and Genshi. - -Conceptually, Mako is an embedded Python (i.e. Python Server Page) language, \ -which refines the familiar ideas of componentized layout and inheritance to \ -produce one of the most straightforward and flexible models available, while \ -also maintaining close ties to Python calling and scoping semantics." -HOMEPAGE="http://www.makotemplates.org" -COPYRIGHT="2006-2015 the Mako authors and contributors" -LICENSE="MIT" -REVISION="2" -SOURCE_URI="https://pypi.python.org/packages/source/M/Mako/Mako-$portVersion.tar.gz" -CHECKSUM_SHA256="7644bc0ee35965d2e146dde31827b8982ed70a58281085fac42869a09764d38c" -SOURCE_DIR="Mako-$portVersion" -PYTHON_VERSION="3.6" - -ARCHITECTURES="arm ppc x86 x86_gcc2 x86_64" - -PROVIDES=" - python3_mako = $portVersion - cmd:mako_render - " -REQUIRES=" - haiku - cmd:python$PYTHON_VERSION - " - -BUILD_REQUIRES=" - python3_setuptools - " -BUILD_PREREQUIRES=" - haiku_devel - cmd:python$PYTHON_VERSION - cmd:gcc - " - -BUILD() -{ - $portPackageLinksDir/cmd~python$PYTHON_VERSION/bin/python3 setup.py build -} - -INSTALL() -{ - # GENERIC: all python_setuptools-based installs need this - python=$portPackageLinksDir/cmd~python$PYTHON_VERSION/bin/python3 - pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3) - installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ - export PYTHONPATH=$installLocation:$PYTHONPATH - mkdir -p $installLocation - - $python setup.py install \ - --prefix=$prefix -} diff --git a/dev-python/mako/python_mako-1.0.3.recipe b/dev-python/mako/python_mako-1.0.3.recipe deleted file mode 100644 index a219b8f93..000000000 --- a/dev-python/mako/python_mako-1.0.3.recipe +++ /dev/null @@ -1,55 +0,0 @@ -SUMMARY="Hyperfast and lightweight templating for the Python platform" -DESCRIPTION="Mako is a template library written in Python. It provides a \ -familiar, non-XML syntax which compiles into Python modules for maximum \ -performance. Mako's syntax and API borrows from the best ideas of many \ -others, including Django and Jinja2 templates, Cheetah, Myghty, and Genshi. - -Conceptually, Mako is an embedded Python (i.e. Python Server Page) language, \ -which refines the familiar ideas of componentized layout and inheritance to \ -produce one of the most straightforward and flexible models available, while \ -also maintaining close ties to Python calling and scoping semantics." -HOMEPAGE="http://www.makotemplates.org" -COPYRIGHT="2006-2015 the Mako authors and contributors" -LICENSE="MIT" -REVISION="1" -SOURCE_URI="https://pypi.python.org/packages/source/M/Mako/Mako-$portVersion.tar.gz" -CHECKSUM_SHA256="7644bc0ee35965d2e146dde31827b8982ed70a58281085fac42869a09764d38c" -SOURCE_DIR="Mako-$portVersion" - -ARCHITECTURES="arm ppc x86 x86_gcc2 x86_64" - -PROVIDES=" - python_mako = $portVersion - cmd:mako_render - " -REQUIRES=" - haiku - cmd:python2 - " - -BUILD_REQUIRES=" - python_setuptools - " -BUILD_PREREQUIRES=" - haiku_devel - cmd:python2 - cmd:gcc - " - -BUILD() -{ - $portPackageLinksDir/cmd~python2/bin/python2 setup.py build -} - -INSTALL() -{ - # GENERIC: all python_setuptools-based installs need this - python=$portPackageLinksDir/cmd~python2/bin/python2 - pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3) - installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ - export PYTHONPATH=$installLocation:$PYTHONPATH - mkdir -p $installLocation - - $python setup.py install \ - --prefix=$prefix -} diff --git a/dev-python/markdown/markdown-2.6.8.recipe b/dev-python/markdown/markdown-2.6.8.recipe new file mode 100644 index 000000000..cd733182c --- /dev/null +++ b/dev-python/markdown/markdown-2.6.8.recipe @@ -0,0 +1,82 @@ +SUMMARY="Python implementation of Markdown" +DESCRIPTION="This is a Python implementation of John Gruber’s Markdown. \ +It is almost completely compliant with the reference implementation, though \ +there are a few known issues." +HOMEPAGE="https://pythonhosted.org/Markdown/ + https://pypi.python.org/pypi/Markdown/" +COPYRIGHT="2007, 2008 The Python Markdown Project + 2004, 2005, 2006 Yuri Takhteyev + 2004 Manfred Stienstra" +LICENSE="BSD (3-clause)" +REVISION="1" +SOURCE_URI="https://pypi.python.org/packages/1d/25/3f6d2cb31ec42ca5bd3bfbea99b63892b735d76e26f20dd2dcc34ffe4f0d/Markdown-$portVersion.tar.gz" +CHECKSUM_SHA256="0ac8a81e658167da95d063a9279c9c1b2699f37c7c4153256a458b3a43860e33" +SOURCE_DIR="Markdown-$portVersion" + + +ARCHITECTURES="any" + +PROVIDES=" + $portName = $portVersion + " +REQUIRES=" + haiku + " + +BUILD_REQUIRES=" + haiku_devel + " + +PYTHON_PACKAGES=(python python3) +PYTHON_VERSIONS=(2.7 3.6) +for i in "${!PYTHON_PACKAGES[@]}"; do +pythonPackage=${PYTHON_PACKAGES[i]} +pythonVersion=${PYTHON_VERSIONS[$i]} +eval "PROVIDES_${pythonPackage}=\"\ + ${portName}_$pythonPackage = $portVersion\ + \"; \ +REQUIRES_$pythonPackage=\"\ + haiku\n\ + cmd:python$pythonVersion\ + \"" +BUILD_REQUIRES="$BUILD_REQUIRES + setuptools_$pythonPackage" +BUILD_PREREQUIRES="$BUILD_PREREQUIRES + cmd:python$pythonVersion" +done + +PROVIDES_python="$PROVIDES_python + cmd:markdown_py + " +REPLACES_python=" + python_markdown + " +PROVIDES_python3="$PROVIDES_python3 + cmd:markdown_py3 + " +REPLACES_python3=" + python3_markdown + " + +INSTALL() +{ + for i in "${!PYTHON_PACKAGES[@]}"; do + pythonPackage=${PYTHON_PACKAGES[i]} + pythonVersion=${PYTHON_VERSIONS[$i]} + + python=python$pythonVersion + installLocation=$prefix/lib/$python/vendor-packages/ + export PYTHONPATH=$installLocation:$PYTHONPATH + mkdir -p $installLocation + rm -rf build + $python setup.py build install \ + --root=/ --prefix=$prefix + + if [ $pythonPackage != python ]; then + mv $binDir/markdown_py $binDir/markdown_py3 + fi + packageEntries $pythonPackage \ + $prefix/lib/python* \ + $binDir + done +} diff --git a/dev-python/markdown/python3_markdown-2.6.8.recipe b/dev-python/markdown/python3_markdown-2.6.8.recipe deleted file mode 100644 index cf54945f2..000000000 --- a/dev-python/markdown/python3_markdown-2.6.8.recipe +++ /dev/null @@ -1,51 +0,0 @@ -SUMMARY="Python implementation of Markdown" -DESCRIPTION="This is a Python implementation of John Gruber’s Markdown. \ -It is almost completely compliant with the reference implementation, though \ -there are a few known issues." -HOMEPAGE="https://pythonhosted.org/Markdown/ - https://pypi.python.org/pypi/Markdown/" -COPYRIGHT="2007, 2008 The Python Markdown Project - 2004, 2005, 2006 Yuri Takhteyev - 2004 Manfred Stienstra" -LICENSE="BSD (3-clause)" -REVISION="1" -SOURCE_URI="https://pypi.python.org/packages/1d/25/3f6d2cb31ec42ca5bd3bfbea99b63892b735d76e26f20dd2dcc34ffe4f0d/Markdown-$portVersion.tar.gz" -CHECKSUM_SHA256="0ac8a81e658167da95d063a9279c9c1b2699f37c7c4153256a458b3a43860e33" -SOURCE_DIR="Markdown-$portVersion" - -ARCHITECTURES="x86 ?x86_gcc2 x86_64" - -PROVIDES=" - python3_markdown = $portVersion - cmd:markdown_py - " -REQUIRES=" - haiku - cmd:python3 - " - -BUILD_REQUIRES=" - haiku_devel - python3_setuptools - " -BUILD_PREREQUIRES=" - cmd:python3 - " - -BUILD() -{ - $portPackageLinksDir/cmd~python3/bin/python3 setup.py build -} - -INSTALL() -{ - # GENERIC: all python_setuptools-based installs need this - python=$portPackageLinksDir/cmd~python3/bin/python3 - pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3) - installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ - export PYTHONPATH=$installLocation:$PYTHONPATH - mkdir -p $installLocation - - $python setup.py install \ - --root=/ --prefix=$prefix -} diff --git a/dev-python/markdown/python_markdown-2.6.8.recipe b/dev-python/markdown/python_markdown-2.6.8.recipe deleted file mode 100644 index 30f2ea4cf..000000000 --- a/dev-python/markdown/python_markdown-2.6.8.recipe +++ /dev/null @@ -1,51 +0,0 @@ -SUMMARY="Python implementation of Markdown" -DESCRIPTION="This is a Python implementation of John Gruber’s Markdown. \ -It is almost completely compliant with the reference implementation, though \ -there are a few known issues." -HOMEPAGE="https://pythonhosted.org/Markdown/ - https://pypi.python.org/pypi/Markdown/" -COPYRIGHT="2007, 2008 The Python Markdown Project - 2004, 2005, 2006 Yuri Takhteyev - 2004 Manfred Stienstra" -LICENSE="BSD (3-clause)" -REVISION="1" -SOURCE_URI="https://pypi.python.org/packages/1d/25/3f6d2cb31ec42ca5bd3bfbea99b63892b735d76e26f20dd2dcc34ffe4f0d/Markdown-$portVersion.tar.gz" -CHECKSUM_SHA256="0ac8a81e658167da95d063a9279c9c1b2699f37c7c4153256a458b3a43860e33" -SOURCE_DIR="Markdown-$portVersion" - -ARCHITECTURES="x86 x86_gcc2 x86_64" - -PROVIDES=" - python_markdown = $portVersion - cmd:markdown_py - " -REQUIRES=" - haiku - cmd:python2 - " - -BUILD_REQUIRES=" - haiku_devel - python_setuptools - " -BUILD_PREREQUIRES=" - cmd:python2 - " - -BUILD() -{ - $portPackageLinksDir/cmd~python2/bin/python2 setup.py build -} - -INSTALL() -{ - # GENERIC: all python_setuptools-based installs need this - python=$portPackageLinksDir/cmd~python2/bin/python2 - pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3) - installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ - export PYTHONPATH=$installLocation:$PYTHONPATH - mkdir -p $installLocation - - $python setup.py install \ - --root=/ --prefix=$prefix -} diff --git a/dev-python/markups/markups-2.0.0.recipe b/dev-python/markups/markups-2.0.0.recipe new file mode 100644 index 000000000..6345e346e --- /dev/null +++ b/dev-python/markups/markups-2.0.0.recipe @@ -0,0 +1,70 @@ +SUMMARY="A wrapper around various text markups" +DESCRIPTION="Markups provides a wrapper around various text markup languages. +Available by default are Markdown, reStructuredText and Textile, but you can \ +easily add your own markups. +" +HOMEPAGE="http://python-requests.org/ + http://pypi.python.org/pypi/markups" +COPYRIGHT="2012-2015 Dmitry Shachnev" +LICENSE="BSD (3-clause)" +REVISION="1" +SOURCE_URI="https://pypi.python.org/packages/0b/98/3a20a868437c17db37cec47cc82fbd1030aa55765faf06207ab832e85152/Markups-$portVersion.tar.gz" +CHECKSUM_SHA256="5639ddd76d74e0a5335e5b66ff2f1b3f9a9f0ab6eeff76a1003f59ed0ec2b721" +SOURCE_DIR="Markups-$portVersion" + +ARCHITECTURES="any" + +PROVIDES=" + $portName = $portVersion + " +REQUIRES=" + haiku + " + +BUILD_REQUIRES=" + haiku_devel + " + +PYTHON_PACKAGES=(python python3) +PYTHON_VERSIONS=(2.7 3.6) +for i in "${!PYTHON_PACKAGES[@]}"; do +pythonPackage=${PYTHON_PACKAGES[i]} +pythonVersion=${PYTHON_VERSIONS[$i]} +eval "PROVIDES_${pythonPackage}=\"\ + ${portName}_$pythonPackage = $portVersion\ + \"; \ +REQUIRES_$pythonPackage=\"\ + haiku\n\ + cmd:python$pythonVersion\ + \"" +BUILD_REQUIRES="$BUILD_REQUIRES + setuptools_$pythonPackage" +BUILD_PREREQUIRES="$BUILD_PREREQUIRES + cmd:python$pythonVersion" +done + +REPLACES_python=" + python_markups + " +REPLACES_python3=" + python3_markups + " + +INSTALL() +{ + for i in "${!PYTHON_PACKAGES[@]}"; do + pythonPackage=${PYTHON_PACKAGES[i]} + pythonVersion=${PYTHON_VERSIONS[$i]} + + python=python$pythonVersion + installLocation=$prefix/lib/$python/vendor-packages/ + export PYTHONPATH=$installLocation:$PYTHONPATH + mkdir -p $installLocation + rm -rf build + $python setup.py build install \ + --root=/ --prefix=$prefix + + packageEntries $pythonPackage \ + $prefix/lib/python* + done +} diff --git a/dev-python/markups/python3_markups-2.0.0.recipe b/dev-python/markups/python3_markups-2.0.0.recipe deleted file mode 100644 index f8b89a3c7..000000000 --- a/dev-python/markups/python3_markups-2.0.0.recipe +++ /dev/null @@ -1,50 +0,0 @@ -SUMMARY="A wrapper around various text markups" -DESCRIPTION="Markups provides a wrapper around various text markup languages. -Available by default are Markdown, reStructuredText and Textile, but you can \ -easily add your own markups. -" -HOMEPAGE="http://python-requests.org/ - http://pypi.python.org/pypi/markups" -COPYRIGHT="2012-2015 Dmitry Shachnev" -LICENSE="BSD (3-clause)" -REVISION="1" -SOURCE_URI="https://pypi.python.org/packages/0b/98/3a20a868437c17db37cec47cc82fbd1030aa55765faf06207ab832e85152/Markups-$portVersion.tar.gz" -CHECKSUM_SHA256="5639ddd76d74e0a5335e5b66ff2f1b3f9a9f0ab6eeff76a1003f59ed0ec2b721" -SOURCE_DIR="Markups-$portVersion" - -ARCHITECTURES="x86 x86_gcc2 x86_64" - -PROVIDES=" - python3_markups = $portVersion - " -REQUIRES=" - haiku - cmd:python3 - " - -BUILD_REQUIRES=" - haiku_devel - python3_setuptools - " -BUILD_PREREQUIRES=" - cmd:python3 - " - -BUILD() -{ - $portPackageLinksDir/cmd~python3/bin/python3 setup.py build -} - -INSTALL() -{ - # GENERIC: all python_setuptools-based installs need this - python=$portPackageLinksDir/cmd~python3/bin/python3 - pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3) - installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ - export PYTHONPATH=$installLocation:$PYTHONPATH - mkdir -p $installLocation - - $python setup.py install \ - --single-version-externally-managed \ - --root=/ --prefix=$prefix -} diff --git a/dev-python/markups/python_markups-2.0.0.recipe b/dev-python/markups/python_markups-2.0.0.recipe deleted file mode 100644 index a9b016ad8..000000000 --- a/dev-python/markups/python_markups-2.0.0.recipe +++ /dev/null @@ -1,49 +0,0 @@ -SUMMARY="A wrapper around various text markups" -DESCRIPTION="Markups provides a wrapper around various text markup languages. -Available by default are Markdown, reStructuredText and Textile, but you can \ -easily add your own markups. -" -HOMEPAGE="http://python-requests.org/ - http://pypi.python.org/pypi/markups" -COPYRIGHT="2012-2015 Dmitry Shachnev" -LICENSE="BSD (3-clause)" -REVISION="1" -SOURCE_URI="https://pypi.python.org/packages/0b/98/3a20a868437c17db37cec47cc82fbd1030aa55765faf06207ab832e85152/Markups-$portVersion.tar.gz" -CHECKSUM_SHA256="5639ddd76d74e0a5335e5b66ff2f1b3f9a9f0ab6eeff76a1003f59ed0ec2b721" -SOURCE_DIR="Markups-$portVersion" - -ARCHITECTURES="x86 x86_gcc2 x86_64" - -PROVIDES=" - python_markups = $portVersion - " -REQUIRES=" - haiku - cmd:python2 - " - -BUILD_REQUIRES=" - haiku_devel - python_setuptools - " -BUILD_PREREQUIRES=" - cmd:python2 - " - -BUILD() -{ - $portPackageLinksDir/cmd~python2/bin/python2 setup.py build -} - -INSTALL() -{ - # GENERIC: all python_setuptools-based installs need this - python=$portPackageLinksDir/cmd~python2/bin/python2 - pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3) - installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ - export PYTHONPATH=$installLocation:$PYTHONPATH - mkdir -p $installLocation - - $python setup.py install \ - --root=/ --prefix=$prefix -} diff --git a/dev-python/mechanize/mechanize-0.3.1.recipe b/dev-python/mechanize/mechanize-0.3.1.recipe new file mode 100644 index 000000000..6d1f0a1e1 --- /dev/null +++ b/dev-python/mechanize/mechanize-0.3.1.recipe @@ -0,0 +1,81 @@ +SUMMARY="Stateful programmatic web browsing in Python" +DESCRIPTION="Stateful programmatic web browsing in Python, after Andy \ +Lester’s Perl module WWW::Mechanize. + +- mechanize.Browser and mechanize.UserAgentBase implement \ +the interface of urllib2.OpenerDirector, so any URL can be opened, not \ +just http. +- mechanize.UserAgentBase offers easy dynamic configuration \ +of user-agent features like protocol, cookie, redirection and \ +robots.txt handling, without having to make a new OpenerDirector \ +each time, e.g. by calling build_opener(). +- Easy HTML form filling. +- Convenient link parsing and following. +- Browser history (.back() and .reload() methods). +- The Referer HTTP header is added properly (optional). +- Automatic observance of robots.txt. +- Automatic handling of HTTP-Equiv and Refresh." +HOMEPAGE="https://github.com/python-mechanize/mechanize + http://pypi.python.org/pypi/mechanize" +COPYRIGHT="2002-2010 John J. Lee + 1997-1999 Gisle Aas + 1997-1999 Johnny Lee + 2003 Andy Lester" +LICENSE="BSD (3-clause)" +REVISION="1" +SOURCE_URI="https://github.com/python-mechanize/mechanize/archive/v$portVersion.tar.gz" +CHECKSUM_SHA256="0f14880646fc96da91440712546fd136896b151228366cdc0604534e0687036c" + +ARCHITECTURES="any" + +PROVIDES=" + $portName = $portVersion + " +REQUIRES=" + haiku + " + +BUILD_REQUIRES=" + haiku_devel + " + +PYTHON_PACKAGES=(python) +PYTHON_VERSIONS=(2.7) +for i in "${!PYTHON_PACKAGES[@]}"; do +pythonPackage=${PYTHON_PACKAGES[i]} +pythonVersion=${PYTHON_VERSIONS[$i]} +eval "PROVIDES_${pythonPackage}=\"\ + ${portName}_$pythonPackage = $portVersion\ + \"; \ +REQUIRES_$pythonPackage=\"\ + haiku\n\ + cmd:python$pythonVersion\ + \"" +BUILD_REQUIRES="$BUILD_REQUIRES + setuptools_$pythonPackage" +BUILD_PREREQUIRES="$BUILD_PREREQUIRES + cmd:python$pythonVersion" +done + +REPLACES_python=" + python_mechanize + " + +INSTALL() +{ + for i in "${!PYTHON_PACKAGES[@]}"; do + pythonPackage=${PYTHON_PACKAGES[i]} + pythonVersion=${PYTHON_VERSIONS[$i]} + + python=python$pythonVersion + installLocation=$prefix/lib/$python/vendor-packages/ + export PYTHONPATH=$installLocation:$PYTHONPATH + mkdir -p $installLocation + rm -rf build + $python setup.py build install \ + --root=/ --prefix=$prefix + + packageEntries $pythonPackage \ + $prefix/lib/python* + done +} diff --git a/dev-python/mechanize/python_mechanize-0.2.5.recipe b/dev-python/mechanize/python_mechanize-0.2.5.recipe deleted file mode 100644 index e5d6f3984..000000000 --- a/dev-python/mechanize/python_mechanize-0.2.5.recipe +++ /dev/null @@ -1,69 +0,0 @@ -SUMMARY="Stateful programmatic web browsing in Python" -DESCRIPTION="Stateful programmatic web browsing in Python, after Andy \ -Lester’s Perl module WWW::Mechanize. - -- mechanize.Browser and mechanize.UserAgentBase implement \ -the interface of urllib2.OpenerDirector, so any URL can be opened, not \ -just http. -- mechanize.UserAgentBase offers easy dynamic configuration \ -of user-agent features like protocol, cookie, redirection and \ -robots.txt handling, without having to make a new OpenerDirector \ -each time, e.g. by calling build_opener(). -- Easy HTML form filling. -- Convenient link parsing and following. -- Browser history (.back() and .reload() methods). -- The Referer HTTP header is added properly (optional). -- Automatic observance of robots.txt. -- Automatic handling of HTTP-Equiv and Refresh." -HOMEPAGE="http://wwwsearch.sourceforge.net/mechanize/ - http://pypi.python.org/pypi/mechanize" -COPYRIGHT="2002-2010 John J. Lee - 1997-1999 Gisle Aas - 1997-1999 Johnny Lee - 2003 Andy Lester" -#gentoo says: LICENSE="|| ( BSD ZPL )" -LICENSE="BSD (3-clause)" -REVISION="2" -SOURCE_URI="http://pypi.python.org/packages/source/m/mechanize/mechanize-0.2.5.tar.gz" -CHECKSUM_SHA256="2e67b20d107b30c00ad814891a095048c35d9d8cb9541801cebe85684cc84766" -SOURCE_DIR="mechanize-$portVersion" - -ARCHITECTURES="x86 x86_gcc2 x86_64" - -PROVIDES=" - python_mechanize = $portVersion - " -REQUIRES=" - haiku$secondaryArchSuffix - cmd:python - python_setuptools - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - python_setuptools - " -BUILD_PREREQUIRES=" - cmd:python - cmd:gcc$secondaryArchSuffix - cmd:ld$secondaryArchSuffix - " - -BUILD() -{ - $portPackageLinksDir/cmd~python/bin/python setup.py build -} - -INSTALL() -{ - # GENERIC: all python_setuptools-based installs need this - export PATH="$portPackageLinksDir/cmd~python/bin:$PATH" - pythonVersion=$(python --version 2>&1 | sed 's/Python //' | head -c3) - installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ - export PYTHONPATH=$installLocation:$PYTHONPATH - mkdir -p $installLocation - - python setup.py install \ - --single-version-externally-managed \ - --root=/ --prefix=$prefix -} diff --git a/dev-python/mock/mock-2.0.0.recipe b/dev-python/mock/mock-2.0.0.recipe new file mode 100644 index 000000000..ae78a5898 --- /dev/null +++ b/dev-python/mock/mock-2.0.0.recipe @@ -0,0 +1,88 @@ +SUMMARY="A library for testing in Python" +DESCRIPTION=" +Mock allows you to replace parts of your system under test with mock objects \ +and make assertions about how they have been used. + +Mock provides a core 'MagicMock' class removing the need to create a host of \ +stubs throughout your test suite. After performing an action, you can make \ +assertions about which methods / attributes were used and arguments they were \ +called with. You can also specify return values and set needed attributes in \ +the normal way. + +The mock module also provides utility functions / objects to assist with \ +testing, particularly monkey patching." +HOMEPAGE="http://pypi.python.org/pypi/mock" +COPYRIGHT="2003-2012, Michael Foord" +LICENSE="BSD (2-clause)" +REVISION="1" +SOURCE_URI="https://pypi.python.org/packages/source/m/mock/mock-$portVersion.tar.gz" +CHECKSUM_SHA256="b158b6df76edd239b8208d481dc46b6afd45a846b7812ff0ce58971cf5bc8bba" + +ARCHITECTURES="any" + +PROVIDES=" + $portName = $portVersion + " +REQUIRES=" + haiku + " + +BUILD_REQUIRES=" + haiku_devel + " + +PYTHON_PACKAGES=(python python3) +PYTHON_VERSIONS=(2.7 3.6) +for i in "${!PYTHON_PACKAGES[@]}"; do +pythonPackage=${PYTHON_PACKAGES[i]} +pythonVersion=${PYTHON_VERSIONS[$i]} +eval "PROVIDES_${pythonPackage}=\"\ + ${portName}_$pythonPackage = $portVersion\ + \"; \ +REQUIRES_$pythonPackage=\"\ + haiku\n\ + cmd:python$pythonVersion\ + \"" +BUILD_REQUIRES="$BUILD_REQUIRES + setuptools_$pythonPackage" +BUILD_PREREQUIRES="$BUILD_PREREQUIRES + cmd:python$pythonVersion" +done + +BUILD() +{ + rm -rf build* + for i in "${!PYTHON_PACKAGES[@]}"; do + pythonPackage=${PYTHON_PACKAGES[i]} + pythonVersion=${PYTHON_VERSIONS[$i]} + + # GENERIC: all python_setuptools-based installs need this + python=$portPackageLinksDir/cmd~python$pythonVersion/bin/python$pythonVersion + pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3) + installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ + export PYTHONPATH=$installLocation:$PYTHONPATH + + $python setup.py build + mv build build$pythonVersion + done +} + +INSTALL() +{ + for i in "${!PYTHON_PACKAGES[@]}"; do + pythonPackage=${PYTHON_PACKAGES[i]} + pythonVersion=${PYTHON_VERSIONS[$i]} + + python=python$pythonVersion + installLocation=$prefix/lib/$python/vendor-packages/ + export PYTHONPATH=$installLocation:$PYTHONPATH + mkdir -p $installLocation + + mv build$pythonVersion build + $python setup.py install \ + --root=/ --prefix=$prefix + + packageEntries $pythonPackage \ + $prefix/lib/python* + done +} diff --git a/dev-python/mock/python_mock-1.3.0.recipe b/dev-python/mock/python_mock-1.3.0.recipe deleted file mode 100644 index 908669b91..000000000 --- a/dev-python/mock/python_mock-1.3.0.recipe +++ /dev/null @@ -1,57 +0,0 @@ -SUMMARY="A library for testing in Python" -DESCRIPTION=" -Mock allows you to replace parts of your system under test with mock objects \ -and make assertions about how they have been used. - -Mock provides a core 'MagicMock' class removing the need to create a host of \ -stubs throughout your test suite. After performing an action, you can make \ -assertions about which methods / attributes were used and arguments they were \ -called with. You can also specify return values and set needed attributes in \ -the normal way. - -The mock module also provides utility functions / objects to assist with \ -testing, particularly monkey patching." -HOMEPAGE="http://pypi.python.org/pypi/mock" -COPYRIGHT="2003-2012, Michael Foord" -LICENSE="BSD (2-clause)" -REVISION="1" -SOURCE_URI="https://pypi.python.org/packages/source/m/mock/mock-$portVersion.tar.gz" -CHECKSUM_SHA256="1e247dbecc6ce057299eb7ee019ad68314bb93152e81d9a6110d35f4d5eca0f6" -SOURCE_DIR="mock-$portVersion" - -ARCHITECTURES="any" - -PROVIDES=" - python_mock = $portVersion - " -REQUIRES=" - haiku - cmd:python2 - " - -BUILD_REQUIRES=" - haiku_devel - python_setuptools >= 17.1.0 - " -BUILD_PREREQUIRES=" - cmd:python2 - " - -BUILD() -{ - $portPackageLinksDir/cmd~python2/bin/python2 setup.py build -} - -INSTALL() -{ - # GENERIC: all python_setuptools-based installs need this - python=$portPackageLinksDir/cmd~python2/bin/python2 - pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3) - installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ - export PYTHONPATH=$installLocation:$PYTHONPATH - mkdir -p $installLocation - - $python setup.py install \ - --single-version-externally-managed \ - --root=/ --prefix=$prefix -} diff --git a/dev-python/numpy/python3_numpy-1.11.2.recipe b/dev-python/numpy/python3_numpy-1.11.2.recipe index c0a57cbbd..345414ad9 100644 --- a/dev-python/numpy/python3_numpy-1.11.2.recipe +++ b/dev-python/numpy/python3_numpy-1.11.2.recipe @@ -29,7 +29,7 @@ REQUIRES=" BUILD_REQUIRES=" haiku_devel - python3_setuptools + setuptools_python3 devel:libopenblas " BUILD_PREREQUIRES=" diff --git a/dev-python/numpy/python_numpy-1.11.2.recipe b/dev-python/numpy/python_numpy-1.11.2.recipe index 133e3f9f2..f67c438d6 100644 --- a/dev-python/numpy/python_numpy-1.11.2.recipe +++ b/dev-python/numpy/python_numpy-1.11.2.recipe @@ -28,7 +28,7 @@ REQUIRES=" BUILD_REQUIRES=" haiku_devel - python_setuptools + setuptools_python devel:libopenblas " BUILD_PREREQUIRES=" diff --git a/dev-python/paramiko/paramiko-1.18.2.recipe b/dev-python/paramiko/paramiko-1.18.2.recipe new file mode 100644 index 000000000..c7387c6e3 --- /dev/null +++ b/dev-python/paramiko/paramiko-1.18.2.recipe @@ -0,0 +1,66 @@ +SUMMARY="Pure python SSH implementation" +DESCRIPTION="Paramiko is a module for python 2.2 (or higher) that implements \ +the SSH2 protocol for secure (encrypted and authenticated) connections to \ +remote machines." +HOMEPAGE="http://www.lag.net/paramiko/" +COPYRIGHT="2003-2009 Robey Pointer" +LICENSE="GNU LGPL v2.1" +REVISION="1" +SOURCE_URI="https://github.com/paramiko/paramiko/archive/$portVersion.tar.gz" +CHECKSUM_SHA256="79bf1702ec9e0b556cbfb3e68c19091f66d98b787c6deede82c48281a6e87f36" + +ARCHITECTURES="any" + +PROVIDES=" + $portName = $portVersion + " +REQUIRES=" + haiku + " + +BUILD_REQUIRES=" + haiku_devel + " + +PYTHON_PACKAGES=(python python3) +PYTHON_VERSIONS=(2.7 3.6) +for i in "${!PYTHON_PACKAGES[@]}"; do +pythonPackage=${PYTHON_PACKAGES[i]} +pythonVersion=${PYTHON_VERSIONS[$i]} +eval "PROVIDES_${pythonPackage}=\"\ + ${portName}_$pythonPackage = $portVersion\ + \"; \ +REQUIRES_$pythonPackage=\"\ + haiku\n\ + pycrypto_$pythonPackage\n\ + cmd:python$pythonVersion\ + \"" +BUILD_REQUIRES="$BUILD_REQUIRES + setuptools_$pythonPackage + pycrypto_$pythonPackage" +BUILD_PREREQUIRES="$BUILD_PREREQUIRES + cmd:python$pythonVersion" +done + +REPLACES_python=" + python_paramiko + " + +INSTALL() +{ + for i in "${!PYTHON_PACKAGES[@]}"; do + pythonPackage=${PYTHON_PACKAGES[i]} + pythonVersion=${PYTHON_VERSIONS[$i]} + + python=python$pythonVersion + installLocation=$prefix/lib/$python/vendor-packages/ + export PYTHONPATH=$installLocation:$PYTHONPATH + mkdir -p $installLocation + rm -rf build + $python setup.py build install \ + --root=/ --prefix=$prefix + + packageEntries $pythonPackage \ + $prefix/lib/python* + done +} diff --git a/dev-python/paramiko/python_paramiko-1.16.0.recipe b/dev-python/paramiko/python_paramiko-1.16.0.recipe deleted file mode 100644 index cdfddb998..000000000 --- a/dev-python/paramiko/python_paramiko-1.16.0.recipe +++ /dev/null @@ -1,45 +0,0 @@ -SUMMARY="Pure python SSH implementation" -DESCRIPTION="Paramiko is a module for python 2.2 (or higher) that implements \ -the SSH2 protocol for secure (encrypted and authenticated) connections to \ -remote machines." -HOMEPAGE="http://www.lag.net/paramiko/" -COPYRIGHT="2003-2009 Robey Pointer" -LICENSE="GNU LGPL v2.1" -REVISION="1" -SOURCE_URI="https://pypi.python.org/packages/source/p/paramiko/paramiko-1.16.0.tar.gz" -STATUS_HAIKU="stable" -CHECKSUM_SHA256="3297ebd3cd072f573772f7c7426939a443c62c458d54bb632ff30fd6ecf96892" - -ARCHITECTURES="arm ppc x86 x86_gcc2 x86_64" - -SOURCE_DIR="paramiko-${portVersion}" - -PROVIDES=" - python_paramiko = $portVersion - " -REQUIRES=" - haiku - cmd:python - pycrypto - " - -BUILD_REQUIRES=" - haiku_devel - " - -BUILD_PREREQUIRES=" - cmd:python - cmd:sed - " - - -BUILD() -{ - python setup.py build -} - - -INSTALL() -{ - python setup.py install --prefix=$prefix -} diff --git a/dev-python/pathtools/pathtools-0.1.2.recipe b/dev-python/pathtools/pathtools-0.1.2.recipe index 17a8011ec..473312392 100644 --- a/dev-python/pathtools/pathtools-0.1.2.recipe +++ b/dev-python/pathtools/pathtools-0.1.2.recipe @@ -6,45 +6,56 @@ HOMEPAGE="http://python-requests.org/ http://pypi.python.org/pypi/requests" COPYRIGHT="2010 Yesudeep Mangalapilly" LICENSE="MIT" -REVISION="2" -SOURCE_URI="https://pypi.python.org/packages/source/p/pathtools/pathtools-0.1.2.tar.gz" +REVISION="3" +SOURCE_URI="https://pypi.python.org/packages/source/p/pathtools/pathtools-$portVersion.tar.gz" CHECKSUM_SHA256="7c35c5421a39bb82e58018febd90e3b6e5db34c5443aaaf742b3f33d4655f1c0" -SOURCE_DIR="pathtools-$portVersion" -ARCHITECTURES="x86 x86_gcc2 x86_64" +ARCHITECTURES="any" PROVIDES=" - pathtools = $portVersion + $portName = $portVersion " REQUIRES=" haiku - cmd:python2 " BUILD_REQUIRES=" haiku_devel - python_setuptools - " -BUILD_PREREQUIRES=" - cmd:python2 - cmd:gcc " -BUILD() -{ - $portPackageLinksDir/cmd~python2/bin/python2 setup.py build -} +PYTHON_PACKAGES=(python python3) +PYTHON_VERSIONS=(2.7 3.6) +for i in "${!PYTHON_PACKAGES[@]}"; do +pythonPackage=${PYTHON_PACKAGES[i]} +pythonVersion=${PYTHON_VERSIONS[$i]} +eval "PROVIDES_${pythonPackage}=\"\ + ${portName}_$pythonPackage = $portVersion\ + \"; \ +REQUIRES_$pythonPackage=\"\ + haiku\n\ + cmd:python$pythonVersion\ + \"" +BUILD_REQUIRES="$BUILD_REQUIRES + setuptools_$pythonPackage" +BUILD_PREREQUIRES="$BUILD_PREREQUIRES + cmd:python$pythonVersion" +done INSTALL() { - # GENERIC: all python_setuptools-based installs need this - python=$portPackageLinksDir/cmd~python2/bin/python2 - pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3) - installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ - export PYTHONPATH=$installLocation:$PYTHONPATH - mkdir -p $installLocation + for i in "${!PYTHON_PACKAGES[@]}"; do + pythonPackage=${PYTHON_PACKAGES[i]} + pythonVersion=${PYTHON_VERSIONS[$i]} - $python setup.py install \ - --single-version-externally-managed \ - --root=/ --prefix=$prefix + python=python$pythonVersion + installLocation=$prefix/lib/$python/vendor-packages/ + export PYTHONPATH=$installLocation:$PYTHONPATH + mkdir -p $installLocation + rm -rf build + $python setup.py build install \ + --root=/ --prefix=$prefix + + packageEntries $pythonPackage \ + $prefix/lib/python* + done } diff --git a/dev-python/pillow/pillow-3.2.0.recipe b/dev-python/pillow/pillow-3.2.0.recipe deleted file mode 100644 index efa2563bf..000000000 --- a/dev-python/pillow/pillow-3.2.0.recipe +++ /dev/null @@ -1,84 +0,0 @@ -SUMMARY="Python Imaging Library (fork)" -DESCRIPTION=" - Pillow is the friendly PIL fork by Alex Clark and Contributors. - PIL is the Python Imaging Library by Fredrik Lundh and Contributors." -HOMEPAGE="https://github.com/python-imaging/Pillow - https://pypi.python.org/pypi/Pillow" -COPYRIGHT="1997-2011 by Secret Labs AB - 1995-2011 by Fredrik Lundh" -LICENSE="HPND" -REVISION="1" -SOURCE_URI="https://pypi.python.org/packages/source/P/Pillow/Pillow-$portVersion.tar.gz" -CHECKSUM_SHA256="64b0a057210c480aea99406c9391180cd866fc0fd8f0b53367e3af21b195784a" -SOURCE_DIR="Pillow-$portVersion" - -ARCHITECTURES="x86 x86_gcc2 x86_64" - -PROVIDES=" - pillow = $portVersion - cmd:createfontdatachunk.py = $portVersion - cmd:enhancer.py = $portVersion - cmd:explode.py = $portVersion - cmd:gifmaker.py = $portVersion - cmd:painter.py = $portVersion - cmd:pilconvert.py = $portVersion - cmd:pildriver.py = $portVersion - cmd:pilfile.py = $portVersion - cmd:pilfont.py = $portVersion - cmd:pilprint.py = $portVersion - cmd:player.py = $portVersion - cmd:thresholder.py = $portVersion - cmd:viewer.py = $portVersion - " -REQUIRES=" - haiku - cmd:python2 - #python_setuptools - lib:libfreetype - lib:libjpeg - lib:libopenjp2 - lib:libtiff - lib:libwebp - lib:libz - #cmd:tcl / tk (someday) - " - -BUILD_REQUIRES=" - haiku_devel - python_setuptools - devel:libfreetype - devel:libjpeg - devel:libopenjp2 - devel:libtiff - devel:libwebp - devel:libz - " -BUILD_PREREQUIRES=" - cmd:gcc - cmd:ld - cmd:python2 - cmd:freetype_config - " - -BUILD() -{ - export INCLUDE="$(findpaths -c: B_FIND_PATH_HEADERS_DIRECTORY)" - export LIB="$(findpaths -c: B_FIND_PATH_DEVELOP_LIB_DIRECTORY)" - $portPackageLinksDir/cmd~python2/bin/python2 setup.py build -} - -INSTALL() -{ - export INCLUDE="$(findpaths -c: B_FIND_PATH_HEADERS_DIRECTORY)" - export LIB="$(findpaths -c: B_FIND_PATH_DEVELOP_LIB_DIRECTORY)" - # GENERIC: all python_setuptools-based installs need this - export PATH="$portPackageLinksDir/cmd~python2/bin:$PATH" - pythonVersion=$(python2 --version 2>&1 | sed 's/Python //' | head -c3) - installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ - export PYTHONPATH=$installLocation:$PYTHONPATH - mkdir -p $installLocation - - python2 setup.py install \ - --single-version-externally-managed \ - --root=/ --prefix=$prefix -} diff --git a/dev-python/pillow/pillow-4.1.0.recipe b/dev-python/pillow/pillow-4.1.0.recipe new file mode 100644 index 000000000..58cbdc8a8 --- /dev/null +++ b/dev-python/pillow/pillow-4.1.0.recipe @@ -0,0 +1,120 @@ +SUMMARY="Python Imaging Library (fork)" +DESCRIPTION=" + Pillow is the friendly PIL fork by Alex Clark and Contributors. + PIL is the Python Imaging Library by Fredrik Lundh and Contributors." +HOMEPAGE="https://github.com/python-imaging/Pillow + https://pypi.python.org/pypi/Pillow" +COPYRIGHT="1997-2011 by Secret Labs AB + 1995-2011 by Fredrik Lundh" +LICENSE="HPND" +REVISION="1" +SOURCE_URI="https://files.pythonhosted.org/packages/source/P/Pillow/Pillow-$portVersion.tar.gz" +CHECKSUM_SHA256="a0fd487fed4a35717401b7566e51a1520b34e7c0f7f2a315a6509f82bc86299f" +SOURCE_DIR="Pillow-$portVersion" + +ARCHITECTURES="x86 x86_gcc2 x86_64" + +PROVIDES=" + $portName = $portVersion + " +REQUIRES=" + haiku + " + +BUILD_REQUIRES=" + haiku_devel + devel:liblcms2 + devel:libfreetype + devel:libopenjp2 + devel:libtiff + devel:libwebp + devel:libz + " +BUILD_PREREQUIRES=" + cmd:gcc + cmd:ld + " + +PYTHON_PACKAGES=(python python3) +PYTHON_VERSIONS=(2.7 3.6) +for i in "${!PYTHON_PACKAGES[@]}"; do +pythonPackage=${PYTHON_PACKAGES[i]} +pythonVersion=${PYTHON_VERSIONS[$i]} +eval "PROVIDES_${pythonPackage}=\"\ + ${portName}_$pythonPackage = $portVersion\ + \"; \ +REQUIRES_$pythonPackage=\"\ + haiku\n\ + cmd:python$pythonVersion\n\ + lib:liblcms2\n\ + lib:libfreetype\n\ + lib:libjpeg\n\ + lib:libopenjp2\n\ + lib:libtiff\n\ + lib:libwebp\n\ + lib:libz\n\ + \"" +BUILD_REQUIRES="$BUILD_REQUIRES + setuptools_$pythonPackage" +BUILD_PREREQUIRES="$BUILD_PREREQUIRES + cmd:python$pythonVersion" +done + +PROVIDES_python="$PROVIDES_python + cmd:createfontdatachunk.py = $portVersion + cmd:enhancer.py = $portVersion + cmd:explode.py = $portVersion + cmd:gifmaker.py = $portVersion + cmd:painter.py = $portVersion + cmd:pilconvert.py = $portVersion + cmd:pildriver.py = $portVersion + cmd:pilfile.py = $portVersion + cmd:pilfont.py = $portVersion + cmd:pilprint.py = $portVersion + cmd:player.py = $portVersion + cmd:thresholder.py = $portVersion + cmd:viewer.py = $portVersion + " +PROVIDES_python3="$PROVIDES_python3 + cmd:createfontdatachunk3.py = $portVersion + cmd:enhancer3.py = $portVersion + cmd:explode3.py = $portVersion + cmd:gifmaker3.py = $portVersion + cmd:painter3.py = $portVersion + cmd:pilconvert3.py = $portVersion + cmd:pildriver3.py = $portVersion + cmd:pilfile3.py = $portVersion + cmd:pilfont3.py = $portVersion + cmd:pilprint3.py = $portVersion + cmd:player3.py = $portVersion + cmd:thresholder3.py = $portVersion + cmd:viewer3.py = $portVersion + " + +INSTALL() +{ + export INCLUDE="$(findpaths -c: B_FIND_PATH_HEADERS_DIRECTORY)" + export LIB="$(findpaths -c: B_FIND_PATH_DEVELOP_LIB_DIRECTORY)" + for i in "${!PYTHON_PACKAGES[@]}"; do + pythonPackage=${PYTHON_PACKAGES[i]} + pythonVersion=${PYTHON_VERSIONS[$i]} + + python=python$pythonVersion + installLocation=$prefix/lib/$python/vendor-packages/ + export PYTHONPATH=$installLocation:$PYTHONPATH + mkdir -p $installLocation + rm -rf build + $python setup.py build install \ + --root=/ --prefix=$prefix + + if [ $pythonPackage != python ]; then + for f in $binDir/*.py; do + mv $f ${f%.py}3.py + done + fi + + packageEntries $pythonPackage \ + $prefix/lib/python* \ + $binDir + done +} diff --git a/dev-python/pip/pip-9.0.0.recipe b/dev-python/pip/pip-9.0.0.recipe new file mode 100644 index 000000000..8eb8bfd46 --- /dev/null +++ b/dev-python/pip/pip-9.0.0.recipe @@ -0,0 +1,75 @@ +SUMMARY="The PyPA recommended tool for installing Python packages" +DESCRIPTION="Install Python packages, replacement for easy_install" +HOMEPAGE="https://pypi.python.org/pypi/pip" +COPYRIGHT="2006-2014 Python Packaging Authority" +LICENSE="Python" +REVISION="1" +SOURCE_URI="https://pypi.io/packages/source/p/pip/pip-$portVersion.tar.gz" +CHECKSUM_SHA256="f62fb70e7e000e46fce12aaeca752e5281a5446977fe5a75ab4189a43b3f8793" + +ARCHITECTURES="any" + +PROVIDES=" + $portName = $portVersion + " +REQUIRES=" + haiku + " + +BUILD_REQUIRES=" + haiku_devel + " + +PYTHON_PACKAGES=(python python3) +PYTHON_VERSIONS=(2.7 3.6) +for i in "${!PYTHON_PACKAGES[@]}"; do +pythonPackage=${PYTHON_PACKAGES[i]} +pythonVersion=${PYTHON_VERSIONS[$i]} +eval "PROVIDES_${pythonPackage}=\"\ + ${portName}_$pythonPackage = $portVersion\n\ + cmd:pip$pythonVersion\n\ + cmd:pip${pythonVersion:0:1}\n\ + \"; \ +REQUIRES_$pythonPackage=\"\ + haiku\n\ + cmd:python$pythonVersion\n\ + setuptools_$pythonPackage\n\ + \"" +BUILD_REQUIRES="$BUILD_REQUIRES + setuptools_$pythonPackage" +BUILD_PREREQUIRES="$BUILD_PREREQUIRES + cmd:python$pythonVersion" +done + +PROVIDES_python="$PROVIDES_python + cmd:pip + " +REPLACES_python=" + python_pip + " +REPLACES_python3=" + python3_pip + " + +INSTALL() +{ + for i in "${!PYTHON_PACKAGES[@]}"; do + pythonPackage=${PYTHON_PACKAGES[i]} + pythonVersion=${PYTHON_VERSIONS[$i]} + + python=python$pythonVersion + installLocation=$prefix/lib/$python/vendor-packages/ + export PYTHONPATH=$installLocation:$PYTHONPATH + mkdir -p $installLocation + rm -rf build + $python setup.py build install \ + --root=/ --prefix=$prefix + + if [ $pythonPackage != python ]; then + rm $binDir/pip + fi + packageEntries $pythonPackage \ + $prefix/lib/python* \ + $binDir + done +} diff --git a/dev-python/pip/python3_pip-7.0.3.recipe b/dev-python/pip/python3_pip-7.0.3.recipe deleted file mode 100644 index b2ecd7bbf..000000000 --- a/dev-python/pip/python3_pip-7.0.3.recipe +++ /dev/null @@ -1,50 +0,0 @@ -SUMMARY="The PyPA recommended tool for installing Python packages" -DESCRIPTION="Install Python packages, replacement for easy_install" -HOMEPAGE="https://pypi.python.org/pypi/pip" -COPYRIGHT="2006-2014 Python Packaging Authority" -LICENSE="Python" -REVISION="2" -SOURCE_URI="https://pypi.python.org/packages/source/p/pip/pip-$portVersion.tar.gz" -CHECKSUM_SHA256="b4c598825a6f6dc2cac65968feb28e6be6c1f7f1408493c60a07eaa731a0affd" -SOURCE_DIR="pip-$portVersion" -PYTHON_VERSION="3.6" - -ARCHITECTURES="x86 x86_gcc2 x86_64" - -PROVIDES=" - python3_pip = $portVersion - cmd:pip - cmd:pip3 - cmd:pip$PYTHON_VERSION - " -REQUIRES=" - haiku - cmd:python$PYTHON_VERSION - python3_setuptools - " - -BUILD_REQUIRES=" - python3_setuptools - " -BUILD_PREREQUIRES=" - haiku_devel - cmd:python$PYTHON_VERSION - cmd:sed - " - -BUILD() -{ - $portPackageLinksDir/cmd~python$PYTHON_VERSION/bin/python3 setup.py build -} - -INSTALL() -{ - # GENERIC: all python_setuptools-based installs need this - pythonVersion=$($portPackageLinksDir/cmd~python$PYTHON_VERSION/bin/python3 --version 2>&1 | sed 's/Python //' | head -c3) - installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ - export PYTHONPATH=$installLocation:$PYTHONPATH - mkdir -p $installLocation - - $portPackageLinksDir/cmd~python$PYTHON_VERSION/bin/python3 setup.py install \ - --prefix=$prefix -} diff --git a/dev-python/pycrypto/pycrypto-2.6.1.recipe b/dev-python/pycrypto/pycrypto-2.6.1.recipe index d975fc304..faceeabaf 100644 --- a/dev-python/pycrypto/pycrypto-2.6.1.recipe +++ b/dev-python/pycrypto/pycrypto-2.6.1.recipe @@ -5,45 +5,65 @@ RIPEMD160), and various encryption algorithms (AES, DES, RSA, ElGamal, etc.). " HOMEPAGE="http://pypi.python.org/pypi/pycrypto/2.6" -SOURCE_URI="http://pypi.python.org/packages/source/p/pycrypto/pycrypto-2.6.1.tar.gz" -REVISION="1" +LICENSE="pycrypto" +COPYRIGHT="2010 Dwayne C. Litzenberger" +REVISION="2" +SOURCE_URI="http://pypi.python.org/packages/source/p/pycrypto/pycrypto-$portVersion.tar.gz" CHECKSUM_SHA256="f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c" -ARCHITECTURES="arm ppc x86 x86_gcc2 x86_64" +ARCHITECTURES="x86_gcc2 x86 x86_64" PROVIDES=" - pycrypto = $portVersion + $portName = $portVersion " - REQUIRES=" haiku - cmd:python " BUILD_REQUIRES=" haiku_devel + devel:libgmp " - BUILD_PREREQUIRES=" - cmd:python - cmd:sed cmd:awk cmd:cc - cmd:autoconf " - -BUILD() -{ - runConfigure ./configure - python setup.py build -} - +PYTHON_PACKAGES=(python python3) +PYTHON_VERSIONS=(2.7 3.6) +for i in "${!PYTHON_PACKAGES[@]}"; do +pythonPackage=${PYTHON_PACKAGES[i]} +pythonVersion=${PYTHON_VERSIONS[$i]} +eval "PROVIDES_${pythonPackage}=\"\ + ${portName}_$pythonPackage = $portVersion\ + \"; \ +REQUIRES_$pythonPackage=\"\ + haiku\n\ + lib:libgmp\n\ + cmd:python$pythonVersion\ + \"" +BUILD_REQUIRES="$BUILD_REQUIRES + setuptools_$pythonPackage" +BUILD_PREREQUIRES="$BUILD_PREREQUIRES + cmd:python$pythonVersion" +done INSTALL() { - python setup.py install --prefix=$prefix + for i in "${!PYTHON_PACKAGES[@]}"; do + pythonPackage=${PYTHON_PACKAGES[i]} + pythonVersion=${PYTHON_VERSIONS[$i]} + + python=python$pythonVersion + installLocation=$prefix/lib/$python/vendor-packages/ + export PYTHONPATH=$installLocation:$PYTHONPATH + mkdir -p $installLocation + rm -rf build + runConfigure ./configure + $python setup.py build + $python setup.py install \ + --root=/ --prefix=$prefix + + packageEntries $pythonPackage \ + $prefix/lib/python* + done } - - -LICENSE="pycrypto" -COPYRIGHT="2010 Dwayne C. Litzenberger" diff --git a/dev-python/pygments/pygments-2.1.3.recipe b/dev-python/pygments/pygments-2.1.3.recipe deleted file mode 100644 index e3ab8ef7c..000000000 --- a/dev-python/pygments/pygments-2.1.3.recipe +++ /dev/null @@ -1,58 +0,0 @@ -SUMMARY="A generic syntax highlighter" -DESCRIPTION="It is a generic syntax highlighter for general use in all kinds \ -of software such as forum systems, wikis or other applications that need to \ -prettify source code. Highlights are: - -* a wide range of common languages and markup formats is supported -* special attention is paid to details that increase highlighting quality -* support for new languages and formats are added easily; most languages use a \ -simple regex-based lexing mechanism -* a number of output formats is available, among them HTML, RTF, LaTeX and \ -ANSI sequences -* it is usable as a command-line tool and as a library -* ... and it highlights even Brainf*ck!" -HOMEPAGE="http://pygments.org/" -COPYRIGHT="2006-2013 by the Pygments team" -LICENSE="BSD (2-clause)" -REVISION="1" -SOURCE_URI="https://pypi.python.org/packages/source/P/Pygments/Pygments-$portVersion.tar.gz" -CHECKSUM_SHA256="88e4c8a91b2af5962bfa5ea2447ec6dd357018e86e94c7d14bd8cacbc5b55d81" -SOURCE_DIR="Pygments-$portVersion" - -ARCHITECTURES="x86 x86_gcc2 x86_64" - -PROVIDES=" - pygments$secondaryArchSuffix = $portVersion - cmd:pygmentize$secondaryArchSuffix = $portVersion - " -REQUIRES=" - haiku$secondaryArchSuffix - cmd:python2$secondaryArchSuffix - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - python_setuptools - " -BUILD_PREREQUIRES=" - cmd:python2$secondaryArchSuffix - " - -BUILD() -{ - $portPackageLinksDir/cmd~python2/bin/python2 setup.py build -} - -INSTALL() -{ - # GENERIC: all python_setuptools-based installs need this - python=$portPackageLinksDir/cmd~python2/bin/python2 - pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3) - installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ - export PYTHONPATH=$installLocation:$PYTHONPATH - mkdir -p $installLocation - - $python setup.py install \ - --single-version-externally-managed \ - --root=/ --prefix=$prefix -} diff --git a/dev-python/pygments/pygments-2.2.0.recipe b/dev-python/pygments/pygments-2.2.0.recipe new file mode 100644 index 000000000..c118b4844 --- /dev/null +++ b/dev-python/pygments/pygments-2.2.0.recipe @@ -0,0 +1,81 @@ +SUMMARY="A generic syntax highlighter" +DESCRIPTION="It is a generic syntax highlighter for general use in all kinds \ +of software such as forum systems, wikis or other applications that need to \ +prettify source code. Highlights are: + +* a wide range of common languages and markup formats is supported +* special attention is paid to details that increase highlighting quality +* support for new languages and formats are added easily; most languages use a \ +simple regex-based lexing mechanism +* a number of output formats is available, among them HTML, RTF, LaTeX and \ +ANSI sequences +* it is usable as a command-line tool and as a library +* ... and it highlights even Brainf*ck!" +HOMEPAGE="http://pygments.org/" +COPYRIGHT="2006-2013 by the Pygments team" +LICENSE="BSD (2-clause)" +REVISION="1" +SOURCE_URI="https://pypi.python.org/packages/71/2a/2e4e77803a8bd6408a2903340ac498cb0a2181811af7c9ec92cb70b0308a/Pygments-$portVersion.tar.gz" +CHECKSUM_SHA256="dbae1046def0efb574852fab9e90209b23f556367b5a320c0bcb871c77c3e8cc" +SOURCE_DIR="Pygments-$portVersion" + +ARCHITECTURES="any" + +PROVIDES=" + $portName = $portVersion + " +REQUIRES=" + haiku + " + +BUILD_REQUIRES=" + haiku_devel + " + +PYTHON_PACKAGES=(python python3) +PYTHON_VERSIONS=(2.7 3.6) +for i in "${!PYTHON_PACKAGES[@]}"; do +pythonPackage=${PYTHON_PACKAGES[i]} +pythonVersion=${PYTHON_VERSIONS[$i]} +eval "PROVIDES_${pythonPackage}=\"\ + ${portName}_$pythonPackage = $portVersion\ + \"; \ +REQUIRES_$pythonPackage=\"\ + haiku\n\ + cmd:python$pythonVersion\ + \"" +BUILD_REQUIRES="$BUILD_REQUIRES + setuptools_$pythonPackage" +BUILD_PREREQUIRES="$BUILD_PREREQUIRES + cmd:python$pythonVersion" +done + +PROVIDES_python="$PROVIDES_python + cmd:pygmentize = $portVersion + " +PROVIDES_python3="$PROVIDES_python3 + cmd:pygmentize3 = $portVersion + " + +INSTALL() +{ + for i in "${!PYTHON_PACKAGES[@]}"; do + pythonPackage=${PYTHON_PACKAGES[i]} + pythonVersion=${PYTHON_VERSIONS[$i]} + + python=python$pythonVersion + installLocation=$prefix/lib/$python/vendor-packages/ + export PYTHONPATH=$installLocation:$PYTHONPATH + mkdir -p $installLocation + rm -rf build + $python setup.py build install \ + --root=/ --prefix=$prefix + + if [ $pythonPackage != python ]; then + mv $binDir/pygmentize $binDir/pygmentize3 + fi + packageEntries $pythonPackage \ + $prefix/lib/python* \ + $binDir + done +} diff --git a/dev-python/pylzma/pylzma-0.4.8.recipe b/dev-python/pylzma/pylzma-0.4.8.recipe index e52f2027d..ffcd9f399 100644 --- a/dev-python/pylzma/pylzma-0.4.8.recipe +++ b/dev-python/pylzma/pylzma-0.4.8.recipe @@ -23,7 +23,7 @@ REQUIRES=" BUILD_REQUIRES=" haiku_devel cmd:sed - python_setuptools + setuptools_python " BUILD_PREREQUIRES=" cmd:python diff --git a/dev-python/pyqt/pyqt-5.7.1.recipe b/dev-python/pyqt/pyqt-5.7.1.recipe index b136236b8..67e8692fb 100644 --- a/dev-python/pyqt/pyqt-5.7.1.recipe +++ b/dev-python/pyqt/pyqt-5.7.1.recipe @@ -85,9 +85,9 @@ REPLACES_python3=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - python_setuptools + setuptools_python sip_python # >= 4.19 - python3_setuptools + setuptools_python3 sip_python3 # >= 4.19 devel:libQt5Bluetooth$secondaryArchSuffix >= 5.7 devel:libQt5Core$secondaryArchSuffix >= 5.7 diff --git a/dev-python/pyqt/pyqt-5.8.2.recipe b/dev-python/pyqt/pyqt-5.8.2.recipe index b38faa9ab..2b91387f4 100644 --- a/dev-python/pyqt/pyqt-5.8.2.recipe +++ b/dev-python/pyqt/pyqt-5.8.2.recipe @@ -88,9 +88,9 @@ REPLACES_python3=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - python_setuptools + setuptools_python sip_python # >= 4.19 - python3_setuptools + setuptools_python3 sip_python3 # >= 4.19 devel:libQt5Bluetooth$secondaryArchSuffix >= 5.7 devel:libQt5Core$secondaryArchSuffix >= 5.7 diff --git a/dev-python/pyyaml/pyyaml-3.11.recipe b/dev-python/pyyaml/pyyaml-3.11.recipe deleted file mode 100644 index 5877ab7d6..000000000 --- a/dev-python/pyyaml/pyyaml-3.11.recipe +++ /dev/null @@ -1,66 +0,0 @@ -SUMMARY="YAML parser and emitter for Python" -DESCRIPTION=" -YAML is a data serialization format designed for human readability \ -and interaction with scripting languages. \ -PyYAML is a YAML parser and emitter for Python. - -PyYAML features a complete YAML 1.1 parser, Unicode support, \ -pickle support, capable extension API, and sensible error messages. \ -PyYAML supports standard YAML tags and \ -provides Python-specific tags that allow to represent an arbitrary Python object. - -PyYAML is applicable for a broad range of tasks from \ -complex configuration files to object serialization and persistance. -" -HOMEPAGE=" - http://pyyaml.org/ - http://pypi.python.org/pypi/PyYAML - " -SOURCE_URI="https://pypi.python.org/packages/source/P/PyYAML/PyYAML-3.11.tar.gz" -CHECKSUM_SHA256="c36c938a872e5ff494938b33b14aaa156cb439ec67548fcab3535bb78b0846e8" -LICENSE="MIT" -COPYRIGHT="2006 Kirill Simonov" -REVISION="1" - -ARCHITECTURES="x86 x86_gcc2 x86_64" - -SOURCE_DIR="PyYAML-$portVersion" - -PROVIDES=" - pyyaml = $portVersion - " - -REQUIRES=" - haiku - cmd:python - " - -#TODO: eventually depend on http://pyyaml.org/wiki/LibYAML -BUILD_REQUIRES=" - haiku_devel - cmd:sed - python_setuptools - " - -BUILD_PREREQUIRES=" - cmd:python - cmd:gcc - " - -BUILD() -{ - $portPackageLinksDir/cmd~python/bin/python setup.py build -} - -INSTALL() -{ - # GENERIC: all python_setuptools-based installs need this - python=$portPackageLinksDir/cmd~python/bin/python - pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3) - installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ - export PYTHONPATH=$installLocation:$PYTHONPATH - mkdir -p $installLocation - - $python setup.py install \ - --prefix=$prefix -} diff --git a/dev-python/pyyaml/pyyaml-3.12.recipe b/dev-python/pyyaml/pyyaml-3.12.recipe new file mode 100644 index 000000000..703578430 --- /dev/null +++ b/dev-python/pyyaml/pyyaml-3.12.recipe @@ -0,0 +1,74 @@ +SUMMARY="YAML parser and emitter for Python" +DESCRIPTION=" +YAML is a data serialization format designed for human readability \ +and interaction with scripting languages. \ +PyYAML is a YAML parser and emitter for Python. + +PyYAML features a complete YAML 1.1 parser, Unicode support, \ +pickle support, capable extension API, and sensible error messages. \ +PyYAML supports standard YAML tags and \ +provides Python-specific tags that allow to represent an arbitrary Python object. + +PyYAML is applicable for a broad range of tasks from \ +complex configuration files to object serialization and persistance. +" +HOMEPAGE="http://pyyaml.org/" +COPYRIGHT="2006 Kirill Simonov" +LICENSE="MIT" +REVISION="1" +SOURCE_URI="http://pyyaml.org/download/pyyaml/PyYAML-$portVersion.tar.gz" +CHECKSUM_SHA256="592766c6303207a20efc445587778322d7f73b161bd994f227adaa341ba212ab" +SOURCE_DIR="PyYAML-$portVersion" + +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PROVIDES=" + $portName = $portVersion + " +REQUIRES=" + haiku + " + +BUILD_REQUIRES=" + haiku_devel + " +BUILD_PREREQUIRES=" + cmd:gcc + " + +PYTHON_PACKAGES=(python python3) +PYTHON_VERSIONS=(2.7 3.6) +for i in "${!PYTHON_PACKAGES[@]}"; do +pythonPackage=${PYTHON_PACKAGES[i]} +pythonVersion=${PYTHON_VERSIONS[$i]} +eval "PROVIDES_${pythonPackage}=\"\ + ${portName}_$pythonPackage = $portVersion\ + \"; \ +REQUIRES_$pythonPackage=\"\ + haiku\n\ + cmd:python$pythonVersion\ + \"" +BUILD_REQUIRES="$BUILD_REQUIRES + setuptools_$pythonPackage" +BUILD_PREREQUIRES="$BUILD_PREREQUIRES + cmd:python$pythonVersion" +done + +INSTALL() +{ + for i in "${!PYTHON_PACKAGES[@]}"; do + pythonPackage=${PYTHON_PACKAGES[i]} + pythonVersion=${PYTHON_VERSIONS[$i]} + + python=python$pythonVersion + installLocation=$prefix/lib/$python/vendor-packages/ + export PYTHONPATH=$installLocation:$PYTHONPATH + mkdir -p $installLocation + rm -rf build + $python setup.py build install \ + --root=/ --prefix=$prefix + + packageEntries $pythonPackage \ + $prefix/lib/python* + done +} diff --git a/dev-python/requests/python3_requests-2.9.1.recipe b/dev-python/requests/python3_requests-2.9.1.recipe deleted file mode 100644 index 3bd714c74..000000000 --- a/dev-python/requests/python3_requests-2.9.1.recipe +++ /dev/null @@ -1,49 +0,0 @@ -SUMMARY="A HTTP library for Python" -DESCRIPTION="Requests is a HTTP library, written in Python, made for humans." -HOMEPAGE="http://python-requests.org/ - http://pypi.python.org/pypi/requests" -COPYRIGHT="2014 Kenneth Reitz" -LICENSE="Apache v2" -REVISION="2" -SOURCE_URI="https://pypi.python.org/packages/source/r/requests/requests-$portVersion.tar.gz" -CHECKSUM_SHA256="c577815dd00f1394203fc44eb979724b098f88264a9ef898ee45b8e5e9cf587f" -SOURCE_DIR="requests-$portVersion" -PYTHON_VERSION="3.6" - -ARCHITECTURES="x86 x86_gcc2 x86_64" - -PROVIDES=" - python3_requests = $portVersion - " -REQUIRES=" - haiku - cmd:python$PYTHON_VERSION - # actually has its own copy... - #ca_root_certificates - " - -BUILD_REQUIRES=" - haiku_devel - " -BUILD_PREREQUIRES=" - cmd:python$PYTHON_VERSION - cmd:gcc - " - -BUILD() -{ - $portPackageLinksDir/cmd~python$PYTHON_VERSION/bin/python3 setup.py build -} - -INSTALL() -{ - # GENERIC: all python_setuptools-based installs need this - python=$portPackageLinksDir/cmd~python$PYTHON_VERSION/bin/python3 - pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3) - installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ - export PYTHONPATH=$installLocation:$PYTHONPATH - mkdir -p $installLocation - - $python setup.py install \ - --prefix=$prefix -} diff --git a/dev-python/requests/python_requests-2.9.1.recipe b/dev-python/requests/python_requests-2.9.1.recipe deleted file mode 100644 index 9cc3a9125..000000000 --- a/dev-python/requests/python_requests-2.9.1.recipe +++ /dev/null @@ -1,48 +0,0 @@ -SUMMARY="A HTTP library for Python" -DESCRIPTION="Requests is a HTTP library, written in Python, made for humans." -HOMEPAGE="http://python-requests.org/ - http://pypi.python.org/pypi/requests" -COPYRIGHT="2014 Kenneth Reitz" -LICENSE="Apache v2" -REVISION="1" -SOURCE_URI="https://pypi.python.org/packages/source/r/requests/requests-$portVersion.tar.gz" -CHECKSUM_SHA256="c577815dd00f1394203fc44eb979724b098f88264a9ef898ee45b8e5e9cf587f" -SOURCE_DIR="requests-$portVersion" - -ARCHITECTURES="x86 x86_gcc2 x86_64" - -PROVIDES=" - python_requests = $portVersion - " -REQUIRES=" - haiku - cmd:python2 - # actually has its own copy... - #ca_root_certificates - " - -BUILD_REQUIRES=" - haiku_devel - " -BUILD_PREREQUIRES=" - cmd:python2 - cmd:gcc - " - -BUILD() -{ - $portPackageLinksDir/cmd~python2/bin/python2 setup.py build -} - -INSTALL() -{ - # GENERIC: all python_setuptools-based installs need this - python=$portPackageLinksDir/cmd~python2/bin/python2 - pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3) - installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ - export PYTHONPATH=$installLocation:$PYTHONPATH - mkdir -p $installLocation - - $python setup.py install \ - --prefix=$prefix -} diff --git a/dev-python/requests/requests-2.13.0.recipe b/dev-python/requests/requests-2.13.0.recipe new file mode 100644 index 000000000..7e512a722 --- /dev/null +++ b/dev-python/requests/requests-2.13.0.recipe @@ -0,0 +1,62 @@ +SUMMARY="A HTTP library for Python" +DESCRIPTION="Requests is a HTTP library, written in Python, made for humans." +HOMEPAGE="http://python-requests.org/ + http://pypi.python.org/pypi/requests" +COPYRIGHT="2014 Kenneth Reitz" +LICENSE="Apache v2" +REVISION="1" +SOURCE_URI="https://github.com/kennethreitz/requests/archive/v$portVersion.tar.gz" +CHECKSUM_SHA256="48fd188aaa388b4193bf7b917cf861a00eafacad651148475bc65ffaef445627" + +ARCHITECTURES="any" + +PROVIDES=" + $portName = $portVersion + " +REQUIRES=" + haiku + " + +BUILD_REQUIRES=" + haiku_devel + " +PYTHON_PACKAGES=(python python3) +PYTHON_VERSIONS=(2.7 3.6) +for i in "${!PYTHON_PACKAGES[@]}"; do +pythonPackage=${PYTHON_PACKAGES[i]} +pythonVersion=${PYTHON_VERSIONS[$i]} +eval "PROVIDES_${pythonPackage}=\"\ + ${portName}_$pythonPackage = $portVersion\ + \"; \ +REQUIRES_$pythonPackage=\"\ + haiku\n\ + cmd:python$pythonVersion\ + \"" +BUILD_REQUIRES="$BUILD_REQUIRES + setuptools_$pythonPackage" +BUILD_PREREQUIRES="$BUILD_PREREQUIRES + cmd:python$pythonVersion" +done + +REPLACES_python=" + python_requests + " + +INSTALL() +{ + for i in "${!PYTHON_PACKAGES[@]}"; do + pythonPackage=${PYTHON_PACKAGES[i]} + pythonVersion=${PYTHON_VERSIONS[$i]} + + python=python$pythonVersion + installLocation=$prefix/lib/$python/vendor-packages/ + export PYTHONPATH=$installLocation:$PYTHONPATH + mkdir -p $installLocation + rm -rf build + $python setup.py build install \ + --root=/ --prefix=$prefix + + packageEntries $pythonPackage \ + $prefix/lib/python* + done +} diff --git a/dev-python/setuptools/python3_setuptools-22.0.0.recipe b/dev-python/setuptools/python3_setuptools-22.0.0.recipe deleted file mode 100644 index 0a89d3f9f..000000000 --- a/dev-python/setuptools/python3_setuptools-22.0.0.recipe +++ /dev/null @@ -1,48 +0,0 @@ -SUMMARY="Download, build, install, upgrade, and uninstall Python packages" -DESCRIPTION="EasyInstall (easy_install) gives you a quick and painless way \ -to install packages remotely by connecting to the cheeseshop or even other \ -websites via HTTP. It is somewhat analogous to the CPAN and PEAR tools for \ -Perl and PHP, respectively." -HOMEPAGE="https://pypi.python.org/pypi/setuptools" -COPYRIGHT="2006-2014 Python Packaging Authority" -LICENSE="Python" -REVISION="1" -SOURCE_URI="https://github.com/pypa/setuptools/archive/v$portVersion.tar.gz" -SOURCE_FILENAME="setuptools-$portVersion.tar.gz" -CHECKSUM_SHA256="90a40d54d21d4cfe55ae2c3597ed3f2a63d9e8fe768f03ff16f2a58ed97bcc32" -SOURCE_DIR="setuptools-$portVersion" - -ARCHITECTURES="x86 x86_gcc2 x86_64" - -PROVIDES=" - python3_setuptools = $portVersion - " -REQUIRES=" - haiku - cmd:python3 - " - -BUILD_REQUIRES=" - haiku_devel - " -BUILD_PREREQUIRES=" - cmd:python3 - cmd:sed - " - -BUILD() -{ - $portPackageLinksDir/cmd~python3/bin/python3 setup.py build -} - -INSTALL() -{ - # GENERIC: all python_setuptools-based installs need this - pythonVersion=$(python3 --version 2>&1 | sed 's/Python //' | head -c3) - installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ - export PYTHONPATH=$installLocation:$PYTHONPATH - mkdir -p $installLocation - - $portPackageLinksDir/cmd~python3/bin/python3 setup.py install \ - --prefix=$prefix -} diff --git a/dev-python/setuptools/python3_setuptools-28.8.0.recipe b/dev-python/setuptools/python3_setuptools-28.8.0.recipe deleted file mode 100644 index 9ade3c18d..000000000 --- a/dev-python/setuptools/python3_setuptools-28.8.0.recipe +++ /dev/null @@ -1,52 +0,0 @@ -SUMMARY="Download, build, install, upgrade, and uninstall Python packages" -DESCRIPTION="EasyInstall (easy_install) gives you a quick and painless way \ -to install packages remotely by connecting to the cheeseshop or even other \ -websites via HTTP. It is somewhat analogous to the CPAN and PEAR tools for \ -Perl and PHP, respectively." -HOMEPAGE="https://pypi.python.org/pypi/setuptools" -COPYRIGHT="2006-2014 Python Packaging Authority" -LICENSE="Python" -REVISION="2" -SOURCE_URI="https://github.com/pypa/setuptools/archive/v$portVersion.tar.gz" -SOURCE_FILENAME="setuptools-$portVersion.tar.gz" -CHECKSUM_SHA256="d3b2c63a5cb6816ace0883bc3f6aca9e7890c61d80ac0d608a183f85825a7cc0" -SOURCE_DIR="setuptools-$portVersion" -PYTHON_VERSION="3.6" - -ARCHITECTURES="x86 x86_gcc2 x86_64" - -PROVIDES=" - python3_setuptools = $portVersion - cmd:easy_install - cmd:easy_install_$PYTHON_VERSION - " -REQUIRES=" - haiku - cmd:python$PYTHON_VERSION - " - -BUILD_REQUIRES=" - haiku_devel - " -BUILD_PREREQUIRES=" - cmd:python$PYTHON_VERSION - cmd:sed - " - -BUILD() -{ - $portPackageLinksDir/cmd~python$PYTHON_VERSION/bin/python3 bootstrap.py - $portPackageLinksDir/cmd~python$PYTHON_VERSION/bin/python3 setup.py build -} - -INSTALL() -{ - # GENERIC: all python_setuptools-based installs need this - pythonVersion=$($portPackageLinksDir/cmd~python$PYTHON_VERSION/bin/python3 --version 2>&1 | sed 's/Python //' | head -c3) - installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ - export PYTHONPATH=$installLocation:$PYTHONPATH - mkdir -p $installLocation - - $portPackageLinksDir/cmd~python$PYTHON_VERSION/bin/python3 setup.py install \ - --prefix=$prefix --skip-build -} diff --git a/dev-python/setuptools/python_setuptools-22.0.0.recipe b/dev-python/setuptools/python_setuptools-22.0.0.recipe deleted file mode 100644 index d0b74d0c0..000000000 --- a/dev-python/setuptools/python_setuptools-22.0.0.recipe +++ /dev/null @@ -1,48 +0,0 @@ -SUMMARY="Download, build, install, upgrade, and uninstall Python packages" -DESCRIPTION="EasyInstall (easy_install) gives you a quick and painless way \ -to install packages remotely by connecting to the cheeseshop or even other \ -websites via HTTP. It is somewhat analogous to the CPAN and PEAR tools for \ -Perl and PHP, respectively." -HOMEPAGE="https://pypi.python.org/pypi/setuptools" -COPYRIGHT="2006-2014 Python Packaging Authority" -LICENSE="Python" -REVISION="1" -SOURCE_URI="https://github.com/pypa/setuptools/archive/v$portVersion.tar.gz" -SOURCE_FILENAME="setuptools-$portVersion.tar.gz" -CHECKSUM_SHA256="90a40d54d21d4cfe55ae2c3597ed3f2a63d9e8fe768f03ff16f2a58ed97bcc32" -SOURCE_DIR="setuptools-$portVersion" - -ARCHITECTURES="x86 x86_gcc2 x86_64" - -PROVIDES=" - python_setuptools = $portVersion - " -REQUIRES=" - haiku - cmd:python2 - " - -BUILD_REQUIRES=" - haiku_devel - " -BUILD_PREREQUIRES=" - cmd:python2 - cmd:sed - " - -BUILD() -{ - $portPackageLinksDir/cmd~python2/bin/python2 setup.py build -} - -INSTALL() -{ - # GENERIC: all python_setuptools-based installs need this - pythonVersion=$(python2 --version 2>&1 | sed 's/Python //' | head -c3) - installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ - export PYTHONPATH=$installLocation:$PYTHONPATH - mkdir -p $installLocation - - $portPackageLinksDir/cmd~python2/bin/python2 setup.py install \ - --prefix=$prefix -} diff --git a/dev-python/setuptools/setuptools-28.8.0.recipe b/dev-python/setuptools/setuptools-28.8.0.recipe new file mode 100644 index 000000000..30a825ebd --- /dev/null +++ b/dev-python/setuptools/setuptools-28.8.0.recipe @@ -0,0 +1,98 @@ +SUMMARY="Download, build, install, upgrade, and uninstall Python packages" +DESCRIPTION="EasyInstall (easy_install) gives you a quick and painless way \ +to install packages remotely by connecting to the cheeseshop or even other \ +websites via HTTP. It is somewhat analogous to the CPAN and PEAR tools for \ +Perl and PHP, respectively." +HOMEPAGE="https://pypi.python.org/pypi/setuptools" +COPYRIGHT="2006-2014 Python Packaging Authority" +LICENSE="Python" +REVISION="1" +SOURCE_URI="https://github.com/pypa/setuptools/archive/v$portVersion.tar.gz" +SOURCE_FILENAME="setuptools-$portVersion.tar.gz" +CHECKSUM_SHA256="d3b2c63a5cb6816ace0883bc3f6aca9e7890c61d80ac0d608a183f85825a7cc0" + +ARCHITECTURES="any" + +PROVIDES=" + $portName = $portVersion + " +REQUIRES=" + haiku + " + +BUILD_REQUIRES=" + haiku_devel + " +BUILD_PREREQUIRES=" + cmd:sed + " + +PYTHON_PACKAGES=(python python3) +PYTHON_VERSIONS=(2.7 3.6) +for i in "${!PYTHON_PACKAGES[@]}"; do +pythonPackage=${PYTHON_PACKAGES[i]} +pythonVersion=${PYTHON_VERSIONS[$i]} +eval "PROVIDES_${pythonPackage}=\"\ + ${portName}_$pythonPackage = $portVersion\n\ + cmd:easy_install_$pythonVersion\n\ + \"; \ +REQUIRES_$pythonPackage=\"\ + haiku\n\ + cmd:python$pythonVersion\n\ + \"" +BUILD_PREREQUIRES="$BUILD_PREREQUIRES + cmd:python$pythonVersion" +done + +PROVIDES_python="$PROVIDES_python + cmd:easy_install + " +REPLACES_python=" + python_setuptools + " +REPLACES_python3=" + python3_setuptools + " + +BUILD() +{ + rm -rf build* + for i in "${!PYTHON_PACKAGES[@]}"; do + pythonPackage=${PYTHON_PACKAGES[i]} + pythonVersion=${PYTHON_VERSIONS[$i]} + # GENERIC: all python_setuptools-based installs need this + python=$portPackageLinksDir/cmd~python$pythonVersion/bin/python$pythonVersion + pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3) + installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ + + $python bootstrap.py + $python setup.py build + mv build build$pythonVersion + done +} + +INSTALL() +{ + for i in "${!PYTHON_PACKAGES[@]}"; do + pythonPackage=${PYTHON_PACKAGES[i]} + pythonVersion=${PYTHON_VERSIONS[$i]} + + python=python$pythonVersion + installLocation=$prefix/lib/$python/vendor-packages/ + export PYTHONPATH=$installLocation:$PYTHONPATH + mkdir -p $installLocation + + mv build$pythonVersion build + $python setup.py install \ + --root=/ --prefix=$prefix --skip-build + + sed -i -e "s|^#\!.*/usr/bin/env python|#!/bin/env python$pythonVersion|" $binDir/easy_install* + if [ $pythonPackage != python ]; then + rm $binDir/easy_install + fi + + packageEntries $pythonPackage \ + $prefix/lib/python* \ + $binDir + done +} diff --git a/dev-python/twisted/patches/twisted-17.1.0.patchset b/dev-python/twisted/patches/twisted-17.1.0.patchset new file mode 100644 index 000000000..3b88029fa --- /dev/null +++ b/dev-python/twisted/patches/twisted-17.1.0.patchset @@ -0,0 +1,59 @@ +From b2c93cc12cec881066556a0b3245acf4273f5f34 Mon Sep 17 00:00:00 2001 +From: Jessica Hamilton +Date: Fri, 20 Jun 2014 04:57:11 +0000 +Subject: sendmsg.c: fix compiling with gcc2. + + +diff --git a/src/twisted/python/_sendmsg.c b/src/twisted/python/_sendmsg.c +index e84c08b..e9b8677 100644 +--- a/src/twisted/python/_sendmsg.c ++++ b/src/twisted/python/_sendmsg.c +@@ -175,9 +175,11 @@ static PyObject *sendmsg_sendmsg(PyObject *self, PyObject *args, PyObject *keywd + + int fd; + int flags = 0; ++ size_t all_data_len = 0; + Py_ssize_t sendmsg_result, iovec_length; + struct msghdr message_header; +- struct iovec iov[1]; ++ struct iovec iov[1]; ++ struct cmsghdr *control_message = NULL; + PyObject *ancillary = NULL; + PyObject *iterator = NULL; + PyObject *item = NULL; +@@ -223,7 +225,7 @@ static PyObject *sendmsg_sendmsg(PyObject *self, PyObject *args, PyObject *keywd + goto finished; + } + +- size_t all_data_len = 0; ++ all_data_len = 0; + + /* First we need to know how big the buffer needs to be in order to + have enough space for all of the messages. */ +@@ -298,7 +300,7 @@ static PyObject *sendmsg_sendmsg(PyObject *self, PyObject *args, PyObject *keywd + } + + /* Unpack the tuples into the control message. */ +- struct cmsghdr *control_message = CMSG_FIRSTHDR(&message_header); ++ control_message = CMSG_FIRSTHDR(&message_header); + while ( (item = PyIter_Next(iterator)) && control_message!=NULL ) { + int type, level; + Py_ssize_t data_len; +@@ -505,12 +507,13 @@ static PyObject *sendmsg_recvmsg(PyObject *self, PyObject *args, PyObject *keywd + static PyObject *sendmsg_getsockfam(PyObject *self, PyObject *args, + PyObject *keywds) { + int fd; ++ socklen_t sz; + struct sockaddr sa; + static char *kwlist[] = {"fd", NULL}; + if (!PyArg_ParseTupleAndKeywords(args, keywds, "i", kwlist, &fd)) { + return NULL; + } +- socklen_t sz = sizeof(sa); ++ sz = sizeof(sa); + if (getsockname(fd, &sa, &sz)) { + PyErr_SetFromErrno(sendmsg_socket_error); + return NULL; +-- +2.11.0 + diff --git a/dev-python/twisted/python_twisted-16.2.0.recipe b/dev-python/twisted/twisted-17.1.0.recipe similarity index 52% rename from dev-python/twisted/python_twisted-16.2.0.recipe rename to dev-python/twisted/twisted-17.1.0.recipe index b7ef1e2b3..a72c8a46d 100644 --- a/dev-python/twisted/python_twisted-16.2.0.recipe +++ b/dev-python/twisted/twisted-17.1.0.recipe @@ -24,14 +24,45 @@ COPYRIGHT="2001-2013 Twisted project members" LICENSE="MIT" REVISION="1" SOURCE_URI="https://github.com/twisted/twisted/archive/twisted-$portVersion.tar.gz" -CHECKSUM_SHA256="458a917dfd61c1d480b3efa024c702890c201667c4f28ce0d5b0f1d22e4c7403" -PATCHES="python_twisted-$portVersion.patchset" +CHECKSUM_SHA256="7fcf6aa05e9dc91a2ce78ac079652001fe704a74149c2fbbb7649133c2b2bb1a" +PATCHES="twisted-$portVersion.patchset" SOURCE_DIR="twisted-twisted-$portVersion" -ARCHITECTURES="x86 x86_gcc2 x86_64" +ARCHITECTURES="?x86_gcc2 ?x86 x86_64" PROVIDES=" - python_twisted = $portVersion + $portName = $portVersion + " +REQUIRES=" + haiku + " + +BUILD_REQUIRES=" + haiku_devel + " +BUILD_PREREQUIRES=" + cmd:gcc + " +PYTHON_PACKAGES=(python python3) +PYTHON_VERSIONS=(2.7 3.6) +for i in "${!PYTHON_PACKAGES[@]}"; do +pythonPackage=${PYTHON_PACKAGES[i]} +pythonVersion=${PYTHON_VERSIONS[$i]} +eval "PROVIDES_${pythonPackage}=\"\ + ${portName}_$pythonPackage = $portVersion\ + \"; \ +REQUIRES_$pythonPackage=\"\ + haiku\n\ + cmd:python$pythonVersion\n\ + zope_interface_$pythonPackage\n\ + \"" +BUILD_REQUIRES="$BUILD_REQUIRES + setuptools_$pythonPackage" +BUILD_PREREQUIRES="$BUILD_PREREQUIRES + cmd:python$pythonVersion" +done + +PROVIDES_python="$PROVIDES_python cmd:cftp cmd:ckeygen cmd:conch @@ -42,39 +73,48 @@ PROVIDES=" cmd:tap2rpm cmd:tkconch cmd:trial + cmd:twist cmd:twistd " -REQUIRES=" - haiku - python_zope.interface >= 3.6.0 - cmd:python2 +REPLACES_python=" + python_twisted " - -BUILD_REQUIRES=" - haiku_devel - python_setuptools - python_zope.interface >= 3.6.0 +PROVIDES_python3="$PROVIDES_python3 + cmd:cftp3 + cmd:ckeygen3 + cmd:conch3 + cmd:mailmail3 + cmd:manhole3 + cmd:pyhtmlizer3 + cmd:tap2deb3 + cmd:tap2rpm3 + cmd:tkconch3 + cmd:trial3 + cmd:twist3 + cmd:twistd3 " -BUILD_PREREQUIRES=" - cmd:python2 - cmd:gcc - " - -BUILD() -{ - $portPackageLinksDir/cmd~python2/bin/python2 setup.py build -} - INSTALL() { - # GENERIC: all python_setuptools-based installs need this - python=$portPackageLinksDir/cmd~python2/bin/python2 - pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3) - installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ - export PYTHONPATH=$installLocation:$PYTHONPATH - mkdir -p $installLocation + for i in "${!PYTHON_PACKAGES[@]}"; do + pythonPackage=${PYTHON_PACKAGES[i]} + pythonVersion=${PYTHON_VERSIONS[$i]} - $python setup.py install \ - --single-version-externally-managed \ - --root=/ --prefix=$prefix + python=python$pythonVersion + installLocation=$prefix/lib/$python/vendor-packages/ + export PYTHONPATH=$installLocation:$PYTHONPATH + mkdir -p $installLocation + rm -rf build + $python setup.py build install \ + --root=/ --prefix=$prefix + + if [ $pythonPackage != python ]; then + for f in $binDir/*; do + mv $f ${f}3 + done + fi + + packageEntries $pythonPackage \ + $prefix/lib/python* \ + $binDir + done } diff --git a/dev-python/urllib3/urllib3-1.15.1.recipe b/dev-python/urllib3/urllib3-1.20.recipe similarity index 51% rename from dev-python/urllib3/urllib3-1.15.1.recipe rename to dev-python/urllib3/urllib3-1.20.recipe index 79a0369eb..eb74b614b 100644 --- a/dev-python/urllib3/urllib3-1.15.1.recipe +++ b/dev-python/urllib3/urllib3-1.20.recipe @@ -19,42 +19,54 @@ COPYRIGHT="2008-2014 Andrey Petrov and contributors" LICENSE="MIT" REVISION="1" SOURCE_URI="https://github.com/shazow/urllib3/archive/$portVersion.tar.gz" -CHECKSUM_SHA256="2bc87c7b9af197657f407afe016e50eb209238832b82e80a7b4d10899bf8fea0" -SOURCE_DIR="urllib3-$portVersion" +CHECKSUM_SHA256="8232fd4c28f7463aaa20894a3fc9bbacb4992b9f6d90705a1a396690e93fc0a6" -ARCHITECTURES="x86 x86_gcc2 x86_64" +ARCHITECTURES="any" PROVIDES=" - urllib3 = $portVersion + $portName = $portVersion " REQUIRES=" haiku - cmd:python2 " BUILD_REQUIRES=" haiku_devel - python_setuptools - " -BUILD_PREREQUIRES=" - cmd:python2 - cmd:gcc " -BUILD() -{ - $portPackageLinksDir/cmd~python2/bin/python2 setup.py build -} +PYTHON_PACKAGES=(python python3) +PYTHON_VERSIONS=(2.7 3.6) +for i in "${!PYTHON_PACKAGES[@]}"; do +pythonPackage=${PYTHON_PACKAGES[i]} +pythonVersion=${PYTHON_VERSIONS[$i]} +eval "PROVIDES_${pythonPackage}=\"\ + ${portName}_$pythonPackage = $portVersion\ + \"; \ +REQUIRES_$pythonPackage=\"\ + haiku\n\ + cmd:python$pythonVersion\ + \"" +BUILD_REQUIRES="$BUILD_REQUIRES + setuptools_$pythonPackage" +BUILD_PREREQUIRES="$BUILD_PREREQUIRES + cmd:python$pythonVersion" +done INSTALL() { - # GENERIC: all python_setuptools-based installs need this - python=$portPackageLinksDir/cmd~python2/bin/python2 - pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3) - installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ - export PYTHONPATH=$installLocation:$PYTHONPATH - mkdir -p $installLocation + for i in "${!PYTHON_PACKAGES[@]}"; do + pythonPackage=${PYTHON_PACKAGES[i]} + pythonVersion=${PYTHON_VERSIONS[$i]} - $python setup.py install \ - --prefix=$prefix + python=python$pythonVersion + installLocation=$prefix/lib/$python/vendor-packages/ + export PYTHONPATH=$installLocation:$PYTHONPATH + mkdir -p $installLocation + rm -rf build + $python setup.py build install \ + --root=/ --prefix=$prefix + + packageEntries $pythonPackage \ + $prefix/lib/python* + done } diff --git a/dev-python/watchdog/python_watchdog-0.8.3.recipe b/dev-python/watchdog/python_watchdog-0.8.3.recipe deleted file mode 100644 index 7c010f138..000000000 --- a/dev-python/watchdog/python_watchdog-0.8.3.recipe +++ /dev/null @@ -1,52 +0,0 @@ -SUMMARY="Filesystem events monitoring" -DESCRIPTION="Python API and shell utilities to monitor file system events." -HOMEPAGE="https://pypi.python.org/pypi/watchdog" -COPYRIGHT="2011 Yesudeep Mangalapilly - 2012 Google, Inc." -LICENSE="Apache v2" -REVISION="1" -SOURCE_URI="https://pypi.python.org/packages/source/w/watchdog/watchdog-$portVersion.tar.gz" -CHECKSUM_SHA256="7e65882adb7746039b6f3876ee174952f8eaaa34491ba34333ddf1fe35de4162" -SOURCE_DIR="watchdog-$portVersion" - -ARCHITECTURES="x86 x86_gcc2 x86_64" - -PROVIDES=" - python_watchdog = $portVersion - cmd:watchmedo - " -REQUIRES=" - haiku - cmd:python2 - argh - pathtools - pyyaml - " - -BUILD_REQUIRES=" - haiku_devel - python_setuptools - " -BUILD_PREREQUIRES=" - cmd:python2 - cmd:gcc - " - -BUILD() -{ - $portPackageLinksDir/cmd~python2/bin/python2 setup.py build -} - -INSTALL() -{ - # GENERIC: all python_setuptools-based installs need this - python=$portPackageLinksDir/cmd~python2/bin/python2 - pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3) - installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ - export PYTHONPATH=$installLocation:$PYTHONPATH - mkdir -p $installLocation - - $python setup.py install \ - --single-version-externally-managed \ - --root=/ --prefix=$prefix -} diff --git a/dev-python/watchdog/watchdog-0.8.3.recipe b/dev-python/watchdog/watchdog-0.8.3.recipe new file mode 100644 index 000000000..a049de8f4 --- /dev/null +++ b/dev-python/watchdog/watchdog-0.8.3.recipe @@ -0,0 +1,77 @@ +SUMMARY="Filesystem events monitoring" +DESCRIPTION="Python API and shell utilities to monitor file system events." +HOMEPAGE="https://pypi.python.org/pypi/watchdog" +COPYRIGHT="2011 Yesudeep Mangalapilly + 2012 Google, Inc." +LICENSE="Apache v2" +REVISION="1" +SOURCE_URI="https://pypi.python.org/packages/source/w/watchdog/watchdog-$portVersion.tar.gz" +CHECKSUM_SHA256="7e65882adb7746039b6f3876ee174952f8eaaa34491ba34333ddf1fe35de4162" + +ARCHITECTURES="any" + +PROVIDES=" + $portName = $portVersion + " +REQUIRES=" + haiku + " + +BUILD_REQUIRES=" + haiku_devel + " +BUILD_PREREQUIRES=" + cmd:gcc + " + +PYTHON_PACKAGES=(python python3) +PYTHON_VERSIONS=(2.7 3.6) +for i in "${!PYTHON_PACKAGES[@]}"; do +pythonPackage=${PYTHON_PACKAGES[i]} +pythonVersion=${PYTHON_VERSIONS[$i]} +eval "PROVIDES_${pythonPackage}=\"\ + ${portName}_$pythonPackage = $portVersion\ + \"; \ +REQUIRES_$pythonPackage=\"\ + haiku\n\ + cmd:python$pythonVersion\n\ + argh_$pythonPackage\n\ + pathtools_$pythonPackage\n\ + pyyaml_$pythonPackage\n\ + \"" +BUILD_REQUIRES="$BUILD_REQUIRES + setuptools_$pythonPackage" +BUILD_PREREQUIRES="$BUILD_PREREQUIRES + cmd:python$pythonVersion" +done + +PROVIDES_python="$PROVIDES_python + cmd:watchmedo = $portVersion + " +PROVIDES_python3="$PROVIDES_python3 + cmd:watchmedo3 = $portVersion + " +INSTALL() +{ + for i in "${!PYTHON_PACKAGES[@]}"; do + pythonPackage=${PYTHON_PACKAGES[i]} + pythonVersion=${PYTHON_VERSIONS[$i]} + + # GENERIC: all python_setuptools-based installs need this + python=python$pythonVersion + pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3) + installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ + export PYTHONPATH=$installLocation:$PYTHONPATH + mkdir -p $installLocation + rm -rf build + $python setup.py build install \ + --root=/ --prefix=$prefix + + if [ $pythonPackage != python ]; then + mv $binDir/watchmedo $binDir/watchmedo3 + fi + packageEntries $pythonPackage \ + $prefix/lib/python* \ + $binDir + done +} diff --git a/dev-python/zope.interface/licenses/ZPL 2.1 b/dev-python/zope-interface/licenses/ZPL 2.1 similarity index 100% rename from dev-python/zope.interface/licenses/ZPL 2.1 rename to dev-python/zope-interface/licenses/ZPL 2.1 diff --git a/dev-python/zope-interface/zope_interface-4.3.3.recipe b/dev-python/zope-interface/zope_interface-4.3.3.recipe new file mode 100644 index 000000000..49be69e36 --- /dev/null +++ b/dev-python/zope-interface/zope_interface-4.3.3.recipe @@ -0,0 +1,73 @@ +SUMMARY="Interfaces for Python" +DESCRIPTION=" +This package provides an implementation of 'object interfaces' for Python. \ +Interfaces are a mechanism for labeling objects as conforming to a given \ +API or contract. So, this package can be considered as implementation of the \ +Design By Contract methodology support in Python. + +For detailed documentation, please see http://docs.zope.org/zope.interface" +HOMEPAGE="http://pypi.python.org/pypi/zope.interface" +COPYRIGHT="2004-2014 Zope Foundation and Contributors" +LICENSE="ZPL 2.1" +REVISION="1" +SOURCE_URI="https://pypi.io/packages/source/z/zope.interface/zope.interface-$portVersion.tar.gz" +CHECKSUM_SHA256="8780ef68ca8c3fe1abb30c058a59015129d6e04a6b02c2e56b9c7de6078dfa88" +SOURCE_DIR="zope.interface-$portVersion" + +ARCHITECTURES="x86 x86_gcc2 x86_64" + +PROVIDES=" + $portName = $portVersion + " +REQUIRES=" + haiku + " + +BUILD_REQUIRES=" + haiku_devel + " +BUILD_PREREQUIRES=" + cmd:gcc + " +PYTHON_PACKAGES=(python python3) +PYTHON_VERSIONS=(2.7 3.6) +for i in "${!PYTHON_PACKAGES[@]}"; do +pythonPackage=${PYTHON_PACKAGES[i]} +pythonVersion=${PYTHON_VERSIONS[$i]} +eval "PROVIDES_${pythonPackage}=\"\ + ${portName}_$pythonPackage = $portVersion\ + \"; \ +REQUIRES_$pythonPackage=\"\ + haiku\n\ + cmd:python$pythonVersion\ + \"" +BUILD_REQUIRES="$BUILD_REQUIRES + setuptools_$pythonPackage" +BUILD_PREREQUIRES="$BUILD_PREREQUIRES + cmd:python$pythonVersion" +done + +REPLACES_python=" + python_zope.interface + " + +INSTALL() +{ + for i in "${!PYTHON_PACKAGES[@]}"; do + pythonPackage=${PYTHON_PACKAGES[i]} + pythonVersion=${PYTHON_VERSIONS[$i]} + + # GENERIC: all python_setuptools-based installs need this + python=python$pythonVersion + pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3) + installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ + export PYTHONPATH=$installLocation:$PYTHONPATH + mkdir -p $installLocation + rm -rf build + $python setup.py build install \ + --root=/ --prefix=$prefix + + packageEntries $pythonPackage \ + $prefix/lib/python* + done +} diff --git a/dev-python/zope.interface/python_zope.interface-4.1.3.recipe b/dev-python/zope.interface/python_zope.interface-4.1.3.recipe deleted file mode 100644 index 6379c0aa5..000000000 --- a/dev-python/zope.interface/python_zope.interface-4.1.3.recipe +++ /dev/null @@ -1,42 +0,0 @@ -SUMMARY="Interfaces for Python" -DESCRIPTION=" -This package provides an implementation of 'object interfaces' for Python. \ -Interfaces are a mechanism for labeling objects as conforming to a given \ -API or contract. So, this package can be considered as implementation of the \ -Design By Contract methodology support in Python. - -For detailed documentation, please see http://docs.zope.org/zope.interface" -HOMEPAGE="http://pypi.python.org/pypi/zope.interface" -COPYRIGHT="2004-2014 Zope Foundation and Contributors" -LICENSE="ZPL 2.1" -REVISION="1" -SOURCE_URI="https://pypi.python.org/packages/source/z/zope.interface/zope.interface-$portVersion.tar.gz" -CHECKSUM_SHA256="2e221a9eec7ccc58889a278ea13dcfed5ef939d80b07819a9a8b3cb1c681484f" -SOURCE_DIR="zope.interface-$portVersion" - -ARCHITECTURES="x86 x86_gcc2 x86_64" - -PROVIDES=" - python_zope.interface = $portVersion - " -REQUIRES=" - haiku - cmd:python2 - " - -BUILD_REQUIRES="" -BUILD_PREREQUIRES=" - haiku_devel - cmd:python2 - " - -BUILD() -{ - $portPackageLinksDir/cmd~python2/bin/python2 setup.py build -} - -INSTALL() -{ - $portPackageLinksDir/cmd~python2/bin/python2 setup.py install \ - --prefix=$prefix -} diff --git a/dev-util/buildbot_slave/buildbot_slave-0.8.12.recipe b/dev-util/buildbot_slave/buildbot_slave-0.8.12.recipe index f0c23f41b..32bf1e1b2 100644 --- a/dev-util/buildbot_slave/buildbot_slave-0.8.12.recipe +++ b/dev-util/buildbot_slave/buildbot_slave-0.8.12.recipe @@ -38,7 +38,7 @@ PROVIDES=" REQUIRES=" haiku cmd:python2 - python_twisted + twisted_python " BUILD_REQUIRES=" diff --git a/dev-util/buildbot_slave/buildbot_slave-0.9.5.recipe b/dev-util/buildbot_slave/buildbot_slave-0.9.5.recipe new file mode 100644 index 000000000..93156970e --- /dev/null +++ b/dev-util/buildbot_slave/buildbot_slave-0.9.5.recipe @@ -0,0 +1,60 @@ +SUMMARY="Python-based continuous integration testing framework" +DESCRIPTION="Buildbot is a continuous integration system designed to automate \ +the build/test cycle. By automatically rebuilding and testing the tree each \ +time something has changed, build problems are pinpointed quickly, before \ +other developers are inconvenienced by the failure. +The main features are: + +- Buildbot is easy to set up, but very extensible and customizable. It \ +supports arbitrary build processes, and is not limited to common build \ +processes for particular languages (e.g., autotools or ant) +- Buildbot supports building and testing on a variety of platforms. \ +Developers, who do not have the facilities to test their changes everywhere \ +before committing, will know shortly afterwards whether they have broken the \ +build or not. +- Buildbot has minimal requirements for slaves: using virtualenv, only a \ +Python installation is required. +- Slaves can be run behind a NAT firewall and communicate with the master. +- Buildbot has a variety of status-reporting tools to get information about \ +builds in front of developers in a timely manner. + +This package contains the slave implementation, i.e. the part that is \ +executing builds and/or tests." +HOMEPAGE="http://www.buildbot.net" +COPYRIGHT="2005-2013 Bryan Warner and the Buildbot team members" +LICENSE="GNU GPL v2" +REVISION="1" +SOURCE_URI="https://pypi.python.org/packages/a4/bc/ea8d3115fca39cfd7492f0d3da1dffde659fc11072f07152247c8d903df6/buildbot-worker-$portVersion.tar.gz" +CHECKSUM_SHA256="be89dbbd64ac4d10c8b43ea0fd8378803170247493c8ae023a4e8732aa9287aa" +SOURCE_DIR="buildbot-worker-$portVersion" +PATCHES="buildbot_slave-$portVersion.patchset" + +ARCHITECTURES="any" + +PROVIDES=" + buildbot_slave = $portVersion + cmd:buildslave = $portVersion + " +REQUIRES=" + haiku + cmd:python2 + twisted_python + " + +BUILD_REQUIRES=" + haiku_devel + " +BUILD_PREREQUIRES=" + cmd:python2 + " + +BUILD() +{ + $portPackageLinksDir/cmd~python2/bin/python2 setup.py build +} + +INSTALL() +{ + $portPackageLinksDir/cmd~python2/bin/python2 setup.py install \ + --prefix=$prefix +} diff --git a/dev-util/buildbot_slave/patches/buildbot_slave-0.9.5.patchset b/dev-util/buildbot_slave/patches/buildbot_slave-0.9.5.patchset new file mode 100644 index 000000000..624dd80c4 --- /dev/null +++ b/dev-util/buildbot_slave/patches/buildbot_slave-0.9.5.patchset @@ -0,0 +1,22 @@ +From 98719cec51efeaa02526088d328f8cf24b641ac4 Mon Sep 17 00:00:00 2001 +From: Jessica Hamilton +Date: Fri, 20 Jun 2014 04:58:54 +0000 +Subject: logwatcher.py: fix path to tail on Haiku + + +diff --git a/buildbot_worker/scripts/logwatcher.py b/buildbot_worker/scripts/logwatcher.py +index d750358..7df3061 100644 +--- a/buildbot_worker/scripts/logwatcher.py ++++ b/buildbot_worker/scripts/logwatcher.py +@@ -73,7 +73,7 @@ class LogWatcher(LineOnlyReceiver): + if platform.system().lower() == 'sunos' and os.path.exists('/usr/xpg4/bin/tail'): + tailBin = "/usr/xpg4/bin/tail" + else: +- tailBin = "/usr/bin/tail" ++ tailBin = "/bin/tail" + self.p = reactor.spawnProcess(self.pp, tailBin, + ("tail", "-f", "-n", "0", self.logfile), + env=os.environ, +-- +2.11.0 + diff --git a/dev-util/gyp/gyp-git.recipe b/dev-util/gyp/gyp-git.recipe index 9a7786353..379724fd0 100644 --- a/dev-util/gyp/gyp-git.recipe +++ b/dev-util/gyp/gyp-git.recipe @@ -4,7 +4,7 @@ DESCRIPTION="GYP is created by Google to generate native IDE project files \ HOMEPAGE="https://gyp.gsrc.io/" COPYRIGHT="2012 Google Inc." LICENSE="BSD (2-clause)" -REVISION="2" +REVISION="3" # Note that the hash which FreeBSD keeps for this version is not the same as # the commit ID in the official gyp repository. This revision in the FreeBSD # mirror is equivalent to commit 02b145a1 in the official repository, which @@ -24,12 +24,12 @@ PROVIDES=" REQUIRES=" haiku cmd:python - python_setuptools + setuptools_python " BUILD_REQUIRES=" haiku_devel - python_setuptools + setuptools_python " BUILD_PREREQUIRES=" cmd:python diff --git a/dev-util/meson/meson-0.39.1.recipe b/dev-util/meson/meson-0.39.1.recipe index b6f9b7cdc..e1e591135 100644 --- a/dev-util/meson/meson-0.39.1.recipe +++ b/dev-util/meson/meson-0.39.1.recipe @@ -28,7 +28,7 @@ REQUIRES=" BUILD_REQUIRES=" haiku_devel - python3_setuptools + setuptools_python3 " BUILD_PREREQUIRES=" cmd:python$PYTHON_VERSION diff --git a/haiku-apps/orphilia_dropbox/orphilia_dropbox-1.recipe b/haiku-apps/orphilia_dropbox/orphilia_dropbox-1.recipe index fd8d378e5..62c63db8e 100644 --- a/haiku-apps/orphilia_dropbox/orphilia_dropbox-1.recipe +++ b/haiku-apps/orphilia_dropbox/orphilia_dropbox-1.recipe @@ -8,7 +8,7 @@ code and is not required for installation." HOMEPAGE="https://github.com/ksiazkowicz/orphilia-dropbox" COPYRIGHT="2011-2014 Maciej Janiszewski" LICENSE="MIT" -REVISION="1" +REVISION="2" SOURCE_URI="git+https://github.com/ksiazkowicz/orphilia-dropbox.git#f692f26793a48e2742f12c20767f0f22a9ff39af" ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" @@ -31,13 +31,13 @@ BUILD_PREREQUIRES=" BUILD_REQUIRES=" haiku_devel - python_setuptools + setuptools_python " REQUIRES=" - pathtools - python_setuptools - urllib3 - watchdog + pathtools_python + setuptools_python + urllib3_python + watchdog_python cmd:python " diff --git a/media-video/openshot/openshot-2.0.7.recipe b/media-video/openshot/openshot-2.0.7.recipe index d64b6a8e2..abfb7ccd8 100644 --- a/media-video/openshot/openshot-2.0.7.recipe +++ b/media-video/openshot/openshot-2.0.7.recipe @@ -6,7 +6,7 @@ you create the film you always dreamed of. Easily add sub-titles, transitions,\ HOMEPAGE="http://www.openshot.org" COPYRIGHT="2008-2016 OpenShot Studios, LLC" LICENSE="GNU GPL v3" -REVISION="3" +REVISION="4" SOURCE_URI="https://github.com/OpenShot/openshot-qt/archive/v$portVersion.tar.gz" SOURCE_FILENAME="openshot-$portVersion.tar.gz" CHECKSUM_SHA256="4c231493f6ce52a64929c3253961f7769c90652cb5a3e4979158e5e032afe433" @@ -23,9 +23,9 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix lib:libopenshot$secondaryArchSuffix - python3_httplib2 + httplib2_python3 pyqt_python3 >= 5 - python3_setuptools + setuptools_python3 cmd:python$PYTHON_VERSION " @@ -33,7 +33,7 @@ BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libopenshot$secondaryArchSuffix pyqt_python3 >= 5 - python3_setuptools + setuptools_python3 " BUILD_PREREQUIRES=" cmd:python$PYTHON_VERSION diff --git a/sys-libs/mesa/mesa-10.5.2.recipe b/sys-libs/mesa/mesa-10.5.2.recipe index fb0cafd94..dd7a776e9 100644 --- a/sys-libs/mesa/mesa-10.5.2.recipe +++ b/sys-libs/mesa/mesa-10.5.2.recipe @@ -36,7 +36,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" llvm${secondaryArchSuffix} - python_mako + mako_python cmd:bison cmd:find cmd:flex diff --git a/sys-libs/mesa/mesa-11.0.1.recipe b/sys-libs/mesa/mesa-11.0.1.recipe index 35159f3f7..414fe820d 100644 --- a/sys-libs/mesa/mesa-11.0.1.recipe +++ b/sys-libs/mesa/mesa-11.0.1.recipe @@ -39,7 +39,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" llvm${secondaryArchSuffix} - python_mako + mako_python cmd:bison cmd:find cmd:flex diff --git a/sys-libs/mesa/mesa-11.2.2.recipe b/sys-libs/mesa/mesa-11.2.2.recipe index 47c654f8a..a374e920c 100644 --- a/sys-libs/mesa/mesa-11.2.2.recipe +++ b/sys-libs/mesa/mesa-11.2.2.recipe @@ -39,7 +39,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" llvm${secondaryArchSuffix} - python_mako + mako_python cmd:bison cmd:find cmd:flex diff --git a/sys-libs/mesa/mesa-12.0.4.recipe b/sys-libs/mesa/mesa-12.0.4.recipe index 58b87050c..3b4c3b797 100644 --- a/sys-libs/mesa/mesa-12.0.4.recipe +++ b/sys-libs/mesa/mesa-12.0.4.recipe @@ -39,7 +39,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" llvm${secondaryArchSuffix} - python_mako + mako_python cmd:bison cmd:find cmd:flex diff --git a/sys-libs/mesa/mesa-13.0.4.recipe b/sys-libs/mesa/mesa-13.0.4.recipe index b2c4e20c3..19f6b8551 100644 --- a/sys-libs/mesa/mesa-13.0.4.recipe +++ b/sys-libs/mesa/mesa-13.0.4.recipe @@ -39,7 +39,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" llvm${secondaryArchSuffix} - python_mako + mako_python cmd:bison cmd:find cmd:flex diff --git a/sys-libs/mesa/mesa-17.0.3.recipe b/sys-libs/mesa/mesa-17.0.3.recipe index 5a876a00a..5b58b24cf 100644 --- a/sys-libs/mesa/mesa-17.0.3.recipe +++ b/sys-libs/mesa/mesa-17.0.3.recipe @@ -39,7 +39,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" llvm${secondaryArchSuffix} - python_mako + mako_python cmd:bison cmd:find cmd:flex