From fac9aa11aa786196f757d1148cb9ab19001c243c Mon Sep 17 00:00:00 2001 From: Rob Walker Date: Fri, 14 Sep 2018 10:47:12 +0100 Subject: [PATCH] app-benchmarks/phoronix-test-suite: new version(s): 8.2.0 Drop 8.2.0 Milestone, pre-release version(s). --- app-benchmarks/phoronix-test-suite/Manifest | 6 +- ...build => phoronix-test-suite-8.2.0.ebuild} | 0 .../phoronix-test-suite-8.2.0_pre2.ebuild | 144 ------------------ 3 files changed, 2 insertions(+), 148 deletions(-) rename app-benchmarks/phoronix-test-suite/{phoronix-test-suite-8.2.0_pre1.ebuild => phoronix-test-suite-8.2.0.ebuild} (100%) delete mode 100644 app-benchmarks/phoronix-test-suite/phoronix-test-suite-8.2.0_pre2.ebuild diff --git a/app-benchmarks/phoronix-test-suite/Manifest b/app-benchmarks/phoronix-test-suite/Manifest index 06f1e924..22e12316 100644 --- a/app-benchmarks/phoronix-test-suite/Manifest +++ b/app-benchmarks/phoronix-test-suite/Manifest @@ -1,8 +1,6 @@ DIST phoronix-test-suite-8.0.1.tar.gz 846244 SHA256 8bfe972c601884f2bbbf4d5069c7691637e8a30af55d2a9597dbe53911b49081 SHA512 86382de74c36e5638bff7f7649a2c387c90434aa57a88d52afb533f28f452b793764923cf851017175c9cc6ba30afd67e77d4ede8dd496a9e826bcd4d3307456 WHIRLPOOL 4d37a3148b42bbd0e1288f0e32493d0ce6206a20222547d97f7e6769234b93bb0e2bd8b5af234def93ea0f9b5dd401c850b6973c8b7aecd6948b3bdfafbbd4e5 -DIST phoronix-test-suite-8.2.0m1.tar.gz 850356 SHA256 06bcf17f3812799d3acaa7a90f4da9ddc148db3f9c438acf1df4069cfe2013a5 SHA512 5b7ea20cfb307d39103c4bc15fa1204b188a1317c2ffc559554109a089543b5cdca1dd18d5e0f6ba2fe583a5e0778d084c1e7ae41eb7830ada5a8133dcd6ab62 WHIRLPOOL 6f733f7ffadde978be7b3cd1ffffd6e64b061e6dc1b742ec71de6ff44fcceb1404544fb85da80af538d5d86e51c736bc041172f0d63adbe9ce40ffd52c0c8337 -DIST phoronix-test-suite-8.2.0m2.tar.gz 855313 SHA256 0ab4fef495e9b28d3eca91bd216f6a9e3a281a66fa8fc966b12f0d46cefa0798 SHA512 ee8854478e5e4f162b97416ab3351d6eba703cca8bca7801ad99c9c0cea9975514b0085b0798a63ec7d7fa55ddb92063aab5ab5622f2d61fa5067e8afb54afb8 WHIRLPOOL bf674f53ed7ff63eaa97e6cbffe4b0b4b6dba41a9a774de7e30dce317f6a3e5e2c3d4bfd72394f5fbd0f92ff0488e3ed119d257c1227f92deda41b4700d53637 +DIST phoronix-test-suite-8.2.0.tar.gz 860755 SHA256 cb92231040fd09a98a97d6620bc98758774731372f8a41b58b85357c0449904c SHA512 2e225e9797d674e0c51e78f00d7d4ade48feff75dbe93723f7ba567deb59c9c05ed2dba7a3f9e9915672d8e3c4d4ea4b29456435db159d7011364339119a7bee WHIRLPOOL 44cbc7165f9c960b70d2ca3b62d9dd27106715cd3b7b91866417e8d1df83a5754e2e5a7cd3dcc039ac01fcba0e3d9a89c6cee7cd4d143df8721cbb41834f2486 EBUILD phoronix-test-suite-8.0.1.ebuild 4752 SHA256 97a1089c2639894a40f5eb6a2f17007b967d349109e7a5d302cded59109af313 SHA512 f73e75fdded8c5e178101282755e82372ea9d5f2c3ace3402175e9f925c33a05983790159041eaa5cefe76a3d8cf7c6ab0fad6bbf0bb61f168cab0f727067230 WHIRLPOOL 13d15de59fc0173aad69a3ed41443edccaea6a187e1329d946009e02706c19fa1f260c1295b278f20eb3dadcae7a562b16a28439c52e9ca6d14d622a63cccfb6 -EBUILD phoronix-test-suite-8.2.0_pre1.ebuild 4752 SHA256 97a1089c2639894a40f5eb6a2f17007b967d349109e7a5d302cded59109af313 SHA512 f73e75fdded8c5e178101282755e82372ea9d5f2c3ace3402175e9f925c33a05983790159041eaa5cefe76a3d8cf7c6ab0fad6bbf0bb61f168cab0f727067230 WHIRLPOOL 13d15de59fc0173aad69a3ed41443edccaea6a187e1329d946009e02706c19fa1f260c1295b278f20eb3dadcae7a562b16a28439c52e9ca6d14d622a63cccfb6 -EBUILD phoronix-test-suite-8.2.0_pre2.ebuild 4752 SHA256 97a1089c2639894a40f5eb6a2f17007b967d349109e7a5d302cded59109af313 SHA512 f73e75fdded8c5e178101282755e82372ea9d5f2c3ace3402175e9f925c33a05983790159041eaa5cefe76a3d8cf7c6ab0fad6bbf0bb61f168cab0f727067230 WHIRLPOOL 13d15de59fc0173aad69a3ed41443edccaea6a187e1329d946009e02706c19fa1f260c1295b278f20eb3dadcae7a562b16a28439c52e9ca6d14d622a63cccfb6 +EBUILD phoronix-test-suite-8.2.0.ebuild 4752 SHA256 97a1089c2639894a40f5eb6a2f17007b967d349109e7a5d302cded59109af313 SHA512 f73e75fdded8c5e178101282755e82372ea9d5f2c3ace3402175e9f925c33a05983790159041eaa5cefe76a3d8cf7c6ab0fad6bbf0bb61f168cab0f727067230 WHIRLPOOL 13d15de59fc0173aad69a3ed41443edccaea6a187e1329d946009e02706c19fa1f260c1295b278f20eb3dadcae7a562b16a28439c52e9ca6d14d622a63cccfb6 EBUILD phoronix-test-suite-9999.ebuild 4752 SHA256 97a1089c2639894a40f5eb6a2f17007b967d349109e7a5d302cded59109af313 SHA512 f73e75fdded8c5e178101282755e82372ea9d5f2c3ace3402175e9f925c33a05983790159041eaa5cefe76a3d8cf7c6ab0fad6bbf0bb61f168cab0f727067230 WHIRLPOOL 13d15de59fc0173aad69a3ed41443edccaea6a187e1329d946009e02706c19fa1f260c1295b278f20eb3dadcae7a562b16a28439c52e9ca6d14d622a63cccfb6 MISC metadata.xml 223 SHA256 0f3364e741283a6b78abfd2962065faa68555c3c167408bcf9e27008a3d0fef4 SHA512 258a180336834206986eed33d45839d4a6e399b2bf966401d1fd6ef22e64a2dcdd041e846d0c1daf82ff49da3fd23e77c88a0dcdad2167cd88fc9b16f8ea35e9 WHIRLPOOL f542bcf74e30afd065d99e78a7b632f26cd0582428736338e087f7928f08a4dd4f48d21f58a85edfc15b7cabb3f502b3a629a9526060cc21d2e65b9d529762be diff --git a/app-benchmarks/phoronix-test-suite/phoronix-test-suite-8.2.0_pre1.ebuild b/app-benchmarks/phoronix-test-suite/phoronix-test-suite-8.2.0.ebuild similarity index 100% rename from app-benchmarks/phoronix-test-suite/phoronix-test-suite-8.2.0_pre1.ebuild rename to app-benchmarks/phoronix-test-suite/phoronix-test-suite-8.2.0.ebuild diff --git a/app-benchmarks/phoronix-test-suite/phoronix-test-suite-8.2.0_pre2.ebuild b/app-benchmarks/phoronix-test-suite/phoronix-test-suite-8.2.0_pre2.ebuild deleted file mode 100644 index 94cd2fc2..00000000 --- a/app-benchmarks/phoronix-test-suite/phoronix-test-suite-8.2.0_pre2.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# shellcheck disable=SC2034 - -EAPI=7 - -inherit bash-completion-r1 xdg-utils-r1 - -DESCRIPTION="Phoronix's comprehensive, cross-platform testing and benchmark suite" -HOMEPAGE="http://www.phoronix-test-suite.com" -SRC_URI="" - -LICENSE="GPL-3" -SLOT="0" - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/${PN}/${PN}.git" - EGIT3_STORE_DIR="${T}" - inherit git-r3 - SRC_URI="" - KEYWORDS="" -else - major_version="$(ver_cut 1-3)" - minor_version="$(ver_cut 4-5)" - MY_PV="${major_version}" - MY_P="${PN}-${MY_PV}" - KEYWORDS="~amd64 ~x86" - if [ ! -z "${minor_version}" ]; then - MY_PV="${MY_PV}${minor_version/pre/m}" - MY_P="${MY_P}${minor_version/pre/m}" - fi - SRC_URI="https://github.com/phoronix-test-suite/${PN}/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz" - S="${WORKDIR}/${MY_P}" - unset -v minor_version major_version -fi - -IUSE="sdl" - -DEPEND="" -RDEPEND="${DEPEND} - app-arch/p7zip - media-libs/libpng - >=dev-lang/php-5.3:=[cli,curl,gd,json,posix,pcntl,sockets,truetype,zip] - www-servers/apache - x11-base/xorg-server - sdl? ( - media-libs/libsdl - media-libs/sdl-net - media-libs/sdl-image - media-libs/libsdl2 - media-libs/sdl2-net - media-libs/sdl2-image - media-libs/sdl2-mixer - - )" - -check_php_config() -{ - local slot - for slot in $(eselect --brief php list cli); do - local php_dir="/etc/php/cli-${slot}" - - if [[ -f "${EROOT%/}${php_dir}/php.ini" ]]; then - dodir "${php_dir}" - cp -f "${EROOT%/}${php_dir}/php.ini" "${ED%/}${php_dir}/php.ini" \ - || die "cp failed: copy php.ini file" - sed -i -e 's|^allow_url_fopen .*|allow_url_fopen = On|g' "${ED%/}${php_dir}/php.ini" \ - || die "sed failed: modify php.ini file" - elif [[ "$(eselect php show cli)" == "${slot}" ]]; then - ewarn "${slot} does not have a php.ini file." - ewarn "${PN} needs the 'allow_url_fopen' option set to \"On\"" - ewarn "for downloading to work properly." - ewarn - else - elog "${slot} does not have a php.ini file." - elog "${PN} may need the 'allow_url_fopen' option set to \"On\"" - elog "for downloading to work properly if you switch to ${slot}" - elog - fi - done -} - -get_optional_dependencies() -{ - (($# == 1)) || die "${FUNCNAME[0]}(): invalid number of arguments: ${#} (1)" - - local -a array_package_names - local field_value ifield package_generic_name optional_packages_xmlline package_names installable_packages="" - local package_close_regexp="" \ - package_generic_name_regexp="^.*|.*$" \ - package_names_regexp="^.*|.*$" - - line=0 - while IFS=$'\n' read -r optional_packages_xmlline; do - if [[ "${optional_packages_xmlline}" =~ ${package_generic_name_regexp} ]]; then - package_generic_name="$(echo "${optional_packages_xmlline}" | sed -r "s@${package_generic_name_regexp}@@g")" - elif [[ "${optional_packages_xmlline}" =~ ${package_names_regexp} ]]; then - package_names="$(echo "${optional_packages_xmlline}" | sed -r -e "s@${package_names_regexp}@@g" -e 's@(^[[:blank:]]+|[[:blank:]]+$)$@@g' )" - ifield=0 - # shellcheck disable=SC2206 - array_package_names=( ${package_names} ) - for (( ifield=0 ; ifield < ${#array_package_names[@]} ; ++ifield )); do - field_value="${array_package_names[ifield]}" - [[ ${field_value} =~ ^.+/.+$ ]] || continue # skip invalid package atoms - - if ! has_version "${field_value}"; then - installable_packages="${installable_packages}${installable_packages:+ }${field_value}" - fi - done - elif [[ "${optional_packages_xmlline}" =~ ${package_close_regexp} && ! -z "${installable_packages}" ]]; then - ewarn " ${package_generic_name}: ${installable_packages}" - installable_packages="" - fi - done <<< "${1}" -} - -src_prepare() { - # BASH completion helper function "have" test is depreciated - sed -i -e '/^have phoronix-test-suite &&$/d' "${S}/pts-core/static/bash_completion" \ - || die "sed failed: remove PTS bash completion have test" - # Remove all dependency resolving shell scripts - security vulnerability - rm -rf "${S}/pts-core/external-test-dependencies/scripts" - eapply_user -} - -src_install() { - # Store the contents of this file - since it will be installed / deleted before we need it. - GENTOO_OPTIONAL_PKGS_XML="$(cat "${S}/pts-core/external-test-dependencies/xml/gentoo-packages.xml")" - newbashcomp pts-core/static/bash_completion "${PN}" - DESTDIR="${D}" "${S}/install-sh" "${EPREFIX%/}/usr" - - # Fix the cli-php config for downloading to work. - check_php_config -} - -pkg_postinst() { - xdg_icon_cache_update - xdg_mimeinfo_database_update - - ewarn "${PN} has the following optional package dependencies:" - get_optional_dependencies "${GENTOO_OPTIONAL_PKGS_XML}" - unset -v GENTOO_OPTIONAL_PKGS_XML -}