summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2019-12-26 12:19:20 +0100
committerMichał Górny <mgorny@gentoo.org>2019-12-26 12:27:17 +0100
commit578362671c70e996e2b1c31e9d086cb06477a9fb (patch)
tree353cb0ea3ac2ea03b1733f4b698bd6699c09d3e9 /dev-util/scons
parentdev-python/pygit2: Remove redundant version (diff)
downloadgentoo-578362671c70e996e2b1c31e9d086cb06477a9fb.tar.gz
gentoo-578362671c70e996e2b1c31e9d086cb06477a9fb.tar.bz2
gentoo-578362671c70e996e2b1c31e9d086cb06477a9fb.zip
dev-util/scons: Remove redundant versions
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'dev-util/scons')
-rw-r--r--dev-util/scons/Manifest8
-rw-r--r--dev-util/scons/files/scons-3.0.5-jdk-include-path.patch14
-rw-r--r--dev-util/scons/files/scons-3.0.5-jni.h-include-path.patch14
-rw-r--r--dev-util/scons/scons-3.0.5-r1.ebuild92
-rw-r--r--dev-util/scons/scons-3.0.5.ebuild75
-rw-r--r--dev-util/scons/scons-3.1.0.ebuild86
6 files changed, 0 insertions, 289 deletions
diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
index 19679d98eac8..5e209cb4ed40 100644
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -1,11 +1,3 @@
-DIST scons-3.0.5-user.html 1130793 BLAKE2B 24bf6d5d566fe3c06879b797a77df5eda738246ddf5631ee3f0f49c3c44a53916a8cd5bd075bcffa350e1b5c99f53f81f229d4f74bcc871572a02a0dfafefada SHA512 1b9c965fac6b792e049ad1975e104d40ff6b99fe4bd247aa375955daaebb46e2ed42afb8484dad652df71b695b7db2ee92df34dc0f1d3372d55fad0d27c4b78d
-DIST scons-3.0.5-user.pdf 2562305 BLAKE2B 48c206386f163a2779b27ede1b77783067a695e7f59255473343ddd3a19c4d39ceb7c7e5ccf819f76eda9282f5fb8d36bd0250a4a18f5e9d1a65fd3148276173 SHA512 443855ecddd1bc56f06b150da5d7b276a4dfe5ff8c5376b3c35b73f8281a89583308ddd138e120e33f67afa2cdd1b9a1366a533306ba4dfa460f439e4a2f33b4
-DIST scons-3.0.5.gh.tar.gz 5510846 BLAKE2B 64489a9335a9aa0e2b58a78c6bba613de41d7035f03e8b5b1c1db8aae92e54808f1bd5ad4e97b8481db0f5276c184040663ec31d7307c30a6b092c860c0bb1c0 SHA512 afd4e3d5a76c009f7a3f55934c2d479c611df5713fdaf60aaa9860fc685f95a314bbe54df92fcbca3570dc9a5b244dcf08bf63ce0cef837c3767a37628abae02
-DIST scons-3.0.5.tar.gz 655236 BLAKE2B 1ccd35e393b3307e0be830c2a5491712cba59fe476dfd9c461567288eb76a42e10ca1552ce7603facb66caf5c0b82583c563bd2342b9d7c68c8cabbd0317467b SHA512 0477038b014674049f12899b64584d44a85283d521b2422561e42020a5ae296a5af005684087c3ff410ed3fcbdcc5ff61998bc429eb29513f2a864138ffc4945
-DIST scons-3.1.0-user.html 1133694 BLAKE2B b7a208668db2303e873f5e7f09b9ad92d5197801a63ff392b086e0dbf1baa9c19d8208a6d9718aa7869e320d85cf3fcd5f24c5fe41dfded9f4a8d21d4bbb9b63 SHA512 731308886a660770aeb7b17020e99cbeb736a0bad8e138ff2363ea5297866445325daa4802ee051e0c01720aa73856163fb9da2fe5fb11077b9a2197e0c24323
-DIST scons-3.1.0-user.pdf 2564059 BLAKE2B 989469fd21e8989acf8e7ca2cf2c72dc584a3e708743e357fc2bd55173dbf64d9e2795706bc585975e8d86c754e1e44947feedf5156fb2b66c9f5402a9a015c6 SHA512 a92c4590a06ef2f4872e06db6d20bad333c5983b43d258574847d36976522888d6424781f43142b44abf4f8abc6f501b9894c476a9d1497b260d42efd48d8e8b
-DIST scons-3.1.0.gh.tar.gz 5528270 BLAKE2B d56d02f7d4550af8df42b5c5f8fda02a92ad6aedabb44e69bd46cb4ecf0f0de6b86a8f1ea65e9c4e5e57430f47c9ec7f354d366e60569b4c414bb15d4e52cc84 SHA512 3894d17bca02b9aa5426c70d894b8ecfcf3db2b20254b848209c31d8413a8cd1c2a7b2a87ef9bcfe5555980beb2815f62cdbe185098a64ae8b3506c41c867463
-DIST scons-3.1.0.tar.gz 661528 BLAKE2B deb3b8b4d22ec705674be3e2f84bb35b4726d5f7c082a341d2319d471a3302fc89bfdadc7545f0f4cc0c321c67301b364bdb5723a1d10374eee636b486197092 SHA512 b2d61e364bcff29027a7ba70e2a74186ab136b00f147ff358701aaf68f47134e18e24c2a9cb1ff9ec0fb4fb73ffa21e04043157f2b5cd975aca7fc91c69385ee
DIST scons-3.1.1-user.html 1134061 BLAKE2B de025ff73ecacec591c63b22bb3f934962a34fa16bec47a58972b97ba28f9a88254b419b4d2edeb2d920e70cf3e0c739df5357956c8586e5377afcd4125ba0a8 SHA512 bd00bcdcd01b192a42110ec65cdb906963af08f5bbc9d5e61624b5b5b1a667b115b099ce2ef71444a8998171a5544f4caecf3acec9715876d4e9e5baa581e60d
DIST scons-3.1.1-user.pdf 2564248 BLAKE2B 702e57a9646779ff1aa077aa7ae7a815d004cda08166f948ef3b893a786c7ccf13e9d1f8621640573802acd0b6a7acaaf68ebea984d5922112a30c4457740bc4 SHA512 0c0f8e93e3bddd9dc0ec661f629f2995ec9375908b3b7bf2b67c9518571cb31754d13fca46fc1182019976e5c0a417832447692ff61f5ee4613b7f56c7891594
DIST scons-3.1.1.gh.tar.gz 5528538 BLAKE2B cbb13a0ec9c5ade9b965592f012af5a3ab5253a3c30a049da499631ff58fc1201666209316d9fbcc8f0a715b194327f3cebe5a50fde01635fdb0304b8fbbb2f6 SHA512 3347a7ec5c6c7b596c0d51bb4a9654b971734736febe3834df0f40e7839e1f0578dafeae838d5ddd9f3319ac3d17b6790666fa1602c30480eba25122355179a5
diff --git a/dev-util/scons/files/scons-3.0.5-jdk-include-path.patch b/dev-util/scons/files/scons-3.0.5-jdk-include-path.patch
deleted file mode 100644
index 708447592fa8..000000000000
--- a/dev-util/scons/files/scons-3.0.5-jdk-include-path.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Nur old/scons-3.0.5/src/engine/SCons/Tool/JavaCommon.py new/scons-3.0.5/src/engine/SCons/Tool/JavaCommon.py
---- old/src/engine/SCons/Tool/JavaCommon.py 2019-03-27 02:16:32.000000000 +0300
-+++ new/src/engine/SCons/Tool/JavaCommon.py 2019-06-04 10:44:01.000000000 +0300
-@@ -403,7 +403,8 @@
- java_macos_version_include_dir = '/System/Library/Frameworks/JavaVM.framework/Versions/%s*/Headers/'
-
--java_linux_include_dirs = ['/usr/lib/jvm/default-java/include',
-- '/usr/lib/jvm/java-*/include']
-+java_linux_include_dirs = ['/usr/lib/jvm/*/include',
-+ '/opt/*jdk-bin-*/include',
-+ '/usr/lib*/openjdk-*/include']
- # Need to match path like below (from Centos 7)
- # /usr/lib/jvm/java-1.8.0-openjdk-1.8.0.191.b12-0.el7_5.x86_64/include/
- java_linux_version_include_dirs = ['/usr/lib/jvm/java-*-sun-%s*/include',
diff --git a/dev-util/scons/files/scons-3.0.5-jni.h-include-path.patch b/dev-util/scons/files/scons-3.0.5-jni.h-include-path.patch
deleted file mode 100644
index 818db02279af..000000000000
--- a/dev-util/scons/files/scons-3.0.5-jni.h-include-path.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Nur old/testing/framework/TestSCons.py new/testing/framework/TestSCons.py
---- old/testing/framework/TestSCons.py 2019-03-27 02:15:48.000000000 +0300
-+++ new/testing/framework/TestSCons.py 2019-06-07 16:13:48.000000000 +0300
-@@ -742,7 +742,8 @@
- version=''
- jni_dirs = ['/System/Library/Frameworks/JavaVM.framework/Headers/jni.h',
-- '/usr/lib/jvm/default-java/include/jni.h',
-- '/usr/lib/jvm/java-*-oracle/include/jni.h']
-+ '/usr/lib/jvm/*/include/jni.h',
-+ '/opt/*jdk-bin-*/include/jni.h',
-+ '/usr/lib*/openjdk-*/include/jni.h']
- else:
- jni_dirs = ['/System/Library/Frameworks/JavaVM.framework/Versions/%s*/Headers/jni.h'%version]
- jni_dirs.extend(['/usr/lib/jvm/java-*-sun-%s*/include/jni.h'%version,
diff --git a/dev-util/scons/scons-3.0.5-r1.ebuild b/dev-util/scons/scons-3.0.5-r1.ebuild
deleted file mode 100644
index b8f27f5dfd17..000000000000
--- a/dev-util/scons/scons-3.0.5-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Extensible Python-based build utility"
-HOMEPAGE="http://www.scons.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
- doc? (
- http://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
- http://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html
- )
- test? ( https://github.com/scons/scons/archive/${PV}.tar.gz -> ${P}.gh.tar.gz )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- test? (
- dev-libs/libxml2[${PYTHON_USEDEP}]
- dev-python/lxml[${PYTHON_USEDEP}]
- )
-"
-
-S=${WORKDIR}/${P}/src
-
-PATCHES=(
- # support env passthrough for Gentoo ebuilds
- "${FILESDIR}"/scons-3.0.1-env-passthrough.patch
- # respect CC, CXX, C*FLAGS, LDFLAGS by default
- "${FILESDIR}"/scons-3.0.3-respect-cc-etc-r1.patch
- # add Gentoo JDK include installation paths
- "${FILESDIR}"/scons-3.0.5-jdk-include-path.patch
-)
-
-src_unpack() {
- # use the git directory structure, but put pregenerated release
- # inside src/ subdirectory to make our life easier
- if use test; then
- unpack "${P}.gh.tar.gz"
- else
- mkdir -p "${P}"/src || die
- fi
-
- tar -C "${P}"/src --strip-components=1 -xzf "${DISTDIR}/${P}.tar.gz" || die
-}
-
-src_prepare() {
- # apply patches relatively to top directory
- cd "${WORKDIR}/${P}" || die
- distutils-r1_src_prepare
-
- # remove half-broken, useless custom commands
- # and fix manpage install location
- sed -i -e '/cmdclass/,/},$/d' \
- -e '/data_files/s:man/:share/man/:' "${S}"/setup.py || die
- if use test; then
- # addtional fix for Gentoo JDK installation paths to find include directory with jni.h
- eapply "${FILESDIR}"/scons-3.0.5-jni.h-include-path.patch
- fi
-}
-
-python_test() {
- # set variable from escons() of scons-util.eclass to make env-passthrough patch work within test env
- local -x GENTOO_SCONS_ENV_PASSTHROUGH=1
- # unset some env variables to pass appropriate tests
- unset AR AS ASFLAGS CC CXX CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
- cd "${WORKDIR}/${P}" || die
- "${EPYTHON}" runtest.py -a --passed \
- -j "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
- --builddir "${BUILD_DIR}/lib"
-
- # runtest.py script returns "0" if all tests are passed
- # and returns "2" if there are any tests with "no result"
- # (i.e. in case if some tools are not installed or it's Windows specific tests)
- [[ ${?} == [02] ]] || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
- local DOCS=( {CHANGES,README,RELEASE}.txt )
- distutils-r1_python_install_all
- rm "${ED%/}/usr/bin/scons.bat" || die
-
- use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
-}
diff --git a/dev-util/scons/scons-3.0.5.ebuild b/dev-util/scons/scons-3.0.5.ebuild
deleted file mode 100644
index 7f7185c37050..000000000000
--- a/dev-util/scons/scons-3.0.5.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Extensible Python-based build utility"
-HOMEPAGE="http://www.scons.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
- doc? (
- http://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
- http://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html
- )
- test? ( https://github.com/scons/scons/archive/${PV}.tar.gz -> ${P}.gh.tar.gz )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-# unresolved & unpredictable test failures
-RESTRICT="test"
-
-S=${WORKDIR}/${P}/src
-
-PATCHES=(
- # support env passthrough for Gentoo ebuilds
- "${FILESDIR}"/scons-3.0.1-env-passthrough.patch
- # respect CC, CXX, C*FLAGS, LDFLAGS by default
- "${FILESDIR}"/scons-3.0.3-respect-cc-etc-r1.patch
-)
-
-src_unpack() {
- # use the git directory structure, but put pregenerated release
- # inside src/ subdirectory to make our life easier
- if use test; then
- unpack "${P}.gh.tar.gz"
- rm -r "${P}/src" || die
- else
- mkdir "${P}" || die
- fi
-
- cd "${P}" || die
- unpack "${P}.tar.gz"
- mv "${P}" src || die
-}
-
-src_prepare() {
- # apply patches relatively to top directory
- cd "${WORKDIR}/${P}" || die
- distutils-r1_src_prepare
-
- # remove half-broken, useless custom commands
- # and fix manpage install location
- sed -i -e '/cmdclass/,/},$/d' \
- -e '/data_files/s:man/:share/man/:' "${S}"/setup.py || die
-}
-
-python_test() {
- cd "${WORKDIR}/${P}" || die
- "${EPYTHON}" runtest.py -as \
- -j "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
- --builddir "${BUILD_DIR}/lib" ||
- die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
- local DOCS=( {CHANGES,README,RELEASE}.txt )
- distutils-r1_python_install_all
- rm "${ED%/}/usr/bin/scons.bat" || die
-
- use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
-}
diff --git a/dev-util/scons/scons-3.1.0.ebuild b/dev-util/scons/scons-3.1.0.ebuild
deleted file mode 100644
index 363c4a06dd55..000000000000
--- a/dev-util/scons/scons-3.1.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Extensible Python-based build utility"
-HOMEPAGE="http://www.scons.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
- doc? (
- http://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
- http://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html
- )
- test? ( https://github.com/scons/scons/archive/${PV}.tar.gz -> ${P}.gh.tar.gz )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- test? (
- dev-libs/libxml2[${PYTHON_USEDEP}]
- dev-python/lxml[${PYTHON_USEDEP}]
- )
-"
-
-S=${WORKDIR}/${P}/src
-
-PATCHES=(
- # support env passthrough for Gentoo ebuilds
- "${FILESDIR}"/scons-3.0.1-env-passthrough.patch
- # respect CC, CXX, C*FLAGS, LDFLAGS by default
- "${FILESDIR}"/scons-3.0.3-respect-cc-etc-r1.patch
-)
-
-src_unpack() {
- # use the git directory structure, but put pregenerated release
- # inside src/ subdirectory to make our life easier
- if use test; then
- unpack "${P}.gh.tar.gz"
- else
- mkdir -p "${P}"/src || die
- fi
-
- tar -C "${P}"/src --strip-components=1 -xzf "${DISTDIR}/${P}.tar.gz" || die
-}
-
-src_prepare() {
- # apply patches relatively to top directory
- cd "${WORKDIR}/${P}" || die
- distutils-r1_src_prepare
-
- # remove half-broken, useless custom commands
- # and fix manpage install location
- sed -i -e '/cmdclass/,/},$/d' \
- -e '/data_files/s:man/:share/man/:' "${S}"/setup.py || die
-}
-
-python_test() {
- # set variable from escons() of scons-util.eclass to make env-passthrough patch work within test env
- local -x GENTOO_SCONS_ENV_PASSTHROUGH=1
- # unset some env variables to pass appropriate tests
- unset AR AS ASFLAGS CC CXX CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
- cd "${WORKDIR}/${P}" || die
- "${EPYTHON}" runtest.py -a --passed \
- -j "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
- --builddir "${BUILD_DIR}/lib"
-
- # runtest.py script returns "0" if all tests are passed
- # and returns "2" if there are any tests with "no result"
- # (i.e. in case if some tools are not installed or it's Windows specific tests)
- [[ ${?} == [02] ]] || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
- local DOCS=( {CHANGES,README,RELEASE}.txt )
- distutils-r1_python_install_all
- rm "${ED}/usr/bin/scons.bat" || die
-
- use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
-}