-
Notifications
You must be signed in to change notification settings - Fork 2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Eclass eapi cleanup #30061
Eclass eapi cleanup #30061
Conversation
Pull Request assignmentSubmitter: @SoapGentoo @gentoo/github Linked bugsNo bugs to link found. If your pull request references any of the Gentoo bug reports, please add appropriate GLEP 66 tags to the commit message and request reassignment. New packagesThis Pull Request appears to be introducing new packages only. Due to limited manpower, adding new packages is considered low priority. This does not mean that your Pull Request will not receive any attention, however, it might take quite some time for it to be reviewed. In the meantime, your new ebuild might find a home in the GURU project repository: the ebuild repository maintained collaboratively by Gentoo users. GURU offers your ebuild a place to be reviewed and improved by other Gentoo users, while making it easy for Gentoo users to install it and enjoy the software it adds. In order to force reassignment and/or bug reference scan, please append Docs: Code of Conduct ● Copyright policy (expl.) ● Devmanual ● GitHub PRs ● Proxy-maint guide |
d8fa811
to
28afacc
Compare
Pull request CI reportReport generated at: 2023-03-11 23:50 UTC There are existing issues already. Please look into the report to make sure none of them affect the packages in question: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM. I've left a few comments for db.eclass
but I wouldn't blame you if you didn't want to touch that more.
@@ -1,43 +1,40 @@ | |||
# Copyright 1999-2022 Gentoo Authors | |||
# Copyright 1999-2023 Gentoo Authors | |||
# Distributed under the terms of the GNU General Public License v2 | |||
|
|||
# @ECLASS: cron.eclass |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Did I mention how terrible I find this eclass? We should really get rid of it.
if [[ -n "${target}" ]] && [[ -e "${target}/db.h" ]] && ( ! [[ -e db.h ]] || [[ -h db.h ]] ); then | ||
cd "${EROOT}"/usr/include || die | ||
target="$(find . -maxdepth 1 -type d -name 'db[0-9]*' | sort -V | cut -d/ -f2- | tail -n1)" | ||
if [[ -n ${target} && -e ${target}/db.h ]] && ( ! [[ -e db.h ]] || [[ -h db.h ]] ); then |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can't you put all that under [[ ... ]]
though?
28afacc
to
49db814
Compare
Pull request CI reportReport generated at: 2023-03-12 11:00 UTC There are existing issues already. Please look into the report to make sure none of them affect the packages in question: |
5ff3e14
to
5af7814
Compare
5ad94e4
to
a81c9d4
Compare
Pull request CI reportReport generated at: 2023-03-12 13:51 UTC There are existing issues already. Please look into the report to make sure none of them affect the packages in question: |
eclass/db.eclass
Outdated
[[ "${IUSE/java}" != "${IUSE}" ]] \ | ||
&& use java \ | ||
&& langs+=( java ) | ||
[[ ${IUSE/java} != ${IUSE} ]] && |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Convert this into a proper if?
@@ -154,11 +140,11 @@ db_src_install_usrlibcleanup() { | |||
|
|||
rm -f \ | |||
"${ED}"/usr/include/{db,db_185}.h \ | |||
"${LIB}"/libdb{,_{cxx,sql,stl,java,tcl}}.a | |||
"${LIB}"/libdb{,_{cxx,sql,stl,java,tcl}}.a || die |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Make sure you try emerging the various sys-libs/db slots with this change in particular
eclass/db.eclass
Outdated
|
||
tclsh testrunner.tcl | ||
echo "source ${t}" > testrunner.tcl || die |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd rather a heredoc but I guess it's only two lines
a81c9d4
to
8ee567d
Compare
Pull request CI reportReport generated at: 2023-03-12 14:46 UTC There are existing issues already. Please look into the report to make sure none of them affect the packages in question: |
8ee567d
to
4c6bea3
Compare
Pull request CI reportReport generated at: 2023-03-13 12:41 UTC There are existing issues already. Please look into the report to make sure none of them affect the packages in question: |
local src="${ROOT}${TCPRULES_DIR}/${f}" | ||
local cdb="${ROOT}${TCPRULES_DIR}/${f}.cdb" | ||
local tmp="${ROOT}${TCPRULES_DIR}/.${f}.tmp" | ||
[[ -e ${src} ]] && tcprules "${cdb}" "${tmp}" < "${src}" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Check exit status of tcprules
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this whole eclass is already pretty brittle as is, I'd rather not lead to more unintended breakage
4c6bea3
to
cf22bf4
Compare
Pull request CI reportReport generated at: 2023-03-13 14:41 UTC There are existing issues already. Please look into the report to make sure none of them affect the packages in question: |
Signed-off-by: David Seifert <soap@gentoo.org>
Signed-off-by: David Seifert <soap@gentoo.org>
Signed-off-by: David Seifert <soap@gentoo.org>
Signed-off-by: David Seifert <soap@gentoo.org>
Signed-off-by: David Seifert <soap@gentoo.org>
Signed-off-by: David Seifert <soap@gentoo.org>
Signed-off-by: David Seifert <soap@gentoo.org>
Signed-off-by: David Seifert <soap@gentoo.org>
Signed-off-by: David Seifert <soap@gentoo.org>
Signed-off-by: David Seifert <soap@gentoo.org>
Signed-off-by: David Seifert <soap@gentoo.org>
Signed-off-by: David Seifert <soap@gentoo.org>
Signed-off-by: David Seifert <soap@gentoo.org>
Signed-off-by: David Seifert <soap@gentoo.org>
Signed-off-by: David Seifert <soap@gentoo.org>
Signed-off-by: David Seifert <soap@gentoo.org>
Signed-off-by: David Seifert <soap@gentoo.org>
Signed-off-by: David Seifert <soap@gentoo.org>
Signed-off-by: David Seifert <soap@gentoo.org>
Signed-off-by: David Seifert <soap@gentoo.org>
39757d6
to
91a549a
Compare
Signed-off-by: David Seifert <soap@gentoo.org>
91a549a
to
fdf1c8f
Compare
Pull request CI reportReport generated at: 2023-03-17 10:51 UTC There are existing issues already. Please look into the report to make sure none of them affect the packages in question: |
Pull request CI reportReport generated at: 2023-03-17 11:07 UTC There are existing issues already. Please look into the report to make sure none of them affect the packages in question: |
Closes: gentoo/gentoo#30061 Signed-off-by: David Seifert <soap@gentoo.org> Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Closes: gentoo/gentoo#30061 Signed-off-by: David Seifert <soap@gentoo.org> Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Closes: gentoo/gentoo#30061 Signed-off-by: David Seifert <soap@gentoo.org>
No description provided.