Re: [gentoo-portage-dev] [PATCH] lib/_emerge/resolver/slot_collision.py: fix redefined-builtin W0622
On 8/2/20 7:53 PM, Aaron Bauman wrote: > * This fixes the referenced warning by renaming the 'id' variable to > 'name' and the 'type' variable to 'atype' > * Additional cosmetic/style changes found along the way. > > Signed-off-by: Aaron Bauman Thanks, merged with s/atype/ctype/ and s/name/idx/: https://gitweb.gentoo.org/proj/portage.git/commit/?id=602d2cd487bb48788e9654a7b7fd5a3be34150d9 -- Thanks, Zac signature.asc Description: OpenPGP digital signature
Re: [gentoo-portage-dev] [PATCH] doc/api/conf.py: silence redefined-builtin for copyright
On 8/2/20 7:21 PM, Aaron Bauman wrote: > * This locally silences the W0622 warning for the override of the > copyright which is required. > > Signed-off-by: Aaron Bauman > --- > doc/api/conf.py | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/doc/api/conf.py b/doc/api/conf.py > index f318ca25d..9522960c8 100644 > --- a/doc/api/conf.py > +++ b/doc/api/conf.py > @@ -24,9 +24,9 @@ import portage > > # -- Project information > - > > -project = 'portage' > -copyright = '2020, Gentoo Authors' > -author = 'Gentoo Authors' > +project = 'portage' # pylint: disable=redefined-builtin > +copyright = '2020, Gentoo Authors' # pylint: disable=redefined-builtin > +author = 'Gentoo Authors' # pylint: disable=redefined-builtin > > # The full version, including alpha/beta/rc tags > release = str(portage.VERSION) > Thanks, merged the copyright line as discussed in #gentoo-portage: https://gitweb.gentoo.org/proj/portage.git/commit/?id=099e575a4cc132e01534023585cf73b7ff806b95 -- Thanks, Zac signature.asc Description: OpenPGP digital signature
[gentoo-portage-dev] [PATCH] lib/_emerge/resolver/slot_collision.py: fix redefined-builtin W0622
* This fixes the referenced warning by renaming the 'id' variable to 'name' and the 'type' variable to 'atype' * Additional cosmetic/style changes found along the way. Signed-off-by: Aaron Bauman --- lib/_emerge/resolver/slot_collision.py | 74 +- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/lib/_emerge/resolver/slot_collision.py b/lib/_emerge/resolver/slot_collision.py index cc16287de..b29d68f2a 100644 --- a/lib/_emerge/resolver/slot_collision.py +++ b/lib/_emerge/resolver/slot_collision.py @@ -591,14 +591,14 @@ class slot_conflict_handler: version_violated = False slot_violated = False use = [] - for (type, sub_type), parents in collision_reasons.items(): + for (atype, sub_type), parents in collision_reasons.items(): for x in parents: if parent == x[0] and atom == x[1]: - if type == "version": + if atype == "version": version_violated = True - elif type == "slot": + elif atype == "slot": slot_violated = True - elif type == "use": + elif atype == "use": use.append(sub_type) break @@ -934,64 +934,64 @@ class slot_conflict_handler: msg += "}" msg += "]\n" writemsg(msg, noiselevel=-1) - + required_changes = {} - for id, pkg in enumerate(config): + for name, pkg in enumerate(config): if not pkg.installed: - #We can't change the USE of installed packages. - for flag in all_involved_flags[id]: + # We can't change the USE of installed packages. + for flag in all_involved_flags[name]: if not pkg.iuse.is_valid_flag(flag): continue - state = all_involved_flags[id][flag] + state = all_involved_flags[name][flag] self._force_flag_for_package(required_changes, pkg, flag, state) - #Go through all (parent, atom) pairs for the current slot conflict. - for ppkg, atom in all_conflict_atoms_by_slotatom[id]: + # Go through all (parent, atom) pairs for the current slot conflict. + for ppkg, atom in all_conflict_atoms_by_slotatom[name]: if not atom.package: continue use = atom.unevaluated_atom.use if not use: - #No need to force something for an atom without USE conditionals. - #These atoms are already satisfied. + # No need to force something for an atom without USE conditionals. + # These atoms are already satisfied. continue - for flag in all_involved_flags[id]: - state = all_involved_flags[id][flag] + for flag in all_involved_flags[name]: + state = all_involved_flags[name][flag] if flag not in use.required or not use.conditional: continue if flag in use.conditional.enabled: - #[flag?] +
[gentoo-portage-dev] [PATCH] doc/api/conf.py: silence redefined-builtin for copyright
* This locally silences the W0622 warning for the override of the copyright which is required. Signed-off-by: Aaron Bauman --- doc/api/conf.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/api/conf.py b/doc/api/conf.py index f318ca25d..9522960c8 100644 --- a/doc/api/conf.py +++ b/doc/api/conf.py @@ -24,9 +24,9 @@ import portage # -- Project information - -project = 'portage' -copyright = '2020, Gentoo Authors' -author = 'Gentoo Authors' +project = 'portage' # pylint: disable=redefined-builtin +copyright = '2020, Gentoo Authors' # pylint: disable=redefined-builtin +author = 'Gentoo Authors' # pylint: disable=redefined-builtin # The full version, including alpha/beta/rc tags release = str(portage.VERSION) -- 2.28.0
Re: [gentoo-portage-dev] [PATCH] cnf/repo.postsync.d/example: add egencache --update-pkg-desc-index (bug 735626)
On Sun, 2 Aug 2020 16:38:06 -0700 Zac Medico wrote: > Add an egencache --update-pkg-desc-index example for users > of app-portage/esearch to migrate to. > > Bug: https://bugs.gentoo.org/735626 > Signed-off-by: Zac Medico > --- > cnf/repo.postsync.d/example | 15 ++- > 1 file changed, 14 insertions(+), 1 deletion(-) > > diff --git a/cnf/repo.postsync.d/example b/cnf/repo.postsync.d/example > index 533bf719c..6c349ab3c 100644 > --- a/cnf/repo.postsync.d/example > +++ b/cnf/repo.postsync.d/example > @@ -1,4 +1,4 @@ > -#!/bin/sh > +#!/bin/bash > # Example /etc/portage/repo.postsync.d script. Make it executable > (chmod +x) for # Portage to process it. > # > @@ -45,6 +45,19 @@ if [ -n "${repository_name}" ]; then > ret=1 > fi > fi > + > + # Regenerate the metadata/pkg_desc_index file if needed. > It's not > + # needed for https://gitweb.gentoo.org/repo/sync/gentoo.git > which > + # provides a freshly generated copy. > + if [[ ! -e ${repository_path}/metadata/pkg_desc_index || ( > + -d ${repository_path}/metadata/md5-cache && > + -n "$(find "${repository_path}/metadata/md5-cache" > -type f -newer "${repository_path}/metadata/pkg_desc_index" -print > -quit)" ) ]]; then > + if ! egencache --update-pkg-desc-index > --repo="${repository_name}" > + then > + echo "!!! egencache failed!" > + ret=1 > + fi > + fi > fi > > # Return explicit status. is good with me, but my bash skills suck... so if there is a mistake I wouldn't know ;)
[gentoo-dev] Automated Package Removal and Addition Tracker, for the week ending 2020-08-02 23:59 UTC
The attached list notes all of the packages that were added or removed from the tree, for the week ending 2020-08-02 23:59 UTC. Removals: app-arch/deltarpm 20200728-02:33 bman f63396228c1 app-backup/holland 20200728-18:45 bman 38311722644 app-backup/holland-backup-example 20200728-18:45 bman 38311722644 app-backup/holland-backup-pgdump20200728-18:45 bman 38311722644 app-backup/holland-backup-random20200728-18:45 bman 38311722644 app-backup/holland-backup-sqlite20200728-18:45 bman 38311722644 app-backup/holland-lib-common 20200728-18:45 bman 38311722644 app-backup/holland-lib-lvm 20200728-18:45 bman 38311722644 app-cdr/burn-cd 20200728-18:45 bman 38311722644 app-crypt/virtualsmartcard 20200728-02:33 bman f63396228c1 app-dicts/duali-data20200728-02:33 bman f63396228c1 app-dicts/opendict 20200728-18:45 bman 38311722644 app-dicts/sword-FarsiOPV20200729-12:27 marecki e6c579565fc app-dicts/sword-FreMartin 20200729-13:28 marecki 569fc37bd6f app-dicts/sword-FreSegond 20200729-12:57 marecki e62c2428014 app-dicts/sword-WebstersDict20200729-12:16 marecki 630b0081f66 app-editors/editra 20200728-18:45 bman 38311722644 app-editors/leo 20200728-18:45 bman 38311722644 app-emulation/playonlinux 20200728-18:45 bman 38311722644 app-misc/scope 20200729-11:20 zlogene 79d3d94c908 app-office/taskcoach20200728-18:45 bman 38311722644 app-text/bibus 20200728-18:45 bman 38311722644 app-text/duali 20200728-02:33 bman f63396228c1 app-text/mftrace20200728-02:33 bman f63396228c1 app-text/queequeg 20200728-02:33 bman f63396228c1 app-text/referencer 20200728-02:33 bman f63396228c1 dev-db/SchemaSync 20200728-18:45 bman 38311722644 dev-libs/libmacaroons 20200728-02:33 bman f63396228c1 dev-libs/tut20200728-02:33 bman f63396228c1 dev-python/elib-intl20200728-02:33 bman f63396228c1 dev-python/eunuchs 20200728-02:33 bman f63396228c1 dev-python/medusa 20200728-02:33 bman f63396228c1 dev-python/python-iwscan20200728-02:33 bman f63396228c1 dev-python/squaremap20200728-18:45 bman 38311722644 dev-util/cargo-tree 20200731-10:44 gyakovlev 225fa99bca9 dev-util/confix 20200728-02:33 bman f63396228c1 dev-util/qmtest 20200728-02:33 bman f63396228c1 dev-util/unrpyc 20200728-02:33 bman f63396228c1 dev-util/wxglade20200728-18:45 bman 38311722644 games-board/teg 20200801-20:03 asturmbd91ed1b641 games-engines/gemrb 20200728-02:33 bman f63396228c1 media-gfx/fontypython 20200728-18:45 bman 38311722644 media-gfx/fr0st 20200728-18:45 bman 38311722644 media-sound/guimup 20200802-11:13 leio 39e3197981d media-sound/lilycomp20200728-02:33 bman f63396228c1 media-video/tovid 20200728-02:33 bman f63396228c1 net-mail/archivemail20200728-02:33 bman f63396228c1 net-mail/getmail20200728-02:33 bman f63396228c1 net-wireless/airpwn 20200728-02:33 bman f63396228c1 sci-chemistry/apbs 20200728-18:45 bman 38311722644 sci-chemistry/bkchem20200728-02:33 bman f63396228c1 sci-chemistry/eden 20200728-18:45 bman 38311722644 sci-chemistry/p3d 20200728-18:45 bman 38311722644 sci-chemistry/pdb2pqr 20200728-18:45 bman 38311722644 sci-chemistry/pdb-tools 20200728-18:45 bman 38311722644 sci-chemistry/prodecomp 20200728-18:45 bman 38311722644 sci-chemistry/pymol-plugins-bni-tools 20200728-02:33 bman f63396228c1 sci-chemistry/pymol-plugins-caver 20200728-18:45 bman 38311722644 sci-chemistry/pymol-plugins-dssp20200728-18:45 bman 38311722644 sci-chemistry/pymol-plugins-emovie 20200728-02:33 bman f63396228c1
[gentoo-portage-dev] [PATCH] cnf/repo.postsync.d/example: add egencache --update-pkg-desc-index (bug 735626)
Add an egencache --update-pkg-desc-index example for users of app-portage/esearch to migrate to. Bug: https://bugs.gentoo.org/735626 Signed-off-by: Zac Medico --- cnf/repo.postsync.d/example | 15 ++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/cnf/repo.postsync.d/example b/cnf/repo.postsync.d/example index 533bf719c..6c349ab3c 100644 --- a/cnf/repo.postsync.d/example +++ b/cnf/repo.postsync.d/example @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Example /etc/portage/repo.postsync.d script. Make it executable (chmod +x) for # Portage to process it. # @@ -45,6 +45,19 @@ if [ -n "${repository_name}" ]; then ret=1 fi fi + + # Regenerate the metadata/pkg_desc_index file if needed. It's not + # needed for https://gitweb.gentoo.org/repo/sync/gentoo.git which + # provides a freshly generated copy. + if [[ ! -e ${repository_path}/metadata/pkg_desc_index || ( + -d ${repository_path}/metadata/md5-cache && + -n "$(find "${repository_path}/metadata/md5-cache" -type f -newer "${repository_path}/metadata/pkg_desc_index" -print -quit)" ) ]]; then + if ! egencache --update-pkg-desc-index --repo="${repository_name}" + then + echo "!!! egencache failed!" + ret=1 + fi + fi fi # Return explicit status. -- 2.25.3
[gentoo-dev] Last rites: dev-vcs/rapidsvn
# Aaron Bauman (2020-08-02) # Py2 only. m-n. Bug #735340 # Removal in 30 days dev-vcs/rapidsvn -- Cheers, Aaron signature.asc Description: PGP signature
[gentoo-dev] Last rites: media-gfx/cptutils
# Aaron Bauman (2020-08-02) # Py2 only. m-n. Bug #735364 # Removal in 30 days media-gfx/cptutils -- Cheers, Aaron signature.asc Description: PGP signature
[gentoo-dev] Last rites: net-wireless/{cpyrit-cuda,cpyrit-opencl,pyrit}
# Aaron Bauman (2020-08-02) # Py2 only. m-n. Bug #709932 # Removal in 30 days net-wireless/cpyrit-cuda net-wireless/cpyrit-opencl net-wireless/pyrit -- Cheers, Aaron signature.asc Description: PGP signature
[gentoo-dev] Last rites: sys-apps/biosdisk
# Aaron Bauman (2020-08-02) # Py2 only. m-n. Bug #735466 # Removal in 30 days sys-apps/biosdisk -- Cheers, Aaron signature.asc Description: PGP signature
[gentoo-dev] Last rites: sys-fs/ecryptfs-utils
# Aaron Bauman (2020-08-02) # Py2 only. m-n. Bug #735486 # Removal in 30 days sys-fs/ecryptfs-utils -- Cheers, Aaron signature.asc Description: PGP signature
[gentoo-dev] Last rites: app-metrics/collectd sys-fs/owfs
# Aaron Bauman (2020-08-02) # Py2 only. m-n. Bug #735502. rdep. # Removal in 30 days app-metrics/collectd sys-fs/owfs -- Cheers, Aaron signature.asc Description: PGP signature
[gentoo-dev] Last rites: www-misc/nx_util
# Aaron Bauman (2020-08-02) # Py2 only. m-n. Bug #735524 # Removal in 30 days www-misc/nx_util -- Cheers, Aaron signature.asc Description: PGP signature
Re: [gentoo-dev] IPython 7.17 drops Python 3.6 support AKA upgrade reminder
On Sat, 2020-08-01 at 09:29 +0200, Michał Górny wrote: > The most recent release of IPython removes support for Python 3.6. > Unless I'm mistaken, this is the first very high profile package > to become 3.7+ only. Please expect a major slay of Python 3.6 support > in its reverse dependencies today. That is, when I finish the large > part of my today's TODO called 'immediate bumps'. I'd like to note that I won't do it after all. The number of (deep) revdeps is too great, and given that py3.6 is no longer in default PYTHON_TARGETS this shouldn't impact our users much. Instead, we'll probably be keeping 3.6 in PYTHON_COMPAT as long as possible until the final deadline. -- Best regards, Michał Górny signature.asc Description: This is a digitally signed message part
[gentoo-dev] [PATCH] Update xorg-3.eclass to handle fonts (again).
Sorry about the last patch, ignore it, still managed to send with the wrong commit sha. Signed-off-by: Henrik Pihl --- eclass/xorg-3.eclass | 181 ++- 1 file changed, 177 insertions(+), 4 deletions(-) diff --git a/eclass/xorg-3.eclass b/eclass/xorg-3.eclass index 168e58b42c8..a52c0146baa 100644 --- a/eclass/xorg-3.eclass +++ b/eclass/xorg-3.eclass @@ -27,6 +27,20 @@ if [[ ${PV} == ** ]]; then XORG_EAUTORECONF="yes" fi +# If we're a font package, but not the font.alias one +FONT_ECLASS="" +if [[ ${CATEGORY} = media-fonts ]]; then + case ${PN} in + font-alias|font-util) + ;; + font*) + # Activate font code in the rest of the eclass + FONT="yes" + FONT_ECLASS="font" + ;; + esac +fi + # @ECLASS-VARIABLE: XORG_MULTILIB # @DESCRIPTION: # If set to 'yes', the multilib support for package will be enabled. Set @@ -34,13 +48,14 @@ fi : ${XORG_MULTILIB:="no"} # we need to inherit autotools first to get the deps -inherit autotools libtool multilib toolchain-funcs flag-o-matic ${GIT_ECLASS} +inherit autotools libtool multilib toolchain-funcs flag-o-matic ${GIT_ECLASS} \ + flag-o-matic ${FONT_ECLASS} ${GIT_ECLASS} if [[ ${XORG_MULTILIB} == yes ]]; then inherit multilib-minimal fi -EXPORTED_FUNCTIONS="src_prepare src_configure src_unpack src_compile src_install" +EXPORTED_FUNCTIONS="src_prepare src_configure src_unpack src_compile src_install pkg_postinst pkg_postrm" case "${EAPI:-0}" in 7) ;; *) die "EAPI=${EAPI} is not supported" ;; @@ -66,7 +81,7 @@ IUSE="" # @ECLASS-VARIABLE: XORG_MODULE # @DESCRIPTION: # The subdirectory to download source from. Possible settings are app, -# doc, data, util, driver, lib, proto, xserver. Set above the +# doc, data, util, driver, font, lib, proto, xserver. Set above the # inherit to override the default autoconfigured module. : ${XORG_MODULE:="auto"} if [[ ${XORG_MODULE} == auto ]]; then @@ -116,7 +131,9 @@ EAUTORECONF_DEPEND+=" >=sys-devel/libtool-2.2.6a sys-devel/m4" if [[ ${PN} != util-macros ]] ; then - EAUTORECONF_DEPEND+=" >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0" + EAUTORECONF_DEPEND+=" >=x11-misc/util-macros-1.18" + # Required even by xorg-server + [[ ${PN} == "font-util" ]] || EAUTORECONF_DEPEND+=" >=media-fonts/font-util-1.2.0" fi WANT_AUTOCONF="latest" WANT_AUTOMAKE="latest" @@ -129,6 +146,36 @@ BDEPEND+=" ${EAUTORECONF_DEPENDS}" unset EAUTORECONF_DEPENDS unset EAUTORECONF_DEPEND +if [[ ${FONT} == yes ]]; then + RDEPEND+=" media-fonts/encodings + >=x11-apps/mkfontscale-1.2.0" + PDEPEND+=" media-fonts/font-alias" + DEPEND+=" >=media-fonts/font-util-1.2.0 + >=x11-apps/mkfontscale-1.2.0" + + # @ECLASS-VARIABLE: FONT_DIR + # @DESCRIPTION: + # If you're creating a font package and the suffix of PN is not equal to + # the subdirectory of /usr/share/fonts/ it should install into, set + # FONT_DIR to that directory or directories. Set before inheriting this + # eclass. + [[ -z ${FONT_DIR} ]] && FONT_DIR=${PN##*-} + + # Fix case of font directories + FONT_DIR=${FONT_DIR/ttf/TTF} + FONT_DIR=${FONT_DIR/otf/OTF} + FONT_DIR=${FONT_DIR/type1/Type1} + FONT_DIR=${FONT_DIR/speedo/Speedo} + + # Set up configure options, wrapped so ebuilds can override if need be + [[ -z ${FONT_OPTIONS} ]] && FONT_OPTIONS="--with-fontdir=\"${EPREFIX}/usr/share/fonts/${FONT_DIR}\"" + + [[ ${PN} = font-misc-misc || ${PN} = font-schumacher-misc || ${PN##*-} = 75dpi || ${PN##*-} = 100dpi || ${PN##*-} = cyrillic ]] && IUSE+=" nls" +fi + +# If we're a driver package, then enable DRIVER case +[[ ${PN} == xf86-video-* || ${PN} == xf86-input-* ]] && DRIVER="yes" + # @ECLASS-VARIABLE: XORG_STATIC # @DESCRIPTION: # Enables static-libs useflag. Set to no, if your package gets: @@ -138,6 +185,7 @@ unset EAUTORECONF_DEPEND # Add static-libs useflag where useful. if [[ ${XORG_STATIC} == yes \ + && ${FONT} != yes \ && ${CATEGORY} != app-doc \ && ${CATEGORY} != x11-apps \ && ${CATEGORY} != x11-drivers \ @@ -224,6 +272,15 @@ debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: RDEPEND=${RDEPEND}" debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: PDEPEND=${PDEPEND}" debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: BDEPEND=${BDEPEND}" +# @FUNCTION: xorg-3_pkg_setup +# @DESCRIPTION: +# Setup prefix compat +xorg-3_pkg_setup() { + debug-print-function ${FUNCNAME} "$@" + + [[ ${FONT} == yes ]] && font_pkg_setup "$@" +} + # @FUNCTION: xorg-3_src_unpack # @DESCRIPTION: # Simply unpack source code. @@ -235,6 +292,8 @@ xorg-3_src_unpack() { else unpack ${A} fi + + [[ -n ${FONT_OPTIONS} ]] && einfo "Detected font directory:
[gentoo-dev] Last rites: sci-biology/HTSeq
# Aaron Bauman (2020-08-02) # Unmaintained. New release upstream. Py3.6 only. # Removal in 30 days. Bug #696484,#718466 sci-biology/HTSeq -- Cheers, Aaron signature.asc Description: PGP signature
[gentoo-dev] [PATCH] media-fonts/font-misc-misc: upgrade to EAPI 7
Closes: https://bugs.gentoo.org/712064 Package-Manager: Portage-3.0.1, Repoman-2.3.23 Signed-off-by: Henrik Pihl --- .../font-misc-misc-1.1.2-r2.ebuild| 21 +++ 1 file changed, 21 insertions(+) create mode 100644 media-fonts/font-misc-misc/font-misc-misc-1.1.2-r2.ebuild diff --git a/media-fonts/font-misc-misc/font-misc-misc-1.1.2-r2.ebuild b/media-fonts/font-misc-misc/font-misc-misc-1.1.2-r2.ebuild new file mode 100644 index 000..07be926c790 --- /dev/null +++ b/media-fonts/font-misc-misc/font-misc-misc-1.1.2-r2.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit xorg-3 + +DESCRIPTION="X.Org miscellaneous fonts" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="" + +DEPEND="" +RDEPEND="${DEPEND}" +BDEPEND="x11-apps/bdftopcf" + +DOCS=( README ChangeLog ) + +src_install() { + einstalldocs + xorg-3_src_install +} -- 2.28.0
[gentoo-dev] Last rites: app-mobilephone/obexftp
# Aaron Bauman (2020-08-02) # Dead upstream. Py3.6 only. Build issues. # Removal in 30 days. Bug #677900,#716384 # #722408,723344 app-mobilephone/obexftp -- Cheers, Aaron signature.asc Description: PGP signature
[gentoo-dev] Last rites: app-misc/evemu
# Aaron Bauman (2020-08-02) # Dead upstream. Py3.6 only. # Removal in 30 days. Bug #722334,#713686 app-misc/evemu -- Cheers, Aaron signature.asc Description: PGP signature
[gentoo-dev] Last rites: app-backup/cachedir
# Aaron Bauman (2020-08-02) # Needs bump. Py3 tests fail. Last release 2yrs. # Removal in 30 days. Bug #718196 app-backup/cachedir -- Cheers, Aaron signature.asc Description: PGP signature
Re: [gentoo-dev] Re: xorg-3.eclass update
On August 2, 2020 1:49:37 PM EDT, Henrik Pihl wrote: >-BEGIN PGP SIGNED MESSAGE- >Hash: SHA512 > >Hello once again, >and of course I get to apologize some more due to forgetting to attach >the >new patch. > >Henrik > >On 2020-08-02 at 17:15, ahve...@gmail.com wrote: >> I'm sorry for my lack of testing but I didn't notice that it was >doing >> everything except updating the fontconfig cache when dealing with the >fonts >> packages. So, here should be hopefully the complete version, as >originally >> intented. >> >> Henrik >> >> On 2020-08-02 at 13:54, ahve...@gmail.com wrote: >> > Hi, >> > According to the bug[1] it should be all right to restore the font >parts >> in >> > the xorg-3 eclass. Matt didn't object either. Currently upgrading >the >> > font-* packages to EAPI 7 and seemed to work the same way as with >5. >> > >> > [1] https://bugs.gentoo.org/712064 >> > >> > Henrik Pihl >-BEGIN PGP SIGNATURE- >Version: FlowCrypt Email Encryption 7.8.8 >Comment: Seamlessly send and receive encrypted email > >wsFzBAEBCgAGBQJfJvyxACEJELLeoy9dd+JHFiEEZ+1cZjaUPp4qaEdxst6j >L1134kfMZBAAuOppKJ+HT73gj/Fug7ZDlGY9+uH/RyokDU5jDD+A3eSqLtK0 >462767d/Of9kjmkJxJv55OGB/XVkZGZTbWpsdwS6GnsG5cj9KsblbBQU5a0g >lRcxbzJuHoNRdhVwz48Z9vC0g41mm3Plj03TmkaM2ys1CVyDlZDylAQOTSPP >a3YSkIj4VfzoSClnwH8sXNAZyqobIU9Av+wIQt0dYkve7Z6LH1OcRJgk8jFQ >siOp6mnqJMb5rvioZyuBUZwOdNL5GD3qbFXJn10Ek+fYZzcE/1pqySbfoLtl >IhtqGp9v4lYz7Yv9MLwEl+XjabJOZbZBRceHIXRJbjLCZEUpDmwFO9NObc8e >KhsFlI3DjM8nz/EyEFIw3/51zENcJPpwlSbDPus6N5nIOjKzGCEOJNpigG5P >uD5Es1s5QCgHf77lB8eRDQoa+u+UwiTbLWUlDIVM3IyYc6crpIM4eAM9mKVA >Jge6EKiRG62IuIAMcPYWNzVxa+TfJWJgpy5Jdu5frxV1Vh8LplTQYIWh5U7G >Jtq1WiGC1u2Jwyk/M8LOqtaymekeG6BSTvYf4Me1FK4+vRL7G4YeYg6LZj36 >RmJz0IeVXfRC+BAit7ctBD4AOfAlNQ9UJIpHnEKNXTGLqtDVuHeF+VEOuJWL >GHsyorcfdpJjtbIKmCvuraysWo/I34u3Qgg= >=XKvL >-END PGP SIGNATURE- Henrik, please send the patch inline so folks can review it. Likely, 'git send-email'. -- Sent from my Android device with K-9 Mail. Please excuse my brevity.
[gentoo-dev] Re: xorg-3.eclass update
-BEGIN PGP SIGNED MESSAGE- Hash: SHA512 Hello once again, and of course I get to apologize some more due to forgetting to attach the new patch. Henrik On 2020-08-02 at 17:15, ahve...@gmail.com wrote: > I'm sorry for my lack of testing but I didn't notice that it was doing > everything except updating the fontconfig cache when dealing with the fonts > packages. So, here should be hopefully the complete version, as originally > intented. > > Henrik > > On 2020-08-02 at 13:54, ahve...@gmail.com wrote: > > Hi, > > According to the bug[1] it should be all right to restore the font parts > in > > the xorg-3 eclass. Matt didn't object either. Currently upgrading the > > font-* packages to EAPI 7 and seemed to work the same way as with 5. > > > > [1] https://bugs.gentoo.org/712064 > > > > Henrik Pihl -BEGIN PGP SIGNATURE- Version: FlowCrypt Email Encryption 7.8.8 Comment: Seamlessly send and receive encrypted email wsFzBAEBCgAGBQJfJvyxACEJELLeoy9dd+JHFiEEZ+1cZjaUPp4qaEdxst6j L1134kfMZBAAuOppKJ+HT73gj/Fug7ZDlGY9+uH/RyokDU5jDD+A3eSqLtK0 462767d/Of9kjmkJxJv55OGB/XVkZGZTbWpsdwS6GnsG5cj9KsblbBQU5a0g lRcxbzJuHoNRdhVwz48Z9vC0g41mm3Plj03TmkaM2ys1CVyDlZDylAQOTSPP a3YSkIj4VfzoSClnwH8sXNAZyqobIU9Av+wIQt0dYkve7Z6LH1OcRJgk8jFQ siOp6mnqJMb5rvioZyuBUZwOdNL5GD3qbFXJn10Ek+fYZzcE/1pqySbfoLtl IhtqGp9v4lYz7Yv9MLwEl+XjabJOZbZBRceHIXRJbjLCZEUpDmwFO9NObc8e KhsFlI3DjM8nz/EyEFIw3/51zENcJPpwlSbDPus6N5nIOjKzGCEOJNpigG5P uD5Es1s5QCgHf77lB8eRDQoa+u+UwiTbLWUlDIVM3IyYc6crpIM4eAM9mKVA Jge6EKiRG62IuIAMcPYWNzVxa+TfJWJgpy5Jdu5frxV1Vh8LplTQYIWh5U7G Jtq1WiGC1u2Jwyk/M8LOqtaymekeG6BSTvYf4Me1FK4+vRL7G4YeYg6LZj36 RmJz0IeVXfRC+BAit7ctBD4AOfAlNQ9UJIpHnEKNXTGLqtDVuHeF+VEOuJWL GHsyorcfdpJjtbIKmCvuraysWo/I34u3Qgg= =XKvL -END PGP SIGNATURE- diff --git a/eclass/xorg-3.eclass b/eclass/xorg-3.eclass index 168e58b42c8..a52c0146baa 100644 --- a/eclass/xorg-3.eclass +++ b/eclass/xorg-3.eclass @@ -27,6 +27,20 @@ if [[ ${PV} == ** ]]; then XORG_EAUTORECONF="yes" fi +# If we're a font package, but not the font.alias one +FONT_ECLASS="" +if [[ ${CATEGORY} = media-fonts ]]; then + case ${PN} in + font-alias|font-util) + ;; + font*) + # Activate font code in the rest of the eclass + FONT="yes" + FONT_ECLASS="font" + ;; + esac +fi + # @ECLASS-VARIABLE: XORG_MULTILIB # @DESCRIPTION: # If set to 'yes', the multilib support for package will be enabled. Set @@ -34,13 +48,14 @@ fi : ${XORG_MULTILIB:="no"} # we need to inherit autotools first to get the deps -inherit autotools libtool multilib toolchain-funcs flag-o-matic ${GIT_ECLASS} +inherit autotools libtool multilib toolchain-funcs flag-o-matic ${GIT_ECLASS} \ + flag-o-matic ${FONT_ECLASS} ${GIT_ECLASS} if [[ ${XORG_MULTILIB} == yes ]]; then inherit multilib-minimal fi -EXPORTED_FUNCTIONS="src_prepare src_configure src_unpack src_compile src_install" +EXPORTED_FUNCTIONS="src_prepare src_configure src_unpack src_compile src_install pkg_postinst pkg_postrm" case "${EAPI:-0}" in 7) ;; *) die "EAPI=${EAPI} is not supported" ;; @@ -66,7 +81,7 @@ IUSE="" # @ECLASS-VARIABLE: XORG_MODULE # @DESCRIPTION: # The subdirectory to download source from. Possible settings are app, -# doc, data, util, driver, lib, proto, xserver. Set above the +# doc, data, util, driver, font, lib, proto, xserver. Set above the # inherit to override the default autoconfigured module. : ${XORG_MODULE:="auto"} if [[ ${XORG_MODULE} == auto ]]; then @@ -116,7 +131,9 @@ EAUTORECONF_DEPEND+=" >=sys-devel/libtool-2.2.6a sys-devel/m4" if [[ ${PN} != util-macros ]] ; then - EAUTORECONF_DEPEND+=" >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0" + EAUTORECONF_DEPEND+=" >=x11-misc/util-macros-1.18" + # Required even by xorg-server + [[ ${PN} == "font-util" ]] || EAUTORECONF_DEPEND+=" >=media-fonts/font-util-1.2.0" fi WANT_AUTOCONF="latest" WANT_AUTOMAKE="latest" @@ -129,6 +146,36 @@ BDEPEND+=" ${EAUTORECONF_DEPENDS}" unset EAUTORECONF_DEPENDS unset EAUTORECONF_DEPEND +if [[ ${FONT} == yes ]]; then + RDEPEND+=" media-fonts/encodings + >=x11-apps/mkfontscale-1.2.0" + PDEPEND+=" media-fonts/font-alias" + DEPEND+=" >=media-fonts/font-util-1.2.0 + >=x11-apps/mkfontscale-1.2.0" + + # @ECLASS-VARIABLE: FONT_DIR + # @DESCRIPTION: + # If you're creating a font package and the suffix of PN is not equal to + # the subdirectory of /usr/share/fonts/ it should install into, set + # FONT_DIR to that directory or directories. Set before inheriting this + # eclass. + [[ -z ${FONT_DIR} ]] && FONT_DIR=${PN##*-} + + # Fix case of font directories + FONT_DIR=${FONT_DIR/ttf/TTF} + FONT_DIR=${FONT_DIR/otf/OTF} + FONT_DIR=${FONT_DIR/type1/Type1} + FONT_DIR=${FONT_DIR/speedo/Speedo} + + # Set up configure options, wrapped so ebuilds can override if need be + [[ -z ${FONT_OPTIONS} ]] && FONT_OPTIONS="--with-fontdir=\"${EPREFIX}/usr/share/fonts/${FONT_DIR}\"" + + [[ ${PN} = font-misc-misc || ${PN} = font-schumacher-misc || ${PN##*-} = 75dpi || ${PN##*-} = 100dpi || ${PN##*-} = cyrillic ]] && IUSE+=" nls"
[gentoo-dev] Re: xorg-3.eclass update
-BEGIN PGP SIGNED MESSAGE- Hash: SHA512 I'm sorry for my lack of testing but I didn't notice that it was doing everything except updating the fontconfig cache when dealing with the fonts packages. So, here should be hopefully the complete version, as originally intented. Henrik On 2020-08-02 at 13:54, ahve...@gmail.com wrote: > Hi, > According to the bug[1] it should be all right to restore the font parts in > the xorg-3 eclass. Matt didn't object either. Currently upgrading the > font-* packages to EAPI 7 and seemed to work the same way as with 5. > > [1] https://bugs.gentoo.org/712064 > > Henrik Pihl -BEGIN PGP SIGNATURE- Version: FlowCrypt Email Encryption 7.8.8 Comment: Seamlessly send and receive encrypted email wsFzBAEBCgAGBQJfJvSwACEJELLeoy9dd+JHFiEEZ+1cZjaUPp4qaEdxst6j L1134keE5BAAm+t01PP5ecvEn+3UTA0H4RulnlPbHX7T11EpCQdfHGxfU5Ly YutTP3sVU7Ji6TfF/KrdDj5MUtfhaNUFVbwEx6f3MeiaRLB4mGQML5Un28Jp I+DmY2PyZYJVcqtAJE4B13RiUpAlNT13zpWn/5pGXt2ykLW9i79WpRjr6iQ+ c6EtYWSyGUG7elnkg8Cdn9z2xa3zZXPlyZEEmFcXrKYpfSA8D8JMfUlQSRHk X5V8v2ZrYp5ouXXn/YECFLo6+Cg1OcyIVi9zbX/1/n+r7EMy8Ae2TVtt5kud agR3zvwMwz7tu+EVCmvWXRA4aR214X3UGUW+oKeY1wolICP3ecpn+HTWAh6+ 2ccT66dy6LqrAckbJAhDUHJo/1tIBAGhQK8Z3ckL5XWTqP7MEaIg8vDOv+PL c/s/cr8vUkEcUrBtthuAkAP7zHmsLWs17DNgCTKlyDh/aOklCd6NNG37YRHJ l5G8rhHLEqIVTDs5OkP6phuXSjtucyNS/XgdDkxia2XyQ3vmZuv1AqoIlc5h 4nv4/DC9IDQwsR51EvyM6CssgM8jP7jimAQu/WD1B8oRL4pFHowyO3hb5HMu 8Lw+dbAQGisA/HJ6dAyb+62L7kFtSBmT6ju9CrIVqlPow655B2n1Zp1/XZ9i keJmegoTpCAH0xkNMPB0pXKdQ3fwzb6Nkmw= =yX6R -END PGP SIGNATURE-
[gentoo-dev] xorg-3.eclass update
-BEGIN PGP SIGNED MESSAGE- Hash: SHA512 Hi, According to the bug[1] it should be all right to restore the font parts in the xorg-3 eclass. Matt didn't object either. Currently upgrading the font-* packages to EAPI 7 and seemed to work the same way as with 5. [1] https://bugs.gentoo.org/712064 Henrik Pihl -BEGIN PGP SIGNATURE- Version: FlowCrypt Email Encryption 7.8.8 Comment: Seamlessly send and receive encrypted email wsFzBAEBCgAGBQJfJsWdACEJELLeoy9dd+JHFiEEZ+1cZjaUPp4qaEdxst6j L1134kcOWBAArEPmt1Oqn91xuEiwmG5yIKGkUHfs+Ja1YZ9BdY5pFMr8nzIa 74GU2lqDjKoD6dvAdqnR6Ov/hzrLLIUXfotebnaaoIxaGNbf565NSzA80O/k mAF+MPg14ydji3CtrSNz/xzbcktgoy0l/QHX8yYMrS/mZHODQQcxrfZaUGz3 uWLDOl9+8GvCztSrTORoku2IGk0MXu5ICNvrzrqRTb84KQOA/HoUyvLp4Tj/ zJwscgYKf9RYVcbXovEKw2qcGZh5ahKifkBnO7jNyJO20WWxPKeD9xY9hWKK 1YjB5ZGsdUd20AZEJuaW4V/gxxTDlzzyQSHOsf3zeGVKb1P709kM3Uig0+xY oxveFa1UARZ8WcKUSD1+1Al9mkzW2Vwir2Rowlp55N1Pignt9QWEjowSPZdt XLUzTBtjMBqduhhDMQCsyM0hUKrbFKCA9D90+JNpfqcOFQdgrbFjslGV0kMO sNEblUj/GYwkiNAG/Tm4nwOzkuwk6dlRd3m5OQQZw2JTRn8TnUweQW2qyirY aWD+6eSbQSkGdW5aProBAyM3G9TkjmMRe4GAVu5d/yOS7a1QmOQ3YMeAgUvq m1qZiwD81LJm8ofLPOQH/WMbTDZgRwQg76zoXFe/bgqHneMgdrCzume6+CPw 9qbUHyoRDXsuUV67ptQD174cbnIAVHkzmT4= =R4ig -END PGP SIGNATURE- diff --git a/eclass/xorg-3.eclass b/eclass/xorg-3.eclass index 168e58b42c8..b20a09a843d 100644 --- a/eclass/xorg-3.eclass +++ b/eclass/xorg-3.eclass @@ -27,6 +27,20 @@ if [[ ${PV} == ** ]]; then XORG_EAUTORECONF="yes" fi +# If we're a font package, but not the font.alias one +FONT_ECLASS="" +if [[ ${CATEGORY} = media-fonts ]]; then + case ${PN} in + font-alias|font-util) + ;; + font*) + # Activate font code in the rest of the eclass + FONT="yes" + FONT_ECLASS="font" + ;; + esac +fi + # @ECLASS-VARIABLE: XORG_MULTILIB # @DESCRIPTION: # If set to 'yes', the multilib support for package will be enabled. Set @@ -66,7 +80,7 @@ IUSE="" # @ECLASS-VARIABLE: XORG_MODULE # @DESCRIPTION: # The subdirectory to download source from. Possible settings are app, -# doc, data, util, driver, lib, proto, xserver. Set above the +# doc, data, util, driver, font, lib, proto, xserver. Set above the # inherit to override the default autoconfigured module. : ${XORG_MODULE:="auto"} if [[ ${XORG_MODULE} == auto ]]; then @@ -129,6 +143,36 @@ BDEPEND+=" ${EAUTORECONF_DEPENDS}" unset EAUTORECONF_DEPENDS unset EAUTORECONF_DEPEND +if [[ ${FONT} == yes ]]; then + RDEPEND+=" media-fonts/encodings + >=x11-apps/mkfontscale-1.2.0" + PDEPEND+=" media-fonts/font-alias" + DEPEND+=" >=media-fonts/font-util-1.2.0 + >=x11-apps/mkfontscale-1.2.0" + + # @ECLASS-VARIABLE: FONT_DIR + # @DESCRIPTION: + # If you're creating a font package and the suffix of PN is not equal to + # the subdirectory of /usr/share/fonts/ it should install into, set + # FONT_DIR to that directory or directories. Set before inheriting this + # eclass. + [[ -z ${FONT_DIR} ]] && FONT_DIR=${PN##*-} + + # Fix case of font directories + FONT_DIR=${FONT_DIR/ttf/TTF} + FONT_DIR=${FONT_DIR/otf/OTF} + FONT_DIR=${FONT_DIR/type1/Type1} + FONT_DIR=${FONT_DIR/speedo/Speedo} + + # Set up configure options, wrapped so ebuilds can override if need be + [[ -z ${FONT_OPTIONS} ]] && FONT_OPTIONS="--with-fontdir=\"${EPREFIX}/usr/share/fonts/${FONT_DIR}\"" + + [[ ${PN} = font-misc-misc || ${PN} = font-schumacher-misc || ${PN##*-} = 75dpi || ${PN##*-} = 100dpi || ${PN##*-} = cyrillic ]] && IUSE+=" nls" +fi + +# If we're a driver package, then enable DRIVER case +[[ ${PN} == xf86-video-* || ${PN} == xf86-input-* ]] && DRIVER="yes" + # @ECLASS-VARIABLE: XORG_STATIC # @DESCRIPTION: # Enables static-libs useflag. Set to no, if your package gets: @@ -224,6 +268,15 @@ debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: RDEPEND=${RDEPEND}" debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: PDEPEND=${PDEPEND}" debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: BDEPEND=${BDEPEND}" +# @FUNCTION: xorg-3_pkg_setup +# @DESCRIPTION: +# Setup prefix compat +xorg-3_pkg_setup() { + debug-print-function ${FUNCNAME} "$@" + + [[ ${FONT} == yes ]] && font_pkg_setup "$@" +} + # @FUNCTION: xorg-3_src_unpack # @DESCRIPTION: # Simply unpack source code. @@ -235,6 +288,8 @@ xorg-3_src_unpack() { else unpack ${A} fi + + [[ -n ${FONT_OPTIONS} ]] && einfo "Detected font directory: ${FONT_DIR}" } # @FUNCTION: xorg-3_reconf_source @@ -270,6 +325,40 @@ xorg-3_src_prepare() { xorg-3_reconf_source } +# @FUNCTION: xorg-3_font_configure +# @DESCRIPTION: +# If a font package, perform any necessary configuration steps +xorg-3_font_configure() { + debug-print-function ${FUNCNAME} "$@" + + if has nls ${IUSE//+} && ! use nls; then + if grep -q -s "disable-all-encodings" ${ECONF_SOURCE:-.}/configure; then + FONT_OPTIONS+=" +--disable-all-encodings +--enable-iso8859-1" + else + FONT_OPTIONS+=" +--disable-iso8859-2 +--disable-iso8859-3 +--disable-iso8859-4 +--disable-iso8859-5 +--disable-iso8859-6 +--disable-iso8859-7 +--disable-iso8859-8 +
Re: [gentoo-dev] [PATCH] mate.eclass: drop static-libs whenever possible
On 8/2/20 3:56 AM, Mart Raudsepp wrote: > Ühel kenal päeval, L, 01.08.2020 kell 14:32, kirjutas Adam Feldman: >> + gnome2_src_configure ${mateconf[@]} "$@" > > This might be something we may want to consider adding to gnome2.eclass > instead? > But I guess that's something to consider for any EAPI-7 port instead, > should one eventually happen (instead of everything moving to meson > instead). > So no objections adding it to mate.eclass for the time being. > gnome2.eclass would need too much checking that it's fine to bother at > this point without the EAPI bump. But remind about it, should a EAPI-7 > gnome2 ever go up for review here :) > > > Mart > Would you like a patch for gnome2.eclass now with a: if has ${EAPI:-0} 7; then fi block so you'll be set to go upon updating the eclass to EAPI 7? -- Thanks, Adam Feldman Gentoo Developer np-hard...@gentoo.org 0x671C52F118F89C67 signature.asc Description: OpenPGP digital signature
[gentoo-dev] Last rites: x11-misc/pypanel
# Michał Górny (2020-08-02) # Discontinued. Last patch in 2008. Py2 only. # Removal in 30 days. Bug #734632. x11-misc/pypanel -- Best regards, Michał Górny signature.asc Description: This is a digitally signed message part
[gentoo-dev] Last rites: dev-python/python-openid
# Michał Górny (2020-08-02) # Stuck on py2. Last release in 2010, last commit in 2014. No revdeps. # Blocks dev-python/mysql-python removal. # Removal in 30 days. Bug #735178. dev-python/python-openid -- Best regards, Michał Górny signature.asc Description: This is a digitally signed message part
[gentoo-dev] Last rites: sys-auth/consolekit and co
# Mikle Kolyada (2020-08-02) # consolekit is abandoned upstream. # People are encouraged to switch to any logind # implementation (systemd/elogind). # Removal in 60 days (bug #727730) sys-auth/consolekit sec-policy/selinux-consolekit signature.asc Description: This is a digitally signed message part.
[gentoo-dev] Last rites: dev-python/mox
# Michał Górny (2020-08-02) # Discontinued upstream in favor of dev-python/mock. Py2 only. # The only revdep is last rited now. # Removal in 30 days. Bug #735158. dev-python/mox -- Best regards, Michał Górny signature.asc Description: This is a digitally signed message part
[gentoo-dev] Last rites: dev-python/google-apputils
# Michał Górny (2020-08-02) # Discontinued upstream in 2015. Python 2 only. No revdeps. # Removal in 30 days. Bug #735156. dev-python/google-apputils -- Best regards, Michał Górny signature.asc Description: This is a digitally signed message part
Re: [gentoo-dev] [PATCH] mate.eclass: drop static-libs whenever possible
Ühel kenal päeval, L, 01.08.2020 kell 14:32, kirjutas Adam Feldman: > + gnome2_src_configure ${mateconf[@]} "$@" This might be something we may want to consider adding to gnome2.eclass instead? But I guess that's something to consider for any EAPI-7 port instead, should one eventually happen (instead of everything moving to meson instead). So no objections adding it to mate.eclass for the time being. gnome2.eclass would need too much checking that it's fine to bother at this point without the EAPI bump. But remind about it, should a EAPI-7 gnome2 ever go up for review here :) Mart signature.asc Description: This is a digitally signed message part