From 55a7866dd6169a108d3a9e8d6696a970dea8a0b6 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 23 Sep 2022 11:29:49 +0100 Subject: gentoo auto-resync : 23:09:2022 - 11:29:49 --- app-arch/Manifest.gz | Bin 16758 -> 16765 bytes app-arch/bzip2/Manifest | 2 +- app-arch/bzip2/bzip2-9999.ebuild | 25 ++--- app-arch/rpm/Manifest | 2 + app-arch/rpm/rpm-4.18.0.ebuild | 165 ++++++++++++++++++++++++++++++++ app-arch/xz-utils/Manifest | 2 +- app-arch/xz-utils/xz-utils-5.2.6.ebuild | 2 +- 7 files changed, 180 insertions(+), 18 deletions(-) create mode 100644 app-arch/rpm/rpm-4.18.0.ebuild (limited to 'app-arch') diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz index 74fb40edc65d..f92215268579 100644 Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ diff --git a/app-arch/bzip2/Manifest b/app-arch/bzip2/Manifest index 47b288509091..13c97717083e 100644 --- a/app-arch/bzip2/Manifest +++ b/app-arch/bzip2/Manifest @@ -8,5 +8,5 @@ AUX bzip2-1.0.8-saneso.patch 463 BLAKE2B 83c5a905dbb3dd6481abe7ad7f57f9ce5c5cac8 DIST bzip2-1.0.8.tar.gz 810029 BLAKE2B 22ab3acd84f4db8c3d6f59340c252faedfd4447cea00dafbd652e65b6cf8a20adf6835c22e58563004cfafdb15348c924996230b4b23cae42da5e25eeac4bdad SHA512 083f5e675d73f3233c7930ebe20425a533feedeaaa9d8cc86831312a6581cefbe6ed0d08d2fa89be81082f2a5abdabca8b3c080bf97218a1bd59dc118a30b9f3 DIST bzip2-1.0.8.tar.gz.sig 310 BLAKE2B 0d702dcb19f7738da9f05ee9d719f5cd3653540365e78db143404e599ea54bc6f9d5e6a38cdf5cdd3c6550243d34266343467c6b1db9d5d3c134f9353b00f395 SHA512 4a4a3fa0ec1c10a704b9870e8e629fd007cca55184423c6bfc3049a702fb41e4aeb73bfe9ca7442c27d32d278f1f34f27523a6be67d35b37896acdded12bf40d EBUILD bzip2-1.0.8-r3.ebuild 3343 BLAKE2B b0b9c71705eb40decdb293ac36edfbb9beb03a5d418c9397d575182b1a41b885fc2dffe57fcd2bc41320eb957e87daf4e4b05a534b0b696e1a4cb14bb1862edd SHA512 0d731c721a9c2df13a70ca40a13ce4cffb4f91dfc2787dd5e86fac97b3dc2d1e6bc0e86d58d50905a39b31d08c1890d02478ce61e5f04fbefc895f2113b4f3ff -EBUILD bzip2-9999.ebuild 1693 BLAKE2B 0829df6dfdbe05a41af80c9207d47ee6e88f6a35ddba7b68f1d7146ed0d4e71c30570be50e6f236a44d3dd30df784953eeeef81ad9359917ef9d109657552520 SHA512 2fb7c803f45681335d92ccedc6c0610800d86d620b5ea9d992c1462deb2a1bfcdf27be0d85ad80fbbbe9bae9957228e11aa7ecfe8f3bb6cc8ba0205b50f6697b +EBUILD bzip2-9999.ebuild 1362 BLAKE2B ef5a5447c068dea75b0ffce542583532deee44154ecfa9946ad3a21bb0a4bbd5b09c04d92bffe3da7d77c5f62d2d1200f92436923b443ed8f7e79313f5476db6 SHA512 392f1dee22e823b5973a0fe7c023b48c23769aace842d299a0389ace5ab7809fc67f76fe4e7aa28ba16a404c843a3c54b39ef97043ba89db3586a1e2b0940281 MISC metadata.xml 333 BLAKE2B 88bbfff022309d663b728da241623e9a9dd2cd00d4638cc97c4809433a3645421239d2f51360f9d848617891e7600ad6b63b17acf8c6ecd65a4e355dc1372084 SHA512 15620686ec250b2547fc7ff369c9c0854a7217e731da556db1224896cfd4e63eba836469722b12115e359a9701acea0ac09d7ecc89fa1dbf8683106432f1f9bb diff --git a/app-arch/bzip2/bzip2-9999.ebuild b/app-arch/bzip2/bzip2-9999.ebuild index 38d766cedafc..e463fbf759d7 100644 --- a/app-arch/bzip2/bzip2-9999.ebuild +++ b/app-arch/bzip2/bzip2-9999.ebuild @@ -1,26 +1,28 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit meson-multilib usr-ldscript DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux" -HOMEPAGE="https://gitlab.com/federicomenaquintero/bzip2" -if [[ "${PV}" == 9999 ]] ; then +HOMEPAGE="https://gitlab.com/bzip2/bzip2" +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://gitlab.com/bzip2/bzip2" inherit git-r3 - EGIT_REPO_URI="https://gitlab.com/federicomenaquintero/bzip2.git" else - SRC_URI="" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi + LICENSE="BZIP2" SLOT="0/1" # subslot = SONAME IUSE="static-libs" -RDEPEND="!app-arch/lbzip2[symlink(-)] - !app-arch/pbzip2[symlink(-)]" +RDEPEND=" + !app-arch/lbzip2[symlink(-)] + !app-arch/pbzip2[symlink(-)] +" multilib_src_configure() { local emesonargs=( @@ -35,13 +37,6 @@ multilib_src_configure() { multilib_src_install() { meson_src_install - # Install libbz2.so.1.0 due to accidental soname change in 1.0.7. - # Reference: 98da0ad82192d21ad74ae52366ea8466e2acea24. - # OK to remove one year after 2020-04-11. - if [[ ! -L "${ED}/usr/$(get_libdir)/libbz2.so.1.0" ]]; then - dosym libbz2.so.1 "/usr/$(get_libdir)/libbz2.so.1.0" - fi - if multilib_is_native_abi ; then gen_usr_ldscript -a bz2 @@ -51,7 +46,7 @@ multilib_src_install() { } multilib_src_install_all() { - # move "important" bzip2 binaries to /bin and use the shared libbz2.so + # Move "important" bzip2 binaries to /bin and use the shared libbz2.so dosym bzip2 /bin/bzcat dosym bzip2 /bin/bunzip2 diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest index 15c21f9294f5..f853d8141f2c 100644 --- a/app-arch/rpm/Manifest +++ b/app-arch/rpm/Manifest @@ -2,6 +2,8 @@ AUX rpm-4.17.0-libdir.patch 855 BLAKE2B 81a2daf0577c8dc3feac190764125da7a616e24c AUX rpm-4.8.1-db-path.patch 628 BLAKE2B 69ac0d4541c4d6e74fd716529c4cfd482432d400f84f39775bd585931e786acf45ab7a1da617f0214dcba90c78511ca22fc556896ae1963ec9160787fdaab902 SHA512 12539bbeda99d261890d50304945c7f022681ca0a283c70f17a6b1f188e9e24e9ce05b71d541ed6d951f94576b5183c49c4db784d5016d075a859c1e4dcb9005 DIST rpm-4.17.0.tar.bz2 4514138 BLAKE2B e2618f7ac59189fb880d6be853aae99080b5008865298d095a123a010ab70f9e2e3ad9402124afbf8291a3863e9e805c9c65ab47cc435df82a729e81984394bf SHA512 d32af8649c6d47796a645b6ecbe580df97f5423bfb17414d5ed0016373f5cfab86ebcfad6c480fb8bfafaf3a960f9bc095ef6faad7b40bdb208cc60e4080b0c8 DIST rpm-4.17.1.tar.bz2 4642016 BLAKE2B d82926845e523c82fcf6a985d8de00f7a5bcc981e15d3115c310260713c482dc43e23b43f887644415b5a51ee382297d6d3569b6914595c91b9b89cc813af8e8 SHA512 d0429510140f25a25b6c9441abe2027d27c485bbd4969752f69e1c843435c9508b9f85e5bb68085dd64b7da533801aa5c04d8c9d962e08d2ddd3199d0265cc85 +DIST rpm-4.18.0.tar.bz2 6600013 BLAKE2B 127c3b1427884d04c3db4fc73eb73a978a58241bc740620e3e46c7557d99833092866b5d9c8b4fdf72cd106668d9e5f5cb8c4b918decf1513a82d10258975116 SHA512 c218b811c0c2db368a2919f60742904a4a5abf09dc20804d649eb42f1853d1c21d121086d6014cd210b2040643c37b5d86b53052958cf702ae2e54fe65f1c0ec EBUILD rpm-4.17.0-r2.ebuild 3993 BLAKE2B 5679659f233757cfe4a346402dd5c0b5cb691ca3bdd2898f937ba50396d1980ba08cb8347bd866d579f2ae220fb0351aff0972830b6f15c16e3bfc3f8b92cf23 SHA512 3b6620c0cc78145ba2433571339bf997a9ed9ead43879e697d40979f670b72ccbdd09921130f67c080353979f1d5b50de29ed2668d16463ca5b14ef383a8376e EBUILD rpm-4.17.1.ebuild 4001 BLAKE2B 98d6d5a59213536a24e05d91862d0e6521641464c2754fdcf63c92ad595902236b0c6fbf17a296696ff199fc1c1b30c9e4b9f8b0174c6183328bdba5a086e33b SHA512 00a28d57559f27f4ce2b2790c3127075d8d61d5db706311b3a6d7b3b2f111c7fbfd7c98ce1d88f515ac239a85adaf2771ca6d0727a4dc0430e70fe87668163dd +EBUILD rpm-4.18.0.ebuild 4095 BLAKE2B c97cb6e3aae7c923b96a25218ea437592813f8cfca894083c699666cad48bde1e2534362ff3a59ed90e35c5b01e7ec76eba01b93fa7de8e6ab121f2243590dad SHA512 a1a4a996ab370a37cb3c68346c011322697f4087809300fa528d6b35cd26fcc0a79908170c44f2ec2713f786589c4f70dfaf5481f9e20ab1ae8f6d9a0290be29 MISC metadata.xml 260 BLAKE2B 00f83151d62c157bea18101b36007f01e6da9d16d438671c37b929b1e19cfc202f379816a1b0d9e3faea99c44a43f97a5d43100266c683487dabba09f1378eea SHA512 d6fc386bd5be91d5dff3d7aa514f4d72e7301a47f888db95573d72505ee86987ae6412fdd8aec82842c006abe831d99f6178b1ac78a04a7dbf9e5bce1d249cb7 diff --git a/app-arch/rpm/rpm-4.18.0.ebuild b/app-arch/rpm/rpm-4.18.0.ebuild new file mode 100644 index 000000000000..a9fd82c33c5d --- /dev/null +++ b/app-arch/rpm/rpm-4.18.0.ebuild @@ -0,0 +1,165 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{3,4} ) +PYTHON_COMPAT=( python3_{8..10} ) + +inherit autotools lua-single perl-module python-single-r1 toolchain-funcs + +DESCRIPTION="Red Hat Package Management Utils" +HOMEPAGE="https://rpm.org/ https://github.com/rpm-software-management/rpm" +SRC_URI="https://ftp.osuosl.org/pub/rpm/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2 + http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2" + +LICENSE="GPL-2 LGPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + +# Tests are broken. See bug #657500 +RESTRICT="test" + +IUSE="acl audit caps +berkdb doc dbus nls openmp python readline selinux +sqlite test +zstd" +REQUIRED_USE="${LUA_REQUIRED_USE} + python? ( ${PYTHON_REQUIRED_USE} )" + +DEPEND=" + ${LUA_DEPS} + !app-arch/rpm5 + app-arch/libarchive:= + >=app-arch/bzip2-1.0.1 + app-arch/xz-utils + >=app-crypt/gnupg-1.2 + >=dev-lang/perl-5.8.8 + dev-libs/elfutils + dev-libs/libgcrypt:= + >=dev-libs/popt-1.7 + sys-apps/file + >=sys-libs/zlib-1.2.3-r1 + virtual/libintl + acl? ( virtual/acl ) + audit? ( sys-process/audit ) + caps? ( >=sys-libs/libcap-2.0 ) + dbus? ( sys-apps/dbus ) + readline? ( sys-libs/readline:= ) + sqlite? ( dev-db/sqlite:3 ) + python? ( ${PYTHON_DEPS} ) + nls? ( virtual/libintl ) + zstd? ( app-arch/zstd:= ) +" +BDEPEND=" + virtual/pkgconfig + doc? ( app-doc/doxygen ) + nls? ( sys-devel/gettext ) + test? ( sys-apps/fakechroot ) +" +RDEPEND=" + ${DEPEND} + selinux? ( sec-policy/selinux-rpm ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-4.8.1-db-path.patch + "${FILESDIR}"/${PN}-4.17.0-libdir.patch +) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + lua-single_pkg_setup + + use python && python-single-r1_pkg_setup + + # Added USE=openmp and this check for bug #779769 + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +src_prepare() { + default + + # bug #356769 + sed -i 's:%{_var}/tmp:/var/tmp:' macros.in || die "Fixing tmppath failed" + # bug #492642 + sed -i "s:@__PYTHON@:${PYTHON}:" macros.in || die "Fixing %__python failed" + + # Prevent automake maintainer mode from kicking in (bug #450448). + #touch -r Makefile.am preinstall.am || die + + eautoreconf +} + +src_configure() { + # rpm no longer supports berkdb, but has readonly support. + # https://github.com/rpm-software-management/rpm/commit/4290300e24c5ab17c615b6108f38438e31eeb1d0 + econf \ + --enable-libelf \ + --without-selinux \ + --disable-inhibit-plugin \ + --with-crypto=libgcrypt \ + $(use_enable berkdb bdb-ro) \ + $(use_enable python) \ + $(use_enable nls) \ + $(use_enable openmp) \ + $(use_enable dbus inhibit-plugin) \ + $(use_enable sqlite) \ + $(use_with caps cap) \ + $(use_with acl) \ + $(use_with audit) \ + $(use_with readline) \ + $(use_enable zstd zstd $(usex zstd yes no)) +} + +src_test() { + # Known to fail with FEATURES=usersandbox (bug #657500) + if has usersandbox ${FEATURES} ; then + ewarn "You are emerging ${P} with 'usersandbox' enabled." \ + "Expect some test failures or emerge with 'FEATURES=-usersandbox'!" + fi + + emake check +} + +src_install() { + default + + # Remove la files + find "${ED}" -name '*.la' -delete || die + + # Fix symlinks to /bin/rpm (bug #349840) + for binary in rpmquery rpmverify; do + ln -sf rpm "${ED}"/usr/bin/${binary} || die + done + + if ! use nls; then + rm -rf "${ED}"/usr/share/man/?? || die + fi + + keepdir /usr/src/rpm/{SRPMS,SPECS,SOURCES,RPMS,BUILD} + + dodoc CREDITS README* + if use doc; then + local docname + for docname in librpm; do + docinto "html/${docname}" + dodoc -r "docs/${docname}/html/." + done + fi + + # Fix perllocal.pod file collision + perl_delete_localpod + + use python && python_optimize +} + +pkg_postinst() { + if [[ -f "${EROOT}"/var/lib/rpm/Packages ]] ; then + einfo "RPM database found... Rebuilding database (may take a while)..." + "${EROOT}"/usr/bin/rpmdb --rebuilddb --root="${EROOT}/" || die + else + einfo "No RPM database found... Creating database..." + "${EROOT}"/usr/bin/rpmdb --initdb --root="${EROOT}/" || die + fi +} diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest index 019c5f6bdce9..f126febdfa42 100644 --- a/app-arch/xz-utils/Manifest +++ b/app-arch/xz-utils/Manifest @@ -6,7 +6,7 @@ DIST xz-5.2.6.tar.gz.sig 566 BLAKE2B 7c6114d93b4e3c8553108da3985029fc4585bfea5d7 DIST xz-5.3.3alpha.tar.gz 2119150 BLAKE2B 031e1a1556cbbd49565c2b72676e46a22c00e0e25bca2938c21d56f2d7f585c294d2a3a5712a3ae5d62fe8fef6e7b2f411fcc3c0ccac4714786209599b599d25 SHA512 c780c6854cb7599ed97629dbf923f5c6802b48e12aa25638c863e2403e56557abffb2b501823d4d53c852b7d09360b9ede355989756fef1daa1fa8cd9395da8d DIST xz-5.3.3alpha.tar.gz.sig 566 BLAKE2B 2a02fd8a84c27967384021aa879efdf598b40ca9ff552080be2d057f402b3aace13bb0d98574e0185edd6ee3084793767f9941d4c1f21f5c5d55f886025cb845 SHA512 e6a849f2dd6f67ad3d51f50fe5f3e7f2a57e97e9d89499e2f88b94ab9716f1db5de34c3bb6f17b6fd55498ee5f4653d3d25e1a495b9c682b3200b2603a85479f EBUILD xz-utils-5.2.5-r2.ebuild 2980 BLAKE2B a84114ae0f3f8c76822059aed6880073befa57f27f2384410316063094da31372dbe7ef3c0086ac53ba678566d32b12421a8fa7702ebc30d65b519ffbf3d5732 SHA512 eeba7fd7474a0a868d3579fb472172834c9ccf8c7fcf33e47b6130526dc17cd53251864c19beb06bb4fa94cb8fb79958225e79957d5ec1bcea1a9594125c992b -EBUILD xz-utils-5.2.6.ebuild 2959 BLAKE2B 79badd2e1bdc64213623152970dedad6c567a07d1a660935dfc93d72e2bc092077cea34ce77fe9b66e3587ce645dea53ef7e00532ea3b149a19df7b732d055fd SHA512 61181718d8c3f45179380e6055090e167ed86f67e4df33391f56f116025f347b4e75b0dd431633595264d8ec448d8033ddc75388270834c2690a6b4aca206fc2 +EBUILD xz-utils-5.2.6.ebuild 2952 BLAKE2B 3252abfc8c55f7f4deb1e7650f428cec581c06029336ac47cbf92e62fe1ceeb1d0715724f33675ebc7e1c97db8302c43299928398ff8144db25b56d44dfeb50c SHA512 f5df40b20d551e42824fca656da97d15245d781f6b561036fbd4772cea6f3ddbbb7411ea861d9a71cbbc8ddfc51a1b4200255560a57f49a82f1b11334ca6c51f EBUILD xz-utils-5.3.3_alpha.ebuild 2989 BLAKE2B 230eedf551bdf5859ab6698e7aab2235cdaf3d334bde4d69ef22865b0c7121e59edfaaf095f60a3d567aa786d37909180fc6ace4a66822fa4e1feb0aa298181b SHA512 d4be8929d9c1479f7eb5d73dabd2831608cbcc8227669eb8c4cd453a5a83e7d9ff539db39be39b36c649db4e64ebc908a821f11671cc4e404e5a04f906f7a3e9 EBUILD xz-utils-9999.ebuild 2959 BLAKE2B 79badd2e1bdc64213623152970dedad6c567a07d1a660935dfc93d72e2bc092077cea34ce77fe9b66e3587ce645dea53ef7e00532ea3b149a19df7b732d055fd SHA512 61181718d8c3f45179380e6055090e167ed86f67e4df33391f56f116025f347b4e75b0dd431633595264d8ec448d8033ddc75388270834c2690a6b4aca206fc2 MISC metadata.xml 539 BLAKE2B 57809a0b57c640a42eca00c3cfbec8a549647b82afc6229b904c769b94b3ee109610d412af69cefe6b86c7cce9a7c363cf376bb87c19b5cee96b45bdd980cddc SHA512 5b86a0f7c76d5b33f32e5db91dafe675dc01399659c5304fafd77adf83b403c936019afadeed1f075834bbb31169d60c87c9d9e69783e7c7a720890f512172a7 diff --git a/app-arch/xz-utils/xz-utils-5.2.6.ebuild b/app-arch/xz-utils/xz-utils-5.2.6.ebuild index 6da152d612d9..b71985098e23 100644 --- a/app-arch/xz-utils/xz-utils-5.2.6.ebuild +++ b/app-arch/xz-utils/xz-utils-5.2.6.ebuild @@ -23,7 +23,7 @@ else SRC_URI+=" verify-sig? ( https://tukaani.org/xz/${MY_P}.tar.gz.sig )" if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~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" fi S="${WORKDIR}/${MY_P}" -- cgit v1.2.3