summaryrefslogtreecommitdiff
path: root/sci-libs
diff options
context:
space:
mode:
Diffstat (limited to 'sci-libs')
-rw-r--r--sci-libs/Manifest.gzbin44805 -> 44816 bytes
-rw-r--r--sci-libs/libsc/Manifest1
-rw-r--r--sci-libs/libsc/files/libsc-9999-set_version.patch44
-rw-r--r--sci-libs/linux-gpib-modules/Manifest2
-rw-r--r--sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.5-r2.ebuild (renamed from sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.5-r1.ebuild)17
-rw-r--r--sci-libs/p4est/Manifest1
-rw-r--r--sci-libs/p4est/files/p4est-9999-set_version.patch44
7 files changed, 6 insertions, 103 deletions
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 332ab2669541..bfe77542e714 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
Binary files differ
diff --git a/sci-libs/libsc/Manifest b/sci-libs/libsc/Manifest
index 8a12140b556d..fdc90602a0f2 100644
--- a/sci-libs/libsc/Manifest
+++ b/sci-libs/libsc/Manifest
@@ -5,7 +5,6 @@ AUX libsc-2.8.5-fix_build_system.patch 696 BLAKE2B fee1ddbd18c2e7155d22e86280247
AUX libsc-2.8.5-fix_cmake_path.patch 918 BLAKE2B 0c9a2a228e204f7255ca74418d44903357186898fac65e45fdf49e4f25d3985e0f7e51a11d80f4f3baaca2d9b8a1524e09a3cc75f66ec0837151b04c34ec6ab2 SHA512 c40db6baa1e440fb6ce37e24471a25dcd0ae020481991924ef57c4e980734359107bcb1d858d29f15d8c8d4da8d67b353e309276ec1103332697c92cb3401aea
AUX libsc-2.8.5-set_version.patch 1794 BLAKE2B 6cdf62143d846cb40868916c2d11a290a5179f3ff2782ff60b381a2aa00ee12995762ab8b7847468776cadc062296b79b45c2c5ddb3bf49655511700186d2abc SHA512 eec7d0fb9daf4559e3ad70f1d3fc8fa422239886f293ed876552151cde8cd80d015f0672703131f28fb9009e7cfb0045b33c23abcfe477922a57c56f9d2abb2c
AUX libsc-2.8.5-use_zlib-ng_symbols.patch 5332 BLAKE2B 6fdd57182822985c23ac3d45ad8008553973ceb76ad285cc6302812765fe1d82d3454bed2268dd0e628a09d582f66e866511d109a898880423603264d3f40f60 SHA512 f58ad84abac25b5462a5bd1b64dcc79f1154b1971bf6ced6d59fdb0933380fa936c55262e449f3d7f9722c5b57c05a60949864e4f7373d1f86848734a58842e5
-AUX libsc-9999-set_version.patch 1517 BLAKE2B 64fecf32b07b37616ec6f80fbed0203df5a7291930aa246f35c3f4080cfc6bea0737e2caa63d85459e76d759fdab64713e01f9c2445e88c63cc1f1ab34616740 SHA512 e083574cdcfade51b9185617939ffb7e47b0cf415c215fee3452b9e5eb3234bf30ed2cc2217f5e019d00b21d98bc031974be06be2db3fad0806daed024d11845
DIST libsc-2.8.3.tar.gz 360755 BLAKE2B 2d7e3a16b97de551678ebb33f362e1ef7ebb0bcbf8d00b1a5317bfbf6732cf7bb9be2d215c79395809f3c616c23da5236c4f0f436a7b8bb07171141aaf08bbb3 SHA512 9def8850898f2d7d7a6ffaffd0872bc18af28026407356a1fe10f2b4f6d4a32ae6febe59c91cfa8817969624f995d48f64e0d5424b475e3a4c501338f4de70de
DIST libsc-2.8.5.tar.gz 401520 BLAKE2B 28f74c03dc9a6238c254683585e3a6e372718bbf147f1a1bfe051d9a9079491650eca645bb695ce4c36920dda459904be6f9d41fb53163952d9076302072e181 SHA512 d7854a77cb574531d410c978af5768782d6201c730a3248371a822172cb99fe0b2efc8c2e4f495160924fb867ed77ab1b9ac17a1db349d8a6495228698cf970b
EBUILD libsc-2.8.3.ebuild 1410 BLAKE2B f4654f5c21f62903c0a41e101acf83963972d3d4c243991c909930b8ea85bf601d5b879875bc736ece50bf0fc9ba15140de6cd960ac42532e3866b7c2cd3e388 SHA512 bc4edc505cbee1411027ea8869c8d4feab0006e8fb873cea02f9db59bb4a82f55c7d1391e4dca153e80e5292864120d7baa96f63c83290d0167492e43c381c33
diff --git a/sci-libs/libsc/files/libsc-9999-set_version.patch b/sci-libs/libsc/files/libsc-9999-set_version.patch
deleted file mode 100644
index 0820b001d8cd..000000000000
--- a/sci-libs/libsc/files/libsc-9999-set_version.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/cmake/git.cmake b/cmake/git.cmake
-index dd6009e..7c5c8f3 100644
---- a/cmake/git.cmake
-+++ b/cmake/git.cmake
-@@ -1,36 +1,3 @@
- # --- extract version from Git
-
--set(PROJECT_VERSION 0.0.0)
--find_program(GIT_VERSION_GEN NAMES git-version-gen
-- PATHS ${CMAKE_SOURCE_DIR}/build-aux NO_DEFAULT_PATH)
--if(GIT_VERSION_GEN)
-- execute_process(COMMAND ${GIT_VERSION_GEN} .tarball_version
-- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-- RESULT_VARIABLE _err
-- OUTPUT_VARIABLE git_version
-- OUTPUT_STRIP_TRAILING_WHITESPACE)
--endif()
--if(_err EQUAL 0)
-- if(git_version MATCHES
-- "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.].*")
-- set(_major "${CMAKE_MATCH_1}")
-- set(_minor "${CMAKE_MATCH_2}")
-- set(_patch "${CMAKE_MATCH_3}")
-- set(PROJECT_VERSION ${_major}.${_minor}.${_patch}.999)
-- elseif(git_version MATCHES
-- "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.](0|[1-9][0-9]*)")
-- set(_major "${CMAKE_MATCH_1}")
-- set(_minor "${CMAKE_MATCH_2}")
-- set(_patch "${CMAKE_MATCH_3}")
-- set(PROJECT_VERSION ${_major}.${_minor}.${_patch})
-- elseif(git_version MATCHES
-- "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)")
-- set(_major "${CMAKE_MATCH_1}")
-- set(_minor "${CMAKE_MATCH_2}")
-- set(PROJECT_VERSION ${_major}.${_minor})
-- elseif(git_version MATCHES
-- "^(0|[1-9][0-9]*)")
-- set(_major "${CMAKE_MATCH_1}")
-- set(PROJECT_VERSION ${_major})
-- endif()
--endif()
-+set(PROJECT_VERSION 9999.0.0)
-
-
diff --git a/sci-libs/linux-gpib-modules/Manifest b/sci-libs/linux-gpib-modules/Manifest
index 4ca64c97cb79..de8f7f690abf 100644
--- a/sci-libs/linux-gpib-modules/Manifest
+++ b/sci-libs/linux-gpib-modules/Manifest
@@ -1,5 +1,5 @@
AUX linux-gpib-modules-4.3.4-depmod.patch 744 BLAKE2B 6079d0523cafcd15e38a7e73e8a0d98e107220e6816bd7646c254044acaa1d39d19e983987dff70c249a67b7accbc74a836f8ddd9f39503cdd510edc2d6bdbc2 SHA512 417193e768b0b5bd41b053a86ebbab163a74662e7f2912c70ae76a873243fb218b24f0680699f9988d4e9097b8bbd8a23902d3f5652675f8a3dbb02915308f12
DIST linux-gpib-4.3.5.tar.gz 1462624 BLAKE2B fff30ed1a7abc18cd4317e8f8979ef4014a532baab8c014f9a2eaa3338a2e8e8b672214d3f2b3f44066be15f432861a3fe3d67652f6966e73e561d99ff1e1566 SHA512 018cc255922a6335f8d28418b0a0808c3a369506470d9c81432ac7183ae255217d938a419e10ba2b0c44205a9d901405ce00ad5bdd968db2721cedd83baa2f76
-EBUILD linux-gpib-modules-4.3.5-r1.ebuild 1319 BLAKE2B 50aed36b9483d368170c8a72b0a7f57a214ce78a1ef824afdf0e95fd348a96e1ce77deb3c4c4e6ff88efd3d946c3043e46ebd232ccb6e1974024b10688e5f48f SHA512 b35a42a2789bd2509700f0f7794f03203c9b218014ef618d078c49c96e1005c3b3c48874c2d4edee5d64b9ff968cf5dc78d35418e6f29911c8f04f01e8f641d7
+EBUILD linux-gpib-modules-4.3.5-r2.ebuild 1246 BLAKE2B 87b7e4ed0f83b7bb3e7959b2357eb28faf67575d43a835321575869d68d953b63e0b02e098689a65765aafdb57bca2b0ca4680180393e8f9013bd7666b204da5 SHA512 52ca8a6db7127ef9425c58db4001a2ef4933dbe52cf8fb448669af9f2156791eee150919595fdb84d3072d7e258c26d4165e3e4cf9d74e312728dbc53dc65bc9
EBUILD linux-gpib-modules-4.3.5.ebuild 1330 BLAKE2B f935eefab0bf6ce9c69eb71607552b90a3d164383c68f1474b2887f1f7548d710e4e243c079a8732bd3073bf42c3197dc312438bc0fe79b8f6a6a59105a23c12 SHA512 cfb97cf0bc1f573ae43183366aedfe3a182319b545b39b8534882036021c5d1291245df83c1b971aa9b47fd6906b3e1bd4bdae1c92e6174fb8a2a7aa2ba59249
MISC metadata.xml 481 BLAKE2B 5ee2924d1131f188c19c84bbfa8a3e2c6093387d15db5a0bc86ea14d4b0c0f36924df7525fb26f0b6660efe1a75f20e19afbd71270386795bd6af82bc5cd38f8 SHA512 dd41ed66cff7ad48e4a107f512e1121fb630f6487ef7872aeab219ff39d6cdb4b5dc14fa19c1b7931697c555702c2bd8bb8ec553b060c11581f02d8a46f76ef4
diff --git a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.5-r1.ebuild b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.5-r2.ebuild
index eae3c0404cb4..7be607ff4d47 100644
--- a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.5-r1.ebuild
+++ b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.5-r2.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/linux-gpib-kernel-${PV}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
IUSE="debug"
COMMONDEPEND=""
@@ -35,29 +35,22 @@ src_unpack() {
}
src_configure() {
- my_gpib_makeopts=''
- use debug && my_gpib_makeopts+='GPIB-DEBUG=1 '
-
- my_gpib_makeopts+="LINUX_SRCDIR=${KERNEL_DIR} "
+ MODULES_MAKEARGS+=( LINUX_SRCDIR="${KV_OUT_DIR}" )
+ use debug && MODULES_MAKEARGS+=( 'GPIB-DEBUG=1' )
}
src_compile() {
- set_arch_to_kernel
-
# The individual modules don't have separate targets so we can't use
# modlist here.
- emake \
- ${my_gpib_makeopts}
+ emake "${MODULES_MAKEARGS[@]}"
}
src_install() {
- set_arch_to_kernel
emake \
+ "${MODULES_MAKEARGS[@]}" \
DESTDIR="${ED}" \
INSTALL_MOD_PATH="${ED}" \
- DEPMOD="/bin/true" \
docdir="${ED}/usr/share/doc/${PF}/html" \
- ${my_gpib_makeopts} \
install
modules_post_process
diff --git a/sci-libs/p4est/Manifest b/sci-libs/p4est/Manifest
index d96c97a99e1c..856a8a967abe 100644
--- a/sci-libs/p4est/Manifest
+++ b/sci-libs/p4est/Manifest
@@ -3,7 +3,6 @@ AUX p4est-2.8-set_version.patch 2520 BLAKE2B fb3ac44167c9b9be7a38e85437792d41e37
AUX p4est-2.8.5-fix_build_system.patch 717 BLAKE2B 87d73e6a40c4d3c4a63f81310f8fed7580c26c42d4f6e104d83ccaa05e9cade306da0b7897ed5dbad1c559b79cbec0c23b950406bc4eebf81c88942e19e2757c SHA512 b425ee30cb1e6754f2139e72984152fe3ed5df71fce1ae5d8ae797b7edd292159f700a13c431ba57177132dbe297606594a0e29aa4df407f6275e517536c3124
AUX p4est-2.8.5-fix_cmake_path.patch 1293 BLAKE2B 223471b591415a89fb62f503802a25b2e53aa16201a4582908b1e1f65701eef6d425a7c775cd6bd3d45e420cead3d2caf00fefb56591593d6033005596458cfb SHA512 cd0368b729fb6118ab0f5b48e91657e6e4452e77271178700873c9e890a5678dda5059e4679fb2770b711f45a02c12a0edbce9c154ab6ab6f456829557d745fb
AUX p4est-2.8.5-set_version.patch 1794 BLAKE2B 6cdf62143d846cb40868916c2d11a290a5179f3ff2782ff60b381a2aa00ee12995762ab8b7847468776cadc062296b79b45c2c5ddb3bf49655511700186d2abc SHA512 eec7d0fb9daf4559e3ad70f1d3fc8fa422239886f293ed876552151cde8cd80d015f0672703131f28fb9009e7cfb0045b33c23abcfe477922a57c56f9d2abb2c
-AUX p4est-9999-set_version.patch 1517 BLAKE2B 64fecf32b07b37616ec6f80fbed0203df5a7291930aa246f35c3f4080cfc6bea0737e2caa63d85459e76d759fdab64713e01f9c2445e88c63cc1f1ab34616740 SHA512 e083574cdcfade51b9185617939ffb7e47b0cf415c215fee3452b9e5eb3234bf30ed2cc2217f5e019d00b21d98bc031974be06be2db3fad0806daed024d11845
DIST p4est-2.8.5.tar.gz 2721258 BLAKE2B 07fd70f5b7ce0d2dcdc0d913cd9ae7920272a0e459c7db7f9d180b592570a5232c7d2bd03547eec3333dcdc6fdc83adcce30c71eb9c44ab6e6b9b9a314707471 SHA512 22b5a9bbfb51e972f4b93a90f5fa0f9557770ccbe357044b5bb97b31d02783affef188cde38c86bb4ece31ba23ce47e4eb95a6e7c5f02d11549cf986e85f68a0
DIST p4est-2.8.tar.gz 2655761 BLAKE2B 0637045bca3525d5d737010865c06d1273c6ecf848ab5ca55d1f19156550b7d7676c4f8d7c7a71b1fc70381dc7912cdca1e5405bb0af948180f75da1a3b1f343 SHA512 599faad177ce21f917e4ddfd969d6ef8c1f08b1e701cbdb9d4a1aa6dfd927176468afe757d018b9b7ded6a9ce165cd6fe78e0688b22cf6b9975cbd85d6f45d3c
EBUILD p4est-2.8-r1.ebuild 1553 BLAKE2B 3878fef2d5366b4885f034e85cfc8102f8e8a6b510b5d58b3d078b789f15ab65561793030a652df60221a57a62eb1916b0ddc7c611ee5721c0aa659df48a68fe SHA512 7d53c94f06ded82962c371f348f40029dfea12208a47020cf1d88b2d1682d8ba2888d11899a51e8024b08da7fc53d5a2c8275f42541d085994842a8158f9cfa4
diff --git a/sci-libs/p4est/files/p4est-9999-set_version.patch b/sci-libs/p4est/files/p4est-9999-set_version.patch
deleted file mode 100644
index 0820b001d8cd..000000000000
--- a/sci-libs/p4est/files/p4est-9999-set_version.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/cmake/git.cmake b/cmake/git.cmake
-index dd6009e..7c5c8f3 100644
---- a/cmake/git.cmake
-+++ b/cmake/git.cmake
-@@ -1,36 +1,3 @@
- # --- extract version from Git
-
--set(PROJECT_VERSION 0.0.0)
--find_program(GIT_VERSION_GEN NAMES git-version-gen
-- PATHS ${CMAKE_SOURCE_DIR}/build-aux NO_DEFAULT_PATH)
--if(GIT_VERSION_GEN)
-- execute_process(COMMAND ${GIT_VERSION_GEN} .tarball_version
-- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-- RESULT_VARIABLE _err
-- OUTPUT_VARIABLE git_version
-- OUTPUT_STRIP_TRAILING_WHITESPACE)
--endif()
--if(_err EQUAL 0)
-- if(git_version MATCHES
-- "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.].*")
-- set(_major "${CMAKE_MATCH_1}")
-- set(_minor "${CMAKE_MATCH_2}")
-- set(_patch "${CMAKE_MATCH_3}")
-- set(PROJECT_VERSION ${_major}.${_minor}.${_patch}.999)
-- elseif(git_version MATCHES
-- "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.](0|[1-9][0-9]*)")
-- set(_major "${CMAKE_MATCH_1}")
-- set(_minor "${CMAKE_MATCH_2}")
-- set(_patch "${CMAKE_MATCH_3}")
-- set(PROJECT_VERSION ${_major}.${_minor}.${_patch})
-- elseif(git_version MATCHES
-- "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)")
-- set(_major "${CMAKE_MATCH_1}")
-- set(_minor "${CMAKE_MATCH_2}")
-- set(PROJECT_VERSION ${_major}.${_minor})
-- elseif(git_version MATCHES
-- "^(0|[1-9][0-9]*)")
-- set(_major "${CMAKE_MATCH_1}")
-- set(PROJECT_VERSION ${_major})
-- endif()
--endif()
-+set(PROJECT_VERSION 9999.0.0)
-
-