From 24a48769f03b243065aec42c384c39a2d2306964 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 28 Feb 2023 10:03:38 +0000 Subject: gentoo auto-resync : 28:02:2023 - 10:03:37 --- sys-apps/Manifest.gz | Bin 48973 -> 48956 bytes sys-apps/accountsservice/Manifest | 3 +- .../accountsservice-22.08.8-r1.ebuild | 87 +++++++ .../accountsservice/accountsservice-22.08.8.ebuild | 86 ------- ...accountsservice-22.08.8-configure-clang16.patch | 33 +++ sys-apps/less/Manifest | 8 +- sys-apps/less/less-618_beta.ebuild | 69 ----- sys-apps/less/less-623_beta.ebuild | 77 ------ sys-apps/less/less-629_beta.ebuild | 80 ++++++ sys-apps/less/less-9999.ebuild | 5 +- sys-apps/portage/Manifest | 3 +- ...ge-3.0.45.1-qa-notice-configure-func-decl.patch | 29 +++ sys-apps/portage/portage-3.0.45.1-r1.ebuild | 284 -------------------- sys-apps/portage/portage-3.0.45.1-r2.ebuild | 285 +++++++++++++++++++++ 14 files changed, 525 insertions(+), 524 deletions(-) create mode 100644 sys-apps/accountsservice/accountsservice-22.08.8-r1.ebuild delete mode 100644 sys-apps/accountsservice/accountsservice-22.08.8.ebuild create mode 100644 sys-apps/accountsservice/files/accountsservice-22.08.8-configure-clang16.patch delete mode 100644 sys-apps/less/less-618_beta.ebuild delete mode 100644 sys-apps/less/less-623_beta.ebuild create mode 100644 sys-apps/less/less-629_beta.ebuild create mode 100644 sys-apps/portage/files/portage-3.0.45.1-qa-notice-configure-func-decl.patch delete mode 100644 sys-apps/portage/portage-3.0.45.1-r1.ebuild create mode 100644 sys-apps/portage/portage-3.0.45.1-r2.ebuild (limited to 'sys-apps') diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz index 541527544679..ccd2bf944796 100644 Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ diff --git a/sys-apps/accountsservice/Manifest b/sys-apps/accountsservice/Manifest index ee269a7bdb0b..6bc50e31a7ab 100644 --- a/sys-apps/accountsservice/Manifest +++ b/sys-apps/accountsservice/Manifest @@ -1,4 +1,5 @@ AUX accountsservice-22.04.62-gentoo-system-users.patch 1318 BLAKE2B 69c74ad620cebd6864efff7ad87401a72ea5f644a773a682653b45584e34755aaf12a0e79ba816c990b0af2784d01fec5e8b657699ecfc7c38343330a36fda57 SHA512 a85a6ca785a3863d96eae39bc3eee5fe89bedd0bdae40cd6bc2e077bb88f72d73d0be63dcf0e0a788f0f5d69ed39801c9ede623afe8ed08c94372314b1fddd09 +AUX accountsservice-22.08.8-configure-clang16.patch 1247 BLAKE2B 2a4a99498f9ae1b6e6e84824918f0961719ef4ea9e2b18171e12b263a51953dcd1be055dfc0b3824821eebd863b33a9ac29b3f619be179d529901e117ca69b88 SHA512 08b409cb8b2a5301a98ca9986b3f33c9cd46ca98a24f273c6d495967a69af447c85bdfd25e5de28adcefc99b8141b9dd77d393bb92d758bf6c7fff1e1ad982ce DIST accountsservice-22.08.8.tar.xz 102672 BLAKE2B 7c9436d3845fc1883772b434c4f9e2fba934d17e6d4452a6be65e1d790a23b331eaaa64b0e6eff6fefe79587a40cf1749a0f3de09f323b10740046bd9d145c9d SHA512 2ca3ceb1b44338d9924b86788256d4eef7ec10e0c2197bfb8cc6c31ae224fab3051f03cb406a526f90057684965bef4ba0f2cc01b26198ec1fc6baec36ad3ff8 -EBUILD accountsservice-22.08.8.ebuild 2028 BLAKE2B e914869415acba107cbdfe1780e86c0c941885943681803b12f33cef83dd48fa5e038e40c43e7a64688d2ac45052e787a04e8eddbaa7d203e617c08ccb1f493f SHA512 8065d821748afcdbc4ab663fe8dcb0ef017661bf5cd1f2b947418bf9257fff31c2b06c80efec6d96a93388ad2f388d02b675ac719109260d8b8a2642f87e8297 +EBUILD accountsservice-22.08.8-r1.ebuild 2072 BLAKE2B 0d3d8951ea62de17377f67fc3aee88aa89c5c319c5136141ae2c65b65a9f8fcb8326e74f561665839dcd62db26a9e241dd8f6988779cc4c4c597ea0126a4e873 SHA512 51ed97b523545d2efc98c51fc4f9599566d06bb1f5556df33c033cfd8f1ed32c26d9f466c4ba13ebf01112f0b8b853251975041c05a588113b516387fab1c2d0 MISC metadata.xml 559 BLAKE2B c43012a95ec8ddd3ce687f69b4dc1889c82f31828f8e1f53bded7723b82c2a8faff594674fbd819370078dc13f48f51df45a3a280563c6a00080e5332128498c SHA512 6c1e1e291bcd11a06fe4e7b73031accdf0fe839cb7372f96d1cc52e5c1a1a1b032adcf0da7dde016331fefcb1ae1402386ba3ab2713b4256e9e60dd2b73f76f5 diff --git a/sys-apps/accountsservice/accountsservice-22.08.8-r1.ebuild b/sys-apps/accountsservice/accountsservice-22.08.8-r1.ebuild new file mode 100644 index 000000000000..738666099808 --- /dev/null +++ b/sys-apps/accountsservice/accountsservice-22.08.8-r1.ebuild @@ -0,0 +1,87 @@ +# Copyright 2011-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{9..11} ) +inherit meson python-any-r1 systemd + +DESCRIPTION="D-Bus interfaces for querying and manipulating user account information" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/AccountsService/" +SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86" + +IUSE="doc elogind gtk-doc +introspection selinux systemd test" +RESTRICT="!test? ( test )" +REQUIRED_USE="^^ ( elogind systemd )" + +CDEPEND=" + >=dev-libs/glib-2.63.5:2 + sys-auth/polkit + virtual/libcrypt:= + elogind? ( >=sys-auth/elogind-229.4 ) + introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) + systemd? ( >=sys-apps/systemd-186:0= ) +" +DEPEND="${CDEPEND}" +BDEPEND=" + dev-libs/libxslt + dev-util/gdbus-codegen + sys-devel/gettext + virtual/pkgconfig + doc? ( + app-text/docbook-xml-dtd:4.1.2 + app-text/xmlto + ) + gtk-doc? ( + dev-util/gtk-doc + app-text/docbook-xml-dtd:4.3 + ) + test? ( + $(python_gen_any_dep ' + dev-python/python-dbusmock[${PYTHON_USEDEP}] + ') + ) +" +RDEPEND="${CDEPEND} + selinux? ( sec-policy/selinux-accountsd ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-22.04.62-gentoo-system-users.patch + "${FILESDIR}"/${P}-configure-clang16.patch +) + +python_check_deps() { + if use test; then + python_has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]" + fi +} + +src_configure() { + local emesonargs=( + --localstatedir="${EPREFIX}/var" + -Dsystemdsystemunitdir="$(systemd_get_systemunitdir)" + -Dadmin_group="wheel" + $(meson_use elogind) + $(meson_use introspection) + $(meson_use doc docbook) + $(meson_use gtk-doc gtk_doc) + -Dvapi=false + ) + meson_src_configure +} + +src_install() { + meson_src_install + + # https://gitlab.freedesktop.org/accountsservice/accountsservice/-/issues/90 + if use doc; then + mv "${ED}/usr/share/doc/${PN}" "${ED}/usr/share/doc/${PF}" || die + fi + + # This directories are created at runtime when needed + rm -r "${ED}"/var/lib || die +} diff --git a/sys-apps/accountsservice/accountsservice-22.08.8.ebuild b/sys-apps/accountsservice/accountsservice-22.08.8.ebuild deleted file mode 100644 index 9f34a6d97636..000000000000 --- a/sys-apps/accountsservice/accountsservice-22.08.8.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 2011-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{9..11} ) -inherit meson python-any-r1 systemd - -DESCRIPTION="D-Bus interfaces for querying and manipulating user account information" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/AccountsService/" -SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86" - -IUSE="doc elogind gtk-doc +introspection selinux systemd test" -RESTRICT="!test? ( test )" -REQUIRED_USE="^^ ( elogind systemd )" - -CDEPEND=" - >=dev-libs/glib-2.63.5:2 - sys-auth/polkit - virtual/libcrypt:= - elogind? ( >=sys-auth/elogind-229.4 ) - introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) - systemd? ( >=sys-apps/systemd-186:0= ) -" -DEPEND="${CDEPEND}" -BDEPEND=" - dev-libs/libxslt - dev-util/gdbus-codegen - sys-devel/gettext - virtual/pkgconfig - doc? ( - app-text/docbook-xml-dtd:4.1.2 - app-text/xmlto - ) - gtk-doc? ( - dev-util/gtk-doc - app-text/docbook-xml-dtd:4.3 - ) - test? ( - $(python_gen_any_dep ' - dev-python/python-dbusmock[${PYTHON_USEDEP}] - ') - ) -" -RDEPEND="${CDEPEND} - selinux? ( sec-policy/selinux-accountsd ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-22.04.62-gentoo-system-users.patch -) - -python_check_deps() { - if use test; then - python_has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]" - fi -} - -src_configure() { - local emesonargs=( - --localstatedir="${EPREFIX}/var" - -Dsystemdsystemunitdir="$(systemd_get_systemunitdir)" - -Dadmin_group="wheel" - $(meson_use elogind) - $(meson_use introspection) - $(meson_use doc docbook) - $(meson_use gtk-doc gtk_doc) - -Dvapi=false - ) - meson_src_configure -} - -src_install() { - meson_src_install - - # https://gitlab.freedesktop.org/accountsservice/accountsservice/-/issues/90 - if use doc; then - mv "${ED}/usr/share/doc/${PN}" "${ED}/usr/share/doc/${PF}" || die - fi - - # This directories are created at runtime when needed - rm -r "${ED}"/var/lib || die -} diff --git a/sys-apps/accountsservice/files/accountsservice-22.08.8-configure-clang16.patch b/sys-apps/accountsservice/files/accountsservice-22.08.8-configure-clang16.patch new file mode 100644 index 000000000000..939418752731 --- /dev/null +++ b/sys-apps/accountsservice/files/accountsservice-22.08.8-configure-clang16.patch @@ -0,0 +1,33 @@ +https://gitlab.freedesktop.org/accountsservice/accountsservice/-/commit/453f893e3c38c209ae9dff47bca74ccb33a5bd34 + +From 453f893e3c38c209ae9dff47bca74ccb33a5bd34 Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Tue, 28 Feb 2023 02:31:50 +0000 +Subject: [PATCH] meson.build: fix -Wimplicit-function-declaration in configure + tests for printf + + needs to be included for printf. Newer compilers like Clang 16 make +implicit function declarations an error by default which can cause misleading +or incorrect configure test results. + +Signed-off-by: Sam James +--- a/meson.build ++++ b/meson.build +@@ -79,6 +79,7 @@ endforeach + + if cc.has_header_symbol('utmpx.h', 'WTMPX_FILENAME', prefix: '#define _GNU_SOURCE') + code = '''#define _GNU_SOURCE ++ #include + #include + int main (int argc, char **argv) { + printf ("%s\n", WTMPX_FILENAME); +@@ -91,6 +92,7 @@ if cc.has_header_symbol('utmpx.h', 'WTMPX_FILENAME', prefix: '#define _GNU_SOURC + config_h.set('PATH_WTMP', 'WTMPX_FILENAME') + elif cc.has_header_symbol('paths.h', '_PATH_WTMPX') + code = '''#include ++ #include + int main (int argc, char **argv) { + printf ("%s\n", _PATH_WTMPX); + return 0; +-- +GitLab diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest index 7ad93ec8190b..6ac9b5b73557 100644 --- a/sys-apps/less/Manifest +++ b/sys-apps/less/Manifest @@ -3,11 +3,9 @@ AUX less-608-procfs.patch 1669 BLAKE2B b44ca75d76df10eb65e73230a68d3d8566121f60d AUX less.envd 47 BLAKE2B 4ebc9242c96918c6942b05f67a9be541c6c535c23072e89e36c376e690cb7df9528e1734514092a6afdd3d4f47db45c6186a8cce5d9eb18ca7c73a01800f35fc SHA512 261b25887b08b3255e412b36130d014fc37ffc7de75dce3b5ba2521d94a1b0be4c584808b9698c30a8dafea70c62fae2cd0642d0983f96cdb418c3c501433674 AUX lesspipe-r1.sh 8135 BLAKE2B f11727136a5235f07ad86c1811c5ef8489a48fc3d032b8840bc67eda70e1800f03505a534870a0ba73aa62e4df4315444c76fe8aa89ab47c8b2f1e08fab5b6e2 SHA512 e7820d0c925da4d217214e093c671d6c2da51da00dcec98bed80fe3e6d664cfd3baf1b850eb711e9ccf9a1d09f943e2fc2efc3e8061bbfa45724c5b623dafe94 DIST less-608.tar.gz 362346 BLAKE2B 988940745fef1222c43b0bf4edec7cc7206ded0ac5d89d3faf4dab706a249913581c2fe7aa6063cf3d717176ed07b69299d3e791ba8a60358483fe9d1bf7f7c6 SHA512 7945b7f88921832ebb1b45fba8cbb449ee0133342796b654a52c146dfff3d84db18724ee84e53349eeea6017a0ebe2d8eb5366210275981dde7bb7190118fa66 -DIST less-618-beta.tar.gz 365786 BLAKE2B b1957ab49059a2df14d8ba5daf1d8543adc4546c44b537d86959e2e1fe2df93f99ceb8ef47097b6f84f75f7740e161269b4e1d5dd263b8171212c87e650a02fe SHA512 6197aa20c77a846e53b376aa63c2863242c40663e72213f66c3597bd8c38a9458163d0c9ba0ca7690574c07348bb7d3e108c3b50dbbedbc9e5707a14d946b280 -DIST less-623-beta.tar.gz 373094 BLAKE2B 661fdb129678a57ef2188b4cd89809b14eaae62b98bb8ec2394cb7b48faf10a3ccdb690f371178e9ed43548ebce1af840cb5042e9019fa747bcec2dca4158dc7 SHA512 60843c668f90ae47cdf4d10849a63481ab67af679b831cbe8955861ae9f238006322734ec3ae49d9aced7927018bf3e0d9fdab98077289b4ffc78f6075041667 +DIST less-629-beta.tar.gz 374918 BLAKE2B 0276006cf81f310a3d25add7cfaedfd678b03f99d48b75eb462fb6dda6e171c495fa6af170257fb286a35b0d6f380136c5d37b6d9a088ee08d42d4f32033afcb SHA512 5b5d7f86b0e2d00d65257b1d27511fdab21fda52f60102f7dd6c31d1314edcf75754dc9a268c03ebfe08ffc7b88f3b7cad0fa5a9504d66b11bc13f5f52cab558 EBUILD less-608-r1.ebuild 1644 BLAKE2B a985faac14059e82275b36c1122bd91da98c9959e816b9f1e8c97e484ce10b3013c915eeff3ea3ce695983eabb0fa71c1a49d5ec59daaec0f982d5ebec8d17ad SHA512 d8022242942862ef1229138d6dc21a3f54e95395510d23f694fec442fe336f2cea583a3ce3d7b5303d1bede89502c260fed51d7f6ea7c2ec401d5af85ade897a EBUILD less-608-r2.ebuild 1691 BLAKE2B 593af00b711b73345589db31b3765ca2de723db667de297a61356c09b919919355f9661a58738e47c92aa94933ee498d55240cbe87997fa912a8d443982639e8 SHA512 e5b372119ee823b4af84f9f747d7cb72ba990a83b5f41d95da6ca512c54cc27585e3fa3c8c2d934c3cd5814c041667487804bde52c568cca002284786ac39782 -EBUILD less-618_beta.ebuild 2026 BLAKE2B 132ce781ae09efae4fe177b311cd4dd57cb1ddc37a21b167f02262d490d981f94918e3a9ff81670f8febea14395d56e6316c32a6236cdf84756553800e17bff6 SHA512 633e22513a82228e2b8770d20bc25c7cf4604bcae161a7c4030fa97605d2ac92d9cc7165c6d03f728f7dc7e6d6f10e61c183bda40e1761dab7ff39f6e3d673e2 -EBUILD less-623_beta.ebuild 2143 BLAKE2B 3b510f61126567ef6c924506a2f56284c3ff9e144a6dd00a8cf5ff66e25df5fdcde55f4871139564da3633fc90d3b5655b5c6212a401bdc2a00380301e99044f SHA512 345491d238f00b49e067fe3517ddf4b4f8bec30f5d049887684c6ac8ae9702b699cd0b3dd1b0112010d5206bf016a01807f4376abf4562bbbfb10348f158bbf5 -EBUILD less-9999.ebuild 2143 BLAKE2B 3b510f61126567ef6c924506a2f56284c3ff9e144a6dd00a8cf5ff66e25df5fdcde55f4871139564da3633fc90d3b5655b5c6212a401bdc2a00380301e99044f SHA512 345491d238f00b49e067fe3517ddf4b4f8bec30f5d049887684c6ac8ae9702b699cd0b3dd1b0112010d5206bf016a01807f4376abf4562bbbfb10348f158bbf5 +EBUILD less-629_beta.ebuild 2238 BLAKE2B 8dea235c74da1c89561f168eef3b020d754c70a9fe8a5f0bd10bf7670eb114ae2abcc13679c95fdf9c5c68da93d3777399a7e70e5249fd0ee77107df6183021c SHA512 37ee9e63fbc572699aaec8278153b0b8eee5afdc702b0fc56c8d6edbf5e1722984e61fb9e386f4abaea533262cb82e265c3f0132c7db9c9273741a382a86cebe +EBUILD less-9999.ebuild 2238 BLAKE2B 8dea235c74da1c89561f168eef3b020d754c70a9fe8a5f0bd10bf7670eb114ae2abcc13679c95fdf9c5c68da93d3777399a7e70e5249fd0ee77107df6183021c SHA512 37ee9e63fbc572699aaec8278153b0b8eee5afdc702b0fc56c8d6edbf5e1722984e61fb9e386f4abaea533262cb82e265c3f0132c7db9c9273741a382a86cebe MISC metadata.xml 384 BLAKE2B ab69cbf4d7813bc4c96dc1c18ca35454dc9e9202bc95e3ff3b638c79b6cff4f9914fba1e7a35908aa305567a3874d3ead3a78f5faa83c9fbd3027afe12767eac SHA512 d799332d42f1c3115132216b3ba98a39f662d583aecb06fa2590e3da4c03b0ec07bab1eb0bbd397ef8249a5916ca9b457992c226899f66d4f4bef8bf1a20074f diff --git a/sys-apps/less/less-618_beta.ebuild b/sys-apps/less/less-618_beta.ebuild deleted file mode 100644 index afce93c3d215..000000000000 --- a/sys-apps/less/less-618_beta.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -WANT_AUTOMAKE=none -WANT_LIBTOOL=none - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://github.com/gwsw/less" - inherit git-r3 -fi - -inherit autotools - -# Releases are usually first a beta then promoted to stable if no -# issues were found. Upstream explicitly ask "to not generally distribute" -# the beta versions. It's okay to keyword beta versions if they fix -# a serious bug, but otherwise try to avoid it. - -MY_PV=${PV/_beta/-beta} -MY_P=${PN}-${MY_PV} -DESCRIPTION="Excellent text file viewer" -HOMEPAGE="http://www.greenwoodsoftware.com/less/" -[[ ${PV} != 9999 ]] && SRC_URI="http://www.greenwoodsoftware.com/less/${MY_P}.tar.gz" -S="${WORKDIR}"/${MY_P/?beta} - -LICENSE="|| ( GPL-3 BSD-2 )" -SLOT="0" -#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" -IUSE="pcre" - -DEPEND=">=app-misc/editor-wrapper-3 - >=sys-libs/ncurses-5.2:0= - pcre? ( dev-libs/libpcre2 )" -RDEPEND="${DEPEND}" - -src_prepare() { - default - # Per upstream README to prepare live build - [[ ${PV} == 9999 ]] && emake -f Makefile.aut distfiles - # Upstream uses unpatched autoconf-2.69, which breaks with clang-16. - # https://bugs.gentoo.org/870412 - eautoreconf -} - -src_configure() { - local myeconfargs=( - --with-regex=$(usex pcre pcre2 posix) - --with-editor="${EPREFIX}"/usr/libexec/editor - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - - newbin "${FILESDIR}"/lesspipe-r1.sh lesspipe - newenvd "${FILESDIR}"/less.envd 70less -} - -pkg_preinst() { - if has_version "<${CATEGORY}/${PN}-483-r1" ; then - elog "The lesspipe.sh symlink has been dropped. If you are still setting" - elog "LESSOPEN to that, you will need to update it to '|lesspipe %s'." - elog "Colorization support has been dropped. If you want that, check out" - elog "the new app-text/lesspipe package." - fi -} diff --git a/sys-apps/less/less-623_beta.ebuild b/sys-apps/less/less-623_beta.ebuild deleted file mode 100644 index 84957e8eccd9..000000000000 --- a/sys-apps/less/less-623_beta.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -WANT_AUTOMAKE=none -WANT_LIBTOOL=none - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://github.com/gwsw/less" - inherit git-r3 -fi - -inherit autotools - -# Releases are usually first a beta then promoted to stable if no -# issues were found. Upstream explicitly ask "to not generally distribute" -# the beta versions. It's okay to keyword beta versions if they fix -# a serious bug, but otherwise try to avoid it. - -MY_PV=${PV/_beta/-beta} -MY_P=${PN}-${MY_PV} -DESCRIPTION="Excellent text file viewer" -HOMEPAGE="http://www.greenwoodsoftware.com/less/" -[[ ${PV} != 9999 ]] && SRC_URI="http://www.greenwoodsoftware.com/less/${MY_P}.tar.gz" -S="${WORKDIR}"/${MY_P/?beta} - -LICENSE="|| ( GPL-3 BSD-2 )" -SLOT="0" -#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" -IUSE="pcre" -# As of 623_beta, lesstest is not included in dist tarballs -RESTRICT="test" - -DEPEND=" - >=app-misc/editor-wrapper-3 - >=sys-libs/ncurses-5.2:= - pcre? ( dev-libs/libpcre2 ) -" -RDEPEND="${DEPEND}" - -src_prepare() { - default - # Per upstream README to prepare live build - [[ ${PV} == 9999 ]] && emake -f Makefile.aut distfiles - # Upstream uses unpatched autoconf-2.69, which breaks with clang-16. - # https://bugs.gentoo.org/870412 - eautoreconf -} - -src_configure() { - local myeconfargs=( - --with-regex=$(usex pcre pcre2 posix) - --with-editor="${EPREFIX}"/usr/libexec/editor - ) - econf "${myeconfargs[@]}" -} - -src_test() { - emake check VERBOSE=1 -} - -src_install() { - default - - newbin "${FILESDIR}"/lesspipe-r1.sh lesspipe - newenvd "${FILESDIR}"/less.envd 70less -} - -pkg_preinst() { - if has_version "<${CATEGORY}/${PN}-483-r1" ; then - elog "The lesspipe.sh symlink has been dropped. If you are still setting" - elog "LESSOPEN to that, you will need to update it to '|lesspipe %s'." - elog "Colorization support has been dropped. If you want that, check out" - elog "the new app-text/lesspipe package." - fi -} diff --git a/sys-apps/less/less-629_beta.ebuild b/sys-apps/less/less-629_beta.ebuild new file mode 100644 index 000000000000..3dc457ca05ff --- /dev/null +++ b/sys-apps/less/less-629_beta.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +WANT_AUTOMAKE=none +WANT_LIBTOOL=none + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://github.com/gwsw/less" + inherit git-r3 +fi + +inherit autotools + +# Releases are usually first a beta then promoted to stable if no +# issues were found. Upstream explicitly ask "to not generally distribute" +# the beta versions. It's okay to keyword beta versions if they fix +# a serious bug, but otherwise try to avoid it. + +MY_PV=${PV/_beta/-beta} +MY_P=${PN}-${MY_PV} +DESCRIPTION="Excellent text file viewer" +HOMEPAGE="http://www.greenwoodsoftware.com/less/" +[[ ${PV} != 9999 ]] && SRC_URI="http://www.greenwoodsoftware.com/less/${MY_P}.tar.gz" +S="${WORKDIR}"/${MY_P/?beta} + +LICENSE="|| ( GPL-3 BSD-2 )" +SLOT="0" +if [[ ${PV} != 9999 && ${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" +fi +IUSE="pcre" +# As of 623_beta, lesstest is not included in dist tarballs +# https://github.com/gwsw/less/issues/344 +RESTRICT="test" + +DEPEND=" + >=app-misc/editor-wrapper-3 + >=sys-libs/ncurses-5.2:= + pcre? ( dev-libs/libpcre2 ) +" +RDEPEND="${DEPEND}" + +src_prepare() { + default + # Per upstream README to prepare live build + [[ ${PV} == 9999 ]] && emake -f Makefile.aut distfiles + # Upstream uses unpatched autoconf-2.69, which breaks with clang-16. + # https://bugs.gentoo.org/870412 + eautoreconf +} + +src_configure() { + local myeconfargs=( + --with-regex=$(usex pcre pcre2 posix) + --with-editor="${EPREFIX}"/usr/libexec/editor + ) + econf "${myeconfargs[@]}" +} + +src_test() { + emake check VERBOSE=1 +} + +src_install() { + default + + newbin "${FILESDIR}"/lesspipe-r1.sh lesspipe + newenvd "${FILESDIR}"/less.envd 70less +} + +pkg_preinst() { + if has_version "<${CATEGORY}/${PN}-483-r1" ; then + elog "The lesspipe.sh symlink has been dropped. If you are still setting" + elog "LESSOPEN to that, you will need to update it to '|lesspipe %s'." + elog "Colorization support has been dropped. If you want that, check out" + elog "the new app-text/lesspipe package." + fi +} diff --git a/sys-apps/less/less-9999.ebuild b/sys-apps/less/less-9999.ebuild index 84957e8eccd9..3dc457ca05ff 100644 --- a/sys-apps/less/less-9999.ebuild +++ b/sys-apps/less/less-9999.ebuild @@ -27,9 +27,12 @@ S="${WORKDIR}"/${MY_P/?beta} LICENSE="|| ( GPL-3 BSD-2 )" SLOT="0" -#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" +if [[ ${PV} != 9999 && ${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" +fi IUSE="pcre" # As of 623_beta, lesstest is not included in dist tarballs +# https://github.com/gwsw/less/issues/344 RESTRICT="test" DEPEND=" diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index ddef215caae0..988c4471da75 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -1,4 +1,5 @@ AUX README.RESCUE 134 BLAKE2B 2cd153e0077388f29e11779670086c50fb1a470b9bb76969a747313021bb85c37b20327ab2feb9b2cc715849245875e7d8a5ae6ceee84b4a33d532996cb793bd SHA512 0df49e479e551648519ea4db0986584463eed498f77b133bd0e517389e71f4ff4069f1a5017c39f349bae62baa2ac32d968048c396261a9045ff00a0e5aa8bf4 +AUX portage-3.0.45.1-qa-notice-configure-func-decl.patch 1098 BLAKE2B 482e2f8557f15baba683302ad0eafaede08a8c1c42f265a2279c6d8074256bba04a769f99363f5946b4e037a7c49e58e905a9efe504af280185d166f3770a0a8 SHA512 96ebbd7181f6ae9b68e172bf5a511c4ef43762647ad46502a4db13d15ea82d55f0d963676b753f597412f15c8bdd32839e3a907126f0003afa49dcdc672b8eba AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c AUX portage-tmpdir.conf 76 BLAKE2B 79f35df57dbdcd461d94d558212261df7df54253d5205b40a0a0640ce2a7ae553a84d7aa8d8c11a776cac44b7573b842951ec11f8ab393145edb1786d6837e79 SHA512 4810d8ae1f8291d34b756897972841d30d5f50b48597a430cb8ddb102dab07a7f0d78c3901b6fdd6763180e92b5ae90a3cb88ae5a5c1cae845b23b49d03a87fd DIST portage-3.0.43.tar.bz2 1139615 BLAKE2B e0f2646c3b6d5d49ec23038ad27507f7b9c0c03b848e82aff336896802c07b29344f924c4525d880f8895ba38f8116a7c79ecea51c794a433da9bd146efadc20 SHA512 b5e5339f3b5446f5c8f9b319e86e82d260e004b0606c3d0eadf09f91c95de0279c64c0fc4d7f6251ebd2cf7a65ba1ba37d752ed48b712e72b8c024835e747691 @@ -6,6 +7,6 @@ DIST portage-3.0.44.tar.bz2 1140911 BLAKE2B 06f584e6e37bbb309b9bb0e29ba4381eadd4 DIST portage-3.0.45.1.tar.bz2 1146037 BLAKE2B 562900b41684a4da3b10a91d796e91b75d631267145c36f0e46d0b3bc749b2e88bbc7e20c4a3c1a8cba74e8bfb25dc1ffc9ffd481ec11a2a2e1d23f9cae770a3 SHA512 961630cd0959001a841d62b3a293458442aeb7725241d6808d4052dd47209bf5d0abdf229a48013d91f9c441349075117747229639a1228fccd5bf6f75e947fd EBUILD portage-3.0.43-r1.ebuild 9141 BLAKE2B 65ef9a74f548093ee70a068bca2084ae3abb0e3eb697481c07f1f3c7ff29b89cefa692254d12cdd7b1465538151fd6bb9e1920271aed72f2d84f517544cdcda6 SHA512 986464312f8a919543eb6db4d2c5e4d418c2cc3bd9508ee6eb4ed6f19ec05a3a4bc6c450df25f9e068a0f858cc621159022aef0d3b97f00b2e3dd97a985c40e3 EBUILD portage-3.0.44.ebuild 9142 BLAKE2B 4e38276dc99c3ccfe1880834819123186d3d4a6b6ad457808ab12c129f960755f45a1ac0ce3bb9d67d0d84b611be6f5ed9a4efa89cbc511e16831ed2b7d6d568 SHA512 e332d70a76809cf99fd1b9d5ee3185671f3b8937ed1a12f582d6e65ff29fdb061303af1699f1065b72af388f973e21f036b5a41ed879d57a3f9e0b7d74dfd398 -EBUILD portage-3.0.45.1-r1.ebuild 8972 BLAKE2B a486548069e0821639f1108b16785ccad0a5641e7e9f9af6b5a4f11ea3d48921bd2e133dd288cd060aef6d75002cfc8398de31d7909526b58296b1a2f419cf7a SHA512 442fda17b35b60a52c9e5b1d5eb3293099015ff39331c8a8bc39cea91f730099dd5613c5c7fb07915369792614cb70ebf8f467af9964ef171cdfcd8f17e456b2 +EBUILD portage-3.0.45.1-r2.ebuild 9029 BLAKE2B adfd3e9ae116ebf4cdfe5d13cf47a7ac28b5d562ef185a97bdc4ead1fc551bef8675714b60411877b49f06aeefa916c7c4ebaa158d5c2fb670d6abd4818dd8e1 SHA512 db845121a027c0112cf3c56359a299b6ddf0738cad19243157cb7c0d974dcc94e8723c59ac5ddfa47867dabf4157eb5ecc00f18f8093cc737f40a476699261a6 EBUILD portage-9999.ebuild 8210 BLAKE2B be8ef5e216424d37e77ddf760f1c9ce96d23b78580b43c27d498f56b076911c633f17691f5d927eda6c6384cff416353d2142c1883cb51b5ad400bc428bd332e SHA512 8c38ff62104d352afa7639e919484fc7b4cf1f9c2a76a60927549c775656621ec060e60a77b435a3604169ce10367710e297e74ee00baa3b83bd007f800bffbd MISC metadata.xml 1539 BLAKE2B 0efa1ae365449d6593909046c32158a9f6755aa9252c34ae00eb866dd29a0b6a5c2e7a4af9293d0f87c4dd9231132fc5361acb0818fb6beff6dd6fbbdc6f409b SHA512 675f5baa1b3079592e3930b11ca18f324e27c42b5515f9ae815a26e53a465640fa6e9c4069df0e2121932b9f1cc73f2c9469c1529728f3c5ed5c3e687743ac0d diff --git a/sys-apps/portage/files/portage-3.0.45.1-qa-notice-configure-func-decl.patch b/sys-apps/portage/files/portage-3.0.45.1-qa-notice-configure-func-decl.patch new file mode 100644 index 000000000000..a621ab65d719 --- /dev/null +++ b/sys-apps/portage/files/portage-3.0.45.1-qa-notice-configure-func-decl.patch @@ -0,0 +1,29 @@ +From eca90b6049a9ce42ec6868f64abcab403c9f4190 Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Tue, 28 Feb 2023 03:10:26 +0000 +Subject: [PATCH] install-qa-check.d/90config-impl-decl: prefix warning with + 'QA Notice' + +... so tinderboxes can pick it up more easily. + +Signed-off-by: Sam James +--- a/bin/install-qa-check.d/90config-impl-decl ++++ b/bin/install-qa-check.d/90config-impl-decl +@@ -92,12 +92,13 @@ config_impl_decl_check() { + # Drop out early if no impl decls found (all the arrays are the same size) + [[ ${#files[@]} -eq 0 ]] && return + +- eqawarn 'Found the following implicit function declarations in configure logs:' ++ eqawarn 'QA Notice: Found the following implicit function declarations in configure logs:' + for l in "${!files[@]}"; do + eqawarn " ${files[l]}:${lines[l]} - ${funcs[l]}" + eqatag 'config.log-impl-decl' "line=${lines[l]}" "func=${funcs[l]}" "${files[l]}" + done + eqawarn 'Check that no features were accidentally disabled.' ++ eqawarn 'See https://wiki.gentoo.org/wiki/Modern_C_porting.' + } + + config_impl_decl_check +-- +2.39.2 + diff --git a/sys-apps/portage/portage-3.0.45.1-r1.ebuild b/sys-apps/portage/portage-3.0.45.1-r1.ebuild deleted file mode 100644 index c226bd813658..000000000000 --- a/sys-apps/portage/portage-3.0.45.1-r1.ebuild +++ /dev/null @@ -1,284 +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/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.1-r2.ebuild b/sys-apps/portage/portage-3.0.45.1-r2.ebuild new file mode 100644 index 000000000000..b345f442048e --- /dev/null +++ b/sys-apps/portage/portage-3.0.45.1-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/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 +} -- cgit v1.2.3