diff options
21 files changed, 54 insertions, 737 deletions
diff --git a/dev-java/xz-java/Manifest b/dev-java/xz-java/Manifest index e8927a9c91dd..3b3b200f67b0 100644 --- a/dev-java/xz-java/Manifest +++ b/dev-java/xz-java/Manifest @@ -1 +1,2 @@ DIST xz-java-1.5.zip 131544 SHA256 0146e437b01ac77046d256a2e7537768b6922c49635c27fa40b3cf745bb2db74 SHA512 8f425b86b216927490c1ab7303ae9db7faf2c275777765ec7d10c4acd4717d2ecf76068afe9a81d099ea0941c05c517cd5e7fe1b4e8bfec804fd3355dd064f41 WHIRLPOOL 5bcaa40f44bd89592e3a4f4a74884551284379f6e5a7985abf0c3673d73bc48144b457f67502097a96a82d0496526f2d5ce9f7b64bef48bd84a00eea87927839 +DIST xz-java-1.6.zip 138434 SHA256 1da9c5534656da8197457feeea7ee6c7a2c908e94f01db6d3c80ee17620e77fc SHA512 a1a6a2da05d51695e58b8e91503106bae6030cb83853df32bc7b8a23db4189c4afef01544c21de91ee3df9ad11e065059c758f121c52e6b6a319b93b2136f666 WHIRLPOOL 8c1145e631be106323b7aeb7ec05fff5bb1eda1ab677490cae7af10711d2888829058f76fd44a125f37d164125302d016e82f4459dc8764ed561111babc6f109 diff --git a/dev-java/xz-java/files/xz-java-stop-fetching-external-files.patch b/dev-java/xz-java/files/xz-java-stop-fetching-external-files.patch index 3c82eff350b0..c5630a9c5052 100644 --- a/dev-java/xz-java/files/xz-java-stop-fetching-external-files.patch +++ b/dev-java/xz-java/files/xz-java-stop-fetching-external-files.patch @@ -1,5 +1,5 @@ ---- build.xml 2011-10-22 12:16:36.000000000 +0200 -+++ build.xml.new 2012-06-01 17:54:41.000000000 +0200 +--- a/build.xml ++++ b/build.xml @@ -35,12 +35,9 @@ description="Generates HTML documentation with javadoc"> <mkdir dir="${doc_dir}"/> diff --git a/dev-java/xz-java/xz-java-1.6.ebuild b/dev-java/xz-java/xz-java-1.6.ebuild new file mode 100644 index 000000000000..bee64be53a4c --- /dev/null +++ b/dev-java/xz-java/xz-java-1.6.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +JAVA_PKG_IUSE="doc examples source" + +inherit java-pkg-2 java-ant-2 + +DESCRIPTION="Implementation of xz data compression in pure java" +HOMEPAGE="http://tukaani.org/xz/java.html" +SRC_URI="http://tukaani.org/xz/${P}.zip" + +LICENSE="public-domain" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=">=virtual/jre-1.4" +DEPEND=">=virtual/jdk-1.4 + app-arch/unzip" + +EANT_DOC_TARGET="doc" + +S="${WORKDIR}" + +PATCHES=( + "${FILESDIR}/${PN}-stop-fetching-external-files.patch" +) + +src_prepare() { + default + java-utils-2_src_prepare +} + +src_install() { + java-pkg_dojar build/jar/xz.jar + use doc && java-pkg_dojavadoc build/doc + use examples && java-pkg_doexamples src/*Demo.java + use source && java-pkg_dosrc src/org +} diff --git a/dev-python/jinja/Manifest b/dev-python/jinja/Manifest index 9be0c27848f9..1b0bebb4983b 100644 --- a/dev-python/jinja/Manifest +++ b/dev-python/jinja/Manifest @@ -1,5 +1,5 @@ DIST Jinja2-2.7.3.tar.gz 378470 SHA256 2e24ac5d004db5714976a04ac0e80c6df6e47e98c354cb2c0d82f8879d4f8fdb SHA512 2810db2b52fe800e2a4a47ea41a07f997b1647a2b7ad05fe564f9d554d6a402283c84c4e2491e5dad8d22acd83d3ca420f0983ed2effc732f6d79600a846071b WHIRLPOOL ece9b68dff414739103eac202b5903d96802939f5742a2bf3ff421d87ef49043ed9a4b2a3a6bf0c2f3d9be0d8295b73c47b253553731b44912cb58add8f233c0 DIST Jinja2-2.8.1.tar.gz 358129 SHA256 35341f3a97b46327b3ef1eb624aadea87a535b8f50863036e085e7c426ac5891 SHA512 0a2e2aa94f5c2f04f79d59d34d5324d2a440385b71192e85e960c761b4a073400e4ab0458e57305650f696a474593d6fbf398fb1d9518be261bb2a5cb866e163 WHIRLPOOL 380636268f903d05afda9c41296986d1c83949dead6c78d3e3cb880137a6c6ec06f0e2297169fc0ea8fd1348c9928f5841d37f951dd941fe89a8ccc96080e191 DIST Jinja2-2.8.tar.gz 357055 SHA256 bc1ff2ff88dbfacefde4ddde471d1417d3b304e8df103a7a9437d47269201bf4 SHA512 2e80d6d9ad10dafcce1e6dd24493f5dffc43a17f71a30a650415638e12d3a3891738ebacc569701129214026d062d91a2b10e4f7a2c7b85d801dde26ded1bebb WHIRLPOOL 31adc38738848aa224cceb0d0afb2b85eb080d166ed84f145eb0576eeedfb91cf8d99d7c98b6a6cc6ab4fedf33fdbe3171c80fd559df48036a7441232702e749 -DIST jinja-2.9.3.tar.gz 415502 SHA256 1ddce1c6a45de023692aa56c2b68232dbeac6ffd83741b3876ee36f1a1a4e704 SHA512 7f5fdfde6b8c64050a27c39460ec9907cab52afe49aff83ec38ac8ad92ef97c8e592efefc633cd2a95336b551fd6a1adfeb92446aa53c5a2a8765d03feab8311 WHIRLPOOL 6fccde87f7f3c77a619a0e005118abb4f59964610a314df932c60477b45e7a18a681c3103f55f150fd8a0b83938f845577c249e9cd5b16442f6044a505b27e73 DIST jinja-2.9.4.tar.gz 416465 SHA256 7e7dc5aca0d4e39814a138e360284ad3d92647f480df4236e355acc542f5413b SHA512 60764e31878478c5b5adb60da8ddb8afd5d0982733728b87340f03abb5ad9092350ff8374d42cbd5be84d08904d06f0dbda2ef05f4dfbdc30110af9ab2472e5e WHIRLPOOL 8c0c34691f51373c64a158e043fd8ead01bd7454905ccf1a901901c52da80d35264023b7a65aa5878b87630b323d13d7cfae2470e472cb0204618ae9f607c99a +DIST jinja-2.9.5.tar.gz 486763 SHA256 86baad86b1210856d784ddf0d243b8fa043f65b1e3cbc07e4fb24cd5b9725d89 SHA512 15c1b79981c4d6fcbb7fa947fe0fd7e43973433c03d6549a84deec8ad70881f7fd0d3a35160bf6371361994f838da7eb478c577de2612e004679ae51bd97b121 WHIRLPOOL 8ef540e81c40b72dbf652b73a63577e052813bc3d263340f55181c9a2320fa8e3f65c37ccaa6f4840d79b63c1c47f12070ae76d61be6fe0a93104e3916a7ff36 diff --git a/dev-python/jinja/jinja-2.9.3.ebuild b/dev-python/jinja/jinja-2.9.5.ebuild index d77846f697c9..93c6e76ad5e6 100644 --- a/dev-python/jinja/jinja-2.9.3.ebuild +++ b/dev-python/jinja/jinja-2.9.5.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 PYTHON_COMPAT=( python2_7 python3_{4,5} pypy pypy3 ) PYTHON_REQ_USE="threads(+)" @@ -58,7 +58,10 @@ python_test() { python_install_all() { use doc && local HTML_DOCS=( docs/_build/html/. ) - use examples && local EXAMPLES=( examples/. ) + if use examples ; then + docinto examples + dodoc -r examples/. + fi distutils-r1_python_install_all diff --git a/dev-ros/test_rospy/Manifest b/dev-ros/test_rospy/Manifest index 8da7b7792430..e92826da59ec 100644 --- a/dev-ros/test_rospy/Manifest +++ b/dev-ros/test_rospy/Manifest @@ -1,10 +1 @@ -DIST ros_comm-1.11.14.tar.gz 945041 SHA256 8e7beff35711b1918501c69cca4f29648d4d4207878edab069bcd59d515c78f3 SHA512 be768faa0a2f45c464e963934a95dc617cac6c3fcec2388602a27846774c25b882b5139099ce10d1d051a21d5938819942e079836d14618071bc7ad90ee78bab WHIRLPOOL e047ce984086655294c20dbf0715cc29f51ec358f075f02de80c5de0d4ef8059990dc8312d78d7a7fa91c4a974dc21cba15d6eacafe02fd3df527770e50f75a5 -DIST ros_comm-1.11.15.tar.gz 946139 SHA256 532b8cc764e9ca8765484a4468b8537c1ddd84342896267cf3e9f6b19c1b7203 SHA512 8eea3fc948093a7640851f18856f2a20748afb80f935e28d230dc2095956d753bde5081dcd020d09638d9c5d63e031257515b6c6874286c03737507e67cce270 WHIRLPOOL 5e0a971f4312dce99c2e2c11841445cea999dbe5b1ebde3ce26badb9a7eaf9fb84220ed5d1e0088e85835104ddad3cd4d555708d010f83da6e84d257bafe699b -DIST ros_comm-1.11.16.tar.gz 947310 SHA256 b8f48c57d58b623c0b9828476fd8fc785570238d1e117fddaae9aaf8600915d3 SHA512 a97678acbafbe33d063f2c69b42e11bc4815c18ba9bb701542fb272d95410d2c1c2a133aa40ad2211ea1b0c2535938a364adac8099b5231c50e37fa42fff5d3d WHIRLPOOL 16dbdb2f754f16ae73b989e443de9f9e4fdbea2f9411c63d02a53a46517fb565dd97d5ea2b155833bcd592d7e9dd23ae3e7676dd1a49ea3dd509ab47f28082f2 -DIST ros_comm-1.11.17.tar.gz 950987 SHA256 a7222b849d709e47ab9c491e491f6b90dcf12db1780382c9cd294e4410839eb2 SHA512 2dfb95feafa6976c62d2d31f2c6586636e534f39cfce20bc6dfa22731ee256ab8a0c0050a672098123d4d7d32702203bf15c7f323b897f74201bb41bd823ebf7 WHIRLPOOL 0c0d55a2119503b2e0b0b218ce99862815b7070c66127ace51929cda91267fdb33f50012936f1da784ac9c82ace86c41059b3b919effb6b767b7617ff4d33c09 -DIST ros_comm-1.12.0.tar.gz 951540 SHA256 511894fde55a1150a88023ecd9d7a3f0557b90df5fbe375941db0071ba63ae43 SHA512 6e429b6b34ccdf1f17b4998b59518975290f0e6e431750f6172f5c86c35d48ae5f21de293d283ed952f142af3c03500f55d27172055a026b2f17e1cfbb4777d0 WHIRLPOOL 411b5a1106f96008ac2cac72c209dc0806bc5134ffe5d8b87d652d76efba0c7e32e388994598c5aecfabfdf700ba9e9f785eecb02e40c493e631a45dab13be39 -DIST ros_comm-1.12.1.tar.gz 954159 SHA256 cc9fddd81b01808f8b95505b3bb16cd2e212de41212dac84c3a2f8f0e648c374 SHA512 1ba58f5a512e3c7b9be6896254abca735d8a887259fd350110666208b673fad4d2a723b79ed5909868fb8d99430ab4af42e946ca4d4f0b681afd072617376c38 WHIRLPOOL 19aaa77e9b549b8488bdb684ce189b0ab7ca346792f5e65e7f458244d1cbf90ec39fc769754090127eb6718f967f5f13ca0d461413aee3b605c9b7df088ae6d2 -DIST ros_comm-1.12.2.tar.gz 956358 SHA256 693f5ed4fbaf537f104f7d279e267af5046b017126e6e2dd3ecb999192af80a7 SHA512 37489f4378386318284295f9ada52c04268ae1879b0c9f0ac5401efa0cb14e4f430aa205d7a3f0975626de8a7441d24f68c981c21693a493f8fd71d75bfe09e6 WHIRLPOOL eec6b6954617b85146f5b2dd6ba60e8df13c5843f3ef34615a96324fdc4f13e181551cde10af69a7a45d81e68e73f3cc9c72a6ffac323d8c36153af789652b5d -DIST ros_comm-1.12.4.tar.gz 966122 SHA256 b166141f7243d81abf1692a08d7f28a061cb9b74692b93eb0282ade45ed02717 SHA512 0f8f8b4c21e5cba1a2d86f829839242eb5db53eb41631d2a4a1ce6a95231f5c3e06bc0c6a375821228febd55af13ee7e9dc13165b350f2ba81b631cc25043f42 WHIRLPOOL 1a6f4570b1d96a94f9d01edabe6a1cc00ce7b83e6bce662e1ff13774c872e3d2755b544fa612f5347d065c2d199eb8ff818001b3c507de60dbd4099f430ed747 -DIST ros_comm-1.12.5.tar.gz 966478 SHA256 a53039f5106133b67689ba579e29c9045e3b1468713019cf72b848ce979b6964 SHA512 0d97eac0b0cf200a1e217597176d55c82249e2e7b9f3c4706dce84068a65c6642e099fb16c69d33b62d6c780d2c2775b7330fb497bc936f9d4bc73a2b5ba12ca WHIRLPOOL 3f1c8239ef146a0915b8f2c183c68eda094f480fa099846c6b152325bd1e8574114ecbb4a5bcd609bf1323f29767dc8110e175c79b07183cc8ff9e51f9a62b19 DIST ros_comm-1.12.6.tar.gz 967763 SHA256 8585d952b1168d2011949b38c68160180b1f3ee1648a506bcb5989f9807335ca SHA512 1987c6362ae0c7c019a226223c73a7aefdc14a3fc66469ab6cdf9c41e9efdf4d7b7d4932af2a52f2082d716342a307b2e415c0ab45f77dfd9a7c1e4274deab5c WHIRLPOOL a719bb81da6b1b7e2f253d3bf6c8db8339333b4fa7f89a18d0fa734e9ff1700e1dac7b537f154015b4ada7455a6673c1715a89e2fdd3da9bbbb70081fc2943cd diff --git a/dev-ros/test_rospy/test_rospy-1.11.14.ebuild b/dev-ros/test_rospy/test_rospy-1.11.14.ebuild deleted file mode 100644 index 174ea68dbec0..000000000000 --- a/dev-ros/test_rospy/test_rospy-1.11.14.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -ROS_REPO_URI="https://github.com/ros/ros_comm" -KEYWORDS="~amd64 ~arm" -ROS_SUBDIR=test/${PN} -CATKIN_HAS_MESSAGES=yes -CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/test_rosmaster" - -PYTHON_COMPAT=( python2_7 ) - -inherit ros-catkin - -DESCRIPTION="Unit tests for rospy" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND="" -DEPEND="${RDEPEND} - dev-ros/rostest[${PYTHON_USEDEP}] - dev-ros/std_msgs[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] - dev-ros/test_rosmaster[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] - dev-ros/rosunit[${PYTHON_USEDEP}] - test? ( - dev-python/numpy[${PYTHON_USEDEP}] - dev-ros/rosbuild - dev-ros/rosgraph[${PYTHON_USEDEP}] - dev-ros/rospy[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] - )" diff --git a/dev-ros/test_rospy/test_rospy-1.11.15.ebuild b/dev-ros/test_rospy/test_rospy-1.11.15.ebuild deleted file mode 100644 index 174ea68dbec0..000000000000 --- a/dev-ros/test_rospy/test_rospy-1.11.15.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -ROS_REPO_URI="https://github.com/ros/ros_comm" -KEYWORDS="~amd64 ~arm" -ROS_SUBDIR=test/${PN} -CATKIN_HAS_MESSAGES=yes -CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/test_rosmaster" - -PYTHON_COMPAT=( python2_7 ) - -inherit ros-catkin - -DESCRIPTION="Unit tests for rospy" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND="" -DEPEND="${RDEPEND} - dev-ros/rostest[${PYTHON_USEDEP}] - dev-ros/std_msgs[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] - dev-ros/test_rosmaster[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] - dev-ros/rosunit[${PYTHON_USEDEP}] - test? ( - dev-python/numpy[${PYTHON_USEDEP}] - dev-ros/rosbuild - dev-ros/rosgraph[${PYTHON_USEDEP}] - dev-ros/rospy[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] - )" diff --git a/dev-ros/test_rospy/test_rospy-1.11.16.ebuild b/dev-ros/test_rospy/test_rospy-1.11.16.ebuild deleted file mode 100644 index 174ea68dbec0..000000000000 --- a/dev-ros/test_rospy/test_rospy-1.11.16.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -ROS_REPO_URI="https://github.com/ros/ros_comm" -KEYWORDS="~amd64 ~arm" -ROS_SUBDIR=test/${PN} -CATKIN_HAS_MESSAGES=yes -CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/test_rosmaster" - -PYTHON_COMPAT=( python2_7 ) - -inherit ros-catkin - -DESCRIPTION="Unit tests for rospy" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND="" -DEPEND="${RDEPEND} - dev-ros/rostest[${PYTHON_USEDEP}] - dev-ros/std_msgs[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] - dev-ros/test_rosmaster[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] - dev-ros/rosunit[${PYTHON_USEDEP}] - test? ( - dev-python/numpy[${PYTHON_USEDEP}] - dev-ros/rosbuild - dev-ros/rosgraph[${PYTHON_USEDEP}] - dev-ros/rospy[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] - )" diff --git a/dev-ros/test_rospy/test_rospy-1.11.17.ebuild b/dev-ros/test_rospy/test_rospy-1.11.17.ebuild deleted file mode 100644 index 174ea68dbec0..000000000000 --- a/dev-ros/test_rospy/test_rospy-1.11.17.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -ROS_REPO_URI="https://github.com/ros/ros_comm" -KEYWORDS="~amd64 ~arm" -ROS_SUBDIR=test/${PN} -CATKIN_HAS_MESSAGES=yes -CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/test_rosmaster" - -PYTHON_COMPAT=( python2_7 ) - -inherit ros-catkin - -DESCRIPTION="Unit tests for rospy" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND="" -DEPEND="${RDEPEND} - dev-ros/rostest[${PYTHON_USEDEP}] - dev-ros/std_msgs[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] - dev-ros/test_rosmaster[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] - dev-ros/rosunit[${PYTHON_USEDEP}] - test? ( - dev-python/numpy[${PYTHON_USEDEP}] - dev-ros/rosbuild - dev-ros/rosgraph[${PYTHON_USEDEP}] - dev-ros/rospy[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] - )" diff --git a/dev-ros/test_rospy/test_rospy-1.12.0.ebuild b/dev-ros/test_rospy/test_rospy-1.12.0.ebuild deleted file mode 100644 index 174ea68dbec0..000000000000 --- a/dev-ros/test_rospy/test_rospy-1.12.0.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -ROS_REPO_URI="https://github.com/ros/ros_comm" -KEYWORDS="~amd64 ~arm" -ROS_SUBDIR=test/${PN} -CATKIN_HAS_MESSAGES=yes -CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/test_rosmaster" - -PYTHON_COMPAT=( python2_7 ) - -inherit ros-catkin - -DESCRIPTION="Unit tests for rospy" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND="" -DEPEND="${RDEPEND} - dev-ros/rostest[${PYTHON_USEDEP}] - dev-ros/std_msgs[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] - dev-ros/test_rosmaster[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] - dev-ros/rosunit[${PYTHON_USEDEP}] - test? ( - dev-python/numpy[${PYTHON_USEDEP}] - dev-ros/rosbuild - dev-ros/rosgraph[${PYTHON_USEDEP}] - dev-ros/rospy[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] - )" diff --git a/dev-ros/test_rospy/test_rospy-1.12.1.ebuild b/dev-ros/test_rospy/test_rospy-1.12.1.ebuild deleted file mode 100644 index 174ea68dbec0..000000000000 --- a/dev-ros/test_rospy/test_rospy-1.12.1.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -ROS_REPO_URI="https://github.com/ros/ros_comm" -KEYWORDS="~amd64 ~arm" -ROS_SUBDIR=test/${PN} -CATKIN_HAS_MESSAGES=yes -CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/test_rosmaster" - -PYTHON_COMPAT=( python2_7 ) - -inherit ros-catkin - -DESCRIPTION="Unit tests for rospy" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND="" -DEPEND="${RDEPEND} - dev-ros/rostest[${PYTHON_USEDEP}] - dev-ros/std_msgs[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] - dev-ros/test_rosmaster[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] - dev-ros/rosunit[${PYTHON_USEDEP}] - test? ( - dev-python/numpy[${PYTHON_USEDEP}] - dev-ros/rosbuild - dev-ros/rosgraph[${PYTHON_USEDEP}] - dev-ros/rospy[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] - )" diff --git a/dev-ros/test_rospy/test_rospy-1.12.2.ebuild b/dev-ros/test_rospy/test_rospy-1.12.2.ebuild deleted file mode 100644 index 48cb395c90ff..000000000000 --- a/dev-ros/test_rospy/test_rospy-1.12.2.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -ROS_REPO_URI="https://github.com/ros/ros_comm" -KEYWORDS="~amd64 ~arm" -ROS_SUBDIR=test/${PN} -CATKIN_HAS_MESSAGES=yes -CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/test_rosmaster" - -PYTHON_COMPAT=( python2_7 ) - -inherit ros-catkin - -DESCRIPTION="Unit tests for rospy" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND="" -DEPEND="${RDEPEND} - dev-ros/rostest[${PYTHON_USEDEP}] - dev-ros/std_msgs[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] - dev-ros/test_rosmaster[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] - dev-ros/rosunit[${PYTHON_USEDEP}] - test? ( - dev-python/numpy[${PYTHON_USEDEP}] - dev-ros/rosbuild - dev-ros/rosgraph[${PYTHON_USEDEP}] - dev-ros/rospy[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] - )" diff --git a/dev-ros/test_rospy/test_rospy-1.12.4.ebuild b/dev-ros/test_rospy/test_rospy-1.12.4.ebuild deleted file mode 100644 index 48cb395c90ff..000000000000 --- a/dev-ros/test_rospy/test_rospy-1.12.4.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -ROS_REPO_URI="https://github.com/ros/ros_comm" -KEYWORDS="~amd64 ~arm" -ROS_SUBDIR=test/${PN} -CATKIN_HAS_MESSAGES=yes -CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/test_rosmaster" - -PYTHON_COMPAT=( python2_7 ) - -inherit ros-catkin - -DESCRIPTION="Unit tests for rospy" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND="" -DEPEND="${RDEPEND} - dev-ros/rostest[${PYTHON_USEDEP}] - dev-ros/std_msgs[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] - dev-ros/test_rosmaster[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] - dev-ros/rosunit[${PYTHON_USEDEP}] - test? ( - dev-python/numpy[${PYTHON_USEDEP}] - dev-ros/rosbuild - dev-ros/rosgraph[${PYTHON_USEDEP}] - dev-ros/rospy[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] - )" diff --git a/dev-ros/test_rospy/test_rospy-1.12.5.ebuild b/dev-ros/test_rospy/test_rospy-1.12.5.ebuild deleted file mode 100644 index 48cb395c90ff..000000000000 --- a/dev-ros/test_rospy/test_rospy-1.12.5.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -ROS_REPO_URI="https://github.com/ros/ros_comm" -KEYWORDS="~amd64 ~arm" -ROS_SUBDIR=test/${PN} -CATKIN_HAS_MESSAGES=yes -CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/test_rosmaster" - -PYTHON_COMPAT=( python2_7 ) - -inherit ros-catkin - -DESCRIPTION="Unit tests for rospy" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND="" -DEPEND="${RDEPEND} - dev-ros/rostest[${PYTHON_USEDEP}] - dev-ros/std_msgs[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] - dev-ros/test_rosmaster[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] - dev-ros/rosunit[${PYTHON_USEDEP}] - test? ( - dev-python/numpy[${PYTHON_USEDEP}] - dev-ros/rosbuild - dev-ros/rosgraph[${PYTHON_USEDEP}] - dev-ros/rospy[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] - )" diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass index d2f504b34fa0..23319ad407f5 100644 --- a/eclass/flag-o-matic.eclass +++ b/eclass/flag-o-matic.eclass @@ -25,7 +25,7 @@ all-flag-vars() { setup-allowed-flags() { ALLOWED_FLAGS=( -pipe -O '-O[12sg]' -mcpu -march -mtune - '-fstack-protector*' '-fsanitize*' + '-fstack-protector*' '-fsanitize*' '-fstack-check*' -fbounds-check -fbounds-checking -fno-strict-overflow -fno-PIE -fno-pie -nopie -no-pie -fno-unit-at-a-time -g '-g[0-9]' -ggdb '-ggdb[0-9]' '-gdwarf-*' gstabs -gstabs+ diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest index 5ff6ac212797..692eae5c76f2 100644 --- a/sys-libs/glibc/Manifest +++ b/sys-libs/glibc/Manifest @@ -11,10 +11,9 @@ DIST glibc-2.21-patches-7.tar.bz2 46894 SHA256 49126df6f4b819f2c315cca0a07e9b8ee DIST glibc-2.21.tar.xz 12322092 SHA256 aeeb362437965a5d3f40b151094ca79def04a115bd363fdd4a9a0c69482923b8 SHA512 8cded6693618bec115f678fcbd0b77556f97dfa8337608f66e37224aefa55b38765ba61cb4d58beea37b5934e5ec8e30bad58613707388484906f2a0ce77997d WHIRLPOOL d07fec32bd92eade065a3b6170932b8bd41d07df4aa69dd5a860ebb9678c22bd1e20bf88b1fc05c3ecc18e709c0a63118e12525dc668e0399d7ef7fe4454702d DIST glibc-2.22-patches-13.tar.bz2 74479 SHA256 ffd1e0f9a41be030e5ce2518d9e84a1fbaa9a4fb2e96f1b85dafb05fea666c86 SHA512 73517fc1502b0733d67ade1d1ba6168415f5da64f37045fac0b10ef57155bf6dfbe1876e4742d2543fcea0c935c179426f6fbb94f0205968392ef903d2f83897 WHIRLPOOL 0eeedaf09eb42e5186256dd41aae00cd2b9b8e3ab929a792e83d0fd8e8a8630d829f01b293588bf59e105eb17ab512416d8d115c3e542cddc34a84b84d56af3d DIST glibc-2.22.tar.xz 12969072 SHA256 eb731406903befef1d8f878a46be75ef862b9056ab0cde1626d08a7a05328948 SHA512 a8719f3a4f8aa5fa81711116fdafbea5082c6dfd85bd8c4cdce60571910263ab422b35bb8b55a84d37ccb146442133ba60a84d453ca4a439c8ccd35419bd051b WHIRLPOOL f7e707b3776fc197a2e7bf5633721925507237b154bbc1f94b9fc303c87e6fc039ff0758da6ee55b4c1a0daaa87c6e594a6c96e7b00a7ba8ae98ee29918709a7 -DIST glibc-2.23-patches-4.tar.bz2 230533 SHA256 5b64a9b30778be79fac8a8c7e2ec7ebb077e136c85d79996ae3d725189d236a4 SHA512 af140a13bbc28070bfec26e041ce562b1cc091d312a82f385becb3ab87ee882d8ea10ac4ec6dcf86f154857527a3383782d46141016047338cebc7c393329cf3 WHIRLPOOL ca7be788c64428bd2bd6e41eee5345ff85dc9ee0987af55f60104a9f03e3019b8fa6a933ba785d3b1b27540c2485160d50499049985271227c07b094db649de3 DIST glibc-2.23-patches-7.tar.bz2 315221 SHA256 97ef9e370ce9b09d8e9b9f6239f7ef94dd837d29b7bfc1404438c63da1d534ac SHA512 c0d0cab0a370acef0b085b0ab09ce868425a12bbb371d0a9ff91dc83a74a0d8d3b541d10c44650b00b7cb155f8ac1f87764e6a6bd9d6bae8a9a904b4df1650ef WHIRLPOOL 128ea1a2eeaad3d95cdf1054d10232a34e8f88d10ed8907a67d9ff02734243d20b21595ca3698a4861d9c65e2a59aedbcf8e399bd1ed879dba1556ce2995ad9b DIST glibc-2.23.tar.xz 13455260 SHA256 94efeb00e4603c8546209cefb3e1a50a5315c86fa9b078b6fad758e187ce13e9 SHA512 b82953388cd028e174cb08f082557bbce0dad8b67b17d31b29f90102fd52a51e03d591448ecb64882a1c1d5303afffc7f6ede85cee4c784a9284fbc9b4ad26cf WHIRLPOOL 7c7e3bf55a89a04bac917b9ca5a1cbb1613f22c427d2766f114b5a36f9635856005b823852ef5d3b73462b577fe4e5865e68e7b64633d48a95fa1e5eaa831a71 -DIST glibc-2.24-patches-4.tar.bz2 66166 SHA256 87e9f1977b836422969c5d893fdeba139618f6bc85f79d0619c541eeaec74ed4 SHA512 421dc34403f0dcdbbdd37833a6f26025a901fc507dadde916c5b364f59c427f2936dadd4fd56ac02f28fbaadcf4122bd5fabfca8b6f1e8dfe9d3979e28ec0a25 WHIRLPOOL f7691cf0c7510bef2fd2e9b4fb729dfa1885dfb908fd588f49c22334554cc750d565286aea2cd214426abd1d501c0343606e62f168edf3626fd6c5dec279b395 +DIST glibc-2.24-patches-5.tar.bz2 66822 SHA256 9844d11da6442926f0b3c58332ee655d307dcb757c781f82e96e98654df17c04 SHA512 798444231ea3dbe6ff1b36af4fa99caca1bf8f90505f37c8d2db3765915519fac2e768bce7710c13c6b3ced765d27ddecf8208d7cfcb108bd0f3ba84af7b86d6 WHIRLPOOL 794eb99d2d3119cee3ff078b6ce98acf551e536ea2077038d5a0cf29c6d28c0ac202bef54aaa7d249c01d34bd2aadf17a85a0857b11a6106b2679eac4a704229 DIST glibc-2.24.tar.xz 13554048 SHA256 99d4a3e8efd144d71488e478f62587578c0f4e1fa0b4eed47ee3d4975ebeb5d3 SHA512 a4cb28a2c51a0cc029ed69da7cba11931a615ba897235590b4f7fad2eaabec9042f8250eaac2a5860997437a69ab13304f10a634000e52c0336b5593b7969adb WHIRLPOOL be82b47fc73f7e780e8e73a5f58b313d8e861d5ea8c4320f95ef0d8c1e125ff011d61dcfc0380be0e83868bd8c3299de1ea662da7fc8d709050e89b2c126e3eb DIST glibc-2.25-patches-1.tar.bz2 22639 SHA256 e758802acc872dcfccc87c6f438bc7630514e99b7973553fbafc1bdc440ff399 SHA512 0257715c74c74249cd0eff036faf361acda06cb2d5c70d9e54e741d8983053c4cdb1b20f619b61b7aa672aa2ded97e2451e232f5e839c6fb4d08dd8ba2ac295c WHIRLPOOL 4916b260345c0cfe260c4910a84d811d75aaf5a3e73144ce41ec7dc7d77ec6a5f23380280035303103c1cea6e2098baba8cdddba051605e446c8b13fa9a1760b DIST glibc-2.25.tar.xz 13873900 SHA256 067bd9bb3390e79aa45911537d13c3721f1d9d3769931a30c2681bfee66f23a0 SHA512 5b7a2418d5b8a1b6a907c6c7fb6477ee2a473151cb45e03d0d4cdd9a33497c90b1ee39e2e7e885e2b25743dcd3747336ef114b4a73eb001da1fd79f29e0f9a6e WHIRLPOOL dc2fafaa4a0e5581268338453838a03ed0c5e7a2af844e8fb7086ab8d3ae48efbdbe6f25db1d089ae669cd2f8b0412f690d965506753d86f8525da2df59b7953 diff --git a/sys-libs/glibc/glibc-2.23-r1.ebuild b/sys-libs/glibc/glibc-2.23-r1.ebuild deleted file mode 100644 index 82bdd11a527e..000000000000 --- a/sys-libs/glibc/glibc-2.23-r1.ebuild +++ /dev/null @@ -1,205 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -inherit eutils versionator toolchain-funcs flag-o-matic gnuconfig multilib systemd unpacker multiprocessing - -DESCRIPTION="GNU libc6 (also called glibc2) C library" -HOMEPAGE="https://www.gnu.org/software/libc/libc.html" - -LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -RESTRICT="strip" # strip ourself #46186 -EMULTILIB_PKG="true" - -# Configuration variables -RELEASE_VER="" -case ${PV} in -9999*) - EGIT_REPO_URIS="git://sourceware.org/git/glibc.git" - EGIT_SOURCEDIRS="${S}" - inherit git-2 - ;; -*) - RELEASE_VER=${PV} - ;; -esac -GCC_BOOTSTRAP_VER="4.7.3-r1" -PATCH_VER="4" # Gentoo patchset -: ${NPTL_KERN_VER:="2.6.32"} # min kernel version nptl requires - -IUSE="audit caps debug gd hardened multilib nscd +rpc selinux systemtap profile suid vanilla crosscompile_opts_headers-only" - -# Here's how the cross-compile logic breaks down ... -# CTARGET - machine that will target the binaries -# CHOST - machine that will host the binaries -# CBUILD - machine that will build the binaries -# If CTARGET != CHOST, it means you want a libc for cross-compiling. -# If CHOST != CBUILD, it means you want to cross-compile the libc. -# CBUILD = CHOST = CTARGET - native build/install -# CBUILD != (CHOST = CTARGET) - cross-compile a native build -# (CBUILD = CHOST) != CTARGET - libc for cross-compiler -# CBUILD != CHOST != CTARGET - cross-compile a libc for a cross-compiler -# For install paths: -# CHOST = CTARGET - install into / -# CHOST != CTARGET - install into /usr/CTARGET/ - -export CBUILD=${CBUILD:-${CHOST}} -export CTARGET=${CTARGET:-${CHOST}} -if [[ ${CTARGET} == ${CHOST} ]] ; then - if [[ ${CATEGORY} == cross-* ]] ; then - export CTARGET=${CATEGORY#cross-} - fi -fi - -is_crosscompile() { - [[ ${CHOST} != ${CTARGET} ]] -} - -# Why SLOT 2.2 you ask yourself while sippin your tea ? -# Everyone knows 2.2 > 0, duh. -SLOT="2.2" - -# General: We need a new-enough binutils/gcc to match upstream baseline. -# arch: we need to make sure our binutils/gcc supports TLS. -COMMON_DEPEND=" - nscd? ( selinux? ( - audit? ( sys-process/audit ) - caps? ( sys-libs/libcap ) - ) ) - suid? ( caps? ( sys-libs/libcap ) ) - selinux? ( sys-libs/libselinux ) -" -DEPEND="${COMMON_DEPEND} - >=app-misc/pax-utils-0.1.10 - !<sys-apps/sandbox-1.6 - !<sys-apps/portage-2.1.2" -RDEPEND="${COMMON_DEPEND} - !sys-kernel/ps3-sources - sys-apps/gentoo-functions - !sys-libs/nss-db" - -if [[ ${CATEGORY} == cross-* ]] ; then - DEPEND+=" !crosscompile_opts_headers-only? ( - >=${CATEGORY}/binutils-2.24 - >=${CATEGORY}/gcc-4.7 - )" - [[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers" -else - DEPEND+=" - >=sys-devel/binutils-2.24 - >=sys-devel/gcc-4.7 - virtual/os-headers" - RDEPEND+=" vanilla? ( !sys-libs/timezone-data )" - PDEPEND+=" !vanilla? ( sys-libs/timezone-data )" -fi - -upstream_uris() { - echo mirror://gnu/glibc/$1 ftp://sourceware.org/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1 -} -gentoo_uris() { - local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI" - devspace=${devspace//HTTP/https://dev.gentoo.org/} - echo mirror://gentoo/$1 ${devspace//URI/$1} -} -SRC_URI=$( - [[ -z ${EGIT_REPO_URIS} ]] && upstream_uris ${P}.tar.xz - [[ -n ${PATCH_VER} ]] && gentoo_uris ${P}-patches-${PATCH_VER}.tar.bz2 -) -SRC_URI+=" ${GCC_BOOTSTRAP_VER:+multilib? ( $(gentoo_uris gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2) )}" - -# eblit-include [--skip] <function> [version] -eblit-include() { - local skipable=false - [[ $1 == "--skip" ]] && skipable=true && shift - [[ $1 == pkg_* ]] && skipable=true - - local e v func=$1 ver=$2 - [[ -z ${func} ]] && die "Usage: eblit-include <function> [version]" - for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do - e="${FILESDIR}/eblits/${func}${v}.eblit" - if [[ -e ${e} ]] ; then - source "${e}" - return 0 - fi - done - ${skipable} && return 0 - die "Could not locate requested eblit '${func}' in ${FILESDIR}/eblits/" -} - -# eblit-run-maybe <function> -# run the specified function if it is defined -eblit-run-maybe() { - [[ $(type -t "$@") == "function" ]] && "$@" -} - -# eblit-run <function> [version] -# aka: src_unpack() { eblit-run src_unpack ; } -eblit-run() { - eblit-include --skip common "${*:2}" - eblit-include "$@" - eblit-run-maybe eblit-$1-pre - eblit-${PN}-$1 - eblit-run-maybe eblit-$1-post -} - -src_unpack() { eblit-run src_unpack ; } -src_prepare() { eblit-run src_prepare ; } -src_configure() { eblit-run src_configure ; } -src_compile() { eblit-run src_compile ; } -src_test() { eblit-run src_test ; } -src_install() { eblit-run src_install ; } - -# FILESDIR might not be available during binpkg install -for x in pretend setup {pre,post}inst ; do - e="${FILESDIR}/eblits/pkg_${x}.eblit" - if [[ -e ${e} ]] ; then - . "${e}" - eval "pkg_${x}() { eblit-run pkg_${x} ; }" - fi -done - -eblit-src_unpack-pre() { - [[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib && unpack gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2 - # Bug 558636 we don't apply the pie works around for 2.22. It shoud have the support. #558636 - GLIBC_PATCH_EXCLUDE+=" 00_all_0002-workaround-crash-when-handling-signals-in-static-PIE.patch" - GLIBC_PATCH_EXCLUDE+=" 00_all_0012-disable-PIE-when-checking-for-PIC-default.patch" -} - -eblit-src_prepare-post() { - cd "${S}" - - epatch "${FILESDIR}"/2.19/${PN}-2.19-ia64-gcc-4.8-reloc-hack.patch #503838 - - if use hardened ; then - # We don't enable these for non-hardened as the output is very terse -- - # it only states that a crash happened. The default upstream behavior - # includes backtraces and symbols. - einfo "Installing Hardened Gentoo SSP and FORTIFY_SOURCE handler" - cp "${FILESDIR}"/2.20/glibc-2.20-gentoo-stack_chk_fail.c debug/stack_chk_fail.c || die - cp "${FILESDIR}"/2.20/glibc-2.20-gentoo-chk_fail.c debug/chk_fail.c || die - - if use debug ; then - # Allow SIGABRT to dump core on non-hardened systems, or when debug is requested. - sed -i \ - -e '/^CFLAGS-backtrace.c/ iCPPFLAGS-stack_chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \ - -e '/^CFLAGS-backtrace.c/ iCPPFLAGS-chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \ - debug/Makefile || die - fi - - # Build various bits with ssp-all - sed -i \ - -e 's:-fstack-protector$:-fstack-protector-all:' \ - */Makefile || die - fi - - case $(gcc-fullversion) in - 4.8.[0-3]|4.9.0) - eerror "You need to switch to a newer compiler; gcc-4.8.[0-3] and gcc-4.9.0 miscompile" - eerror "glibc. See https://bugs.gentoo.org/547420 for details." - die "need to switch compilers #547420" - ;; - esac -} diff --git a/sys-libs/glibc/glibc-2.23-r2.ebuild b/sys-libs/glibc/glibc-2.23-r2.ebuild deleted file mode 100644 index 27b7d3ab7fac..000000000000 --- a/sys-libs/glibc/glibc-2.23-r2.ebuild +++ /dev/null @@ -1,206 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -inherit eutils versionator toolchain-funcs flag-o-matic gnuconfig multilib systemd unpacker multiprocessing prefix - -DESCRIPTION="GNU libc6 (also called glibc2) C library" -HOMEPAGE="https://www.gnu.org/software/libc/libc.html" - -LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -RESTRICT="strip" # strip ourself #46186 -EMULTILIB_PKG="true" - -# Configuration variables -RELEASE_VER="" -case ${PV} in -9999*) - EGIT_REPO_URIS="git://sourceware.org/git/glibc.git" - EGIT_SOURCEDIRS="${S}" - inherit git-2 - ;; -*) - RELEASE_VER=${PV} - ;; -esac -GCC_BOOTSTRAP_VER="4.7.3-r1" -PATCH_VER="4" # Gentoo patchset -: ${NPTL_KERN_VER:="2.6.32"} # min kernel version nptl requires - -IUSE="audit caps debug gd hardened multilib nscd +rpc selinux systemtap profile suid vanilla crosscompile_opts_headers-only" - -# Here's how the cross-compile logic breaks down ... -# CTARGET - machine that will target the binaries -# CHOST - machine that will host the binaries -# CBUILD - machine that will build the binaries -# If CTARGET != CHOST, it means you want a libc for cross-compiling. -# If CHOST != CBUILD, it means you want to cross-compile the libc. -# CBUILD = CHOST = CTARGET - native build/install -# CBUILD != (CHOST = CTARGET) - cross-compile a native build -# (CBUILD = CHOST) != CTARGET - libc for cross-compiler -# CBUILD != CHOST != CTARGET - cross-compile a libc for a cross-compiler -# For install paths: -# CHOST = CTARGET - install into / -# CHOST != CTARGET - install into /usr/CTARGET/ - -export CBUILD=${CBUILD:-${CHOST}} -export CTARGET=${CTARGET:-${CHOST}} -if [[ ${CTARGET} == ${CHOST} ]] ; then - if [[ ${CATEGORY} == cross-* ]] ; then - export CTARGET=${CATEGORY#cross-} - fi -fi - -is_crosscompile() { - [[ ${CHOST} != ${CTARGET} ]] -} - -# Why SLOT 2.2 you ask yourself while sippin your tea ? -# Everyone knows 2.2 > 0, duh. -SLOT="2.2" - -# General: We need a new-enough binutils/gcc to match upstream baseline. -# arch: we need to make sure our binutils/gcc supports TLS. -COMMON_DEPEND=" - nscd? ( selinux? ( - audit? ( sys-process/audit ) - caps? ( sys-libs/libcap ) - ) ) - suid? ( caps? ( sys-libs/libcap ) ) - selinux? ( sys-libs/libselinux ) -" -DEPEND="${COMMON_DEPEND} - >=app-misc/pax-utils-0.1.10 - !<sys-apps/sandbox-1.6 - !<sys-apps/portage-2.1.2" -RDEPEND="${COMMON_DEPEND} - !sys-kernel/ps3-sources - sys-apps/gentoo-functions - !sys-libs/nss-db" - -if [[ ${CATEGORY} == cross-* ]] ; then - DEPEND+=" !crosscompile_opts_headers-only? ( - >=${CATEGORY}/binutils-2.24 - >=${CATEGORY}/gcc-4.7 - )" - [[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers" -else - DEPEND+=" - >=sys-devel/binutils-2.24 - >=sys-devel/gcc-4.7 - virtual/os-headers" - RDEPEND+=" vanilla? ( !sys-libs/timezone-data )" - PDEPEND+=" !vanilla? ( sys-libs/timezone-data )" -fi - -upstream_uris() { - echo mirror://gnu/glibc/$1 ftp://sourceware.org/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1 -} -gentoo_uris() { - local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI" - devspace=${devspace//HTTP/https://dev.gentoo.org/} - echo mirror://gentoo/$1 ${devspace//URI/$1} -} -SRC_URI=$( - [[ -z ${EGIT_REPO_URIS} ]] && upstream_uris ${P}.tar.xz - [[ -n ${PATCH_VER} ]] && gentoo_uris ${P}-patches-${PATCH_VER}.tar.bz2 -) -SRC_URI+=" ${GCC_BOOTSTRAP_VER:+multilib? ( $(gentoo_uris gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2) )}" - -# eblit-include [--skip] <function> [version] -eblit-include() { - local skipable=false - [[ $1 == "--skip" ]] && skipable=true && shift - [[ $1 == pkg_* ]] && skipable=true - - local e v func=$1 ver=$2 - [[ -z ${func} ]] && die "Usage: eblit-include <function> [version]" - for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do - e="${FILESDIR}/eblits/${func}${v}.eblit" - if [[ -e ${e} ]] ; then - source "${e}" - return 0 - fi - done - ${skipable} && return 0 - die "Could not locate requested eblit '${func}' in ${FILESDIR}/eblits/" -} - -# eblit-run-maybe <function> -# run the specified function if it is defined -eblit-run-maybe() { - [[ $(type -t "$@") == "function" ]] && "$@" -} - -# eblit-run <function> [version] -# aka: src_unpack() { eblit-run src_unpack ; } -eblit-run() { - eblit-include --skip common "${*:2}" - eblit-include "$@" - eblit-run-maybe eblit-$1-pre - eblit-${PN}-$1 - eblit-run-maybe eblit-$1-post -} - -src_unpack() { eblit-run src_unpack ; } -src_prepare() { eblit-run src_prepare ; } -src_configure() { eblit-run src_configure ; } -src_compile() { eblit-run src_compile ; } -src_test() { eblit-run src_test ; } -src_install() { eblit-run src_install ; } - -# FILESDIR might not be available during binpkg install -for x in pretend setup {pre,post}inst ; do - e="${FILESDIR}/eblits/pkg_${x}.eblit" - if [[ -e ${e} ]] ; then - . "${e}" - eval "pkg_${x}() { eblit-run pkg_${x} ; }" - fi -done - -eblit-src_unpack-pre() { - [[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib && unpack gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2 - # Bug 558636 we don't apply the pie works around for 2.22. It shoud have the support. #558636 - GLIBC_PATCH_EXCLUDE+=" 00_all_0002-workaround-crash-when-handling-signals-in-static-PIE.patch" - GLIBC_PATCH_EXCLUDE+=" 00_all_0012-disable-PIE-when-checking-for-PIC-default.patch" - GLIBC_PATCH_EXCLUDE+=" 00_all_0009-sys-types.h-drop-sys-sysmacros.h-include.patch" -} - -eblit-src_prepare-post() { - cd "${S}" - - epatch "${FILESDIR}"/2.19/${PN}-2.19-ia64-gcc-4.8-reloc-hack.patch #503838 - - if use hardened ; then - # We don't enable these for non-hardened as the output is very terse -- - # it only states that a crash happened. The default upstream behavior - # includes backtraces and symbols. - einfo "Installing Hardened Gentoo SSP and FORTIFY_SOURCE handler" - cp "${FILESDIR}"/2.20/glibc-2.20-gentoo-stack_chk_fail.c debug/stack_chk_fail.c || die - cp "${FILESDIR}"/2.20/glibc-2.20-gentoo-chk_fail.c debug/chk_fail.c || die - - if use debug ; then - # Allow SIGABRT to dump core on non-hardened systems, or when debug is requested. - sed -i \ - -e '/^CFLAGS-backtrace.c/ iCPPFLAGS-stack_chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \ - -e '/^CFLAGS-backtrace.c/ iCPPFLAGS-chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \ - debug/Makefile || die - fi - - # Build various bits with ssp-all - sed -i \ - -e 's:-fstack-protector$:-fstack-protector-all:' \ - */Makefile || die - fi - - case $(gcc-fullversion) in - 4.8.[0-3]|4.9.0) - eerror "You need to switch to a newer compiler; gcc-4.8.[0-3] and gcc-4.9.0 miscompile" - eerror "glibc. See https://bugs.gentoo.org/547420 for details." - die "need to switch compilers #547420" - ;; - esac -} diff --git a/sys-libs/glibc/glibc-2.23-r3.ebuild b/sys-libs/glibc/glibc-2.23-r3.ebuild index cadc74929981..7f6d871713c0 100644 --- a/sys-libs/glibc/glibc-2.23-r3.ebuild +++ b/sys-libs/glibc/glibc-2.23-r3.ebuild @@ -10,7 +10,7 @@ DESCRIPTION="GNU libc6 (also called glibc2) C library" HOMEPAGE="https://www.gnu.org/software/libc/libc.html" LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ~ppc ppc64 s390 sh ~sparc ~x86" RESTRICT="strip" # strip ourself #46186 EMULTILIB_PKG="true" diff --git a/sys-libs/glibc/glibc-2.24.ebuild b/sys-libs/glibc/glibc-2.24-r1.ebuild index 0b2f2ca3e452..740d0f06ae49 100644 --- a/sys-libs/glibc/glibc-2.24.ebuild +++ b/sys-libs/glibc/glibc-2.24-r1.ebuild @@ -9,7 +9,7 @@ DESCRIPTION="GNU libc6 (also called glibc2) C library" HOMEPAGE="https://www.gnu.org/software/libc/libc.html" LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE" -#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" RESTRICT="strip" # strip ourself #46186 EMULTILIB_PKG="true" @@ -26,7 +26,7 @@ case ${PV} in ;; esac GCC_BOOTSTRAP_VER="4.7.3-r1" -PATCH_VER="4" # Gentoo patchset +PATCH_VER="5" # Gentoo patchset : ${NPTL_KERN_VER:="2.6.32"} # min kernel version nptl requires IUSE="audit caps debug gd hardened multilib nscd +rpc selinux systemtap profile suid vanilla crosscompile_opts_headers-only" |