There's a bit of indirection here that isn't strictly needed:
- get_libdir is guaranteed to never fail
- PYTHONPATH is not necessary, setup.py internally handles this
- the --staging-root and --root options are aliases, and the last one
wins; simply pass it once
Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
Signed-off-by: Zac Medico <zmedico@gentoo.org>
This has never been caused by the upstream binary install, which
installs to /opt and does not affect from-source installs under any
circumstances ever.
What did happen is back during the major version update from 2.85 to
3.0, upstream stopped including a vendored regex/ module, and started
expecting it to be installed as a system dependency.
Under most circumstances, this was fine, and simply installing the
dependency would get things working. One possible edge case occurred,
however, when the old version of the package did NOT byte-compile the
vendored regex module, but calibre was run as root. (There are reasons
it might end up being run as root, the most obvious being that a user
wanted to run the headless server or another command-line tool.)
If this happened, then the python interpreter would automatically
byte-compile every module on import, but the PM wouldn't track it for
removal. After an upgrade, the cached file could still be imported and
would effectively mask the system version of the regex module, but would
be missing the binary portion.
Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
Signed-off-by: Zac Medico <zmedico@gentoo.org>
A library file does not care what its shebang is. The intended purpose
of all these shebangs is to indicate to text editors, what the expected
syntax highlighting mode should be.
This has no practical effect on the resulting package. The installed
bytes are different, they just don't *do* anything different. No revbump
needed.
Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
Signed-off-by: Zac Medico <zmedico@gentoo.org>
The liberation fonts are removed and replaced with symlinks to the
system fonts. I've put quite a bit of work in upstream to make this work
in a supported manner; let's use that instead of fragile, unchecked
shell code.
In particular, upstream's buildsystem dies if the expected fonts do not
exist.
Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
Signed-off-by: Zac Medico <zmedico@gentoo.org>
The install process does not rerun compiles, so setting variables there
is useless and does nothing. They didn't have any effect on src_compile
all this time, which means that whatever they tried to fix clearly was
not an issue. ;)
That being said, there are two things going on here:
- OVERRIDE_CFLAGS is used by the calibre build system in addition to
CFLAGS, so it is not actually necessary to override it, and using
both, means using -Wall and suchlike so respecting it seems reasonable
- the calibre build system respects either $PATH or $QMAKE to find the
qmake program. Instead of using the former method in src_compile and
the latter method in src_install, just use the latter method in
src_compile and avoid munging $PATH.
Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
Signed-off-by: Zac Medico <zmedico@gentoo.org>
I do not know what kbuildsyscoca is, other than "does not exist
anymore"? So I am skeptical it is still relevant.
I do know that it is no longer necessary to fake out xdg-utils programs,
since I fixed this in 2019, as part of calibre 3.43.0; it now detects
when we are running a DESTDIR install and refrains from running:
- `xdg-desktop-menu forceupdate`
- `xdg-mime` at all (instead it uses shutil.copyfile to copy over one
file)
and sets up the requisite $XDG_* variables to make the utils operate on
a staged installation directory.
Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
Signed-off-by: Zac Medico <zmedico@gentoo.org>
Ever since calibre's python 3 port was completed, this variable was no
longer needed to unlock opting in to using python3. And thus, it is
neither checked nor used.
Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
Signed-off-by: Zac Medico <zmedico@gentoo.org>
Historically, calibre has always supported this. Allow checking it. No
revbump needed.
Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
Signed-off-by: Zac Medico <zmedico@gentoo.org>
Albeit information remains kind of buried in there, but in case
someone happens to look at it when trying to figure out what
to depend on for qtprintsupport -- aka not [cups] but rather
need [gui,widgets].
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>