From c8c3804588db08dae281504dd79ef71741cd8dc3 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 23 Mar 2023 12:45:14 +0000 Subject: gentoo auto-resync : 23:03:2023 - 12:45:13 --- sys-apps/Manifest.gz | Bin 49108 -> 49091 bytes sys-apps/pcsc-lite/Manifest | 2 +- sys-apps/pcsc-lite/metadata.xml | 1 + sys-apps/pcsc-tools/Manifest | 4 +- sys-apps/pcsc-tools/metadata.xml | 3 +- sys-apps/pcsc-tools/pcsc-tools-1.6.2.ebuild | 64 +++++++ sys-apps/portage/Manifest | 4 +- sys-apps/portage/portage-3.0.45.3-r1.ebuild | 285 ---------------------------- sys-apps/portage/portage-3.0.45.3-r2.ebuild | 285 ++++++++++++++++++++++++++++ sys-apps/portage/portage-9999.ebuild | 2 +- 10 files changed, 359 insertions(+), 291 deletions(-) create mode 100644 sys-apps/pcsc-tools/pcsc-tools-1.6.2.ebuild delete mode 100644 sys-apps/portage/portage-3.0.45.3-r1.ebuild create mode 100644 sys-apps/portage/portage-3.0.45.3-r2.ebuild (limited to 'sys-apps') diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz index e916d714f0b2..b428e4ccead8 100644 Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ diff --git a/sys-apps/pcsc-lite/Manifest b/sys-apps/pcsc-lite/Manifest index 8bee51fd5731..68dd5319fd6a 100644 --- a/sys-apps/pcsc-lite/Manifest +++ b/sys-apps/pcsc-lite/Manifest @@ -6,4 +6,4 @@ AUX pcscd-udev 330 BLAKE2B 50e99953aec238fe98c6aee5219d3978b44d37c90ce74c9cb8e19 AUX pcscd.conf 32 BLAKE2B 2407e00c654d7e259ebf69ab420800f5605cb3ead23eb4aa07317928c38b6328eae2e566fab84c8844fb80e8a165cd32982fee753498b20c7a750f52fbb1f995 SHA512 ae27cdab8a60201639b9d9aca2d7f760146a5c5238878a0ebb562740385bf58f04bbc37a19cd1a2c8c69ee463f10beecc6531dde733cb6a6d4b06816f54b1569 DIST pcsc-lite-1.9.9.tar.bz2 789914 BLAKE2B 4a28e71e5fb23685f8ef1e0c577157708a3130e2f0eb3cb5d93c4da307d40578a862fce6726f8e4b7c6296b86f953448eb0748412d8933cc2e58a28daf285190 SHA512 748ec3d82ff48af1a8dc5a581863e5d94adc47ab8f3158ceb838c2b521ece3a746b737c7b4bb2ba8b545be85ff18b9639443864e50b2e065cf2fbfdf79ef9700 EBUILD pcsc-lite-1.9.9.ebuild 3335 BLAKE2B f16cd542eecf6d5987c0f74d337fefda3f38e4c24fdd7a395390489552af99108e91bf7f95682c08e45acf2254d87f77cf70b66f67115e9da80fa648bd86b238 SHA512 5f9258b8376612e6de95d1f5e83aaebe2fdc3789da5fd1c5ba16b994e70d27f94e3c46cdc725565f89a9d78ac9ff78afa14c0d873555e0aaa01a855f2110a01d -MISC metadata.xml 1079 BLAKE2B 3d9513402f4eb55c1f67f79eb44fb9b850910960dfe52ec5bc419af6e71621ada842ff4cecf526bee4670264e37bdf0f1f8515f618191deac5cd4a4bf0cb8a72 SHA512 76353b55542f8c4e9096dd5315df06ff772fde7ab4db0d2901fd933f30a3e5b873e50658aedb65c5744e408b9f6b5467d226711b496d21057b16721559bb3e90 +MISC metadata.xml 1165 BLAKE2B 7574a214e85108c9507deae579da38edca6cca7fcdc20fe8295ded39067f4de37d966f96522f21aec7530e27c76d14d8490ff672f35af3601d6dbb0d33813395 SHA512 22ee7464a81a4c2d7bbf0dd9c6713f20c06aba47dd5e3f6a6e71fc3addf03636b3d17aebdc5d97926e892c01510579c19bdf7ed291720f135bdce70828ee420c diff --git a/sys-apps/pcsc-lite/metadata.xml b/sys-apps/pcsc-lite/metadata.xml index 4813f135e4b7..0f53bd7be602 100644 --- a/sys-apps/pcsc-lite/metadata.xml +++ b/sys-apps/pcsc-lite/metadata.xml @@ -12,6 +12,7 @@ Uses sys-auth/polkit to restrict access to smartcard readers or smartcards to given users. + https://salsa.debian.org/rousseau/PCSC/blob/master/ChangeLog LudovicRousseau/PCSC diff --git a/sys-apps/pcsc-tools/Manifest b/sys-apps/pcsc-tools/Manifest index a9a2544dd9a1..d9f96cea8512 100644 --- a/sys-apps/pcsc-tools/Manifest +++ b/sys-apps/pcsc-tools/Manifest @@ -1,6 +1,8 @@ AUX smartcard.cron 319 BLAKE2B fac8c4360b802de32ff5b0fc5c2ef41aacc28186001ee6f4f3a1cd878ed75cae3f7f78aaad58580d11a695b3fd624fdd412669c743b951818de1aef6d9d4cdf0 SHA512 cb34e75090ff0fde349b81867383ed776b4c89672039f42426e27d2fce77ba0575827d2627b82fc9c435d6091b26e7c2a0e51dbcd1bdd1c883b8c37000ed516e DIST pcsc-tools-1.6.0.tar.bz2 304960 BLAKE2B a60d280d39689d7eaa407aa5857c63af0acda3791e5d9f5c2f62048260178dc728fb179aed3c369340e192ba9b3d5db04bacbe5cc6ef1519c7cde55e10ca6b45 SHA512 951014510dcfd011fc08c92a927ed8a39751c15cd9278e9bd61693a2743a82d4b88907e01e013738f6b5afb569cb4d9e9802ee575c731b83da33e92f96eb5d50 DIST pcsc-tools-1.6.1.tar.bz2 313105 BLAKE2B 62169f4bab81cfe137098b863ae572df283498f7fcb6b6ecaef9122ccc530d6201805b13903826887c70363443d02e43d0d0fb88e15d5f634fc0e1e775c3ecaf SHA512 fc1a6bdea55ee1194d08998f229870b7fb65f53b3b5ddb209540980d95dab8dfb62d4bc865716d0120bb843d5095b0ad9286c42ad352e52c1cfe48ef28b5adaf +DIST pcsc-tools-1.6.2.tar.bz2 320182 BLAKE2B 88a76f4120a183df909ce9d189e38e51897080839ebe7ca85aa4447a441363e6917ddb1c5e6c0e881c8792078700676ad1cfe24609957a4fef54374d5be824a4 SHA512 20104baefa7928a86d21cee49d045cc35b8e74fec5be79ba5608ae046a110096efae96768d281e0f1350f71a889f89c675336d8264c75f8423369a49c03b42a8 EBUILD pcsc-tools-1.6.0.ebuild 1390 BLAKE2B 7faab3fc2f66bcff8f46fa4a892eac268bd3dfc9acd1e5c655bd2fd242b025dde9d0af58d4798f756515279377da1a59db7ca975fb2b6d3639249bae5188b6bd SHA512 1381dae367689c8bafa9867b1eea875ad8e623a12ac4aa0bb1950d7a9cb2d118d0f92fb4988680bb1a718f07af50b19a05849eb6470b4551533bf86890bcde3c EBUILD pcsc-tools-1.6.1.ebuild 1390 BLAKE2B fe8027aed9f82d103ee67f3192f402d2fd5b02dd91032f3f26c7f61a1f8c16b9c19ddb132d87477b59bd83da3742feb53a8f1a640a1ddcdb527beb0ec58548fc SHA512 58eb4058aa8a91e8fab0816471c054df666eae8cb62db10e71a16cb8eeee6ca230c17f7cdfd8d042eabd314d8ef700541d77612372a7b75980d6fe8c47cdd10b -MISC metadata.xml 448 BLAKE2B f642f8f9a269fe6e3b082d4c17e2ab2c8aeb67ddcfd7a5bdaf66a95aedd6ffcfe0bcc936ad2c5e24904dd15814d61e609afc055ca5b6613cc854bc802cddb239 SHA512 feb5f0c59a283bd5f42b48cbd7fd148cd0716566438dd76c254732a9fea6e886c5e1d5416dff3c419a5fb77a03e240b3c399b0d7d81ee41ee09c02b590205d86 +EBUILD pcsc-tools-1.6.2.ebuild 1347 BLAKE2B ec8944d34fe19eb087da989a09c4afd88ee2d3571346f416b10212b0878f748b75a9fc56639d325faa9b6446751ff4869903254332bb30e4547062566dd42d01 SHA512 f2d37759442b028d20bd4cff7e9803dc3a5b75e740d428316a43e2c05678c4895a75c7bdb2c77ca85e21b09999b111bfdb98a17319d5ba84431c98edc4447e5f +MISC metadata.xml 530 BLAKE2B f9a0c7d8938d6dd2616fc62108c567ac598d880cca2e7b43f8c4c6ce53799a340a319015f2c0bae0ee8cf0a62cb5d52722d070e01d45bc38837e4e87fb0e709b SHA512 22ccf135d86a9eeb75a0b3369c5931420a88dddf679bd1de70c8c34fee5920c188931660c29d00394b40041c7ac8af0e549d90a24d2213b5a53ac5202f16c5d7 diff --git a/sys-apps/pcsc-tools/metadata.xml b/sys-apps/pcsc-tools/metadata.xml index e0feb13228a3..430a76d4135c 100644 --- a/sys-apps/pcsc-tools/metadata.xml +++ b/sys-apps/pcsc-tools/metadata.xml @@ -6,9 +6,10 @@ Gentoo Base System - Monthly cronjob the update-smartcard_list script + Install a monthly cronjob to update the update-smartcard_list script + https://pcsc-tools.apdu.fr/Changelog LudovicRousseau/pcsc-tools diff --git a/sys-apps/pcsc-tools/pcsc-tools-1.6.2.ebuild b/sys-apps/pcsc-tools/pcsc-tools-1.6.2.ebuild new file mode 100644 index 000000000000..4effc00f4cbf --- /dev/null +++ b/sys-apps/pcsc-tools/pcsc-tools-1.6.2.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop toolchain-funcs xdg-utils + +DESCRIPTION="PC/SC Architecture smartcard tools" +HOMEPAGE="https://pcsc-tools.apdu.fr/ https://github.com/LudovicRousseau/pcsc-tools" +SRC_URI="https://pcsc-tools.apdu.fr/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86" +IUSE="gui network-cron" + +DEPEND=">=sys-apps/pcsc-lite-1.4.14" +RDEPEND=" + ${DEPEND} + dev-perl/pcsc-perl + gui? ( dev-perl/Gtk3 ) +" +BDEPEND="virtual/pkgconfig" + +DOCS=( + README Changelog +) + +src_compile() { + # explicitly only build the pcsc_scan application, or the man + # pages will be gzipped first, and then unpacked. + emake pcsc_scan CC="$(tc-getCC)" +} + +src_install() { + einstalldocs + + # install manually, makes it much easier since the Makefile + # requires fiddling with + dobin ATR_analysis scriptor pcsc_scan + doman pcsc_scan.1 scriptor.1p ATR_analysis.1p + + if use gui; then + domenu gscriptor.desktop + dobin gscriptor + doman gscriptor.1p + fi + + if use network-cron ; then + exeinto /etc/cron.monthly + newexe "${FILESDIR}"/smartcard.cron update-smartcard_list + fi + + insinto /usr/share/pcsc + doins smartcard_list.txt +} + +pkg_postinst() { + use gui && xdg_desktop_database_update +} + +pkg_postrm() { + xdg_desktop_database_update +} diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index 7f74f2694ea3..60e325bee707 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -8,6 +8,6 @@ DIST portage-3.0.45.3.tar.bz2 1146552 BLAKE2B 0506124bf47d71df699c2ecb2846b19f68 EBUILD portage-3.0.43-r1.ebuild 9141 BLAKE2B 65ef9a74f548093ee70a068bca2084ae3abb0e3eb697481c07f1f3c7ff29b89cefa692254d12cdd7b1465538151fd6bb9e1920271aed72f2d84f517544cdcda6 SHA512 986464312f8a919543eb6db4d2c5e4d418c2cc3bd9508ee6eb4ed6f19ec05a3a4bc6c450df25f9e068a0f858cc621159022aef0d3b97f00b2e3dd97a985c40e3 EBUILD portage-3.0.44-r1.ebuild 9169 BLAKE2B 083c35995b4cd8b633e49a8732589577b9a6cb08ef16a66f0c3e38b10be5bc3e1f8181b2e6be0d30d0bfde94b4c485d767aff47849e82fb511260e5e755c30f6 SHA512 8802ab4408e6e57c9fb9ef71515054d85a42e9a0ee54b38e6c362c0c2c1cff3a4fe1d3514f4f35479557421fd2110736ff4948f814154b7afc4eef06dfd48ec0 EBUILD portage-3.0.45.2-r1.ebuild 8999 BLAKE2B 9c2f4a6e96ebd87371cf29854ce4d27093f375093cf8a2c23e8b4cdbbec942dd8a84989c28ce9d9ba5a5b4f0db95e1ffb526faad738a34d233060351d74e6572 SHA512 8950bebdb20689fec9e2a8b4afc897c7621374229f9084454df2ac2bc4dd37deac81662476dcd85a63279ceb96ff15a811143d721712fba41e8e63292b4f4eb2 -EBUILD portage-3.0.45.3-r1.ebuild 8999 BLAKE2B 9c2f4a6e96ebd87371cf29854ce4d27093f375093cf8a2c23e8b4cdbbec942dd8a84989c28ce9d9ba5a5b4f0db95e1ffb526faad738a34d233060351d74e6572 SHA512 8950bebdb20689fec9e2a8b4afc897c7621374229f9084454df2ac2bc4dd37deac81662476dcd85a63279ceb96ff15a811143d721712fba41e8e63292b4f4eb2 -EBUILD portage-9999.ebuild 8237 BLAKE2B a02fd55eb8ca0ea132e9b1ef30a9b256e92db9d1728bb6f9b4d376736aa2fab71143e0da0eab4e4c85458b9802b486d1e09cb173122f6ee61d5786a44ef3ed45 SHA512 97c81bb2dc66297e523e4f7e9c52f3b3e83a2dc4a5791b888325e263d43b7732d17e89930f97e0c56d4576685c83b8fb34c39ee6c4ab0bb7c2a353870391ef48 +EBUILD portage-3.0.45.3-r2.ebuild 9017 BLAKE2B 4c816d11e96e9b139aa46616350939bf75ed440db5f73dd814aafbede01351edf143275e9107f1d449f8d14f8557533e1978b963a5a3a8270f19779c0d5f3b6a SHA512 7a76b5a9224c3535f28794b7a7ddd96fd35a7350edd0f70ae310ebc124c9470a30d3efaaa65a4e2a1e0570f95e110a3068984aa4805b6d596f1994cddde16b43 +EBUILD portage-9999.ebuild 8255 BLAKE2B ad0ff30ae513e4da3aafa3add484d06afcc00ddea9b0e95b6bde83f0fdcbd8cfe37614db88e151bdd97a2350fca57cb4acc0f1b1f4e080f748a1692db38dc310 SHA512 535fa7616a578e8c7417898757f8e8116cce7b144df0cd1052f147efbd7be1c4dda4667a8d748f02c2f86d12f21125a14120f49718dea1be7fc7b5fff6f43971 MISC metadata.xml 1539 BLAKE2B 0efa1ae365449d6593909046c32158a9f6755aa9252c34ae00eb866dd29a0b6a5c2e7a4af9293d0f87c4dd9231132fc5361acb0818fb6beff6dd6fbbdc6f409b SHA512 675f5baa1b3079592e3930b11ca18f324e27c42b5515f9ae815a26e53a465640fa6e9c4069df0e2121932b9f1cc73f2c9469c1529728f3c5ed5c3e687743ac0d diff --git a/sys-apps/portage/portage-3.0.45.3-r1.ebuild b/sys-apps/portage/portage-3.0.45.3-r1.ebuild deleted file mode 100644 index 069c7557fe50..000000000000 --- a/sys-apps/portage/portage-3.0.45.3-r1.ebuild +++ /dev/null @@ -1,285 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( pypy3 python3_{9..11} ) -PYTHON_REQ_USE='bzip2(+),threads(+)' -TMPFILES_OPTIONAL=1 - -inherit distutils-r1 linux-info toolchain-funcs tmpfiles prefix - -DESCRIPTION="The package management and distribution system for Gentoo" -HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" -SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2" - -LICENSE="GPL-2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -SLOT="0" -IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr" -RESTRICT="!test? ( test )" - -BDEPEND=" - app-arch/xz-utils - test? ( dev-vcs/git ) -" -DEPEND=" - !build? ( $(python_gen_impl_dep 'ssl(+)') ) - >=app-arch/tar-1.27 - dev-lang/python-exec:2 - >=sys-apps/sed-4.0.5 sys-devel/patch - doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) - apidoc? ( - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/sphinx-epytext[${PYTHON_USEDEP}] - ) -" -# Require sandbox-2.2 for bug #288863. -# For whirlpool hash, require python[ssl] (bug #425046). -# For compgen, require bash[readline] (bug #445576). -# app-portage/gemato goes without PYTHON_USEDEP since we're calling -# the executable. -RDEPEND=" - acct-user/portage - app-arch/zstd - >=app-arch/tar-1.27 - dev-lang/python-exec:2 - >=sys-apps/baselayout-2.9 - >=sys-apps/findutils-4.4 - !build? ( - >=sys-apps/sed-4.0.5 - >=app-shells/bash-5.0:0[readline] - >=app-admin/eselect-1.2 - rsync-verify? ( - >=app-portage/gemato-14.5[${PYTHON_USEDEP}] - >=sec-keys/openpgp-keys-gentoo-release-20220101 - >=app-crypt/gnupg-2.2.4-r2[ssl(-)] - ) - ) - elibc_glibc? ( >=sys-apps/sandbox-2.2 ) - elibc_musl? ( >=sys-apps/sandbox-2.2 ) - kernel_linux? ( sys-apps/util-linux ) - >=app-misc/pax-utils-0.1.17 - selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] ) - xattr? ( kernel_linux? ( - >=sys-apps/install-xattr-0.3 - ) ) - !> cnf/make.globals || die - fi - - if use native-extensions && ! tc-is-cross-compiler; then - printf "[build_ext]\nportage_ext_modules=true\n" >> \ - setup.cfg || die - fi - - if ! use ipc ; then - einfo "Disabling ipc..." - sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \ - -i lib/_emerge/AbstractEbuildProcess.py || \ - die "failed to patch AbstractEbuildProcess.py" - fi - - if use xattr && use kernel_linux ; then - einfo "Adding FEATURES=xattr to make.globals ..." - echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \ - || die "failed to append to make.globals" - fi - - if use build || ! use rsync-verify; then - sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \ - -e '/^sync-webrsync-verify-signature/s|yes|no|' \ - -i cnf/repos.conf || die "sed failed" - fi - - if [[ -n ${EPREFIX} ]] ; then - einfo "Setting portage.const.EPREFIX ..." - hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \ - -w "/_BINARY/" lib/portage/const.py - - einfo "Prefixing shebangs ..." - > "${T}/shebangs" || die - while read -r -d $'\0' ; do - local shebang=$(head -n1 "$REPLY") - if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then - echo "${REPLY}" >> "${T}/shebangs" || die - fi - done < <(find . -type f -executable ! -name etc-update -print0) - - if [[ -s ${T}/shebangs ]]; then - xargs sed -i -e "1s:^#!:#!${EPREFIX}:" < "${T}/shebangs" || die "sed failed" - fi - - einfo "Adjusting make.globals, repos.conf and etc-update ..." - hprefixify cnf/{make.globals,repos.conf} bin/etc-update - - if use prefix-guest ; then - sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \ - -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \ - -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \ - -i cnf/repos.conf || die "sed failed" - fi - fi - - cd "${S}/cnf" || die - if [[ -f "make.conf.example.${ARCH}".diff ]] ; then - patch make.conf.example "make.conf.example.${ARCH}".diff || \ - die "Failed to patch make.conf.example" - else - eerror "" - eerror "Portage does not have an arch-specific configuration for this arch." - eerror "Please notify the arch maintainer about this issue. Using generic." - eerror "" - fi -} - -python_compile_all() { - local targets=() - use doc && targets+=( docbook ) - use apidoc && targets+=( apidoc ) - - if [[ ${targets[@]} ]]; then - esetup.py "${targets[@]}" - fi -} - -python_test() { - esetup.py test -} - -python_install() { - # Install sbin scripts to bindir for python-exec linking - # they will be relocated in pkg_preinst() - distutils-r1_python_install \ - --system-prefix="${EPREFIX}/usr" \ - --bindir="$(python_get_scriptdir)" \ - --docdir="${EPREFIX}/usr/share/doc/${PF}" \ - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \ - --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \ - --sbindir="$(python_get_scriptdir)" \ - --sysconfdir="${EPREFIX}/etc" \ - "${@}" -} - -python_install_all() { - distutils-r1_python_install_all - - local targets=() - use doc && targets+=( - install_docbook - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" - ) - use apidoc && targets+=( - install_apidoc - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" - ) - - # install docs - if [[ ${targets[@]} ]]; then - esetup.py "${targets[@]}" - fi - - dotmpfiles "${FILESDIR}"/portage-{ccache,tmpdir}.conf - - # Due to distutils/python-exec limitations - # these must be installed to /usr/bin. - local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld' - einfo "Moving admin scripts to the correct directory" - dodir /usr/sbin - for target in ${sbin_relocations}; do - einfo "Moving /usr/bin/${target} to /usr/sbin/${target}" - mv "${ED}/usr/bin/${target}" "${ED}/usr/sbin/${target}" || die "sbin scripts move failed!" - done -} - -pkg_preinst() { - if ! use build; then - python_setup - local sitedir=$(python_get_sitedir) - [[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory" - env -u DISTDIR \ - -u PORTAGE_OVERRIDE_EPREFIX \ - -u PORTAGE_REPOSITORIES \ - -u PORTDIR \ - -u PORTDIR_OVERLAY \ - PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ - "${PYTHON}" -m portage._compat_upgrade.default_locations || die - - env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \ - PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ - "${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die - - env -u FEATURES -u PORTAGE_REPOSITORIES \ - PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ - "${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die - fi - - # elog dir must exist to avoid logrotate error for bug #415911. - # This code runs in preinst in order to bypass the mapping of - # portage:portage to root:root which happens after src_install. - keepdir /var/log/portage/elog - # This is allowed to fail if the user/group are invalid for prefix users. - if chown portage:portage "${ED}"/var/log/portage{,/elog} 2>/dev/null ; then - chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog} - fi - - if has_version "<${CATEGORY}/${PN}-2.3.77"; then - elog "The emerge --autounmask option is now disabled by default, except for" - elog "portions of behavior which are controlled by the --autounmask-use and" - elog "--autounmask-license options. For backward compatibility, previous" - elog "behavior of --autounmask=y and --autounmask=n is entirely preserved." - elog "Users can get the old behavior simply by adding --autounmask to the" - elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this" - elog "change, see https://bugs.gentoo.org/658648." - fi -} - -pkg_postinst() { - # Warn about obsolete "enotice" script, bug #867010 - local bashrc=${EROOT}/etc/portage/profile/profile.bashrc - if [[ -e ${bashrc} ]] && grep -q enotice "${bashrc}"; then - eerror "Obsolete 'enotice' script detected!" - eerror "Please remove this from ${bashrc} to avoid problems." - eerror "See bug 867010 for more details." - fi -} diff --git a/sys-apps/portage/portage-3.0.45.3-r2.ebuild b/sys-apps/portage/portage-3.0.45.3-r2.ebuild new file mode 100644 index 000000000000..77fa14500ba4 --- /dev/null +++ b/sys-apps/portage/portage-3.0.45.3-r2.ebuild @@ -0,0 +1,285 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( pypy3 python3_{9..11} ) +PYTHON_REQ_USE='bzip2(+),threads(+)' +TMPFILES_OPTIONAL=1 + +inherit distutils-r1 linux-info toolchain-funcs tmpfiles prefix + +DESCRIPTION="The package management and distribution system for Gentoo" +HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" +SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2" + +LICENSE="GPL-2" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +SLOT="0" +IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr" +RESTRICT="!test? ( test )" + +BDEPEND=" + app-arch/xz-utils + test? ( dev-vcs/git ) +" +DEPEND=" + !build? ( $(python_gen_impl_dep 'ssl(+)') ) + >=app-arch/tar-1.27 + dev-lang/python-exec:2 + >=sys-apps/sed-4.0.5 sys-devel/patch + doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) + apidoc? ( + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/sphinx-epytext[${PYTHON_USEDEP}] + ) +" +# Require sandbox-2.2 for bug #288863. +# For whirlpool hash, require python[ssl] (bug #425046). +# For compgen, require bash[readline] (bug #445576). +# app-portage/gemato goes without PYTHON_USEDEP since we're calling +# the executable. +RDEPEND=" + acct-user/portage + app-arch/zstd + >=app-arch/tar-1.27 + dev-lang/python-exec:2 + >=sys-apps/baselayout-2.9 + >=sys-apps/findutils-4.4 + !build? ( + >=sys-apps/sed-4.0.5 + >=app-shells/bash-5.0:0[readline] + >=app-admin/eselect-1.2 + rsync-verify? ( + >=app-portage/gemato-14.5[${PYTHON_USEDEP}] + >=sec-keys/openpgp-keys-gentoo-release-20220101 + >=app-crypt/gnupg-2.2.4-r2[ssl(-)] + ) + ) + elibc_glibc? ( >=sys-apps/sandbox-2.2 ) + elibc_musl? ( >=sys-apps/sandbox-2.2 ) + kernel_linux? ( sys-apps/util-linux ) + >=app-misc/pax-utils-0.1.17 + selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] ) + xattr? ( kernel_linux? ( + >=sys-apps/install-xattr-0.3 + ) ) + !> cnf/make.globals || die + fi + + if use native-extensions && ! tc-is-cross-compiler; then + printf "[build_ext]\nportage_ext_modules=true\n" >> \ + setup.cfg || die + fi + + if ! use ipc ; then + einfo "Disabling ipc..." + sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \ + -i lib/_emerge/AbstractEbuildProcess.py || \ + die "failed to patch AbstractEbuildProcess.py" + fi + + if use xattr && use kernel_linux ; then + einfo "Adding FEATURES=xattr to make.globals ..." + echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \ + || die "failed to append to make.globals" + fi + + if use build || ! use rsync-verify; then + sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \ + -e '/^sync-webrsync-verify-signature/s|yes|no|' \ + -i cnf/repos.conf || die "sed failed" + fi + + if [[ -n ${EPREFIX} ]] ; then + einfo "Setting portage.const.EPREFIX ..." + hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \ + -w "/_BINARY/" lib/portage/const.py + + einfo "Prefixing shebangs ..." + > "${T}/shebangs" || die + while read -r -d $'\0' ; do + local shebang=$(head -n1 "$REPLY") + if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then + echo "${REPLY}" >> "${T}/shebangs" || die + fi + done < <(find . -type f -executable ! -name etc-update -print0) + + if [[ -s ${T}/shebangs ]]; then + xargs sed -i -e "1s:^#!:#!${EPREFIX}:" < "${T}/shebangs" || die "sed failed" + fi + + einfo "Adjusting make.globals, repos.conf and etc-update ..." + hprefixify cnf/{make.globals,repos.conf} bin/etc-update + + if use prefix-guest ; then + sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \ + -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \ + -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \ + -i cnf/repos.conf || die "sed failed" + fi + fi + + cd "${S}/cnf" || die + if [[ -f "make.conf.example.${ARCH}".diff ]] ; then + patch make.conf.example "make.conf.example.${ARCH}".diff || \ + die "Failed to patch make.conf.example" + else + eerror "" + eerror "Portage does not have an arch-specific configuration for this arch." + eerror "Please notify the arch maintainer about this issue. Using generic." + eerror "" + fi +} + +python_compile_all() { + local targets=() + use doc && targets+=( docbook ) + use apidoc && targets+=( apidoc ) + + if [[ ${targets[@]} ]]; then + esetup.py "${targets[@]}" + fi +} + +python_test() { + esetup.py test +} + +python_install() { + # Install sbin scripts to bindir for python-exec linking + # they will be relocated in pkg_preinst() + distutils-r1_python_install \ + --system-prefix="${EPREFIX}/usr" \ + --bindir="$(python_get_scriptdir)" \ + --docdir="${EPREFIX}/usr/share/doc/${PF}" \ + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \ + --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \ + --sbindir="$(python_get_scriptdir)" \ + --sysconfdir="${EPREFIX}/etc" \ + "${@}" +} + +python_install_all() { + distutils-r1_python_install_all + + local targets=() + use doc && targets+=( + install_docbook + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" + ) + use apidoc && targets+=( + install_apidoc + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" + ) + + # install docs + if [[ ${targets[@]} ]]; then + esetup.py "${targets[@]}" + fi + + dotmpfiles "${FILESDIR}"/portage-{ccache,tmpdir}.conf + + # Due to distutils/python-exec limitations + # these must be installed to /usr/bin. + local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld' + einfo "Moving admin scripts to the correct directory" + dodir /usr/sbin + for target in ${sbin_relocations}; do + einfo "Moving /usr/bin/${target} to /usr/sbin/${target}" + mv "${ED}/usr/bin/${target}" "${ED}/usr/sbin/${target}" || die "sbin scripts move failed!" + done +} + +pkg_preinst() { + if ! use build; then + python_setup + local sitedir=$(python_get_sitedir) + [[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory" + env -u DISTDIR \ + -u PORTAGE_OVERRIDE_EPREFIX \ + -u PORTAGE_REPOSITORIES \ + -u PORTDIR \ + -u PORTDIR_OVERLAY \ + PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ + "${PYTHON}" -m portage._compat_upgrade.default_locations || die + + env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \ + PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ + "${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die + + env -u FEATURES -u PORTAGE_REPOSITORIES \ + PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ + "${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die + fi + + # elog dir must exist to avoid logrotate error for bug #415911. + # This code runs in preinst in order to bypass the mapping of + # portage:portage to root:root which happens after src_install. + keepdir /var/log/portage/elog + # This is allowed to fail if the user/group are invalid for prefix users. + if chown portage:portage "${ED}"/var/log/portage{,/elog} 2>/dev/null ; then + chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog} + fi + + if has_version "<${CATEGORY}/${PN}-2.3.77"; then + elog "The emerge --autounmask option is now disabled by default, except for" + elog "portions of behavior which are controlled by the --autounmask-use and" + elog "--autounmask-license options. For backward compatibility, previous" + elog "behavior of --autounmask=y and --autounmask=n is entirely preserved." + elog "Users can get the old behavior simply by adding --autounmask to the" + elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this" + elog "change, see https://bugs.gentoo.org/658648." + fi +} + +pkg_postinst() { + # Warn about obsolete "enotice" script, bug #867010 + local bashrc=${EROOT}/etc/portage/profile/profile.bashrc + if [[ -e ${bashrc} ]] && grep -q enotice "${bashrc}"; then + eerror "Obsolete 'enotice' script detected!" + eerror "Please remove this from ${bashrc} to avoid problems." + eerror "See bug 867010 for more details." + fi +} diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild index 90005674f456..d25ac103a8dd 100644 --- a/sys-apps/portage/portage-9999.ebuild +++ b/sys-apps/portage/portage-9999.ebuild @@ -97,7 +97,7 @@ python_prepare_all() { die "failed to patch create_depgraph_params.py" einfo "Enabling additional FEATURES for gentoo-dev..." - echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir"' \ + echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir warn-on-large-env"' \ >> cnf/make.globals || die fi -- cgit v1.2.3