root
5 years ago
249 changed files with 2315 additions and 1418 deletions
-
4app-benchmarks/stress/stress-1.0.4-r1.ebuild
-
1app-crypt/keybase/Manifest
-
47app-crypt/keybase/keybase-1.0.20.ebuild
-
2app-editors/focuswriter/focuswriter-1.6.3.ebuild
-
3app-editors/retext/Manifest
-
49app-editors/retext/retext-5.3.1.ebuild
-
9app-editors/retext/retext-7.0.0.ebuild
-
4app-editors/retext/retext-9999.ebuild
-
1app-emulation/diskimage-builder/Manifest
-
29app-emulation/diskimage-builder/diskimage-builder-2.0.0.ebuild
-
1app-emulation/kompose/Manifest
-
30app-emulation/kompose/kompose-0.3.0.ebuild
-
2app-misc/screen/Manifest
-
37app-misc/screen/files/screen-4.3.1-ansi.c.patch
-
17app-misc/screen/files/screen-4.5.0-logfile-access-revert.patch
-
12app-misc/screen/files/screen-4.5.0-solaris-PATH_MAX.patch
-
157app-misc/screen/screen-4.3.1-r1.ebuild
-
162app-misc/screen/screen-4.5.0-r1.ebuild
-
4app-text/wiki2beamer/wiki2beamer-0.9.5-r1.ebuild
-
2dev-cpp/commoncpp2/commoncpp2-1.8.1-r3.ebuild
-
56dev-games/physfs/physfs-2.0.3-r1.ebuild
-
4dev-libs/libsodium/Manifest
-
4dev-libs/libsodium/libsodium-1.0.12.ebuild
-
34dev-libs/libsodium/libsodium-1.0.2.ebuild
-
34dev-libs/libsodium/libsodium-1.0.8.ebuild
-
2dev-libs/libunistring/libunistring-0.9.7.ebuild
-
15dev-libs/vc/Manifest
-
39dev-libs/vc/vc-1.3.1.ebuild
-
2dev-perl/XML-LibXML/XML-LibXML-2.12.800-r1.ebuild
-
2dev-perl/glib-perl/glib-perl-1.324.0.ebuild
-
6dev-python/cgroup-utils/cgroup-utils-0.6.ebuild
-
4dev-python/cookies/cookies-2.2.1.ebuild
-
4dev-python/pxml/pxml-0.2.12.ebuild
-
4dev-python/pylibacl/pylibacl-0.5.0-r1.ebuild
-
4dev-python/pypax/pypax-9999.ebuild
-
1dev-python/safety/Manifest
-
23dev-python/safety/safety-0.6.0.ebuild
-
1dev-python/setuptools/Manifest
-
69dev-python/setuptools/setuptools-34.3.2.ebuild
-
1dev-util/android-studio/Manifest
-
99dev-util/android-studio/android-studio-2.3.0.8.162.3764568.ebuild
-
4dev-util/bumpversion/bumpversion-0.5.3.ebuild
-
202dev-util/cmake/cmake-3.7.2-r10.ebuild
-
843dev-util/cmake/files/cmake-3.7.2-x32.patch
-
2dev-util/cookiecutter/cookiecutter-1.5.1.ebuild
-
3dev-util/docker-ls/Manifest
-
42dev-util/docker-ls/docker-ls-0.2.1_p20161102.ebuild
-
8dev-util/docker-ls/metadata.xml
-
1dev-util/drone-ui/Manifest
-
20dev-util/drone-ui/drone-ui-0_pre20170103.ebuild
-
5dev-util/drone/Manifest
-
49dev-util/drone/drone-0.5.0_pre20170219.ebuild
-
39dev-util/drone/drone-0.5.0_rc1_p20170310.ebuild
-
3eclass/ELT-patches/aixrtl/1.5.0-soname
-
6eclass/ELT-patches/aixrtl/2.4.2.418-soname
-
4eclass/golang-vcs-snapshot.eclass
-
1media-libs/gd/Manifest
-
61media-libs/gd/gd-2.2.3.ebuild
-
2media-libs/harfbuzz/Manifest
-
0media-libs/harfbuzz/harfbuzz-1.4.5.ebuild
-
2metadata/dtd/timestamp.chk
-
2metadata/glsa/timestamp.chk
-
2metadata/md5-cache/app-admin/cli53-0.8.4
-
2metadata/md5-cache/app-admin/cli53-0.8.7
-
2metadata/md5-cache/app-admin/vault-0.5.3
-
4metadata/md5-cache/app-benchmarks/stress-1.0.4-r1
-
12metadata/md5-cache/app-crypt/keybase-1.0.20
-
4metadata/md5-cache/app-editors/focuswriter-1.6.3
-
14metadata/md5-cache/app-editors/retext-5.3.1
-
14metadata/md5-cache/app-editors/retext-6.0.1
-
14metadata/md5-cache/app-editors/retext-7.0.0
-
10metadata/md5-cache/app-editors/retext-9999
-
2metadata/md5-cache/app-emulation/containerd-0.2.3_p20170131
-
2metadata/md5-cache/app-emulation/containerd-0.2.3_p20170223
-
2metadata/md5-cache/app-emulation/containerd-0.2.5
-
2metadata/md5-cache/app-emulation/containerd-0.2.5-r1
-
14metadata/md5-cache/app-emulation/diskimage-builder-2.0.0
-
2metadata/md5-cache/app-emulation/docker-1.12.6
-
2metadata/md5-cache/app-emulation/docker-1.13.1-r2
-
2metadata/md5-cache/app-emulation/docker-1.13.1-r3
-
2metadata/md5-cache/app-emulation/docker-17.03.0
-
2metadata/md5-cache/app-emulation/docker-machine-0.10.0
-
2metadata/md5-cache/app-emulation/docker-machine-0.9.0
-
2metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20161111
-
2metadata/md5-cache/app-emulation/docker-registry-2.5.1
-
2metadata/md5-cache/app-emulation/docker-registry-2.6.0
-
2metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc2_p20170201
-
2metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc2_p20170222
-
2metadata/md5-cache/app-emulation/docker-swarm-1.2.0
-
2metadata/md5-cache/app-emulation/hyperd-0.7.0-r1
-
2metadata/md5-cache/app-emulation/kompose-0.2.0_p20170214
-
13metadata/md5-cache/app-emulation/kompose-0.3.0
-
2metadata/md5-cache/app-emulation/runc-1.0.0_rc2-r2
-
2metadata/md5-cache/app-emulation/runc-1.0.0_rc2_p20170222
-
2metadata/md5-cache/app-emulation/runv-0.7.0
-
13metadata/md5-cache/app-misc/screen-4.3.1-r1
-
13metadata/md5-cache/app-misc/screen-4.5.0-r1
-
4metadata/md5-cache/app-text/wiki2beamer-0.9.5-r1
-
4metadata/md5-cache/dev-cpp/commoncpp2-1.8.1-r3
-
2metadata/md5-cache/dev-db/etcd-3.0.17
@ -0,0 +1,47 @@ |
|||
# Copyright 1999-2017 Gentoo Foundation |
|||
# Distributed under the terms of the GNU General Public License v2 |
|||
|
|||
EAPI=6 |
|||
|
|||
inherit eutils versionator |
|||
|
|||
MY_PV=$(replace_version_separator 3 '-') |
|||
|
|||
DESCRIPTION="Client for keybase.io" |
|||
HOMEPAGE="https://keybase.io/" |
|||
SRC_URI="https://github.com/keybase/client/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" |
|||
|
|||
LICENSE="BSD" |
|||
SLOT="0" |
|||
KEYWORDS="~amd64 ~x86" |
|||
IUSE="" |
|||
|
|||
DEPEND=" |
|||
>=dev-lang/go-1.6:0" |
|||
RDEPEND=" |
|||
app-crypt/gnupg" |
|||
|
|||
S="${WORKDIR}/src/github.com/keybase/client" |
|||
|
|||
src_unpack() { |
|||
unpack "${P}.tar.gz" |
|||
mkdir -p "$(dirname "${S}")" || die |
|||
mv "client-${MY_PV}" "${S}" || die |
|||
} |
|||
|
|||
src_compile() { |
|||
GOPATH="${WORKDIR}:${S}/go/vendor" \ |
|||
go build -v -x \ |
|||
-tags production \ |
|||
-o "${T}/keybase" \ |
|||
github.com/keybase/client/go/keybase || die |
|||
} |
|||
|
|||
src_install() { |
|||
dobin "${T}/keybase" |
|||
} |
|||
|
|||
pkg_postinst() { |
|||
elog "Run the service: keybase service" |
|||
elog "Run the client: keybase login" |
|||
} |
|||
@ -1,4 +1,3 @@ |
|||
DIST ReText-4.1.3.tar.gz 129283 SHA256 bb4409982d27ac62cab01b0748fe41d9c6660853668b350f3369e76d155edd6c SHA512 d2b3fa901afa9870f6cecc7ab3126b91f1420ca1b14ddd4f609c2ada7121388840b5be679914694664f3bbf876ee8522aa6b0c82a23f837844f788fa10a46323 WHIRLPOOL 3be71e5d7ec612ae4e4fec17ca544f6d0e7cb7421fcdeb517d3c13156ed07f5e5e7c3e352cf604bfb5f2287964fdc173a1bac0eeab41ee1cda8b265ad0f57686 |
|||
DIST ReText-5.3.1.tar.gz 159669 SHA256 515b1aaa57615453f8933f997753072a5c4691793da2280e70d1b333b53904c6 SHA512 76c6f78c10129e4845de819fa6db3deff5441a25331fd3dadbdfeb766caa453f21214f82e6625c919cc8be2fcfdfada970cae32837bb8904c3702dda19890628 WHIRLPOOL 5c2db75c2b2f23419bc2803849f6b7a69f3540911c6e53f46a46baffd150a9a0db75d0343361963a53bcc1a6da4534eb72d99068a26c13c1551b6188ab81f67a |
|||
DIST ReText-6.0.1.tar.gz 184098 SHA256 7c9785cb022d2f0b123b8a808c2419cf1300249d594a72a5ef5a0030de8bb630 SHA512 aca8db5d82fadee7b8d03279e080b33da696339eb674ba1fc2dd4ced7c92b1608d8ed2d181bdbe913601d63755df38ebdfa06f77398e1b52cc922f54fc0fe867 WHIRLPOOL 0590b347e7ca21d7e6e653c74fd53abe2ccb0852e6ab3f53213f8beb38234b0b757bf60ba77f68e485b68332d3b06def94aa4b9aebae369e472a876ce34d9b77 |
|||
DIST ReText-6.0.2.tar.gz 195339 SHA256 ce28b20673627bd4e17c750d71b73e073776e291b2a1736dd561a1a24aa7f70b SHA512 e8670c03eb2a38b8baeedee4c6e31b52e6e3954f2b1fa0d4249653f77e853aa7fd8ee7a43c98d36194889528dd0da75d4106950385e93d8d2b69139454de1729 WHIRLPOOL a42e4ec9d82e15754bf7aaf4c05a15cbb818a5e4d8b71c7994f0a5dca3f27b5fee56f6a3adfbf49f073e70de11202852b301945884dd8bab63f123128d316557 |
|||
DIST ReText-7.0.0.tar.gz 203294 SHA256 01eaf11768f27ba1da2572f2dbcf9b6857d5baa3ca1f50d1cacad894a228f032 SHA512 0a2e430659e7d87d50780fecbf5f04f852f144d143ec83b90126ab9e7b8006756cbc8710c9cec192ddad2cba9f7236e684fa207e308c565388ede308da3c1a35 WHIRLPOOL 5f3633c45c6ef7cb44cbd805849a97b81536d762910d44380a6d2836eb7308ed0c449ec282139b0eea07445be051a0cfa4ab7d3b077693a07f4d14beffbfc8ae |
|||
@ -1,49 +0,0 @@ |
|||
# Copyright 1999-2016 Gentoo Foundation |
|||
# Distributed under the terms of the GNU General Public License v2 |
|||
|
|||
EAPI=5 |
|||
|
|||
PYTHON_COMPAT=( python3_4 ) |
|||
|
|||
PLOCALES="ca cs cy da de es et eu fr hu it ja pl pt pt_BR ru sk sr sr@latin uk zh_TW" |
|||
|
|||
inherit distutils-r1 l10n |
|||
|
|||
MY_PN="ReText" |
|||
MY_P="${MY_PN}-${PV/_/~}" |
|||
|
|||
DESCRIPTION="Simple editor for Markdown and reStructuredText" |
|||
HOMEPAGE="https://github.com/retext-project/retext https://github.com/retext-project/retext/wiki" |
|||
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" |
|||
|
|||
LICENSE="GPL-2" |
|||
SLOT="0" |
|||
KEYWORDS="~amd64 ~x86" |
|||
IUSE="+spell" |
|||
|
|||
RDEPEND=" |
|||
dev-python/docutils[${PYTHON_USEDEP}] |
|||
dev-python/markdown[${PYTHON_USEDEP}] |
|||
<dev-python/markups-2[${PYTHON_USEDEP}] |
|||
dev-python/pygments[${PYTHON_USEDEP}] |
|||
dev-python/PyQt5[gui,network,printsupport,webkit,widgets,${PYTHON_USEDEP}] |
|||
spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] ) |
|||
" |
|||
|
|||
S="${WORKDIR}"/${MY_P} |
|||
|
|||
remove_locale() { |
|||
find "${ED}" -name "retext_${1}.qm" -delete || die "Failed to remove locale ${1}." |
|||
} |
|||
|
|||
python_test() { |
|||
esetup.py test |
|||
} |
|||
|
|||
python_install_all() { |
|||
distutils-r1_python_install_all |
|||
|
|||
l10n_for_each_disabled_locale_do remove_locale |
|||
|
|||
make_desktop_entry ${PN} "${MY_PN} Editor" ${PN} "Development;Utility;TextEditor" |
|||
} |
|||
@ -1,3 +1,4 @@ |
|||
DIST diskimage-builder-1.26.1.tar.gz 260140 SHA256 dd842a364124a59aaa3751fe178f8799c39e29badbc69d1459d2ed35b9042660 SHA512 698c97b7e016a87c2acd83d27400bd009e8148bb76efc737fae3344aa2c860fdf4060f1608eaa38566c24fa68c5fdbf51559ab64f9d9ef26d0adbe3a1b69325f WHIRLPOOL 83e86a6b5a1629041465be971657968fbdad3377ba9c3bb60ce29b2dd658165541f6e3b5a67eaa13727221e0a44032aafb26b30e042453e2a4c4e085cb26f3da |
|||
DIST diskimage-builder-1.27.0.tar.gz 264590 SHA256 108e6fa41cbab88a018e43b19f5706b20a984b94131d6451876eedc26a26a892 SHA512 63e98c95452f9ddb9ae21f208b7dc840a9a10a02e9dee8d313cac531854b706f7662ea7b907f38a72c58d6ecdead324782d4cbda32fb7a4861b8c4bef9412a56 WHIRLPOOL 586b62729a5577a0ed804c7f457297e0624d1e491ab82ee95c29443ba46d5769814fded9ae88e2b6f7e2ec8d69b208851f24f26f04667717055944d296ccdb9f |
|||
DIST diskimage-builder-1.28.0.tar.gz 267409 SHA256 2d8999a8484d27e8604d125aabcbdad648f8b601776225cfc611faf1a3b9a0e6 SHA512 ae13e29563f90a4aaa4f2bee889bca4fd662da41fcffb957ca8a4380907e5d89fbc25ecb93aeda2cb5597776b51417388e8a5e39741250d68a8f7f67239ebc7f WHIRLPOOL 7cfcefcf37fd0d5fae4fb8d3284ad3b60e53e4a2853c85625a1925c34bd4cdbee999932089f7dae81adcf699226ba1550f729a2b1b8aab4b6e54c10c7148fea1 |
|||
DIST diskimage-builder-2.0.0.tar.gz 288997 SHA256 1a9166483373d3336422d39f79b27abd875ce89eec46af37f3f76e7e567faa68 SHA512 757ede8ae6124b4b03aa8b60def624a5bd031deff100c49a9de1cffe184fe7346bde40ab8ff84b6d00caf7ccffd928929a1623edc3d4d7d267591cd9da4e113c WHIRLPOOL 26f8884b57c013dd002a9c119ba840a2e8f48ebcb806f7a8eb2c38cfb250e1a42374f9396fee1f5283484a10025edc8b484325578d1fb787e012be19fdf5a685 |
|||
@ -0,0 +1,29 @@ |
|||
# Copyright 1999-2017 Gentoo Foundation |
|||
# Distributed under the terms of the GNU General Public License v2 |
|||
|
|||
EAPI=6 |
|||
PYTHON_COMPAT=( python2_7 ) |
|||
|
|||
inherit distutils-r1 |
|||
|
|||
DESCRIPTION="Golden Disk Image builder." |
|||
HOMEPAGE="http://docs.openstack.org/developer/diskimage-builder/" |
|||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
|||
|
|||
LICENSE="Apache-2.0" |
|||
SLOT="0" |
|||
KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux" |
|||
IUSE="" |
|||
|
|||
CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]" |
|||
DEPEND="${CDEPEND} |
|||
dev-python/setuptools[${PYTHON_USEDEP}]" |
|||
RDEPEND="${CDEPEND} |
|||
>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}] |
|||
>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}] |
|||
>=dev-python/flake8-2.5.4[${PYTHON_USEDEP}] |
|||
<dev-python/flake8-2.6.0[${PYTHON_USEDEP}] |
|||
>=dev-python/six-1.9.0[${PYTHON_USEDEP}] |
|||
app-emulation/qemu |
|||
sys-block/parted |
|||
sys-fs/multipath-tools" |
|||
@ -1 +1,2 @@ |
|||
DIST kompose-0.2.0_p20170214.tar.gz 4928182 SHA256 437303c2f7b3c24182561e76cfa85102814f731fc7f5951933fe6c153c6b2e1b SHA512 dab013f861f4a185c0fdea3f4b79d33ff280f3c7ad77e150ce381770182ad77a37d8ccbadfe1f7bd13d50dc36a7087847d1636b6b411a21e0de43113be5b0183 WHIRLPOOL 581a6059bdb6286ca859e5a2f1e750a9ceaa3724ed9fee4092ac9283b2216629118437ccd0354ffebde95ac37b1591048f5972658a093b4aefc09bc8a02402f8 |
|||
DIST kompose-0.3.0.tar.gz 4928611 SHA256 047e5367856f07338515eea43fb213e08fdde79333250e4cc85251e80251c928 SHA512 094d0093d6cf480d8c757f5f2d82719eaaf0c6c1b33140d45fcb2ff7b129e9cada0660a3faf26b13e877b05897920e00ddf8b451dfc91042f7f6bb72a4a24618 WHIRLPOOL dba40efcfdd6d22a9112c078be47f159fde4de9ac43bf04f72c5006add523a67c13487c0da9168feab0c8c9f84abe3865914239008d87172df86b3654b21935d |
|||
@ -0,0 +1,30 @@ |
|||
# Copyright 1999-2017 Gentoo Foundation |
|||
# Distributed under the terms of the GNU General Public License v2 |
|||
|
|||
EAPI=6 |
|||
inherit golang-build golang-vcs-snapshot |
|||
|
|||
EGO_PN="github.com/kubernetes-incubator/kompose/..." |
|||
EGIT_COMMIT="v0.3.0" |
|||
COMPOSE_COMMIT="135165b" |
|||
ARCHIVE_URI="https://${EGO_PN%/*}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" |
|||
KEYWORDS="~amd64" |
|||
|
|||
DESCRIPTION="Tool to move from docker-compose to Kubernetes" |
|||
HOMEPAGE="https://github.com/kubernetes-incubator/kompose" |
|||
SRC_URI="${ARCHIVE_URI}" |
|||
LICENSE="Apache-2.0" |
|||
SLOT="0/${PVR}" |
|||
IUSE="hardened" |
|||
|
|||
RESTRICT="test" |
|||
|
|||
src_compile() { |
|||
export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" |
|||
GOPATH="${S}" go build -ldflags="-X github.com/kubernetes-incubator/kompose/cmd.GITCOMMIT=${COMPOSE_COMMIT}" -o bin/kompose src/${EGO_PN%/*}/main.go || die |
|||
} |
|||
|
|||
src_install() { |
|||
dobin bin/* |
|||
dodoc -r src/${EGO_PN%/*}/{docs,{README,RELEASE,ROADMAP,CHANGELOG,CONTRIBUTING}.md} |
|||
} |
|||
@ -1,4 +1,2 @@ |
|||
DIST screen-4.3.1.tar.gz 845958 SHA256 fa4049f8aee283de62e283d427f2cfd35d6c369b40f7f45f947dbfd915699d63 SHA512 8e8a25b23330a7d8e00fc9e6cc430f0eb3937ccf4183efbd6fd24e4dc04cc09b3acae45bfc24892faee433b18fa79b1cfe0211fd75c0d74ecf908f916bf774aa WHIRLPOOL b47f7538351028cc3a2ec7f69a9373e152fa7655c6ae9feb75ba46db3cdc9b7d58ce78043993b7f134da3a04754c5e52d1a77da4c30a8decda21c79cf5c50f51 |
|||
DIST screen-4.4.0.tar.gz 846010 SHA256 ef722a54759a3bf23aad272bbf33c414c1078cad6bcd982fada93c0d7917218b SHA512 6e43f85c419f778822ec85e4340c95769e981a3d51abdeb5f26c6ebb840da9ab11b351ecc7f380ceea39bcfaa87f1124cfebd6af4ecb62b886eb189e7b79981b WHIRLPOOL a0d68d2d50f9f50537bf73a6dbb1ecbfe8c6af5c5322003a717431734bdc86a940fc55cd8c3a28b3e5ec572aaa0ceba376d97cbb8c5090a92d499cba2889b322 |
|||
DIST screen-4.5.0.tar.gz 963233 SHA256 01c3a7c362185f35d6a95dff52d64337076496acd034d717de3c263500cfefb0 SHA512 b2705ed9604355d4153d7902f820af6131a1f2387650f5c6efeda7acf543aad48e8603c26d7c6e74213c8eece994d5d9bb0d114bc19c8d8f3d8e99c00ea4a484 WHIRLPOOL 04b26e849ae0440778f2eee1a8d8730697a0f8ee933522ec16de697ff0cc189fc67b7e46b7cb218457ab53e491fceff0d70e44417c7c3af5c934cd3fae769382 |
|||
DIST screen-4.5.1.tar.gz 963153 SHA256 97db2114dd963b016cd4ded34831955dcbe3251e5eee45ac2606e67e9f097b2d SHA512 ca53477ad38264be38efb1d10a1337b647dd061127162c77533b17a30d046cd0caabe38e4a9e5389aac30d5dc62eb53e7877411e69adae36d0ca869bd0a82804 WHIRLPOOL db60013141e3f426107d3f1e518b48fc0bbf89fbf51b26b5ac7208b9940448397ec0009d389365289a1d06421b403982093c8b7ee8d891eea20c704d7ad376b1 |
|||
@ -1,37 +0,0 @@ |
|||
--- a/ansi.c
|
|||
+++ b/ansi.c
|
|||
@@ -2502,13 +2502,13 @@
|
|||
return; |
|||
if (n > 0) |
|||
{ |
|||
+ if (ye - ys + 1 < n)
|
|||
+ n = ye - ys + 1;
|
|||
if (n > 256) |
|||
{ |
|||
MScrollV(p, n - 256, ys, ye, bce); |
|||
n = 256; |
|||
} |
|||
- if (ye - ys + 1 < n)
|
|||
- n = ye - ys + 1;
|
|||
#ifdef COPY_PASTE |
|||
if (compacthist) |
|||
{ |
|||
@@ -2562,15 +2562,14 @@
|
|||
} |
|||
else |
|||
{ |
|||
+ n = -n;
|
|||
+ if (ye - ys + 1 < n)
|
|||
+ n = ye - ys + 1;
|
|||
if (n < -256) |
|||
{ |
|||
MScrollV(p, n + 256, ys, ye, bce); |
|||
n = -256; |
|||
} |
|||
- n = -n;
|
|||
- if (ye - ys + 1 < n)
|
|||
- n = ye - ys + 1;
|
|||
-
|
|||
ml = p->w_mlines + ye; |
|||
/* Clear lines */ |
|||
for (i = ye; i > ye - n; i--, ml--) |
|||
@ -1,17 +0,0 @@ |
|||
Revert commit 5460f5d28c01a9a58e021eb1dffef2965e629d58 |
|||
|
|||
--- b/screen.c
|
|||
+++ a/screen.c
|
|||
@@ -670,12 +670,6 @@ int main(int ac, char** av)
|
|||
Panic(0, "-L: logfile name can not start with \"-\" symbol"); |
|||
if (strlen(screenlogfile) > PATH_MAX) |
|||
Panic(0, "-L: logfile name too long. (max. %d char)", PATH_MAX); |
|||
-
|
|||
- FILE *w_check;
|
|||
- if ((w_check = fopen(screenlogfile, "w")) == NULL)
|
|||
- Panic(0, "-L: logfile name access problem");
|
|||
- else
|
|||
- fclose(w_check);
|
|||
} |
|||
nwin_options.Lflag = 1; |
|||
break; |
|||
@ -1,12 +0,0 @@ |
|||
On Solaris one needs to include limits.h in order to use PATH_MAX |
|||
|
|||
--- screen-4.5.0/screen.c
|
|||
+++ screen-4.5.0/screen.c
|
|||
@@ -44,6 +44,7 @@
|
|||
#endif |
|||
#include <ctype.h> |
|||
#include <fcntl.h> |
|||
+#include <limits.h>
|
|||
|
|||
#ifdef sgi |
|||
# include <sys/sysmacros.h> |
|||
@ -1,157 +0,0 @@ |
|||
# Copyright 1999-2017 Gentoo Foundation |
|||
# Distributed under the terms of the GNU General Public License v2 |
|||
|
|||
EAPI=5 |
|||
|
|||
inherit autotools eutils flag-o-matic pam toolchain-funcs user |
|||
|
|||
DESCRIPTION="screen manager with VT100/ANSI terminal emulation" |
|||
HOMEPAGE="https://www.gnu.org/software/screen/" |
|||
SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" |
|||
|
|||
LICENSE="GPL-2" |
|||
SLOT="0" |
|||
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
|||
IUSE="debug nethack pam selinux multiuser" |
|||
|
|||
CDEPEND=" |
|||
>=sys-libs/ncurses-5.2:0= |
|||
pam? ( virtual/pam )" |
|||
RDEPEND="${CDEPEND} |
|||
selinux? ( sec-policy/selinux-screen )" |
|||
DEPEND="${CDEPEND} |
|||
sys-apps/texinfo" |
|||
|
|||
# Patches: |
|||
# - Don't use utempter even if it is found on the system. |
|||
# - Bug 559394. |
|||
PATCHES=( |
|||
"${FILESDIR}"/${PN}-4.3.0-no-utempter.patch |
|||
"${FILESDIR}"/${PN}-4.3.1-ansi.c.patch |
|||
) |
|||
|
|||
pkg_setup() { |
|||
# Make sure utmp group exists, as it's used later on. |
|||
enewgroup utmp 406 |
|||
} |
|||
|
|||
src_prepare() { |
|||
# Apply patches. |
|||
epatch "${PATCHES[@]}" |
|||
|
|||
# sched.h is a system header and causes problems with some C libraries |
|||
mv sched.h _sched.h || die |
|||
sed -i '/include/ s:sched.h:_sched.h:' screen.h || die |
|||
|
|||
# Fix manpage. |
|||
sed -i \ |
|||
-e "s:/usr/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \ |
|||
-e "s:/usr/local/screens:${EPREFIX}/tmp/screen:g" \ |
|||
-e "s:/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \ |
|||
-e "s:/etc/utmp:${EPREFIX}/var/run/utmp:g" \ |
|||
-e "s:/local/screens/S-:${EPREFIX}/tmp/screen/S-:g" \ |
|||
doc/screen.1 \ |
|||
|| die |
|||
|
|||
if [[ ${CHOST} == *-darwin* ]] ; then |
|||
sed -i -e '/^#define UTMPOK/s/define/undef/' acconfig.h || die |
|||
fi |
|||
|
|||
# reconfigure |
|||
eautoreconf |
|||
} |
|||
|
|||
src_configure() { |
|||
append-cppflags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}" |
|||
|
|||
if [[ ${CHOST} == *-solaris* ]] ; then |
|||
# https://lists.gnu.org/archive/html/screen-devel/2014-04/msg00095.html |
|||
append-cppflags -D_XOPEN_SOURCE \ |
|||
-D_XOPEN_SOURCE_EXTENDED=1 \ |
|||
-D__EXTENSIONS__ |
|||
append-libs -lsocket -lnsl |
|||
fi |
|||
|
|||
use nethack || append-cppflags "-DNONETHACK" |
|||
use debug && append-cppflags "-DDEBUG" |
|||
|
|||
econf \ |
|||
--with-socket-dir="${EPREFIX}/tmp/screen" \ |
|||
--with-sys-screenrc="${EPREFIX}/etc/screenrc" \ |
|||
--with-pty-mode=0620 \ |
|||
--with-pty-group=5 \ |
|||
--enable-rxvt_osc \ |
|||
--enable-telnet \ |
|||
--enable-colors256 \ |
|||
$(use_enable pam) |
|||
} |
|||
|
|||
src_compile() { |
|||
LC_ALL=POSIX emake comm.h term.h |
|||
emake osdef.h |
|||
|
|||
emake -C doc screen.info |
|||
default |
|||
} |
|||
|
|||
src_install() { |
|||
local tmpfiles_perms tmpfiles_group |
|||
|
|||
dobin screen |
|||
|
|||
if use multiuser || use prefix |
|||
then |
|||
fperms 4755 /usr/bin/screen |
|||
tmpfiles_perms="0755" |
|||
tmpfiles_group="root" |
|||
else |
|||
fowners root:utmp /usr/bin/screen |
|||
fperms 2755 /usr/bin/screen |
|||
tmpfiles_perms="0775" |
|||
tmpfiles_group="utmp" |
|||
fi |
|||
|
|||
dodir /etc/tmpfiles.d |
|||
echo "d /tmp/screen ${tmpfiles_perms} root ${tmpfiles_group}" \ |
|||
> "${ED}"/etc/tmpfiles.d/screen.conf |
|||
|
|||
insinto /usr/share/screen |
|||
doins terminfo/{screencap,screeninfo.src} |
|||
insinto /usr/share/screen/utf8encodings |
|||
doins utf8encodings/?? |
|||
insinto /etc |
|||
doins "${FILESDIR}"/screenrc |
|||
|
|||
pamd_mimic_system screen auth |
|||
|
|||
dodoc \ |
|||
README ChangeLog INSTALL TODO NEWS* patchlevel.h \ |
|||
doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps} |
|||
|
|||
doman doc/screen.1 |
|||
doinfo doc/screen.info |
|||
} |
|||
|
|||
pkg_postinst() { |
|||
if [[ -z ${REPLACING_VERSIONS} ]] |
|||
then |
|||
elog "Some dangerous key bindings have been removed or changed to more safe values." |
|||
elog "We enable some xterm hacks in our default screenrc, which might break some" |
|||
elog "applications. Please check /etc/screenrc for information on these changes." |
|||
fi |
|||
|
|||
# Add /tmp/screen in case it doesn't exist yet. This should solve |
|||
# problems like bug #508634 where tmpfiles.d isn't in effect. |
|||
local rundir="${EROOT%/}/tmp/screen" |
|||
if [[ ! -d ${rundir} ]] ; then |
|||
if use multiuser || use prefix ; then |
|||
tmpfiles_group="root" |
|||
else |
|||
tmpfiles_group="utmp" |
|||
fi |
|||
mkdir -m 0775 "${rundir}" |
|||
chgrp ${tmpfiles_group} "${rundir}" |
|||
fi |
|||
|
|||
ewarn "This revision changes the screen socket location to ${rundir}" |
|||
} |
|||
@ -1,162 +0,0 @@ |
|||
# Copyright 1999-2017 Gentoo Foundation |
|||
# Distributed under the terms of the GNU General Public License v2 |
|||
|
|||
EAPI=6 |
|||
|
|||
SCM="" |
|||
[[ "${PV}" = 9999 ]] && SCM="git-r3" |
|||
inherit autotools eutils flag-o-matic pam toolchain-funcs user ${SCM} |
|||
unset SCM |
|||
|
|||
DESCRIPTION="screen manager with VT100/ANSI terminal emulation" |
|||
HOMEPAGE="https://www.gnu.org/software/screen/" |
|||
|
|||
if [[ "${PV}" != 9999 ]] ; then |
|||
SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" |
|||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
|||
else |
|||
EGIT_REPO_URI="git://git.savannah.gnu.org/screen.git" |
|||
EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" # needed for setting S later on |
|||
S="${WORKDIR}"/${P}/src |
|||
fi |
|||
|
|||
LICENSE="GPL-2" |
|||
SLOT="0" |
|||
IUSE="debug nethack pam selinux multiuser" |
|||
|
|||
CDEPEND=" |
|||
>=sys-libs/ncurses-5.2:0= |
|||
pam? ( virtual/pam )" |
|||
RDEPEND="${CDEPEND} |
|||
selinux? ( sec-policy/selinux-screen )" |
|||
DEPEND="${CDEPEND} |
|||
sys-apps/texinfo" |
|||
|
|||
PATCHES=( |
|||
# Don't use utempter even if it is found on the system. |
|||
"${FILESDIR}"/${PN}-4.3.0-no-utempter.patch |
|||
# PATH_MAX usage needs an include on Solaris |
|||
"${FILESDIR}"/${P}-solaris-PATH_MAX.patch |
|||
# Revert patch due to security, bug #607116 |
|||
"${FILESDIR}"/${P}-logfile-access-revert.patch |
|||
) |
|||
|
|||
pkg_setup() { |
|||
# Make sure utmp group exists, as it's used later on. |
|||
enewgroup utmp 406 |
|||
} |
|||
|
|||
src_prepare() { |
|||
default |
|||
|
|||
# sched.h is a system header and causes problems with some C libraries |
|||
mv sched.h _sched.h || die |
|||
sed -i '/include/ s:sched.h:_sched.h:' screen.h || die |
|||
|
|||
# Fix manpage. |
|||
sed -i \ |
|||
-e "s:/usr/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \ |
|||
-e "s:/usr/local/screens:${EPREFIX}/tmp/screen:g" \ |
|||
-e "s:/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \ |
|||
-e "s:/etc/utmp:${EPREFIX}/var/run/utmp:g" \ |
|||
-e "s:/local/screens/S\\\-:${EPREFIX}/tmp/screen/S\\\-:g" \ |
|||
doc/screen.1 \ |
|||
|| die |
|||
|
|||
if [[ ${CHOST} == *-darwin* ]] ; then |
|||
sed -i -e '/^#define UTMPOK/s/define/undef/' acconfig.h || die |
|||
fi |
|||
|
|||
# reconfigure |
|||
eautoreconf |
|||
} |
|||
|
|||
src_configure() { |
|||
append-cppflags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}" |
|||
|
|||
if [[ ${CHOST} == *-solaris* ]] ; then |
|||
# enable msg_header by upping the feature standard compatible |
|||
# with c99 mode |
|||
append-cppflags -D_XOPEN_SOURCE=600 |
|||
fi |
|||
|
|||
use nethack || append-cppflags "-DNONETHACK" |
|||
use debug && append-cppflags "-DDEBUG" |
|||
|
|||
econf \ |
|||
--with-socket-dir="${EPREFIX}/tmp/screen" \ |
|||
--with-sys-screenrc="${EPREFIX}/etc/screenrc" \ |
|||
--with-pty-mode=0620 \ |
|||
--with-pty-group=5 \ |
|||
--enable-rxvt_osc \ |
|||
--enable-telnet \ |
|||
--enable-colors256 \ |
|||
$(use_enable pam) |
|||
} |
|||
|
|||
src_compile() { |
|||
LC_ALL=POSIX emake comm.h term.h |
|||
emake osdef.h |
|||
|
|||
emake -C doc screen.info |
|||
default |
|||
} |
|||
|
|||
src_install() { |
|||
local DOCS=( |
|||
README ChangeLog INSTALL TODO NEWS* patchlevel.h |
|||
doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps} |
|||
) |
|||
|
|||
default |
|||
|
|||
local tmpfiles_perms tmpfiles_group |
|||
|
|||
if use multiuser || use prefix |
|||
then |
|||
fperms 4755 /usr/bin/screen-${PV} |
|||
tmpfiles_perms="0755" |
|||
tmpfiles_group="root" |
|||
else |
|||
fowners root:utmp /usr/bin/screen-${PV} |
|||
fperms 2755 /usr/bin/screen-${PV} |
|||
tmpfiles_perms="0775" |
|||
tmpfiles_group="utmp" |
|||
fi |
|||
|
|||
dodir /etc/tmpfiles.d |
|||
echo "d /tmp/screen ${tmpfiles_perms} root ${tmpfiles_group}" \ |
|||
> "${ED}"/etc/tmpfiles.d/screen.conf |
|||
|
|||
insinto /usr/share/screen |
|||
doins terminfo/{screencap,screeninfo.src} |
|||
|
|||
insinto /etc |
|||
doins "${FILESDIR}"/screenrc |
|||
|
|||
pamd_mimic_system screen auth |
|||
} |
|||
|
|||
pkg_postinst() { |
|||
if [[ -z ${REPLACING_VERSIONS} ]] |
|||
then |
|||
elog "Some dangerous key bindings have been removed or changed to more safe values." |
|||
elog "We enable some xterm hacks in our default screenrc, which might break some" |
|||
elog "applications. Please check /etc/screenrc for information on these changes." |
|||
fi |
|||
|
|||
# Add /tmp/screen in case it doesn't exist yet. This should solve |
|||
# problems like bug #508634 where tmpfiles.d isn't in effect. |
|||
local rundir="${EROOT%/}/tmp/screen" |
|||
if [[ ! -d ${rundir} ]] ; then |
|||
if use multiuser || use prefix ; then |
|||
tmpfiles_group="root" |
|||
else |
|||
tmpfiles_group="utmp" |
|||
fi |
|||
mkdir -m 0775 "${rundir}" |
|||
chgrp ${tmpfiles_group} "${rundir}" |
|||
fi |
|||
|
|||
ewarn "This revision changes the screen socket location to ${rundir}" |
|||
} |
|||
@ -1,56 +0,0 @@ |
|||
# Copyright 1999-2015 Gentoo Foundation |
|||
# Distributed under the terms of the GNU General Public License v2 |
|||
|
|||
EAPI=5 |
|||
inherit cmake-multilib |
|||
|
|||
DESCRIPTION="Abstraction layer for filesystem and archive access" |
|||
HOMEPAGE="http://icculus.org/physfs/" |
|||
SRC_URI="http://icculus.org/physfs/downloads/${P}.tar.bz2" |
|||
|
|||
LICENSE="ZLIB" |
|||
SLOT="0" |
|||
KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86 ~x86-fbsd" |
|||
IUSE="doc grp hog mvl qpak static-libs wad +zip" |
|||
|
|||
RDEPEND="" |
|||
DEPEND="doc? ( app-doc/doxygen )" |
|||
|
|||
src_prepare() { |
|||
sed -i -e 's:-Werror::' CMakeLists.txt || die |
|||
# make sure these libs aren't used |
|||
rm -rf lzma zlib* |
|||
} |
|||
|
|||
src_configure() { |
|||
local mycmakeargs=" |
|||
-DPHYSFS_ARCHIVE_7Z=OFF |
|||
-DPHYSFS_BUILD_SHARED=ON |
|||
-DPHYSFS_BUILD_TEST=OFF |
|||
-DPHYSFS_BUILD_WX_TEST=OFF |
|||
-DPHYSFS_INTERNAL_ZLIB=OFF |
|||
$(cmake-utils_use static-libs PHYSFS_BUILD_STATIC) |
|||
$(cmake-utils_use grp PHYSFS_ARCHIVE_GRP) |
|||
$(cmake-utils_use hog PHYSFS_ARCHIVE_HOG) |
|||
$(cmake-utils_use mvl PHYSFS_ARCHIVE_MVL) |
|||
$(cmake-utils_use wad PHYSFS_ARCHIVE_WAD) |
|||
$(cmake-utils_use qpak PHYSFS_ARCHIVE_QPAK) |
|||
$(cmake-utils_use zip PHYSFS_ARCHIVE_ZIP)" |
|||
|
|||
cmake-multilib_src_configure |
|||
} |
|||
|
|||
src_compile() { |
|||
cmake-multilib_src_compile |
|||
|
|||
if multilib_is_native_abi && use doc ; then |
|||
doxygen || die "doxygen failed" |
|||
fi |
|||
} |
|||
|
|||
src_install() { |
|||
local DOCS="CHANGELOG.txt CREDITS.txt TODO.txt" |
|||
local HTML_DOCS=$(use doc && echo docs/html/*) |
|||
|
|||
cmake-multilib_src_install |
|||
} |
|||
@ -1,4 +1,2 @@ |
|||
DIST libsodium-1.0.10.tar.gz 1827211 SHA256 71b786a96dd03693672b0ca3eb77f4fb08430df307051c0d45df5353d22bc4be SHA512 ff52e7f25787cc858e8d26be10913c689bd3dd394c8e163133920141be67a292a1dba066a1037e83cf0ced155a1554f07f24c2f33a7a6aa52521d39f537cd515 WHIRLPOOL 452ac241c26284e433c4a4595b45a1470da0be15a78761dd825460d676e48a3f36eb37ddf2c1843e3fdc64cc7cddf70dbc1aa1a983a249e1440521dc58cacf8a |
|||
DIST libsodium-1.0.11.tar.gz 1846782 SHA256 a14549db3c49f6ae2170cbbf4664bd48ace50681045e8dbea7c8d9fb96f9c765 SHA512 4b1293c4d0e52264beecdd05833857bc4d77d1c2a97eea0138fe04df383b9a2dfcad4a79ccd9aed8f6c0047ba67c49292b0d2ccf987ab0b5046b46b1586ccbd7 WHIRLPOOL ff02835e05a491695ba1b6d55d1b3168c15c9c6326377d2a24d1dbc9eaa3da538efcf22610c81d32297b057138162132e340b64ce980a199563d4101beb9d899 |
|||
DIST libsodium-1.0.2.tar.gz 1673394 SHA256 961d8f10047f545ae658bcc73b8ab0bf2c312ac945968dd579d87c768e5baa19 SHA512 15fc47516f0e35906c1c304205fa991e74a273e4e6fc2186b6c16f0e41523de24493e149262b97ef03e4adc221232372ef1f283c4c23f96e4c5d99023d361e14 WHIRLPOOL 18509d9911c1d0ec6e8b9a8735abfeb2c1623669d31045abc6d9dd1289571fbe3a055f960f42a86779e7c03967532d71d7b9d0597ecfe457672e69b27b577e48 |
|||
DIST libsodium-1.0.8.tar.gz 1794750 SHA256 c0f191d2527852641e0a996b7b106d2e04cbc76ea50731b2d0babd3409301926 SHA512 8f85e85e699c2b45674befd466e018c9f2ff1333c8fa806da49d9674068c33929bd3463e8908ffcd9c6154d430737e08e0522ac8ed4219e4fffe2e0a7a611c65 WHIRLPOOL 379addb00b366d2de887749fa72b17c003fa583728788e416e363a64196ade3ead9b5e12691f7693f0554323b88dc3c0cb6038c7abaf7f1291d60b97cc24daf6 |
|||
DIST libsodium-1.0.12.tar.gz 1887284 SHA256 b8648f1bb3a54b0251cf4ffa4f0d76ded13977d4fa7517d988f4c902dd8e2f95 SHA512 1e63960da42bcc90945463ae1f5b1355849881dce5bba6d293391f8d6f0932063a5bfd433a071cb184af90ebeab469acc34710587116922144d61f3d7661901b WHIRLPOOL 7edf3a97b96b9a89fdb7b2c56aaaf9f37e89bb816801260c5791af133ddbd7fa9db137fab0b11b85277a483cdbae26bb879181ff72090251f576099750c9003f |
|||
@ -1,34 +0,0 @@ |
|||
# Copyright 1999-2015 Gentoo Foundation |
|||
# Distributed under the terms of the GNU General Public License v2 |
|||
|
|||
EAPI=5 |
|||
|
|||
inherit eutils |
|||
|
|||
DESCRIPTION="A portable fork of NaCl, a higher-level cryptographic library" |
|||
HOMEPAGE="https://github.com/jedisct1/libsodium" |
|||
SRC_URI="http://download.libsodium.org/${PN}/releases/${P}.tar.gz" |
|||
|
|||
LICENSE="ISC" |
|||
SLOT="0/13" |
|||
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" |
|||
IUSE="+asm minimal static-libs +urandom" |
|||
|
|||
src_configure() { |
|||
local myconf |
|||
|
|||
# --disable-pie needed on x86, bug #512734 |
|||
use x86 && myconf="${myconf} --disable-pie" |
|||
|
|||
econf \ |
|||
$(use_enable asm) \ |
|||
$(use_enable minimal) \ |
|||
$(use_enable !urandom blocking-random) \ |
|||
$(use_enable static-libs static) \ |
|||
${myconf} |
|||
} |
|||
|
|||
src_install() { |
|||
default |
|||
prune_libtool_files |
|||
} |
|||
@ -1,34 +0,0 @@ |
|||
# Copyright 1999-2015 Gentoo Foundation |
|||
# Distributed under the terms of the GNU General Public License v2 |
|||
|
|||
EAPI=5 |
|||
|
|||
inherit eutils |
|||
|
|||
DESCRIPTION="A portable fork of NaCl, a higher-level cryptographic library" |
|||
HOMEPAGE="https://github.com/jedisct1/libsodium" |
|||
SRC_URI="http://download.libsodium.org/${PN}/releases/${P}.tar.gz" |
|||
|
|||
LICENSE="ISC" |
|||
SLOT="0/18" |
|||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" |
|||
IUSE="+asm minimal static-libs +urandom" |
|||
|
|||
src_configure() { |
|||
local myconf |
|||
|
|||
# --disable-pie needed on x86, bug #512734 |
|||
use x86 && myconf="${myconf} --disable-pie" |
|||
|
|||
econf \ |
|||
$(use_enable asm) \ |
|||
$(use_enable minimal) \ |
|||
$(use_enable !urandom blocking-random) \ |
|||
$(use_enable static-libs static) \ |
|||
${myconf} |
|||
} |
|||
|
|||
src_install() { |
|||
default |
|||
prune_libtool_files |
|||
} |
|||
@ -0,0 +1,39 @@ |
|||
# Copyright 1999-2017 Gentoo Foundation |
|||
# Distributed under the terms of the GNU General Public License v2 |
|||
|
|||
EAPI=6 |
|||
|
|||
inherit cmake-utils |
|||
|
|||
DESCRIPTION="SIMD Vector Class Library for C++" |
|||
HOMEPAGE="https://github.com/VcDevel/Vc" |
|||
|
|||
VC_TEST_DATA=( reference-{acos,asin,atan,ln,log2,log10,sincos}-{dp,sp}.dat ) |
|||
for i in ${VC_TEST_DATA[@]}; do |
|||
SRC_URI+="test? ( http://compeng.uni-frankfurt.de/~kretz/Vc-testdata/$i -> ${P}-${i} ) " |
|||
done |
|||
|
|||
SRC_URI+="https://github.com/VcDevel/Vc/archive/${PV}.tar.gz -> ${P}.tar.gz" |
|||
|
|||
LICENSE="LGPL-3" |
|||
SLOT="0" |
|||
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos" |
|||
IUSE="test" |
|||
|
|||
src_unpack() { |
|||
default_src_unpack |
|||
S="${WORKDIR}"/Vc-${PV} |
|||
if use test ; then |
|||
mkdir -p "${WORKDIR}"/${P}_build/tests || die |
|||
for i in ${VC_TEST_DATA[@]}; do |
|||
cp "${DISTDIR}"/${P}-$i "${WORKDIR}"/${P}_build/tests/${i} || die |
|||
done |
|||
fi |
|||
} |
|||
|
|||
src_configure() { |
|||
local mycmakeargs=( |
|||
-DBUILD_TESTING=$(usex test) |
|||
) |
|||
cmake-utils_src_configure |
|||
} |
|||
@ -1 +1,2 @@ |
|||
DIST safety-0.5.1.tar.gz 8404 SHA256 6ba9e3b6c3d33588d3ed062d11dea8a5f855e09cde9418f69c866fa23068f3e8 SHA512 95d61256cf16cceb92d35215bfb70e38b663e0cd0162658b41e692993cd08457e7bd36faacfa86512031327a930a0b254eb2af4838db808ba93c13aefa35a82b WHIRLPOOL 6774dc4df2003d0d1c705216c558cfe5ccea8167d20031ef327dad4a9fef1bb2a3f60a7309a3e997741c196d9e851c67c9fb1a4c81d7f192d6d1ca04832826ce |
|||
DIST safety-0.6.0.tar.gz 8625 SHA256 d2fd0217bd7680e48614e2d26561ca363a3aa207ccef6e492dec189a1927a31b SHA512 23cb933bb9a065966058830e8a324a927b02b1d599437f6b18f936cf3760f33fae382bc47d2fc33d29648c6741a0bf3b7bc46684322433633277871e75c428f8 WHIRLPOOL 1d8c33b8815c3f61fc0970e004b16cb948b503e8a43452361d415b61597d4c4ae7533d4f2fad11c1ab2d51a02bd9349724f76d6e007447f23659d424bf1fb889 |
|||
@ -0,0 +1,23 @@ |
|||
# Copyright 1999-2017 Gentoo Foundation |
|||
# Distributed under the terms of the GNU General Public License v2 |
|||
|
|||
EAPI=6 |
|||
|
|||
PYTHON_COMPAT=( python{2_7,3_4,3_5} ) |
|||
inherit distutils-r1 |
|||
|
|||
DESCRIPTION="Checks your installed dependencies for known security vulnerabilities" |
|||
HOMEPAGE="https://github.com/pyupio/safety" |
|||
SRC_URI="https://github.com/pyupio/safety/archive/${PV}.tar.gz -> ${P}.tar.gz" |
|||
|
|||
LICENSE="MIT" |
|||
SLOT="0" |
|||
KEYWORDS="~amd64 ~x86" |
|||
IUSE="" |
|||
|
|||
RDEPEND=">=dev-python/setuptools-16[${PYTHON_USEDEP}] |
|||
>=dev-python/click-6.0[${PYTHON_USEDEP}] |
|||
dev-python/packaging[${PYTHON_USEDEP}] |
|||
dev-python/pip[${PYTHON_USEDEP}] |
|||
dev-python/requests[${PYTHON_USEDEP}]" |
|||
DEPEND="${DEPEND}" |
|||
@ -0,0 +1,69 @@ |
|||
# Copyright 1999-2017 Gentoo Foundation |
|||
# Distributed under the terms of the GNU General Public License v2 |
|||
|
|||
EAPI=6 |
|||
PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 ) |
|||
|
|||
inherit distutils-r1 |
|||
|
|||
if [[ ${PV} == "9999" ]]; then |
|||
EGIT_REPO_URI="https://github.com/pypa/setuptools.git" |
|||
inherit git-r3 |
|||
else |
|||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip" |
|||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
|||
fi |
|||
|
|||
DESCRIPTION="Collection of extensions to Distutils" |
|||
HOMEPAGE="https://github.com/pypa/setuptools https://pypi.python.org/pypi/setuptools" |
|||
|
|||
LICENSE="MIT" |
|||
SLOT="0" |
|||
IUSE="test" |
|||
|
|||
RDEPEND=" |
|||
>=dev-python/packaging-16.8[${PYTHON_USEDEP}] |
|||
>=dev-python/six-1.10.0[${PYTHON_USEDEP}] |
|||
>=dev-python/appdirs-1.4.0-r1[${PYTHON_USEDEP}] |
|||
" |
|||
DEPEND="${RDEPEND} |
|||
app-arch/unzip |
|||
test? ( |
|||
dev-python/pip[${PYTHON_USEDEP}] |
|||
>=dev-python/pytest-2.8[${PYTHON_USEDEP}] |
|||
dev-python/mock[${PYTHON_USEDEP}] |
|||
) |
|||
" |
|||
PDEPEND=" |
|||
>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]" |
|||
|
|||
# Force in-source build because build system modifies sources. |
|||
DISTUTILS_IN_SOURCE_BUILD=1 |
|||
|
|||
DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} ) |
|||
|
|||
python_prepare_all() { |
|||
if [[ ${PV} == "9999" ]]; then |
|||
python_setup |
|||
${EPYTHON} bootstrap.py || die |
|||
fi |
|||
|
|||
# disable tests requiring a network connection |
|||
rm setuptools/tests/test_packageindex.py || die |
|||
|
|||
# don't run integration tests |
|||
rm setuptools/tests/test_integration.py || die |
|||
|
|||
distutils-r1_python_prepare_all |
|||
} |
|||
|
|||
python_test() { |
|||
# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg |
|||
# It tries to sandbox the test in a tempdir |
|||
HOME="${PWD}" py.test --verbose ${PN} || die "Tests failed under ${EPYTHON}" |
|||
} |
|||
|
|||
python_install() { |
|||
export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1 |
|||
distutils-r1_python_install |
|||
} |
|||
@ -1 +1,2 @@ |
|||
DIST android-studio-ide-145.3537739-linux.zip 459957542 SHA256 982377b5694a40782cd9b1190e6fb9d2046bb9cc0767b2ba7cd5aebda773d581 SHA512 2e005b2232b43e84875008e1e0bec70afff68839733bfa6e0195be23c6c76be29540321937235620c3481beb31c030086df430e73a8e16e3a10bce5e0c98753f WHIRLPOOL f30b44abaf5f7b5b69eaa5c58864a11f2fc53b1bcf1c34ba524f7bf13de5d230476d4ab564fdeb40e1e2060a9526e3268c0189db8ed1bfbff47be4f6192f606e |
|||
DIST android-studio-ide-162.3764568-linux.zip 449372867 SHA256 214cee47ef7a628c712ae618f5aab6c2a56a72aa479a50937d4cad5a0abf8435 SHA512 36609ca69e7ebb62f14d9a8aa25eb2fe022acc99b0ffa4b1de7eb4c4554455bf3ea10c06d152e4fc14bc88e6f4990129aa5cbf605da883abf02a6a11c8be8293 WHIRLPOOL 8bdcc5b3f4f3f07d3e4e54d729eb46afdd018340e14676422b1e1f1276d73e891672dcfa2be225b8ec4f776b955751271a9c49133df658ff366e56149f9a6d04 |
|||
@ -0,0 +1,99 @@ |
|||
# Copyright 1999-2017 Gentoo Foundation |
|||
# Distributed under the terms of the GNU General Public License v2 |
|||
|
|||
EAPI=6 |
|||
inherit eutils java-pkg-2 versionator |
|||
|
|||
RESTRICT="strip" |
|||
QA_PREBUILT="opt/${PN}/bin/libbreakgen*.so |
|||
opt/${PN}/bin/fsnotifier* |
|||
opt/${PN}/lib/libpty/linux/x86*/libpty.so |
|||
opt/${PN}/plugins/android/lib/libwebp_jni*.so" |
|||
|
|||
if [[ $(get_version_component_count) -eq 6 ]]; then |
|||
STUDIO_V=$(get_version_component_range 1-4) |
|||
BUILD_V=$(get_version_component_range 5-6) |
|||
else |
|||
STUDIO_V=$(get_version_component_range 1-3) |
|||
BUILD_V=$(get_version_component_range 4-5) |
|||
fi |
|||
|
|||
DESCRIPTION="A new Android development environment based on IntelliJ IDEA" |
|||
HOMEPAGE="http://developer.android.com/sdk/installing/studio.html" |
|||
SRC_URI="https://dl.google.com/dl/android/studio/ide-zips/${STUDIO_V}/${PN}-ide-${BUILD_V}-linux.zip" |
|||
|
|||
LICENSE="Apache-2.0" |
|||
SLOT="0" |
|||
IUSE="selinux" |
|||
KEYWORDS="~amd64 ~x86" |
|||
|
|||
DEPEND="app-arch/zip |
|||
dev-java/commons-logging:0 |
|||
dev-java/log4j:0" |
|||
|
|||
# dev-java/guava:18 |
|||
RDEPEND=">=virtual/jdk-1.7 |
|||
selinux? ( sec-policy/selinux-android ) |
|||
>=app-arch/bzip2-1.0.6-r4 |
|||
dev-java/commons-logging:0 |
|||
dev-java/log4j:0 |
|||
>=dev-libs/expat-2.1.0-r3 |
|||
>=dev-libs/libffi-3.0.13-r1 |
|||
>=media-libs/fontconfig-2.10.92 |
|||
>=media-libs/freetype-2.5.5 |
|||
>=media-libs/libpng-1.2.51 |
|||
>=media-libs/mesa-10.2.8 |
|||
|| ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify ) |
|||
|| ( >=sys-libs/ncurses-5.9-r3:5/5[tinfo] >=sys-libs/ncurses-5.9-r3:0/5[tinfo] ) |
|||
>=sys-libs/zlib-1.2.8-r1 |
|||
>=x11-libs/libX11-1.6.2 |
|||
>=x11-libs/libXau-1.0.7-r1 |
|||
>=x11-libs/libXdamage-1.1.4-r1 |
|||
>=x11-libs/libXdmcp-1.1.1-r1 |
|||
>=x11-libs/libXext-1.3.2 |
|||
>=x11-libs/libXfixes-5.0.1 |
|||
>=x11-libs/libXrender-0.9.8 |
|||
>=x11-libs/libXxf86vm-1.1.3 |
|||
>=x11-libs/libdrm-2.4.46 |
|||
>=x11-libs/libxcb-1.9.1 |
|||
>=x11-libs/libxshmfence-1.1" |
|||
S=${WORKDIR}/${PN} |
|||
|
|||
src_prepare() { |
|||
eapply_user |
|||
# This is really a bundled jdk not a jre |
|||
rm -R "${S}/jre" || die "Could not remove bundled jdk" |
|||
|
|||
# Replace bundled jars with system |
|||
# has problems with newer jdom:0 not updated to jdom:2 |
|||
cd "${S}/lib" |
|||
local JARS="commons-logging log4j" |
|||
local j |
|||
for j in ${JARS}; do |
|||
rm -v ${j/:*/}*.jar |
|||
java-pkg_jar-from ${j} |
|||
done |
|||
} |
|||
|
|||
src_compile() { |
|||
: |
|||
} |
|||
|
|||
src_install() { |
|||
local dir="/opt/${PN}" |
|||
|
|||
insinto "${dir}" |
|||
# Replaced bundled jre with system vm/jdk |
|||
# This is really a bundled jdk not a jre |
|||
doins -r * |
|||
|
|||
rm -rf "${D}${dir}/jre" || die |
|||
dosym "/etc/java-config-2/current-system-vm" "${dir}/jre" |
|||
|
|||
fperms 755 "${dir}/bin/studio.sh" "${dir}"/bin/fsnotifier{,64} |
|||
chmod 755 "${D}${dir}"/gradle/gradle-*/bin/gradle || die |
|||
|
|||
newicon "bin/studio.png" "${PN}.png" |
|||
make_wrapper ${PN} ${dir}/bin/studio.sh |
|||
make_desktop_entry ${PN} "Android Studio" ${PN} "Development;IDE" |
|||
} |
|||
@ -0,0 +1,202 @@ |
|||
# Copyright 1999-2017 Gentoo Foundation |
|||
# Distributed under the terms of the GNU General Public License v2 |
|||
|
|||
EAPI=6 |
|||
|
|||
CMAKE_REMOVE_MODULES="no" |
|||
inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx flag-o-matic |
|||
|
|||
MY_P="${P/_/-}" |
|||
|
|||
DESCRIPTION="Cross platform Make" |
|||
HOMEPAGE="http://www.cmake.org/" |
|||
SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz" |
|||
|
|||
LICENSE="CMake" |
|||
SLOT="0" |
|||
[[ "${PV}" = *_rc* ]] || \ |
|||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" |
|||
IUSE="doc emacs system-jsoncpp ncurses qt5" |
|||
|
|||
RDEPEND=" |
|||
>=app-arch/libarchive-3.0.0:= |
|||
>=dev-libs/expat-2.0.1 |
|||
>=dev-libs/libuv-1.0.0:= |
|||
>=net-misc/curl-7.21.5[ssl] |
|||
sys-libs/zlib |
|||
virtual/pkgconfig |
|||
emacs? ( virtual/emacs ) |
|||
ncurses? ( sys-libs/ncurses:0= ) |
|||
qt5? ( |
|||
dev-qt/qtcore:5 |
|||
dev-qt/qtgui:5 |
|||
dev-qt/qtwidgets:5 |
|||
) |
|||
system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= ) |
|||
" |
|||
DEPEND="${RDEPEND} |
|||
doc? ( dev-python/sphinx ) |
|||
" |
|||
|
|||
S="${WORKDIR}/${MY_P}" |
|||
|
|||
SITEFILE="50${PN}-gentoo.el" |
|||
|
|||
PATCHES=( |
|||
# prefix |
|||
"${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch |
|||
"${FILESDIR}"/${PN}-3.0.0-prefix-dirs.patch |
|||
"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch |
|||
|
|||
# handle gentoo packaging in find modules |
|||
"${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch |
|||
"${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch |
|||
"${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch |
|||
"${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch |
|||
"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch |
|||
|
|||
# respect python eclasses |
|||
"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch |
|||
"${FILESDIR}"/${PN}-3.1.0-FindPythonInterp.patch |
|||
|
|||
# upstream fixes (can usually be removed with a version bump) |
|||
|
|||
# testing 3.9 backports - bug #426936 |
|||
"${FILESDIR}"/${PN}-3.7.2-x32.patch |
|||
) |
|||
|
|||
cmake_src_bootstrap() { |
|||
# Cleanup args to extract only JOBS. |
|||
# Because bootstrap does not know anything else. |
|||
echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null |
|||
if [ $? -eq 0 ]; then |
|||
par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+') |
|||
par_arg="--parallel=${par_arg}" |
|||
else |
|||
par_arg="--parallel=1" |
|||
fi |
|||
|
|||
# disable running of cmake in boostrap command |
|||
sed -i \ |
|||
-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \ |
|||
bootstrap || die "sed failed" |
|||
|
|||
# execinfo.h on Solaris isn't quite what it is on Darwin |
|||
if [[ ${CHOST} == *-solaris* ]] ; then |
|||
sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die |
|||
fi |
|||
|
|||
tc-export CC CXX LD |
|||
|
|||
# bootstrap script isn't exactly /bin/sh compatible |
|||
${CONFIG_SHELL:-sh} ./bootstrap \ |
|||
--prefix="${T}/cmakestrap/" \ |
|||
${par_arg} \ |
|||
|| die "Bootstrap failed" |
|||
} |
|||
|
|||
cmake_src_test() { |
|||
# fix OutDir and SelectLibraryConfigurations tests |
|||
# these are altered thanks to our eclass |
|||
sed -i -e 's:#IGNORE ::g' \ |
|||
"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \ |
|||
|| die |
|||
|
|||
pushd "${BUILD_DIR}" > /dev/null |
|||
|
|||
local ctestargs |
|||
[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure" |
|||
|
|||
# Excluded tests: |
|||
# BootstrapTest: we actualy bootstrap it every time so why test it. |
|||
# BundleUtilities: bundle creation broken |
|||
# CTest.updatecvs: which fails to commit as root |
|||
# Fortran: requires fortran |
|||
# Qt4Deploy, which tries to break sandbox and ignores prefix |
|||
# Qt5Autogen, which breaks for unknown reason |
|||
# TestUpload, which requires network access |
|||
"${BUILD_DIR}"/bin/ctest ${ctestargs} \ |
|||
-E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|Qt5Autogen|TestUpload)" \ |
|||
|| die "Tests failed" |
|||
|
|||
popd > /dev/null |
|||
} |
|||
|
|||
src_prepare() { |
|||
cmake-utils_src_prepare |
|||
|
|||
# Add gcc libs to the default link paths |
|||
sed -i \ |
|||
-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \ |
|||
-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \ |
|||
Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed" |
|||
if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then |
|||
CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" |
|||
cmake_src_bootstrap |
|||
fi |
|||
} |
|||
|
|||
src_configure() { |
|||
# Fix linking on Solaris |
|||
[[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl |
|||
|
|||
local mycmakeargs=( |
|||
-DCMAKE_USE_SYSTEM_LIBRARIES=ON |
|||
-DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp) |
|||
-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr |
|||
-DCMAKE_DOC_DIR=/share/doc/${PF} |
|||
-DCMAKE_MAN_DIR=/share/man |
|||
-DCMAKE_DATA_DIR=/share/${PN} |
|||
-DSPHINX_MAN=$(usex doc) |
|||
-DSPHINX_HTML=$(usex doc) |
|||
-DBUILD_CursesDialog="$(usex ncurses)" |
|||
) |
|||
|
|||
if use qt5 ; then |
|||
mycmakeargs+=( |
|||
-DBUILD_QtDialog=ON |
|||
$(cmake-utils_use_find_package qt5 Qt5Widgets) |
|||
) |
|||
fi |
|||
|
|||
cmake-utils_src_configure |
|||
} |
|||
|
|||
src_compile() { |
|||
cmake-utils_src_compile |
|||
use emacs && elisp-compile Auxiliary/cmake-mode.el |
|||
} |
|||
|
|||
src_test() { |
|||
virtx cmake_src_test |
|||
} |
|||
|
|||
src_install() { |
|||
cmake-utils_src_install |
|||
|
|||
if use emacs; then |
|||
elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc |
|||
elisp-site-file-install "${FILESDIR}/${SITEFILE}" |
|||
fi |
|||
|
|||
insinto /usr/share/vim/vimfiles/syntax |
|||
doins Auxiliary/vim/syntax/cmake.vim |
|||
|
|||
insinto /usr/share/vim/vimfiles/indent |
|||
doins Auxiliary/vim/indent/cmake.vim |
|||
|
|||
insinto /usr/share/vim/vimfiles/ftdetect |
|||
doins "${FILESDIR}/${PN}.vim" |
|||
|
|||
dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack} |
|||
|
|||
rm -r "${ED}"/usr/share/cmake/{completions,editors} || die |
|||
} |
|||
|
|||
pkg_postinst() { |
|||
use emacs && elisp-site-regen |
|||
} |
|||
|
|||
pkg_postrm() { |
|||
use emacs && elisp-site-regen |
|||
} |
|||
@ -0,0 +1,843 @@ |
|||
Backports from 3.9 |
|||
|
|||
Gentoo-bug: 426936 |
|||
|
|||
From 503f25d490e56dfc1d3dc894e1fc1bd3e7e89e81 Mon Sep 17 00:00:00 2001 |
|||
From: Christian Schmidbauer <ch.schmidbauer@gmail.com> |
|||
Date: Sat, 25 Feb 2017 19:47:49 +0100 |
|||
Subject: [PATCH] find_library: Allow custom lib suffix be used as find path |
|||
|
|||
Add a new `CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX` variable to allow use |
|||
of a custom suffix on `lib` directory names. This is a more general |
|||
option than that added by commit v3.7.0-rc1~504^2 (Teach find_library |
|||
and find_package to search lib32 paths, 2016-06-10). It allows the find |
|||
path to be more deterministic on custom setups. |
|||
|
|||
See discussion in #10287 and #15994. |
|||
---
|
|||
Help/command/find_library.rst | 7 ++++++ |
|||
Help/manual/cmake-variables.7.rst | 1 + |
|||
Help/prop_gbl/FIND_LIBRARY_USE_LIB32_PATHS.rst | 2 ++ |
|||
Help/prop_gbl/FIND_LIBRARY_USE_LIB64_PATHS.rst | 2 ++ |
|||
.../release/dev/find_library-custom-lib-suffix.rst | 6 +++++ |
|||
.../CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX.rst | 11 +++++++++ |
|||
Source/cmFindLibraryCommand.cxx | 28 ++++++++++++---------- |
|||
Tests/CMakeOnly/find_library/CMakeLists.txt | 15 +++++++++++- |
|||
.../CMakeOnly/find_library/lib/A/libXYZ/libtest2.a | 0 |
|||
Tests/CMakeOnly/find_library/lib/XYZ/libtest1.a | 0 |
|||
.../CMakeOnly/find_library/libXYZ/A/lib/libtest4.a | 0 |
|||
.../find_library/libXYZ/A/libXYZ/libtest5.a | 0 |
|||
Tests/CMakeOnly/find_library/libXYZ/A/libtest6.a | 0 |
|||
Tests/CMakeOnly/find_library/libXYZ/libtest7.a | 0 |
|||
14 files changed, 58 insertions(+), 14 deletions(-) |
|||
create mode 100644 Help/release/dev/find_library-custom-lib-suffix.rst |
|||
create mode 100644 Help/variable/CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX.rst |
|||
create mode 100644 Tests/CMakeOnly/find_library/lib/A/libXYZ/libtest2.a |
|||
create mode 100644 Tests/CMakeOnly/find_library/lib/XYZ/libtest1.a |
|||
create mode 100644 Tests/CMakeOnly/find_library/libXYZ/A/lib/libtest4.a |
|||
create mode 100644 Tests/CMakeOnly/find_library/libXYZ/A/libXYZ/libtest5.a |
|||
create mode 100644 Tests/CMakeOnly/find_library/libXYZ/A/libtest6.a |
|||
create mode 100644 Tests/CMakeOnly/find_library/libXYZ/libtest7.a |
|||
|
|||
diff --git a/Help/command/find_library.rst b/Help/command/find_library.rst
|
|||
index 1eb50f7..e912040 100644
|
|||
--- a/Help/command/find_library.rst
|
|||
+++ b/Help/command/find_library.rst
|
|||
@@ -49,6 +49,13 @@ path to the framework ``<fullPath>/A.framework``. When a full path to a
|
|||
framework is used as a library, CMake will use a ``-framework A``, and a |
|||
``-F<fullPath>`` to link the framework to the target. |
|||
|
|||
+If the :variable:`CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX` variable is set all
|
|||
+search paths will be tested as normal, with the suffix appended, and with
|
|||
+all matches of ``lib/`` replaced with
|
|||
+``lib${CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX}/``. This variable overrides
|
|||
+the :prop_gbl:`FIND_LIBRARY_USE_LIB32_PATHS`
|
|||
+and :prop_gbl:`FIND_LIBRARY_USE_LIB64_PATHS` global properties.
|
|||
+
|
|||
If the :prop_gbl:`FIND_LIBRARY_USE_LIB32_PATHS` global property is set |
|||
all search paths will be tested as normal, with ``32/`` appended, and |
|||
with all matches of ``lib/`` replaced with ``lib32/``. This property is |
|||
diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst
|
|||
index 259d87b..a25efe7 100644
|
|||
--- a/Help/manual/cmake-variables.7.rst
|
|||
+++ b/Help/manual/cmake-variables.7.rst
|
|||
@@ -130,6 +130,7 @@ Variables that Change Behavior
|
|||
/variable/CMAKE_SYSROOT |
|||
/variable/CMAKE_FIND_APPBUNDLE |
|||
/variable/CMAKE_FIND_FRAMEWORK |
|||
+ /variable/CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX
|
|||
/variable/CMAKE_FIND_LIBRARY_PREFIXES |
|||
/variable/CMAKE_FIND_LIBRARY_SUFFIXES |
|||
/variable/CMAKE_FIND_NO_INSTALL_PREFIX |
|||
diff --git a/Help/prop_gbl/FIND_LIBRARY_USE_LIB32_PATHS.rst b/Help/prop_gbl/FIND_LIBRARY_USE_LIB32_PATHS.rst
|
|||
index ce18b65..8396026 100644
|
|||
--- a/Help/prop_gbl/FIND_LIBRARY_USE_LIB32_PATHS.rst
|
|||
+++ b/Help/prop_gbl/FIND_LIBRARY_USE_LIB32_PATHS.rst
|
|||
@@ -8,3 +8,5 @@ Whether the :command:`find_library` command should automatically search
|
|||
:command:`find_library` command should automatically search the ``lib32`` |
|||
variant of directories called ``lib`` in the search path when building 32-bit |
|||
binaries. |
|||
+
|
|||
+See also the :variable:`CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX` variable.
|
|||
diff --git a/Help/prop_gbl/FIND_LIBRARY_USE_LIB64_PATHS.rst b/Help/prop_gbl/FIND_LIBRARY_USE_LIB64_PATHS.rst
|
|||
index e52f8eb..ed343ba 100644
|
|||
--- a/Help/prop_gbl/FIND_LIBRARY_USE_LIB64_PATHS.rst
|
|||
+++ b/Help/prop_gbl/FIND_LIBRARY_USE_LIB64_PATHS.rst
|
|||
@@ -8,3 +8,5 @@ FIND_LIBRARY_USE_LIB64_PATHS is a boolean specifying whether the
|
|||
:command:`find_library` command should automatically search the lib64 |
|||
variant of directories called lib in the search path when building |
|||
64-bit binaries. |
|||
+
|
|||
+See also the :variable:`CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX` variable.
|
|||
diff --git a/Help/release/dev/find_library-custom-lib-suffix.rst b/Help/release/dev/find_library-custom-lib-suffix.rst
|
|||
new file mode 100644 |
|||
index 0000000..824b27e
|
|||
--- /dev/null
|
|||
+++ b/Help/release/dev/find_library-custom-lib-suffix.rst
|
|||
@@ -0,0 +1,6 @@
|
|||
+find_library-custom-lib-suffix
|
|||
+------------------------------
|
|||
+
|
|||
+* A :variable:`CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX` variable was added to
|
|||
+ tell the :command:`find_library` command to search in a ``lib<suffix>``
|
|||
+ directory before each ``lib`` directory that would normally be searched.
|
|||
diff --git a/Help/variable/CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX.rst b/Help/variable/CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX.rst
|
|||
new file mode 100644 |
|||
index 0000000..f7c6524
|
|||
--- /dev/null
|
|||
+++ b/Help/variable/CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX.rst
|
|||
@@ -0,0 +1,11 @@
|
|||
+CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX
|
|||
+------------------------------------
|
|||
+
|
|||
+Specify a ``<suffix>`` to tell the :command:`find_library` command to
|
|||
+search in a ``lib<suffix>`` directory before each ``lib`` directory that
|
|||
+would normally be searched.
|
|||
+
|
|||
+This overrides the behavior of related global properties:
|
|||
+
|
|||
+* :prop_gbl:`FIND_LIBRARY_USE_LIB32_PATHS`
|
|||
+* :prop_gbl:`FIND_LIBRARY_USE_LIB64_PATHS`
|
|||
diff --git a/Source/cmFindLibraryCommand.cxx b/Source/cmFindLibraryCommand.cxx
|
|||
index 2feedf3..c506d66 100644
|
|||
--- a/Source/cmFindLibraryCommand.cxx
|
|||
+++ b/Source/cmFindLibraryCommand.cxx
|
|||
@@ -43,20 +43,22 @@ bool cmFindLibraryCommand::InitialPass(std::vector<std::string> const& argsIn,
|
|||
return true; |
|||
} |
|||
|
|||
- if (this->Makefile->GetState()->GetGlobalPropertyAsBool(
|
|||
- "FIND_LIBRARY_USE_LIB32_PATHS")) {
|
|||
- // add special 32 bit paths if this is a 32 bit compile.
|
|||
- if (this->Makefile->PlatformIs32Bit()) {
|
|||
- this->AddArchitecturePaths("32");
|
|||
- }
|
|||
+ // add custom lib<qual> paths instead of using fixed lib32 or lib64
|
|||
+ if (const char* customLib = this->Makefile->GetDefinition(
|
|||
+ "CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX")) {
|
|||
+ this->AddArch | |||