diff options
25 files changed, 408 insertions, 1665 deletions
diff --git a/dev-python/repoze-sphinx-autointerface/repoze-sphinx-autointerface-0.7.1-r1.ebuild b/dev-python/repoze-sphinx-autointerface/repoze-sphinx-autointerface-0.7.1-r1.ebuild index 0c7a3a58dc56..430969814984 100644 --- a/dev-python/repoze-sphinx-autointerface/repoze-sphinx-autointerface-0.7.1-r1.ebuild +++ b/dev-python/repoze-sphinx-autointerface/repoze-sphinx-autointerface-0.7.1-r1.ebuild @@ -33,7 +33,7 @@ python_install() { distutils-r1_python_install # install the namespace (it's the only subpackage) - python_moduleinto repoze/sphinx + python_moduleinto repoze.sphinx python_domodule repoze/sphinx/__init__.py } diff --git a/dev-python/repoze-who/repoze-who-2.2-r1.ebuild b/dev-python/repoze-who/repoze-who-2.2-r1.ebuild index f2f3ac568592..fb3636b8fe99 100644 --- a/dev-python/repoze-who/repoze-who-2.2-r1.ebuild +++ b/dev-python/repoze-who/repoze-who-2.2-r1.ebuild @@ -33,10 +33,10 @@ python_install() { distutils-r1_python_install # install __init__.py files for sub-namespaces - python_moduleinto repoze/who + python_moduleinto repoze.who python_domodule repoze/who/__init__.py - python_moduleinto repoze/who/plugins + python_moduleinto repoze.who.plugins python_domodule repoze/who/plugins/__init__.py } diff --git a/dev-util/android-ndk/Manifest b/dev-util/android-ndk/Manifest index 413efcc05b7f..4560b61c42b4 100644 --- a/dev-util/android-ndk/Manifest +++ b/dev-util/android-ndk/Manifest @@ -4,10 +4,7 @@ DIST android-ndk-10e-amd64.7z 401522849 SHA256 102d6723f67ff1384330d12c45854315d DIST android-ndk-10e-x86.7z 394281908 SHA256 92b07d25aaad9b341a7f2b2a62402d508e948bf2dea3ee7b65a6aeb18bca7df5 SHA512 fdce2537c4f9bca980948961448ec746bca0626b92c1edf0db46df34819b6ea2f6acb4f0921c3ff8da8e20dd6b414749c6cb3b973d7d1cdecccb4b8f4f2e0679 WHIRLPOOL 40205439cf16b3bf374aaaa9930bab96e8b3dba8b2de07fb920564e78c62017c2f7693cc1880b8e6da2542a20af8822d1851ee8a3097d325074efb3a89ac1579 DIST android-ndk-r11c-linux-x86_64.zip 794135138 SHA256 ba85dbe4d370e4de567222f73a3e034d85fc3011b3cbd90697f3e8dcace3ad94 SHA512 c0de562061c9f08bcd1ae05b1de26898788e71cc7dc40502348214edd5a90f1bf8125721e587b341f6fe774fc79b1a6e28b3f702f3275e016baa0382fcea2767 WHIRLPOOL 7d8ef18e7644e28c4ac1aa5a49f7d6487181aacc348ff09cc5ac8fc4ca15e06f38924d2425a24b840ed6c9c589587415b630aedace02e1d3df6a4c222fbcaafc DIST android-ndk-r13b-linux-x86_64.zip 687311866 SHA256 3524d7f8fca6dc0d8e7073a7ab7f76888780a22841a6641927123146c3ffd29c SHA512 39f3bd2d0e1daca11870df2e2ef318ad070b19163a55e2c1c4a1a871e02f8ec51263d7cf4b6da54eaadbe4253b5c11b85f4c5aeb67fccfff9147a5c420589d12 WHIRLPOOL 53230a1d15f4eaff5955fec69cd88f8e9fec56e362f22cf0b0b2a992b64525f63ae696fbd9614e3f11aa7141c49ee2a800db5c4acff503c0ba3511bf6a3f18bf -DIST android-ndk-r8b-linux-x86.tar.bz2 160466240 SHA256 4309c6e8f6bc48bfda7a4b339dc792e926f18ed765bedda7727bb6778937dad0 SHA512 a7a4bb00a16a473cec33c185f21b386d72a4d1dc1294f86bfeff95de70c45e0a9b357ac53d482a3b0e8dfc527de9d561e2b121c199c9149662bd4f05e6bef1b2 WHIRLPOOL c799cc7cc06baafb67b4630debebf458513d203998e1fae1b9395daaa8d5998e71468c3a0e43cacb1ec959ae854a016c4407129ed86c3d5a2fd0e3162bc1c395 -DIST android-ndk-r8c-linux-x86.tar.bz2 179945337 SHA256 1d3c463bb33e1c429771745e7e287321f9ebecc8eb30d0e514396508887b9ba4 SHA512 317d6786a33bc94ef9bf983c7836284e74442521a7f1aaa653f1b1c3d2d6428633fb410ac219b90f21ee6a89493a006eebb77fd7ae00889d1e4c5408162bbb89 WHIRLPOOL d30902cfd65a6402bdae28a332f6ef8ba9f94a30eebc8e39ccea3d7e01ab82eeb95c787bfd13d78fd043e0e37bf5d5b66b61bfd4f23781aa4b1a605f23fd1f23 -DIST android-ndk-r8d-linux-x86.tar.bz2 254644383 SHA256 29b9e1cc0aade159f1b2e0ebf7f53dfbe3e4e43f96387f43f28b1cfce5c707e5 SHA512 76fba8f76325338a29df24c071ab838cde4457de302b91f9c461913b1e26a14aae11c41fbfbb98071c698ffe949d0909ed20a43bc5072141e3c075ce3252480f WHIRLPOOL 206906094bcd84b0a502e28ceda2593add269ced8724e5873951c6094b1fb8c7d3a90704119c140687725ee97f7b216fc506e1a592b1d69b86177b515f561082 -DIST android-ndk-r8e-linux-x86.tar.bz2 461526099 SHA256 c2c4e0c8b3037149a0f5dbb08d72f814a52af4da9fff9d80328c675457e95a98 SHA512 c8f897441d803960f4dbc18b9c99688a952a5175ff5b3c332a8ca25e5612a7d4c931f354cfbb7efd0f9497ada53124f792bb839d07594218187d4a19a0bce5dd WHIRLPOOL 36c9f4d63ef2e29c089deec1229d297c3f462ca376360237c7df75ad6fb649f73e3d664466a423f6768b0dcb7fe3e2f301c5662fcc2590da90bb6bb1b772d467 +DIST android-ndk-r14b-linux-x86_64.zip 840626594 SHA256 0ecc2017802924cf81fffc0f51d342e3e69de6343da892ac9fa1cd79bc106024 SHA512 24435267fc5acae559aa5159f7c895ce5ea0cbb8ef966bb8ff0dadffcadccbe46bc3880d285bf4e411ef78632cf2f862408e7b2b41ebca51078b41eac66a301a WHIRLPOOL 066469686fac5fd48dc0d44c79276b174fed2ea751fd2f9d2b42a39bb60110703c527a43a74ef0a943898776855f61b13f4ecd2140876986601b9a14977736a4 DIST android-ndk-r9-linux-x86-legacy-toolchains.tar.bz2 241172797 SHA256 26b94f0a5d686b4892cb22b06094751efded0958baed380b2ccce56517fd830b SHA512 4c8f1c9c6dfe264f227959124dc19f9fc9596c166076b8ec82b37f033101285ccd5832962e233d2605869308b2367280665a1f53f4693cb753434b480c49af25 WHIRLPOOL 60fa7d65c34850ae8b247cca067e2ff41c34986fd87fe8752d6da5b866f4967946eab6f4192701554532c688e075cd2b6f3231ba84698de6216bff33b12024c0 DIST android-ndk-r9-linux-x86.tar.bz2 419862465 SHA256 30f3da01e4d8d3415777b5d88a0b70fac5a4620807fd28110f9bc4c8093f6b6e SHA512 9c2da6b52df00ff6177ac18314f7c7abef585d2297362d426a9b0a28c8319531d684c1515971066050181178ab205210a7f25ec1de9be843fd0da7c1e897747e WHIRLPOOL 0cdf68e15cac621c686dbc6c6f5fd40e164ee043030a861a1f0484ae6abc8a73c521130c6ec8e6fe6f1beba5b87256634134efcfdc6b0ebf4cda83dbc78db88e DIST android-ndk-r9-linux-x86_64-legacy-toolchains.tar.bz2 244427866 SHA256 087fbca38a1a2c1a309de272d22e84bbc1c3e2254211761180572fde75faab27 SHA512 dde193474b46ac2ceb69f5ad3ba106eb840daf18470538d85e147b17dff8b1b1b848d499727e28bb8e76bdd16dd4bb99dc073c06f80949080551ae0437f08eed WHIRLPOOL e821828e0ceb8f977dabae8ef92f0b763158ad8d9a7709c6bf051f80db1a7e699ec5c6b5801c08b77e9e7cfc97053497272445ec46d671c1cbdffc0999dc4009 diff --git a/dev-util/android-ndk/android-ndk-14b.ebuild b/dev-util/android-ndk/android-ndk-14b.ebuild new file mode 100644 index 000000000000..5f92e3300036 --- /dev/null +++ b/dev-util/android-ndk/android-ndk-14b.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +CHECKREQS_DISK_BUILD="6G" +inherit check-reqs + +DESCRIPTION="Open Handset Alliance's Android NDK (Native Dev Kit)" +HOMEPAGE="http://developer.android.com/sdk/ndk/" +SRC_URI="https://dl.google.com/android/repository/${PN}-r${PV}-linux-x86_64.zip" + +LICENSE="android" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" +RESTRICT="mirror strip installsources test" + +DEPEND="app-arch/p7zip" +RDEPEND=">=dev-util/android-sdk-update-manager-10 + >=sys-devel/make-3.81 + || ( + sys-libs/ncurses:0/5[tinfo] + sys-libs/ncurses:5/5[tinfo] + )" + +S="${WORKDIR}/${PN}-r${PV}" + +ANDROID_NDK_DIR="opt/${PN}" + +QA_PREBUILT="*" +PYTHON_UPDATER_IGNORE="1" + +pkg_pretend() { + check-reqs_pkg_pretend +} + +pkg_setup() { + check-reqs_pkg_setup +} + +src_configure() { + : +} + +src_compile() { + : +} + +src_install() { + dodir "/${ANDROID_NDK_DIR}" + cp -pPR * "${ED}/${ANDROID_NDK_DIR}" || die + + dodir "/${ANDROID_NDK_DIR}/out" + fowners -R root:android "/${ANDROID_NDK_DIR}" + fperms 0775 "/${ANDROID_NDK_DIR}/"{,build,platforms,prebuilt} + fperms 0775 "/${ANDROID_NDK_DIR}/"{python-packages,sources,toolchains} + fperms 3775 "/${ANDROID_NDK_DIR}/out" + + ANDROID_PREFIX="${EPREFIX}/${ANDROID_NDK_DIR}" + ANDROID_PATH="${EPREFIX}/${ANDROID_NDK_DIR}" + + for i in toolchains/*/prebuilt/linux-*/bin + do + ANDROID_PATH="${ANDROID_PATH}:${ANDROID_PREFIX}/${i}" + done + + echo "PATH=\"${ANDROID_PATH}\"" > "${T}/80${PN}" || die + doenvd "${T}/80${PN}" + + echo "SEARCH_DIRS_MASK=\"${EPREFIX}/${ANDROID_NDK_DIR}\"" > "${T}/80${PN}" || die + insinto "/etc/revdep-rebuild" + doins "${T}/80${PN}" +} diff --git a/dev-util/android-ndk/android-ndk-8b.ebuild b/dev-util/android-ndk/android-ndk-8b.ebuild deleted file mode 100644 index 4c8c21c97541..000000000000 --- a/dev-util/android-ndk/android-ndk-8b.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=3 - -MY_P="${PN}-r${PV}" - -DESCRIPTION="Open Handset Alliance's Android NDK (Native Dev Kit)" -HOMEPAGE="http://developer.android.com/sdk/ndk/" -SRC_URI="https://dl.google.com/android/ndk/${MY_P}-linux-x86.tar.bz2" - -LICENSE="android" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" -RESTRICT="mirror strip installsources test" - -DEPEND="" -RDEPEND=">=dev-util/android-sdk-update-manager-10 - >=sys-devel/make-3.81" - -S="${WORKDIR}/${MY_P}" - -ANDROID_NDK_DIR="opt/${PN}" - -ANDROID_TC_ARM_ANDROID_4_4="${ANDROID_NDK_DIR}/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86" -ANDROID_TC_ARM_ANDROID_4_6="${ANDROID_NDK_DIR}/toolchains/arm-linux-androideabi-4.6/prebuilt/linux-x86" -ANDROID_TC_MIPS_ANDROID_4_4="${ANDROID_NDK_DIR}/toolchains/mipsel-linux-android-4.4.3/prebuilt/linux-x86" -ANDROID_TC_MIPS_ANDROID_4_6="${ANDROID_NDK_DIR}/toolchains/mipsel-linux-android-4.6/prebuilt/linux-x86" -ANDROID_TC_X86_ANDROID_4_4="${ANDROID_NDK_DIR}/toolchains/x86-4.4.3/prebuilt/linux-x86" -ANDROID_TC_X86_ANDROID_4_6="${ANDROID_NDK_DIR}/toolchains/x86-4.6/prebuilt/linux-x86" - -QA_PREBUILT="*" -PYTHON_UPDATER_IGNORE="1" - -src_configure() { - : -} - -src_compile() { - : -} - -src_install() { - dodir "/${ANDROID_NDK_DIR}" - cp -pPR * "${ED}/${ANDROID_NDK_DIR}" - - fowners -R root:android "/${ANDROID_NDK_DIR}" - fperms 0775 "/${ANDROID_NDK_DIR}/"{,build,docs,platforms,samples} - fperms 0775 "/${ANDROID_NDK_DIR}/"{sources,tests,toolchains} - - dodir "/${ANDROID_NDK_DIR}/out" - fowners root:android "/${ANDROID_NDK_DIR}/out" - fperms 3775 "/${ANDROID_NDK_DIR}/out" - - printf '%s' \ - "PATH=\"${EPREFIX}/${ANDROID_NDK_DIR}:" \ - "${EPREFIX}/${ANDROID_TC_ARM_ANDROID_4_4}/bin/:" \ - "${EPREFIX}/${ANDROID_TC_ARM_ANDROID_4_6}/bin/:" \ - "${EPREFIX}/${ANDROID_TC_MIPS_ANDROID_4_4}/bin/:" \ - "${EPREFIX}/${ANDROID_TC_MIPS_ANDROID_4_6}/bin/:" \ - "${EPREFIX}/${ANDROID_TC_X86_ANDROID_4_4}/bin/:" \ - "${EPREFIX}/${ANDROID_TC_X86_ANDROID_4_6}/bin/\"" \ - $'\n' \ - > "${T}/80${PN}" || die - - doenvd "${T}/80${PN}" || die - - echo "SEARCH_DIRS_MASK=\"${EPREFIX}/${ANDROID_NDK_DIR}\"" \ - > "${T}/80${PN}" || die - insinto "/etc/revdep-rebuild" - doins "${T}/80${PN}" -} diff --git a/dev-util/android-ndk/android-ndk-8c.ebuild b/dev-util/android-ndk/android-ndk-8c.ebuild deleted file mode 100644 index 4c8c21c97541..000000000000 --- a/dev-util/android-ndk/android-ndk-8c.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=3 - -MY_P="${PN}-r${PV}" - -DESCRIPTION="Open Handset Alliance's Android NDK (Native Dev Kit)" -HOMEPAGE="http://developer.android.com/sdk/ndk/" -SRC_URI="https://dl.google.com/android/ndk/${MY_P}-linux-x86.tar.bz2" - -LICENSE="android" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" -RESTRICT="mirror strip installsources test" - -DEPEND="" -RDEPEND=">=dev-util/android-sdk-update-manager-10 - >=sys-devel/make-3.81" - -S="${WORKDIR}/${MY_P}" - -ANDROID_NDK_DIR="opt/${PN}" - -ANDROID_TC_ARM_ANDROID_4_4="${ANDROID_NDK_DIR}/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86" -ANDROID_TC_ARM_ANDROID_4_6="${ANDROID_NDK_DIR}/toolchains/arm-linux-androideabi-4.6/prebuilt/linux-x86" -ANDROID_TC_MIPS_ANDROID_4_4="${ANDROID_NDK_DIR}/toolchains/mipsel-linux-android-4.4.3/prebuilt/linux-x86" -ANDROID_TC_MIPS_ANDROID_4_6="${ANDROID_NDK_DIR}/toolchains/mipsel-linux-android-4.6/prebuilt/linux-x86" -ANDROID_TC_X86_ANDROID_4_4="${ANDROID_NDK_DIR}/toolchains/x86-4.4.3/prebuilt/linux-x86" -ANDROID_TC_X86_ANDROID_4_6="${ANDROID_NDK_DIR}/toolchains/x86-4.6/prebuilt/linux-x86" - -QA_PREBUILT="*" -PYTHON_UPDATER_IGNORE="1" - -src_configure() { - : -} - -src_compile() { - : -} - -src_install() { - dodir "/${ANDROID_NDK_DIR}" - cp -pPR * "${ED}/${ANDROID_NDK_DIR}" - - fowners -R root:android "/${ANDROID_NDK_DIR}" - fperms 0775 "/${ANDROID_NDK_DIR}/"{,build,docs,platforms,samples} - fperms 0775 "/${ANDROID_NDK_DIR}/"{sources,tests,toolchains} - - dodir "/${ANDROID_NDK_DIR}/out" - fowners root:android "/${ANDROID_NDK_DIR}/out" - fperms 3775 "/${ANDROID_NDK_DIR}/out" - - printf '%s' \ - "PATH=\"${EPREFIX}/${ANDROID_NDK_DIR}:" \ - "${EPREFIX}/${ANDROID_TC_ARM_ANDROID_4_4}/bin/:" \ - "${EPREFIX}/${ANDROID_TC_ARM_ANDROID_4_6}/bin/:" \ - "${EPREFIX}/${ANDROID_TC_MIPS_ANDROID_4_4}/bin/:" \ - "${EPREFIX}/${ANDROID_TC_MIPS_ANDROID_4_6}/bin/:" \ - "${EPREFIX}/${ANDROID_TC_X86_ANDROID_4_4}/bin/:" \ - "${EPREFIX}/${ANDROID_TC_X86_ANDROID_4_6}/bin/\"" \ - $'\n' \ - > "${T}/80${PN}" || die - - doenvd "${T}/80${PN}" || die - - echo "SEARCH_DIRS_MASK=\"${EPREFIX}/${ANDROID_NDK_DIR}\"" \ - > "${T}/80${PN}" || die - insinto "/etc/revdep-rebuild" - doins "${T}/80${PN}" -} diff --git a/dev-util/android-ndk/android-ndk-8d.ebuild b/dev-util/android-ndk/android-ndk-8d.ebuild deleted file mode 100644 index f5d15a69aed7..000000000000 --- a/dev-util/android-ndk/android-ndk-8d.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=3 - -MY_P="${PN}-r${PV}" - -DESCRIPTION="Open Handset Alliance's Android NDK (Native Dev Kit)" -HOMEPAGE="http://developer.android.com/sdk/ndk/" -SRC_URI="https://dl.google.com/android/ndk/${MY_P}-linux-x86.tar.bz2" - -LICENSE="android" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" -RESTRICT="mirror strip installsources test" - -DEPEND="" -RDEPEND=">=dev-util/android-sdk-update-manager-10 - >=sys-devel/make-3.81" - -S="${WORKDIR}/${MY_P}" - -ANDROID_NDK_DIR="opt/${PN}" - -ANDROID_TC_ARM_ANDROID_4_4="${ANDROID_NDK_DIR}/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86" -ANDROID_TC_ARM_ANDROID_4_6="${ANDROID_NDK_DIR}/toolchains/arm-linux-androideabi-4.6/prebuilt/linux-x86" -ANDROID_TC_ARM_ANDROID_4_7="${ANDROID_NDK_DIR}/toolchains/arm-linux-androideabi-4.7/prebuilt/linux-x86" -ANDROID_TC_MIPS_ANDROID_4_4="${ANDROID_NDK_DIR}/toolchains/mipsel-linux-android-4.4.3/prebuilt/linux-x86" -ANDROID_TC_MIPS_ANDROID_4_6="${ANDROID_NDK_DIR}/toolchains/mipsel-linux-android-4.6/prebuilt/linux-x86" -ANDROID_TC_MIPS_ANDROID_4_7="${ANDROID_NDK_DIR}/toolchains/mipsel-linux-android-4.7/prebuilt/linux-x86" -ANDROID_TC_X86_ANDROID_4_4="${ANDROID_NDK_DIR}/toolchains/x86-4.4.3/prebuilt/linux-x86" -ANDROID_TC_X86_ANDROID_4_6="${ANDROID_NDK_DIR}/toolchains/x86-4.6/prebuilt/linux-x86" -ANDROID_TC_X86_ANDROID_4_7="${ANDROID_NDK_DIR}/toolchains/x86-4.7/prebuilt/linux-x86" - -QA_PREBUILT="*" -PYTHON_UPDATER_IGNORE="1" - -src_configure() { - : -} - -src_compile() { - : -} - -src_install() { - dodir "/${ANDROID_NDK_DIR}" - cp -pPR * "${ED}/${ANDROID_NDK_DIR}" - - fowners -R root:android "/${ANDROID_NDK_DIR}" - fperms 0775 "/${ANDROID_NDK_DIR}/"{,build,docs,platforms,samples} - fperms 0775 "/${ANDROID_NDK_DIR}/"{sources,tests,toolchains} - - dodir "/${ANDROID_NDK_DIR}/out" - fowners root:android "/${ANDROID_NDK_DIR}/out" - fperms 3775 "/${ANDROID_NDK_DIR}/out" - - printf '%s' \ - "PATH=\"${EPREFIX}/${ANDROID_NDK_DIR}:" \ - "${EPREFIX}/${ANDROID_TC_ARM_ANDROID_4_4}/bin/:" \ - "${EPREFIX}/${ANDROID_TC_ARM_ANDROID_4_6}/bin/:" \ - "${EPREFIX}/${ANDROID_TC_ARM_ANDROID_4_7}/bin/:" \ - "${EPREFIX}/${ANDROID_TC_MIPS_ANDROID_4_4}/bin/:" \ - "${EPREFIX}/${ANDROID_TC_MIPS_ANDROID_4_6}/bin/:" \ - "${EPREFIX}/${ANDROID_TC_MIPS_ANDROID_4_7}/bin/:" \ - "${EPREFIX}/${ANDROID_TC_X86_ANDROID_4_4}/bin/:" \ - "${EPREFIX}/${ANDROID_TC_X86_ANDROID_4_6}/bin/:" \ - "${EPREFIX}/${ANDROID_TC_X86_ANDROID_4_7}/bin/\"" \ - $'\n' \ - > "${T}/80${PN}" || die - - doenvd "${T}/80${PN}" || die - - echo "SEARCH_DIRS_MASK=\"${EPREFIX}/${ANDROID_NDK_DIR}\"" \ - > "${T}/80${PN}" || die - insinto "/etc/revdep-rebuild" - doins "${T}/80${PN}" -} diff --git a/dev-util/android-ndk/android-ndk-8e.ebuild b/dev-util/android-ndk/android-ndk-8e.ebuild deleted file mode 100644 index f5d15a69aed7..000000000000 --- a/dev-util/android-ndk/android-ndk-8e.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=3 - -MY_P="${PN}-r${PV}" - -DESCRIPTION="Open Handset Alliance's Android NDK (Native Dev Kit)" -HOMEPAGE="http://developer.android.com/sdk/ndk/" -SRC_URI="https://dl.google.com/android/ndk/${MY_P}-linux-x86.tar.bz2" - -LICENSE="android" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" -RESTRICT="mirror strip installsources test" - -DEPEND="" -RDEPEND=">=dev-util/android-sdk-update-manager-10 - >=sys-devel/make-3.81" - -S="${WORKDIR}/${MY_P}" - -ANDROID_NDK_DIR="opt/${PN}" - -ANDROID_TC_ARM_ANDROID_4_4="${ANDROID_NDK_DIR}/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86" -ANDROID_TC_ARM_ANDROID_4_6="${ANDROID_NDK_DIR}/toolchains/arm-linux-androideabi-4.6/prebuilt/linux-x86" -ANDROID_TC_ARM_ANDROID_4_7="${ANDROID_NDK_DIR}/toolchains/arm-linux-androideabi-4.7/prebuilt/linux-x86" -ANDROID_TC_MIPS_ANDROID_4_4="${ANDROID_NDK_DIR}/toolchains/mipsel-linux-android-4.4.3/prebuilt/linux-x86" -ANDROID_TC_MIPS_ANDROID_4_6="${ANDROID_NDK_DIR}/toolchains/mipsel-linux-android-4.6/prebuilt/linux-x86" -ANDROID_TC_MIPS_ANDROID_4_7="${ANDROID_NDK_DIR}/toolchains/mipsel-linux-android-4.7/prebuilt/linux-x86" -ANDROID_TC_X86_ANDROID_4_4="${ANDROID_NDK_DIR}/toolchains/x86-4.4.3/prebuilt/linux-x86" -ANDROID_TC_X86_ANDROID_4_6="${ANDROID_NDK_DIR}/toolchains/x86-4.6/prebuilt/linux-x86" -ANDROID_TC_X86_ANDROID_4_7="${ANDROID_NDK_DIR}/toolchains/x86-4.7/prebuilt/linux-x86" - -QA_PREBUILT="*" -PYTHON_UPDATER_IGNORE="1" - -src_configure() { - : -} - -src_compile() { - : -} - -src_install() { - dodir "/${ANDROID_NDK_DIR}" - cp -pPR * "${ED}/${ANDROID_NDK_DIR}" - - fowners -R root:android "/${ANDROID_NDK_DIR}" - fperms 0775 "/${ANDROID_NDK_DIR}/"{,build,docs,platforms,samples} - fperms 0775 "/${ANDROID_NDK_DIR}/"{sources,tests,toolchains} - - dodir "/${ANDROID_NDK_DIR}/out" - fowners root:android "/${ANDROID_NDK_DIR}/out" - fperms 3775 "/${ANDROID_NDK_DIR}/out" - - printf '%s' \ - "PATH=\"${EPREFIX}/${ANDROID_NDK_DIR}:" \ - "${EPREFIX}/${ANDROID_TC_ARM_ANDROID_4_4}/bin/:" \ - "${EPREFIX}/${ANDROID_TC_ARM_ANDROID_4_6}/bin/:" \ - "${EPREFIX}/${ANDROID_TC_ARM_ANDROID_4_7}/bin/:" \ - "${EPREFIX}/${ANDROID_TC_MIPS_ANDROID_4_4}/bin/:" \ - "${EPREFIX}/${ANDROID_TC_MIPS_ANDROID_4_6}/bin/:" \ - "${EPREFIX}/${ANDROID_TC_MIPS_ANDROID_4_7}/bin/:" \ - "${EPREFIX}/${ANDROID_TC_X86_ANDROID_4_4}/bin/:" \ - "${EPREFIX}/${ANDROID_TC_X86_ANDROID_4_6}/bin/:" \ - "${EPREFIX}/${ANDROID_TC_X86_ANDROID_4_7}/bin/\"" \ - $'\n' \ - > "${T}/80${PN}" || die - - doenvd "${T}/80${PN}" || die - - echo "SEARCH_DIRS_MASK=\"${EPREFIX}/${ANDROID_NDK_DIR}\"" \ - > "${T}/80${PN}" || die - insinto "/etc/revdep-rebuild" - doins "${T}/80${PN}" -} diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index 07f719a62a8c..2b3c8d933d1a 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -116,7 +116,8 @@ case ${EAPI} in *) die "EAPI=${EAPI:-0} is not supported" ;; esac -inherit toolchain-funcs multilib flag-o-matic eutils multiprocessing versionator +inherit toolchain-funcs multilib ninja-utils flag-o-matic eutils \ + multiprocessing versionator EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install @@ -680,44 +681,6 @@ enable_cmake-utils_src_compile() { cmake-utils_src_make "$@" } -_ninjaopts_from_makeopts() { - if [[ ${NINJAOPTS+set} == set ]]; then - return 0 - fi - local ninjaopts=() - set -- ${MAKEOPTS} - while (( $# )); do - case $1 in - -j|-l) - if [[ $# -eq 1 || $2 == -* ]]; then - if [[ $1 == -j ]]; then - # absurdly high job limit - ninjaopts+=( $1 9999 ) - else # -l - # remove load limit (like make does for -l) - ninjaopts+=( $1 0 ) - fi - shift 1 - else - ninjaopts+=( $1 $2 ) - shift 2 - fi - ;; - -j*|-l*) - ninjaopts+=( $1 ) - shift 1 - ;; - -k) - # -k 0 = any number of tasks can fail - ninjaopts+=( $1 0 ) - shift 1 - ;; - *) shift ;; - esac - done - export NINJAOPTS="${ninjaopts[*]}" -} - # @FUNCTION: _cmake_ninja_src_make # @INTERNAL # @DESCRIPTION: @@ -727,16 +690,7 @@ _cmake_ninja_src_make() { [[ -e build.ninja ]] || die "build.ninja not found. Error during configure stage." - _ninjaopts_from_makeopts - - if [[ "${CMAKE_VERBOSE}" != "OFF" ]]; then - set -- ninja ${NINJAOPTS} -v "$@" - else - set -- ninja ${NINJAOPTS} "$@" - fi - - echo "$@" - "$@" || die + eninja "$@" } # @FUNCTION: _cmake_emake_src_make diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass index 3be67bbf2a21..1376326c9579 100644 --- a/eclass/distutils-r1.eclass +++ b/eclass/distutils-r1.eclass @@ -770,10 +770,14 @@ distutils-r1_src_compile() { fi } -_clean_egg_info() { - # Work around for setuptools test behavior (bug 534058). - # https://bitbucket.org/pypa/setuptools/issue/292 - rm -rf "${BUILD_DIR}"/lib/*.egg-info +# @FUNCTION: _distutils-r1_clean_egg_info +# @INTERNAL +# @DESCRIPTION: +# Clean up potential stray egg-info files left by setuptools test phase. +# Those files ended up being unversioned, and caused issues: +# https://bugs.gentoo.org/534058 +_distutils-r1_clean_egg_info() { + rm -rf "${BUILD_DIR}"/lib/*.egg-info || die } distutils-r1_src_test() { @@ -781,7 +785,7 @@ distutils-r1_src_test() { if declare -f python_test >/dev/null; then _distutils-r1_run_foreach_impl python_test - _distutils-r1_run_foreach_impl _clean_egg_info + _distutils-r1_run_foreach_impl _distutils-r1_clean_egg_info fi if declare -f python_test_all >/dev/null; then @@ -789,6 +793,33 @@ distutils-r1_src_test() { fi } +# @FUNCTION: _distutils-r1_check_namespace_pth +# @INTERNAL +# @DESCRIPTION: +# Check if any *-nspkg.pth files were installed (by setuptools) +# and warn about the policy non-conformance if they were. +_distutils-r1_check_namespace_pth() { + local f pth=() + + while IFS= read -r -d '' f; do + pth+=( "${f}" ) + done < <(find "${ED}" -name '*-nspkg.pth' -print0) + + if [[ ${pth[@]} ]]; then + ewarn "The following *-nspkg.pth files were found installed:" + ewarn + for f in "${pth[@]}"; do + ewarn " ${f#${ED%/}}" + done + ewarn + ewarn "The presence of those files may break namespaces in Python 3.5+. Please" + ewarn "read our documentation on reliable handling of namespaces and update" + ewarn "the ebuild accordingly:" + ewarn + ewarn " https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages" + fi +} + distutils-r1_src_install() { debug-print-function ${FUNCNAME} "${@}" @@ -812,6 +843,8 @@ distutils-r1_src_install() { "${cmd}" "QA: python_install_all() didn't call distutils-r1_python_install_all" fi + + _distutils-r1_check_namespace_pth } # -- distutils.eclass functions -- diff --git a/eclass/ninja-utils.eclass b/eclass/ninja-utils.eclass new file mode 100644 index 000000000000..69216176ba61 --- /dev/null +++ b/eclass/ninja-utils.eclass @@ -0,0 +1,57 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: ninja-utils.eclass +# @MAINTAINER: +# Michał Górny <mgorny@gentoo.org> +# Mike Gilbert <floppym@gentoo.org> +# @AUTHOR: +# Michał Górny <mgorny@gentoo.org> +# Mike Gilbert <floppym@gentoo.org> +# @BLURB: common bits to run dev-util/ninja builder +# @DESCRIPTION: +# This eclass provides a single function -- eninja -- that can be used +# to run the ninja builder alike emake. It does not define any +# dependencies, you need to depend on dev-util/ninja yourself. Since +# ninja is rarely used stand-alone, most of the time this eclass will +# be used indirectly by the eclasses for other build systems (CMake, +# Meson). + +if [[ -z ${_NINJA_UTILS_ECLASS} ]]; then + +case ${EAPI:-0} in + 0|1|3) die "EAPI=${EAPI:-0} is not supported (too old)";; + # copied from cmake-utils + 2|4|5|6) ;; + *) die "EAPI=${EAPI} is not yet supported" ;; +esac + +# @ECLASS-VARIABLE: NINJAOPTS +# @DEFAULT_UNSET +# @DESCRIPTION: +# The default set of options to pass to Ninja. Similar to MAKEOPTS, +# supposed to be set in make.conf. If unset, eninja() will convert +# MAKEOPTS instead. + +inherit multiprocessing + +# @FUNCTION: eninja +# @USAGE: [<args>...] +# @DESCRIPTION: +# Call Ninja, passing the NINJAOPTS (or converted MAKEOPTS), followed +# by the supplied arguments. This function dies if ninja fails. Starting +# with EAPI 6, it also supports being called via 'nonfatal'. +eninja() { + local nonfatal_args=() + [[ ${EAPI:-0} != [245] ]] && nonfatal_args+=( -n ) + + if [[ -z ${NINJAOPTS+set} ]]; then + NINJAOPTS="-j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0)" + fi + set -- ninja -v ${NINJAOPTS} "$@" + echo "$@" >&2 + "$@" || die "${nonfatal_args[@]}" "${*} failed" +} + +_NINJA_UTILS_ECLASS=1 +fi diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass index df57cf1e1322..6181ec32af61 100644 --- a/eclass/python-r1.eclass +++ b/eclass/python-r1.eclass @@ -267,8 +267,11 @@ _python_validate_useflags() { # are both in PYTHON_COMPAT and match any of the patterns passed # as parameters to the function. # -# Remember to escape or quote the patterns to prevent shell filename -# expansion. +# The patterns can be either fnmatch-style patterns (matched via bash +# == operator against PYTHON_COMPAT values) or '-2' / '-3' to indicate +# appropriately all enabled Python 2/3 implementations (alike +# python_is_python3). Remember to escape or quote the fnmatch patterns +# to prevent accidental shell filename expansion. # # When all implementations are requested, please use ${PYTHON_USEDEP} # instead. Please also remember to set an appropriate REQUIRED_USE @@ -287,19 +290,15 @@ _python_validate_useflags() { python_gen_usedep() { debug-print-function ${FUNCNAME} "${@}" - local impl pattern - local matches=() + local impl matches=() for impl in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do - for pattern; do - if [[ ${impl} == ${pattern} ]]; then - matches+=( - "python_targets_${impl}(-)?" - "-python_single_target_${impl}(-)" - ) - break - fi - done + if _python_impl_matches "${impl}" "${@}"; then + matches+=( + "python_targets_${impl}(-)?" + "-python_single_target_${impl}(-)" + ) + fi done [[ ${matches[@]} ]] || die "No supported implementations match python_gen_usedep patterns: ${@}" @@ -315,6 +314,12 @@ python_gen_usedep() { # are both in PYTHON_COMPAT and match any of the patterns passed # as parameters to the function. # +# The patterns can be either fnmatch-style patterns (matched via bash +# == operator against PYTHON_COMPAT values) or '-2' / '-3' to indicate +# appropriately all enabled Python 2/3 implementations (alike +# python_is_python3). Remember to escape or quote the fnmatch patterns +# to prevent accidental shell filename expansion. +# # Example: # @CODE # PYTHON_COMPAT=( python{2_7,3_4} ) @@ -328,16 +333,12 @@ python_gen_usedep() { python_gen_useflags() { debug-print-function ${FUNCNAME} "${@}" - local impl pattern - local matches=() + local impl matches=() for impl in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do - for pattern; do - if [[ ${impl} == ${pattern} ]]; then - matches+=( "python_targets_${impl}" ) - break - fi - done + if _python_impl_matches "${impl}" "${@}"; then + matches+=( "python_targets_${impl}" ) + fi done echo "${matches[@]}" @@ -350,6 +351,12 @@ python_gen_useflags() { # of Python implementations which are both in PYTHON_COMPAT and match # any of the patterns passed as the remaining parameters. # +# The patterns can be either fnmatch-style patterns (matched via bash +# == operator against PYTHON_COMPAT values) or '-2' / '-3' to indicate +# appropriately all enabled Python 2/3 implementations (alike +# python_is_python3). Remember to escape or quote the fnmatch patterns +# to prevent accidental shell filename expansion. +# # In order to enforce USE constraints on the packages, verbatim # '${PYTHON_USEDEP}' (quoted!) may be placed in the dependency # specification. It will get expanded within the function into a proper @@ -372,27 +379,22 @@ python_gen_useflags() { python_gen_cond_dep() { debug-print-function ${FUNCNAME} "${@}" - local impl pattern - local matches=() - + local impl matches=() local dep=${1} shift for impl in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do - for pattern; do - if [[ ${impl} == ${pattern} ]]; then - # substitute ${PYTHON_USEDEP} if used - # (since python_gen_usedep() will not return ${PYTHON_USEDEP} - # the code is run at most once) - if [[ ${dep} == *'${PYTHON_USEDEP}'* ]]; then - local usedep=$(python_gen_usedep "${@}") - dep=${dep//\$\{PYTHON_USEDEP\}/${usedep}} - fi - - matches+=( "python_targets_${impl}? ( ${dep} )" ) - break + if _python_impl_matches "${impl}" "${@}"; then + # substitute ${PYTHON_USEDEP} if used + # (since python_gen_usedep() will not return ${PYTHON_USEDEP} + # the code is run at most once) + if [[ ${dep} == *'${PYTHON_USEDEP}'* ]]; then + local usedep=$(python_gen_usedep "${@}") + dep=${dep//\$\{PYTHON_USEDEP\}/${usedep}} fi - done + + matches+=( "python_targets_${impl}? ( ${dep} )" ) + fi done echo "${matches[@]}" @@ -407,6 +409,12 @@ python_gen_cond_dep() { # patterns are passed, the output dependencies will be generated only # for the implementations matching them. # +# The patterns can be either fnmatch-style patterns (matched via bash +# == operator against PYTHON_COMPAT values) or '-2' / '-3' to indicate +# appropriately all enabled Python 2/3 implementations (alike +# python_is_python3). Remember to escape or quote the fnmatch patterns +# to prevent accidental shell filename expansion. +# # Use this function when you need to request different USE flags # on the Python interpreter depending on package's USE flags. If you # only need a single set of interpreter USE flags, just set @@ -429,22 +437,17 @@ python_gen_cond_dep() { python_gen_impl_dep() { debug-print-function ${FUNCNAME} "${@}" - local impl pattern - local matches=() - + local impl matches=() local PYTHON_REQ_USE=${1} shift local patterns=( "${@-*}" ) for impl in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do - for pattern in "${patterns[@]}"; do - if [[ ${impl} == ${pattern} ]]; then - local PYTHON_PKG_DEP - python_export "${impl}" PYTHON_PKG_DEP - matches+=( "python_targets_${impl}? ( ${PYTHON_PKG_DEP} )" ) - break - fi - done + if _python_impl_matches "${impl}" "${patterns[@]}"; then + local PYTHON_PKG_DEP + python_export "${impl}" PYTHON_PKG_DEP + matches+=( "python_targets_${impl}? ( ${PYTHON_PKG_DEP} )" ) + fi done echo "${matches[@]}" @@ -594,6 +597,12 @@ python_parallel_foreach_impl() { # and matches at least one of the patterns passed (or '*' if no patterns # passed). Set the Python build environment up for that implementation. # +# The patterns can be either fnmatch-style patterns (matched via bash +# == operator against PYTHON_COMPAT values) or '-2' / '-3' to indicate +# appropriately all enabled Python 2/3 implementations (alike +# python_is_python3). Remember to escape or quote the fnmatch patterns +# to prevent accidental shell filename expansion. +# # This function needs to be used when Python is being called outside # of python_foreach_impl calls (e.g. for shared processes like doc # building). python_foreach_impl sets up the build environment itself. @@ -619,12 +628,9 @@ python_setup() { local best_impl patterns=( "${@-*}" ) _python_try_impl() { - local pattern - for pattern in "${patterns[@]}"; do - if [[ ${EPYTHON} == ${pattern} ]]; then - best_impl=${EPYTHON} - fi - done + if _python_impl_matches "${impl}" "${patterns[@]}"; then + best_impl=${EPYTHON} + fi } python_foreach_impl _python_try_impl unset -f _python_try_impl diff --git a/eclass/python-single-r1.eclass b/eclass/python-single-r1.eclass index fc51c4ec2377..3762d3d6e990 100644 --- a/eclass/python-single-r1.eclass +++ b/eclass/python-single-r1.eclass @@ -271,8 +271,11 @@ if [[ ! ${_PYTHON_SINGLE_R1} ]]; then # are both in PYTHON_COMPAT and match any of the patterns passed # as parameters to the function. # -# Remember to escape or quote the patterns to prevent shell filename -# expansion. +# The patterns can be either fnmatch-style patterns (matched via bash +# == operator against PYTHON_COMPAT values) or '-2' / '-3' to indicate +# appropriately all enabled Python 2/3 implementations (alike +# python_is_python3). Remember to escape or quote the fnmatch patterns +# to prevent accidental shell filename expansion. # # When all implementations are requested, please use ${PYTHON_USEDEP} # instead. Please also remember to set an appropriate REQUIRED_USE @@ -291,19 +294,15 @@ if [[ ! ${_PYTHON_SINGLE_R1} ]]; then python_gen_usedep() { debug-print-function ${FUNCNAME} "${@}" - local impl pattern - local matches=() + local impl matches=() for impl in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do - for pattern; do - if [[ ${impl} == ${pattern} ]]; then - matches+=( - "python_targets_${impl}(-)?" - "python_single_target_${impl}(+)?" - ) - break - fi - done + if _python_impl_matches "${impl}" "${@}"; then + matches+=( + "python_targets_${impl}(-)?" + "python_single_target_${impl}(+)?" + ) + fi done [[ ${matches[@]} ]] || die "No supported implementations match python_gen_usedep patterns: ${@}" @@ -319,6 +318,12 @@ python_gen_usedep() { # are both in PYTHON_COMPAT and match any of the patterns passed # as parameters to the function. # +# The patterns can be either fnmatch-style patterns (matched via bash +# == operator against PYTHON_COMPAT values) or '-2' / '-3' to indicate +# appropriately all enabled Python 2/3 implementations (alike +# python_is_python3). Remember to escape or quote the fnmatch patterns +# to prevent accidental shell filename expansion. +# # Example: # @CODE # PYTHON_COMPAT=( python{2_7,3_4} ) @@ -332,8 +337,7 @@ python_gen_usedep() { python_gen_useflags() { debug-print-function ${FUNCNAME} "${@}" - local flag_prefix impl pattern - local matches=() + local flag_prefix impl matches=() if [[ ${#_PYTHON_SUPPORTED_IMPLS[@]} -eq 1 ]]; then flag_prefix=python_targets @@ -342,12 +346,9 @@ python_gen_useflags() { fi for impl in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do - for pattern; do - if [[ ${impl} == ${pattern} ]]; then - matches+=( "${flag_prefix}_${impl}" ) - break - fi - done + if _python_impl_matches "${impl}" "${@}"; then + matches+=( "${flag_prefix}_${impl}" ) + fi done echo "${matches[@]}" @@ -360,6 +361,12 @@ python_gen_useflags() { # of Python implementations which are both in PYTHON_COMPAT and match # any of the patterns passed as the remaining parameters. # +# The patterns can be either fnmatch-style patterns (matched via bash +# == operator against PYTHON_COMPAT values) or '-2' / '-3' to indicate +# appropriately all enabled Python 2/3 implementations (alike +# python_is_python3). Remember to escape or quote the fnmatch patterns +# to prevent accidental shell filename expansion. +# # In order to enforce USE constraints on the packages, verbatim # '${PYTHON_USEDEP}' (quoted!) may be placed in the dependency # specification. It will get expanded within the function into a proper @@ -382,8 +389,7 @@ python_gen_useflags() { python_gen_cond_dep() { debug-print-function ${FUNCNAME} "${@}" - local flag_prefix impl pattern - local matches=() + local flag_prefix impl matches=() if [[ ${#_PYTHON_SUPPORTED_IMPLS[@]} -eq 1 ]]; then flag_prefix=python_targets @@ -395,20 +401,17 @@ python_gen_cond_dep() { shift for impl in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do - for pattern; do - if [[ ${impl} == ${pattern} ]]; then - # substitute ${PYTHON_USEDEP} if used - # (since python_gen_usedep() will not return ${PYTHON_USEDEP} - # the code is run at most once) - if [[ ${dep} == *'${PYTHON_USEDEP}'* ]]; then - local usedep=$(python_gen_usedep "${@}") - dep=${dep//\$\{PYTHON_USEDEP\}/${usedep}} - fi - - matches+=( "${flag_prefix}_${impl}? ( ${dep} )" ) - break + if _python_impl_matches "${impl}" "${@}"; then + # substitute ${PYTHON_USEDEP} if used + # (since python_gen_usedep() will not return ${PYTHON_USEDEP} + # the code is run at most once) + if [[ ${dep} == *'${PYTHON_USEDEP}'* ]]; then + local usedep=$(python_gen_usedep "${@}") + dep=${dep//\$\{PYTHON_USEDEP\}/${usedep}} fi - done + + matches+=( "${flag_prefix}_${impl}? ( ${dep} )" ) + fi done echo "${matches[@]}" @@ -423,6 +426,12 @@ python_gen_cond_dep() { # patterns are passed, the output dependencies will be generated only # for the implementations matching them. # +# The patterns can be either fnmatch-style patterns (matched via bash +# == operator against PYTHON_COMPAT values) or '-2' / '-3' to indicate +# appropriately all enabled Python 2/3 implementations (alike +# python_is_python3). Remember to escape or quote the fnmatch patterns +# to prevent accidental shell filename expansion. +# # Use this function when you need to request different USE flags # on the Python interpreter depending on package's USE flags. If you # only need a single set of interpreter USE flags, just set @@ -459,14 +468,11 @@ python_gen_impl_dep() { local patterns=( "${@-*}" ) for impl in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do - for pattern in "${patterns[@]}"; do - if [[ ${impl} == ${pattern} ]]; then - local PYTHON_PKG_DEP - python_export "${impl}" PYTHON_PKG_DEP - matches+=( "${flag_prefix}_${impl}? ( ${PYTHON_PKG_DEP} )" ) - break - fi - done + if _python_impl_matches "${impl}" "${patterns[@]}"; then + local PYTHON_PKG_DEP + python_export "${impl}" PYTHON_PKG_DEP + matches+=( "${flag_prefix}_${impl}? ( ${PYTHON_PKG_DEP} )" ) + fi done echo "${matches[@]}" diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass index 66a359e8daee..c1349ff277b0 100644 --- a/eclass/python-utils-r1.eclass +++ b/eclass/python-utils-r1.eclass @@ -47,6 +47,18 @@ _PYTHON_ALL_IMPLS=( ) readonly _PYTHON_ALL_IMPLS +# @ECLASS-VARIABLE: PYTHON_COMPAT_NO_STRICT +# @INTERNAL +# @DESCRIPTION: +# Set to a non-empty value in order to make eclass tolerate (ignore) +# unknown implementations in PYTHON_COMPAT. +# +# This is intended to be set by the user when using ebuilds that may +# have unknown (newer) implementations in PYTHON_COMPAT. The assumption +# is that the ebuilds are intended to be used within multiple contexts +# which can involve revisions of this eclass that support a different +# set of Python implementations. + # @FUNCTION: _python_impl_supported # @USAGE: <impl> # @INTERNAL @@ -79,6 +91,7 @@ _python_impl_supported() { fi ;; *) + [[ ${PYTHON_COMPAT_NO_STRICT} ]] && return 1 die "Invalid implementation in PYTHON_COMPAT: ${impl}" esac } @@ -149,6 +162,38 @@ _python_set_impls() { fi } +# @FUNCTION: _python_impl_matches +# @USAGE: <impl> <pattern>... +# @INTERNAL +# @DESCRIPTION: +# Check whether the specified <impl> matches at least one +# of the patterns following it. Return 0 if it does, 1 otherwise. +# +# <impl> should be in PYTHON_COMPAT form. The patterns can be either: +# a) fnmatch-style patterns, e.g. 'python2*', 'pypy'... +# b) '-2' to indicate all Python 2 variants (= !python_is_python3) +# c) '-3' to indicate all Python 3 variants (= python_is_python3) +_python_impl_matches() { + [[ ${#} -ge 2 ]] || die "${FUNCNAME}: takes at least 2 parameters" + + local impl=${1} pattern + shift + + for pattern; do + if [[ ${pattern} == -2 ]]; then + ! python_is_python3 "${impl}" + return + elif [[ ${pattern} == -3 ]]; then + python_is_python3 "${impl}" + return + elif [[ ${impl} == ${pattern} ]]; then + return 0 + fi + done + + return 1 +} + # @ECLASS-VARIABLE: PYTHON # @DEFAULT_UNSET # @DESCRIPTION: @@ -810,11 +855,19 @@ python_newscript() { # The <new-path> can either be an absolute target system path (in which # case it needs to start with a slash, and ${ED} will be prepended to # it) or relative to the implementation's site-packages directory -# (then it must not start with a slash). +# (then it must not start with a slash). The relative path can be +# specified either using the Python package notation (separated by dots) +# or the directory notation (using slashes). # # When not set explicitly, the modules are installed to the top # site-packages directory. # +# In the relative case, the exact path is determined directly +# by each python_doscript/python_newscript function. Therefore, +# python_moduleinto can be safely called before establishing the Python +# interpreter and/or a single call can be used to set the path correctly +# for multiple implementations, as can be seen in the following example. +# # Example: # @CODE # src_install() { @@ -823,12 +876,6 @@ python_newscript() { # python_foreach_impl python_domodule baz.py # } # @CODE - -# Set the current module root. The new value will be stored -# in the 'python_moduleroot' environment variable. The new value need -# be relative to the site-packages root. -# -# Alternatively, you can set the variable directly. python_moduleinto() { debug-print-function ${FUNCNAME} "${@}" @@ -867,7 +914,7 @@ python_domodule() { local PYTHON_SITEDIR=${PYTHON_SITEDIR} [[ ${PYTHON_SITEDIR} ]] || python_export PYTHON_SITEDIR - d=${PYTHON_SITEDIR#${EPREFIX}}/${python_moduleroot} + d=${PYTHON_SITEDIR#${EPREFIX}}/${python_moduleroot//.//} fi ( diff --git a/licenses/CROSSOVER b/licenses/CROSSOVER deleted file mode 100644 index 4054d44801f0..000000000000 --- a/licenses/CROSSOVER +++ /dev/null @@ -1,721 +0,0 @@ - CrossOver Office Standard License Grant - -YOU REALLY WANT TO READ THIS, ESPECIALLY THE PART ABOUT THE MANDATORY CAR WASH -FOR CODEWEAVERS EMPLOYEES... - -If you don't like this license grant: - - a. Let us know, we'd appreciate the feedback. - - b. Stop right now, and ask for a refund. We'll cheerfully do so. - - -The main thing we want you to know: - This is a license for one user. The license is not necessarily for a -specific user, or a specific computer, but it is for one person at a -time. If you need to support more than one person, please contact us -for volume pricing and site licensing. We do offer educational -discounts. - - - ----------------< Start of Formal License Grant >----------------------- - - 1. License. The software accompanying this License (hereinafter "Software"), - regardless of the media on which it is distributed, are licensed to you - by CodeWeavers ("VENDOR"). You own the medium on which the Software is - recorded, but VENDOR and VENDOR's Licensors (referred to collectively as - "VENDOR") retain title to the Software and related documentation. You - may: - - a. run the Software on any computer, so long as no more than one - person per license is ever using the Software at any one time. - - b. transfer all your license rights in the Software, the backup copy - of the Software, the related documentation and a copy of this - License to another party, provided the other party reads and agrees - to accept the terms and conditions of this License. - - 2. Free Software. The Software contained in this product includes some - components of Free Software, including software from the Wine Project, - Tcl, Tk, iTcl, and the Loki Software Setup software. - - The Wine project is licensed under terms of the GNU Lesser Public - License, which is included below as Appendix A. The best source for the - Wine source code is the main Wine web page at http://www.winehq.com. - - Tcl/Tk/and iTcl are licensed under a 'BSD-style' license, which is - included below as Appendix B. - - The Loki Setup software is licensed under the terms of the GNU General - Public License, Version 2. A copy of this license is provided with this - distribution as the file GPLV2. All changes to the Loki Setup software - have been submitted back to Loki (www.lokigames.com). With the demise of - Loki, the best source for this source code is now the following web site: - www.icculus.org. - - We have made no changes to the Tcl/Tk, and iTcl software, and we suggest - that individuals wishing to obtain this software contact the sponsors of - those software projects directly. The web site for this project is - www.tcl.tk. - - We include source code with each CD purchase of CrossOver Office. Current - source code for Free Software contained within CrossOver products is also - generally available at our web site, www.codeweavers.com. However, - individuals wishing to obtain source directly from us will be cheerfully - provided with a copy of any Free Software source upon request. We reserve - the right to charge a nominal processing fee for transmission of the - source code. Send such requests to info@codeweavers.com. - - CodeWeavers strongly believes in the Free Software movement. We believe - that the spirit of this movement makes it important for you to be able to - obtain these components for yourself, make changes, and then use those - changes with our Software. To that end, you are explicitly granted - license to build alternate versions of the Wine software for use in - conjunction with the Software. - - IN NO WAY IS THIS LICENSE GRANT INTENDED TO SUPERCEDE THE LICENSE - AGREEMENTS OF ANY FREE SOFTWARE COMPONENTS THAT ARE DISTRIBUTED IN - CONJUNCTION WITH THE SOFTWARE. - - 3. Restrictions. The Software contains copyrighted material, trade secrets - and other proprietary material. In order to protect them, and except as - permitted by applicable legislation or by the Free Software licenses - detailed in Section 2, you may not: - - a. decompile, reverse engineer, disassemble or otherwise reduce the - Software to a human-perceivable form - - b. rent, lend, loan, distribute or create derivative works based upon - the Software in whole or in part. - - - 4. Term. This License is granted to you immediately upon purchase of a - license from CodeWeavers, or other related third party. - - This License is effective until terminated. You may terminate this - License at any time by destroying the Software, related documentation and - all copies thereof. - - This License will terminate immediately without notice from VENDOR if: - - a. you use the Software in a fashion that exceeds the rights granted - to you by this license, OR - - b. you fail to conclude the purchase transaction, OR - - c. you request a refund. - - - If the Software was given to you for purposes of evaluation, then this - License will terminate at the end of the specified evaluation period, - typically 30 days. - - Upon termination you must destroy the Software, related documentation and - all copies thereof. - - 5. Export Law Assurance. You agree and certify that neither the Software nor - any other technical data received from VENDOR, nor the direct product - thereof, will be exported outside the United States except as authorized - and as permitted by the laws and regulations of the United States. If the - Software has been rightfully obtained by you outside of the United - States, you agree that you will not reexport the Software nor any other - technical data received from VENDOR, nor the direct product thereof, - except as permitted by the laws and regulations of the United States and - the laws and regulations of the jurisdiction in which you obtained the - Software. - - 6. Government End Users. If you are acquiring the Software on behalf of any - unit or agency of the United States Government, the following provisions - apply. The Government agrees: - - a. if the Software is supplied to the Department of Defense (DoD), the - Software is classified as "Commercial Computer Software" and the - Government is acquiring only "restricted rights" in the Software - and its documentation as that term is defined in Clause 252.227- - 7013(c)(1) of the DFARS; and - - b. if the Software is supplied to any unit or agency of the United - States Government other than DoD, the Government's rights in the - Software and its documentation will be as defined in Clause 52.227- - 19(c)(2) of the FAR or, in the case of NASA, in Clause 18-52.227-86 - (d) of the NASA Supplement to the FAR. - - - 7. Limited Warranty on Media. VENDOR warrants the tangible media on which - the Software is recorded to be free from defects in materials and - workmanship under normal use for a period of ninety (90) days from the - date of purchase as evidenced by a copy of the receipt. VENDOR's entire - liability and your exclusive remedy will be replacement of the media not - meeting VENDOR's limited warranty and which is returned to VENDOR or an - VENDOR authorized representative with a copy of the receipt. VENDOR will - have no responsibility to replace an media damaged by accident, abuse or - misapplication. ANY IMPLIED WARRANTIES ON THE TANGIBLE MEDIA, INCLUDING - THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - PURPOSE, ARE LIMITED IN DURATION TO NINETY (90) DAYS FROM THE DATE OF - DELIVERY. THIS WARRANTY GIVES YOU SPECIFIC LEGAL RIGHTS, AND YOU MAY ALSO - HAVE OTHER RIGHTS WHICH VARY BY JURISDICTION. - - 8. Disclaimer of Warranty on Software. You expressly acknowledge and agree - that use of the Software is at your sole risk. The Software and related - documentation are provided "AS IS" and without warranty of any kind and - VENDOR EXPRESSLY DISCLAIMS ALL WARRANTIES, EXPRESS AND IMPLIED, - INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS FOR A PARTICULAR PURPOSE. VENDOR DOES NOT WARRANT THAT THE - FUNCTIONS CONTAINED IN THE SOFTWARE WILL MEET YOUR REQUIREMENTS, OR THAT - THE OPERATION OF THE SOFTWARE WILL BE UNINTERRUPTED OR ERROR-FREE, OR - THAT DEFECTS IN THE SOFTWARE WILL BE CORRECTED. THE ENTIRE RISK AS TO THE - RESULTS AND PERFORMANCE OF THE SOFTWARE IS ASSUMED BY YOU. FURTHERMORE, - VENDOR DOES NOT WARRANT OR MAKE ANY REPRESENTATIONS REGARDING THE USE OR - THE RESULTS OF THE USE OF THE SOFTWARE OR RELATED DOCUMENTATION IN TERMS - OF THEIR CORRECTNESS, ACCURACY, RELIABILITY, CURRENTNESS, OR OTHERWISE. - NO ORAL OR WRITTEN INFORMATION OR ADVICE GIVEN BY VENDOR OR VENDOR'S - AUTHORIZED REPRESENTATIVE SHALL CREATE A WARRANTY OR IN ANY WAY INCREASE - THE SCOPE OF THIS WARRANTY. SHOULD THE SOFTWARE PROVE DEFECTIVE, YOU (AND - NOT VENDOR OR VENDOR'S AUTHORIZED REPRESENTATIVE) ASSUME THE ENTIRE COST - OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. SOME JURISDICTIONS DO - NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO THE ABOVE EXCLUSION MAY - NOT APPLY TO YOU. - - 9. Limitation of Liability. UNDER NO CIRCUMSTANCES INCLUDING NEGLIGENCE, - SHALL VENDOR, OR ITS DIRECTORS, OFFICERS, EMPLOYEES OR AGENTS, BE LIABLE - TO YOU FOR ANY INCIDENTAL, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES - (INCLUDING DAMAGES FOR LOSS OF BUSINESS PROFITS, BUSINESS INTERRUPTION, - LOSS OF BUSINESS INFORMATION, AND THE LIKE) ARISING OUT OF THE USE, - MISUSE OR INABILITY TO USE THE SOFTWARE OR RELATED DOCUMENTATION, EVEN IF - VENDOR OR VENDOR'S AUTHORIZED REPRESENTATIVE HAS BEEN ADVISED OF THE - POSSIBILITY OF SUCH DAMAGES. SOME JURISDICTIONS DO NOT ALLOW THE - LIMITATION OR EXCLUSION OF LIABILITY FOR INCIDENTAL OR CONSEQUENTIAL - DAMAGES, SO THE ABOVE LIMITATION OR EXCLUSION MAY NOT APPLY TO YOU. In no - event shall VENDOR's total liability to you for all damages, losses, and - causes of action (whether in contract, tort (including negligence) or - otherwise) exceed the amount paid by you for the Software. - - 10. Controlling Law and Severability. This License shall be governed by and - construed in accordance with the laws of the United States and the State - of Minnesota, as applied to agreements entered into and to be performed - entirely within Minnesota between Minnesota residents. If for any reason - a court of competent jurisdiction finds any provision of this License or - portion thereof, to be unenforceable, that provision of the License shall - be enforced to the maximum extent permissible so as to effect the intent - of the parties, and the remainder of this License shall continue in full - force and effect. - - - -Appendix A - Wine License - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - -Appendix B - TCL License - -This software is copyrighted by the Regents of the University of California, -Sun Microsystems, Inc., Scriptics Corporation, and other parties. The following -terms apply to all files associated with the software unless explicitly -disclaimed in individual files. - -The authors hereby grant permission to use, copy, modify, distribute, and -license this software and its documentation for any purpose, provided that -existing copyright notices are retained in all copies and that this notice is -included verbatim in any distributions. No written agreement, license, or -royalty fee is required for any of the authorized uses. Modifications to this -software may be copyrighted by their authors and need not follow the licensing -terms described here, provided that the new terms are clearly indicated on the -first page of each file where they apply. - -IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY FOR -DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF -THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY DERIVATIVES THEREOF, EVEN -IF THE AUTHORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES, INCLUDING, -BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A -PARTICULAR PURPOSE, AND NON-INFRINGEMENT. THIS SOFTWARE IS PROVIDED ON AN "AS -IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE NO OBLIGATION TO PROVIDE -MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - -GOVERNMENT USE: If you are acquiring this software on behalf of the U.S. -government, the Government shall have only "Restricted Rights" in the software -and related documentation as defined in the Federal Acquisition Regulations -(FARs) in Clause 52.227.19 (c) (2). If you are acquiring the software on behalf -of the Department of Defense, the software shall be classified as "Commercial -Computer Software" and the Government shall have only "Restricted Rights" as -defined in Clause 252.227-7013 (c) (1) of DFARs. Notwithstanding the foregoing, -the authors grant the U.S. Government and others acting in its behalf -permission to use and distribute the software in accordance with the terms -specified in this license. - - ----------------< End of Formal License Grant >----------------------- - -OKAY, WE WERE JUST KIDDING. THERE'S NOTHING IN HERE ABOUT CARWASHES. BUT YOU -REALLY SHOULD READ THESE THINGS, YOU KNOW. (It's the Beige Honda minivan, if -you really insist). - -For those of you that do really care about license agreements, we close with -one final description of our motivation behind this document. - -The key legal principal operating here is that, under copyright law, you have -no rights to use this software. If you are a purchasing customer (or have been -granted a temporary evaluation license), then we grant you a right to use the -software. All humor aside, this is not intended as a License Agreement, in -which we attempt to coerce or bind you to terms you are not aware of. Instead, -this is a License Grant - a document that details the way in which your -purchase entitles you to use our software. The key point is that you have no -rights other than those explicitly described in this agreement. If you have -further thoughts about this license please email us at info@codeweavers.com; we -are always open to suggestions. diff --git a/licenses/oracle-jdbc b/licenses/oracle-jdbc deleted file mode 100644 index edaa84550292..000000000000 --- a/licenses/oracle-jdbc +++ /dev/null @@ -1,222 +0,0 @@ -Oracle Technology Network Development and Distribution License Terms - -Export Controls on the Programs -Selecting the "Accept License Agreement" button is a confirmation of your -agreement that you comply, now and during the trial term, with each of the -following statements: - --You are not a citizen, national, or resident of, and are not under control of, -the government of Cuba, Iran, Sudan, Libya, North Korea, Syria, nor any country -to which the United States has prohibited export. --You will not download or otherwise export or re-export the Programs, directly -or indirectly, to the above mentioned countries nor to citizens, nationals or -residents of those countries. --You are not listed on the United States Department of Treasury lists of -Specially Designated Nationals, Specially Designated Terrorists, and Specially -Designated Narcotic Traffickers, nor are you listed on the United States -Department of Commerce Table of Denial Orders. - -You will not download or otherwise export or re-export the Programs, directly or -indirectly, to persons on the above mentioned lists. - -You will not use the Programs for, and will not allow the Programs to be used -for, any purposes prohibited by United States law, including, without -limitation, for the development, design, manufacture or production of nuclear, -chemical or biological weapons of mass destruction. - -EXPORT RESTRICTIONS -You agree that U.S. export control laws and other applicable export and import -laws govern your use of the programs, including technical data; additional -information can be found on Oracle®'s Global Trade Compliance web site -(http://www.oracle.com/products/export). - -You agree that neither the programs nor any direct product thereof will be -exported, directly, or indirectly, in violation of these laws, or will be used -for any purpose prohibited by these laws including, without limitation, nuclear, -chemical, or biological weapons proliferation. - -Oracle Employees: Under no circumstances are Oracle Employees authorized to -download software for the purpose of distributing it to customers. Oracle -products are available to employees for internal use or demonstration purposes -only. In keeping with Oracle's trade compliance obligations under U.S. and -applicable multilateral law, failure to comply with this policy could result in -disciplinary action up to and including termination. - -Note: You are bound by the Oracle Technology Network ("OTN") License Agreement -terms. The OTN License Agreement terms also apply to all updates you receive -under your Technology Track subscription. - -The OTN License Agreement terms below supercede any shrinkwrap license on the -OTN Technology Track software CDs and previous OTN License terms (including the -Oracle Program License as modified by the OTN Program Use Certificate). - -Oracle Technology Network Development and Distribution License Agreement - - -"We," "us," and "our" refers to Oracle USA, Inc., for and on behalf of itself -and its subsidiaries and affiliates under common control. "You" and "your" -refers to the individual or entity that wishes to use the programs from Oracle. -"Programs" refers to the software product you wish to download and use and -program documentation. "License" refers to your right to use the programs under -the terms of this agreement. This agreement is governed by the substantive and -procedural laws of California. You and Oracle agree to submit to the exclusive -jurisdiction of, and venue in, the courts of San Francisco, San Mateo, or Santa -Clara counties in California in any dispute arising out of or relating to this -agreement. - -We are willing to license the programs to you only upon the condition that you -accept all of the terms contained in this agreement. Read the terms carefully -and select the "Accept" button at the bottom of the page to confirm your -acceptance. If you are not willing to be bound by these terms, select the "Do -Not Accept" button and the registration process will not continue. - -License Rights -We grant you a nonexclusive, nontransferable limited license to use the programs -for purposes of developing your applications. You may also distribute the -programs with your applications to your customers. If you want to use the -programs for any purpose other than as expressly permitted under this agreement -you must contact us, or an Oracle reseller, to obtain the appropriate license. -We may audit your use of the programs. Program documentation is either shipped -with the programs, or documentation may accessed online at -http://otn.oracle.com/docs. - -Ownership and Restrictions -We retain all ownership and intellectual property rights in the programs. You -may make a sufficient number of copies of the programs for the licensed use and -one copy of the programs for backup purposes. - -You may not: -- use the programs for any purpose other than as provided above; -- distribute the programs unless accompanied with your applications; -- charge your end users for use of the programs; -- remove or modify any program markings or any notice of our proprietary rights; -- use the programs to provide third party training on the content and/or -functionality of the programs, except for training your licensed users; -- assign this agreement or give the programs, program access or an interest in -the programs to any individual or entity except as provided under this -agreement; -- cause or permit reverse engineering (unless required by law for -interoperability), disassembly or decompilation of the programs; -- disclose results of any program benchmark tests without our prior consent; or, -- use any Oracle name, trademark or logo. - -Program Distribution -We grant you a nonexclusive, nontransferable right to copy and distribute the -programs to your end users provided that you do not charge your end users for -use of the programs and provided your end users may only use the programs to run -your applications for their business operations. Prior to distributing the -programs you shall require your end users to execute an agreement binding them -to terms consistent with those contained in this section and the sections of -this agreement entitled "License Rights," "Ownership and Restrictions," -"Export," "Disclaimer of Warranties and Exclusive Remedies," "No Technical -Support," "End of Agreement," "Relationship Between the Parties," and "Open -Source." You must also include a provision stating that your end users shall -have no right to distribute the programs, and a provision specifying us as a -third party beneficiary of the agreement. You are responsible for obtaining -these agreements with your end users. - -You agree to: (a) defend and indemnify us against all claims and damages caused -by your distribution of the programs in breach of this agreements and/or failure -to include the required contractual provisions in your end user agreement as -stated above; (b) keep executed end user agreements and records of end user -information including name, address, date of distribution and identity of -programs distributed; (c) allow us to inspect your end user agreements and -records upon request; and, (d) enforce the terms of your end user agreements so -as to effect a timely cure of any end user breach, and to notify us of any -breach of the terms. - -Export -You agree that U.S. export control laws and other applicable export and import -laws govern your use of the programs, including technical data; additional -information can be found on Oracle's Global Trade Compliance web site located at -http://www.oracle.com/products/export/index.html?content.html. You agree that -neither the programs nor any direct product thereof will be exported, directly, -or indirectly, in violation of these laws, or will be used for any purpose -prohibited by these laws including, without limitation, nuclear, chemical, or -biological weapons proliferation. - -Disclaimer of Warranty and Exclusive Remedies - -THE PROGRAMS ARE PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND. WE FURTHER -DISCLAIM ALL WARRANTIES, EXPRESS AND IMPLIED, INCLUDING WITHOUT LIMITATION, ANY -IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR -NONINFRINGEMENT. - -IN NO EVENT SHALL WE BE LIABLE FOR ANY INDIRECT, INCIDENTAL, SPECIAL, PUNITIVE -OR CONSEQUENTIAL DAMAGES, OR DAMAGES FOR LOSS OF PROFITS, REVENUE, DATA OR DATA -USE, INCURRED BY YOU OR ANY THIRD PARTY, WHETHER IN AN ACTION IN CONTRACT OR -TORT, EVEN IF WE HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. OUR -ENTIRE LIABILITY FOR DAMAGES HEREUNDER SHALL IN NO EVENT EXCEED ONE THOUSAND -DOLLARS (U.S. $1,000). - -No Technical Support -Our technical support organization will not provide technical support, phone -support, or updates to you for the programs licensed under this agreement. - -Restricted Rights -If you distribute a license to the United States government, the programs, -including documentation, shall be considered commercial computer software and -you will place a legend, in addition to applicable copyright notices, on the -documentation, and on the media label, substantially similar to the following: -NOTICE OF RESTRICTED RIGHTS -"Programs delivered subject to the DOD FAR Supplement are 'commercial computer -software' and use, duplication, and disclosure of the programs, including -documentation, shall be subject to the licensing restrictions set forth in the -applicable Oracle license agreement. Otherwise, programs delivered subject to -the Federal Acquisition Regulations are 'restricted computer software' and use, -duplication, and disclosure of the programs, including documentation, shall be -subject to the restrictions in FAR 52.227-19, Commercial Computer -Software-Restricted Rights (June 1987). Oracle USA, Inc., 500 Oracle Parkway, -Redwood City, CA 94065." - -End of Agreement -You may terminate this agreement by destroying all copies of the programs. We -have the right to terminate your right to use the programs if you fail to comply -with any of the terms of this agreement, in which case you shall destroy all -copies of the programs. - -Relationship Between the Parties -The relationship between you and us is that of licensee/licensor. Neither party -will represent that it has any authority to assume or create any obligation, -express or implied, on behalf of the other party, nor to represent the other -party as agent, employee, franchisee, or in any other capacity. Nothing in this -agreement shall be construed to limit either party's right to independently -develop or distribute software that is functionally similar to the other party's -products, so long as proprietary information of the other party is not included -in such software. - -Open Source -"Open Source" software - software available without charge for use, modification -and distribution - is often licensed under terms that require the user to make -the user's modifications to the Open Source software or any software that the -user 'combines' with the Open Source software freely available in source code -form. If you use Open Source software in conjunction with the programs, you must -ensure that your use does not: (i) create, or purport to create, obligations of -us with respect to the Oracle programs; or (ii) grant, or purport to grant, to -any third party any rights to or immunities under our intellectual property or -proprietary rights in the Oracle programs. For example, you may not develop a -software program using an Oracle program and an Open Source program where such -use results in a program file(s) that contains code from both the Oracle program -and the Open Source program (including without limitation libraries) if the Open -Source program is licensed under a license that requires any "modifications" be -made freely available. You also may not combine the Oracle program with programs -licensed under the GNU General Public License ("GPL") in any manner that could -cause, or could be interpreted or asserted to cause, the Oracle program or any -modifications thereto to become subject to the terms of the GPL. - -Entire Agreement -You agree that this agreement is the complete agreement for the programs and -licenses, and this agreement supersedes all prior or contemporaneous agreements -or representations. If any term of this agreement is found to be invalid or -unenforceable, the remaining provisions will remain effective. - -Last updated: 03/09/05 - -Should you have any questions concerning this License Agreement, or if you -desire to contact Oracle for any reason, please write: -Oracle USA, Inc. -500 Oracle Parkway, -Redwood City, CA 94065 - -Oracle may contact you to ask if you had a satisfactory experience installing -and using this OTN software download. diff --git a/licenses/sun-bcla-j2ee-deployment b/licenses/sun-bcla-j2ee-deployment deleted file mode 100644 index 244543d10017..000000000000 --- a/licenses/sun-bcla-j2ee-deployment +++ /dev/null @@ -1,199 +0,0 @@ -Sun Microsystems, Inc. -Binary Code License Agreement - -READ THE TERMS OF THIS AGREEMENT AND ANY PROVIDED SUPPLEMEN -TAL LICENSE TERMS (COLLECTIVELY "AGREEMENT") CAREFULLY BEFO -RE OPENING THE SOFTWARE MEDIA PACKAGE. BY OPENING THE SOFT -WARE MEDIA PACKAGE, YOU AGREE TO THE TERMS OF THIS AGREEMEN -T. IF YOU ARE ACCESSING THE SOFTWARE ELECTRONICALLY, INDIC -ATE YOUR ACCEPTANCE OF THESE TERMS BY SELECTING THE "ACCEPT -" BUTTON AT THE END OF THIS AGREEMENT. IF YOU DO NOT AGREE - TO ALL THESE TERMS, PROMPTLY RETURN THE UNUSED SOFTWARE TO - YOUR PLACE OF PURCHASE FOR A REFUND OR, IF THE SOFTWARE IS - ACCESSED ELECTRONICALLY, SELECT THE "DECLINE" BUTTON AT TH -E END OF THIS AGREEMENT. - -1. LICENSE TO USE. Sun grants you a non-exclusive and non --transferable license for the internal use only of the acco -mpanying software and documentation and any error correctio -ns provided by Sun (collectively "Software"), by the number - of users and the class of computer hardware for which the -corresponding fee has been paid. - -2. RESTRICTIONS. Software is confidential and copyrighted -. Title to Software and all associated intellectual propert -y rights is retained by Sun and/or its licensors. Except a -s specifically authorized in any Supplemental License Terms -, you may not make copies of Software, other than a single -copy of Software for archival purposes. Unless enforcement - is prohibited by applicable law, you may not modify, decom -pile, or reverse engineer Software. Licensee acknowledges -that Licensed Software is not designed or intended for use -in the design, construction, operation or maintenance of an -y nuclear facility. Sun Microsystems, Inc. disclaims any ex -press or implied warranty of fitness for such uses. No ri -ght, title or interest in or to any trademark, service mark -, logo or trade name of Sun or its licensors is granted und -er this Agreement. - -3. LIMITED WARRANTY. Sun warrants to you that for a perio -d of ninety (90) days from the date of purchase, as evidenc -ed by a copy of the receipt, the media on which Software is - furnished (if any) will be free of defects in materials an -d workmanship under normal use. Except for the foregoing, -Software is provided "AS IS". Your exclusive remedy and Su -n's entire liability under this limited warranty will be at - Sun's option to replace Software media or refund the fee p -aid for Software. - -4. DISCLAIMER OF WARRANTY. UNLESS SPECIFIED IN THIS AGREE -MENT, ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AN -D WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABI -LITY, FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT -ARE DISCLAIMED, EXCEPT TO THE EXTENT THAT THESE DISCLAIMERS - ARE HELD TO BE LEGALLY INVALID. - -5. LIMITATION OF LIABILITY. TO THE EXTENT NOT PROHIBITED -BY LAW, IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR - ANY LOST REVENUE, PROFIT OR DATA, OR FOR SPECIAL, INDIRECT -, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CA -USED REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF -OR RELATED TO THE USE OF OR INABILITY TO USE SOFTWARE, EVEN - IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES -. In no event will Sun's liability to you, whether in cont -ract, tort (including negligence), or otherwise, exceed the - amount paid by you for Software under this Agreement. The - foregoing limitations will apply even if the above stated -warranty fails of its essential purpose. - -6. Termination. This Agreement is effective until termina -ted. You may terminate this Agreement at any time by destr -oying all copies of Software. This Agreement will terminat -e immediately without notice from Sun if you fail to comply - with any provision of this Agreement. Upon Termination, y -ou must destroy all copies of Software. - -7. Export Regulations. All Software and technical data del -ivered under this Agreement are subject to US export contro -l laws and may be subject to export or import regulations i -n other countries. You agree to comply strictly with all s -uch laws and regulations and acknowledge that you have the -responsibility to obtain such licenses to export, re-export -, or import as may be required after delivery to you. - -8. U.S. Government Restricted Rights. If Software is bein -g acquired by or on behalf of the U.S. Government or by a U -.S. Government prime contractor or subcontractor (at any ti -er), then the Government's rights in Software and accompany -ing documentation will be only as set forth in this Agreeme -nt; this is in accordance with 48 CFR 227.7201 through 227. -7202-4 (for Department of Defense (DOD) acquisitions) and w -ith 48 CFR 2.101 and 12.212 (for non-DOD acquisitions). - -9. Governing Law. Any action related to this Agreement wi -ll be governed by California law and controlling U.S. feder -al law. No choice of law rules of any jurisdiction will ap -ply. - -10. Severability. If any provision of this Agreement is hel -d to be unenforceable, this Agreement will remain in effect - with the provision omitted, unless omission would frustrat -e the intent of the parties, in which case this Agreement w -ill immediately terminate. - -11. Integration. This Agreement is the entire agreement be -tween you and Sun relating to its subject matter. It super -sedes all prior or contemporaneous oral or written communic -ations, proposals, representations and warranties and preva -ils over any conflicting or additional terms of any quote, -order, acknowledgment, or other communication between the p -arties relating to its subject matter during the term of th -is Agreement. No modification of this Agreement will be bi -nding, unless in writing and signed by an authorized repres -entative of each party. - -JAVA(TM) INTERFACE CLASSES -J2EE(TM) DEPLOYMENT SPECIFICATION INTERFACE CLASSES 1.1 -SUPPLEMENTAL LICENSE TERMS - -These supplemental license terms ("Supplemental Terms") add - to or modify the terms of the Binary Code License Agreemen -t (collectively, the "Agreement"). Capitalized terms not de -fined in these Supplemental Terms shall have the same meani -ngs ascribed to them in the Agreement. These Supplemental T -erms shall supersede any inconsistent or conflicting terms -in the Agreement, or in any license contained within the So -ftware. - -1. Software Internal Use and Development License Grant. Sub -ject to the terms and conditions of this Agreement, includi -ng, but not limited to Section 3 (Java(TM) Technology Restr -ictions) of these Supplemental Terms, Sun grants you a non- -exclusive, non-transferable, limited license to reproduce i -nternally and use internally the binary form of the Softwar -e, complete and unmodified, for the sole purpose of designi -ng, developing and testing your Java applets and applicatio -ns ("Programs"). - -2. License to Distribute Software. In addition to the lice -nse granted in Section 1 (Software Internal Use and Develop -ment License Grant) of these Supplemental Terms, subject to - the terms and conditions of this Agreement, including but -not limited to Section 3 (Java Technology Restrictions), Su -n grants you a non-exclusive, non-transferable, limited lic -ense to reproduce and distribute the Software in binary for -m only, provided that you (i) distribute the Software compl -ete and unmodified and only bundled as part of your Program -s, (ii) do not distribute additional software intended to r -eplace any component(s) of the Software, (iii) do not remov -e or alter any proprietary legends or notices contained in -the Software, (iv) only distribute the Software subject to -a license agreement that protects Sun's interests consisten -t with the terms contained in this Agreement, and (v) agree - to defend and indemnify Sun and its licensors from and aga -inst any damages, costs, liabilities, settlement amounts an -d/or expenses (including attorneys' fees) incurred in conne -ction with any claim, lawsuit or action by any third party -that arises or results from the use or distribution of any -and all Programs and/or Software. - -3. Java Technology Restrictions. You may not modify the Jav -a Platform Interface ("JPI", identified as classes containe -d within the "java" package or any subpackages of the "java -" package), by creating additional classes within the JPI o -r otherwise causing the addition to or modification of the -classes in the JPI. In the event that you create an additi -onal class and associated API(s) which (i) extends the func -tionality of the Java Platform, and (ii) is exposed to thir -d party software developers for the purpose of developing a -dditional software which invokes such additional API, you m -ust promptly publish broadly an accurate specification for -such API for free use by all developers. You may not create -, or authorize your licensees to create additional classes, - interfaces, or subpackages that are in any way identified -as "java", "javax", "sun" or similar convention as specifie -d by Sun in any naming convention designation. - -4. Trademarks and Logos. You acknowledge and agree as betwe -en you and Sun that Sun owns the SUN, SOLARIS, JAVA, JINI, -FORTE, and iPLANET trademarks and all SUN, SOLARIS, JAVA, J -INI, FORTE, and iPLANET-related trademarks, service marks, -logos and other brand designations ("Sun Marks"), and you a -gree to comply with the Sun Trademark and Logo Usage Requir -ements currently located at http://www.sun.com/policies/tra -demarks. Any use you make of the Sun Marks inures to Sun's -benefit. - -5. Source Code. Software may contain source code that is pr -ovided solely for reference purposes pursuant to the terms -of this Agreement. Source code may not be redistributed un -less expressly provided for in this Agreement. - -6. Termination for Infringement. Either party may termina -te this Agreement immediately should any Software become, o -r in either party's opinion be likely to become, the subjec -t of a claim of infringement of any intellectual property r -ight. - -For inquiries please contact: Sun Microsystems, Inc. 4150 N -etwork Circle, Santa Clara, California 95054.
\ No newline at end of file diff --git a/media-libs/libsamplerate/Manifest b/media-libs/libsamplerate/Manifest index 0586cef85f06..9c39646573f8 100644 --- a/media-libs/libsamplerate/Manifest +++ b/media-libs/libsamplerate/Manifest @@ -1 +1,2 @@ +DIST libsamplerate-0.1.8.tar.gz 4303330 SHA256 93b54bdf46d5e6d2354b7034395fe329c222a966790de34520702bb9642f1c06 SHA512 85d93df24d9d62e7803a5d0ac5d268b2085214adcb160e32fac316b12ee8a0ce36ccfb433a3c0a08f6e3ec418a5962bdb84f8a11262286a9b347436983029a7d WHIRLPOOL 5aff2290372570178752fedb5cafe1cb8d30cd8aa0910f8f7a2333d41746ac7a88e5cc7f7228eb8ba60aa2908fad0242214ac3e29346db04cc1e9cc66386eddf DIST libsamplerate-0.1.9.tar.gz 4336641 SHA256 0a7eb168e2f21353fb6d84da152e4512126f7dc48ccb0be80578c565413444c1 SHA512 78596657963cbf06785e3e6e1190b093df71da52ca340e75bd8246a962cd79dd1c90fa5527c607cebcb296e2c1ee605015278b274e3b768f2f3fbeb0eadfb728 WHIRLPOOL 3591f08cd64f731a8bdd02daabec6b7bc6bcd9f6806bab4f687f3c120481d4cfbcf5fd7752052a6147358b7471549c99d963615bda89b9679b1e091b636e7b8e diff --git a/media-libs/libsamplerate/libsamplerate-0.1.8-r1.ebuild b/media-libs/libsamplerate/libsamplerate-0.1.8-r1.ebuild new file mode 100644 index 000000000000..05981cf9a5c2 --- /dev/null +++ b/media-libs/libsamplerate/libsamplerate-0.1.8-r1.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +AUTOTOOLS_AUTORECONF=1 +AUTOTOOLS_PRUNE_LIBTOOL_FILES=all +inherit autotools-multilib + +DESCRIPTION="Secret Rabbit Code (aka libsamplerate) is a Sample Rate Converter for audio" +HOMEPAGE="http://www.mega-nerd.com/SRC/" +SRC_URI="http://www.mega-nerd.com/SRC/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="ia64" +IUSE="sndfile static-libs" + +RDEPEND="sndfile? ( >=media-libs/libsndfile-1.0.2 ) + abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r6 + !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +DOCS=( AUTHORS ChangeLog NEWS README ) + +src_prepare() { + local PATCHES=( + "${FILESDIR}/${PN}-0.1.3-dontbuild-tests-examples.patch" + "${FILESDIR}/${P}-lm.patch" + ) + + AT_M4DIR="M4" \ + autotools-multilib_src_prepare +} + +src_configure() { + my_configure() { + local myeconfargs=( + --disable-fftw + ) + + if [ "${ABI}" = "${DEFAULT_ABI}" ] ; then + myeconfargs+=( $(use_enable sndfile) ) + else + myeconfargs+=( --disable-sndfile ) + fi + + autotools-utils_src_configure + + if [ "${ABI}" != "${DEFAULT_ABI}" ] ; then + sed -i -e "s/ doc examples//" "${BUILD_DIR}/Makefile" || die + fi + } + multilib_parallel_foreach_abi my_configure +} + +src_install() { + autotools-multilib_src_install \ + htmldocdir="${EPREFIX}/usr/share/doc/${PF}/html" +} diff --git a/profiles/desc/collectd_plugins.desc b/profiles/desc/collectd_plugins.desc index 31fe67c93bc3..f2bcd532951c 100644 --- a/profiles/desc/collectd_plugins.desc +++ b/profiles/desc/collectd_plugins.desc @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation. +# Copyright 1999-2017 Gentoo Foundation. # Distributed under the terms of the GNU General Public License v2 # This file contains descriptions of COLLECTD_PLUGINS USE_EXPAND flags. @@ -35,7 +35,6 @@ exec - Build the exec input/output plugin (executes scripts / applications and r fhcount - Build the file handles input plugin (reports the number of used file handles) filecount - Build the filecount input plugin (counts the number of files in a directory and all its subdirectories) fscache - Build the fscache input plugin (collects information about the file-system based caching infrastructure for network file-systems and other slow media) -genericjmx - Build the GenericJMX input plugin (reads Managed Beans (MBeans) from an MBeanServer using JMX input plugin; Requires JAVA) gmond - Build the gmond input plugin (receives data from gmond, the client daemon of the Ganglia project) gps - Build the gps input plugin (collects number of satellites seen by a GPS receiver using sci-geosciences/gpsd) hddtemp - Build the hddtemp input plugin (collects the temperature of disks from hddtemp daemon) @@ -128,7 +127,6 @@ write_http - Build the write_http output plugin (sends metrics to a web-server u write_kafka - Build the Kafka output plugin (sends metrics to Apache Kafka) write_log - Build the write_log output plugin (writes metrics to a file) write_redis - Build the Redis output plugin (stores values in Redis) -write_riemann - Build the Riemann output plugin (stores values in Riemann, a stream processing and monitoring system) write_sensu - Build the Sensu output plugin (sends metrics to Sensu Core, an open-source monitoring project) write_tsdb - Build the TSDB output plugin (writes metrics to OpenTSDB, an open-source distributed time-series database based on Apache HBase) xencpu - Build the XEN CPU input plugin (collects XEN Hypervisor CPU stats using app-emulation/xen-tools) diff --git a/profiles/desc/gpsd_protocols.desc b/profiles/desc/gpsd_protocols.desc index cb90ac520ade..dc148efc497b 100644 --- a/profiles/desc/gpsd_protocols.desc +++ b/profiles/desc/gpsd_protocols.desc @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation. +# Copyright 1999-2017 Gentoo Foundation. # Distributed under the terms of the GNU General Public License v2 # This file contains descriptions of possible protocols for gpsd package. @@ -34,4 +34,3 @@ tnt - True North protocol support tripmate - Tripmate protocol support tsip - Trimble TSIP protocol support ublox - U-Blox Protocol support -ubx - UBX protocol support diff --git a/profiles/use.desc b/profiles/use.desc index 311c3412018b..a09d6f61f8e0 100644 --- a/profiles/use.desc +++ b/profiles/use.desc @@ -164,7 +164,6 @@ jpeg - Add JPEG image support jpeg2k - Support for JPEG 2000, a wavelet-based image compression format kde - Add support for KDE (K Desktop Environment) kerberos - Add kerberos support -kolab - Add support for the Kolab groupware server kontact - Enable support for the KDE personal information manager (kde-apps/kdepim*) ladspa - Enable the ability to support ladspa plugins lame - Prefer using LAME libraries for MP3 encoding support diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index 4b3f649fd620..d2b4c84ad63e 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -13,7 +13,7 @@ fi PYTHON_COMPAT=( python{3_4,3_5,3_6} ) -inherit bash-completion-r1 linux-info multilib-minimal multiprocessing pam python-any-r1 systemd toolchain-funcs udev user +inherit bash-completion-r1 linux-info multilib-minimal ninja-utils pam python-any-r1 systemd toolchain-funcs udev user DESCRIPTION="System and service manager for Linux" HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd" @@ -285,15 +285,6 @@ multilib_src_configure() { "$@" || die } -eninja() { - if [[ -z ${NINJAOPTS+set} ]]; then - NINJAOPTS="-j $(makeopts_jobs) -l $(makeopts_loadavg "${MAKEOPTS}" 0)" - fi - set -- ninja -v ${NINJAOPTS} "$@" - echo "$@" - "$@" || die -} - multilib_src_compile() { eninja } diff --git a/www-client/chromium/chromium-59.0.3071.47.ebuild b/www-client/chromium/chromium-59.0.3071.47.ebuild index 909ae41ab28d..cb5041167a2d 100644 --- a/www-client/chromium/chromium-59.0.3071.47.ebuild +++ b/www-client/chromium/chromium-59.0.3071.47.ebuild @@ -8,7 +8,7 @@ CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr sv sw ta te th tr uk vi zh-CN zh-TW" -inherit check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib multiprocessing pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs versionator virtualx xdg-utils +inherit check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs versionator virtualx xdg-utils DESCRIPTION="Open-source version of Google Chrome web browser" HOMEPAGE="http://chromium.org/" @@ -504,23 +504,6 @@ src_configure() { out/Release/gn gen --args="${myconf_gn}" out/Release || die } -eninja() { - if [[ -z ${NINJAOPTS+set} ]]; then - local jobs=$(makeopts_jobs) - local loadavg=$(makeopts_loadavg) - - if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then - NINJAOPTS+=" -j ${jobs}" - fi - if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then - NINJAOPTS+=" -l ${loadavg}" - fi - fi - set -- ninja -v ${NINJAOPTS} "$@" - echo "$@" - "$@" -} - src_compile() { local ninja_targets="chrome chromedriver" if use suid; then diff --git a/www-client/chromium/chromium-60.0.3095.5.ebuild b/www-client/chromium/chromium-60.0.3095.5.ebuild index 1a29ba35961c..210fb31567be 100644 --- a/www-client/chromium/chromium-60.0.3095.5.ebuild +++ b/www-client/chromium/chromium-60.0.3095.5.ebuild @@ -8,7 +8,7 @@ CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr sv sw ta te th tr uk vi zh-CN zh-TW" -inherit check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib multiprocessing pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs versionator virtualx xdg-utils +inherit check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs versionator virtualx xdg-utils DESCRIPTION="Open-source version of Google Chrome web browser" HOMEPAGE="http://chromium.org/" @@ -510,23 +510,6 @@ src_configure() { out/Release/gn gen --args="${myconf_gn}" out/Release || die } -eninja() { - if [[ -z ${NINJAOPTS+set} ]]; then - local jobs=$(makeopts_jobs) - local loadavg=$(makeopts_loadavg) - - if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then - NINJAOPTS+=" -j ${jobs}" - fi - if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then - NINJAOPTS+=" -l ${loadavg}" - fi - fi - set -- ninja -v ${NINJAOPTS} "$@" - echo "$@" - "$@" -} - src_compile() { local ninja_targets="chrome chromedriver" if use suid; then |