diff options
45 files changed, 1294 insertions, 117 deletions
diff --git a/app-emulation/qemu/qemu-2.5.0-r2.ebuild b/app-emulation/qemu/qemu-2.5.0-r2.ebuild index 072691e8cc09..340575ff0a03 100644 --- a/app-emulation/qemu/qemu-2.5.0-r2.ebuild +++ b/app-emulation/qemu/qemu-2.5.0-r2.ebuild @@ -99,7 +99,7 @@ SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND} ) infiniband? ( sys-infiniband/librdmacm:=[static-libs(+)] ) iscsi? ( net-libs/libiscsi ) - jpeg? ( virtual/jpeg:=[static-libs(+)] ) + jpeg? ( virtual/jpeg:0=[static-libs(+)] ) lzo? ( dev-libs/lzo:2[static-libs(+)] ) ncurses? ( sys-libs/ncurses:0=[static-libs(+)] ) nfs? ( >=net-fs/libnfs-1.9.3[static-libs(+)] ) diff --git a/app-emulation/qemu/qemu-2.5.0-r3.ebuild b/app-emulation/qemu/qemu-2.5.0-r3.ebuild index 755f5a68f56d..8e1bc0b2c2e1 100644 --- a/app-emulation/qemu/qemu-2.5.0-r3.ebuild +++ b/app-emulation/qemu/qemu-2.5.0-r3.ebuild @@ -99,7 +99,7 @@ SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND} ) infiniband? ( sys-infiniband/librdmacm:=[static-libs(+)] ) iscsi? ( net-libs/libiscsi ) - jpeg? ( virtual/jpeg:=[static-libs(+)] ) + jpeg? ( virtual/jpeg:0=[static-libs(+)] ) lzo? ( dev-libs/lzo:2[static-libs(+)] ) ncurses? ( sys-libs/ncurses:0=[static-libs(+)] ) nfs? ( >=net-fs/libnfs-1.9.3[static-libs(+)] ) diff --git a/app-emulation/qemu/qemu-2.5.1.ebuild b/app-emulation/qemu/qemu-2.5.1.ebuild index ae5fa97bd6a3..ffe487692b0f 100644 --- a/app-emulation/qemu/qemu-2.5.1.ebuild +++ b/app-emulation/qemu/qemu-2.5.1.ebuild @@ -99,7 +99,7 @@ SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND} ) infiniband? ( sys-infiniband/librdmacm:=[static-libs(+)] ) iscsi? ( net-libs/libiscsi ) - jpeg? ( virtual/jpeg:=[static-libs(+)] ) + jpeg? ( virtual/jpeg:0=[static-libs(+)] ) lzo? ( dev-libs/lzo:2[static-libs(+)] ) ncurses? ( sys-libs/ncurses:0=[static-libs(+)] ) nfs? ( >=net-fs/libnfs-1.9.3[static-libs(+)] ) diff --git a/app-emulation/qemu/qemu-2.6.0.ebuild b/app-emulation/qemu/qemu-2.6.0.ebuild index 8028b8b8196b..81504ad9deee 100644 --- a/app-emulation/qemu/qemu-2.6.0.ebuild +++ b/app-emulation/qemu/qemu-2.6.0.ebuild @@ -94,7 +94,7 @@ SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND} ) infiniband? ( sys-infiniband/librdmacm:=[static-libs(+)] ) iscsi? ( net-libs/libiscsi ) - jpeg? ( virtual/jpeg:=[static-libs(+)] ) + jpeg? ( virtual/jpeg:0=[static-libs(+)] ) lzo? ( dev-libs/lzo:2[static-libs(+)] ) ncurses? ( sys-libs/ncurses:0=[static-libs(+)] ) nfs? ( >=net-fs/libnfs-1.9.3[static-libs(+)] ) diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild index 6ca8a48bccad..8f136c3f78de 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-9999.ebuild @@ -94,7 +94,7 @@ SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND} ) infiniband? ( sys-infiniband/librdmacm:=[static-libs(+)] ) iscsi? ( net-libs/libiscsi ) - jpeg? ( virtual/jpeg:=[static-libs(+)] ) + jpeg? ( virtual/jpeg:0=[static-libs(+)] ) lzo? ( dev-libs/lzo:2[static-libs(+)] ) ncurses? ( sys-libs/ncurses:0=[static-libs(+)] ) nfs? ( >=net-fs/libnfs-1.9.3[static-libs(+)] ) diff --git a/dev-haskell/juicypixels/Manifest b/dev-haskell/juicypixels/Manifest index f3df0bf21159..8ffadaf9a36c 100644 --- a/dev-haskell/juicypixels/Manifest +++ b/dev-haskell/juicypixels/Manifest @@ -1,4 +1,2 @@ -DIST JuicyPixels-3.1.7.1.tar.gz 96433 SHA256 5751e984068e7a325f6b45a3d00f827aee49e4e63abf2a84a9b6c3dcb09d1a56 SHA512 c5ba19641b61789cd471e0de038c58712989945bfcd340d769f4614b3fd7b1f6073349a8b48115c6a9ca83cb8fc813f715e55f08acd230940ca04084210ffccc WHIRLPOOL 55ef29470528c301012192cb30535e56342cdf9190207a0869d83bdd6bda1c48188582ab3589ccf8375e7a57c294403314792422ecc78717d28f5f65fb8ed44b DIST JuicyPixels-3.2.5.3.tar.gz 116074 SHA256 fc36f130e678119475434febcdfe75e1e083062a4729a3104cc5bdc7972cd8ce SHA512 e5c0b0442b1b79aa751afed9a5df23b9fc1f3bfddd0d7b0f3751053018f4434331a0e0ecb16d2fc36a87d3edd3fc06727cfa9557607a02d7040ead623a5917bd WHIRLPOOL 93322b1b474befddc189e8c5ded6fb5343f421e488c57b4c9108f9b729028278ca807d92e28651b5e5acfbedcc0c3c5d01ad0198f9e347f84a3672efaff6d17a -DIST JuicyPixels-3.2.6.4.tar.gz 116527 SHA256 6268583fd7915913b3d68a399184bfcfebfaa010be9aa10232d76324df65a6ac SHA512 830743b3a06efb4a39e8b6f44a21c25b8bb4afcb98b55a2e23653786829773ef774ad6ccffd2ee05001972afb594d4ddac20cad60b6bf2a6c4b7fd5a954036b9 WHIRLPOOL 2bb7c588f45ee6cf563fe1787486ad695fab3657faebcff6ca12a41ae098696d0273cd192ae7bafcb5a9464f09efa930bcfe585962ba75e18ad96733aed58a51 DIST JuicyPixels-3.2.7.tar.gz 118647 SHA256 0126ff02d78045a299e76a35e2a3d3d188e7512f08d57e89bf1e0a94eb6ff14b SHA512 418d887a799fc46f4c73da1ebae0288e0f25e21c943f38dbf0b2519096e4ba145711a05d9da7bb1e588a5183e91ab09dfe3a209a6728c610eb5771a5d963ee6a WHIRLPOOL e46aa8a353688948e8e2ac39a63c21ca20a8288ce4377e6cffa6867429e40e131e8ef4dce69bf3f030bd89feb6760de0dbf7c4e1695c4fe990145bba1c52a7f7 diff --git a/dev-haskell/juicypixels/juicypixels-3.1.7.1.ebuild b/dev-haskell/juicypixels/juicypixels-3.1.7.1.ebuild deleted file mode 100644 index e98d54f843fd..000000000000 --- a/dev-haskell/juicypixels/juicypixels-3.1.7.1.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -# ebuild generated by hackport 0.4.3.9999 - -CABAL_FEATURES="lib profile haddock hoogle hscolour" -inherit haskell-cabal - -MY_PN="JuicyPixels" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Picture loading/serialization (in png, jpeg, bitmap, gif, tiff and radiance)" -HOMEPAGE="https://github.com/Twinside/Juicy.Pixels" -SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="mmap" - -RDEPEND=">=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.8:=[profile?] - >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] - >=dev-haskell/primitive-0.4:=[profile?] <dev-haskell/primitive-0.6:=[profile?] - >=dev-haskell/transformers-0.2:=[profile?] - >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.11:=[profile?] - >=dev-haskell/zlib-0.5.3.1:=[profile?] <dev-haskell/zlib-0.6:=[profile?] - >=dev-lang/ghc-7.4.1:= - mmap? ( dev-haskell/mmap:=[profile?] ) -" -DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.10 -" - -S="${WORKDIR}/${MY_P}" - -src_configure() { - haskell-cabal_src_configure \ - $(cabal_flag mmap mmap) -} diff --git a/dev-haskell/juicypixels/juicypixels-3.2.5.3.ebuild b/dev-haskell/juicypixels/juicypixels-3.2.5.3.ebuild index 88f18b309bdb..1dbefd6f23ae 100644 --- a/dev-haskell/juicypixels/juicypixels-3.2.5.3.ebuild +++ b/dev-haskell/juicypixels/juicypixels-3.2.5.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -12,7 +12,7 @@ inherit haskell-cabal MY_PN="JuicyPixels" MY_P="${MY_PN}-${PV}" -DESCRIPTION="Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)" +DESCRIPTION="Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and others)" HOMEPAGE="https://github.com/Twinside/Juicy.Pixels" SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz" diff --git a/dev-haskell/juicypixels/juicypixels-3.2.6.4.ebuild b/dev-haskell/juicypixels/juicypixels-3.2.6.4.ebuild deleted file mode 100644 index f64edd1b1e2e..000000000000 --- a/dev-haskell/juicypixels/juicypixels-3.2.6.4.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -# ebuild generated by hackport 0.4.6.9999 - -CABAL_FEATURES="lib profile haddock hoogle hscolour" -inherit haskell-cabal - -MY_PN="JuicyPixels" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)" -HOMEPAGE="https://github.com/Twinside/Juicy.Pixels" -SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="mmap" - -RDEPEND=">=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.8:=[profile?] - >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] - >=dev-haskell/primitive-0.4:=[profile?] <dev-haskell/primitive-0.7:=[profile?] - >=dev-haskell/transformers-0.2:=[profile?] - >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.12:=[profile?] - >=dev-haskell/zlib-0.5.3.1:=[profile?] <dev-haskell/zlib-0.7:=[profile?] - >=dev-lang/ghc-7.10.1:= - mmap? ( dev-haskell/mmap:=[profile?] ) -" -DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.22.2.0 -" - -S="${WORKDIR}/${MY_P}" - -src_configure() { - haskell-cabal_src_configure \ - $(cabal_flag mmap mmap) -} diff --git a/dev-haskell/kan-extensions/kan-extensions-4.2.3.ebuild b/dev-haskell/kan-extensions/kan-extensions-4.2.3.ebuild index 21d24f599870..1facf1b28e57 100644 --- a/dev-haskell/kan-extensions/kan-extensions-4.2.3.ebuild +++ b/dev-haskell/kan-extensions/kan-extensions-4.2.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -9,7 +9,7 @@ EAPI=5 CABAL_FEATURES="lib profile haddock hoogle hscolour" inherit haskell-cabal -DESCRIPTION="Kan extensions, Kan lifts, various forms of the Yoneda lemma, and (co)density (co)monads" +DESCRIPTION="Kan extensions, lifts, forms of the Yoneda lemma, and (co)density (co)monads" HOMEPAGE="https://github.com/ekmett/kan-extensions/" SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" diff --git a/dev-haskell/pcre-light/pcre-light-0.4-r1.ebuild b/dev-haskell/pcre-light/pcre-light-0.4-r1.ebuild index 46b0bcf065a9..e1852347966f 100644 --- a/dev-haskell/pcre-light/pcre-light-0.4-r1.ebuild +++ b/dev-haskell/pcre-light/pcre-light-0.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -9,7 +9,7 @@ EAPI=5 CABAL_FEATURES="lib profile haddock hoogle hscolour" inherit base haskell-cabal -DESCRIPTION="A small, efficient and portable regex library for Perl 5 compatible regular expressions" +DESCRIPTION="Portable regex library for Perl 5 compatible regular expressions" HOMEPAGE="http://code.haskell.org/~dons/code/pcre-light" SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" diff --git a/dev-haskell/tasty-th/tasty-th-0.1.3.ebuild b/dev-haskell/tasty-th/tasty-th-0.1.3.ebuild index 90140e4e2062..e3ecf74cf325 100644 --- a/dev-haskell/tasty-th/tasty-th-0.1.3.ebuild +++ b/dev-haskell/tasty-th/tasty-th-0.1.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -9,7 +9,7 @@ EAPI=5 CABAL_FEATURES="lib profile haddock hoogle hscolour" inherit haskell-cabal -DESCRIPTION="Automagically generate the HUnit- and Quickcheck-bulk-code using Template Haskell" +DESCRIPTION="Automatic tasty test case discovery using TH" HOMEPAGE="https://github.com/bennofs/tasty-th" SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" diff --git a/dev-haskell/temporary/temporary-1.1.2.4.ebuild b/dev-haskell/temporary/temporary-1.1.2.4.ebuild index e58dc5b84d08..e48aebff0869 100644 --- a/dev-haskell/temporary/temporary-1.1.2.4.ebuild +++ b/dev-haskell/temporary/temporary-1.1.2.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -9,7 +9,7 @@ EAPI=5 CABAL_FEATURES="lib profile haddock hoogle hscolour" inherit haskell-cabal -DESCRIPTION="Portable temporary file and directory support for Windows and Unix, based on code from Cabal" +DESCRIPTION="Portable temporary file and directory support for Windows and Unix" HOMEPAGE="https://github.com/batterseapower/temporary" SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" diff --git a/dev-haskell/temporary/temporary-1.2.0.3.ebuild b/dev-haskell/temporary/temporary-1.2.0.3.ebuild index baa8dfe0a176..553b2a7e6a45 100644 --- a/dev-haskell/temporary/temporary-1.2.0.3.ebuild +++ b/dev-haskell/temporary/temporary-1.2.0.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -9,7 +9,7 @@ EAPI=5 CABAL_FEATURES="lib profile haddock hoogle hscolour" inherit haskell-cabal -DESCRIPTION="Portable temporary file and directory support for Windows and Unix, based on code from Cabal" +DESCRIPTION="Portable temporary file and directory support for Windows and Unix" HOMEPAGE="https://github.com/batterseapower/temporary" SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" diff --git a/dev-haskell/transformers-compat/transformers-compat-0.1.1.1.ebuild b/dev-haskell/transformers-compat/transformers-compat-0.1.1.1.ebuild index 1f7a50efba3a..4a3f3b8bab2b 100644 --- a/dev-haskell/transformers-compat/transformers-compat-0.1.1.1.ebuild +++ b/dev-haskell/transformers-compat/transformers-compat-0.1.1.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -9,7 +9,7 @@ EAPI=5 CABAL_FEATURES="lib profile haddock hoogle hscolour" inherit haskell-cabal -DESCRIPTION="A small compatibility shim exposing the new types from transformers 0.3 to older Haskell platforms" +DESCRIPTION="A small compatibility shim for dev-haskell/transformers" HOMEPAGE="https://github.com/ekmett/transformers-compat/" SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" diff --git a/dev-lang/python/files/python-3.5-distutils-OO-build.patch b/dev-lang/python/files/python-3.5-distutils-OO-build.patch new file mode 100644 index 000000000000..8af8c30c76fe --- /dev/null +++ b/dev-lang/python/files/python-3.5-distutils-OO-build.patch @@ -0,0 +1,80 @@ +From 90507018442f9adabb586fd3d0a0206b9c2f2f50 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> +Date: Sun, 5 Jun 2016 08:18:01 +0200 +Subject: [PATCH] distutils: make -OO enable both opt-1 and opt-2 optimization + +Bug: http://bugs.python.org/issue27226 +Bug: https://bugs.gentoo.org/585060 +--- + Lib/distutils/command/build_py.py | 8 ++++---- + Lib/distutils/command/install_lib.py | 12 ++++++------ + 2 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/Lib/distutils/command/build_py.py b/Lib/distutils/command/build_py.py +index cf0ca57..838d4e4 100644 +--- a/Lib/distutils/command/build_py.py ++++ b/Lib/distutils/command/build_py.py +@@ -315,9 +315,9 @@ class build_py (Command): + if self.compile: + outputs.append(importlib.util.cache_from_source( + filename, optimization='')) +- if self.optimize > 0: ++ for opt in range(1, self.optimize + 1): + outputs.append(importlib.util.cache_from_source( +- filename, optimization=self.optimize)) ++ filename, optimization=opt)) + + outputs += [ + os.path.join(build_dir, filename) +@@ -387,8 +387,8 @@ class build_py (Command): + if self.compile: + byte_compile(files, optimize=0, + force=self.force, prefix=prefix, dry_run=self.dry_run) +- if self.optimize > 0: +- byte_compile(files, optimize=self.optimize, ++ for opt in range(1, self.optimize + 1): ++ byte_compile(files, optimize=opt, + force=self.force, prefix=prefix, dry_run=self.dry_run) + + class build_py_2to3(build_py, Mixin2to3): +diff --git a/Lib/distutils/command/install_lib.py b/Lib/distutils/command/install_lib.py +index 6154cf0..049b662 100644 +--- a/Lib/distutils/command/install_lib.py ++++ b/Lib/distutils/command/install_lib.py +@@ -24,8 +24,8 @@ class install_lib(Command): + # 2) compile .pyc only (--compile --no-optimize; default) + # 3) compile .pyc and "opt-1" .pyc (--compile --optimize) + # 4) compile "opt-1" .pyc only (--no-compile --optimize) +- # 5) compile .pyc and "opt-2" .pyc (--compile --optimize-more) +- # 6) compile "opt-2" .pyc only (--no-compile --optimize-more) ++ # 5) compile .pyc, "opt-1" and "opt-2" .pyc (--compile --optimize-more) ++ # 6) compile "opt-1" and "opt-2" .pyc (--no-compile --optimize-more) + # + # The UI for this is two options, 'compile' and 'optimize'. + # 'compile' is strictly boolean, and only decides whether to +@@ -132,8 +132,8 @@ class install_lib(Command): + byte_compile(files, optimize=0, + force=self.force, prefix=install_root, + dry_run=self.dry_run) +- if self.optimize > 0: +- byte_compile(files, optimize=self.optimize, ++ for opt in range(1, self.optimize + 1): ++ byte_compile(files, optimize=opt, + force=self.force, prefix=install_root, + verbose=self.verbose, dry_run=self.dry_run) + +@@ -167,9 +167,9 @@ class install_lib(Command): + if self.compile: + bytecode_files.append(importlib.util.cache_from_source( + py_file, optimization='')) +- if self.optimize > 0: ++ for opt in range(1, self.optimize + 1): + bytecode_files.append(importlib.util.cache_from_source( +- py_file, optimization=self.optimize)) ++ py_file, optimization=opt)) + + return bytecode_files + +-- +2.8.3 + diff --git a/dev-lang/python/python-3.5.1-r3.ebuild b/dev-lang/python/python-3.5.1-r3.ebuild new file mode 100644 index 000000000000..3e8fc9839166 --- /dev/null +++ b/dev-lang/python/python-3.5.1-r3.ebuild @@ -0,0 +1,360 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +WANT_LIBTOOL="none" + +inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs + +MY_P="Python-${PV/_/}" +PATCHSET_VERSION="3.5.1-0" + +DESCRIPTION="An interpreted, interactive, object-oriented programming language" +HOMEPAGE="http://www.python.org/" +SRC_URI="http://www.python.org/ftp/python/${PV%_rc*}/${MY_P}.tar.xz + https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz" + +LICENSE="PSF-2" +SLOT="3.5/3.5m" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" +IUSE="build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk wininst +xml" + +# Do not add a dependency on dev-lang/python to this ebuild. +# If you need to apply a patch which requires python for bootstrapping, please +# run the bootstrap code on your dev box and include the results in the +# patchset. See bug 447752. + +RDEPEND="app-arch/bzip2:0= + app-arch/xz-utils:0= + >=sys-libs/zlib-1.1.3:0= + virtual/libffi + virtual/libintl + gdbm? ( sys-libs/gdbm:0=[berkdb] ) + ncurses? ( + >=sys-libs/ncurses-5.2:0= + readline? ( >=sys-libs/readline-4.1:0= ) + ) + sqlite? ( >=dev-db/sqlite-3.3.8:3= ) + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:= ) + ) + tk? ( + >=dev-lang/tcl-8.0:0= + >=dev-lang/tk-8.0:0= + dev-tcltk/blt:0= + dev-tcltk/tix + ) + xml? ( >=dev-libs/expat-2.1:0= ) + !!<sys-apps/sandbox-2.6-r1" +DEPEND="${RDEPEND} + virtual/pkgconfig + !sys-devel/gcc[libffi(-)]" +RDEPEND+=" !build? ( app-misc/mime-types )" +PDEPEND=">=app-eselect/eselect-python-20140125-r1" + +S="${WORKDIR}/${MY_P}" + +PYVER=${SLOT%/*} + +src_prepare() { + # Ensure that internal copies of expat, libffi and zlib are not used. + rm -fr Modules/expat + rm -fr Modules/_ctypes/libffi* + rm -fr Modules/zlib + + if tc-is-cross-compiler; then + # Invokes BUILDPYTHON, which is built for the host arch + local EPATCH_EXCLUDE="*_regenerate_platform-specific_modules.patch" + fi + + EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches" + epatch "${FILESDIR}/${PN}-3.4.3-ncurses-pkg-config.patch" + epatch "${FILESDIR}/3.5.1-cross-compile.patch" + epatch "${FILESDIR}/${PN}-3.5-distutils-OO-build.patch" + + epatch_user + + sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \ + configure.ac \ + Lib/distutils/command/install.py \ + Lib/distutils/sysconfig.py \ + Lib/site.py \ + Lib/sysconfig.py \ + Lib/test/test_site.py \ + Makefile.pre.in \ + Modules/getpath.c \ + Modules/Setup.dist \ + setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@" + + eautoreconf +} + +src_configure() { + local disable + use gdbm || disable+=" gdbm" + use ncurses || disable+=" _curses _curses_panel" + use readline || disable+=" readline" + use sqlite || disable+=" _sqlite3" + use ssl || export PYTHON_DISABLE_SSL="1" + use tk || disable+=" _tkinter" + use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat. + export PYTHON_DISABLE_MODULES="${disable}" + + if ! use xml; then + ewarn "You have configured Python without XML support." + ewarn "This is NOT a recommended configuration as you" + ewarn "may face problems parsing any XML documents." + fi + + if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then + einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}" + fi + + if [[ "$(gcc-major-version)" -ge 4 ]]; then + append-flags -fwrapv + fi + + filter-flags -malign-double + + # https://bugs.gentoo.org/show_bug.cgi?id=50309 + if is-flagq -O3; then + is-flagq -fstack-protector-all && replace-flags -O3 -O2 + use hardened && replace-flags -O3 -O2 + fi + + # Export CXX so it ends up in /usr/lib/python3.X/config/Makefile. + tc-export CXX + + # The configure script fails to use pkg-config correctly. + # http://bugs.python.org/issue15506 + export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG) + + # Set LDFLAGS so we link modules with -lpython3.2 correctly. + # Needed on FreeBSD unless Python 3.2 is already installed. + # Please query BSD team before removing this! + append-ldflags "-L." + + local dbmliborder + if use gdbm; then + dbmliborder+="${dbmliborder:+:}gdbm" + fi + + BUILD_DIR="${WORKDIR}/${CHOST}" + mkdir -p "${BUILD_DIR}" || die + cd "${BUILD_DIR}" || die + + local myeconfargs=( + --with-fpectl + --enable-shared + $(use_enable ipv6) + $(use_with threads) + --infodir='${prefix}/share/info' + --mandir='${prefix}/share/man' + --with-computed-gotos + --with-dbmliborder="${dbmliborder}" + --with-libc= + --enable-loadable-sqlite-extensions + --without-ensurepip + --with-system-expat + --with-system-ffi + ) + + ECONF_SOURCE="${S}" OPT="" econf "${myeconfargs[@]}" + + if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then + eerror "configure has detected that the sem_open function is broken." + eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777." + die "Broken sem_open function (bug 496328)" + fi +} + +src_compile() { + cd "${BUILD_DIR}" || die + + emake CPPFLAGS= CFLAGS= LDFLAGS= + + # Work around bug 329499. See also bug 413751 and 457194. + if has_version dev-libs/libffi[pax_kernel]; then + pax-mark E python + else + pax-mark m python + fi +} + +src_test() { + # Tests will not work when cross compiling. + if tc-is-cross-compiler; then + elog "Disabling tests due to crosscompiling." + return + fi + + cd "${BUILD_DIR}" || die + + # Skip failing tests. + local skipped_tests="gdb" + + for test in ${skipped_tests}; do + mv "${S}"/Lib/test/test_${test}.py "${T}" + done + + local -x PYTHONDONTWRITEBYTECODE= + emake test EXTRATESTOPTS="-u-network" CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty + local result=$? + + for test in ${skipped_tests}; do + mv "${T}/test_${test}.py" "${S}"/Lib/test + done + + elog "The following tests have been skipped:" + for test in ${skipped_tests}; do + elog "test_${test}.py" + done + + elog "If you would like to run them, you may:" + elog "cd '${EPREFIX}/usr/$(get_libdir)/python${PYVER}/test'" + elog "and run the tests separately." + + if [[ ${result} -ne 0 ]]; then + die "emake test failed" + fi +} + +src_install() { + local libdir=${ED}/usr/$(get_libdir)/python${PYVER} + + cd "${BUILD_DIR}" || die + + emake DESTDIR="${D}" altinstall + + sed \ + -e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \ + -e "s/\(PY_LDFLAGS=\).*/\1/" \ + -i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed" + + # Fix collisions between different slots of Python. + rm -f "${ED}usr/$(get_libdir)/libpython3.so" + + # Cheap hack to get version with ABIFLAGS + local abiver=$(cd "${ED}usr/include"; echo python*) + if [[ ${abiver} != python${PYVER} ]]; then + # Replace python3.X with a symlink to python3.Xm + rm "${ED}usr/bin/python${PYVER}" || die + dosym "${abiver}" "/usr/bin/python${PYVER}" + # Create python3.X-config symlink + dosym "${abiver}-config" "/usr/bin/python${PYVER}-config" + # Create python-3.5m.pc symlink + dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc" + fi + + # python seems to get rebuilt in src_install (bug 569908) + # Work around it for now. + if has_version dev-libs/libffi[pax_kernel]; then + pax-mark E "${ED}usr/bin/${abiver}" + else + pax-mark m "${ED}usr/bin/${abiver}" + fi + + use elibc_uclibc && rm -fr "${libdir}/test" + use sqlite || rm -fr "${libdir}/"{sqlite3,test/test_sqlite*} + use tk || rm -fr "${ED}usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} + + use threads || rm -fr "${libdir}/multiprocessing" + use wininst || rm -f "${libdir}/distutils/command/"wininst-*.exe + + dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS} + + if use examples; then + insinto /usr/share/doc/${PF}/examples + find "${S}"/Tools -name __pycache__ -print0 | xargs -0 rm -fr + doins -r "${S}"/Tools + fi + insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510 + local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \ + emake --no-print-directory -s -f - 2>/dev/null) + newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py + + newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER} + newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER} + sed \ + -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \ + -e "s:@PYDOC@:pydoc${PYVER}:" \ + -i "${ED}etc/conf.d/pydoc-${PYVER}" "${ED}etc/init.d/pydoc-${PYVER}" || die "sed failed" + + # for python-exec + local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR ) + + # if not using a cross-compiler, use the fresh binary + if ! tc-is-cross-compiler; then + local -x PYTHON=./python + local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}. + else + vars=( PYTHON "${vars[@]}" ) + fi + + python_export "python${PYVER}" "${vars[@]}" + echo "EPYTHON='${EPYTHON}'" > epython.py || die + python_domodule epython.py + + # python-exec wrapping support + local pymajor=${PYVER%.*} + mkdir -p "${D}${PYTHON_SCRIPTDIR}" || die + # python and pythonX + ln -s "../../../bin/${abiver}" \ + "${D}${PYTHON_SCRIPTDIR}/python${pymajor}" || die + ln -s "python${pymajor}" \ + "${D}${PYTHON_SCRIPTDIR}/python" || die + # python-config and pythonX-config + # note: we need to create a wrapper rather than symlinking it due + # to some random dirname(argv[0]) magic performed by python-config + cat > "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" <<-EOF || die + #!/bin/sh + exec "${abiver}-config" "\${@}" + EOF + chmod +x "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die + ln -s "python${pymajor}-config" \ + "${D}${PYTHON_SCRIPTDIR}/python-config" || die + # 2to3, pydoc, pyvenv + ln -s "../../../bin/2to3-${PYVER}" \ + "${D}${PYTHON_SCRIPTDIR}/2to3" || die + ln -s "../../../bin/pydoc${PYVER}" \ + "${D}${PYTHON_SCRIPTDIR}/pydoc" || die + ln -s "../../../bin/pyvenv-${PYVER}" \ + "${D}${PYTHON_SCRIPTDIR}/pyvenv" || die + # idle + if use tk; then + ln -s "../../../bin/idle${PYVER}" \ + "${D}${PYTHON_SCRIPTDIR}/idle" || die + fi +} + +pkg_preinst() { + if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then + python_updater_warning="1" + fi +} + +eselect_python_update() { + if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then + eselect python update + fi + + if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then + eselect python update --python${PV%%.*} + fi +} + +pkg_postinst() { + eselect_python_update + + if [[ "${python_updater_warning}" == "1" ]]; then + ewarn "You have just upgraded from an older version of Python." + ewarn + ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules." + fi +} + +pkg_postrm() { + eselect_python_update +} diff --git a/dev-python/bitstring/Manifest b/dev-python/bitstring/Manifest index 9f9fb2dc2d74..547af6618824 100644 --- a/dev-python/bitstring/Manifest +++ b/dev-python/bitstring/Manifest @@ -1 +1,2 @@ DIST bitstring-3.1.1.zip 620317 SHA256 52de6257e95f923284d4c1fdce8287df65a2c677f26d73d288ed06188586ab6f SHA512 856fca0d16929e1fd6e78e9b5fe63fbbabe35bd0c49ef188b24ee0585feea36a485506a2fb8d87e1515ed4162d83c70faa5af59abfe95cef212c6ebaf9fa90d2 WHIRLPOOL 305521c110601f1145344d2423bd91f901c58f08759b4a7c0865cc342d12d9dc4f633e81fc260032e3c41aa73472aa452de476dd418cdb5051957908c7078d47 +DIST bitstring-3.1.5.tar.gz 761527 SHA256 b769620c1b52d6c1548c6c4f055613f4eee3120ed8a5cff4ba4ffbbc8a582286 SHA512 2c98768c98fc5ab99eeb4ac089ec66f091949e5e4f326563b1b480981ac2aa40258fe0065809eed9c08a71fae3cf09254a8a2465e86635db5287c0d2f241d75f WHIRLPOOL c059af1f54e46cc92acfbc40ef3e7461f6bd55739e552a8cc58dabe3bbd0140ad8d1084cd85540aebdfaf3fe68c98471679bc6db684190740cd55931285241d2 diff --git a/dev-python/bitstring/bitstring-3.1.5.ebuild b/dev-python/bitstring/bitstring-3.1.5.ebuild new file mode 100644 index 000000000000..ce74739b6247 --- /dev/null +++ b/dev-python/bitstring/bitstring-3.1.5.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} ) +inherit distutils-r1 + +DESCRIPTION="A pure Python module for creation and analysis of binary data" +HOMEPAGE="https://github.com/scott-griffiths/bitstring" +SRC_URI="https://github.com/scott-griffiths/${PN}/archive/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +S=${WORKDIR}/${PN}-${P} + +DOCS=( README.rst release_notes.txt ) + +python_test() { + pushd test >/dev/null || die + "${PYTHON}" -m unittest discover || die "Testing failed with ${EPYTHON}" + popd >/dev/null || die +} diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass index 0f9b58f6fce5..717123cc5f96 100644 --- a/eclass/python-utils-r1.eclass +++ b/eclass/python-utils-r1.eclass @@ -640,8 +640,14 @@ python_optimize() { instpath=/${instpath##/} case "${EPYTHON}" in + python2.7|python3.[34]) + "${PYTHON}" -m compileall -q -f -d "${instpath}" "${d}" + "${PYTHON}" -OO -m compileall -q -f -d "${instpath}" "${d}" + ;; python*) + # both levels of optimization are separate since 3.5 "${PYTHON}" -m compileall -q -f -d "${instpath}" "${d}" + "${PYTHON}" -O -m compileall -q -f -d "${instpath}" "${d}" "${PYTHON}" -OO -m compileall -q -f -d "${instpath}" "${d}" ;; *) diff --git a/media-gfx/gmic/files/gmic-1.6.5.0-makefile.patch b/media-gfx/gmic/files/gmic-1.6.5.0-makefile.patch index 91e7528ae850..ebf5e45108aa 100644 --- a/media-gfx/gmic/files/gmic-1.6.5.0-makefile.patch +++ b/media-gfx/gmic/files/gmic-1.6.5.0-makefile.patch @@ -36,7 +36,7 @@ +MINC2_LIBS = -lminc_io -lvolume_io2 -lminc2 -lnetcdf -lhdf5 -lz # Flags to enable native support for downloading files from the network. - # ( http://curl.haxx.se/libcurl/ ) + # ( https://curl.haxx.se/libcurl/ ) @@ -325,7 +324,6 @@ cli: diff --git a/media-gfx/gmic/files/gmic-1.6.5.1-makefile.patch b/media-gfx/gmic/files/gmic-1.6.5.1-makefile.patch index e2d0dd3133c2..4dfe9b7ff526 100644 --- a/media-gfx/gmic/files/gmic-1.6.5.1-makefile.patch +++ b/media-gfx/gmic/files/gmic-1.6.5.1-makefile.patch @@ -35,7 +35,7 @@ +MINC2_LIBS = -lminc_io -lvolume_io2 -lminc2 -lnetcdf -lhdf5 -lz # Flags to enable native support for downloading files from the network. - # ( http://curl.haxx.se/libcurl/ ) + # ( https://curl.haxx.se/libcurl/ ) @@ -308,7 +307,6 @@ cli: diff --git a/media-plugins/gimp-gmic/files/gmic-1.6.5.0-makefile.patch b/media-plugins/gimp-gmic/files/gmic-1.6.5.0-makefile.patch index 91e7528ae850..ebf5e45108aa 100644 --- a/media-plugins/gimp-gmic/files/gmic-1.6.5.0-makefile.patch +++ b/media-plugins/gimp-gmic/files/gmic-1.6.5.0-makefile.patch @@ -36,7 +36,7 @@ +MINC2_LIBS = -lminc_io -lvolume_io2 -lminc2 -lnetcdf -lhdf5 -lz # Flags to enable native support for downloading files from the network. - # ( http://curl.haxx.se/libcurl/ ) + # ( https://curl.haxx.se/libcurl/ ) @@ -325,7 +324,6 @@ cli: diff --git a/media-plugins/gimp-gmic/files/gmic-1.6.5.1-makefile.patch b/media-plugins/gimp-gmic/files/gmic-1.6.5.1-makefile.patch index e2d0dd3133c2..4dfe9b7ff526 100644 --- a/media-plugins/gimp-gmic/files/gmic-1.6.5.1-makefile.patch +++ b/media-plugins/gimp-gmic/files/gmic-1.6.5.1-makefile.patch @@ -35,7 +35,7 @@ +MINC2_LIBS = -lminc_io -lvolume_io2 -lminc2 -lnetcdf -lhdf5 -lz # Flags to enable native support for downloading files from the network. - # ( http://curl.haxx.se/libcurl/ ) + # ( https://curl.haxx.se/libcurl/ ) @@ -308,7 +307,6 @@ cli: diff --git a/net-misc/curl/curl-7.45.0.ebuild b/net-misc/curl/curl-7.45.0.ebuild index b29e3869d5bd..6c147a8ed641 100644 --- a/net-misc/curl/curl-7.45.0.ebuild +++ b/net-misc/curl/curl-7.45.0.ebuild @@ -7,8 +7,8 @@ EAPI="5" inherit autotools eutils prefix multilib-minimal DESCRIPTION="A Client that groks URLs" -HOMEPAGE="http://curl.haxx.se/" -SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2" +HOMEPAGE="https://curl.haxx.se/" +SRC_URI="https://curl.haxx.se/download/${P}.tar.bz2" LICENSE="MIT" SLOT="0" diff --git a/net-misc/curl/curl-7.47.1.ebuild b/net-misc/curl/curl-7.47.1.ebuild index 77a83d332204..e23178dda44d 100644 --- a/net-misc/curl/curl-7.47.1.ebuild +++ b/net-misc/curl/curl-7.47.1.ebuild @@ -7,8 +7,8 @@ EAPI="5" inherit autotools eutils prefix multilib-minimal DESCRIPTION="A Client that groks URLs" -HOMEPAGE="http://curl.haxx.se/" -SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2" +HOMEPAGE="https://curl.haxx.se/" +SRC_URI="https://curl.haxx.se/download/${P}.tar.bz2" LICENSE="MIT" SLOT="0" diff --git a/net-misc/curl/curl-7.49.0.ebuild b/net-misc/curl/curl-7.49.0.ebuild index 0624a92b1f3c..8f4be9e396fc 100644 --- a/net-misc/curl/curl-7.49.0.ebuild +++ b/net-misc/curl/curl-7.49.0.ebuild @@ -7,8 +7,8 @@ EAPI="5" inherit autotools eutils prefix multilib-minimal DESCRIPTION="A Client that groks URLs" -HOMEPAGE="http://curl.haxx.se/" -SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2" +HOMEPAGE="https://curl.haxx.se/" +SRC_URI="https://curl.haxx.se/download/${P}.tar.bz2" LICENSE="MIT" SLOT="0" diff --git a/net-misc/curl/curl-7.49.1.ebuild b/net-misc/curl/curl-7.49.1.ebuild index ae337f15af7e..42592d46ccd0 100644 --- a/net-misc/curl/curl-7.49.1.ebuild +++ b/net-misc/curl/curl-7.49.1.ebuild @@ -7,8 +7,8 @@ EAPI="5" inherit autotools eutils prefix multilib-minimal DESCRIPTION="A Client that groks URLs" -HOMEPAGE="http://curl.haxx.se/" -SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2" +HOMEPAGE="https://curl.haxx.se/" +SRC_URI="https://curl.haxx.se/download/${P}.tar.bz2" LICENSE="MIT" SLOT="0" diff --git a/sci-libs/cfitsio/Manifest b/sci-libs/cfitsio/Manifest index 565d1854e294..39d11cfff6c9 100644 --- a/sci-libs/cfitsio/Manifest +++ b/sci-libs/cfitsio/Manifest @@ -1,2 +1,3 @@ DIST cfitsio-3.360.tar.gz 4104894 SHA256 b5fb209583c76a0bcc39808e55ebf2417b9c26114c59db1a3f49ea1ede5fa95d SHA512 158819b4a3a29c29a5f017283e2b20067420994e881d202dbf3ba199c9e564dc1e74f8be5ce84f78107126d2a8688cc55cc7ed284540ca647e44cdc3b0b02072 WHIRLPOOL 05589a27c6fa83a0240b26924954c1c6d25d985ad609dfbd37fccfe5758fd28efbd97a5ec289803053e2f53e053e51c017292845de1b4368bcd1725fa2eccdb7 DIST cfitsio-3.38.tar.gz 4142236 SHA256 d4aef44401b1d2142a13ffc3a28cce7c77264ca0ddce164d87fdcb275503dd5d SHA512 7428c1c87736ca384153f7f810e0bdbccdcc2f41892b0b9ceda9e5efb20655585c2789b16510a5362f8b67ef53a0ac443094786966e5748cbe7ad828599723fc WHIRLPOOL 8a809e0cc89357a983e60c56e41ef5d758561751d49a2443c0c0b2640d0573f6f7313c99342458600aa28739e0ea55f85adc1e04505777c3339dc750aa829bcf +DIST cfitsio-3.39.tar.gz 4177822 SHA256 4d0c4fa870cc9ea9163197b40e8b6357fa26e47e83bf3ad97bf992c7ad7ecc33 SHA512 a6cde8353d7beede7e7a53ba7109c3a6b5812355a423ad8e2e459281ac760b392014e3ee2d2f30c639eef38294ebac59950010e3cadfd078692f6d3c6d167e3f WHIRLPOOL 55a8bac494bc77e805a67c42edcd7c4730dac1c5185c051e5750b87163e421b6a9b870baeb873585621c98a85f9c68cf83ff255627fa5e7bd86aa116722de087 diff --git a/sci-libs/cfitsio/cfitsio-3.39.ebuild b/sci-libs/cfitsio/cfitsio-3.39.ebuild new file mode 100644 index 000000000000..08e057e1c4a1 --- /dev/null +++ b/sci-libs/cfitsio/cfitsio-3.39.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +FORTRAN_NEEDED=fortran + +inherit fortran-2 multilib-minimal + +DESCRIPTION="C and Fortran library for manipulating FITS files" +HOMEPAGE="http://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html" +SRC_URI="https://dev.gentoo.org/~bicatali/distfiles/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/5" +KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris" +IUSE="bzip2 doc examples fortran static-libs +tools threads" + +RDEPEND=" + sys-libs/zlib[${MULTILIB_USEDEP}] + bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )" +DEPEND="${RDEPEND} + fortran? ( dev-lang/cfortran )" + +pkg_setup() { + use fortran && fortran-2_pkg_setup +} + +src_prepare() { + # avoid internal cfortran + if use fortran; then + mv cfortran.h cfortran.h.disabled + ln -s "${EPREFIX}"/usr/include/cfortran.h . || die + fi + default +} + +multilib_src_configure() { + ECONF_SOURCE="${S}" econf \ + $(use_enable fortran) \ + $(use_enable static-libs static) \ + $(use_enable threads) \ + $(use_enable tools) \ + $(use_with bzip2) +} + +multilib_src_install_all() { + dodoc README README.md CHANGES.md docs/changes.txt docs/cfitsio.doc + use fortran && dodoc docs/fitsio.doc + use doc && dodoc docs/{quick,cfitsio,fpackguide}.pdf + use doc && use fortran && dodoc docs/fitsio.pdf + if use examples; then + insinto /usr/share/doc/${PF}/examples + doins cookbook.c testprog.c speed.c smem.c + use fortran && doins cookbook.f testf77.f + fi + prune_libtool_files --all +} diff --git a/sys-power/phc-intel/Manifest b/sys-power/phc-intel/Manifest index 0d39c094a59b..496cbc5b8f22 100644 --- a/sys-power/phc-intel/Manifest +++ b/sys-power/phc-intel/Manifest @@ -1,3 +1,4 @@ DIST phc-intel-pack-rev15.1.tar.bz2 97762 SHA256 5154295f2cfc0e263510d71041a2d1d9a0d2e7a0c67730c9f80ba1011bbde8a4 SHA512 e0163f315343bb34dde57cb806d99b6ea6586b54827142a49532d862cbe02689d581e221ebd6466d1992107e4d98456989402ba4172e85b9e9f24405f27d28f1 WHIRLPOOL 5c02326541d0773cff668919d0d4809f3b79fd3bff6149c62d136760d440e5338b2a9e00a236f25bcb6dead4a65f74e4f1d3763a38bb996ddef315664758b621 DIST phc-intel-pack-rev16.tar.bz2 100320 SHA256 545de96d22aee47cfe5b6292a0f55797cbc18aa03ca050831d8ff964be1896ca SHA512 bfe502e67f68ec7b4dbae77f0e2b57876928c6d5047697842c397a1d622978c270b85d0c5f83d22ca74a48942da60ab2b78e405ba866f55ee937f5b530f5165e WHIRLPOOL 0a693ee1a31047c7f3ba404ec7906045a54c94b48963da1274f24ee9f8f9ddb0f8fcc6e8c5a9b096594bd3b26f32de9058e60ca21d429d2c9bb7993944b32f6e DIST phc-intel-pack-rev17.tar.bz2 100565 SHA256 97e8659423ff9ce5e7f77e5e4049b100677a37b05a341d294aba286de1bbaeb9 SHA512 0db84ae3e366ff95577ee89b2e1cb22778fdba76783aa2606b6b5925e46c6e5daf80a7365eba6f3f806a017daa98d7b20828c644a3967f180c612e7c92a94871 WHIRLPOOL 795c73daeda3b42306560d799cd7d180e9f0888dc11ec36b2236a1ee000754780c0f299ebaec0ca4e1a73ca1326f0957d46823fb7500db28bd8b0946b24ec522 +DIST phc-intel-pack-rev21.tar.bz2 111951 SHA256 714fc70ce4cbf5c90e1a9966b19985b375a6ce5e99e90861f7d5addc18b57c95 SHA512 4aaa7beffe107d31bd9006f658b9a280ef0ace3d81ac88ef281b958803ac9e551ed4a33d5f25c0ec28d3d80349cfd4f81bcfcf708767dae133b4389b6d2348a0 WHIRLPOOL d84a094184bdcda7b4fc527732ee588bd65973dbbe58caf70101698ce7781ba6070a82b10d152041f616e6e40023f8a870913cfa89c009cb2f73e6d4bb9143bc diff --git a/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.10.patch b/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.10.patch new file mode 100644 index 000000000000..16fffd1833da --- /dev/null +++ b/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.10.patch @@ -0,0 +1,51 @@ +--- phc-intel-pack-rev21/inc/3.10/linux-phc-0.3.2.patch ++++ phc-intel-pack-rev21/inc/3.10/linux-phc-0.3.2.patch +@@ -120,7 +120,7 @@ + if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) { + msrs = msrs_alloc(); + +-@@ -963,10 +965,484 @@ ++@@ -963,10 +965,489 @@ + msrs_free(msrs); + msrs = NULL; + } +@@ -198,6 +198,7 @@ + + vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control); + + count += sprintf(&buf[count], "%u ", vid); + + } +++ if (count) count--; + + count += sprintf(&buf[count], "\n"); + + + + return count; +@@ -227,6 +228,7 @@ + + vid = extract_vid_from_control(data->original_controls[freq_table[i].index]); + + count += sprintf(&buf[count], "%u ", vid); + + } +++ if (count) count--; + + count += sprintf(&buf[count], "\n"); + + + + return count; +@@ -253,6 +255,7 @@ + + fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control); + + count += sprintf(&buf[count], "%u ", fid); + + } +++ if (count) count--; + + count += sprintf(&buf[count], "\n"); + + + + return count; +@@ -281,6 +284,7 @@ + + vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control); + + count += sprintf(&buf[count], "%u:%u ", fid, vid); + + } +++ if (count) count--; + + count += sprintf(&buf[count], "\n"); + + + + return count; +@@ -312,6 +316,7 @@ + + vid = extract_vid_from_control(data->original_controls[freq_table[i].index]); + + count += sprintf(&buf[count], "%u:%u ", fid, vid); + + } +++ if (count) count--; + + count += sprintf(&buf[count], "\n"); + + + + return count; diff --git a/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.11.patch b/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.11.patch new file mode 100644 index 000000000000..13d9df5eba2b --- /dev/null +++ b/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.11.patch @@ -0,0 +1,51 @@ +--- phc-intel-pack-rev21/inc/3.11/linux-phc-0.3.2.patch ++++ phc-intel-pack-rev21/inc/3.11/linux-phc-0.3.2.patch +@@ -122,7 +122,7 @@ + if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) { + msrs = msrs_alloc(); + +-@@ -986,10 +987,485 @@ ++@@ -986,10 +987,489 @@ + msrs_free(msrs); + msrs = NULL; + } +@@ -200,6 +200,7 @@ + + vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control); + + count += sprintf(&buf[count], "%u ", vid); + + } +++ if (count) count--; + + count += sprintf(&buf[count], "\n"); + + + + return count; +@@ -229,6 +230,7 @@ + + vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]); + + count += sprintf(&buf[count], "%u ", vid); + + } +++ if (count) count--; + + count += sprintf(&buf[count], "\n"); + + + + return count; +@@ -255,6 +257,7 @@ + + fid = extract_fid_from_control(acpi_data->states[freq_table[i].driver_data].control); + + count += sprintf(&buf[count], "%u ", fid); + + } +++ if (count) count--; + + count += sprintf(&buf[count], "\n"); + + + + return count; +@@ -283,6 +286,7 @@ + + vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control); + + count += sprintf(&buf[count], "%u:%u ", fid, vid); + + } +++ if (count) count--; + + count += sprintf(&buf[count], "\n"); + + + + return count; +@@ -314,6 +318,7 @@ + + vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]); + + count += sprintf(&buf[count], "%u:%u ", fid, vid); + + } +++ if (count) count--; + + count += sprintf(&buf[count], "\n"); + + + + return count; diff --git a/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.12.patch b/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.12.patch new file mode 100644 index 000000000000..4031d34523a2 --- /dev/null +++ b/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.12.patch @@ -0,0 +1,51 @@ +--- phc-intel-pack-rev21/inc/3.12/linux-phc-0.3.2.patch ++++ phc-intel-pack-rev21/inc/3.12/linux-phc-0.3.2.patch +@@ -97,7 +97,7 @@ + static void __init acpi_cpufreq_boost_init(void) + { + if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) { +-@@ -982,6 +983,480 @@ ++@@ -982,6 +983,485 @@ + } + } + +@@ -173,6 +173,7 @@ + + vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control); + + count += sprintf(&buf[count], "%u ", vid); + + } +++ if (count) count--; + + count += sprintf(&buf[count], "\n"); + + + + return count; +@@ -202,6 +203,7 @@ + + vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]); + + count += sprintf(&buf[count], "%u ", vid); + + } +++ if (count) count--; + + count += sprintf(&buf[count], "\n"); + + + + return count; +@@ -228,6 +230,7 @@ + + fid = extract_fid_from_control(acpi_data->states[freq_table[i].driver_data].control); + + count += sprintf(&buf[count], "%u ", fid); + + } +++ if (count) count--; + + count += sprintf(&buf[count], "\n"); + + + + return count; +@@ -256,6 +259,7 @@ + + vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control); + + count += sprintf(&buf[count], "%u:%u ", fid, vid); + + } +++ if (count) count--; + + count += sprintf(&buf[count], "\n"); + + + + return count; +@@ -287,6 +291,7 @@ + + vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]); + + count += sprintf(&buf[count], "%u:%u ", fid, vid); + + } +++ if (count) count--; + + count += sprintf(&buf[count], "\n"); + + + + return count; diff --git a/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.13.patch b/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.13.patch new file mode 100644 index 000000000000..78db83fb478d --- /dev/null +++ b/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.13.patch @@ -0,0 +1,51 @@ +--- phc-intel-pack-rev21/inc/3.13/linux-phc-0.3.2.patch ++++ phc-intel-pack-rev21/inc/3.13/linux-phc-0.3.2.patch +@@ -97,7 +97,7 @@ + static void __init acpi_cpufreq_boost_init(void) + { + if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) { +-@@ -956,6 +957,480 @@ ++@@ -956,6 +957,485 @@ + } + } + +@@ -173,6 +173,7 @@ + + vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control); + + count += sprintf(&buf[count], "%u ", vid); + + } +++ if (count) count--; + + count += sprintf(&buf[count], "\n"); + + + + return count; +@@ -202,6 +203,7 @@ + + vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]); + + count += sprintf(&buf[count], "%u ", vid); + + } +++ if (count) count--; + + count += sprintf(&buf[count], "\n"); + + + + return count; +@@ -228,6 +230,7 @@ + + fid = extract_fid_from_control(acpi_data->states[freq_table[i].driver_data].control); + + count += sprintf(&buf[count], "%u ", fid); + + } +++ if (count) count--; + + count += sprintf(&buf[count], "\n"); + + + + return count; +@@ -256,6 +259,7 @@ + + vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control); + + count += sprintf(&buf[count], "%u:%u ", fid, vid); + + } +++ if (count) count--; + + count += sprintf(&buf[count], "\n"); + + + + return count; +@@ -287,6 +291,7 @@ + + vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]); + + count += sprintf(&buf[count], "%u:%u ", fid, vid); + + } +++ if (count) count--; + + count += sprintf(&buf[count], "\n"); + + + + return count; diff --git a/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.14.patch b/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.14.patch new file mode 100644 index 000000000000..3c8e75a6a534 --- /dev/null +++ b/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.14.patch @@ -0,0 +1,51 @@ +--- phc-intel-pack-rev21/inc/3.14/linux-phc-0.3.2.patch ++++ phc-intel-pack-rev21/inc/3.14/linux-phc-0.3.2.patch +@@ -98,7 +98,7 @@ + static void __init acpi_cpufreq_boost_init(void) + { + if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) { +-@@ -929,6 +929,481 @@ ++@@ -929,6 +929,486 @@ + } + } + +@@ -174,6 +174,7 @@ + + vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control); + + count += sprintf(&buf[count], "%u ", vid); + + } +++ if (count) count--; + + count += sprintf(&buf[count], "\n"); + + + + return count; +@@ -203,6 +204,7 @@ + + vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]); + + count += sprintf(&buf[count], "%u ", vid); + + } +++ if (count) count--; + + count += sprintf(&buf[count], "\n"); + + + + return count; +@@ -229,6 +231,7 @@ + + fid = extract_fid_from_control(acpi_data->states[freq_table[i].driver_data].control); + + count += sprintf(&buf[count], "%u ", fid); + + } +++ if (count) count--; + + count += sprintf(&buf[count], "\n"); + + + + return count; +@@ -257,6 +260,7 @@ + + vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control); + + count += sprintf(&buf[count], "%u:%u ", fid, vid); + + } +++ if (count) count--; + + count += sprintf(&buf[count], "\n"); + + + + return count; +@@ -288,6 +292,7 @@ + + vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]); + + count += sprintf(&buf[count], "%u:%u ", fid, vid); + + } +++ if (count) count--; + + count += sprintf(&buf[count], "\n"); + + + + return count; diff --git a/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.15.patch b/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.15.patch new file mode 100644 index 000000000000..d15916a1fbea --- /dev/null +++ b/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.15.patch @@ -0,0 +1,51 @@ +--- phc-intel-pack-rev21/inc/3.15/linux-phc-0.3.2.patch ++++ phc-intel-pack-rev21/inc/3.15/linux-phc-0.3.2.patch +@@ -98,7 +98,7 @@ + static void __init acpi_cpufreq_boost_init(void) + { + if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) { +-@@ -929,6 +929,481 @@ ++@@ -929,6 +929,486 @@ + } + } + +@@ -174,6 +174,7 @@ + + vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control); + + count += sprintf(&buf[count], "%u ", vid); + + } +++ if (count) count--; + + count += sprintf(&buf[count], "\n"); + + + + return count; +@@ -203,6 +204,7 @@ + + vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]); + + count += sprintf(&buf[count], "%u ", vid); + + } +++ if (count) count--; + + count += sprintf(&buf[count], "\n"); + + + + return count; +@@ -229,6 +231,7 @@ + + fid = extract_fid_from_control(acpi_data->states[freq_table[i].driver_data].control); + + count += sprintf(&buf[count], "%u ", fid); + + } +++ if (count) count--; + + count += sprintf(&buf[count], "\n"); + + + + return count; +@@ -257,6 +260,7 @@ + + vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control); + + count += sprintf(&buf[count], "%u:%u ", fid, vid); + + } +++ if (count) count--; + + count += sprintf(&buf[count], "\n"); + + + + return count; +@@ -288,6 +292,7 @@ + + vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]); + + count += sprintf(&buf[count], "%u:%u ", fid, vid); + + } +++ if (count) count--; + + count += sprintf(&buf[count], "\n"); + + + + return count; diff --git a/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.4.patch b/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.4.patch new file mode 100644 index 000000000000..345fa6c73ab8 --- /dev/null +++ b/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.4.patch @@ -0,0 +1,51 @@ +--- phc-intel-pack-rev21/inc/3.4/linux-phc-0.3.2.patch ++++ phc-intel-pack-rev21/inc/3.4/linux-phc-0.3.2.patch +@@ -55,7 +55,7 @@ + kfree(data->freq_table); + kfree(data); + } +-@@ -716,8 +728,470 @@ ++@@ -716,8 +728,475 @@ + return 0; + } + +@@ -134,6 +134,7 @@ + + vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control); + + count += sprintf(&buf[count], "%u ", vid); + + } +++ if (count) count--; + + count += sprintf(&buf[count], "\n"); + + + + return count; +@@ -163,6 +164,7 @@ + + vid = extract_vid_from_control(data->original_controls[freq_table[i].index]); + + count += sprintf(&buf[count], "%u ", vid); + + } +++ if (count) count--; + + count += sprintf(&buf[count], "\n"); + + + + return count; +@@ -189,6 +191,7 @@ + + fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control); + + count += sprintf(&buf[count], "%u ", fid); + + } +++ if (count) count--; + + count += sprintf(&buf[count], "\n"); + + + + return count; +@@ -217,6 +220,7 @@ + + vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control); + + count += sprintf(&buf[count], "%u:%u ", fid, vid); + + } +++ if (count) count--; + + count += sprintf(&buf[count], "\n"); + + + + return count; +@@ -248,6 +252,7 @@ + + vid = extract_vid_from_control(data->original_controls[freq_table[i].index]); + + count += sprintf(&buf[count], "%u:%u ", fid, vid); + + } +++ if (count) count--; + + count += sprintf(&buf[count], "\n"); + + + + return count; diff --git a/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.7.patch b/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.7.patch new file mode 100644 index 000000000000..003941fd729d --- /dev/null +++ b/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.7.patch @@ -0,0 +1,51 @@ +--- phc-intel-pack-rev21/inc/3.7.5/linux-phc-0.3.2.patch ++++ phc-intel-pack-rev21/inc/3.7.5/linux-phc-0.3.2.patch +@@ -120,7 +120,7 @@ + if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) { + msrs = msrs_alloc(); + +-@@ -966,10 +968,484 @@ ++@@ -966,10 +968,489 @@ + msrs_free(msrs); + msrs = NULL; + } +@@ -198,6 +198,7 @@ + + vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control); + + count += sprintf(&buf[count], "%u ", vid); + + } +++ if (count) count--; + + count += sprintf(&buf[count], "\n"); + + + + return count; +@@ -227,6 +228,7 @@ + + vid = extract_vid_from_control(data->original_controls[freq_table[i].index]); + + count += sprintf(&buf[count], "%u ", vid); + + } +++ if (count) count--; + + count += sprintf(&buf[count], "\n"); + + + + return count; +@@ -253,6 +255,7 @@ + + fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control); + + count += sprintf(&buf[count], "%u ", fid); + + } +++ if (count) count--; + + count += sprintf(&buf[count], "\n"); + + + + return count; +@@ -281,6 +284,7 @@ + + vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control); + + count += sprintf(&buf[count], "%u:%u ", fid, vid); + + } +++ if (count) count--; + + count += sprintf(&buf[count], "\n"); + + + + return count; +@@ -312,6 +316,7 @@ + + vid = extract_vid_from_control(data->original_controls[freq_table[i].index]); + + count += sprintf(&buf[count], "%u:%u ", fid, vid); + + } +++ if (count) count--; + + count += sprintf(&buf[count], "\n"); + + + + return count; diff --git a/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.9.patch b/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.9.patch new file mode 100644 index 000000000000..2532e37b40bc --- /dev/null +++ b/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.9.patch @@ -0,0 +1,51 @@ +--- phc-intel-pack-rev21/inc/3.9.6/linux-phc-0.3.2.patch ++++ phc-intel-pack-rev21/inc/3.9.6/linux-phc-0.3.2.patch +@@ -120,7 +120,7 @@ + if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) { + msrs = msrs_alloc(); + +-@@ -970,10 +972,484 @@ ++@@ -970,10 +972,489 @@ + msrs_free(msrs); + msrs = NULL; + } +@@ -198,6 +198,7 @@ + + vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control); + + count += sprintf(&buf[count], "%u ", vid); + + } +++ if (count) count--; + + count += sprintf(&buf[count], "\n"); + + + + return count; +@@ -227,6 +228,7 @@ + + vid = extract_vid_from_control(data->original_controls[freq_table[i].index]); + + count += sprintf(&buf[count], "%u ", vid); + + } +++ if (count) count--; + + count += sprintf(&buf[count], "\n"); + + + + return count; +@@ -253,6 +255,7 @@ + + fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control); + + count += sprintf(&buf[count], "%u ", fid); + + } +++ if (count) count--; + + count += sprintf(&buf[count], "\n"); + + + + return count; +@@ -281,6 +284,7 @@ + + vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control); + + count += sprintf(&buf[count], "%u:%u ", fid, vid); + + } +++ if (count) count--; + + count += sprintf(&buf[count], "\n"); + + + + return count; +@@ -312,6 +316,7 @@ + + vid = extract_vid_from_control(data->original_controls[freq_table[i].index]); + + count += sprintf(&buf[count], "%u:%u ", fid, vid); + + } +++ if (count) count--; + + count += sprintf(&buf[count], "\n"); + + + + return count; diff --git a/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-4.1.patch b/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-4.1.patch new file mode 100644 index 000000000000..ddc65b4d34f1 --- /dev/null +++ b/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-4.1.patch @@ -0,0 +1,51 @@ +--- phc-intel-pack-rev21/inc/4.1/linux-phc-0.3.2.patch ++++ phc-intel-pack-rev21/inc/4.1/linux-phc-0.3.2.patch +@@ -95,7 +95,7 @@ + static void __init acpi_cpufreq_boost_init(void) + { + if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) { +-@@ -928,6 +925,481 @@ ++@@ -928,6 +925,486 @@ + } + } + +@@ -171,6 +171,7 @@ + + vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control); + + count += sprintf(&buf[count], "%u ", vid); + + } +++ if (count) count--; + + count += sprintf(&buf[count], "\n"); + + + + return count; +@@ -200,6 +201,7 @@ + + vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]); + + count += sprintf(&buf[count], "%u ", vid); + + } +++ if (count) count--; + + count += sprintf(&buf[count], "\n"); + + + + return count; +@@ -226,6 +228,7 @@ + + fid = extract_fid_from_control(acpi_data->states[freq_table[i].driver_data].control); + + count += sprintf(&buf[count], "%u ", fid); + + } +++ if (count) count--; + + count += sprintf(&buf[count], "\n"); + + + + return count; +@@ -254,6 +257,7 @@ + + vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control); + + count += sprintf(&buf[count], "%u:%u ", fid, vid); + + } +++ if (count) count--; + + count += sprintf(&buf[count], "\n"); + + + + return count; +@@ -285,6 +289,7 @@ + + vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]); + + count += sprintf(&buf[count], "%u:%u ", fid, vid); + + } +++ if (count) count--; + + count += sprintf(&buf[count], "\n"); + + + + return count; diff --git a/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-4.3.patch b/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-4.3.patch new file mode 100644 index 000000000000..103ad0b38b19 --- /dev/null +++ b/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-4.3.patch @@ -0,0 +1,51 @@ +--- phc-intel-pack-rev21/inc/4.3/linux-phc-0.3.2.patch ++++ phc-intel-pack-rev21/inc/4.3/linux-phc-0.3.2.patch +@@ -97,7 +97,7 @@ + static void __init acpi_cpufreq_boost_init(void) + { + if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) { +-@@ -941,6 +937,492 @@ ++@@ -941,6 +937,497 @@ + } + } + +@@ -169,6 +169,7 @@ + + vid = extract_vid_from_control(perf->states[freq_table[i].driver_data].control); + + count += sprintf(&buf[count], "%u ", vid); + + } +++ if (count) count--; + + count += sprintf(&buf[count], "\n"); + + + + return count; +@@ -197,6 +198,7 @@ + + vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]); + + count += sprintf(&buf[count], "%u ", vid); + + } +++ if (count) count--; + + count += sprintf(&buf[count], "\n"); + + + + return count; +@@ -222,6 +224,7 @@ + + fid = extract_fid_from_control(perf->states[freq_table[i].driver_data].control); + + count += sprintf(&buf[count], "%u ", fid); + + } +++ if (count) count--; + + count += sprintf(&buf[count], "\n"); + + + + return count; +@@ -252,6 +255,7 @@ + + vid = extract_vid_from_control(perf->states[freq_table[i].driver_data].control); + + count += sprintf(&buf[count], "%u:%u ", fid, vid); + + } +++ if (count) count--; + + count += sprintf(&buf[count], "\n"); + + + + return count; +@@ -285,6 +289,7 @@ + + vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]); + + count += sprintf(&buf[count], "%u:%u ", fid, vid); + + } +++ if (count) count--; + + count += sprintf(&buf[count], "\n"); + + + + return count; diff --git a/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-4.5.patch b/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-4.5.patch new file mode 100644 index 000000000000..928edc616f7b --- /dev/null +++ b/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-4.5.patch @@ -0,0 +1,51 @@ +--- phc-intel-pack-rev21/inc/4.5/linux-phc-0.3.2.patch ++++ phc-intel-pack-rev21/inc/4.5/linux-phc-0.3.2.patch +@@ -96,7 +96,7 @@ + static void __init acpi_cpufreq_boost_init(void) + { + if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) { +-@@ -935,6 +932,491 @@ ++@@ -935,6 +932,496 @@ + } + } + +@@ -168,6 +168,7 @@ + + vid = extract_vid_from_control(perf->states[freq_table[i].driver_data].control); + + count += sprintf(&buf[count], "%u ", vid); + + } +++ if (count) count--; + + count += sprintf(&buf[count], "\n"); + + + + return count; +@@ -196,6 +197,7 @@ + + vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]); + + count += sprintf(&buf[count], "%u ", vid); + + } +++ if (count) count--; + + count += sprintf(&buf[count], "\n"); + + + + return count; +@@ -221,6 +223,7 @@ + + fid = extract_fid_from_control(perf->states[freq_table[i].driver_data].control); + + count += sprintf(&buf[count], "%u ", fid); + + } +++ if (count) count--; + + count += sprintf(&buf[count], "\n"); + + + + return count; +@@ -251,6 +254,7 @@ + + vid = extract_vid_from_control(perf->states[freq_table[i].driver_data].control); + + count += sprintf(&buf[count], "%u:%u ", fid, vid); + + } +++ if (count) count--; + + count += sprintf(&buf[count], "\n"); + + + + return count; +@@ -284,6 +288,7 @@ + + vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]); + + count += sprintf(&buf[count], "%u:%u ", fid, vid); + + } +++ if (count) count--; + + count += sprintf(&buf[count], "\n"); + + + + return count; diff --git a/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-4.6.patch b/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-4.6.patch new file mode 100644 index 000000000000..efb4baf088e7 --- /dev/null +++ b/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-4.6.patch @@ -0,0 +1,51 @@ +--- phc-intel-pack-rev21/inc/4.6/linux-phc-0.3.2.patch ++++ phc-intel-pack-rev21/inc/4.6/linux-phc-0.3.2.patch +@@ -97,7 +97,7 @@ + static void __init acpi_cpufreq_boost_init(void) + { + if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) { +-@@ -917,6 +914,491 @@ ++@@ -917,6 +914,496 @@ + } + } + +@@ -169,6 +169,7 @@ + + vid = extract_vid_from_control(perf->states[freq_table[i].driver_data].control); + + count += sprintf(&buf[count], "%u ", vid); + + } +++ if (count) count--; + + count += sprintf(&buf[count], "\n"); + + + + return count; +@@ -197,6 +198,7 @@ + + vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]); + + count += sprintf(&buf[count], "%u ", vid); + + } +++ if (count) count--; + + count += sprintf(&buf[count], "\n"); + + + + return count; +@@ -222,6 +224,7 @@ + + fid = extract_fid_from_control(perf->states[freq_table[i].driver_data].control); + + count += sprintf(&buf[count], "%u ", fid); + + } +++ if (count) count--; + + count += sprintf(&buf[count], "\n"); + + + + return count; +@@ -252,6 +255,7 @@ + + vid = extract_vid_from_control(perf->states[freq_table[i].driver_data].control); + + count += sprintf(&buf[count], "%u:%u ", fid, vid); + + } +++ if (count) count--; + + count += sprintf(&buf[count], "\n"); + + + + return count; +@@ -285,6 +289,7 @@ + + vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]); + + count += sprintf(&buf[count], "%u:%u ", fid, vid); + + } +++ if (count) count--; + + count += sprintf(&buf[count], "\n"); + + + + return count; diff --git a/sys-power/phc-intel/phc-intel-0.3.2.12.21.ebuild b/sys-power/phc-intel/phc-intel-0.3.2.12.21.ebuild new file mode 100644 index 000000000000..65d10b78682b --- /dev/null +++ b/sys-power/phc-intel/phc-intel-0.3.2.12.21.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit linux-info linux-mod eutils + +DESCRIPTION="Processor Hardware Control for Intel CPUs" +HOMEPAGE="http://www.linux-phc.org/ + http://www.linux-phc.org/forum/viewtopic.php?f=7&t=267" +#no automatic filenames here, sorry +SRC_URI="http://www.linux-phc.org/forum/download/file.php?id=170 -> phc-intel-pack-rev21.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +CONFIG_CHECK="~!X86_ACPI_CPUFREQ" +ERROR_X86_ACPI_CPUFREQ="CONFIG_X86_ACPI_CPUFREQ has to be configured to Module to enable the replacement of acpi-cpufreq with phc-intel." + +MODULE_NAMES="phc-intel(misc:)" +BUILD_PARAMS="KERNELSRC=\"${KERNEL_DIR}\" -j1" +BUILD_TARGETS="all" + +S=${WORKDIR}/${A/.tar.bz2} + +pkg_setup() { + if kernel_is lt 3 1 ; then + eerror "Your kernel version is no longer supported by this version of ${PN}." + eerror "Please use a previous version of ${PN} or a newer kernel." + die + fi + if kernel_is gt 4 6 ; then + eerror "Your kernel version is not yet tested with this version of ${PN}." + eerror "It might not build or expose runtime problems." + fi + linux-mod_pkg_setup +} + +src_prepare() { + epatch \ + "${FILESDIR}"/phc-intel-0.3.2-rev21-trailing-space-3.{4,7,9,10,11,12,13,14,15}.patch \ + "${FILESDIR}"/phc-intel-0.3.2-rev21-trailing-space-4.{1,3,5,6}.patch + + sed -e '/^all:/s:prepare::' \ + -i Makefile || die + + local my_sub=arch/x86/kernel/cpu + if kernel_is gt 2 6 39 ; then + my_sub=drivers + fi + cp -v "${KERNEL_DIR}"/${my_sub}/cpufreq/acpi-cpufreq.c . || die + if kernel_is lt 3 12 ; then + cp -v "${KERNEL_DIR}"/${my_sub}/cpufreq/mperf.h . || die + fi + + if kernel_is lt 4 7 ; then + epatch inc/${KV_MAJOR}.${KV_MINOR}/linux-phc-0.3.2.patch + else + epatch inc/4.6/linux-phc-0.3.2.patch + fi + + mv acpi-cpufreq.c phc-intel.c || die +} |