diff options
Diffstat (limited to 'sys-libs')
27 files changed, 654 insertions, 477 deletions
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz Binary files differindex 0bcf90f2731e..591193f234eb 100644 --- a/sys-libs/Manifest.gz +++ b/sys-libs/Manifest.gz diff --git a/sys-libs/e2fsprogs-libs/Manifest b/sys-libs/e2fsprogs-libs/Manifest index 411f48354dc0..db77da1d9ac7 100644 --- a/sys-libs/e2fsprogs-libs/Manifest +++ b/sys-libs/e2fsprogs-libs/Manifest @@ -3,7 +3,7 @@ DIST e2fsprogs-1.45.6.tar.xz 5572144 BLAKE2B 24a44d27a02a1fa178083d5ee6034b20fed DIST e2fsprogs-1.45.7.tar.xz 5570052 BLAKE2B 237ef068c3899641b5eb908cc302c8c6b454e337bce2de95fc96b9a078a003db0c44bd34391063cc2f30a95dcce57950fe900f59ae7d273786c657b7c190b341 SHA512 fcbd66af7b87f2bdec562ddd59c8c5fbd60f32fdd582a5c9d21cb6cfea642d2cdca57b6c29124309798528b2d9ceadf770928a6698f75dc88a47701286128763 DIST e2fsprogs-1.46.1.tar.xz 7019700 BLAKE2B 2356fcd206de14377a4625a8be2ff94cfd3fb2b911836a3da46499964fc5d7f2a6d03bf5818543d2ead34ac7cab36ef0e18885343d6814a0124b50ab7ea4bb69 SHA512 fe6aa55b62f183633872209cd69cf6be0753d5a430542a7c73dbbd428e5fa93b5df7efa7507bb60f9f90a1c61cb8f5cf10665675eea8bd72aad3d04dd2dae15c DIST e2fsprogs-1.46.2.tar.xz 7020552 BLAKE2B 0eda7428862c13dfd02308f0321d22c134679197bad5b247baa6f0ca386433db6749b97529709d43934afa73d8d0801379bb342456a0fd3dab7df01f5a90fd31 SHA512 5297a4d7bf944806d8ee77227eac596b5e5efed2c665561d40094c40b9f321616c60975a2716f1499a9f72243df6e3b6e2267b98ec1fdc1dfd646d7be887fc4d -EBUILD e2fsprogs-libs-1.45.6.ebuild 2161 BLAKE2B 6f7bcb58e36d06f3c0fcbe9ad5d0ed63be6b815fb7ad20ed1084f17b9c328ec7ec2672ece06812a97291d0018405f7070aa032d67892133a894e790d3eedb77d SHA512 c1cdcd01d6857317ede20b982d8db869b1c0348f7e0825ad32e498d92fcdaf2187d6482c0278c2d025b91eb1c5234d00e157fa589f2d3f9877970a7b091e87ec +EBUILD e2fsprogs-libs-1.45.6.ebuild 2160 BLAKE2B 05045fd69fc90c4206967059f6d2e288577682f0bc95f157fab766891d5a65daeece6e2091794becbda8b7d7f631927b5410b28948d92d640fb90de051e00394 SHA512 ea106e7c7879aa86f12c853445d6fdd18d969dabeff6da62d029b6bdeda78f89379305ef98b53fdcc2030d4b9b3584c5a36d91091e53752ab93b2cd8fa6a954a EBUILD e2fsprogs-libs-1.45.7.ebuild 2161 BLAKE2B 6f7bcb58e36d06f3c0fcbe9ad5d0ed63be6b815fb7ad20ed1084f17b9c328ec7ec2672ece06812a97291d0018405f7070aa032d67892133a894e790d3eedb77d SHA512 c1cdcd01d6857317ede20b982d8db869b1c0348f7e0825ad32e498d92fcdaf2187d6482c0278c2d025b91eb1c5234d00e157fa589f2d3f9877970a7b091e87ec EBUILD e2fsprogs-libs-1.46.1.ebuild 2169 BLAKE2B 314050d578df28da88a24adc53d8c4809316f3d63a31a35198c0f79a0d6d78895a0a498acce05538a4d227a7c650234acca683372132dfbcfc7fc4fcff423b9c SHA512 e2497549c127a030cfcba925022f90fd67ca5fe3e1ae92b705d9a43ac67f3c4a07c6d8f0a6f1248552db570ca53c1a48dd4c19a1cc4e822c6fca24088f6bc120 EBUILD e2fsprogs-libs-1.46.2.ebuild 2169 BLAKE2B 314050d578df28da88a24adc53d8c4809316f3d63a31a35198c0f79a0d6d78895a0a498acce05538a4d227a7c650234acca683372132dfbcfc7fc4fcff423b9c SHA512 e2497549c127a030cfcba925022f90fd67ca5fe3e1ae92b705d9a43ac67f3c4a07c6d8f0a6f1248552db570ca53c1a48dd4c19a1cc4e822c6fca24088f6bc120 diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.6.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.6.ebuild index 722e3a0df067..0112e42b9627 100644 --- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.6.ebuild +++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.6.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/$ LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" IUSE="static-libs" RDEPEND="!sys-libs/com_err diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest index c7aff8ff6893..217ba5a7c909 100644 --- a/sys-libs/glibc/Manifest +++ b/sys-libs/glibc/Manifest @@ -33,7 +33,7 @@ EBUILD glibc-2.25-r11.ebuild 6063 BLAKE2B a995a2553fad56abe09f0f890e2c70f9456867 EBUILD glibc-2.30-r9.ebuild 43285 BLAKE2B 45b8676a5705d4ef9318b058ce99cf2bb81c7443ddc4c140fdea76de03d5897e033f4faa2ebd7cab8ec72d890b3d0987bc2d9a7230ac0a0ef99a0c4aea747575 SHA512 2d5601c314a0a2d8d104bdbeb6d52cc44a49e10d4579e76d3217cd38478de78382f7a265d70fe0c5e1508cfd07838950e89e575b3537484903a8642b4c6cf3d4 EBUILD glibc-2.31-r7.ebuild 44403 BLAKE2B baf87ec423c82cea585c116918feba4004af01573f36f816c20027f87c023df00b522856ed7b962c2cd44db116bf068263bcbbc10895fbe20f314f46d148e6cc SHA512 fe7764927c3a9c547c8d35061450cbc9740eb6fa42a1a3996c46d74c07dcf4555b3f551b6e61b65749b2fa84c0650d1af0704fd8a6e7abde2266f86d9144c252 EBUILD glibc-2.32-r6.ebuild 44731 BLAKE2B e56042edac080216524a950684834af6b1f41ae12bb8085adced31dfe8a83e6246a06aff0fe4eb27b1bf82cd2188a3e41a576f8a83a75da91a9a1f93f9867ff4 SHA512 a17953c22b97d7f45d3c19359cf2eedaeb0df87fbf284dfb8cec8b3ee556247c3717e34ad9557e318c7aac2332b7dfbf9c4adae7c987342e75cee03c0fc7cd4f -EBUILD glibc-2.32-r7.ebuild 44737 BLAKE2B b41f035dbd0f4f7c2af31510a24885b5a08e40d3b08d5d7495ff1cb5e1185aa527bc9a442bcf574ae338dd76c9219bcd24e5762a4e73ab01cbed018f4ddca3ad SHA512 03c79a00d88edc9e2e93ae6cf37b8d92297f3be8b9682c7a4daf030285cdc250aec1aa3099cd3f3c92e8e3c7dc632f9ade4e20af35ffbcc72b40bfd61e2b121d +EBUILD glibc-2.32-r7.ebuild 44736 BLAKE2B efbfc6d30383c97b30cbc042fc8b3e3c4dea2d8492dff8241d2f98fa69edcf317c0280c068d72eba3bce9312fbeae9387a9d2d35ff045a1a1d1cb418ab8bbc2c SHA512 1c5d8b1931f380d8ce63ecb4e3d72cd7ff24ff96453c18998554c16f6ab4bdf9b2836e42be70e7116a35df5379206dc681b2fd7cb1cfe80a73ccfe3048abc67b EBUILD glibc-2.32-r8.ebuild 44743 BLAKE2B 2f16601b7df47c5569d6d22dc1644a57362dd46869b03e3388ead2c8d8d42ee98f93eb1c616037651008279772d8f935064e48ad56321f9d5a625d5012516326 SHA512 f9e35074c7c1300d3b2fb88785610f198b87aa8555a1c00a04dbbf388e3edbfba6202f1e4d25b57869efa299b78cf5fddb9fa9cbd510b09ab632c1afa1a1e181 EBUILD glibc-2.33.ebuild 44373 BLAKE2B 534c11b9648dd476472bbf4def577fae1748c0515e817fc1cef4dc385c11435422354426a91e96f522281d3a5cb47053049c5bd9081c91c71097908af44fedf0 SHA512 fcfcbe527d36ef18652df025620fe9165cec23b0e3f06154b932ccbdfb2528ef360f1e2dfe8369f992f56d2d97f9bf2104efb79a48ef5b457c26fd4b1a1c978e EBUILD glibc-9999.ebuild 44371 BLAKE2B dd6431480e03393e00d5e53aaa82fe335a2df2d9dd5ddd4b043f60ff4da08588073fbd450ff67bb3bd7ded3a37c81e0cf59145f8f351a06ae8240580efafb2e7 SHA512 6dcbf0fbbf654d9cfefef384531bc5c378589952c1472b88b1e9a37ee89ef9f386f5f7aabdaa252f3c5551e6df2ca920daca56348043676f32c9e8464848f189 diff --git a/sys-libs/glibc/glibc-2.32-r7.ebuild b/sys-libs/glibc/glibc-2.32-r7.ebuild index 60f158334e6d..2ead5dd7c01d 100644 --- a/sys-libs/glibc/glibc-2.32-r7.ebuild +++ b/sys-libs/glibc/glibc-2.32-r7.ebuild @@ -23,7 +23,7 @@ PATCH_DEV=dilfridge if [[ ${PV} == 9999* ]]; then inherit git-r3 else - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 sparc x86" SRC_URI="mirror://gnu/glibc/${P}.tar.xz" SRC_URI+=" https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz" SRC_URI+=" riscv? ( https://dev.gentoo.org/~dilfridge/distfiles/backport-rv32.txz )" diff --git a/sys-libs/ldb/Manifest b/sys-libs/ldb/Manifest index 7b839951267b..fa81332ba077 100644 --- a/sys-libs/ldb/Manifest +++ b/sys-libs/ldb/Manifest @@ -1,7 +1,13 @@ AUX ldb-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch 701 BLAKE2B dd2398f9e1fa39bfc3de89928dd3b935fd6ee9db4bc2c4e381ba5672098ae9209b2d6e475fa2549a9cef2e3ce5e9a789557413fbdb1bbd68842cca89ce1e8094 SHA512 35ba295d94ab5ce767f39c4cd5eb48d57a6e4993977013ee6ae0d640f74b5437a4dff6f1d14dc44dbcdc25d4e51e5084b0e3216353b2af383d8f544993228170 AUX ldb-1.5.2-optional_packages.patch 1441 BLAKE2B 0b9413cd9690aae2b2eb26f097d2509c0bbe0fc59f81bab22add57ffe0c603a8fb0c9be038d06693dcbb1d3817d4ad97a5931120b18bd9783efaac599fe0ccbc SHA512 2f313c3377385279ca3da6db21d926df0559d971e1fd42f8cce57b4001078c3817f472b85088a1f3b0e5ddcdfbbfd943199485d6e4a00412f62c883c6ea04afd DIST ldb-2.1.4.tar.gz 1673335 BLAKE2B 581ea127715d82d849f78c11fc66eb278e45f6c9ff9b379d5a3cfaa8c9c424004614a5a9c2120710d23feb1252294e2abd4983158a2a46e5d70180ad3c765dbd SHA512 7e0eecccc973881dde2390568dc71a2ffe7c7ed894daaa9cadf80c221e1b969fd9a8729f3c48a0f611a64b2941c295a2bc7bd8ba869881ba14f75b8bf331167e +DIST ldb-2.1.5.tar.gz 1675898 BLAKE2B 0097a7437a96e4daa04fc77f574e6b27150e83be10db903a1f48d41ffde9c83b0712a5487e0f61644aedabb3d9ee7b4290ea0d56a402cdfa6692597154543e24 SHA512 4f75c7b952713f8f78d06fd9b3e4920bfa3c4f95630f608517b7528e77dcc13ddabcfcf3ca4221be8418209a83b094583f5c374ff74f36a48676a3d4bef67817 DIST ldb-2.2.0.tar.gz 1676551 BLAKE2B 1ad84372b024e1ed680a09d215324027c9a37883204c2e69bb39d28a280cba639a4a46ec12b12d89f291f5505f55849eee880345412c6d95d9b6d6e9c00a4fd9 SHA512 3814078a51d2110eeda291ac859c0027df88475812bd6b5f2ce8f8f50aba9c84faced97c37aa1f45e406783a8df97c60ae778df897bb0e89ba3ac8568acced69 +DIST ldb-2.2.1.tar.gz 1676819 BLAKE2B 794575d5bd7d33dcd586cb5de6c392411795c467f472f517d5182a2559698a5489e703c8360baf2d0b1bff080c943a403a666d0ef7a9a180ae90052055966f40 SHA512 a2b1598869e3d9f17c5b82fc2b7289f1f08a7378a1d72609af5ed5cc91fb571ac67d3a8c22d64dad5dcc9fe32520baccd5cc37d5b4fc5f1b00a7064902296344 +DIST ldb-2.3.0.tar.gz 1686378 BLAKE2B b31949e14a41f6fc99ef022e4072021d135037d835aeca80ee81a58ed20cab4f8cbd96e394f59460df11e2424e2e263d5fb01b9cebbfb4ca1bcc77162e93ed3f SHA512 7e389c0b4700a809893276d69216436ebd6d30e1f52407e4a08a1113cf14e151aed74300d8c36765c91c8f3195d8054b13a28cbdfcab031f88fd1d353e415348 EBUILD ldb-2.1.4-r1.ebuild 2817 BLAKE2B 0f54f80ad5ee3321d3a900e0ce7b38b8664a7f43d038d896d895653abd33385ac5803b91b8e2aa42afc947ac7b34026879193971c9eea23aca0079df3627980f SHA512 392f9878fd99545af347fac85c7ccd56960266540ee34c78989e05aa05cf0d5de4323d70d0d50b436e105538bf9507dfff40ae17e15df64f18e71d587ab74be7 +EBUILD ldb-2.1.5.ebuild 2940 BLAKE2B 95223849edbd590115dde104ba1f237eaeba527f6648aef0add71ab1ff8560ec43cfcbfda4440ead268fc3e737aece49e6ff0ced11961fab9e1f5c1e7640bcbb SHA512 db18d07a5c506fdb14c388144c58c2bb4cc599a19a4f4f1e5b944a0406134c3ccbf4340aa91f982d5158910d42c294999a1c03cb5e67a9bd7794416733ab75d2 EBUILD ldb-2.2.0-r2.ebuild 2940 BLAKE2B 95223849edbd590115dde104ba1f237eaeba527f6648aef0add71ab1ff8560ec43cfcbfda4440ead268fc3e737aece49e6ff0ced11961fab9e1f5c1e7640bcbb SHA512 db18d07a5c506fdb14c388144c58c2bb4cc599a19a4f4f1e5b944a0406134c3ccbf4340aa91f982d5158910d42c294999a1c03cb5e67a9bd7794416733ab75d2 +EBUILD ldb-2.2.1.ebuild 2940 BLAKE2B 95223849edbd590115dde104ba1f237eaeba527f6648aef0add71ab1ff8560ec43cfcbfda4440ead268fc3e737aece49e6ff0ced11961fab9e1f5c1e7640bcbb SHA512 db18d07a5c506fdb14c388144c58c2bb4cc599a19a4f4f1e5b944a0406134c3ccbf4340aa91f982d5158910d42c294999a1c03cb5e67a9bd7794416733ab75d2 +EBUILD ldb-2.3.0.ebuild 2940 BLAKE2B 95223849edbd590115dde104ba1f237eaeba527f6648aef0add71ab1ff8560ec43cfcbfda4440ead268fc3e737aece49e6ff0ced11961fab9e1f5c1e7640bcbb SHA512 db18d07a5c506fdb14c388144c58c2bb4cc599a19a4f4f1e5b944a0406134c3ccbf4340aa91f982d5158910d42c294999a1c03cb5e67a9bd7794416733ab75d2 MISC metadata.xml 525 BLAKE2B 161146886c9d4b7139238e5753f02bbbd3eb4aa6c59415f45710c11b25e80d6e4085036e00808b38d06b671dc976922dacbab9ef3f4f18ed9793d5b5621ff546 SHA512 87a8414b97c3f08fed9395574f7be7739c845c593c2fa324e6928758e455e2ee9d45c2607dba298da2c1e21863878c147e613f6fc3750111952b7e7a7b7ada95 diff --git a/sys-libs/ldb/ldb-2.1.5.ebuild b/sys-libs/ldb/ldb-2.1.5.ebuild new file mode 100644 index 000000000000..c36e5d65316e --- /dev/null +++ b/sys-libs/ldb/ldb-2.1.5.ebuild @@ -0,0 +1,118 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_REQ_USE="threads(+)" +inherit python-single-r1 waf-utils multilib-minimal + +DESCRIPTION="LDAP-like embedded database" +HOMEPAGE="https://ldb.samba.org" +SRC_URI="https://samba.org/ftp/pub/${PN}/${P}.tar.gz" + +LICENSE="LGPL-3" +SLOT="0/${PV}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" +IUSE="doc +ldap +lmdb python test" + +REQUIRED_USE="${PYTHON_REQUIRED_USE} + test? ( python )" + +RESTRICT="!test? ( test )" + +RDEPEND=" + !elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] ) + dev-libs/popt[${MULTILIB_USEDEP}] + >=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}] + >=sys-libs/talloc-2.3.1[${MULTILIB_USEDEP}] + >=sys-libs/tdb-1.4.3[${MULTILIB_USEDEP}] + >=sys-libs/tevent-0.10.2[${MULTILIB_USEDEP}] + ldap? ( net-nds/openldap ) + lmdb? ( >=dev-db/lmdb-0.9.16[${MULTILIB_USEDEP}] ) + python? ( + ${PYTHON_DEPS} + sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}] + sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}] + sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}] + ) +" +DEPEND="${RDEPEND}" +BDEPEND="${PYTHON_DEPS} + dev-libs/libxslt + virtual/pkgconfig + doc? ( app-doc/doxygen ) +" + +WAF_BINARY="${S}/buildtools/bin/waf" + +MULTILIB_WRAPPED_HEADERS=( /usr/include/pyldb.h ) + +PATCHES=( + "${FILESDIR}"/${PN}-1.5.2-optional_packages.patch + "${FILESDIR}"/${PN}-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch +) + +pkg_setup() { + # Package fails to build with distcc + export DISTCC_DISABLE=1 + + # waf requires a python interpreter + python-single-r1_pkg_setup +} + +src_prepare() { + default + multilib_copy_sources +} + +multilib_src_configure() { + local myconf=( + $(usex ldap '' --disable-ldap) + $(usex lmdb '' --without-ldb-lmdb) + --disable-rpath + --disable-rpath-install --bundled-libraries=NONE + --with-modulesdir="${EPREFIX}"/usr/$(get_libdir)/samba + --builtin-libraries=NONE + ) + if ! multilib_is_native_abi; then + myconf+=( --disable-python ) + else + use python || myconf+=( --disable-python ) + fi + waf-utils_src_configure "${myconf[@]}" +} + +multilib_src_compile() { + waf-utils_src_compile + multilib_is_native_abi && use doc && doxygen Doxyfile +} + +multilib_src_test() { + if multilib_is_native_abi; then + WAF_MAKE=1 \ + PATH=buildtools/bin:../../../buildtools/bin:$PATH:"${BUILD_DIR}"/bin/shared/private/ \ + LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"${BUILD_DIR}"/bin/shared/private/:"${BUILD_DIR}"/bin/shared \ + waf test || die + fi +} + +multilib_src_install() { + waf-utils_src_install + + if multilib_is_native_abi && use doc; then + doman apidocs/man/man3/*.3 + docinto html + dodoc -r apidocs/html/. + fi + + use python && python_optimize #726454 +} + +pkg_postinst() { + if has_version sys-auth/sssd; then + ewarn "You have sssd installed. It is known to break after ldb upgrades," + ewarn "so please try to rebuild it before reporting bugs." + ewarn "See https://bugs.gentoo.org/404281" + fi +} diff --git a/sys-libs/ldb/ldb-2.2.1.ebuild b/sys-libs/ldb/ldb-2.2.1.ebuild new file mode 100644 index 000000000000..c36e5d65316e --- /dev/null +++ b/sys-libs/ldb/ldb-2.2.1.ebuild @@ -0,0 +1,118 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_REQ_USE="threads(+)" +inherit python-single-r1 waf-utils multilib-minimal + +DESCRIPTION="LDAP-like embedded database" +HOMEPAGE="https://ldb.samba.org" +SRC_URI="https://samba.org/ftp/pub/${PN}/${P}.tar.gz" + +LICENSE="LGPL-3" +SLOT="0/${PV}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" +IUSE="doc +ldap +lmdb python test" + +REQUIRED_USE="${PYTHON_REQUIRED_USE} + test? ( python )" + +RESTRICT="!test? ( test )" + +RDEPEND=" + !elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] ) + dev-libs/popt[${MULTILIB_USEDEP}] + >=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}] + >=sys-libs/talloc-2.3.1[${MULTILIB_USEDEP}] + >=sys-libs/tdb-1.4.3[${MULTILIB_USEDEP}] + >=sys-libs/tevent-0.10.2[${MULTILIB_USEDEP}] + ldap? ( net-nds/openldap ) + lmdb? ( >=dev-db/lmdb-0.9.16[${MULTILIB_USEDEP}] ) + python? ( + ${PYTHON_DEPS} + sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}] + sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}] + sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}] + ) +" +DEPEND="${RDEPEND}" +BDEPEND="${PYTHON_DEPS} + dev-libs/libxslt + virtual/pkgconfig + doc? ( app-doc/doxygen ) +" + +WAF_BINARY="${S}/buildtools/bin/waf" + +MULTILIB_WRAPPED_HEADERS=( /usr/include/pyldb.h ) + +PATCHES=( + "${FILESDIR}"/${PN}-1.5.2-optional_packages.patch + "${FILESDIR}"/${PN}-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch +) + +pkg_setup() { + # Package fails to build with distcc + export DISTCC_DISABLE=1 + + # waf requires a python interpreter + python-single-r1_pkg_setup +} + +src_prepare() { + default + multilib_copy_sources +} + +multilib_src_configure() { + local myconf=( + $(usex ldap '' --disable-ldap) + $(usex lmdb '' --without-ldb-lmdb) + --disable-rpath + --disable-rpath-install --bundled-libraries=NONE + --with-modulesdir="${EPREFIX}"/usr/$(get_libdir)/samba + --builtin-libraries=NONE + ) + if ! multilib_is_native_abi; then + myconf+=( --disable-python ) + else + use python || myconf+=( --disable-python ) + fi + waf-utils_src_configure "${myconf[@]}" +} + +multilib_src_compile() { + waf-utils_src_compile + multilib_is_native_abi && use doc && doxygen Doxyfile +} + +multilib_src_test() { + if multilib_is_native_abi; then + WAF_MAKE=1 \ + PATH=buildtools/bin:../../../buildtools/bin:$PATH:"${BUILD_DIR}"/bin/shared/private/ \ + LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"${BUILD_DIR}"/bin/shared/private/:"${BUILD_DIR}"/bin/shared \ + waf test || die + fi +} + +multilib_src_install() { + waf-utils_src_install + + if multilib_is_native_abi && use doc; then + doman apidocs/man/man3/*.3 + docinto html + dodoc -r apidocs/html/. + fi + + use python && python_optimize #726454 +} + +pkg_postinst() { + if has_version sys-auth/sssd; then + ewarn "You have sssd installed. It is known to break after ldb upgrades," + ewarn "so please try to rebuild it before reporting bugs." + ewarn "See https://bugs.gentoo.org/404281" + fi +} diff --git a/sys-libs/ldb/ldb-2.3.0.ebuild b/sys-libs/ldb/ldb-2.3.0.ebuild new file mode 100644 index 000000000000..c36e5d65316e --- /dev/null +++ b/sys-libs/ldb/ldb-2.3.0.ebuild @@ -0,0 +1,118 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_REQ_USE="threads(+)" +inherit python-single-r1 waf-utils multilib-minimal + +DESCRIPTION="LDAP-like embedded database" +HOMEPAGE="https://ldb.samba.org" +SRC_URI="https://samba.org/ftp/pub/${PN}/${P}.tar.gz" + +LICENSE="LGPL-3" +SLOT="0/${PV}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" +IUSE="doc +ldap +lmdb python test" + +REQUIRED_USE="${PYTHON_REQUIRED_USE} + test? ( python )" + +RESTRICT="!test? ( test )" + +RDEPEND=" + !elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] ) + dev-libs/popt[${MULTILIB_USEDEP}] + >=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}] + >=sys-libs/talloc-2.3.1[${MULTILIB_USEDEP}] + >=sys-libs/tdb-1.4.3[${MULTILIB_USEDEP}] + >=sys-libs/tevent-0.10.2[${MULTILIB_USEDEP}] + ldap? ( net-nds/openldap ) + lmdb? ( >=dev-db/lmdb-0.9.16[${MULTILIB_USEDEP}] ) + python? ( + ${PYTHON_DEPS} + sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}] + sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}] + sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}] + ) +" +DEPEND="${RDEPEND}" +BDEPEND="${PYTHON_DEPS} + dev-libs/libxslt + virtual/pkgconfig + doc? ( app-doc/doxygen ) +" + +WAF_BINARY="${S}/buildtools/bin/waf" + +MULTILIB_WRAPPED_HEADERS=( /usr/include/pyldb.h ) + +PATCHES=( + "${FILESDIR}"/${PN}-1.5.2-optional_packages.patch + "${FILESDIR}"/${PN}-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch +) + +pkg_setup() { + # Package fails to build with distcc + export DISTCC_DISABLE=1 + + # waf requires a python interpreter + python-single-r1_pkg_setup +} + +src_prepare() { + default + multilib_copy_sources +} + +multilib_src_configure() { + local myconf=( + $(usex ldap '' --disable-ldap) + $(usex lmdb '' --without-ldb-lmdb) + --disable-rpath + --disable-rpath-install --bundled-libraries=NONE + --with-modulesdir="${EPREFIX}"/usr/$(get_libdir)/samba + --builtin-libraries=NONE + ) + if ! multilib_is_native_abi; then + myconf+=( --disable-python ) + else + use python || myconf+=( --disable-python ) + fi + waf-utils_src_configure "${myconf[@]}" +} + +multilib_src_compile() { + waf-utils_src_compile + multilib_is_native_abi && use doc && doxygen Doxyfile +} + +multilib_src_test() { + if multilib_is_native_abi; then + WAF_MAKE=1 \ + PATH=buildtools/bin:../../../buildtools/bin:$PATH:"${BUILD_DIR}"/bin/shared/private/ \ + LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"${BUILD_DIR}"/bin/shared/private/:"${BUILD_DIR}"/bin/shared \ + waf test || die + fi +} + +multilib_src_install() { + waf-utils_src_install + + if multilib_is_native_abi && use doc; then + doman apidocs/man/man3/*.3 + docinto html + dodoc -r apidocs/html/. + fi + + use python && python_optimize #726454 +} + +pkg_postinst() { + if has_version sys-auth/sssd; then + ewarn "You have sssd installed. It is known to break after ldb upgrades," + ewarn "so please try to rebuild it before reporting bugs." + ewarn "See https://bugs.gentoo.org/404281" + fi +} diff --git a/sys-libs/libcap/Manifest b/sys-libs/libcap/Manifest index e2b6402523e4..1def6435f5e6 100644 --- a/sys-libs/libcap/Manifest +++ b/sys-libs/libcap/Manifest @@ -2,7 +2,6 @@ AUX libcap-2.21-include.patch 218 BLAKE2B 536be33e749bc818efb29e3a7a010029025520 AUX libcap-2.25-ignore-RAISE_SETFCAP-install-failures.patch 988 BLAKE2B 63417032b843ff7cb704c9880cfca4db5083d05d479c71dd12925d729f22a4900c2ae277a20399d58830eaca969842d587a2ae0a646809d6b659a75d13678312 SHA512 ba573ce68858c1370f3d25ad03678a534e6f3052076694d09e795d1febf2f3d76a6a170658b71d9e31105521fd5d22dd72095585a5402286dba424937064b389 AUX libcap-2.38-no_perl.patch 3049 BLAKE2B 77fdcda75b273fd69695161d48f37fda40375f5f36acdb31e9f9e5b7585e6933733586c6ad96673efb79a6657dbbffd4431612ed723905e9f4d595a9dd8c49c4 SHA512 f3938a8a78407639bfdda4d9c4b4096025f956430f9efbce438689aabbea74915c55c6afbd45a7af4ecc0c437ee72e9aa8335da52d3237c928702e62824e537a AUX libcap-2.42-build-system-fixes.patch 6518 BLAKE2B 138347d98901a0a41c36a3f3e1ff7c539836ba00e0cb1c80005d1e261c35f822bee51a4ca86be324f84b29fc6362e9b891ef105b2142f22be4e8896731b3ee16 SHA512 fbe8fe06ab3650b3247811b04b4afa1d56fc641de0b90c448b99904816b7d4e02d30c5dc54cd038d57c16f828a671c73f3c176e1e5826e6b9c69e2d3085015ff -AUX libcap-2.45-build-system-fixes.patch 6618 BLAKE2B 0f18fbf2ba66b0b6131b4f1b9df1005ddeccda31ace7085104531cf57c09d7d2f7ed1aea489f9ef6f2d9701c80acae94265a08aa25951fc6fa95820d0441f789 SHA512 738090eaba52eed82bb8cbf1f3a9a440a1b2e409e875965f8499e78047faad21476e9be42e3707f968e3b5d633b0581b27e09f101b0e4de26abeaf58c7b45e33 AUX libcap-2.48-build-system-fixes.patch 6274 BLAKE2B 4c81eb50b0a682ca9df03145a53e884589e0961e1b754b522f40d48fca60fe983ae93349d256e62977bf28c99c8c25763d05aa8483aebfc436664756a220d70a SHA512 5b88a5c5ea14d2270ed4018249ceb32b0c91db03ed18a6989cc44250da91887385dc3f37087f716771ddbaa90c7e3d733a64063507465eb354252d9f64b85f80 DIST libcap-2.43.tar.xz 125284 BLAKE2B bde36f8397f4adb74760eb403daa06bee1b8f45ddc253cc3c3ef1f6e95d0e4c76d0f2e6fa3335a8bc451f18ac7128c96230f6aba9ae0320fa4f9d669e7b4f715 SHA512 817add571fb2c54ad2a39974e6545b8fc8d855ecdcf2e00b2cc10e583802c49dfea2d8bca484c89ecd574fdacfc46565b51e3064a4407cf1985defb913240d45 DIST libcap-2.48.tar.xz 132280 BLAKE2B 43ab75b73a5297ec24467fae82378f8c7aba5356afcebfb32a695d664a4b5268526fd90a009596c0f516a626d8f4523a9b49ec3225b6a886da32e62eb5b55ea5 SHA512 3cb1e2b026c0f60d6f225c7255944d45023e59fd065b8f832739fc90d33b3347981675de12dd705c4ecbd647a494a17daf39e1d92599bcd1a83306886edadba1 diff --git a/sys-libs/libcap/files/libcap-2.45-build-system-fixes.patch b/sys-libs/libcap/files/libcap-2.45-build-system-fixes.patch deleted file mode 100644 index 4b22ed096e18..000000000000 --- a/sys-libs/libcap/files/libcap-2.45-build-system-fixes.patch +++ /dev/null @@ -1,207 +0,0 @@ -From 4e74abfe7309302b4aa6c90f9e54647cb5e0146d Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Wed, 4 Nov 2020 22:46:20 +0100 -Subject: [PATCH] build system fixes - -This touches up the homebrewed build system to work much better "out of the -box" for people. Specifically: - - allow toolchain vars to be set via environment - - CC / BUILD_CC / AR / RANLIB - - CFLAGS / CPPFLAGS / LDFLAGS - - split CPPFLAGS out of CFLAGS - - break -fPIC out of global CFLAGS and only use where needed - - use LDLIBS for libraries, not LDFLAGS - -Signed-off-by: Mike Frysinger <vapier@gentoo.org> - -Forward ported from libcap-2.24 to libcap-2.25 -Forward ported from libcap-2.25 to libcap-2.28 -Forward ported from libcap-2.28 to libcap-2.29 -Forward ported from libcap-2.29 to libcap-2.33 -Forward ported from libcap-2.33 to libcap-2.34 -Forward ported from libcap-2.34 to libcap-2.37 -Forward ported from libcap-2.37 to libcap-2.39 -Forward ported from libcap-2.39 to libcap-2.42 -Forward ported from libcap-2.42 to libcap-2.44 -Forward ported from libcap-2.44 to libcap-2.45 - -Signed-off-by: Lars Wendler <polynomial-c@gentoo.org> ---- - Make.Rules | 12 +++++++----- - Makefile | 1 - - libcap/Makefile | 7 ++++--- - pam_cap/Makefile | 8 +++++--- - progs/Makefile | 2 +- - tests/Makefile | 6 ++++-- - 6 files changed, 21 insertions(+), 15 deletions(-) - -diff --git a/Make.Rules b/Make.Rules -index cc6f95b..31d9db5 100644 ---- a/Make.Rules -+++ b/Make.Rules -@@ -52,7 +52,6 @@ GOMAJOR=0 - # Compilation specifics - - KERNEL_HEADERS := $(topdir)/libcap/include/uapi --IPATH += -fPIC -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include - - CC := $(CROSS_COMPILE)gcc - DEFINES := -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -@@ -60,7 +59,7 @@ COPTS ?= -O2 - CFLAGS ?= $(COPTS) $(DEFINES) - BUILD_CC ?= $(CC) - BUILD_COPTS ?= -O2 --BUILD_CFLAGS ?= $(BUILD_COPTS) $(DEFINES) $(IPATH) -+BUILD_CFLAGS ?= $(CFLAGS) - AR := $(CROSS_COMPILE)ar - RANLIB := $(CROSS_COMPILE)ranlib - DEBUG = -g #-DDEBUG -@@ -76,10 +75,13 @@ LIBPSXLIB := -L$(topdir)/libcap -lpsx $(PSXLINKFLAGS) - - BUILD_GPERF := $(shell which gperf >/dev/null 2>/dev/null && echo yes) - --SYSTEM_HEADERS = /usr/include -+LIBCAP_CPPFLAGS = -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include $(DEFINES) -+CPPFLAGS += $(LIBCAP_CPPFLAGS) -+BUILD_CPPFLAGS += $(LIBCAP_CPPFLAGS) - INCS=$(topdir)/libcap/include/sys/capability.h - LDFLAGS += -L$(topdir)/libcap --CFLAGS += -Dlinux $(WARNINGS) $(DEBUG) -+CPPFLAGS += -Dlinux -+CFLAGS += $(WARNINGS) $(DEBUG) - INDENT := $(shell if [ -n "$$(which indent 2>/dev/null)" ]; then echo "| indent -kr" ; fi) - - # SHARED tracks whether or not the SHARED libraries (libcap.so, -@@ -104,7 +106,7 @@ PTHREADS ?= yes - - ifeq ($(PTHREADS),yes) - GO := go --GOLANG := $(shell if [ -n "$(shell $(GO) version 2>/dev/null)" ]; then echo yes ; else echo no ; fi) -+GOLANG ?= $(shell if [ -n "$(shell $(GO) version 2>/dev/null)" ]; then echo yes ; else echo no ; fi) - ifeq ($(GOLANG),yes) - GOROOT := $(shell $(GO) env GOROOT) - GOCGO := $(shell if [ "$(shell $(GO) env CGO_ENABLED)" = 1 ]; then echo yes ; else echo no ; fi) -diff --git a/Makefile b/Makefile -index 8e8d5f3..580c48f 100644 ---- a/Makefile -+++ b/Makefile -@@ -17,7 +17,6 @@ ifeq ($(GOLANG),yes) - $(MAKE) -C go $@ - rm -f cap/go.sum - endif -- $(MAKE) -C tests $@ - $(MAKE) -C progs $@ - $(MAKE) -C doc $@ - $(MAKE) -C kdebug $@ -diff --git a/libcap/Makefile b/libcap/Makefile -index 230be39..7d0bcfb 100644 ---- a/libcap/Makefile -+++ b/libcap/Makefile -@@ -25,6 +25,7 @@ MINCAPLIBNAME=$(MAJCAPLIBNAME).$(MINOR) - PSXOBJS=$(addsuffix .o, $(PSXFILES)) - MAJPSXLIBNAME=$(PSXLIBNAME).$(VERSION) - MINPSXLIBNAME=$(MAJPSXLIBNAME).$(MINOR) -+CFLAGS += -fPIC - - all: pcs $(STACAPLIBNAME) - ifeq ($(SHARED),yes) -@@ -66,7 +67,7 @@ libpsx.pc: libpsx.pc.in - $< >$@ - - _makenames: _makenames.c cap_names.list.h -- $(BUILD_CC) $(BUILD_CFLAGS) $< -o $@ -+ $(BUILD_CC) $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $< -o $@ - - cap_names.h: _makenames - ./_makenames > cap_names.h -@@ -105,10 +106,10 @@ $(PSXLIBNAME) $(MAJPSXLIBNAME) $(MINPSXLIBNAME): $(PSXOBJS) - endif - - %.o: %.c $(INCLS) -- $(CC) $(CFLAGS) $(IPATH) -c $< -o $@ -+ $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ - - cap_text.o: cap_text.c $(USE_GPERF_OUTPUT) $(INCLS) -- $(CC) $(CFLAGS) $(IPATH) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@ -+ $(CC) $(CFLAGS) $(CPPFLAGS) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@ - - cap_test: cap_test.c libcap.h - $(CC) $(CFLAGS) $(IPATH) $< -o $@ -diff --git a/pam_cap/Makefile b/pam_cap/Makefile -index 56604fd..2da4674 100644 ---- a/pam_cap/Makefile -+++ b/pam_cap/Makefile -@@ -3,6 +3,8 @@ - topdir=$(shell pwd)/.. - include ../Make.Rules - -+CFLAGS += -fPIC -+ - all: pam_cap.so - $(MAKE) testlink - -@@ -16,16 +18,16 @@ install: all - # written (and you know why it fails), email me and explain why. Thanks! - - pam_cap.so: pam_cap.o -- $(LD) -o pam_cap.so $< $(LIBCAPLIB) $(LDFLAGS) -+ $(LD) $(CFLAGS) -o pam_cap.so $< $(LIBCAPLIB) $(LDFLAGS) - - pam_cap.o: pam_cap.c -- $(CC) $(CFLAGS) $(IPATH) -c $< -o $@ -+ $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ - - test_pam_cap: test_pam_cap.c pam_cap.c - $(CC) $(CFLAGS) $(IPATH) -o $@ test_pam_cap.c $(LIBCAPLIB) $(LDFLAGS) --static - - testlink: test.c pam_cap.o -- $(CC) $(CFLAGS) -o $@ $+ -lpam -ldl $(LIBCAPLIB) $(LDFLAGS) -+ $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $+ -lpam -ldl $(LIBCAPLIB) $(LDFLAGS) - - test: pam_cap.so - make testlink -diff --git a/progs/Makefile b/progs/Makefile -index 1d7fc7a..64dbe86 100644 ---- a/progs/Makefile -+++ b/progs/Makefile -@@ -28,7 +28,7 @@ $(BUILD): %: %.o $(DEPS) - $(CC) $(CFLAGS) -o $@ $< $(LIBCAPLIB) $(LDFLAGS) - - %.o: %.c $(INCS) -- $(CC) $(IPATH) $(CAPSH_SHELL) $(CFLAGS) -c $< -o $@ -+ $(CC) $(CAPSH_SHELL) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ - - install: all - mkdir -p -m 0755 $(FAKEROOT)$(SBINDIR) -diff --git a/tests/Makefile b/tests/Makefile -index fc39fee..3668825 100644 ---- a/tests/Makefile -+++ b/tests/Makefile -@@ -13,6 +13,8 @@ ifeq ($(PTHREADS),yes) - make psx_test libcap_psx_test libcap_psx_launch_test - endif - -+CFLAGS += -fPIC -+ - install: all - - ifeq ($(DYNAMIC),yes) -@@ -62,13 +64,13 @@ run_psx_test: psx_test - ./psx_test - - psx_test: psx_test.c $(DEPS) -- $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LINKEXTRA) $(LIBPSXLIB) $(LDFLAGS) -+ $(CC) $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LINKEXTRA) $(LIBPSXLIB) $(LDFLAGS) - - run_libcap_psx_test: libcap_psx_test - ./libcap_psx_test - - libcap_psx_test: libcap_psx_test.c $(DEPS) -- $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LINKEXTRA) $(LIBCAPLIB) $(LIBPSXLIB) $(LDFLAGS) -+ $(CC) $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LINKEXTRA) $(LIBCAPLIB) $(LIBPSXLIB) $(LDFLAGS) - - # privileged - run_libcap_launch_test: libcap_launch_test noop --- -2.29.2 - diff --git a/sys-libs/libstatgrab/Manifest b/sys-libs/libstatgrab/Manifest index d7b7b06de093..6795dd1ed34a 100644 --- a/sys-libs/libstatgrab/Manifest +++ b/sys-libs/libstatgrab/Manifest @@ -2,5 +2,5 @@ AUX libstatgrab-0.91-tinfo.patch 1833 BLAKE2B 77d33279b50f9210260f3897912735573a DIST libstatgrab-0.91.tar.gz 776046 BLAKE2B 29906d4df8b8e8f1ae8fedf5ccac12b282b5cba66715a2d1b51059426e7cb073862e49cbee535c0f9ea7a34171cbc3d143a38a92149ffe5f22ed9ec426fec0be SHA512 f360f2e1b185bf9603b1d9c50649b0050e9502128ff81a9f4de88457e2f5203deafe7fd7ac13ebc4cc56e6ecd1bdf8aacae64987bdf36af0c9929e30626915f6 DIST libstatgrab-0.92.tar.gz 815262 BLAKE2B d8ca538f01d9e0b1d5c459c9c0da6df5b6806e02649d726c3ee8a2f69233a7183df6dda95980a8e6f8b438478ec28f4baa9d623d5372e5e3e28ea4909e905872 SHA512 a99c6be56d930779d0d8f6f81e64e2f31e19423009c39e925b39116a42aa2c6037651992ac2168c43a5c6ecadf3e4a58486ab6148cf96118c429b04fdcf65192 EBUILD libstatgrab-0.91.ebuild 946 BLAKE2B b0cf0184f773911a205e417f7838d145e6d3204c9c394faa91b76b146ccd7dc714b57f23f46eaa739ca0e54cf327169197e1b7ecc5f85cdd9cfff1e0c819b389 SHA512 30b3af926914c5d515162b20d86e0c3f9ccb6c640f748a74f01bbff2cd80d7e07c3be5261f573a6eee25f946f99d28d2e653adebe36cd3b8af26ff1ea5e0e434 -EBUILD libstatgrab-0.92.ebuild 922 BLAKE2B 4657ab981a10f60b1b7981c95b2ed5ff0a41cd16cc78e82a35fe7916833f678a46e8395095c6c3f9c98fcf22f6059a113e7ed2883a2ddfcaf8c1bb52207d25be SHA512 409025763dc226cebc532ebc2dbfdc42c51c67483bd6c3af6073b7c53a3def232590f6fcf0b016f360fca33a40418c386fc035d0b68980e276983693d0d07dab +EBUILD libstatgrab-0.92.ebuild 919 BLAKE2B 5efdf89cd5e69f96b8d045ad52a293fd71234aaf5165f0b43731876a4de606528d7dda25cd1f15f6c822de0246c5504b80a43a0de72f6d5438a18b286bc25293 SHA512 56ace8ffac5ddc99e7208504fe27c494ed01d494d7272aab75f822835e5418ad71d0fd4a1c178b08fadc967cc16e54dce84b7ed7895eb91cabdbedb3e0a9db2f MISC metadata.xml 255 BLAKE2B ba7d0981de71831366e07fb905548792571c3660154eed0b3988fb0e57ae92e133bfa15076550b754fbe848d07956764d68f03aa293270aba07d459561298301 SHA512 d099268b71914186aa1cb481cffe2d080ad5b16aa720a3d76e8d012e5adcca479bbbffb72c50a76bf95535bb5c89525b51786157c66476a0431e3bff317b0ece diff --git a/sys-libs/libstatgrab/libstatgrab-0.92.ebuild b/sys-libs/libstatgrab/libstatgrab-0.92.ebuild index aee5352b1938..b62910109c58 100644 --- a/sys-libs/libstatgrab/libstatgrab-0.92.ebuild +++ b/sys-libs/libstatgrab/libstatgrab-0.92.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.mirrorservice.org/sites/ftp.i-scream.org/pub/i-scream/libst LICENSE="|| ( GPL-2 LGPL-2.1 )" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc x86" IUSE="examples" RDEPEND="sys-libs/ncurses" diff --git a/sys-libs/suacomp/Manifest b/sys-libs/suacomp/Manifest deleted file mode 100644 index 5cd36a48cabd..000000000000 --- a/sys-libs/suacomp/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -AUX suacomp-0.6.14-strtoll.patch 1456 BLAKE2B 745f4f8277498244d04aa979e1ec4d415854e4f9be3e66c856ad80884e48dc94ec9526ad8b72840cfaf1db46a60bca8704d35c30619832f4f34942f19396803f SHA512 603c49683d7cce6f6edc0b12a1aefddfffd0e9d3c57b34ae176fa94139d3b427bee5993f7d2cd35a575113a8c42becce8b49c4c334dc8cc8fe4902b49bf9cda3 -DIST suacomp-0.6.14.tar.gz 36712 BLAKE2B 09df68729de50753e987a958a7184125308b652dcd4483acfa89bdf454a74341398ef4e5db616b1b2d8e51025040e7e3807df9221402b17e63fb3fd862272f68 SHA512 6e559059c18c1412611d837bf2f5fad08deaf9145464347f712fdb0cd4e0dfae1b7b46253ef086bd4c98cc1555111872b6b5af5272b77a88c767e9008143b7f1 -EBUILD suacomp-0.6.14.ebuild 1273 BLAKE2B 579888178129a52e45a84baf215395c905da3b7073e15a1de938835b8537c3357cf28658c61e7cc2ac220823bc41d0ee06eda3203568b9f9998fa1bd1f786886 SHA512 64071d9dbd1cdea7afbde0bb79459bad3a11707d213774d667844e1435dca28e7d6329ddfa6acab78c7f9b9741e540f02dd21ecc78f6fc91e77aa8ef2de9f129 -EBUILD suacomp-9999.ebuild 1167 BLAKE2B 9af7ab58e3d0862dd74cad9d7977d9dc4f70d7cdda7f59b149dd9638b5c806970eeacb8e06f456ffb7a586c84e149100f193806c34d1668988cf6d297659e10d SHA512 b6eb9a765b6c0d69b3962c8eb2aef2b6eab0d822d83f7a5f5b10a1e578c6a9ad8587742c36ba117319d5ebe9ec4d9f613f118dd149f811b5965b11c8d976a1be -MISC metadata.xml 548 BLAKE2B 78c65be8454a70ede5311102ca21ef76c697c7222fb053536d9cf165f252ba0891e810675e8e12930640a52038679904ff11f4ad0c8a992405f3a0be2a0433af SHA512 a7a233b0f745af85c510fa021dded0cf5d6c57845c1517451d6e939c2784453fda9413c450cb9e8160ac2cdfbb7a898f45733f6505b19102bcfe7c1d28b81b99 diff --git a/sys-libs/suacomp/files/suacomp-0.6.14-strtoll.patch b/sys-libs/suacomp/files/suacomp-0.6.14-strtoll.patch deleted file mode 100644 index 16ee7f4e5c41..000000000000 --- a/sys-libs/suacomp/files/suacomp-0.6.14-strtoll.patch +++ /dev/null @@ -1,44 +0,0 @@ -From a498772e5fe942eafe06ed62a00a21c4b99164b5 Mon Sep 17 00:00:00 2001 -From: David Holm <dholmster@gmail.com> -Date: Fri, 14 Sep 2012 20:57:30 +0200 -Subject: [PATCH] Fixes build issues on SUA 6.0 - -The prototypes for strto[u]ll.c in SUA 6.0 use C99 and are defined using (u_)quad_t. This will cause compilation to fail since there is a mismatch between stdlib.h and the implementation in suacomp. This change switches to the C99 definition and undefines strto[u]ll in case stdlib.h wants to map them to existing implementations. - -https://sourceforge.net/p/suacomp/tickets/1/ ---- - strtoll.c | 3 ++- - strtoull.c | 3 ++- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/strtoll.c b/strtoll.c -index 12f9886..c9e34b8 100644 ---- a/strtoll.c -+++ b/strtoll.c -@@ -9,7 +9,8 @@ - #include <unistd.h> - #include <stdlib.h> - --long long int strtoll(const char* nptr, char** endptr, int base) { -+#undef strtoll -+quad_t strtoll(const char* nptr, char** endptr, int base) { - long long int ret; - DT("enter: %p, %p, %d\n", nptr, endptr, base); - -diff --git a/strtoull.c b/strtoull.c -index d0e0e67..622ee9b 100644 ---- a/strtoull.c -+++ b/strtoull.c -@@ -9,7 +9,8 @@ - #include <unistd.h> - #include <stdlib.h> - --long long int strtoull(const char* nptr, char** endptr, int base) { -+#undef strtoull -+u_quad_t strtoull(const char* nptr, char** endptr, int base) { - long long int ret; - DT("enter: %p, %p, %d\n", nptr, endptr, base); - --- -1.7.6.1 - diff --git a/sys-libs/suacomp/metadata.xml b/sys-libs/suacomp/metadata.xml deleted file mode 100644 index 0d95d5d4e805..000000000000 --- a/sys-libs/suacomp/metadata.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>haubi@gentoo.org</email> - <name>Michael Haubenwallner</name> - </maintainer> - <longdescription lang="en"> - A small library, trying to overcome the problems occuring when building - (and using) gentoo-prefix on an interix based system. This has no use - on non-interix systems. - </longdescription> - <upstream> - <remote-id type="sourceforge">suacomp</remote-id> - </upstream> -</pkgmetadata> diff --git a/sys-libs/suacomp/suacomp-0.6.14.ebuild b/sys-libs/suacomp/suacomp-0.6.14.ebuild deleted file mode 100644 index be3e9886e4e5..000000000000 --- a/sys-libs/suacomp/suacomp-0.6.14.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="library wrapping the interix lib-c to make it less buggy" -HOMEPAGE="http://suacomp.sf.net" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="BEER-WARE" -SLOT="0" -KEYWORDS="" -IUSE="debug" - -DEPEND="" -RDEPEND="" - -get_opts() { - local shlibc= - local stlibc= - - local dir - for dir in /usr/lib /usr/lib/x86; do - [[ -f ${dir}/libc.a ]] && stlibc=${dir}/libc.a - - local name - for name in libc.so.5.2 libc.so.3.5; do - [[ -f ${dir}/${name} ]] && { shlibc=${dir}/${name}; break; } - done - - [[ -f ${shlibc} && -f ${stlibc} ]] && break - done - - echo "SHARED_LIBC=${shlibc} STATIC_LIBC=${stlibc}" -} - -src_prepare() { - [[ ${CHOST} == *-interix6* ]] && eapply "${FILESDIR}"/${P}-strtoll.patch - eapply_user -} - -src_configure() { - if use debug; then - append-flags -D_DEBUG -D_DEBUG_TRACE - fi -} - -src_compile() { - emake all CC=$(tc-getCC) $(get_opts) CFLAGS="${CFLAGS}" -} - -src_test() { - local v= - - use debug && v="TEST_VERBOSE=1" - use debug && export SUACOMP_DEBUG_OUT=stderr - - emake check $(get_opts) ${v} -} - -src_install() { - emake install PREFIX="${EPREFIX}/usr" DESTDIR="${D}" $(get_opts) \ - CFLAGS="${CFLAGS}" -} diff --git a/sys-libs/suacomp/suacomp-9999.ebuild b/sys-libs/suacomp/suacomp-9999.ebuild deleted file mode 100644 index b356312ab407..000000000000 --- a/sys-libs/suacomp/suacomp-9999.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic toolchain-funcs git-r3 - -DESCRIPTION="library wrapping the interix lib-c to make it less buggy" -HOMEPAGE="http://suacomp.sf.net" -EGIT_REPO_URI="https://git.code.sf.net/p/suacomp/git" - -LICENSE="BEER-WARE" -SLOT="0" -IUSE="debug" - -DEPEND="" -RDEPEND="" - -get_opts() { - local shlibc= - local stlibc= - - local dir - for dir in /usr/lib /usr/lib/x86; do - [[ -f ${dir}/libc.a ]] && stlibc=${dir}/libc.a - - local name - for name in libc.so.5.2 libc.so.3.5; do - [[ -f ${dir}/${name} ]] && { shlibc=${dir}/${name}; break; } - done - - [[ -f ${shlibc} && -f ${stlibc} ]] && break - done - - echo "SHARED_LIBC=${shlibc} STATIC_LIBC=${stlibc}" -} - -src_configure() { - if use debug; then - append-flags -D_DEBUG -D_DEBUG_TRACE - fi -} - -src_compile() { - emake all CC=$(tc-getCC) $(get_opts) CFLAGS="${CFLAGS}" -} - -src_test() { - local v= - - use debug && v="TEST_VERBOSE=1" - use debug && export SUACOMP_DEBUG_OUT=stderr - - emake check $(get_opts) ${v} -} - -src_install() { - emake install PREFIX="${EPREFIX}/usr" DESTDIR="${D}" $(get_opts) \ - CFLAGS="${CFLAGS}" -} diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest index 72481a7a8264..97eeb40fddd3 100644 --- a/sys-libs/timezone-data/Manifest +++ b/sys-libs/timezone-data/Manifest @@ -1,4 +1,4 @@ DIST tzcode2021a.tar.gz 262204 BLAKE2B 4072685f2344602ffcfe32a7bf92d3b0d93e38ffca842f1c07a60db5e26f1f18ab32fc7b5f155b0bdab49f8d0bfcd5b58f4a192b4d06d7d9639893e5cb596328 SHA512 bf1d53bcbfecd3b09d57a9e6d3cb49b5dc5f8e1b6674b67e7f974e1a268c2aaf13ca89a7ef12f49d0665aff782bd72685e00c22a41ca88a028da0429f972fd45 DIST tzdata2021a.tar.gz 411892 BLAKE2B b8d177e90e22bd8a3fd23c9a9c19896cb245efd8e768b59ab8c63e56ab141e67331f3231e3a7c802f844375049cfd902e14e912ce677b3aea38fc0d968905e87 SHA512 7cdd762ec90ce12a30fa36b1d66d1ea82d9fa21e514e2b9c7fcbe2541514ee0fadf30843ff352c65512fb270857b51d1517b45e1232b89c6f954ba9ff1833bb3 -EBUILD timezone-data-2021a.ebuild 5380 BLAKE2B 2f058ece71e2feb8e3db2ad1d09822ec3e32befa081331a2172f451fd84c8674a572aa5433d93294003701bbf94e6bc7d9b8a66d169b5d9f8580b1c9b801ad7b SHA512 a7beca84f4b2d34d602dc68a7a73b0ff64d35e8af4df415e7cbae135bc219d77ab38b62e216c01dbacefb978f7328d9e56a7c68bcec7d5d69950013caf55d6d8 +EBUILD timezone-data-2021a.ebuild 5676 BLAKE2B f9868622cbcb8290fe622a97a81830546c79d4ddecee7b0f9b0022c38a176b9a28e50eccc8d9b2f0518c16202d2febd953cfb431f97c26b9fc14e1c37163c31c SHA512 1a5d9dd6d24a3e333d0c3a6b22cc9b40de85b1ce357b926ee507e4c24117489711bbaa18df7a8b3419feff8fd1e24967ae53136e1457e248b10af9da13175c1f MISC metadata.xml 728 BLAKE2B b390f4f3d184c7f424d97a36883c9ab67f56a2445d6ecfe6deca69d42864b1249fa2fec6a48bf693f9b2101c167597e5a435cf13a8797784e8f37ad870bf3daf SHA512 36e2c2fa026441ae4b21d33b9425a7195c4d4d404e8f010e9bf894be3095b0d461079a87126f22c398475652777301aa5dcf151b195502d25b4094420c56c7e4 diff --git a/sys-libs/timezone-data/timezone-data-2021a.ebuild b/sys-libs/timezone-data/timezone-data-2021a.ebuild index 52f5fbdca3bd..b7dce14ae8a4 100644 --- a/sys-libs/timezone-data/timezone-data-2021a.ebuild +++ b/sys-libs/timezone-data/timezone-data-2021a.ebuild @@ -150,28 +150,39 @@ configure_tz_data() { fi if ! tz=$(get_TIMEZONE) ; then - einfo "Assuming your empty ${etc_lt} file is what you want; skipping update." + einfo "Assuming your empty ${src} file is what you want; skipping update." return 0 fi - if [[ "${tz}" == "FOOKABLOIE" ]] ; then - elog "You do not have TIMEZONE set in ${src}." - if [[ ! -e "${etc_lt}" ]] ; then - cp -f "${EROOT}"/usr/share/zoneinfo/Factory "${etc_lt}" - elog "Setting ${etc_lt} to Factory." - else - elog "Skipping auto-update of ${etc_lt}." - fi + if [[ "${tz}" == "FOOKABLOIE" ]] ; then + einfo "You do not have a timezone set in ${src}; skipping update." return 0 fi - if [[ ! -e "${EROOT}/usr/share/zoneinfo/${tz}" ]] ; then - elog "You have an invalid TIMEZONE setting in ${src}" - elog "Your ${etc_lt} has been reset to Factory; enjoy!" - tz="Factory" + local tzpath="${EROOT}/usr/share/zoneinfo/${tz}" + + if [[ ! -e ${tzpath} ]]; then + ewarn "The timezone specified in ${src} is not valid." + return 1 + fi + + if [[ -f ${etc_lt} ]]; then + # If a regular file already exists, copy over it. + ewarn "Found a regular file at ${etc_lt}." + ewarn "Some software may expect a symlink instead." + ewarn "You may convert it to a symlink by removing the file and running:" + ewarn " emerge --config sys-libs/timezone-data" + einfo "Copying ${tzpath} to ${etc_lt}." + cp -f "${tzpath}" "${etc_lt}" + else + # Otherwise, create a symlink and remove the timezone file. + tzpath="../usr/share/zoneinfo/${tz}" + einfo "Linking ${tzpath} at ${etc_lt}." + if ln -snf "${tzpath}" "${etc_lt}"; then + einfo "Removing ${src}." + rm -f "${src}" + fi fi - einfo "Updating ${etc_lt} with ${EROOT}/usr/share/zoneinfo/${tz}" - cp -f "${EROOT}/usr/share/zoneinfo/${tz}" "${etc_lt}" } pkg_config() { diff --git a/sys-libs/zlib-ng/Manifest b/sys-libs/zlib-ng/Manifest index 6756eb8f98c9..763a814dd750 100644 --- a/sys-libs/zlib-ng/Manifest +++ b/sys-libs/zlib-ng/Manifest @@ -1,3 +1,3 @@ -DIST zlib-ng-2.0.1.tar.gz 697121 BLAKE2B c4e8c9602f9cf33746c842b2f100adad2fca2b3808691f73ca5b679bbac186a70bf575df731cf60797755275835a5839f4602e08e15faf16b216d4d6d99d4aeb SHA512 c3be0a29e07989353a41a07a4eb037efbc0de5a87f1a4fe338c97c0dc7145225bd1f1039cde4a440be3b54130e297153c5180d69a491b92bc8a69839a8c1a9e3 -EBUILD zlib-ng-2.0.1.ebuild 695 BLAKE2B 738b6ad23488631592fe8c1c0be99eb0d0b2e3963e3edf5c13eb39f2d9bf49322b6806264c0d74e6ccba6407c230d94f9cff6f2d04a296145b4f56985dc29256 SHA512 bd74daaa1d4e4216c79a12a7cb6e0dda502c43dc6e89c0e98c8df6d1e0efa9c2fa21e4632bdc7f7882ba3f4bd185d4abe0b6b39dfa190448c7ce2679713cade5 -MISC metadata.xml 420 BLAKE2B bcd9a2026fb660169b9d56d12c32b78160b18380939b4f44db319605c07c495849fe1cf33f208fd35920dad0aabe3c5d59df7d54685d022a8264d0d31f20bb8f SHA512 344b9daa07f6e11684358928c70b0469058d3d126af49a1be153395686ea87d3a889c9e9d234e44363d7e438dfc321be9d93278e299df0415f3ae8404cfe95e3 +DIST zlib-ng-2.0.2.tar.gz 698033 BLAKE2B 97645b054daddfe77aa23ec90e0beccc631c33f9ea841b8305ee7d2fb82dc61b2d60e924187d0012f7e99760669dd9d3c5f4e19dc64a0d2b253d333e21c898fe SHA512 d40a4fe036783fbc46225a49ff026cc12cd335103aa6f24e14e724c23d034019ed392337072879bc014223fe7b74a68f8d1d7dc1dfdbda95af864020e14272a8 +EBUILD zlib-ng-2.0.2.ebuild 1971 BLAKE2B 6c6f5f9b1af80c9a7dfa525c849990a590d140c382ee99a9c7965426f4974e34bffc6a18e6b047b336b5d41bf3939e4e6a039f29837ea6add42f0b9dac64b68e SHA512 6305b130787419a29e6c70a7af35e24ed04fb2365898e6a38c46894f6e2660686805d381f30dda00377db30c2088010c1308a9aa3665f678cb518dc4b5f0928b +MISC metadata.xml 430 BLAKE2B 6c9dc67624e11d0cad0e9cdd748ba6e759e09a15fe5c4188c289ca234ce304f128a4150d835214a3035d570bb9b576c752d31bf194ec4e91058ac778fb24352c SHA512 a43ac0b952306ed54935ca12f5aa2d4e425a3b6056dc52df6e7f8b9a11f992222328ef8a363939bccf0e0d5b4251a9d5479aae79a2332ec535b2e1e546b6e2e0 diff --git a/sys-libs/zlib-ng/metadata.xml b/sys-libs/zlib-ng/metadata.xml index 44db40fcc5ea..af26df0fdf9f 100644 --- a/sys-libs/zlib-ng/metadata.xml +++ b/sys-libs/zlib-ng/metadata.xml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>base-system@gentoo.org</email> - <name>Gentoo Base System</name> -</maintainer> -<use> - <flag name="compat">Enable compatibility to <pkg>sys-libs/zlib</pkg></flag> -</use> -<upstream> - <remote-id type="github">zlib-ng/zlib-ng</remote-id> -</upstream> + <maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> + </maintainer> + <use> + <flag name="compat">Enable compatibility to <pkg>sys-libs/zlib</pkg></flag> + </use> + <upstream> + <remote-id type="github">zlib-ng/zlib-ng</remote-id> + </upstream> </pkgmetadata> diff --git a/sys-libs/zlib-ng/zlib-ng-2.0.1.ebuild b/sys-libs/zlib-ng/zlib-ng-2.0.1.ebuild deleted file mode 100644 index 6c9d4fdc34fb..000000000000 --- a/sys-libs/zlib-ng/zlib-ng-2.0.1.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 -# $Id: 688f948c5f3067e775bfab5057e8047f467a9ca9 $ - -EAPI=7 - -inherit cmake - -DESCRIPTION="zlib data compression library" -HOMEPAGE="https://github.com/zlib-ng/zlib-ng" -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="ZLIB" -SLOT="0" - -#KEYWORDS="~amd64 ~x86" -IUSE="compat test" - -RESTRICT="!test? ( test )" - -src_prepare() { - cmake_src_prepare - sed "/LIB_INSTALL_DIR/s@/lib\"@/$(get_libdir)\"@" \ - -i CMakeLists.txt || die -} - -src_configure() { - local mycmakeargs=( - -DZLIB_COMPAT="$(usex compat)" - -DZLIB_ENABLE_TESTS="$(usex test)" - ) - cmake_src_configure -} diff --git a/sys-libs/zlib-ng/zlib-ng-2.0.2.ebuild b/sys-libs/zlib-ng/zlib-ng-2.0.2.ebuild new file mode 100644 index 000000000000..35316b265096 --- /dev/null +++ b/sys-libs/zlib-ng/zlib-ng-2.0.2.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +DESCRIPTION="Fork of the zlib data compression library" +HOMEPAGE="https://github.com/zlib-ng/zlib-ng" +SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="ZLIB" +SLOT="0" +#KEYWORDS="~amd64 ~x86" + +CPU_USE=( cpu_flags_{x86_{avx2,sse2,ssse3,sse4a,pclmul},arm_{crc32,neon},ppc_vsx2} ) +IUSE="compat ${CPU_USE[@]} test" + +RESTRICT="!test? ( test )" + +RDEPEND="compat? ( !sys-libs/zlib )" + +src_configure() { + local mycmakeargs=( + -DZLIB_COMPAT="$(usex compat)" + -DZLIB_ENABLE_TESTS="$(usex test)" + # Unaligned access is controversial and undefined behaviour + # Let's keep it off for now + # https://github.com/gentoo/gentoo/pull/17167 + -DWITH_UNALIGNED="OFF" + ) + + # The intrinsics options are all defined conditionally, so we need + # to enable them on/off per-arch here for now. + if use amd64 || use x86 ; then + mycmakeargs+=( + -DWITH_AVX2=$(usex cpu_flags_x86_avx2) + -DWITH_SSE2=$(usex cpu_flags_x86_sse2) + -DWITH_SSSE3=$(usex cpu_flags_x86_ssse3) + -DWITH_SSE4=$(usex cpu_flags_x86_sse4a) + -DWITH_PCLMULQDQ=$(usex cpu_flags_x86_pclmul) + ) + fi + + if use arm || use arm64 ; then + mycmakeargs+=( + -DWITH_ACLE=$(usex cpu_flags_arm_crc32) + -DWITH_NEON=$(usex cpu_flags_arm_neon) + ) + fi + + if use ppc || use ppc64 ; then + # The POWER8 support is VSX which was introduced + # VSX2 was introduced with POWER8, so use that as a proxy for it + mycmakeargs+=( + -DWITH_POWER8=$(usex cpu_flags_ppc_vsx2) + ) + fi + + # TODO: There's no s390x USE_EXPAND yet + + cmake_src_configure +} + +src_install() { + cmake_src_install + + if use compat ; then + ewarn "zlib-ng is experimental and replacing the system zlib is dangerous" + ewarn "Please be careful!" + ewarn + ewarn "The following link explains the guarantees (and what is NOT guaranteed):" + ewarn "https://github.com/zlib-ng/zlib-ng/blob/2.0.x/PORTING.md" + fi +} diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest index 1ff71033b9e5..377647b51eaf 100644 --- a/sys-libs/zlib/Manifest +++ b/sys-libs/zlib/Manifest @@ -4,4 +4,5 @@ DIST zlib-1.2.11-cygwin-gzopen_w.patch 1170 BLAKE2B fe351436716634bd823da8c2811d DIST zlib-1.2.11.tar.gz 607698 BLAKE2B 6bfc4bca5dcadba8a0d4121a2b3ed0bfe440c261003521862c8e6381f1a6f0a72d3fc037351d30afd7ef321e8e8d2ec817c046ac749f2ca0c97fbdc2f7e840b7 SHA512 73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae DIST zlib-1.2.7-cygwin-minizip.patch 2626 BLAKE2B 885f1fda877c0b783618b163702fb46126b7db572767cd4edb86bd92db1f432c887ef1724e70c8319c26886368dba3a962af5284ec0875c20ec8ad2245fd100a SHA512 e372f1e06311e843eca2092e182c41abb009b5e9880b60292d708e4bc0de5a9e4c43d49b25b0c09df4784bc46a1254472bc5cdbdd8d6c762a9f6a145a555bfe7 EBUILD zlib-1.2.11-r3.ebuild 4180 BLAKE2B 11ad2994f6981193ab218e23b6936a099dc020f47a1522e5984b5a6eb6046972bddd7a8609b679bb9d9b8e0cc952b149829ff3fdd625387a8c0f636fdb9ae1a2 SHA512 f1678d18d8defd26ca0c7af83de426f1bb8afa6a12803db4db96bacb74710da95b4d0d7f830b6372c9a093658262f48ff6e9431ed18a3447ee3017768ef92ce1 -MISC metadata.xml 432 BLAKE2B 80b2aa4dbc687fa23b3e64f12af789d2b1f308ccba611de152efde3008a5b6f66ee56121c2c4846a482e426c78e5f921ee7cf9b196c28504ee0de420725a6239 SHA512 947d4b2035ab49c42f6141f14553f1e8f4796b4ddc24c6a4f071ac2300eb120648dd03eef49773295d3e3f30cd9d3cbb391bde798dacf1187b46ff75abd59420 +EBUILD zlib-1.2.11-r4.ebuild 4237 BLAKE2B d720cf66ca7dc3f1229dccaa3daf89985204f138972f3ae3e6f52aa3267ff9e4eb75e96ac83c84c1867dab8fa17bab21e79f9f4d5501a78e1ac50150d114ab96 SHA512 207d36cd81cceb9737525f837e276a37a5ddd37add62aa83efe1f0ee9e2906f821d9e21b5695db79724c1cb83f67940079c548fe8135c0b77b9e0a5673034ae7 +MISC metadata.xml 493 BLAKE2B 56454cd42e326bbf6d5b6c535cfcf49edeaadf748d7b7c2956dbabebf32a1372800c3bc5442b28ef1f153c846475f77f24ee0256f34f038d5903166e0cd4612d SHA512 fbf724610d52699ef2cbc59870fb09e786df2dc36f4c89955d12460a11070a153dc2bda31f4c9d207dba08638eaa965d359b20fce90d401528cb67f3947e3a60 diff --git a/sys-libs/zlib/metadata.xml b/sys-libs/zlib/metadata.xml index 105b205e9e4e..a45bfbc4ee9e 100644 --- a/sys-libs/zlib/metadata.xml +++ b/sys-libs/zlib/metadata.xml @@ -1,14 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>base-system@gentoo.org</email> - <name>Gentoo Base System</name> -</maintainer> -<use> - <flag name="minizip">include the minizip library for quick and dirty zip extraction</flag> -</use> -<upstream> - <remote-id type="cpe">cpe:/a:gnu:zlib</remote-id> -</upstream> + <maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> + </maintainer> + <use> + <flag name="minizip">include the minizip library for quick and dirty zip extraction</flag> + </use> + <upstream> + <remote-id type="github">madler/zlib</remote-id> + <remote-id type="cpe">cpe:/a:gnu:zlib</remote-id> + </upstream> </pkgmetadata> diff --git a/sys-libs/zlib/zlib-1.2.11-r4.ebuild b/sys-libs/zlib/zlib-1.2.11-r4.ebuild new file mode 100644 index 000000000000..8a3b7742a6fb --- /dev/null +++ b/sys-libs/zlib/zlib-1.2.11-r4.ebuild @@ -0,0 +1,160 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +AUTOTOOLS_AUTO_DEPEND="no" + +inherit autotools toolchain-funcs multilib multilib-minimal usr-ldscript + +CYGWINPATCHES=( + "https://github.com/cygwinports/zlib/raw/22a3462cae33a82ad966ea0a7d6cbe8fc1368fec/1.2.11-gzopen_w.patch -> ${PN}-1.2.11-cygwin-gzopen_w.patch" + "https://github.com/cygwinports/zlib/raw/22a3462cae33a82ad966ea0a7d6cbe8fc1368fec/1.2.7-minizip-cygwin.patch -> ${PN}-1.2.7-cygwin-minizip.patch" +) + +DESCRIPTION="Standard (de)compression library" +HOMEPAGE="https://zlib.net/" +SRC_URI="https://zlib.net/${P}.tar.gz + http://www.gzip.org/zlib/${P}.tar.gz + http://www.zlib.net/current/beta/${P}.tar.gz + elibc_Cygwin? ( ${CYGWINPATCHES[*]} )" + +LICENSE="ZLIB" +SLOT="0/1" # subslot = SONAME +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +IUSE="minizip static-libs" + +BDEPEND="minizip? ( ${AUTOTOOLS_DEPEND} )" +# See #309623 for libxml2 +RDEPEND=" + !<dev-libs/libxml2-2.7.7 + !sys-libs/zlib-ng[compat] +" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-1.2.11-fix-deflateParams-usage.patch + "${FILESDIR}"/${PN}-1.2.11-minizip-drop-crypt-header.patch #658536 +) + +src_prepare() { + default + + if use elibc_Cygwin ; then + local p + for p in "${CYGWINPATCHES[@]}" ; do + # Strip out the "... -> " from the array + eapply -p2 "${DISTDIR}/${p#*> }" + done + fi + + if use minizip ; then + cd contrib/minizip || die + eautoreconf + fi + + case ${CHOST} in + *-cygwin*) + # do not use _wopen, is a mingw symbol only + sed -i -e '/define WIDECHAR/d' "${S}"/gzguts.h || die + # zlib1.dll is the mingw name, need cygz.dll + # cygz.dll is loaded by toolchain, put into subdir + sed -i -e 's|zlib1.dll|win32/cygz.dll|' win32/Makefile.gcc || die + ;; + esac + + case ${CHOST} in + *-mingw*|mingw*|*-cygwin*) + # uses preconfigured Makefile rather than configure script + multilib_copy_sources + ;; + esac +} + +echoit() { echo "$@"; "$@"; } + +multilib_src_configure() { + case ${CHOST} in + *-mingw*|mingw*|*-cygwin*) + ;; + *) + local uname=$("${EPREFIX}"/usr/share/gnuconfig/config.sub "${CHOST}" | cut -d- -f3) #347167 + local myconf=( + --shared + --prefix="${EPREFIX}/usr" + --libdir="${EPREFIX}/usr/$(get_libdir)" + ${uname:+--uname=${uname}} + ) + # not an autoconf script, so can't use econf + echoit "${S}"/configure "${myconf[@]}" || die + ;; + esac + + if use minizip ; then + local minizipdir="contrib/minizip" + mkdir -p "${BUILD_DIR}/${minizipdir}" || die + cd ${minizipdir} || die + ECONF_SOURCE="${S}/${minizipdir}" \ + econf $(use_enable static-libs static) + fi +} + +multilib_src_compile() { + case ${CHOST} in + *-mingw*|mingw*|*-cygwin*) + emake -f win32/Makefile.gcc STRIP=true PREFIX=${CHOST}- + sed \ + -e 's|@prefix@|'"${EPREFIX}"'/usr|g' \ + -e 's|@exec_prefix@|${prefix}|g' \ + -e 's|@libdir@|${exec_prefix}/'$(get_libdir)'|g' \ + -e 's|@sharedlibdir@|${exec_prefix}/'$(get_libdir)'|g' \ + -e 's|@includedir@|${prefix}/include|g' \ + -e 's|@VERSION@|'${PV}'|g' \ + zlib.pc.in > zlib.pc || die + ;; + *) + emake + ;; + esac + use minizip && emake -C contrib/minizip +} + +sed_macros() { + # clean up namespace a little #383179 + # we do it here so we only have to tweak 2 files + sed -i -r 's:\<(O[FN])\>:_Z_\1:g' "$@" || die +} + +multilib_src_install() { + case ${CHOST} in + *-mingw*|mingw*|*-cygwin*) + emake -f win32/Makefile.gcc install \ + BINARY_PATH="${ED}/usr/bin" \ + LIBRARY_PATH="${ED}/usr/$(get_libdir)" \ + INCLUDE_PATH="${ED}/usr/include" \ + SHARED_MODE=1 + # overwrites zlib.pc created from win32/Makefile.gcc #620136 + insinto /usr/$(get_libdir)/pkgconfig + doins zlib.pc + ;; + + *) + emake install DESTDIR="${D}" LDCONFIG=: + gen_usr_ldscript -a z + ;; + esac + sed_macros "${ED}"/usr/include/*.h + + if use minizip ; then + emake -C contrib/minizip install DESTDIR="${D}" + sed_macros "${ED}"/usr/include/minizip/*.h + fi + + if ! use static-libs ; then + rm -f "${ED}"/usr/$(get_libdir)/lib{z,minizip}.{a,la} || die #419645 + fi +} + +multilib_src_install_all() { + dodoc FAQ README ChangeLog doc/*.txt + use minizip && dodoc contrib/minizip/*.txt +} |