date:20210131

[gentoo-commits] proj/sci:master commit in: sci-biology/MochiView/

2021-01-31 Thread Andrew Ammerlaan

commit: 5bc6928cca2630e651f601fa8fba065ef5f9471e
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Mon Feb  1 07:53:36 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Mon Feb  1 07:53:36 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=5bc6928c

sci-biology/MochiView: fix empty ebuild

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan  riseup.net>

 sci-biology/MochiView/MochiView-1.45.ebuild | 16 
 sci-biology/MochiView/MochiView-1.46.ebuild | 23 +++
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/sci-biology/MochiView/MochiView-1.45.ebuild 
b/sci-biology/MochiView/MochiView-1.45.ebuild
deleted file mode 100644
index 61e0be859..0
--- a/sci-biology/MochiView/MochiView-1.45.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Genome browser and analysis"
-HOMEPAGE="http://johnsonlab.ucsf.edu/mochi.html";
-SRC_URI=""
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"

diff --git a/sci-biology/MochiView/MochiView-1.46.ebuild 
b/sci-biology/MochiView/MochiView-1.46.ebuild
new file mode 100644
index 0..d9db425fa
--- /dev/null
+++ b/sci-biology/MochiView/MochiView-1.46.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit java-utils-2
+
+DESCRIPTION="Genome browser and analysis"
+HOMEPAGE="http://johnsonlab.ucsf.edu/mochi.html";
+SRC_URI="https://www.johnsonlab.ucsf.edu/s/MochiView_v${PV//.}.zip";
+
+LICENSE="MIT LGPL-3 MPL-1.1 Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND=">=virtual/jre-1.7:*"
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}/${PN}_v${PV}"
+
+src_install() {
+   java-pkg_dojar INTERNAL_USE/*.jar
+}

[gentoo-commits] repo/gentoo:master commit in: media-libs/libmp3splt/

2021-01-31 Thread Andreas Sturmlechner

commit: 16e3ae36874b18e8b2730b63c9915987c9437e37
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Feb  1 07:49:26 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Feb  1 07:49:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16e3ae36

media-libs/libmp3splt: Drop 0.9.2-r1

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-libs/libmp3splt/libmp3splt-0.9.2-r1.ebuild | 51 
 1 file changed, 51 deletions(-)

diff --git a/media-libs/libmp3splt/libmp3splt-0.9.2-r1.ebuild 
b/media-libs/libmp3splt/libmp3splt-0.9.2-r1.ebuild
deleted file mode 100644
index 8c7d738565f..000
--- a/media-libs/libmp3splt/libmp3splt-0.9.2-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit versionator autotools eutils multilib
-
-DESCRIPTION="a library for mp3splt to split mp3 and ogg files without decoding"
-HOMEPAGE="http://mp3splt.sourceforge.net";
-SRC_URI="mirror://sourceforge/${PN:3}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 sparc x86"
-IUSE="doc flac pcre"
-
-RDEPEND="media-libs/libmad
-   media-libs/libvorbis
-   media-libs/libogg
-   media-libs/libid3tag
-   flac? ( >=media-libs/flac-1.2.1 )
-   pcre? ( dev-libs/libpcre )"
-DEPEND="${RDEPEND}
-   doc? ( >=app-doc/doxygen-1.8.3.1 media-gfx/graphviz )
-   sys-apps/findutils"
-
-src_prepare() {
-   epatch "${FILESDIR}"/${PN}-0.7-libltdl.patch
-   epatch "${FILESDIR}"/CVE-2017-15185.patch
-   eautoreconf
-}
-
-src_configure() {
-   econf \
-   --disable-static \
-   $(use_enable pcre) \
-   $(use_enable flac) \
-   $(use_enable doc doxygen_doc) \
-   --docdir=/usr/share/doc/${PF} \
-   --disable-optimise \
-   --disable-cutter  # TODO package cutter 

-}
-
-src_install() {
-   default
-   use doc && docompress -x /usr/share/doc/${PF}/doxygen/${PN}_ico.svg
-
-   dodoc AUTHORS ChangeLog LIMITS NEWS README TODO
-
-   find "${D}"/usr -name '*.la' -delete
-}

[gentoo-commits] repo/proj/guru:dev commit in: dev-scheme/gerbil/, dev-scheme/gerbil/files/

2021-01-31 Thread Maciej Barć

commit: a6f6f061395b002f7612771fb0cc50e0280e91a8
Author: Maciej Barć  protonmail  com>
AuthorDate: Mon Feb  1 01:57:55 2021 +
Commit: Maciej Barć  protonmail  com>
CommitDate: Mon Feb  1 03:41:52 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a6f6f061

dev-scheme/gerbil: new pkg; add version 0.16 and 

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Maciej Barć  protonmail.com>

 dev-scheme/gerbil/Manifest |   1 +
 dev-scheme/gerbil/files/gerbil_home.sh |   6 ++
 dev-scheme/gerbil/gerbil-0.16.ebuild   | 112 +++
 dev-scheme/gerbil/gerbil-.ebuild   | 119 +
 dev-scheme/gerbil/metadata.xml |  34 ++
 5 files changed, 272 insertions(+)

diff --git a/dev-scheme/gerbil/Manifest b/dev-scheme/gerbil/Manifest
new file mode 100644
index ..d1147d68
--- /dev/null
+++ b/dev-scheme/gerbil/Manifest
@@ -0,0 +1 @@
+DIST gerbil-0.16.tar.gz 1715765 BLAKE2B 
74cd501b19c8f124f9478c73080e92c2ba0bf92e8cb9faa4cba492b2def8a61633897b67def4200e53962ccf22287f58cf7fdd33604104acc80bde12dd58b07c
 SHA512 
46782b4b71a3b437501b825f2f164e53b285d3a4cdba8f04485edaaa589d8500535c06a47a1464fc537ab7546413dde37c8d6a16a5e076a99ccf255905ed105d

diff --git a/dev-scheme/gerbil/files/gerbil_home.sh 
b/dev-scheme/gerbil/files/gerbil_home.sh
new file mode 100644
index ..8e695985
--- /dev/null
+++ b/dev-scheme/gerbil/files/gerbil_home.sh
@@ -0,0 +1,6 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+
+GERBIL_HOME="${EPREFIX}/usr/share/gerbil"
+export GERBIL_HOME

diff --git a/dev-scheme/gerbil/gerbil-0.16.ebuild 
b/dev-scheme/gerbil/gerbil-0.16.ebuild
new file mode 100644
index ..b5ddf8a9
--- /dev/null
+++ b/dev-scheme/gerbil/gerbil-0.16.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp-common toolchain-funcs wrapper
+
+DESCRIPTION="Dialect of Scheme designed for Systems Programming"
+HOMEPAGE="
+   https://cons.io/
+   https://github.com/vyzo/gerbil
+"
+
+if [[ "${PV}" == ** ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/vyzo/${PN}.git";
+else
+   SRC_URI="https://github.com/vyzo/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64"
+fi
+
+LICENSE="Apache-2.0 LGPL-2.1"
+SLOT="0"
+IUSE="emacs leveldb lmdb mysql +sqlite +xml yaml +zlib"
+
+BDEPEND="
+   emacs? ( >=app-editors/emacs-23.1:* )
+"
+DEPEND="
+   dev-scheme/gambit
+   leveldb? ( dev-libs/leveldb )
+   lmdb? ( dev-db/lmdb )
+   mysql? ( dev-db/mariadb:* )
+   sqlite? ( dev-db/sqlite )
+   xml? ( dev-libs/libxml2 )
+   yaml? ( dev-libs/libyaml )
+   zlib? ( sys-libs/zlib )
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${P}/src"
+
+src_configure() {
+   # Just to be safe, because './configure --help' says:
+   # "Set default GERBIL_HOME (environment variable still overrides)"
+   unset GERBIL_HOME
+
+   local myconf=(
+   $(use_enable leveldb)
+   $(use_enable lmdb)
+   $(use_enable mysql)
+   $(use_enable xml libxml)
+   $(use_enable yaml libyaml)
+   $(usex sqlite '' '--disable-sqlite')
+   $(usex zlib '' '--disable-zlib')
+   --prefix="${D}/usr/share/${PN}"
+   )
+   # This is not a standard 'configure' script!
+   gsi ./configure "${myconf[@]}" \
+   || die "Failed to configure using the 'configure' script"
+}
+
+src_compile() {
+   # The 'build.sh' script uses environment variables that are exported
+   # by portage, ie.: CFLAGS, LDFLAGS, ...
+   sh ./build.sh \
+   || die "Failed to compile using the 'build.sh' script"
+}
+
+src_install() {
+   mkdir -p "${D}/usr/share/${PN}" \
+   || die "Failed to make ${D}/usr/share/${PN} directory"
+   gsi ./install \
+   || die "Failed to install using the 'install' script"
+
+   sed -i "s|${D}|${EPREFIX}|g" "${D}/usr/share/${PN}/bin/gxc" \
+   || die "Failed to fix the 'gxc' executable script"
+
+   mv "${D}/usr/share/${PN}/share/emacs" "${D}/usr/share/emacs" \
+   || die "Failed to fix '/usr/share/emacs' install path"
+   mv "${D}/usr/share/${PN}/share/${PN}/TAGS" "${D}/usr/share/${PN}/TAGS" \
+   || die "Failed to fix '/usr/share/gerbil/TAGS' install path"
+
+   # Compile the 'gerbil-mode.el'
+   # FIXME: Doesn't autoload
+   if use emacs; then
+   pushd "${D}/usr/share/emacs/site-lisp/gerbil" || die
+   elisp-compile *.el || die
+   popd || die
+   fi
+
+   # Create wrappers for gerbil executables in GERBIL_HOME 
(/usr/share/gerbil)
+   pushd "${D}/usr/share/${PN}/bin" || die
+   local gx_bin
+   for gx_bin in *; do

[gentoo-commits] proj/sci:master commit in: sci-biology/MaSuRCA/

2021-01-31 Thread Andrew Ammerlaan

commit: 295c07c0f1dc210afcb0131f0451f86b3c83b1b3
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Mon Feb  1 07:41:14 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Mon Feb  1 07:41:14 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=295c07c0

sci-biology/MaSuRCA: version bump 4.0.1

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan  riseup.net>

 .../{MaSuRCA-3.2.2.ebuild => MaSuRCA-4.0.1.ebuild} | 26 --
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/sci-biology/MaSuRCA/MaSuRCA-3.2.2.ebuild 
b/sci-biology/MaSuRCA/MaSuRCA-4.0.1.ebuild
similarity index 52%
rename from sci-biology/MaSuRCA/MaSuRCA-3.2.2.ebuild
rename to sci-biology/MaSuRCA/MaSuRCA-4.0.1.ebuild
index 2f2f9ddbd..8e6d2925e 100644
--- a/sci-biology/MaSuRCA/MaSuRCA-3.2.2.ebuild
+++ b/sci-biology/MaSuRCA/MaSuRCA-4.0.1.ebuild
@@ -1,35 +1,27 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="de Bruijn and OLC assembler for Sanger, Roche 454, Illumina, 
Pacbio, Nanopore"
 HOMEPAGE="http://www.genome.umd.edu/masurca.html
http://bioinformatics.oxfordjournals.org/content/29/21/2669
-   http://biorxiv.org/content/biorxiv/early/2016/07/26/066100.full.pdf";
-SRC_URI="${P}.tar.gz
-   ftp://ftp.genome.umd.edu/pub/MaSuRCA/MaSuRCA_QuickStartGuide.pdf";
+   https://biorxiv.org/content/biorxiv/early/2016/07/26/066100.full.pdf";
+SRC_URI="https://github.com/alekseyzimin/masurca/releases/download/v${PV}/${P}.tar.gz";
 
 LICENSE="BSD GPL-2 GPL-3"
 SLOT="0"
-KEYWORDS=""
-IUSE=""
+KEYWORDS="~amd64"
 
-DEPEND=">=dev-lang/perl-5.8
-   app-arch/bzip2"
+DEPEND="
+   >=dev-lang/perl-5.8
+   app-arch/bzip2
+"
 RDEPEND="${DEPEND}"
 
-RESTRICT="fetch"
-
-src_configure(){
-   ./install.sh || die
-}
-
 src_compile(){
./install.sh || die
 }
-
 src_install(){
dobin masurca
-   dodoc sr_config_example.txt
 }

[gentoo-commits] repo/gentoo:master commit in: dev-util/cargo-c/

2021-01-31 Thread Luca Barbato

commit: dc382702ea44c676f8d3b5a00883507164afd724
Author: Luca Barbato  gentoo  org>
AuthorDate: Mon Feb  1 07:24:46 2021 +
Commit: Luca Barbato  gentoo  org>
CommitDate: Mon Feb  1 07:25:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc382702

dev-util/cargo-c: New version

Uses cargo 0.50

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Luca Barbato  gentoo.org>

 dev-util/cargo-c/Manifest  | 58 +
 .../{cargo-c-0.7.0.ebuild => cargo-c-0.7.2.ebuild} | 72 +++---
 2 files changed, 69 insertions(+), 61 deletions(-)

diff --git a/dev-util/cargo-c/Manifest b/dev-util/cargo-c/Manifest
index 0ff4ec923a9..7afbe2b03f4 100644
--- a/dev-util/cargo-c/Manifest
+++ b/dev-util/cargo-c/Manifest
@@ -4,7 +4,7 @@ DIST aho-corasick-0.7.10.crate 111039 BLAKE2B 
69f984dbe528ece5ce4345bc0f39c12250
 DIST aho-corasick-0.7.15.crate 113071 BLAKE2B 
a22743be74f873b9545648db6a994250e3e39b92ac99601580e3b02194d205e921bff0b1952a4cca3399a3a7828555a1abfb0c1466f3930811c6b95c1a07ec5e
 SHA512 
e67816efa7305937a7cbbb0079b91b8afa3fdab52cfb8eeddeee156f18bbeed26f941cd4cb18ab2bdc1da5a9ff1dcbe9d2090deec68c00287bd99ace18ee8b24
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 
9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4
 SHA512 
a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
 DIST anyhow-1.0.27.crate 26395 BLAKE2B 
f510c352ba6cb6be2e20d40e176bd48f7bf39dff4a0be288f54da60346f2fcb9b6376a4f139fbe13a9178ec8feb58a28badc209814d6ed9d1decd7b327ac8a4b
 SHA512 
ed880d594fa5d17f14abecee56f7b2742b9ceb744bf8548c99c0ac6f3880f761df657959ecf512d7d194f75055db668eaf1a8306876d596b471b12ccffb8c959
-DIST anyhow-1.0.36.crate 29083 BLAKE2B 
62166679a01ba1a2935316efa74b97a990f3ad720cbe339abc333a8609462438ec0268c4f3e6f5ede1ec972a23ce982d8e5de057c3f76b3f711b1d1d1cba8fe9
 SHA512 
4128dade4fa361230581973809598556b188195f5cbd951f2be651cb9bdb9ce6bbc45e70e0f05044080b054524d379bf2661cddc85ca157f0b260c1c0b492bda
+DIST anyhow-1.0.38.crate 30417 BLAKE2B 
168c6692fa669e90bba848bbb830fcd18ef2e2359a6f0f6b0ac8a20666b9c8416ac79e20d1b31e7230e261284502ede8091adc6b8cfdb462e8c4ad57a2cad651
 SHA512 
3f6229fd9d284053f348f8180f9b1f1c1f1b711b733ff9a331b2f16ad6dd0c46a38ec17c8c8257981209230ba769b7cce349b64bb7f6f8ea6150ab9d6e483b8c
 DIST atty-0.2.14.crate 5470 BLAKE2B 
2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab
 SHA512 
d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 DIST autocfg-1.0.0.crate 12870 BLAKE2B 
79e495d53298574afd3b292da7c9c363dcb3ea434fd44258efaf3628e95ebfc731f03083f8a1060272a2a3478a6452cdc41539e2dac08465cc6e6283844bf260
 SHA512 
451fc63148792ba1952b884170e3481359b01bacca5ec0456f43ca58f8e092b8f81c9764f8b00d4104059ff608089be5858220ee868127c064cc890c767ec3a3
 DIST autocfg-1.0.1.crate 12908 BLAKE2B 
40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a
 SHA512 
630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
@@ -16,9 +16,9 @@ DIST bstr-0.2.14.crate 345490 BLAKE2B 
96095cf4d70d88cd5cb4a61bd0e72a673933c7d1d9
 DIST bytesize-1.0.0.crate 7522 BLAKE2B 
cd4f9687753ec1ea4e7435f34b64afdf6e5534d33515d00c413da37081dea57eb76b2f3b8e001e65ca40908efccddcfa458ce1e3b5974aa79232567d9df7faff
 SHA512 
a8837bc05efbf6faf55ce76cffb0f8ef2f47baad2f65875da246f4a8f1052af0fcd8f156950deac0e57e015183d740e0d8ced1e6da1aaecf03244ad370d926b8
 DIST bytesize-1.0.1.crate 7629 BLAKE2B 
c1f969f809abf5ac432e8590158781c26d11448ff0590647f2d60ad62d416a9f93e8bf1d5a650a40cac21bda90310c02f323bcc4fd1e2ee122de1588aff29352
 SHA512 
99a11059c27ed3c0279acafff1c0fa27fb7e5021876d2ad3a79ff8f31030fdc8a1b5969063ec6578499412804564cd3cb325c9198196bd4a078225a47179f605
 DIST cargo-0.43.1.crate 1119258 BLAKE2B 
b6ab277b4c06064fc7ba84f829363a5bcc2e484136b2f50f75354234f6114bd424d2f88952dc45c7f671751cd1ebff3ba3076c5cc648de0550d5ef1e122dc3ab
 SHA512 
950e6f30643b38c90bddcb2be34f02c7e57da1e3f8afeb2f0f1037d93a877928064748339b40ca520ed045d36ef5c25a8bb3ad294316fe657368cfb50163f399
-DIST cargo-0.49.0.crate 1312720 BLAKE2B 
700e677b5b2ec9567219bcb3103829542d459e5ef79a40093626cf056370176c68be008b741a21684661661cb079c085869e56bdaa21d5eb6cc0cd4b9884c6c7
 SHA512 
2590a4a71f756e5f614ec500be39c08c627994b6c3fff76c5d5c7fbe06bd7bdcd4fe1bb4971b54eb4d8b5b10780931fdbc1a410c049d97ee84b9eb8c2502a6ac
+DIST cargo-0.50.0.crate 1333002 BLAKE2B 
6cc353a73d89d797b52905916153261f72ee1308663e3640ad4ade08a91d9d61316cc943628493c8890d0798603857f2aaec7d066c2cf86a68ef03c8666016c5
 SHA512 
f4bdcedf2bb4789887e27b635a365db419f4c4b9b65c31a28919a45ec5254b1fa6167e3d78598d73df95e31b6e208f9287ade64742eb98e

[gentoo-commits] proj/sci:master commit in: sci-mathematics/Macaulay2/, sci-mathematics/Macaulay2/files/

2021-01-31 Thread Andrew Ammerlaan

commit: 1331916dfa9c5dfa3956973cdf12ad37c4c19634
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Mon Feb  1 06:30:24 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Mon Feb  1 06:30:24 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=1331916d

sci-mathematics/Macaulay: remove pack, py2 only

build system explicitly looks for py2

Signed-off-by: Andrew Ammerlaan  riseup.net>

 sci-mathematics/Macaulay2/Macaulay2-.ebuild| 178 -
 .../Macaulay2/files/70Macaulay2-gentoo.el  |  11 --
 sci-mathematics/Macaulay2/files/-lapack.patch  |  50 --
 .../files/-paths-of-external-programs.patch|  73 -
 .../Macaulay2/files/paths-of-dependencies.patch|  48 --
 sci-mathematics/Macaulay2/metadata.xml |  15 --
 6 files changed, 375 deletions(-)

diff --git a/sci-mathematics/Macaulay2/Macaulay2-.ebuild 
b/sci-mathematics/Macaulay2/Macaulay2-.ebuild
deleted file mode 100644
index 5b4e608c7..0
--- a/sci-mathematics/Macaulay2/Macaulay2-.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools elisp-common flag-o-matic git-r3 python-single-r1 
toolchain-funcs
-
-FACTORY="factory-4.0.0+m4"
-FACTORY_GFTABLES="factory.4.0.1-gftables"
-
-DESCRIPTION="Research tool for commutative algebra and algebraic geometry"
-HOMEPAGE="https://faculty.math.illinois.edu/Macaulay2";
-BASE_URI="https://faculty.math.illinois.edu/Macaulay2/Downloads/OtherSourceCode/";
-SRC_URI="
-   ${BASE_URI}/${FACTORY}.tar.gz
-   ${BASE_URI}/${FACTORY_GFTABLES}.tar.gz
-   ${BASE_URI}/gtest-1.7.0.tar.gz"
-EGIT_REPO_URI="git://github.com/Macaulay2/M2.git"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS=""
-IUSE="debug emacs +optimization"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-   sys-process/time
-   virtual/pkgconfig
-   app-arch/unzip
-   app-text/dos2unix"
-# Unzip and dos2unix just for normaliz
-
-RDEPEND="${PYTHON_DEPS}
-   sys-libs/gdbm
-   dev-libs/ntl
-   sci-mathematics/pari[gmp]
-   >=sys-libs/readline-6.1
-   dev-libs/libxml2:2
-   sci-mathematics/flint[gc(-)]
-   sci-mathematics/frobby
-   sci-mathematics/4ti2
-   sci-mathematics/nauty
-   >=sci-mathematics/normaliz-2.8
-   sci-mathematics/gfan
-   sci-libs/mpir[cxx]
-   dev-libs/mpfr
-   sci-libs/cdd+
-   sci-libs/cddlib
-   sci-libs/lrslib[gmp]
-   virtual/blas
-   virtual/lapack
-   dev-util/ctags
-   sys-libs/ncurses
-   >=dev-libs/boehm-gc-7.2_alpha6[threads]
-   dev-libs/libatomic_ops
-   emacs? ( app-editors/emacs )"
-
-SITEFILE=70Macaulay2-gentoo.el
-
-S="${WORKDIR}/${PN}-${PV}/"
-
-RESTRICT="mirror"
-
-src_unpack (){
-   # unpack "Normaliz2.8.zip"
-   git-r3_src_unpack
-   # Undo one level of directory until git allows to checkout
-   # subdirectories
-   mv "${S}"/M2/* "${S}" || die
-   # Need to get rid of this now because install wants this location later
-   rm -r "${S}/M2" || die
-}
-
-pkg_setup () {
-   tc-export CC CPP CXX PKG_CONFIG
-   append-cppflags "-I/usr/include/frobby"
-   # gtest needs python:2
-   python-single-r1_pkg_setup
-}
-
-src_prepare() {
-   # Put updated Normaliz.m2 in place
-   # cp "${WORKDIR}/Normaliz2.8/Macaulay2/Normaliz.m2" \
-   #   "${S}/Macaulay2/packages" || die
-   # dos2unix "${S}/Macaulay2/packages/Normaliz.m2" || die
-
-   # Patching .m2 files to look for external programs in
-   # /usr/bin
-   eapply "${FILESDIR}"/${PV}-paths-of-external-programs.patch
-
-   # Shortcircuit lapack tests
-   eapply "${FILESDIR}"/${PV}-lapack.patch
-
-   eapply_user
-
-   # Factory is a statically linked library which (in this flavor) are not 
used by any
-   # other program. We build it internally and don't install it.
-   cp "${DISTDIR}/${FACTORY}.tar.gz" "${S}/BUILD/tarfiles/" \
-   || die "copy failed"
-   cp "${DISTDIR}/${FACTORY_GFTABLES}.tar.gz" "${S}/BUILD/tarfiles/" \
-   || die "copy failed"
-   # Macaulay2 developers want that gtest is built internally because
-   # the documentation says it may fail if build with options not the
-   # same as the tested program.
-   cp "${DISTDIR}/gtest-1.7.0.tar.gz" "${S}/BUILD/tarfiles/" \
-   || die "copy failed"
-
-   eautoreconf
-}
-
-src_configure (){
-   # Recommended in bug #268064 Possibly unecessary
-   # but should not hurt anybody.
-   if ! use emacs; then
-   tags="ctags"
-   fi
-
-   # configure instead of econf to enable install with --prefix
-   ./configure LIBS="$($(tc-getPKG_CONFIG) --libs lapack)" \
-   --prefix="${D}/usr" \
-   --disable-encap \
-   --d

[gentoo-commits] repo/gentoo:master commit in: www-client/firefox/

2021-01-31 Thread Joonas Niilola

commit: 8b0ec6a4a863a7a31980028678f6ffd7d5e96557
Author: Joonas Niilola  gentoo  org>
AuthorDate: Mon Feb  1 05:53:26 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Feb  1 05:54:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b0ec6a4

www-client/firefox: security cleanup

Bug: https://bugs.gentoo.org/767334
Signed-off-by: Joonas Niilola  gentoo.org>

 www-client/firefox/Manifest  |   96 ---
 www-client/firefox/firefox-78.6.1.ebuild | 1130 --
 2 files changed, 1226 deletions(-)

diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 7696a501bc2..b67b8576007 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -1,99 +1,3 @@
-DIST firefox-78.6.1esr-ach.xpi 460288 BLAKE2B 
0deb4f7227f97dc85759a98b9c124dfd2ad6b2e80014a8df075d98874c0af3156fc2410df35894d8f058fcb9042854b651f1f8a3ddc750bf9cc826b0d9f20534
 SHA512 
b9c82df1bf78bbd08c1c67643c30256b203602493bfccd6b394fc17c63bcee4d5d47d107e712489cd2541b96c34076f2e4866b5df9aec24e5bef3f5189637faa
-DIST firefox-78.6.1esr-af.xpi 428359 BLAKE2B 
9c2545c167a4bc5d979cea86b5bb46b8d629c4ecbb3c5be1c89e5c4898bf785426007b50d9a4772355682bb421ca319c32ee9f695d240cf8083826347cef3458
 SHA512 
c96387df99be7ffc7a81a6851cb10609cc34181986a317474a143370c21a94917e1983b6de7788b446cd516ab0e301d6b4203f0a9afd1e87335752de5a561ba0
-DIST firefox-78.6.1esr-an.xpi 508377 BLAKE2B 
b42dd34e1c5af1bf0127251ce0ef3078932ff3d7913258da860ccc8cd97cee9aaba3788322c9fa8807ccef07a2f4ebab1f7304238c787bb395f9755fecb0449c
 SHA512 
df0eb3a1a087ff89f9bf2d4dad2053de0a4c58da418670f04157464486c830a9a9abe1d4a7f051df60719abfac828f91b681074eec1efb0ec04fb0b19b5eb19b
-DIST firefox-78.6.1esr-ar.xpi 560960 BLAKE2B 
e27b55f5cad76b75bf3b22c5e1ca741e9dbc7797dc27755e311b2b812d355edb21e719c6ad815a1ebdf1a0dc175182bdab3ce484018bffc7e56e415d65f937b4
 SHA512 
b12aa7d5b4cdc7fcfb61b0cdfa092e828be564de72b6adb1fc1d0fa7870773d3dad54baa7a404c0f108eb5c6ac66dca52df428fd8b281120da573d07822238f4
-DIST firefox-78.6.1esr-ast.xpi 456385 BLAKE2B 
cd352fa2dd474941d260aa8b0f49680e8b09de817db0d94b1bdafa73ac2ac4a67fe0695fd22dff92185e8f134e7675d237fa350f1c5aea37b1105c8f4767838f
 SHA512 
cac4ed9b9c42252605bf08d55cf691a70594208a55c255ea72f9841be81e1ba5f629823974a71433ac0e1f0430adf13758bb26b5dc2844276d9bdcf8820a07db
-DIST firefox-78.6.1esr-az.xpi 497424 BLAKE2B 
7d2414af78cdf9f00c8e8751ce4c59cd359e4dcfcb2e1ef8e0789e626c3b57aacf573304fbb536b3f2b21e36adf5cd796174e59b207ef5562773027f6ff63aba
 SHA512 
1e0dab133f0b916227d0a4613ceaeffa4b78bc8dac1b4fe5221fe6a9722ca1f271d3eb471ae6d0d25f2b9d085cd831123f577da410468c8640173c57f72d7b53
-DIST firefox-78.6.1esr-be.xpi 608641 BLAKE2B 
21c9dc6d9b7696270a263e629cfca6fce1a0e020dbc7ead96406c05372e463e5429143fb8e4969bcd5a42325a49470bf1ad5e43b2479fb14b1353facc37c4b84
 SHA512 
1f124ef8ea292fd81f5b625f135b861edbe0f1105d987392a648630e224cbe620b10397e8c9267faa5f15315525fca493234067afda5bfeabf86dcb010050fdc
-DIST firefox-78.6.1esr-bg.xpi 553966 BLAKE2B 
edb123eaa542f9e19537095d2309d47bb76c424a65e66e2c628b4d9dbc412639ed43c76f38576ce8b3e20f182183e27c89e7bc2906af145d671f6a7c6b78da5f
 SHA512 
6eaa40c4e340f45df8a543ae4bfb5db966559ff8197d5679bdefb12889e7194704c32316d5f2be477365e8f5f44521f9ea752255b9f422c0b2834183e2237f25
-DIST firefox-78.6.1esr-bn.xpi 572611 BLAKE2B 
bfe53d1f8a21ec0a86d2db943f5640f6572bd1a1a05a043e421e90f49c81fcb1d682d8f48288ccc8f5f811e54097bb56304605b93511c6a562ec132d205619a6
 SHA512 
c2c6e7c2a3fbbf2deaa1282e800bf0af8cad8cf20e8c41390669ea1a10f64ed58e0b232de85c68d6f8256b50073ebb9c173789340ffa9bac160afb5195547a61
-DIST firefox-78.6.1esr-br.xpi 507132 BLAKE2B 
d7f36d3ed1c8a0ac5cd9e29b7e89e91129f391a796ac80652965f8b4e49f8c76011fc37373e0a7ec8bfb633f5706f9ac4320a23e1665ccddd3bd103c57e3cb45
 SHA512 
361bb62a7be4247bdb567b0eebbdc0f6324dc504162117b21d0b3577285e2d5cdea203ce265e6b78b8b0ee12471ab262a64d4045a1b249bafdab790c134c7a9a
-DIST firefox-78.6.1esr-bs.xpi 463813 BLAKE2B 
918937c060a0e65e996dd88ebcd9ddc0bac31f67fbb67066436aeacb8ce9220d3b32804d8f4d7d662fe9259bf8c43b54c656d788c6192a411357947dfaddbbc0
 SHA512 
104a7ad95dc49a7f5c64337b9298e781942b4c98915213bb5f3f31e6e5ce030525c51819d8aff4afbfdf23fcd515239bd781aa67e56afc41a86d7a3b5f85614d
-DIST firefox-78.6.1esr-ca-valencia.xpi 517190 BLAKE2B 
12bd939cd93da38ed4e758ef6cc918f96813cac70aa444ec042d54361a3d7b7151015b0fca7ce146ea3749e74d96c9fad897f36d4ed2f38e0278146105d3a784
 SHA512 
d2a4773b1427cfbfc3c2f6cad120655296a909ca0704f26de07fd979efc633e881c9960b4563ead9166ee0b1267441ce9d6627566942ce7b890f73348270c9ee
-DIST firefox-78.6.1esr-ca.xpi 514179 BLAKE2B 
b07a30760ce05cad5c8bdd649ab4cd8eeb948c140ce9bf5b972d74d4f9a4f1e3a3697136f2fcdae0625d56e9a542c35ebcb394649f13228b4e5faf41a1e86379
 SHA512 
6ad0dd0ef7e56f2afb12b91f0cfd85af893b1460471d9872d3df875d559ccef0b9e3e0826f4196c252eaa9010231d71fa4f456fae30a0c2d2147ea926aab42a2
-DIST firefox-78.6.1esr-cak.xpi 551536 BLAKE2B 
540dd975e96cc4b1078b68e67d56a0e119219df5cc152b4365d1392257df36dc9ed065c311bd8de5

[gentoo-commits] repo/gentoo:master commit in: www-client/firefox-bin/

2021-01-31 Thread Joonas Niilola

commit: 311b1adcad283bca8c383ad3f807143df090c077
Author: Joonas Niilola  gentoo  org>
AuthorDate: Mon Feb  1 05:53:55 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Feb  1 05:54:41 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=311b1adc

www-client/firefox-bin: security cleanup

Bug: https://bugs.gentoo.org/767334
Signed-off-by: Joonas Niilola  gentoo.org>

 www-client/firefox-bin/Manifest  |  97 --
 www-client/firefox-bin/firefox-bin-78.6.1.ebuild | 411 ---
 2 files changed, 508 deletions(-)

diff --git a/www-client/firefox-bin/Manifest b/www-client/firefox-bin/Manifest
index 6368164ec0c..9386538ec49 100644
--- a/www-client/firefox-bin/Manifest
+++ b/www-client/firefox-bin/Manifest
@@ -1,98 +1,3 @@
-DIST firefox-78.6.1esr-ach.xpi 460288 BLAKE2B 
0deb4f7227f97dc85759a98b9c124dfd2ad6b2e80014a8df075d98874c0af3156fc2410df35894d8f058fcb9042854b651f1f8a3ddc750bf9cc826b0d9f20534
 SHA512 
b9c82df1bf78bbd08c1c67643c30256b203602493bfccd6b394fc17c63bcee4d5d47d107e712489cd2541b96c34076f2e4866b5df9aec24e5bef3f5189637faa
-DIST firefox-78.6.1esr-af.xpi 428359 BLAKE2B 
9c2545c167a4bc5d979cea86b5bb46b8d629c4ecbb3c5be1c89e5c4898bf785426007b50d9a4772355682bb421ca319c32ee9f695d240cf8083826347cef3458
 SHA512 
c96387df99be7ffc7a81a6851cb10609cc34181986a317474a143370c21a94917e1983b6de7788b446cd516ab0e301d6b4203f0a9afd1e87335752de5a561ba0
-DIST firefox-78.6.1esr-an.xpi 508377 BLAKE2B 
b42dd34e1c5af1bf0127251ce0ef3078932ff3d7913258da860ccc8cd97cee9aaba3788322c9fa8807ccef07a2f4ebab1f7304238c787bb395f9755fecb0449c
 SHA512 
df0eb3a1a087ff89f9bf2d4dad2053de0a4c58da418670f04157464486c830a9a9abe1d4a7f051df60719abfac828f91b681074eec1efb0ec04fb0b19b5eb19b
-DIST firefox-78.6.1esr-ar.xpi 560960 BLAKE2B 
e27b55f5cad76b75bf3b22c5e1ca741e9dbc7797dc27755e311b2b812d355edb21e719c6ad815a1ebdf1a0dc175182bdab3ce484018bffc7e56e415d65f937b4
 SHA512 
b12aa7d5b4cdc7fcfb61b0cdfa092e828be564de72b6adb1fc1d0fa7870773d3dad54baa7a404c0f108eb5c6ac66dca52df428fd8b281120da573d07822238f4
-DIST firefox-78.6.1esr-ast.xpi 456385 BLAKE2B 
cd352fa2dd474941d260aa8b0f49680e8b09de817db0d94b1bdafa73ac2ac4a67fe0695fd22dff92185e8f134e7675d237fa350f1c5aea37b1105c8f4767838f
 SHA512 
cac4ed9b9c42252605bf08d55cf691a70594208a55c255ea72f9841be81e1ba5f629823974a71433ac0e1f0430adf13758bb26b5dc2844276d9bdcf8820a07db
-DIST firefox-78.6.1esr-az.xpi 497424 BLAKE2B 
7d2414af78cdf9f00c8e8751ce4c59cd359e4dcfcb2e1ef8e0789e626c3b57aacf573304fbb536b3f2b21e36adf5cd796174e59b207ef5562773027f6ff63aba
 SHA512 
1e0dab133f0b916227d0a4613ceaeffa4b78bc8dac1b4fe5221fe6a9722ca1f271d3eb471ae6d0d25f2b9d085cd831123f577da410468c8640173c57f72d7b53
-DIST firefox-78.6.1esr-be.xpi 608641 BLAKE2B 
21c9dc6d9b7696270a263e629cfca6fce1a0e020dbc7ead96406c05372e463e5429143fb8e4969bcd5a42325a49470bf1ad5e43b2479fb14b1353facc37c4b84
 SHA512 
1f124ef8ea292fd81f5b625f135b861edbe0f1105d987392a648630e224cbe620b10397e8c9267faa5f15315525fca493234067afda5bfeabf86dcb010050fdc
-DIST firefox-78.6.1esr-bg.xpi 553966 BLAKE2B 
edb123eaa542f9e19537095d2309d47bb76c424a65e66e2c628b4d9dbc412639ed43c76f38576ce8b3e20f182183e27c89e7bc2906af145d671f6a7c6b78da5f
 SHA512 
6eaa40c4e340f45df8a543ae4bfb5db966559ff8197d5679bdefb12889e7194704c32316d5f2be477365e8f5f44521f9ea752255b9f422c0b2834183e2237f25
-DIST firefox-78.6.1esr-bn.xpi 572611 BLAKE2B 
bfe53d1f8a21ec0a86d2db943f5640f6572bd1a1a05a043e421e90f49c81fcb1d682d8f48288ccc8f5f811e54097bb56304605b93511c6a562ec132d205619a6
 SHA512 
c2c6e7c2a3fbbf2deaa1282e800bf0af8cad8cf20e8c41390669ea1a10f64ed58e0b232de85c68d6f8256b50073ebb9c173789340ffa9bac160afb5195547a61
-DIST firefox-78.6.1esr-br.xpi 507132 BLAKE2B 
d7f36d3ed1c8a0ac5cd9e29b7e89e91129f391a796ac80652965f8b4e49f8c76011fc37373e0a7ec8bfb633f5706f9ac4320a23e1665ccddd3bd103c57e3cb45
 SHA512 
361bb62a7be4247bdb567b0eebbdc0f6324dc504162117b21d0b3577285e2d5cdea203ce265e6b78b8b0ee12471ab262a64d4045a1b249bafdab790c134c7a9a
-DIST firefox-78.6.1esr-bs.xpi 463813 BLAKE2B 
918937c060a0e65e996dd88ebcd9ddc0bac31f67fbb67066436aeacb8ce9220d3b32804d8f4d7d662fe9259bf8c43b54c656d788c6192a411357947dfaddbbc0
 SHA512 
104a7ad95dc49a7f5c64337b9298e781942b4c98915213bb5f3f31e6e5ce030525c51819d8aff4afbfdf23fcd515239bd781aa67e56afc41a86d7a3b5f85614d
-DIST firefox-78.6.1esr-ca-valencia.xpi 517190 BLAKE2B 
12bd939cd93da38ed4e758ef6cc918f96813cac70aa444ec042d54361a3d7b7151015b0fca7ce146ea3749e74d96c9fad897f36d4ed2f38e0278146105d3a784
 SHA512 
d2a4773b1427cfbfc3c2f6cad120655296a909ca0704f26de07fd979efc633e881c9960b4563ead9166ee0b1267441ce9d6627566942ce7b890f73348270c9ee
-DIST firefox-78.6.1esr-ca.xpi 514179 BLAKE2B 
b07a30760ce05cad5c8bdd649ab4cd8eeb948c140ce9bf5b972d74d4f9a4f1e3a3697136f2fcdae0625d56e9a542c35ebcb394649f13228b4e5faf41a1e86379
 SHA512 
6ad0dd0ef7e56f2afb12b91f0cfd85af893b1460471d9872d3df875d559ccef0b9e3e0826f4196c252eaa9010231d71fa4f456fae30a0c2d2147ea926aab42a2
-DIST firefox-78.6.1esr-cak.xpi 551536 BLAKE2B 
540dd975e96cc4b1078b68e67d56a0e119219df5cc152b4365d

[gentoo-commits] repo/gentoo:master commit in: x11-themes/greybird/

2021-01-31 Thread Joonas Niilola

commit: 38b119cd08e92f6b09478e7833c68ccb054026f9
Author: Joonas Niilola  gentoo  org>
AuthorDate: Mon Feb  1 05:52:34 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Feb  1 05:54:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38b119cd

x11-themes/greybird: clean old

Signed-off-by: Joonas Niilola  gentoo.org>

 x11-themes/greybird/Manifest  |  2 -
 x11-themes/greybird/greybird-3.20.1-r2.ebuild | 54 ---
 x11-themes/greybird/greybird-3.22.12.ebuild   | 53 --
 x11-themes/greybird/metadata.xml  |  5 ---
 4 files changed, 114 deletions(-)

diff --git a/x11-themes/greybird/Manifest b/x11-themes/greybird/Manifest
index bbae8138fc0..c6fc38b442c 100644
--- a/x11-themes/greybird/Manifest
+++ b/x11-themes/greybird/Manifest
@@ -1,3 +1 @@
-DIST greybird-3.20.1.tar.gz 193824 BLAKE2B 
d4e5cba92e9acf2fd084ee5b1bb5db332bb541193980ee7c74ba98da3b1bb675efd171078fac6051be21d2c2fd03b88f45bf7dff3101ec91578dc28bed212ec9
 SHA512 
9fe8662fa1c3c9b51aa1ba6d9cb9a54a8e7640386dc43cb695e87ed733a40893067bd86277a03d1c17c48596ba0897a0a41ed48db985727b0d65f2ce2de2227e
-DIST greybird-3.22.12.tar.gz 283646 BLAKE2B 
f276833bafd7ff0043025074e4476f7407a18428326a5e938254064ab42fe7a865366f12d5022e177a15a80f4d77889b2e143bc79430d552fa78f4ffbf953282
 SHA512 
95e1a743b16152f95c1dad01416ed54595ec1ffa5b50c6ae4599b5962aae0259d2a224d2fb71292a8f832adeba5e3a5534a0a7fbcdac136a3e322a15726d3401
 DIST greybird-3.22.14.tar.gz 283933 BLAKE2B 
68f0b71dc71d260cf8f2a6971fac15ecedf345655309558c600848b531b3338ba3670c09c13182c24baa90f2fec24fdacc7498ee12bc1b1f00416bf12f68ac39
 SHA512 
766099b80eb81cfca07b52671e721ab281bb120ea252e369be2f83b6f38f1b7be5c0a2cc2d25b35f565063589e28982393f5c911b8c3ade608999339c93a490e

diff --git a/x11-themes/greybird/greybird-3.20.1-r2.ebuild 
b/x11-themes/greybird/greybird-3.20.1-r2.ebuild
deleted file mode 100644
index 2f0155ff830..000
--- a/x11-themes/greybird/greybird-3.20.1-r2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-MY_PN=${PN/g/G}
-
-DESCRIPTION="The default theme from Xubuntu"
-HOMEPAGE="http://shimmerproject.org/project/greybird/ 
https://github.com/shimmerproject/Greybird";
-SRC_URI="https://github.com/shimmerproject/${MY_PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-
-# README says "dual-licensed as GPLv2 or later and CC-BY-SA 3.0 or later"
-LICENSE="CC-BY-SA-3.0 GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="appindicator gnome"
-
-RDEPEND="
-   >=x11-themes/gtk-engines-murrine-0.90
-   >=x11-libs/gtk+-3.20.0:3
-"
-DEPEND="${RDEPEND}
-   dev-ruby/sass
-   dev-libs/glib:2
-"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-#RESTRICT="binchecks strip"
-
-src_prepare() {
-   eapply_user
-   eautoreconf
-}
-
-src_install() {
-   emake DESTDIR="${D}" install
-
-   pushd "${ED}"usr/share/themes/${MY_PN} > /dev/null || die
-   use appindicator || rm -rf unity
-   use gnome || rm -rf metacity-1
-   popd > /dev/null || die
-}
-
-pkg_postinst() {
-   if ! has_version x11-themes/elementary-xfce-icon-theme ; then
-   elog "For upstream's default icon theme, please emerge"
-   elog "x11-themes/elementary-xfce-icon-theme"
-   fi
-   if ! has_version x11-themes/vanilla-dmz-xcursors ; then
-   elog "For upstream's default cursor theme, please emerge"
-   elog "x11-themes/vanilla-dmz-xcursors"
-   fi
-}

diff --git a/x11-themes/greybird/greybird-3.22.12.ebuild 
b/x11-themes/greybird/greybird-3.22.12.ebuild
deleted file mode 100644
index fa58cb9e287..000
--- a/x11-themes/greybird/greybird-3.22.12.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit meson
-
-DESCRIPTION="The default theme from Xubuntu"
-HOMEPAGE="http://shimmerproject.org/project/greybird/ 
https://github.com/shimmerproject/Greybird";
-SRC_URI="https://github.com/shimmerproject/${PN^}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-
-# README says "dual-licensed as GPLv2 or later and CC-BY-SA 3.0 or later"
-LICENSE="CC-BY-SA-3.0 GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="appindicator gnome gtk2 gtk3 xfce"
-REQUIRED_USE="
-   || ( appindicator gnome gtk2 gtk3 xfce )
-"
-
-RDEPEND="
-   >=x11-libs/gtk+-3.22:3
-   >=x11-themes/gtk-engines-murrine-0.90
-"
-DEPEND="
-   ${RDEPEND}
-   dev-lang/sassc
-   dev-libs/glib:2
-   dev-ruby/sass:3.5
-"
-S=${WORKDIR}/${P^}
-
-src_install() {
-   meson_src_install
-
-   pushd "${ED}"/usr/share/themes > /dev/null || die
-   use appindicator || { rm -r ${PN^}*/unity || die; }
-   use gnome || { rm -r ${PN^}*/metacity-1 || die; }
-   use gtk2 || { rm -r ${PN^}*/gtk-2.0 || die; }
-   use gtk3 || { r

[gentoo-commits] repo/gentoo:master commit in: net-libs/libgsasl/

2021-01-31 Thread Sam James

commit: 0d3be585fdec58361ed44a9b3e033f48c0fc8ee7
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb  1 05:48:13 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb  1 05:48:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d3be585

net-libs/libgsasl: add note to bump with net-misc/gsasl

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 net-libs/libgsasl/libgsasl-1.10.0.ebuild   | 1 +
 net-libs/libgsasl/libgsasl-1.8.0-r1.ebuild | 1 +
 net-libs/libgsasl/libgsasl-1.8.1.ebuild| 1 +
 3 files changed, 3 insertions(+)

diff --git a/net-libs/libgsasl/libgsasl-1.10.0.ebuild 
b/net-libs/libgsasl/libgsasl-1.10.0.ebuild
index 8be209781db..8340dee0fd7 100644
--- a/net-libs/libgsasl/libgsasl-1.10.0.ebuild
+++ b/net-libs/libgsasl/libgsasl-1.10.0.ebuild
@@ -5,6 +5,7 @@ EAPI=7
 
 inherit autotools
 
+# NOTE: Please bump with net-misc/gsasl
 DESCRIPTION="The GNU SASL library"
 HOMEPAGE="https://www.gnu.org/software/gsasl/";
 SRC_URI="mirror://gnu/${PN/lib}/${P}.tar.gz"

diff --git a/net-libs/libgsasl/libgsasl-1.8.0-r1.ebuild 
b/net-libs/libgsasl/libgsasl-1.8.0-r1.ebuild
index a1b730b55ff..3c6634c1ebe 100644
--- a/net-libs/libgsasl/libgsasl-1.8.0-r1.ebuild
+++ b/net-libs/libgsasl/libgsasl-1.8.0-r1.ebuild
@@ -5,6 +5,7 @@ EAPI=7
 
 inherit autotools
 
+# NOTE: Please bump with net-misc/gsasl
 DESCRIPTION="The GNU SASL library"
 HOMEPAGE="https://www.gnu.org/software/gsasl/";
 SRC_URI="mirror://gnu/${PN/lib}/${P}.tar.gz"

diff --git a/net-libs/libgsasl/libgsasl-1.8.1.ebuild 
b/net-libs/libgsasl/libgsasl-1.8.1.ebuild
index 1cb716fb63b..f83373ad3e8 100644
--- a/net-libs/libgsasl/libgsasl-1.8.1.ebuild
+++ b/net-libs/libgsasl/libgsasl-1.8.1.ebuild
@@ -5,6 +5,7 @@ EAPI=7
 
 inherit autotools
 
+# NOTE: Please bump with net-misc/gsasl
 DESCRIPTION="The GNU SASL library"
 HOMEPAGE="https://www.gnu.org/software/gsasl/";
 SRC_URI="mirror://gnu/${PN/lib}/${P}.tar.gz"

[gentoo-commits] repo/gentoo:master commit in: net-misc/gsasl/

2021-01-31 Thread Sam James

commit: 27f4ad69d65a5121afa6bc8e465fb80bb104c04a
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb  1 05:48:53 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb  1 05:48:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27f4ad69

net-misc/gsasl: add note to bump with net-libs/libgsasl

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 net-misc/gsasl/gsasl-1.10.0.ebuild   | 1 +
 net-misc/gsasl/gsasl-1.8.0-r1.ebuild | 3 ++-
 net-misc/gsasl/gsasl-1.8.1.ebuild| 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/net-misc/gsasl/gsasl-1.10.0.ebuild 
b/net-misc/gsasl/gsasl-1.10.0.ebuild
index abf23f7845d..058ca1ab674 100644
--- a/net-misc/gsasl/gsasl-1.10.0.ebuild
+++ b/net-misc/gsasl/gsasl-1.10.0.ebuild
@@ -5,6 +5,7 @@ EAPI=7
 
 inherit autotools
 
+# NOTE: Please bump with net-libs/libgsasl
 DESCRIPTION="The GNU SASL client, server, and library"
 HOMEPAGE="https://www.gnu.org/software/gsasl/";
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"

diff --git a/net-misc/gsasl/gsasl-1.8.0-r1.ebuild 
b/net-misc/gsasl/gsasl-1.8.0-r1.ebuild
index a1e9339e1b7..35ba6ca5ea1 100644
--- a/net-misc/gsasl/gsasl-1.8.0-r1.ebuild
+++ b/net-misc/gsasl/gsasl-1.8.0-r1.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit autotools
 
+# NOTE: Please bump with net-libs/libgsasl
 DESCRIPTION="The GNU SASL client, server, and library"
 HOMEPAGE="https://www.gnu.org/software/gsasl/";
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"

diff --git a/net-misc/gsasl/gsasl-1.8.1.ebuild 
b/net-misc/gsasl/gsasl-1.8.1.ebuild
index b98f4c28835..06d078bb87f 100644
--- a/net-misc/gsasl/gsasl-1.8.1.ebuild
+++ b/net-misc/gsasl/gsasl-1.8.1.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit autotools
 
+# NOTE: Please bump with net-libs/libgsasl
 DESCRIPTION="The GNU SASL client, server, and library"
 HOMEPAGE="https://www.gnu.org/software/gsasl/";
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"

[gentoo-commits] proj/sci:master commit in: sci-chemistry/chimera-bin/

2021-01-31 Thread Andrew Ammerlaan

commit: a42d61b5cfa3b633832faa0b63e942e258118cce
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Mon Feb  1 05:37:10 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Mon Feb  1 05:37:10 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=a42d61b5

sci-chemistry/chimera-bin: remove dep on python

the documentation says that python2.7 comes bundled with
the binaries

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan  riseup.net>

 sci-chemistry/chimera-bin/chimera-bin-1.14.ebuild | 7 +--
 sci-chemistry/chimera-bin/chimera-bin-1.15.ebuild | 7 +--
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/sci-chemistry/chimera-bin/chimera-bin-1.14.ebuild 
b/sci-chemistry/chimera-bin/chimera-bin-1.14.ebuild
index cb31dca65..b65625139 100644
--- a/sci-chemistry/chimera-bin/chimera-bin-1.14.ebuild
+++ b/sci-chemistry/chimera-bin/chimera-bin-1.14.ebuild
@@ -3,9 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
-
-inherit desktop xdg python-r1
+inherit desktop xdg
 
 DESCRIPTION="An extensible Molecular Modelling System"
 HOMEPAGE="https://www.cgl.ucsf.edu/chimera/";
@@ -15,8 +13,6 @@ SLOT="0"
 LICENSE="chimera"
 KEYWORDS="~amd64 ~x86"
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
 DEPEND="prefix? ( dev-util/patchelf )"
 RDEPEND="
dev-lang/tcl
@@ -47,7 +43,6 @@ RDEPEND="
x11-libs/libSM
x11-libs/libXt
x11-libs/libGLw
-   ${PYTHON_DEPS}
 "
 
 S="${WORKDIR}"

diff --git a/sci-chemistry/chimera-bin/chimera-bin-1.15.ebuild 
b/sci-chemistry/chimera-bin/chimera-bin-1.15.ebuild
index cb31dca65..b65625139 100644
--- a/sci-chemistry/chimera-bin/chimera-bin-1.15.ebuild
+++ b/sci-chemistry/chimera-bin/chimera-bin-1.15.ebuild
@@ -3,9 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
-
-inherit desktop xdg python-r1
+inherit desktop xdg
 
 DESCRIPTION="An extensible Molecular Modelling System"
 HOMEPAGE="https://www.cgl.ucsf.edu/chimera/";
@@ -15,8 +13,6 @@ SLOT="0"
 LICENSE="chimera"
 KEYWORDS="~amd64 ~x86"
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
 DEPEND="prefix? ( dev-util/patchelf )"
 RDEPEND="
dev-lang/tcl
@@ -47,7 +43,6 @@ RDEPEND="
x11-libs/libSM
x11-libs/libXt
x11-libs/libGLw
-   ${PYTHON_DEPS}
 "
 
 S="${WORKDIR}"

[gentoo-commits] repo/proj/guru:dev commit in: dev-python/bitbox02/

2021-01-31 Thread Andreas Zuber

commit: 178371449c23c61bfd90d832e233d7414065cd72
Author: Andreas Zuber  gmx  ch>
AuthorDate: Mon Feb  1 05:20:01 2021 +
Commit: Andreas Zuber  gmx  ch>
CommitDate: Mon Feb  1 05:20:01 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=17837144

dev-python/bitbox02: version bump to 5.2.0

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Andreas Zuber  gmx.ch>

 dev-python/bitbox02/Manifest  |  1 +
 dev-python/bitbox02/bitbox02-5.2.0.ebuild | 26 ++
 2 files changed, 27 insertions(+)

diff --git a/dev-python/bitbox02/Manifest b/dev-python/bitbox02/Manifest
index 8f073a09..711327c3 100644
--- a/dev-python/bitbox02/Manifest
+++ b/dev-python/bitbox02/Manifest
@@ -1 +1,2 @@
 DIST bitbox02-5.1.0.tar.gz 51297 BLAKE2B 
8450cbc4b040cc5b9d9923cff5c2f07e6819032a9fe1b54a108b6bc7a1571535c0930ec8f63a2c13c9abe098d7ba1c6c3f0e138caf1220ab484248cf164a18d4
 SHA512 
2088d8a93172a5d8a233c1dd0b73d08182d9828f7a799273cae3665b49751edd98660f305c3e8dad0df10300f2ebe38a1233498fe43ee40647a2b0a242bb2096
+DIST bitbox02-5.2.0.tar.gz 53182 BLAKE2B 
6794c5c6c8b269316f6ec851b0dfa3646a39bd53e5be8e1364f4e2d8706ff545f43793734cd96339f6761120f3ceb813c871c6e7b847439c2669cc2a4bf89970
 SHA512 
8c804c3ad09308f599cc45ba62a9db43e16f5f4a5a7de848b5e67f8f8f224832792da038ccdb7f91a4fac159c774080df3b44c9ab21ff9525cf9dec231d8ec3f

diff --git a/dev-python/bitbox02/bitbox02-5.2.0.ebuild 
b/dev-python/bitbox02/bitbox02-5.2.0.ebuild
new file mode 100644
index ..789b578c
--- /dev/null
+++ b/dev-python/bitbox02/bitbox02-5.2.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit distutils-r1
+
+DESCRIPTION="Python API for communicating with the BitBox02 device"
+HOMEPAGE="https://github.com/digitalbitbox/bitbox02-firmware";
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+   >=dev-python/base58-2.0.0[${PYTHON_USEDEP}]
+   >=dev-python/ecdsa-0.14.0[${PYTHON_USEDEP}]
+   >=dev-python/hidapi-0.7.99[${PYTHON_USEDEP}]
+   >=dev-python/noiseprotocol-0.3.0[${PYTHON_USEDEP}]
+   >=dev-python/protobuf-python-3.7.0[${PYTHON_USEDEP}]
+   >=dev-python/semver-2.8.1[${PYTHON_USEDEP}]
+   >=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]"
+BDEPEND=""

[gentoo-commits] repo/proj/guru:dev commit in: dev-python/bitbox02/

2021-01-31 Thread Andreas Zuber

commit: 6d11ff517552a72e2206d0314f790f063605c124
Author: Andreas Zuber  gmx  ch>
AuthorDate: Mon Feb  1 05:22:48 2021 +
Commit: Andreas Zuber  gmx  ch>
CommitDate: Mon Feb  1 05:22:48 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6d11ff51

dev-python/bitbox02: cleanup old version

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Andreas Zuber  gmx.ch>

 dev-python/bitbox02/Manifest  |  1 -
 dev-python/bitbox02/bitbox02-5.1.0.ebuild | 26 --
 2 files changed, 27 deletions(-)

diff --git a/dev-python/bitbox02/Manifest b/dev-python/bitbox02/Manifest
index 711327c3..b3a3bb36 100644
--- a/dev-python/bitbox02/Manifest
+++ b/dev-python/bitbox02/Manifest
@@ -1,2 +1 @@
-DIST bitbox02-5.1.0.tar.gz 51297 BLAKE2B 
8450cbc4b040cc5b9d9923cff5c2f07e6819032a9fe1b54a108b6bc7a1571535c0930ec8f63a2c13c9abe098d7ba1c6c3f0e138caf1220ab484248cf164a18d4
 SHA512 
2088d8a93172a5d8a233c1dd0b73d08182d9828f7a799273cae3665b49751edd98660f305c3e8dad0df10300f2ebe38a1233498fe43ee40647a2b0a242bb2096
 DIST bitbox02-5.2.0.tar.gz 53182 BLAKE2B 
6794c5c6c8b269316f6ec851b0dfa3646a39bd53e5be8e1364f4e2d8706ff545f43793734cd96339f6761120f3ceb813c871c6e7b847439c2669cc2a4bf89970
 SHA512 
8c804c3ad09308f599cc45ba62a9db43e16f5f4a5a7de848b5e67f8f8f224832792da038ccdb7f91a4fac159c774080df3b44c9ab21ff9525cf9dec231d8ec3f

diff --git a/dev-python/bitbox02/bitbox02-5.1.0.ebuild 
b/dev-python/bitbox02/bitbox02-5.1.0.ebuild
deleted file mode 100644
index 35da71f8..
--- a/dev-python/bitbox02/bitbox02-5.1.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit distutils-r1
-
-DESCRIPTION="Python API for communicating with the BitBox02 device"
-HOMEPAGE="https://github.com/digitalbitbox/bitbox02-firmware";
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-   >=dev-python/base58-2.0.0[${PYTHON_USEDEP}]
-   >=dev-python/ecdsa-0.13.0[${PYTHON_USEDEP}]
-   >=dev-python/hidapi-0.7.99[${PYTHON_USEDEP}]
-   >=dev-python/noiseprotocol-0.3.0[${PYTHON_USEDEP}]
-   >=dev-python/protobuf-python-3.7.0[${PYTHON_USEDEP}]
-   >=dev-python/semver-2.8.1[${PYTHON_USEDEP}]
-   >=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]"
-BDEPEND=""

[gentoo-commits] repo/gentoo:master commit in: profiles/arch/arm/

2021-01-31 Thread Sam James

commit: 98d5e3b0da3eda4cbb05bea59a5a12ae65b77b5a
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb  1 04:53:56 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb  1 04:53:56 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98d5e3b0

profiles/arch/arm: unmask USE=gusb, colord for stable

Closes: https://bugs.gentoo.org/766180
Signed-off-by: Sam James  gentoo.org>

 profiles/arch/arm/use.stable.mask | 2 --
 1 file changed, 2 deletions(-)

diff --git a/profiles/arch/arm/use.stable.mask 
b/profiles/arch/arm/use.stable.mask
index 0edb74fb7ac..540ee8241f6 100644
--- a/profiles/arch/arm/use.stable.mask
+++ b/profiles/arch/arm/use.stable.mask
@@ -34,9 +34,7 @@ gcl
 
 # Pacho Ramos  (2014-04-13)
 # Not going to be stabilized on this arch
-colord
 devhelp
 eds
 gdm
 gnome-online-accounts
-gusb

[gentoo-commits] repo/gentoo:master commit in: profiles/arch/powerpc/

2021-01-31 Thread Sam James

commit: 9a98e82e629e0fdff6820b8577a4edb1527f8f15
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb  1 04:55:13 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb  1 04:55:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a98e82e

profiles/arch/powerpc: unmask USE=gusb and colord for stable

Bug: https://bugs.gentoo.org/766180
Signed-off-by: Sam James  gentoo.org>

 profiles/arch/powerpc/use.stable.mask | 2 --
 1 file changed, 2 deletions(-)

diff --git a/profiles/arch/powerpc/use.stable.mask 
b/profiles/arch/powerpc/use.stable.mask
index ea3f5809981..e895c62d8be 100644
--- a/profiles/arch/powerpc/use.stable.mask
+++ b/profiles/arch/powerpc/use.stable.mask
@@ -11,7 +11,6 @@ octave
 # Pacho Ramos  (2014-04-17)
 # Dropped stable keywords after the discussion caused by
 # Gnome 3.8/3.10 stabilization on this arch
-colord
 devhelp
 dia
 eds
@@ -19,6 +18,5 @@ evo
 gnome-online-accounts
 gnome-shell
 gnumeric
-gusb
 upnp
 upnp-av

[gentoo-commits] proj/sci:master commit in: sci-biology/tablet-bin/files/, sci-biology/tablet-bin/

2021-01-31 Thread Andrew Ammerlaan

commit: ecd3b3602cb2f9728ea08d2cd72c3d37f8373f93
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Mon Feb  1 05:07:34 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Mon Feb  1 05:07:34 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=ecd3b360

sci-biology/tablet-bin: drop pack, py2 only

Signed-off-by: Andrew Ammerlaan  riseup.net>

 sci-biology/tablet-bin/files/response.varfile  |  11 ---
 sci-biology/tablet-bin/metadata.xml|  12 ---
 .../tablet-bin/tablet-bin-1.20.12.24.ebuild| 105 -
 3 files changed, 128 deletions(-)

diff --git a/sci-biology/tablet-bin/files/response.varfile 
b/sci-biology/tablet-bin/files/response.varfile
deleted file mode 100644
index cfa2e6808..0
--- a/sci-biology/tablet-bin/files/response.varfile
+++ /dev/null
@@ -1,11 +0,0 @@
-#install4j response file for Tablet x.xx.xx.xx
-#Mon Jan 24 11:35:29 GMT 2011
-executeLauncherAction$Boolean=false
-sys.programGroupDisabled$Boolean=true
-# somehow, this happens: ln -s 
/scratch/var/tmp/portage/sci-biology/tablet-bin-1.11.02.18/image/opt/Tablet/tablet
 /usr/local/bin/tablet
-# # that happens because 
/scratch/var/tmp/portage/sci-biology/tablet-bin-1.11.02.18/image/opt/Tablet/.install4j/response.varfile
 does not reflect our values
-sys.symlinkDir="${D}"usr/bin
-#sys.symlinkDir=/scratch/var/tmp/portage/sci-biology/tablet-bin-1.11.02.18/image/usr/bin
-sys.languageId=en
-sys.userHome="${D}"/../temp
-sys.installationDir="${D}"opt/Tablet

diff --git a/sci-biology/tablet-bin/metadata.xml 
b/sci-biology/tablet-bin/metadata.xml
deleted file mode 100644
index 138cb7705..0
--- a/sci-biology/tablet-bin/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-http://www.gentoo.org/dtd/metadata.dtd";>
-
-   
-   mmokr...@fold.natur.cuni.cz
-   Martin Mokrejs
-   
-   
-   sci-biol...@gentoo.org
-   Gentoo Biology Project
-   
-

diff --git a/sci-biology/tablet-bin/tablet-bin-1.20.12.24.ebuild 
b/sci-biology/tablet-bin/tablet-bin-1.20.12.24.ebuild
deleted file mode 100644
index 697ae0d36..0
--- a/sci-biology/tablet-bin/tablet-bin-1.20.12.24.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit java-pkg-2 python-r1
-
-DESCRIPTION="Viewer of next generation sequence assemblies and alignments"
-HOMEPAGE="https://ics.hutton.ac.uk/tablet";
-SRC_URI="
-   x86? ( 
https://ics.hutton.ac.uk/resources/tablet/installers/tablet_linux_x86_$(ver_rs 
0-3 _).sh -> ${P}.sh )
-   amd64? ( 
https://ics.hutton.ac.uk/resources/tablet/installers/tablet_linux_x64_$(ver_rs 
0-3 _).sh -> ${P}.sh )
-   https://bioinf.hutton.ac.uk/tablet/additional/coveragestats.py";
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-   app-text/dos2unix
-   >=virtual/jdk-1.8:*"
-RDEPEND="${DEPEND}
-   >=virtual/jre-1.8:*"
-# contains bundled sqlite-jdbc-3.8.6.jar, samtools-linux64.jar, picard.jar
-# sqlite-jdbc-3.8.6.jar is not dev-db/sqlite:3 and samtools-linux64.jar is not 
sci-biology/samtools either
-# replacing picard.jar with a symlink to picard.jar from sci-biology.picard 
does not help either
-
-S="${WORKDIR}"
-
-src_unpack() {
-   local file
-   for file in ${A}; do
-   cp "${DISTDIR}"/${file} "${WORKDIR}" || die
-   done
-}
-
-src_install() {
-   # In theory it seems this binary package could be installed through ant
-   # instead of the install4j package which is not easy to be forced
-   # non-interactive. The below approach via install4j is not ideal but 
works.
-   sed "s#\"\${D}\"#\"${D}\"#g" "${FILESDIR}"/response.varfile > 
"${WORKDIR}"/response.varfile || die "sed failed"
-
-   # the intallation script somehow does not pickup
-   # -varfile="${DISTDIR}"/response.varfile from the commandline and 
therefore
-   # we place the file rather directly into the place where it should 
reside.
-   # In the file you can read details how the variables were mangled. For
-   # example, the trick with sys.symlinkDir in the response.varfile is to
-   # disable the installation process to symlink from /usr/local/bin/table 
to
-   # /opt/Tablet/tablet. That was logged in that file with the following 
line:
-   #
-   # 
/var/tmp/portage/sci-biology/tablet-bin-1.11.02.18/image/opt/Tablet/.install4j/installation.log:
-   #   Variable changed: sys.symlinkDir=/usr/local/bin[class 
java.lang.String]
-   #
-   # The file is then left on the installed system in 
"${D}"/opt/Tablet/.install4j/response.varfile
-   dodir /opt/Tablet/.install4j
-   cat "${WORKDIR}"/response.varfile > 
"${ED}"/opt/Tablet/.install4j/response.varfile || die
-
-   # make sure we force java to point a to $HOME which is inside our s

[gentoo-commits] proj/sci:master commit in: sci-biology/tablet/, sci-biology/tablet/files/

2021-01-31 Thread Andrew Ammerlaan

commit: 5d9e94b7d6dcf17e0158e3619e3921b9354dd702
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Mon Feb  1 05:05:49 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Mon Feb  1 05:06:50 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=5d9e94b7

sci-biology/tablet: drop pack, py2 only

the py code is still py2 style

Signed-off-by: Andrew Ammerlaan  riseup.net>

 sci-biology/tablet/files/response.varfile   | 11 -
 sci-biology/tablet/metadata.xml | 12 --
 sci-biology/tablet/tablet-1.17.08.17.ebuild | 63 -
 sci-biology/tablet/tablet-.ebuild   | 61 
 4 files changed, 147 deletions(-)

diff --git a/sci-biology/tablet/files/response.varfile 
b/sci-biology/tablet/files/response.varfile
deleted file mode 100644
index cfa2e6808..0
--- a/sci-biology/tablet/files/response.varfile
+++ /dev/null
@@ -1,11 +0,0 @@
-#install4j response file for Tablet x.xx.xx.xx
-#Mon Jan 24 11:35:29 GMT 2011
-executeLauncherAction$Boolean=false
-sys.programGroupDisabled$Boolean=true
-# somehow, this happens: ln -s 
/scratch/var/tmp/portage/sci-biology/tablet-bin-1.11.02.18/image/opt/Tablet/tablet
 /usr/local/bin/tablet
-# # that happens because 
/scratch/var/tmp/portage/sci-biology/tablet-bin-1.11.02.18/image/opt/Tablet/.install4j/response.varfile
 does not reflect our values
-sys.symlinkDir="${D}"usr/bin
-#sys.symlinkDir=/scratch/var/tmp/portage/sci-biology/tablet-bin-1.11.02.18/image/usr/bin
-sys.languageId=en
-sys.userHome="${D}"/../temp
-sys.installationDir="${D}"opt/Tablet

diff --git a/sci-biology/tablet/metadata.xml b/sci-biology/tablet/metadata.xml
deleted file mode 100644
index 138cb7705..0
--- a/sci-biology/tablet/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-http://www.gentoo.org/dtd/metadata.dtd";>
-
-   
-   mmokr...@fold.natur.cuni.cz
-   Martin Mokrejs
-   
-   
-   sci-biol...@gentoo.org
-   Gentoo Biology Project
-   
-

diff --git a/sci-biology/tablet/tablet-1.17.08.17.ebuild 
b/sci-biology/tablet/tablet-1.17.08.17.ebuild
deleted file mode 100644
index 158caba78..0
--- a/sci-biology/tablet/tablet-1.17.08.17.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit java-pkg-2 java-ant-2 python-r1
-
-[ "$PV" == "" ] && inherit git-r3
-
-DESCRIPTION="Viewer of next generation sequence assemblies and alignments"
-HOMEPAGE="https://ics.hutton.ac.uk/tablet";
-if [ "$PV" == "" ]; then
-   EGIT_REPO_URI="https://github.com/cropgeeks/tablet.git";
-   KEYWORDS=""
-else
-   SRC_URI="https://github.com/cropgeeks/tablet/archive/${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="" # lacks lib/htsjdk-2.0.11.jar
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-   >=virtual/jdk-1.8:*"
-RDEPEND="${PYTHON_DEPS}
-   >=virtual/jre-1.8:*
-   >=dev-java/commons-compress-1.4.1
-   dev-java/htsjdk"
-# contains bundled sqlite-jdbc-3.8.6.jar, samtools-linux64.jar
-# sqlite-jdbc-3.8.6.jar is not dev-db/sqlite:3
-# samtools-linux64.jar is not sci-biology/samtools but 0.1.12a (r862)
-# needs htsjdk-2.0.11.jar
-
-src_compile(){
-   mkdir -p classes || die
-   ant jar || die
-}
-
-src_install() {
-   java-pkg_dojar lib/tablet.jar
-   java-pkg_dolauncher ${PN}
-   java-pkg_dojar lib/tablet-resources.jar
-   java-pkg_dojar lib/flamingo.jar
-   java-pkg_dojar lib/scri-commons.jar
-   java-pkg_dojar lib/samtools-all.jar
-   if [ "${ABI}" == "amd64" ]; then
-   java-pkg_dojar lib/samtools-linux64.jar
-   fi
-   if [ "${ABI}" == "x86" ]; then
-   java-pkg_dojar lib/samtools-linux32.jar
-   fi
-   # is the tar.gz tarball missing by mistake lib/htsjdk*.jar ?
-   # java-pkg_dojar lib/htsjdk*.jar # is htsjdk-2.11.0 in tablet-1.17.08.17
-   java-pkg_dojar lib/sqlite-jdbc*.jar
-
-   echo "PATH=${EPREFIX}/opt/Tablet" > 99Tablet
-   doenvd 99Tablet
-}

diff --git a/sci-biology/tablet/tablet-.ebuild 
b/sci-biology/tablet/tablet-.ebuild
deleted file mode 100644
index e9ae6890d..0
--- a/sci-biology/tablet/tablet-.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit java-pkg-2 java-ant-2 python-r1
-
-[ "$PV" == "" ] && inherit git-r3
-
-DESCRIPTION="Viewer of next generation sequence assemblies and alignments"
-HOMEPAGE="https://ics.hutton.ac.uk/tablet";
-if [ "$PV" == "" ]; then
-   EGIT_REPO_URI="https://github.com/cropgeeks/tablet.git";
-   KEYWORDS=""
-else
-   SRC_URI="https://github.com/cropgeeks/tablet/archive/${PV}.tar.gz -> 
${P}.tar.gz"
-

[gentoo-commits] proj/sci:master commit in: sci-biology/stampy-bin/

2021-01-31 Thread Andrew Ammerlaan

commit: 141d595a554e77413db8b484a734ee2100d51cb5
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Mon Feb  1 04:54:12 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Mon Feb  1 04:54:12 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=141d595a

sci-biology/stampy-bin: drop pack, py2 only

documentation says it needs py2.6 or py2.7

Signed-off-by: Andrew Ammerlaan  riseup.net>

 sci-biology/stampy-bin/metadata.xml | 12 ---
 sci-biology/stampy-bin/stampy-bin-1.0.28.ebuild | 43 -
 2 files changed, 55 deletions(-)

diff --git a/sci-biology/stampy-bin/metadata.xml 
b/sci-biology/stampy-bin/metadata.xml
deleted file mode 100644
index 138cb7705..0
--- a/sci-biology/stampy-bin/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-http://www.gentoo.org/dtd/metadata.dtd";>
-
-   
-   mmokr...@fold.natur.cuni.cz
-   Martin Mokrejs
-   
-   
-   sci-biol...@gentoo.org
-   Gentoo Biology Project
-   
-

diff --git a/sci-biology/stampy-bin/stampy-bin-1.0.28.ebuild 
b/sci-biology/stampy-bin/stampy-bin-1.0.28.ebuild
deleted file mode 100644
index 6d3034304..0
--- a/sci-biology/stampy-bin/stampy-bin-1.0.28.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit toolchain-funcs python-r1 python-utils-r1
-
-DESCRIPTION="Map highly divergent short reads to a reference"
-HOMEPAGE="http://www.well.ox.ac.uk/project-stampy";
-SRC_URI="stampy-${PV}.tar.gz"
-
-LICENSE="stampy-academic"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="fetch"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/stampy-${PV}
-
-# FIXME: the makefile calls python but fails if that is under python-3.4, 2.7 
works
-# FIXME: respect CC and CXX
-
-src_prepare(){
-   sed -e 's/-O2 -Wall/$(CFLAGS)/' -i makefile || die
-}
-
-src_install(){
-   dobin *.py
-   python_foreach_impl python_domodule maptools.so
-   python_moduleinto Stampy
-   python_foreach_impl python_domodule build/python2.7/Stampy/*.pyc # only 
*.pyc files available
-   python_moduleinto ext
-   python_foreach_impl python_domodule build/python2.7/ext/*.pyc # only 
*.pyc files available
-   python_moduleinto plugins
-   python_foreach_impl python_domodule build/python2.7/plugins/*.py*
-   dodoc README.txt
-}

[gentoo-commits] proj/sci:master commit in: sci-biology/scaffold_builder/

2021-01-31 Thread Andrew Ammerlaan

commit: d4d0d1524160afa9709b58edeb13c0dd1eff7c9f
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Mon Feb  1 04:51:13 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Mon Feb  1 04:51:13 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=d4d0d152

sci-biology/scaffold_builder: drop pack, py2 only

checked the code, and this is still py2 style

Signed-off-by: Andrew Ammerlaan  riseup.net>

 sci-biology/scaffold_builder/metadata.xml  | 15 -
 .../scaffold_builder/scaffold_builder-2.2.ebuild   | 39 --
 2 files changed, 54 deletions(-)

diff --git a/sci-biology/scaffold_builder/metadata.xml 
b/sci-biology/scaffold_builder/metadata.xml
deleted file mode 100644
index 0f267b755..0
--- a/sci-biology/scaffold_builder/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-http://www.gentoo.org/dtd/metadata.dtd";>
-
-   
-   mmokr...@fold.natur.cuni.cz
-   Martin Mokrejs
-   
-   
-   sci-biol...@gentoo.org
-   Gentoo Biology Project
-   
-   
-   downloads
-   
-

diff --git a/sci-biology/scaffold_builder/scaffold_builder-2.2.ebuild 
b/sci-biology/scaffold_builder/scaffold_builder-2.2.ebuild
deleted file mode 100644
index 9f60e82c6..0
--- a/sci-biology/scaffold_builder/scaffold_builder-2.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-r1
-
-DESCRIPTION="Combine FASTA contigs from a de novo assembly into scaffolds"
-HOMEPAGE="
-   https://sourceforge.net/projects/scaffold-b
-   https://edwards.sdsu.edu/scaffold_builder";
-SRC_URI="
-   
https://sourceforge.net/projects/scaffold-b/files/scaffold_builder_v${PV}.zip
-   
https://sourceforge.net/projects/scaffold-b/files/scaffold_builder_v2_help.doc
-   https://downloads.sourceforge.net/project/scaffold-b/Manual_v2.1.pdf";
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-   sci-biology/mummer"
-DEPEND="${RDEPEND}"
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
-
-src_install(){
-   echo "#! /usr/bin/env python" > scaffold_builder.pyy || die
-   cat scaffold_builder.py >> scaffold_builder.pyy || die
-   mv scaffold_builder.pyy scaffold_builder.py || die
-   python_foreach_impl python_doscript scaffold_builder.py
-   dodoc "${DISTDIR}"/scaffold_builder_v2_help.doc
-   newdoc "${DISTDIR}"/Manual_v2.1.pdf scaffold_builder.pdf
-}

[gentoo-commits] repo/gentoo:master commit in: media-libs/libmpeg2/

2021-01-31 Thread Sam James

commit: cf6febd99abeb7e9a5769efeed7913264a2fefb1
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb  1 04:45:02 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb  1 04:45:02 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf6febd9

media-libs/libmpeg2: Stabilize 0.5.1-r3 sparc, #765565

Signed-off-by: Sam James  gentoo.org>

 media-libs/libmpeg2/libmpeg2-0.5.1-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libmpeg2/libmpeg2-0.5.1-r3.ebuild 
b/media-libs/libmpeg2/libmpeg2-0.5.1-r3.ebuild
index 99634fd7f1c..6a4fd24a0ea 100644
--- a/media-libs/libmpeg2/libmpeg2-0.5.1-r3.ebuild
+++ b/media-libs/libmpeg2/libmpeg2-0.5.1-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://libmpeg2.sourceforge.net/files/${P}.tar.gz";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="sdl X"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-libs/libmp3splt/

2021-01-31 Thread Sam James

commit: eb0da0c205c25e37606136896ddc61cb010262f4
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb  1 04:45:00 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb  1 04:45:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb0da0c2

media-libs/libmp3splt: Stabilize 0.9.2-r2 sparc, #672784

Signed-off-by: Sam James  gentoo.org>

 media-libs/libmp3splt/libmp3splt-0.9.2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libmp3splt/libmp3splt-0.9.2-r2.ebuild 
b/media-libs/libmp3splt/libmp3splt-0.9.2-r2.ebuild
index 349edb8975a..dec4b03a7c8 100644
--- a/media-libs/libmp3splt/libmp3splt-0.9.2-r2.ebuild
+++ b/media-libs/libmp3splt/libmp3splt-0.9.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN:3}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 sparc x86"
 IUSE="doc flac pcre"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: app-misc/figlet/

2021-01-31 Thread Sam James

commit: 133b979afbbca556d623f319e4c71cf047d2874d
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb  1 04:44:29 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb  1 04:44:29 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=133b979a

app-misc/figlet: Stabilize 2.2.5-r1 arm64, #768006

Signed-off-by: Sam James  gentoo.org>

 app-misc/figlet/figlet-2.2.5-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/figlet/figlet-2.2.5-r1.ebuild 
b/app-misc/figlet/figlet-2.2.5-r1.ebuild
index 6b8b2829ed8..9e32653271a 100644
--- a/app-misc/figlet/figlet-2.2.5-r1.ebuild
+++ b/app-misc/figlet/figlet-2.2.5-r1.ebuild
@@ -10,7 +10,7 @@ 
SRC_URI="ftp://ftp.figlet.org/pub/figlet/program/unix/${P}.tar.gz";
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 src_compile() {
emake clean

[gentoo-commits] repo/gentoo:master commit in: media-libs/libmpeg2/

2021-01-31 Thread Sam James

commit: fe648739b4a207575bd3aa670f97efba59b84861
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb  1 04:44:34 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb  1 04:44:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe648739

media-libs/libmpeg2: Stabilize 0.5.1-r3 arm64, #765565

Signed-off-by: Sam James  gentoo.org>

 media-libs/libmpeg2/libmpeg2-0.5.1-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libmpeg2/libmpeg2-0.5.1-r3.ebuild 
b/media-libs/libmpeg2/libmpeg2-0.5.1-r3.ebuild
index 0809ff88c03..99634fd7f1c 100644
--- a/media-libs/libmpeg2/libmpeg2-0.5.1-r3.ebuild
+++ b/media-libs/libmpeg2/libmpeg2-0.5.1-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://libmpeg2.sourceforge.net/files/${P}.tar.gz";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="sdl X"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2021-01-31 Thread Sam James

commit: c90b7bd02085351f54aef592aa7c7cc75f5a6983
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb  1 04:44:01 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb  1 04:44:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c90b7bd0

app-editors/emacs: Stabilize 27.1-r3 arm, #767361

Signed-off-by: Sam James  gentoo.org>

 app-editors/emacs/emacs-27.1-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/emacs/emacs-27.1-r3.ebuild 
b/app-editors/emacs/emacs-27.1-r3.ebuild
index a73497960d2..3a5e0446356 100644
--- a/app-editors/emacs/emacs-27.1-r3.ebuild
+++ b/app-editors/emacs/emacs-27.1-r3.ebuild
@@ -33,7 +33,7 @@ else
fi
SLOT="${PV%%.*}"
[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
-   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv 
sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv 
sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 DESCRIPTION="The extensible, customizable, self-documenting real-time display 
editor"

[gentoo-commits] repo/gentoo:master commit in: media-libs/libmpeg2/

2021-01-31 Thread Sam James

commit: 6798e6b30b33b35b1f1a16f5c9f334bf1ab61d53
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb  1 04:44:04 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb  1 04:44:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6798e6b3

media-libs/libmpeg2: Stabilize 0.5.1-r3 arm, #765565

Signed-off-by: Sam James  gentoo.org>

 media-libs/libmpeg2/libmpeg2-0.5.1-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libmpeg2/libmpeg2-0.5.1-r3.ebuild 
b/media-libs/libmpeg2/libmpeg2-0.5.1-r3.ebuild
index 6004c530410..0809ff88c03 100644
--- a/media-libs/libmpeg2/libmpeg2-0.5.1-r3.ebuild
+++ b/media-libs/libmpeg2/libmpeg2-0.5.1-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://libmpeg2.sourceforge.net/files/${P}.tar.gz";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="sdl X"
 
 RDEPEND="

[gentoo-commits] proj/sci:master commit in: sci-chemistry/mddnmr/

2021-01-31 Thread Andrew Ammerlaan

commit: 6a1e687cd68e85154efae73c9cda8f568c0dc072
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Mon Feb  1 04:42:51 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Mon Feb  1 04:42:51 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=6a1e687c

sci-chemistry/mddnmr: drop pack, py2 only

the manual says this only works with python2

Signed-off-by: Andrew Ammerlaan  riseup.net>

 sci-chemistry/mddnmr/mddnmr-2.7.ebuild | 66 --
 sci-chemistry/mddnmr/metadata.xml  |  8 -
 2 files changed, 74 deletions(-)

diff --git a/sci-chemistry/mddnmr/mddnmr-2.7.ebuild 
b/sci-chemistry/mddnmr/mddnmr-2.7.ebuild
deleted file mode 100644
index 3ef7b2c02..0
--- a/sci-chemistry/mddnmr/mddnmr-2.7.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
-
-MY_P="${PN}${PV}"
-
-DESCRIPTION="Program for processing of NUS multidimensional NMR spectra"
-HOMEPAGE="http://mddnmr.spektrino.com/";
-SRC_URI="${MY_P}.tgz"
-
-SLOT="0"
-KEYWORDS=""
-LICENSE="mddnmr"
-
-RESTRICT="fetch"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-   ${PYTHON_DEPS}
-   app-shells/tcsh
-   sci-chemistry/nmrpipe"
-DEPEND=""
-
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${PN}
-
-QA_PREBUILT="opt/${PN}/.*"
-
-src_install() {
-   exeinto /opt/${PN}/com
-   doexe com/*
-
-   exeinto /opt/${PN}/bin
-   if use amd64; then
-   doexe binXeonE5mkl/*
-   elif use x86; then
-   doexe binUbuntu32Static/*
-   fi
-
-   insinto /opt/${PN}/
-   doins -r GUI
-
-   cat >> "${T}"/qMDD <<- EOF
-   #!${EPREFIX}/bin/csh
-
-   setenv LD_LIBRARY_PATH $(grep LDPATH "${EPREFIX}"/etc/env.d/35intelsdp 
| sed 's:LDAPATH=::g')"
-   setenv MDD_NMR "${EPREFIX}/opt/${PN}"
-   setenv MDD_NMRbin "${EPREFIX}/opt/${PN}/bin/"
-   set path=( . "\$MDD_NMRbin"  "\${MDD_NMR}/com" \$path )
-
-   csh "${EPREFIX}/opt/${PN}/GUI/qMDD"
-   EOF
-
-   dobin "${T}"/qMDD
-
-   dodoc *pdf
-
-   python_optimize "${ED}"
-}

diff --git a/sci-chemistry/mddnmr/metadata.xml 
b/sci-chemistry/mddnmr/metadata.xml
deleted file mode 100644
index da36ecbfc..0
--- a/sci-chemistry/mddnmr/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-http://www.gentoo.org/dtd/metadata.dtd";>
-
-   
-   sci-chemis...@gentoo.org
-   Gentoo Chemistry Project
-   
-

[gentoo-commits] repo/gentoo:master commit in: dev-python/python-dotenv/

2021-01-31 Thread Sam James

commit: 0f1a663aac0d5d5bf4858e9a985a8f05805113b2
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb  1 04:43:29 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb  1 04:43:29 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f1a663a

dev-python/python-dotenv: Stabilize 0.15.0 ALLARCHES, #760234

Signed-off-by: Sam James  gentoo.org>

 dev-python/python-dotenv/python-dotenv-0.15.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-python/python-dotenv/python-dotenv-0.15.0.ebuild 
b/dev-python/python-dotenv/python-dotenv-0.15.0.ebuild
index 1702ed8c029..ff88ef01a11 100644
--- a/dev-python/python-dotenv/python-dotenv-0.15.0.ebuild
+++ b/dev-python/python-dotenv/python-dotenv-0.15.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~x86"
 IUSE="test"
 
 DEPEND="test? (

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2021-01-31 Thread Sam James

commit: 12923f3ebfc6373b9fc7ab1ad0bcde619aa6dfea
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb  1 04:43:23 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb  1 04:43:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12923f3e

net-analyzer/wireshark: Stabilize 3.4.3 amd64, #767907

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/wireshark/wireshark-3.4.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-3.4.3.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.3.ebuild
index 16956159e8f..21cdd17f9d6 100644
--- a/net-analyzer/wireshark/wireshark-3.4.3.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.3.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P/_/}"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 x86"
 IUSE="
androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
+dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb

[gentoo-commits] repo/gentoo:master commit in: dev-java/protobuf-java/

2021-01-31 Thread Sam James

commit: 7739002a1b69fd9d02ec7a02bd444a428093d0b9
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb  1 04:43:32 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb  1 04:43:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7739002a

dev-java/protobuf-java: Stabilize 3.14.0 amd64, #763747

Signed-off-by: Sam James  gentoo.org>

 dev-java/protobuf-java/protobuf-java-3.14.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/protobuf-java/protobuf-java-3.14.0.ebuild 
b/dev-java/protobuf-java/protobuf-java-3.14.0.ebuild
index cb4d56bc508..453e5bee516 100644
--- a/dev-java/protobuf-java/protobuf-java-3.14.0.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.14.0.ebuild
@@ -23,7 +23,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/25"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
 BDEPEND="~dev-libs/protobuf-${PV}

[gentoo-commits] repo/gentoo:master commit in: media-libs/libmpeg2/

2021-01-31 Thread Sam James

commit: de2c819b8a66f6b0f35e119369c6893cb342029b
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb  1 04:43:34 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb  1 04:43:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de2c819b

media-libs/libmpeg2: Stabilize 0.5.1-r3 amd64, #765565

Signed-off-by: Sam James  gentoo.org>

 media-libs/libmpeg2/libmpeg2-0.5.1-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libmpeg2/libmpeg2-0.5.1-r3.ebuild 
b/media-libs/libmpeg2/libmpeg2-0.5.1-r3.ebuild
index 19f464944a6..6004c530410 100644
--- a/media-libs/libmpeg2/libmpeg2-0.5.1-r3.ebuild
+++ b/media-libs/libmpeg2/libmpeg2-0.5.1-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://libmpeg2.sourceforge.net/files/${P}.tar.gz";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="sdl X"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: net-libs/mbedtls/

2021-01-31 Thread Sam James

commit: e9eefccb458186e61f872ac4196fbd78bbaaf685
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb  1 04:43:26 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb  1 04:43:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9eefccb

net-libs/mbedtls: Stabilize 2.25.0 amd64, #764317

Signed-off-by: Sam James  gentoo.org>

 net-libs/mbedtls/mbedtls-2.25.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/mbedtls/mbedtls-2.25.0.ebuild 
b/net-libs/mbedtls/mbedtls-2.25.0.ebuild
index 3a3fe113f9f..6324e1d678d 100644
--- a/net-libs/mbedtls/mbedtls-2.25.0.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.25.0.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}/${PN}-${P}
 
 LICENSE="Apache-2.0"
 SLOT="0/6.13.1" # ffmpeg subslot naming: SONAME tuple of 
{libmbedcrypto.so,libmbedtls.so,libmbedx509.so}
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 
~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 
~sparc x86"
 IUSE="cpu_flags_x86_sse2 doc havege libressl programs -static-libs test 
threads zlib"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: dev-perl/Crypt-Random-Source/

2021-01-31 Thread Sam James

commit: be8013dd4ec400f0e47c48d198d8bf62c456a29c
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb  1 04:42:29 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb  1 04:42:29 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be8013dd

dev-perl/Crypt-Random-Source: Stabilize 0.140.0 x86, #732642

Signed-off-by: Sam James  gentoo.org>

 dev-perl/Crypt-Random-Source/Crypt-Random-Source-0.140.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-perl/Crypt-Random-Source/Crypt-Random-Source-0.140.0.ebuild 
b/dev-perl/Crypt-Random-Source/Crypt-Random-Source-0.140.0.ebuild
index e5fa51c904a..0a3e08f0887 100644
--- a/dev-perl/Crypt-Random-Source/Crypt-Random-Source-0.140.0.ebuild
+++ b/dev-perl/Crypt-Random-Source/Crypt-Random-Source-0.140.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Get weak or strong random data from pluggable sources"
 
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: dev-libs/boost/

2021-01-31 Thread Sam James

commit: a5d95ddb2eb801e773a402712a970ae3cdd4711c
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb  1 04:42:34 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb  1 04:42:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5d95ddb

dev-libs/boost: Stabilize 1.74.0-r2 x86, #620468

Signed-off-by: Sam James  gentoo.org>

 dev-libs/boost/boost-1.74.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/boost/boost-1.74.0-r2.ebuild 
b/dev-libs/boost/boost-1.74.0-r2.ebuild
index b109fb2b5f8..62ae4d59a5e 100644
--- a/dev-libs/boost/boost-1.74.0-r2.ebuild
+++ b/dev-libs/boost/boost-1.74.0-r2.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://dl.bintray.com/boostorg/release/${PV}/source/boost_${MY_PV}.tar
 
 LICENSE="Boost-1.0"
 SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~sparc64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~sparc64-solaris ~x86-solaris ~x86-winnt"
 IUSE="bzip2 context debug doc icu lzma +nls mpi numpy python static-libs 
+threads tools zlib zstd"
 REQUIRED_USE="
mpi? ( threads )

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

2021-01-31 Thread Sam James

commit: 47ee5647b95f44a74ab92a1035c1c9562a52e8a3
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb  1 04:42:24 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb  1 04:42:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47ee5647

net-analyzer/wireshark: Stabilize 3.4.3 x86, #767907

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/wireshark/wireshark-3.4.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/wireshark-3.4.3.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.3.ebuild
index 9451bd4cdcb..16956159e8f 100644
--- a/net-analyzer/wireshark/wireshark-3.4.3.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.3.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P/_/}"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 x86"
 IUSE="
androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon
+dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb

[gentoo-commits] repo/gentoo:master commit in: x11-themes/greybird/

2021-01-31 Thread Sam James

commit: fb47d8c16d541cb0bd995b88bb04ac9ff77cef86
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb  1 04:42:39 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb  1 04:42:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb47d8c1

x11-themes/greybird: Stabilize 3.22.14 x86, #720322

Signed-off-by: Sam James  gentoo.org>

 x11-themes/greybird/greybird-3.22.14.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-themes/greybird/greybird-3.22.14.ebuild 
b/x11-themes/greybird/greybird-3.22.14.ebuild
index c11576a9a47..9b41f8fae75 100644
--- a/x11-themes/greybird/greybird-3.22.14.ebuild
+++ b/x11-themes/greybird/greybird-3.22.14.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/shimmerproject/${PN^}/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
 
 # Theme files, no test case available.
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: media-libs/libmp3splt/

2021-01-31 Thread Sam James

commit: ae388d81b90acabc28cacdeccc550f04a3711eea
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb  1 04:42:37 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb  1 04:42:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae388d81

media-libs/libmp3splt: Stabilize 0.9.2-r2 x86, #672784

Signed-off-by: Sam James  gentoo.org>

 media-libs/libmp3splt/libmp3splt-0.9.2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libmp3splt/libmp3splt-0.9.2-r2.ebuild 
b/media-libs/libmp3splt/libmp3splt-0.9.2-r2.ebuild
index 824f197b30d..349edb8975a 100644
--- a/media-libs/libmp3splt/libmp3splt-0.9.2-r2.ebuild
+++ b/media-libs/libmp3splt/libmp3splt-0.9.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN:3}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
 IUSE="doc flac pcre"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: net-nntp/tin/

2021-01-31 Thread Sam James

commit: 06029875c764c9edbca914573997450166e31ebe
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb  1 04:42:31 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb  1 04:42:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06029875

net-nntp/tin: Stabilize 2.4.5 x86, #724510

Signed-off-by: Sam James  gentoo.org>

 net-nntp/tin/tin-2.4.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-nntp/tin/tin-2.4.5.ebuild b/net-nntp/tin/tin-2.4.5.ebuild
index d89944b2835..f1749213e8b 100644
--- a/net-nntp/tin/tin-2.4.5.ebuild
+++ b/net-nntp/tin/tin-2.4.5.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="ftp://ftp.tin.org/pub/news/clients/tin/stable/${P}.tar.xz";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="cancel-locks debug doc +etiquette gpg idn ipv6 mime nls sasl socks5 
spell unicode"
 
 BDEPEND="virtual/pkgconfig"

[gentoo-commits] repo/gentoo:master commit in: app-accessibility/caribou/

2021-01-31 Thread Sam James

commit: 356915186edc4dfbeae5412f205d726fde6c4632
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb  1 04:42:26 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb  1 04:42:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35691518

app-accessibility/caribou: Stabilize 0.4.21-r2 x86, #765661

Signed-off-by: Sam James  gentoo.org>

 app-accessibility/caribou/caribou-0.4.21-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-accessibility/caribou/caribou-0.4.21-r2.ebuild 
b/app-accessibility/caribou/caribou-0.4.21-r2.ebuild
index ecee56604f0..158e4af5f78 100644
--- a/app-accessibility/caribou/caribou-0.4.21-r2.ebuild
+++ b/app-accessibility/caribou/caribou-0.4.21-r2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Caribou";
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

[gentoo-commits] proj/sci:master commit in: sci-biology/ncbi-blast+/

2021-01-31 Thread Andrew Ammerlaan

commit: 185edf7edae700779fb362e1adba1042514420da
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Mon Feb  1 04:36:18 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Mon Feb  1 04:36:18 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=185edf7e

sci-biology/ncbi-blast+: drop py2 only versions

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan  riseup.net>

 sci-biology/ncbi-blast+/ncbi-blast+-2.2.30.ebuild | 352 -
 sci-biology/ncbi-blast+/ncbi-blast+-2.2.31.ebuild | 355 -
 sci-biology/ncbi-blast+/ncbi-blast+-2.6.0.ebuild  | 360 --
 sci-biology/ncbi-blast+/ncbi-blast+-2.8.1.ebuild  |   2 +-
 4 files changed, 1 insertion(+), 1068 deletions(-)

diff --git a/sci-biology/ncbi-blast+/ncbi-blast+-2.2.30.ebuild 
b/sci-biology/ncbi-blast+/ncbi-blast+-2.2.30.ebuild
deleted file mode 100644
index 05c844b1c..0
--- a/sci-biology/ncbi-blast+/ncbi-blast+-2.2.30.ebuild
+++ /dev/null
@@ -1,352 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils flag-o-matic multilib python-single-r1 toolchain-funcs
-
-MY_P="ncbi-blast-${PV}+-src"
-# workdir/ncbi-blast-2.2.30+-src
-# 
ftp://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/2.2.30/ncbi-blast-2.2.30+-src.tar.gz
-
-DESCRIPTION="A subset of NCBI C++ Toolkit containing just the NCBI BLAST+"
-HOMEPAGE="https://ncbi.github.io/cxx-toolkit/";
-SRC_URI="
-   ftp://ftp.ncbi.nih.gov/blast/executables/blast+/${PV}/${MY_P}.tar.gz";
-#  http://dev.gentoo.org/~jlec/distfiles/${PN}-${PV#0.}-asneeded.patch.xz";
-
-# should also install ftp://ftp.ncbi.nlm.nih.gov/blast/db/taxdb.tar.gz
-# see http://www.biostars.org/p/76551/ and 
http://blastedbio.blogspot.cz/2012/05/blast-tabular-missing-descriptions.html
-LICENSE="public-domain"
-SLOT="0"
-IUSE="
-   debug static-libs static threads pch
-   test wxwidgets odbc
-   berkdb boost bzip2 cppunit curl expat fltk freetype gif
-   glut gnutls hdf5 icu jpeg lzo mesa mysql muparser opengl pcre png python
-   sablotron sqlite tiff xerces xalan xml xpm xslt X"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# sys-libs/db should be compiled with USE=cxx
-DEPEND="
-   http://anonscm.debian.org/viewvc/debian-med/trunk/packages/ncbi-blast%2B/trunk/debian/patches/fix_lib_deps?revision=18535&view=markup
-   epatch "${FILESDIR}"/"${P}"__fix_lib_deps.patch
-   # make sure this one is the last one and contains the actual patches 
applied unless we can have autoconf-2.59 or 2.60
-   # https://bugs.gentoo.org/show_bug.cgi?id=514706
-
-   tc-export CXX CC
-
-## cd src/build-system || die
-#  eautoreconf
-
-   # Temporarily disabling eautoconf because we patch configure via 
${P}-support-autoconf-2.60.patch
-   # eautoconf # keep it disabled until we can ensure 2.59 is installed
-   # beware 12.0.0. and previous required autoconf-2.59, a patch for 
12.0.0 brings autoconf-2.60 support
-   default
-}
-
-# possibly place modified contents of ${W}/src/build-system/config.site.ncbi 
and {W}/src/build-system/config.site.ex into ${W}/src/build-system/config.site
-src_configure() {
-   local myconf=()
-   #--without-optimization  turn off optimization flags in non-debug mode
-   #--with-profilingbuild profiled versions of libs and apps
-   #--with-tcheck(=DIR) build for Intel Thread Checker (in DIR)
-   #--with-plugin-auto-load always enable the plugin manager by default
-   #--with-bundles  build bundles in addition to dylibs on Mac OS X
-   #--with-bin-release  build executables suitable for public release
-   #   no dll and such
-   #--with-64   compile to 64-bit code
-   #--with-universalbuild universal binaries on Mac OS X
-   #--with-universal=CPUs   build universal binaries targeting the given 
CPUs
-   #--without-exe   do not build executables
-   #--with-relative-runpath=P specify an executable-relative DLL search 
path
-   #--with-hard-runpath hard-code runtime path, ignoring 
LD_LIBRARY_PATH
-   #--with-limited-linker   don't attempt to build especially large 
projects
-   #--with-extra-action=script to call after the configuration is 
complete
-   #--with-autodep  automatic generation of dependencies (GNU make)
-   #--with-fake-root=DIRappear to have been built under DIR
-   #--with-build-root-sfx=X add a user-specified suffix to the build dir 
name
-   #--without-execopy   do not copy built executables to the BIN area
-   #--with-lib-rebuilds ensure that apps use up-to-date libraries
-   #--with-lib-rebuilds=ask ask whether to update each app's libraries
-   #--without-deactivation  keep old copies of libraries

[gentoo-commits] proj/sci:master commit in: sci-biology/ncbi-tools++/

2021-01-31 Thread Andrew Ammerlaan

commit: e8d4a8bc048182c0db34a3b995ac6a5c24fcdbb8
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Mon Feb  1 04:32:58 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Mon Feb  1 04:32:58 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=e8d4a8bc

sci-biology/ncbi-tools++: drop py2 only version

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan  riseup.net>

 .../ncbi-tools++/ncbi-tools++-12.0.0.ebuild| 369 -
 .../ncbi-tools++/ncbi-tools++-18.0.0.ebuild|   2 +-
 2 files changed, 1 insertion(+), 370 deletions(-)

diff --git a/sci-biology/ncbi-tools++/ncbi-tools++-12.0.0.ebuild 
b/sci-biology/ncbi-tools++/ncbi-tools++-12.0.0.ebuild
deleted file mode 100644
index ed50801fc..0
--- a/sci-biology/ncbi-tools++/ncbi-tools++-12.0.0.ebuild
+++ /dev/null
@@ -1,369 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils flag-o-matic multilib python-single-r1 toolchain-funcs
-
-MY_TAG="Jun_15_2010"
-MY_Y="${MY_TAG/*_/}"
-MY_PV="12_0_0"
-MY_P="ncbi_cxx--${MY_PV}"
-#ftp://ftp.ncbi.nlm.nih.gov/toolbox/ncbi_tools++/ARCHIVE/9_0_0/ncbi_cxx--9_0_0.tar.gz
-
-# for example sci-biology/ncbi-tools++-12.0.0 contains blastn-2.2.28+
-DESCRIPTION="NCBI C++ Toolkit, including NCBI BLAST+"
-HOMEPAGE="https://ncbi.github.io/cxx-toolkit/";
-SRC_URI="
-   
ftp://ftp.ncbi.nih.gov/toolbox/ncbi_tools++/ARCHIVE/${MY_PV}/ncbi_cxx--${MY_PV}.tar.gz";
-#  http://dev.gentoo.org/~jlec/distfiles/${PN}-${PV#0.}-asneeded.patch.xz";
-
-# should also install ftp://ftp.ncbi.nlm.nih.gov/blast/db/taxdb.tar.gz
-# see http://www.biostars.org/p/76551/ and 
http://blastedbio.blogspot.cz/2012/05/blast-tabular-missing-descriptions.html
-LICENSE="public-domain"
-SLOT="0"
-IUSE="
-   debug static-libs static threads pch
-   test wxwidgets odbc
-   berkdb boost bzip2 cppunit curl expat fastcgi fltk freetype gif
-   glut gnutls hdf5 icu jpeg lzo mesa mysql muparser opengl pcre png python
-   sablotron sqlite tiff xerces xalan xml xpm xslt X"
-#KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-KEYWORDS="~amd64"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# sys-libs/db should be compiled with USE=cxx
-# dev-libs/boost must have Boost.Test suite, probably dev-libs/boost[test] 
then?
-DEPEND="
-   https://bugs.gentoo.org/show_bug.cgi?id=514706
-
-   tc-export CXX CC
-
-   cd src/build-system || die
-#  eautoreconf
-
-   # Temporarily disabling eautoconf because we patch configure via 
${P}-support-autoconf-2.60.patch
-   # eautoconf # keep it disabled until we can ensure 2.59 is installed
-   # beware 12.0.0. and previous required autoconf-2.59, a patch for 
12.0.0 brings autoconf-2.60 support
-}
-
-# possibly place modified contents of ${W}/src/build-system/config.site.ncbi 
and {W}/src/build-system/config.site.ex into ${W}/src/build-system/config.site
-src_configure() {
-   local myconf=()
-   #--without-optimization  turn off optimization flags in non-debug mode
-   #--with-profilingbuild profiled versions of libs and apps
-   #--with-tcheck(=DIR) build for Intel Thread Checker (in DIR)
-   #--with-plugin-auto-load always enable the plugin manager by default
-   #--with-bundles  build bundles in addition to dylibs on Mac OS X
-   #--with-bin-release  build executables suitable for public release
-   #   no dll and such
-   #--with-64   compile to 64-bit code
-   #--with-universalbuild universal binaries on Mac OS X
-   #--with-universal=CPUs   build universal binaries targeting the given 
CPUs
-   #--without-exe   do not build executables
-   #--with-relative-runpath=P specify an executable-relative DLL search 
path
-   #--with-hard-runpath hard-code runtime path, ignoring 
LD_LIBRARY_PATH
-   #--with-limited-linker   don't attempt to build especially large 
projects
-   #--with-extra-action=script to call after the configuration is 
complete
-   #--with-autodep  automatic generation of dependencies (GNU make)
-   #--with-fake-root=DIRappear to have been built under DIR
-   #--with-build-root-sfx=X add a user-specified suffix to the build dir 
name
-   #--without-execopy   do not copy built executables to the BIN area
-   #--with-lib-rebuilds ensure that apps use up-to-date libraries
-   #--with-lib-rebuilds=ask ask whether to update each app's libraries
-   #--without-deactivation  keep old copies of libraries that no longer 
build
-   #--without-makefile-auto-update  do not auto-update generated makefiles
-   #--with-projects=FILEbuild projects listed in FILE by default
-   #--without-flat-makefile do not generate an all-encompassing flat 
makefile
-   #--wi

[gentoo-commits] proj/releng: Branch deleted: consolidate-upload

2021-01-31 Thread Matt Turner

commit: 
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Feb  1 04:15:36 2021 +

Branch deleted: consolidate-upload

[gentoo-commits] proj/releng:master commit in: tools/

2021-01-31 Thread Matt Turner

commit: 8f478fe30ba9f3a43df0753fc8369f93b509f4af
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Jan 31 01:00:37 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Jan 31 01:56:43 2021 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=8f478fe3

tools: Add UPLOAD_DEST

Signed-off-by: Matt Turner  gentoo.org>

 tools/catalyst-auto-alpha.conf  |  2 +-
 tools/catalyst-auto-amd64.conf  | 18 +++---
 tools/catalyst-auto-arm.conf|  2 +-
 tools/catalyst-auto-arm64.conf  |  2 +-
 tools/catalyst-auto-hppa.conf   |  2 +-
 tools/catalyst-auto-ia64.conf   |  2 +-
 tools/catalyst-auto-ppc.conf|  2 +-
 tools/catalyst-auto-ppc64le.conf|  2 +-
 tools/catalyst-auto-qemu-arm.conf   |  2 +-
 tools/catalyst-auto-qemu-riscv.conf |  2 +-
 tools/catalyst-auto-s390.conf   |  2 +-
 tools/catalyst-auto-s390x.conf  |  2 +-
 tools/catalyst-auto-sparc64.conf|  2 +-
 tools/catalyst-auto-x86.conf| 18 +++---
 14 files changed, 18 insertions(+), 42 deletions(-)

diff --git a/tools/catalyst-auto-alpha.conf b/tools/catalyst-auto-alpha.conf
index 6a233900..c2359f59 100644
--- a/tools/catalyst-auto-alpha.conf
+++ b/tools/catalyst-auto-alpha.conf
@@ -48,7 +48,7 @@ upload() {
--omit-dir-times
--delay-updates
)
-   rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+   rsync "${RSYNC_OPTS[@]}" "$@" 
${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
 }
 
 post_build() {

diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 363c80cb..0b07c988 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -80,26 +80,14 @@ upload() {
--omit-dir-times
--delay-updates
)
-   rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_DEST}
+   rsync "${RSYNC_OPTS[@]}" "$@" 
${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
 }
 
 post_build() {
local set=$1 spec=$2
 
-   case $HOSTNAME in
-   # If you ever need to ensure it's copied somewhere local, drop 
a hostname in here!
-   LOCAL)
-   DEST_DEFAULT=${BUILD_DESTDIR_BASE}
-   DEST_HARDENED=${BUILD_DESTDIR_BASE}/hardened
-   ;;
-   *)
-   
DEST_DEFAULT=${UPLOAD_USER}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}
-   
DEST_HARDENED=${UPLOAD_USER}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
-   ;;
-   esac
-
pushd "${BUILD_SRCDIR_BASE}"/default >/dev/null || exit
-   UPLOAD_DEST=${DEST_DEFAULT}
+   UPLOAD_DEST=${BUILD_DESTDIR_BASE}
case ${spec} in
stage3.spec)
upload stage3-amd64-${TIMESTAMP}.tar.xz*
@@ -126,7 +114,7 @@ post_build() {
popd >/dev/null || exit
 
pushd "${BUILD_SRCDIR_BASE}"/hardened >/dev/null || exit
-   UPLOAD_DEST=${DEST_HARDENED}
+   UPLOAD_DEST=${BUILD_DESTDIR_BASE}/hardened
case ${spec} in
hardened/stage3.spec)
upload stage3-amd64-hardened-${TIMESTAMP}.tar.xz*

diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf
index 5c78ab99..b15d3569 100644
--- a/tools/catalyst-auto-arm.conf
+++ b/tools/catalyst-auto-arm.conf
@@ -70,7 +70,7 @@ upload() {
--omit-dir-times
--delay-updates
)
-   rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+   rsync "${RSYNC_OPTS[@]}" "$@" 
${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
 else
echo Would now upload "$@"
ls -l $@

diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index f1ce7ab1..c14cb56b 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -42,7 +42,7 @@ upload() {
--omit-dir-times
--delay-updates
)
-   rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+   rsync "${RSYNC_OPTS[@]}" "$@" 
${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
 }
 
 post_build() {

diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index 6ba59c81..d93a1370 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -48,7 +48,7 @@ upload() {
--omit-dir-times
--delay-updates
)
-   rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+   rsync "${RSYNC_OPTS[@]}" "$@" 
${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
 }
 
 post_build() {

diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index 1d123d2a..852be0d4 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -41,7 +41,7 @@ upload() {
--omit-dir-times
--delay-updates
)
-   rsync "$

[gentoo-commits] proj/releng:master commit in: tools/

2021-01-31 Thread Matt Turner

commit: 7ec486fab44faf29fc8abbedf9449f64088a89de
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Jan 31 01:02:35 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Jan 31 01:57:12 2021 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=7ec486fa

tools: Consolidate upload() function

Signed-off-by: Matt Turner  gentoo.org>

 tools/catalyst-auto | 24 +++-
 tools/catalyst-auto-alpha.conf  | 18 --
 tools/catalyst-auto-amd64.conf  | 18 --
 tools/catalyst-auto-arm.conf| 23 ---
 tools/catalyst-auto-arm64.conf  | 17 -
 tools/catalyst-auto-hppa.conf   | 17 -
 tools/catalyst-auto-ia64.conf   | 17 -
 tools/catalyst-auto-ppc.conf| 17 -
 tools/catalyst-auto-ppc64le.conf| 17 -
 tools/catalyst-auto-qemu-arm.conf   | 23 ---
 tools/catalyst-auto-qemu-riscv.conf | 20 
 tools/catalyst-auto-s390.conf   | 17 -
 tools/catalyst-auto-s390x.conf  | 17 -
 tools/catalyst-auto-sparc64.conf| 17 -
 tools/catalyst-auto-x86.conf| 18 --
 15 files changed, 23 insertions(+), 257 deletions(-)

diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index 203abe81..0f0eae34 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -47,7 +47,6 @@ Options:
   --intervalExit if last successful run was less than  ago
   -l|--lock File to grab a lock on to prevent multiple invocations
   -X|--nonetwork  Do not perform network operations (like uploading result)
-  This needs to be supported by the config file as well.
   -h|--help   Show this message and quit
 
 EOH
@@ -270,6 +269,29 @@ verify_dnssec() {
 fi
 }
 
+upload() {
+   if [[ ${nonetwork} == 0 ]]; then
+   echo Uploading "$@"
+   local SSH_CMD=(
+   ssh
+   -i ${UPLOAD_KEY}
+   -o UserKnownHostsFile=/dev/null
+   -o VerifyHostKeyDNS=yes
+   -o StrictHostKeyChecking=no
+   )
+   local RSYNC_OPTS=(
+   -e "${SSH_CMD[*]}"
+   --archive
+   --omit-dir-times
+   --delay-updates
+   )
+   rsync "${RSYNC_OPTS[@]}" "$@" 
${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
+   else
+   echo Would now upload "$@"
+   ls -l $@
+   fi
+}
+
 run_catalyst_commands() {
doneconfig=0
for config_file in "${config_files[@]}"; do

diff --git a/tools/catalyst-auto-alpha.conf b/tools/catalyst-auto-alpha.conf
index c2359f59..f755c9b5 100644
--- a/tools/catalyst-auto-alpha.conf
+++ b/tools/catalyst-auto-alpha.conf
@@ -33,24 +33,6 @@ update_symlinks() {
done
 }
 
-upload() {
-   echo Uploading "$@"
-   local SSH_CMD=(
-   ssh
-   -i ${UPLOAD_KEY}
-   -o UserKnownHostsFile=/dev/null
-   -o VerifyHostKeyDNS=yes
-   -o StrictHostKeyChecking=no
-   )
-   local RSYNC_OPTS=(
-   -e "${SSH_CMD[*]}"
-   --archive
-   --omit-dir-times
-   --delay-updates
-   )
-   rsync "${RSYNC_OPTS[@]}" "$@" 
${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
-}
-
 post_build() {
local set=$1 spec=$2
 

diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 0b07c988..b14013f7 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -65,24 +65,6 @@ update_symlinks() {
done
 }
 
-upload() {
-   echo " ** Uploading $@"
-   local SSH_CMD=(
-   ssh
-   -i ${UPLOAD_KEY}
-   -o UserKnownHostsFile=/dev/null
-   -o VerifyHostKeyDNS=yes
-   -o StrictHostKeyChecking=no
-   )
-   local RSYNC_OPTS=(
-   -e "${SSH_CMD[*]}"
-   --archive
-   --omit-dir-times
-   --delay-updates
-   )
-   rsync "${RSYNC_OPTS[@]}" "$@" 
${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
-}
-
 post_build() {
local set=$1 spec=$2
 

diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf
index b15d3569..829ff4c5 100644
--- a/tools/catalyst-auto-arm.conf
+++ b/tools/catalyst-auto-arm.conf
@@ -54,29 +54,6 @@ update_symlinks() {
done
 }
 
-upload() {
-if [[ ${nonetwork} == 0 ]]; then
-   echo Uploading "$@"
-   local SSH_CMD=(
-   ssh
-   -i ${UPLOAD_KEY}
-   -o UserKnownHostsFile=/dev/null
-   -o VerifyHostKeyDNS=yes
-   -o StrictHostKeyChecking=no
-   )
-   local RSYNC_OPTS=(
-   -e "$

[gentoo-commits] proj/releng:master commit in: config/, config/old/

2021-01-31 Thread Matt Turner

commit: d70057496ea43cadab0426afa7918a5408ef1854
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Feb  1 03:57:41 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Feb  1 03:58:03 2021 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=d7005749

config/old: Remove

Signed-off-by: Matt Turner  gentoo.org>

 config/README | 2 --
 config/old/active-release | 1 -
 config/old/amd64-default.conf | 9 -
 config/old/amd64-default.env  | 3 ---
 config/old/amd64-dev.conf | 9 -
 config/old/amd64-hardened.conf| 9 -
 config/old/amd64-hardened.env | 7 ---
 config/old/amd64-uclibc.conf  | 9 -
 config/old/amd64-uclibc.env   | 1 -
 config/old/snapshot-official.conf | 7 ---
 config/old/x86-default.conf   | 9 -
 config/old/x86-default.env| 4 
 config/old/x86-dev.conf   | 9 -
 config/old/x86-hardened.conf  | 9 -
 config/old/x86-hardened.env   | 5 -
 config/old/x86-uclibc.conf| 9 -
 config/old/x86-uclibc.env | 4 
 17 files changed, 106 deletions(-)

diff --git a/config/README b/config/README
index 93cbf3dc..22badd08 100644
--- a/config/README
+++ b/config/README
@@ -2,8 +2,6 @@ This directory houses the config files for catalyst to be used 
by releng
 build boxes. To use these config files, add a symlink in a build box from
 /etc/catalyst/release to this dir.
 
-Old config files that serve as examples are stores in the old subdir.
-
 Changes to these files should be discussed with the members responsible
 for individual build boxes / arches or with the RelEng team.
 

diff --git a/config/old/active-release b/config/old/active-release
deleted file mode 100644
index 4a70890b..
--- a/config/old/active-release
+++ /dev/null
@@ -1 +0,0 @@
-2008.0

diff --git a/config/old/amd64-default.conf b/config/old/amd64-default.conf
deleted file mode 100644
index 92647308..
--- a/config/old/amd64-default.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-distdir="/usr/portage/distfiles"
-portdir="/release/portage"
-options="pkgcache autoresume snapcache seedcache kerncache"
-sharedir="/usr/lib/catalyst/"
-storedir="/release/buildroot/amd64-default"
-envscript="/etc/catalyst/amd64-default.env"
-hash_function="crc32"
-digests="md5 sha1"
-contents="auto"

diff --git a/config/old/amd64-default.env b/config/old/amd64-default.env
deleted file mode 100644
index d130ae5a..
--- a/config/old/amd64-default.env
+++ /dev/null
@@ -1,3 +0,0 @@
-export GENTOO_MIRRORS="http://gentoo.osuosl.org/";
-export INPUT_DEVICES="evdev keyboard mouse vmmouse"
-export MAKEOPTS="-j4"

diff --git a/config/old/amd64-dev.conf b/config/old/amd64-dev.conf
deleted file mode 100644
index d15a803f..
--- a/config/old/amd64-dev.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-distdir="/usr/portage/distfiles"
-portdir="/release/portage"
-options="ccache pkgcache autoresume snapcache seedcache kerncache"
-sharedir="/usr/lib/catalyst/"
-storedir="/release/buildroot/amd64-dev"
-envscript="/etc/catalyst/amd64-dev.env"
-hash_function="crc32"
-digests="md5 sha1"
-contents="auto"

diff --git a/config/old/amd64-hardened.conf b/config/old/amd64-hardened.conf
deleted file mode 100644
index 20c39a0b..
--- a/config/old/amd64-hardened.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-distdir="/usr/portage/distfiles"
-portdir="/release/portage"
-options="ccache pkgcache autoresume snapcache seedcache kerncache"
-sharedir="/usr/lib/catalyst/"
-storedir="/release/buildroot/amd64-hardened"
-envscript="/etc/catalyst/amd64-hardened.env"
-hash_function="crc32"
-digests="md5 sha1"
-contents="auto"

diff --git a/config/old/amd64-hardened.env b/config/old/amd64-hardened.env
deleted file mode 100644
index fe933ce0..
--- a/config/old/amd64-hardened.env
+++ /dev/null
@@ -1,7 +0,0 @@
-export CFLAGS="-O2 -pipe"
-export CXXFLAGS="${CFLAGS}"
-export CHOS="x86_64-pc-linux-gnu" 
-export GENTOO_MIRRORS="http://gentoo.osuosl.org/";
-export MAKEOPTS="-j3"
-# Jorge Vicetto - testing for hardened builds
-#export MAKEOPTS="-j6"

diff --git a/config/old/amd64-uclibc.conf b/config/old/amd64-uclibc.conf
deleted file mode 100644
index eb46f361..
--- a/config/old/amd64-uclibc.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-distdir="/usr/portage/distfiles"
-portdir="/release/portage"
-options="ccache pkgcache autoresume snapcache seedcache kerncache"
-sharedir="/usr/lib/catalyst/"
-storedir="/release/buildroot/amd64-uclibc"
-envscript="/etc/catalyst/amd64-uclibc.env"
-hash_function="crc32"
-digests="md5 sha1"
-contents="auto"

diff --git a/config/old/amd64-uclibc.env b/config/old/amd64-uclibc.env
deleted file mode 100644
index a1c428c6..
--- a/config/old/amd64-uclibc.env
+++ /dev/null
@@ -1 +0,0 @@
-export GENTOO_MIRRORS="http://gentoo.osuosl.org/";

diff --git a/config/old/snapshot-official.conf 
b/config/old/snapshot-official.conf
deleted file mode 100644
index 8db59586..
--- a/co

[gentoo-commits] proj/releng:master commit in: tools/

2021-01-31 Thread Matt Turner

commit: 2a8050450c9f210afff1624b1d6458bf4f782fae
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Feb  1 04:03:24 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Feb  1 04:03:24 2021 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=2a805045

tools: Readd ARCH/TYPE assignments

These are used in the sourced .env file.

Signed-off-by: Matt Turner  gentoo.org>

 tools/catalyst-auto-amd64.conf | 2 ++
 tools/catalyst-auto-x86.conf   | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index b14013f7..2f6ed30e 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -5,6 +5,8 @@ UPLOAD_USER=amd64
 UPLOAD_KEY=/root/.ssh/id_rsa
 host=$(hostname)
 
+ARCH="amd64"
+TYPE="auto"
 source /etc/catalyst/release/build.env
 
 SPECS_DIR=${REPO_DIR}/releases/specs/amd64

diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index 5822d992..cee289e4 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -5,6 +5,8 @@ UPLOAD_USER=x86
 UPLOAD_KEY=/root/.ssh/id_rsa
 host=$(hostname)
 
+ARCH="x86"
+TYPE="auto"
 source /etc/catalyst/release/build.env
 
 SPECS_DIR=${REPO_DIR}/releases/specs/x86

[gentoo-commits] proj/releng:master commit in: tools/

2021-01-31 Thread Matt Turner

commit: 174254bbb1a7245e192fbe041b66ffc202ff5650
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Jan 31 23:22:07 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Jan 31 23:22:07 2021 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=174254bb

tools: Include post_build.log contents when successful

Signed-off-by: Matt Turner  gentoo.org>

 tools/catalyst-auto | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index 0f0eae34..70be8055 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -522,7 +522,7 @@ run_catalyst_commands() {
(date -d"${stamp}" +%s; echo "${stamp}") 
>"${last_success_file}"
fi
 
-   send_email "Catalyst build success" "Build process complete."
+   send_email "Catalyst build success" "Build process complete." 
"${TMPDIR}/log/post_build.log"
 
if [[ ${keep_tmpdir} == 0 ]]; then
if ! rm -rf "${TMPDIR}"; then

[gentoo-commits] proj/releng:master commit in: tools/

2021-01-31 Thread Matt Turner

commit: 7b51adc7521e137a33c5a5924b03054dc736585f
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Jan 31 23:24:53 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Jan 31 23:27:13 2021 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=7b51adc7

tools: Simplify nonetwork handling

... and fix the indentation.

Signed-off-by: Matt Turner  gentoo.org>

 tools/catalyst-auto | 8 ++--
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index 70be8055..1f053048 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -53,7 +53,7 @@ EOH
 }
 
 send_email() {
-if [[ ${nonetwork} == 0 ]]; then
+   [[ ${nonetwork} == 0 ]] || return
 
local subject="${EMAIL_SUBJECT_PREPEND} $1"
local message=$2
@@ -69,8 +69,6 @@ send_email() {
printf 'From: %s\r\nTo: %s\r\nSubject: %s\r\n\r\n%b' \
"${EMAIL_FROM}" "${EMAIL_TO}" "${subject}" "${body}" | \
/usr/sbin/sendmail -f "${EMAIL_FROM}" ${EMAIL_TO//,/ }
-
-fi
 }
 
 # Usage: run_cmd  
@@ -249,7 +247,7 @@ git_update() {
 # SSH fingerprint from DNS. To do this securely, we need to ensure DNSSEC is
 # working.
 verify_dnssec() {
-if [[ ${nonetwork} == 0 ]]; then
+   [[ ${nonetwork} == 0 ]] || return
 
which dig >/dev/null || {
echo "net-dns/bind-tools is needed to verify DNSSEC is working"
@@ -265,8 +263,6 @@ verify_dnssec() {
echo "DNSSEC is not enabled in /etc/resolv.conf"
exit 1
fi
-
-fi
 }
 
 upload() {

[gentoo-commits] proj/releng:master commit in: tools/

2021-01-31 Thread Matt Turner

commit: 5515e890485b5f23a68104dc7004235a02dca15d
Author: Matt Turner  gentoo  org>
AuthorDate: Sat Jan 30 23:43:40 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sat Jan 30 23:46:08 2021 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=5515e890

tools: Add UPLOAD_USER variable

Signed-off-by: Matt Turner  gentoo.org>

 tools/catalyst-auto-alpha.conf  | 3 ++-
 tools/catalyst-auto-amd64.conf  | 6 +++---
 tools/catalyst-auto-arm.conf| 3 ++-
 tools/catalyst-auto-arm64.conf  | 3 ++-
 tools/catalyst-auto-hppa.conf   | 3 ++-
 tools/catalyst-auto-ia64.conf   | 3 ++-
 tools/catalyst-auto-ppc.conf| 3 ++-
 tools/catalyst-auto-ppc64le.conf| 3 ++-
 tools/catalyst-auto-qemu-arm.conf   | 4 +++-
 tools/catalyst-auto-qemu-riscv.conf | 4 +++-
 tools/catalyst-auto-s390.conf   | 3 ++-
 tools/catalyst-auto-s390x.conf  | 3 ++-
 tools/catalyst-auto-sparc64.conf| 3 ++-
 tools/catalyst-auto-x86.conf| 6 +++---
 14 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/tools/catalyst-auto-alpha.conf b/tools/catalyst-auto-alpha.conf
index 27825851..687d1fc3 100644
--- a/tools/catalyst-auto-alpha.conf
+++ b/tools/catalyst-auto-alpha.conf
@@ -1,6 +1,7 @@
 # This is the config file for the catalyst-auto script. It should be pretty
 # self-explanatory.
  
+UPLOAD_USER=alpha
 SPECS_DIR=${REPO_DIR}/releases/specs/alpha
  
 SPECS="stage1.spec stage3.spec"
@@ -33,7 +34,7 @@ update_symlinks() {
 
 upload() {
echo Uploading "$@"
-   rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o 
VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" 
al...@releng-incoming.gentoo.org:
+   rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o 
VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" 
${UPLOAD_USER}@releng-incoming.gentoo.org:
 }
 
 post_build() {

diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 6ee56fb1..3c0b6c99 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -1,7 +1,7 @@
 # This is the config file for the catalyst-auto script. It should be pretty
 # self-explanatory.
 
-ARCH="amd64"
+UPLOAD_USER=amd64
 host=$(hostname)
 
 source /etc/catalyst/release/build.env
@@ -85,8 +85,8 @@ post_build() {
DEST_HARDENED=${BUILD_DESTDIR_BASE}/hardened
;;
*)
-   
DEST_DEFAULT=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}
-   
DEST_HARDENED=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
+   
DEST_DEFAULT=${UPLOAD_USER}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}
+   
DEST_HARDENED=${UPLOAD_USER}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
;;
esac
 

diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf
index 9f873c31..feaad6bd 100644
--- a/tools/catalyst-auto-arm.conf
+++ b/tools/catalyst-auto-arm.conf
@@ -1,6 +1,7 @@
 # This is the config file for the catalyst-auto script. It should be pretty
 # self-explanatory.
 
+UPLOAD_USER=arm
 host=$(hostname)
 
 SPECS_DIR=${REPO_DIR}/releases/specs/arm
@@ -55,7 +56,7 @@ update_symlinks() {
 upload() {
 if [[ ${nonetwork} == 0 ]]; then
echo Uploading "$@"
-   rsync -e 'ssh -i /root/.ssh/id_ed25519 -o UserKnownHostsFile=/dev/null 
-o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" 
a...@releng-incoming.gentoo.org:
+   rsync -e 'ssh -i /root/.ssh/id_ed25519 -o UserKnownHostsFile=/dev/null 
-o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" 
${UPLOAD_USER}@releng-incoming.gentoo.org:
 else
echo Would now upload "$@"
ls -l $@

diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index e143ebbb..14211166 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -1,6 +1,7 @@
 # This is the config file for the catalyst-auto script. It should be pretty
 # self-explanatory.
 
+UPLOAD_USER=arm64
 SPECS_DIR=${REPO_DIR}/releases/specs/arm64
 SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
 
@@ -27,7 +28,7 @@ update_symlinks() {
 }
 
 upload() {
-   rsync -e 'ssh -i /root/.ssh/id_ed25519 -o UserKnownHostsFile=/dev/null 
-o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" 
ar...@releng-incoming.gentoo.org:
+   rsync -e 'ssh -i /root/.ssh/id_ed25519 -o UserKnownHostsFile=/dev/null 
-o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" 
${UPLOAD_USER}@releng-incoming.gentoo.org:
 }
 
 post_build() {

diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index 967985b6..135b188c 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -1,6 +1,7 @@
 # This is the config file for the catalyst-auto script. It should be pretty
 # self-explanatory.
 
+UPLOAD_USER=hppa
 SPECS_DIR=${REPO_DI

[gentoo-commits] proj/releng:master commit in: tools/

2021-01-31 Thread Matt Turner

commit: 4de1432aa1494b7c2459bb7fa740234a6777eac5
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Jan 31 00:39:55 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Jan 31 01:56:43 2021 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=4de1432a

tools: Add RSYNC_OPTS array

Signed-off-by: Matt Turner  gentoo.org>

 tools/catalyst-auto-alpha.conf  |  5 -
 tools/catalyst-auto-amd64.conf  | 14 +++---
 tools/catalyst-auto-arm.conf|  5 -
 tools/catalyst-auto-arm64.conf  |  5 -
 tools/catalyst-auto-hppa.conf   |  5 -
 tools/catalyst-auto-ia64.conf   |  5 -
 tools/catalyst-auto-ppc.conf|  5 -
 tools/catalyst-auto-ppc64le.conf|  5 -
 tools/catalyst-auto-qemu-arm.conf   |  5 -
 tools/catalyst-auto-qemu-riscv.conf |  5 -
 tools/catalyst-auto-s390.conf   |  5 -
 tools/catalyst-auto-s390x.conf  |  5 -
 tools/catalyst-auto-sparc64.conf|  5 -
 tools/catalyst-auto-x86.conf| 14 +++---
 14 files changed, 62 insertions(+), 26 deletions(-)

diff --git a/tools/catalyst-auto-alpha.conf b/tools/catalyst-auto-alpha.conf
index ebaff6eb..381171b5 100644
--- a/tools/catalyst-auto-alpha.conf
+++ b/tools/catalyst-auto-alpha.conf
@@ -42,7 +42,10 @@ upload() {
-o VerifyHostKeyDNS=yes
-o StrictHostKeyChecking=no
)
-   rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+   local RSYNC_OPTS=(
+   -e "${SSH_CMD[*]}"
+   )
+   rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
 }
 
 post_build() {

diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 0ef11f2f..363c80cb 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -74,13 +74,13 @@ upload() {
-o VerifyHostKeyDNS=yes
-o StrictHostKeyChecking=no
)
-   rsync \
-   -e "${SSH_CMD[*]}" \
-   -a \
-   --omit-dir-times \
-   --delay-updates \
-   "$@" \
-   "${UPLOAD_DEST}"
+   local RSYNC_OPTS=(
+   -e "${SSH_CMD[*]}"
+   --archive
+   --omit-dir-times
+   --delay-updates
+   )
+   rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_DEST}
 }
 
 post_build() {

diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf
index 26fe8156..eaae0399 100644
--- a/tools/catalyst-auto-arm.conf
+++ b/tools/catalyst-auto-arm.conf
@@ -64,7 +64,10 @@ upload() {
-o VerifyHostKeyDNS=yes
-o StrictHostKeyChecking=no
)
-   rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+   local RSYNC_OPTS=(
+   -e "${SSH_CMD[*]}"
+   )
+   rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
 else
echo Would now upload "$@"
ls -l $@

diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index 9f457989..1bd94ae9 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -36,7 +36,10 @@ upload() {
-o VerifyHostKeyDNS=yes
-o StrictHostKeyChecking=no
)
-   rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+   local RSYNC_OPTS=(
+   -e "${SSH_CMD[*]}"
+   )
+   rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
 }
 
 post_build() {

diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index 8b465421..3b93e4ec 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -42,7 +42,10 @@ upload() {
-o VerifyHostKeyDNS=yes
-o StrictHostKeyChecking=no
)
-   rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+   local RSYNC_OPTS=(
+   -e "${SSH_CMD[*]}"
+   )
+   rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
 }
 
 post_build() {

diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index 6c78c8a7..2d87a837 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -35,7 +35,10 @@ upload() {
-o VerifyHostKeyDNS=yes
-o StrictHostKeyChecking=no
)
-   rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+   local RSYNC_OPTS=(
+   -e "${SSH_CMD[*]}"
+   )
+   rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
 }
 
 post_build() {

diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index a1286726..615c3f55 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -41,7 +41,10 @@ upload() {
-o VerifyHostKeyDNS=yes
-o StrictHostKeyChecking=no
)
-   rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng

[gentoo-commits] proj/releng:master commit in: tools/

2021-01-31 Thread Matt Turner

commit: 3d95cec60b1acde2f6561df4dcc26f4b0dffe86c
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Jan 31 00:01:29 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Jan 31 00:01:29 2021 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=3d95cec6

tools: Add UPLOAD_KEY

Signed-off-by: Matt Turner  gentoo.org>

 tools/catalyst-auto-alpha.conf  | 3 ++-
 tools/catalyst-auto-amd64.conf  | 3 ++-
 tools/catalyst-auto-arm.conf| 3 ++-
 tools/catalyst-auto-arm64.conf  | 3 ++-
 tools/catalyst-auto-hppa.conf   | 3 ++-
 tools/catalyst-auto-ia64.conf   | 3 ++-
 tools/catalyst-auto-ppc.conf| 3 ++-
 tools/catalyst-auto-ppc64le.conf| 3 ++-
 tools/catalyst-auto-qemu-arm.conf   | 3 ++-
 tools/catalyst-auto-qemu-riscv.conf | 3 ++-
 tools/catalyst-auto-s390.conf   | 3 ++-
 tools/catalyst-auto-s390x.conf  | 3 ++-
 tools/catalyst-auto-sparc64.conf| 3 ++-
 tools/catalyst-auto-x86.conf| 3 ++-
 14 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/tools/catalyst-auto-alpha.conf b/tools/catalyst-auto-alpha.conf
index 687d1fc3..a60f979d 100644
--- a/tools/catalyst-auto-alpha.conf
+++ b/tools/catalyst-auto-alpha.conf
@@ -2,6 +2,7 @@
 # self-explanatory.
  
 UPLOAD_USER=alpha
+UPLOAD_KEY=/root/.ssh/id_rsa
 SPECS_DIR=${REPO_DIR}/releases/specs/alpha
  
 SPECS="stage1.spec stage3.spec"
@@ -34,7 +35,7 @@ update_symlinks() {
 
 upload() {
echo Uploading "$@"
-   rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o 
VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" 
${UPLOAD_USER}@releng-incoming.gentoo.org:
+   rsync -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o 
VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" 
${UPLOAD_USER}@releng-incoming.gentoo.org:
 }
 
 post_build() {

diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 3c0b6c99..16aeda56 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -2,6 +2,7 @@
 # self-explanatory.
 
 UPLOAD_USER=amd64
+UPLOAD_KEY=/root/.ssh/id_rsa
 host=$(hostname)
 
 source /etc/catalyst/release/build.env
@@ -67,7 +68,7 @@ update_symlinks() {
 upload() {
echo " ** Uploading $@"
rsync \
-   -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o 
VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' \
+   -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o 
VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' \
-a \
--omit-dir-times \
--delay-updates \

diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf
index feaad6bd..56459c50 100644
--- a/tools/catalyst-auto-arm.conf
+++ b/tools/catalyst-auto-arm.conf
@@ -2,6 +2,7 @@
 # self-explanatory.
 
 UPLOAD_USER=arm
+UPLOAD_KEY=/root/.ssh/id_ed25519
 host=$(hostname)
 
 SPECS_DIR=${REPO_DIR}/releases/specs/arm
@@ -56,7 +57,7 @@ update_symlinks() {
 upload() {
 if [[ ${nonetwork} == 0 ]]; then
echo Uploading "$@"
-   rsync -e 'ssh -i /root/.ssh/id_ed25519 -o UserKnownHostsFile=/dev/null 
-o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" 
${UPLOAD_USER}@releng-incoming.gentoo.org:
+   rsync -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o 
VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" 
${UPLOAD_USER}@releng-incoming.gentoo.org:
 else
echo Would now upload "$@"
ls -l $@

diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index 14211166..064e6f41 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -2,6 +2,7 @@
 # self-explanatory.
 
 UPLOAD_USER=arm64
+UPLOAD_KEY=/root/.ssh/id_ed25519
 SPECS_DIR=${REPO_DIR}/releases/specs/arm64
 SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
 
@@ -28,7 +29,7 @@ update_symlinks() {
 }
 
 upload() {
-   rsync -e 'ssh -i /root/.ssh/id_ed25519 -o UserKnownHostsFile=/dev/null 
-o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" 
${UPLOAD_USER}@releng-incoming.gentoo.org:
+   rsync -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o 
VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" 
${UPLOAD_USER}@releng-incoming.gentoo.org:
 }
 
 post_build() {

diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index 135b188c..d2034010 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -2,6 +2,7 @@
 # self-explanatory.
 
 UPLOAD_USER=hppa
+UPLOAD_KEY=/root/.ssh/buildsync.key
 SPECS_DIR=${REPO_DIR}/releases/specs/hppa
 
 SETS="hppa1_1 hppa2_0 hppa_livecd hppa_netboot"
@@ -34,7 +35,7 @@ update_symlinks() {
 }
 
 upload() {
-   rsync -e 'ssh -i /root/.ssh/buildsync.key -o 
UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o 
StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+   rsync -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o 
VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no'

[gentoo-commits] proj/releng:master commit in: tools/

2021-01-31 Thread Matt Turner

commit: 33ce8acb5722cf2f91e81ed918e46cb4f0ef8ffe
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Jan 31 00:41:01 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Jan 31 01:56:43 2021 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=33ce8acb

tools: Use same set of RSYNC_OPTS

Signed-off-by: Matt Turner  gentoo.org>

 tools/catalyst-auto-alpha.conf  | 3 +++
 tools/catalyst-auto-arm.conf| 3 +++
 tools/catalyst-auto-arm64.conf  | 3 +++
 tools/catalyst-auto-hppa.conf   | 3 +++
 tools/catalyst-auto-ia64.conf   | 3 +++
 tools/catalyst-auto-ppc.conf| 3 +++
 tools/catalyst-auto-ppc64le.conf| 3 +++
 tools/catalyst-auto-qemu-arm.conf   | 3 +++
 tools/catalyst-auto-qemu-riscv.conf | 3 +++
 tools/catalyst-auto-s390.conf   | 3 +++
 tools/catalyst-auto-s390x.conf  | 3 +++
 tools/catalyst-auto-sparc64.conf| 3 +++
 12 files changed, 36 insertions(+)

diff --git a/tools/catalyst-auto-alpha.conf b/tools/catalyst-auto-alpha.conf
index 381171b5..6a233900 100644
--- a/tools/catalyst-auto-alpha.conf
+++ b/tools/catalyst-auto-alpha.conf
@@ -44,6 +44,9 @@ upload() {
)
local RSYNC_OPTS=(
-e "${SSH_CMD[*]}"
+   --archive
+   --omit-dir-times
+   --delay-updates
)
rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
 }

diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf
index eaae0399..5c78ab99 100644
--- a/tools/catalyst-auto-arm.conf
+++ b/tools/catalyst-auto-arm.conf
@@ -66,6 +66,9 @@ upload() {
)
local RSYNC_OPTS=(
-e "${SSH_CMD[*]}"
+   --archive
+   --omit-dir-times
+   --delay-updates
)
rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
 else

diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index 1bd94ae9..f1ce7ab1 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -38,6 +38,9 @@ upload() {
)
local RSYNC_OPTS=(
-e "${SSH_CMD[*]}"
+   --archive
+   --omit-dir-times
+   --delay-updates
)
rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
 }

diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index 3b93e4ec..6ba59c81 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -44,6 +44,9 @@ upload() {
)
local RSYNC_OPTS=(
-e "${SSH_CMD[*]}"
+   --archive
+   --omit-dir-times
+   --delay-updates
)
rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
 }

diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index 2d87a837..1d123d2a 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -37,6 +37,9 @@ upload() {
)
local RSYNC_OPTS=(
-e "${SSH_CMD[*]}"
+   --archive
+   --omit-dir-times
+   --delay-updates
)
rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
 }

diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index 615c3f55..61354d22 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -43,6 +43,9 @@ upload() {
)
local RSYNC_OPTS=(
-e "${SSH_CMD[*]}"
+   --archive
+   --omit-dir-times
+   --delay-updates
)
rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
 }

diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
index e2394932..a8e438e1 100644
--- a/tools/catalyst-auto-ppc64le.conf
+++ b/tools/catalyst-auto-ppc64le.conf
@@ -44,6 +44,9 @@ upload() {
)
local RSYNC_OPTS=(
-e "${SSH_CMD[*]}"
+   --archive
+   --omit-dir-times
+   --delay-updates
)
rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
 }

diff --git a/tools/catalyst-auto-qemu-arm.conf 
b/tools/catalyst-auto-qemu-arm.conf
index e6075ec3..68f583ef 100644
--- a/tools/catalyst-auto-qemu-arm.conf
+++ b/tools/catalyst-auto-qemu-arm.conf
@@ -67,6 +67,9 @@ upload() {
)
local RSYNC_OPTS=(
-e "${SSH_CMD[*]}"
+   --archive
+   --omit-dir-times
+   --delay-updates
)
rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
 else

diff --git a/tools/catalyst-auto-qemu-riscv.conf 
b/tools/catalyst-auto-qemu-riscv.conf
index dced8eec..035c0ee7 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -54,6 +54,9 @@ upload() {
)
local RSYNC_OPTS=(

[gentoo-commits] proj/releng:master commit in: tools/

2021-01-31 Thread Matt Turner

commit: e357bcd8673a5e86c152a0e584762a363715a0a8
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Jan 31 00:16:03 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Jan 31 01:56:27 2021 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=e357bcd8

tools: Add SSH_CMD array

Signed-off-by: Matt Turner  gentoo.org>

 tools/catalyst-auto-alpha.conf  | 9 -
 tools/catalyst-auto-amd64.conf  | 9 -
 tools/catalyst-auto-arm.conf| 9 -
 tools/catalyst-auto-arm64.conf  | 9 -
 tools/catalyst-auto-hppa.conf   | 9 -
 tools/catalyst-auto-ia64.conf   | 9 -
 tools/catalyst-auto-ppc.conf| 9 -
 tools/catalyst-auto-ppc64le.conf| 9 -
 tools/catalyst-auto-qemu-arm.conf   | 9 -
 tools/catalyst-auto-qemu-riscv.conf | 9 -
 tools/catalyst-auto-s390.conf   | 9 -
 tools/catalyst-auto-s390x.conf  | 9 -
 tools/catalyst-auto-sparc64.conf| 9 -
 tools/catalyst-auto-x86.conf| 9 -
 14 files changed, 112 insertions(+), 14 deletions(-)

diff --git a/tools/catalyst-auto-alpha.conf b/tools/catalyst-auto-alpha.conf
index a60f979d..ebaff6eb 100644
--- a/tools/catalyst-auto-alpha.conf
+++ b/tools/catalyst-auto-alpha.conf
@@ -35,7 +35,14 @@ update_symlinks() {
 
 upload() {
echo Uploading "$@"
-   rsync -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o 
VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" 
${UPLOAD_USER}@releng-incoming.gentoo.org:
+   local SSH_CMD=(
+   ssh
+   -i ${UPLOAD_KEY}
+   -o UserKnownHostsFile=/dev/null
+   -o VerifyHostKeyDNS=yes
+   -o StrictHostKeyChecking=no
+   )
+   rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
 }
 
 post_build() {

diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 16aeda56..0ef11f2f 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -67,8 +67,15 @@ update_symlinks() {
 
 upload() {
echo " ** Uploading $@"
+   local SSH_CMD=(
+   ssh
+   -i ${UPLOAD_KEY}
+   -o UserKnownHostsFile=/dev/null
+   -o VerifyHostKeyDNS=yes
+   -o StrictHostKeyChecking=no
+   )
rsync \
-   -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o 
VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' \
+   -e "${SSH_CMD[*]}" \
-a \
--omit-dir-times \
--delay-updates \

diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf
index 56459c50..26fe8156 100644
--- a/tools/catalyst-auto-arm.conf
+++ b/tools/catalyst-auto-arm.conf
@@ -57,7 +57,14 @@ update_symlinks() {
 upload() {
 if [[ ${nonetwork} == 0 ]]; then
echo Uploading "$@"
-   rsync -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o 
VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" 
${UPLOAD_USER}@releng-incoming.gentoo.org:
+   local SSH_CMD=(
+   ssh
+   -i ${UPLOAD_KEY}
+   -o UserKnownHostsFile=/dev/null
+   -o VerifyHostKeyDNS=yes
+   -o StrictHostKeyChecking=no
+   )
+   rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
 else
echo Would now upload "$@"
ls -l $@

diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index 064e6f41..9f457989 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -29,7 +29,14 @@ update_symlinks() {
 }
 
 upload() {
-   rsync -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o 
VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" 
${UPLOAD_USER}@releng-incoming.gentoo.org:
+   local SSH_CMD=(
+   ssh
+   -i ${UPLOAD_KEY}
+   -o UserKnownHostsFile=/dev/null
+   -o VerifyHostKeyDNS=yes
+   -o StrictHostKeyChecking=no
+   )
+   rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
 }
 
 post_build() {

diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index d2034010..8b465421 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -35,7 +35,14 @@ update_symlinks() {
 }
 
 upload() {
-   rsync -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o 
VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" 
${UPLOAD_USER}@releng-incoming.gentoo.org:
+   local SSH_CMD=(
+   ssh
+   -i ${UPLOAD_KEY}
+   -o UserKnownHostsFile=/dev/null
+   -o VerifyHostKeyDNS=yes
+   -o StrictHostKeyChecking=no
+   )
+   rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
 }
 
 post_build() {

diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index 845ffc51..6c78c8a

[gentoo-commits] proj/sci:master commit in: sci-biology/afni/files/

2021-01-31 Thread Horea Christian

commit: dad08138c6043026d67cf7e54b610a084a9e6780
Author: Horea Christian  chymera  eu>
AuthorDate: Mon Feb  1 03:52:44 2021 +
Commit: Horea Christian  gmail  com>
CommitDate: Mon Feb  1 03:52:44 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=dad08138

sci-biology/afni: added missing patch file

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Horea Christian  chymera.eu>

 sci-biology/afni/files/afni-20.3.03-python.patch | 11 +++
 1 file changed, 11 insertions(+)

diff --git a/sci-biology/afni/files/afni-20.3.03-python.patch 
b/sci-biology/afni/files/afni-20.3.03-python.patch
new file mode 100644
index 0..24ed98405
--- /dev/null
+++ b/sci-biology/afni/files/afni-20.3.03-python.patch
@@ -0,0 +1,11 @@
+--- a/other_builds/Makefile.linux_fedora_19_64  2020-10-09 
07:07:58.348874414 -0400
 b/other_builds/Makefile.linux_fedora_19_64 2020-10-10 01:15:22.337755934 
-0400
+@@ -11,8 +11,6 @@
+
+ # --
+ # python from C
+-IPYTHON  = -DSELENIUM_READY -I/usr/include/python2.7
+-LDPYTHON = -lpython2.7
+
+ # --
+ # X configuration

[gentoo-commits] repo/gentoo:master commit in: dev-util/idea-community/

2021-01-31 Thread Alice Ferrazzi

commit: 356127da3eec2ca937c573a63f0b13d3a304f625
Author: Alice Ferrazzi  gentoo  org>
AuthorDate: Mon Feb  1 03:29:08 2021 +
Commit: Alice Ferrazzi  gentoo  org>
CommitDate: Mon Feb  1 03:32:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=356127da

Removing myself as maintainer for idea-community

Package-Manager: Portage-2.3.89, Repoman-2.3.23
Signed-off-by: Alice Ferrazzi  gentoo.org>

 dev-util/idea-community/metadata.xml | 4 
 1 file changed, 4 deletions(-)

diff --git a/dev-util/idea-community/metadata.xml 
b/dev-util/idea-community/metadata.xml
index 3642c1e6927..13775082386 100644
--- a/dev-util/idea-community/metadata.xml
+++ b/dev-util/idea-community/metadata.xml
@@ -5,10 +5,6 @@
mpag...@gentoo.org
Mike Pagano

-   
-   ali...@gentoo.org
-   Ferrazzi Alice
-   

Excel at enterprise, mobile and web development with Java, Scala and 
Groovy, with all the latest modern technologies and frameworks available out of 
the box.

[gentoo-commits] repo/gentoo:master commit in: media-libs/libmp3splt/

2021-01-31 Thread Sam James

commit: 8ddab1d5c32ab11949787b76301e061c97c04044
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb  1 03:13:13 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb  1 03:13:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ddab1d5

media-libs/libmp3splt: Stabilize 0.9.2-r2 amd64, #672784

Signed-off-by: Sam James  gentoo.org>

 media-libs/libmp3splt/libmp3splt-0.9.2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libmp3splt/libmp3splt-0.9.2-r2.ebuild 
b/media-libs/libmp3splt/libmp3splt-0.9.2-r2.ebuild
index 32c19c64fdb..824f197b30d 100644
--- a/media-libs/libmp3splt/libmp3splt-0.9.2-r2.ebuild
+++ b/media-libs/libmp3splt/libmp3splt-0.9.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN:3}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc flac pcre"
 
 RDEPEND="

[gentoo-commits] proj/sci:master commit in: sci-biology/last/

2021-01-31 Thread Horea Christian

commit: 6c8fb90998dcb9570df323291eae7eebb1086d37
Author: Horea Christian  chymera  eu>
AuthorDate: Mon Feb  1 03:10:57 2021 +
Commit: Horea Christian  gmail  com>
CommitDate: Mon Feb  1 03:10:57 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=6c8fb909

sci-biology/last: EAPI and PYTHON_COMPAT bump

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Horea Christian  chymera.eu>

 sci-biology/last/last-852.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sci-biology/last/last-852.ebuild b/sci-biology/last/last-852.ebuild
index b063550b3..ed21ba097 100644
--- a/sci-biology/last/last-852.ebuild
+++ b/sci-biology/last/last-852.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{2_7,3_7} )
 
 inherit toolchain-funcs python-single-r1

[gentoo-commits] proj/sci:master commit in: sci-physics/elk/

2021-01-31 Thread Horea Christian

commit: eb9b02cb123bd4e5e20bf9d0e3a783968e325a06
Author: Horea Christian  chymera  eu>
AuthorDate: Mon Feb  1 02:57:12 2021 +
Commit: Horea Christian  gmail  com>
CommitDate: Mon Feb  1 02:57:12 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=eb9b02cb

sci-physics/elk: dropped broken package with deprecated versions

Signed-off-by: Horea Christian  chymera.eu>

 sci-physics/elk/elk-1.4.22.ebuild | 110 --
 sci-physics/elk/elk-2.1.25.ebuild | 136 --
 sci-physics/elk/metadata.xml  |  25 ---
 3 files changed, 271 deletions(-)

diff --git a/sci-physics/elk/elk-1.4.22.ebuild 
b/sci-physics/elk/elk-1.4.22.ebuild
deleted file mode 100644
index daa3d4f53..0
--- a/sci-physics/elk/elk-1.4.22.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic fortran-2 multilib toolchain-funcs
-
-DESCRIPTION="All-electron full-potential linearised augmented-plane wave 
(FP-LAPW)"
-HOMEPAGE="http://elk.sourceforge.net/";
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="-debug lapack libxc mpi openmp perl test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-   lapack? (
-   virtual/blas
-   virtual/lapack )
-   libxc? ( >=sci-libs/libxc-1.2.0-r1[fortran] )
-   mpi? ( virtual/mpi )"
-DEPEND="${RDEPEND}
-   perl? ( dev-lang/perl )
-   virtual/pkgconfig"
-
-DOCS=( README  )
-
-FORTRAN_STANDARD=90
-
-pkg_setup() {
-   # fortran-2.eclass does not handle mpi wrappers
-   if use mpi; then
-   export FC="mpif90"
-   export F77="mpif77"
-   export CC="mpicc"
-   export CXX="mpic++"
-   else
-   tc-export FC F77 CC CXX
-   fi
-
-   use openmp && FORTRAN_NEED_OPENMP=1
-
-   fortran-2_pkg_setup
-
-   use openmp && append-flags -fopenmp
-}
-
-src_prepare() {
-   rm -rf src/{BLAS,LAPACK} || die
-   if use libxc; then
-   sed -i -e's/^\(SRC_libxc =\)/#\1/' "${S}/src/Makefile" || die
-   fi
-   if use mpi; then
-   sed -i -e's/^\(SRC_mpi =\)/#\1/' "${S}/src/Makefile" || die
-   fi
-
-   sed \
-   -e "s: -o : ${LDFLAGS} -o :g" \
-   -i src/{,eos,spacegroup}/Makefile || die
-}
-
-src_configure() {
-   append-fflags -I/usr/include -I/usr/$(get_libdir)/finclude
-
-   cat > make.inc <<- EOF
-   MAKE = make
-   F90 = $(tc-getFC)
-   F90_OPTS = ${FCFLAGS}
-   F77 = $(tc-getF77)
-   F77_OPTS = ${FFLAGS}
-   CC = $(tc-getCC)
-   CXX = $(tc-getCXX)
-   CFLAGS = ${CFLAGS}
-   CXXFLAGS = ${CXXFLAGS}
-   LD = $(tc-getLD)
-   AR = $(tc-getAR)
-   LIB_SYS =
-   LIB_LPK = $($(tc-getPKG_CONFIG) --libs lapack)
-   LIB_FFT = fftlib.a
-   EOF
-
-   if use libxc; then
-   echo "LIB_XC = -L/usr/$(get_libdir) -lxc" >> make.inc
-   echo "SRC_libxc = libxc_funcs.f90 libxc.f90 libxcifc.f90" 
>>make.inc
-   fi
-}
-
-MAKEOPTS+=" -j1"
-
-src_compile() {
-   emake -C src fft
-   emake -C src elk
-   emake -C src/eos
-   emake -C src/spacegroup
-}
-
-src_install() {
-   dobin src/elk src/protex src/eos/eos src/spacegroup/spacegroup
-   dobin utilities/elk-bands
-   use perl && dobin utilities/xps_exc.pl utilities/se.pl
-   dodoc README
-   for doc in docs/*; do
-   dodoc $doc
-   done
-   insinto /usr/share/${P}
-   doins -r species utilities examples tests
-}

diff --git a/sci-physics/elk/elk-2.1.25.ebuild 
b/sci-physics/elk/elk-2.1.25.ebuild
deleted file mode 100644
index cef46a976..0
--- a/sci-physics/elk/elk-2.1.25.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils flag-o-matic fortran-2 multilib toolchain-funcs python-single-r1
-
-DESCRIPTION="All-electron full-potential linearised augmented-plane wave 
(FP-LAPW)"
-HOMEPAGE="http://elk.sourceforge.net/";
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="-debug lapack libxc mpi openmp perl python test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-   lapack? (
-   virtual/blas
-   virtual/lapack )
-   libxc? ( >=sci-libs/libxc-1.2.0-r1[fortran] )
-   perl? ( dev-lang/perl )
-   python? ( ${PYTHON_DEPS} )
-   mpi? ( virtual/mpi )"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig"
-
-DOCS=( README  )
-
-FORTRAN_STANDARD=90
-
-pkg_setup() {
-   # fortran-2.eclass does not handle mpi wrappers
-   if use mpi; then
-   export FC="mpif90"
-   export

[gentoo-commits] proj/sci:master commit in: dev-lang/conceptual/

2021-01-31 Thread Horea Christian

commit: a8e11ea716240f47e8cd445ca3719935b346fdf2
Author: Horea Christian  chymera  eu>
AuthorDate: Mon Feb  1 02:42:56 2021 +
Commit: Horea Christian  gmail  com>
CommitDate: Mon Feb  1 02:42:56 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=a8e11ea7

dev-lang/conceptual: PYTHON_COMPAT bump

untested due to broken dep:
https://github.com/gentoo/sci/issues/1048

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Horea Christian  chymera.eu>

 dev-lang/conceptual/conceptual-1.5.1b.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/conceptual/conceptual-1.5.1b.ebuild 
b/dev-lang/conceptual/conceptual-1.5.1b.ebuild
index d2e6046d2..e5a297155 100644
--- a/dev-lang/conceptual/conceptual-1.5.1b.ebuild
+++ b/dev-lang/conceptual/conceptual-1.5.1b.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{2_7,3_7} )
 JAVA_PKG_OPT_USE="gui"
 
 inherit java-pkg-opt-2 python-single-r1

[gentoo-commits] repo/gentoo:master commit in: gui-libs/display-manager-init/

2021-01-31 Thread Sam James

commit: 5ab06fee81c35dc8f9e981d9e1086fcf40a4254f
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb  1 02:28:42 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb  1 02:28:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ab06fee

gui-libs/display-manager-init: mark ALLARCHES

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 gui-libs/display-manager-init/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gui-libs/display-manager-init/metadata.xml 
b/gui-libs/display-manager-init/metadata.xml
index 7a7bbf81054..303dfce27f8 100644
--- a/gui-libs/display-manager-init/metadata.xml
+++ b/gui-libs/display-manager-init/metadata.xml
@@ -5,4 +5,5 @@
x...@gentoo.org
X11

+

[gentoo-commits] repo/gentoo:master commit in: dev-util/pkgcheck/

2021-01-31 Thread Sam James

commit: ced53e1bbff9a8b6113c09843420e56b4ffbf916
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb  1 02:24:33 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb  1 02:24:33 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ced53e1b

dev-util/pkgcheck: ~x64-macos keyworded

Bug: https://bugs.gentoo.org/768126
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 dev-util/pkgcheck/pkgcheck-0.8.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/pkgcheck/pkgcheck-0.8.1.ebuild 
b/dev-util/pkgcheck/pkgcheck-0.8.1.ebuild
index 153cd35575d..c9026b71e0d 100644
--- a/dev-util/pkgcheck/pkgcheck-0.8.1.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.8.1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == * ]] ; then
EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git";
inherit git-r3
 else
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="~amd64 ~x86 ~x64-macos"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi

[gentoo-commits] repo/gentoo:master commit in: dev-util/pkgcheck/

2021-01-31 Thread Sam James

commit: 8adda5dd780c4cf7c9cb0a477b9d2452f759422b
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb  1 02:20:53 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb  1 02:20:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8adda5dd

dev-util/pkgcheck: drop keywords where no dev-python/tree-sitter

Bug: https://bugs.gentoo.org/768126
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 dev-util/pkgcheck/pkgcheck-0.8.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/pkgcheck/pkgcheck-0.8.1.ebuild 
b/dev-util/pkgcheck/pkgcheck-0.8.1.ebuild
index 8f19d233835..153cd35575d 100644
--- a/dev-util/pkgcheck/pkgcheck-0.8.1.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.8.1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == * ]] ; then
EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git";
inherit git-r3
 else
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 
~sparc ~x86 ~x64-macos"
+   KEYWORDS="~amd64 ~x86"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi

[gentoo-commits] proj/hardened-refpolicy:master commit in: gentoo/

2021-01-31 Thread Jason Zaman

commit: 2e7c40d97c294c20e6cf359c4afef08089bdc388
Author: Jason Zaman  gentoo  org>
AuthorDate: Mon Feb  1 01:21:09 2021 +
Commit: Jason Zaman  gentoo  org>
CommitDate: Mon Feb  1 01:21:42 2021 +
URL:
https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=2e7c40d9

Merge upstream

Signed-off-by: Jason Zaman  gentoo.org>

 gentoo/STATE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gentoo/STATE b/gentoo/STATE
index bc102696..053066d7 100644
--- a/gentoo/STATE
+++ b/gentoo/STATE
@@ -1 +1 @@
-main 26ed37c9917d3640630fa27ec402b8efb52d9c79
+main 072c0a945865b1df3116b0c6f6c3aef7061a6049

[gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/services/

2021-01-31 Thread Jason Zaman

commit: 9531f15d3e4ddcd2dd55283bc3a303dbb3c547e1
Author: Chris PeBenito  ieee  org>
AuthorDate: Thu Jan 28 19:57:19 2021 +
Commit: Jason Zaman  gentoo  org>
CommitDate: Mon Feb  1 01:21:42 2021 +
URL:
https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=9531f15d

samba: Fix lint error.

Signed-off-by: Chris PeBenito  ieee.org>
Signed-off-by: Jason Zaman  gentoo.org>

 policy/modules/services/samba.te | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/policy/modules/services/samba.te b/policy/modules/services/samba.te
index 9f8ef0f1..9c21f473 100644
--- a/policy/modules/services/samba.te
+++ b/policy/modules/services/samba.te
@@ -203,7 +203,7 @@ allow samba_net_t self:capability { dac_override 
dac_read_search sys_chroot sys_
 allow samba_net_t self:capability2 block_suspend;
 allow samba_net_t self:process { sigkill getsched setsched };
 allow samba_net_t self:unix_stream_socket { accept listen };
-allow samba_net_t self:fifo_file rw_file_perms;
+allow samba_net_t self:fifo_file rw_inherited_fifo_file_perms;
 
 allow samba_net_t samba_etc_t:file read_file_perms;

[gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/services/

2021-01-31 Thread Jason Zaman

commit: a7b3815e4094fbd2026df9993962d57b41493e90
Author: Chris PeBenito  ieee  org>
AuthorDate: Thu Jan 28 20:28:06 2021 +
Commit: Jason Zaman  gentoo  org>
CommitDate: Mon Feb  1 01:21:42 2021 +
URL:
https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=a7b3815e

pacemaker: Module version bump.

Signed-off-by: Chris PeBenito  ieee.org>
Signed-off-by: Jason Zaman  gentoo.org>

 policy/modules/services/pacemaker.te | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/policy/modules/services/pacemaker.te 
b/policy/modules/services/pacemaker.te
index d69b5d9c..eee432f3 100644
--- a/policy/modules/services/pacemaker.te
+++ b/policy/modules/services/pacemaker.te
@@ -1,4 +1,4 @@
-policy_module(pacemaker, 1.6.2)
+policy_module(pacemaker, 1.6.3)
 
 
 #

[gentoo-commits] proj/hardened-refpolicy:master commit in: config/

2021-01-31 Thread Jason Zaman

commit: 87f914f8e84b754af3ee9c9ebfdb7d831246bd36
Author: Kenton Groombridge  concord  sh>
AuthorDate: Thu Jan 28 20:21:44 2021 +
Commit: Jason Zaman  gentoo  org>
CommitDate: Mon Feb  1 01:21:42 2021 +
URL:
https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=87f914f8

init: label systemd units in /etc

Signed-off-by: Kenton Groombridge  concord.sh>
Signed-off-by: Jason Zaman  gentoo.org>

 config/file_contexts.subs_dist | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/file_contexts.subs_dist b/config/file_contexts.subs_dist
index b374c9aa..b7e008f1 100644
--- a/config/file_contexts.subs_dist
+++ b/config/file_contexts.subs_dist
@@ -15,6 +15,7 @@
 /libx32 /usr/lib
 /sbin /usr/sbin
 /etc/init.d /etc/rc.d/init.d
+/etc/systemd/system /usr/lib/systemd/system
 /lib/systemd /usr/lib/systemd
 /run/lock /var/lock
 /usr/lib32 /usr/lib

[gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/services/, policy/modules/admin/

2021-01-31 Thread Jason Zaman

commit: 79df140f318c01af4a7c976194cf72b6a01fd87d
Author: Chris PeBenito  ieee  org>
AuthorDate: Thu Jan 28 20:27:03 2021 +
Commit: Jason Zaman  gentoo  org>
CommitDate: Mon Feb  1 01:21:42 2021 +
URL:
https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=79df140f

sudo, spamassassin: Module version bump.

Signed-off-by: Chris PeBenito  ieee.org>
Signed-off-by: Jason Zaman  gentoo.org>

 policy/modules/admin/sudo.te| 2 +-
 policy/modules/services/spamassassin.te | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/policy/modules/admin/sudo.te b/policy/modules/admin/sudo.te
index 2ac111d6..418af9ad 100644
--- a/policy/modules/admin/sudo.te
+++ b/policy/modules/admin/sudo.te
@@ -1,4 +1,4 @@
-policy_module(sudo, 1.15.0)
+policy_module(sudo, 1.15.1)
 
 ## 
 ## 

diff --git a/policy/modules/services/spamassassin.te 
b/policy/modules/services/spamassassin.te
index 9f0ebb41..4738375f 100644
--- a/policy/modules/services/spamassassin.te
+++ b/policy/modules/services/spamassassin.te
@@ -1,4 +1,4 @@
-policy_module(spamassassin, 2.14.1)
+policy_module(spamassassin, 2.14.2)
 
 
 #

[gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/apps/, policy/modules/system/

2021-01-31 Thread Jason Zaman

commit: aca741873cf293fc54247ea147c4fae4e62929b8
Author: Chris PeBenito  ieee  org>
AuthorDate: Fri Jan 29 13:35:12 2021 +
Commit: Jason Zaman  gentoo  org>
CommitDate: Mon Feb  1 01:21:42 2021 +
URL:
https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=aca74187

userdomain, gpg: Module version bump.

Signed-off-by: Chris PeBenito  ieee.org>
Signed-off-by: Jason Zaman  gentoo.org>

 policy/modules/apps/gpg.te  | 2 +-
 policy/modules/system/userdomain.te | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/policy/modules/apps/gpg.te b/policy/modules/apps/gpg.te
index 376e1a9f..608575be 100644
--- a/policy/modules/apps/gpg.te
+++ b/policy/modules/apps/gpg.te
@@ -1,4 +1,4 @@
-policy_module(gpg, 2.17.1)
+policy_module(gpg, 2.17.2)
 
 
 #

diff --git a/policy/modules/system/userdomain.te 
b/policy/modules/system/userdomain.te
index d17f3c81..034f6af5 100644
--- a/policy/modules/system/userdomain.te
+++ b/policy/modules/system/userdomain.te
@@ -1,4 +1,4 @@
-policy_module(userdomain, 4.20.6)
+policy_module(userdomain, 4.20.7)
 
 
 #

[gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/admin/

2021-01-31 Thread Jason Zaman

commit: 21ac5d4937112c4cca29d52c36c91b240c2abb5f
Author: Kenton Groombridge  concord  sh>
AuthorDate: Tue Jan 26 23:08:54 2021 +
Commit: Jason Zaman  gentoo  org>
CommitDate: Mon Feb  1 01:21:42 2021 +
URL:
https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=21ac5d49

sudo: add tunable for HTTP connections

Signed-off-by: Kenton Groombridge  concord.sh>
Signed-off-by: Jason Zaman  gentoo.org>

 policy/modules/admin/sudo.te | 15 +++
 1 file changed, 15 insertions(+)

diff --git a/policy/modules/admin/sudo.te b/policy/modules/admin/sudo.te
index 2cebeef7..2ac111d6 100644
--- a/policy/modules/admin/sudo.te
+++ b/policy/modules/admin/sudo.te
@@ -1,5 +1,16 @@
 policy_module(sudo, 1.15.0)
 
+## 
+## 
+## Determine whether all sudo domains
+## can connect to TCP HTTP ports. This
+## is needed if an additional authentication
+## mechanism via an HTTP server is
+## required for users to use sudo.
+## 
+## 
+gen_tunable(sudo_all_tcp_connect_http_port, false)
+
 
 #
 # Declarations
@@ -7,3 +18,7 @@ attribute sudodomain;
 
 type sudo_exec_t;
 application_executable_file(sudo_exec_t)
+
+tunable_policy(`sudo_all_tcp_connect_http_port',`
+   corenet_tcp_connect_http_port(sudodomain)
+')

[gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/system/, policy/modules/apps/

2021-01-31 Thread Jason Zaman

commit: 82dbbae293b2fe9a7a5f85590ea17dc1916ee529
Author: Dave Sugar  tresys  com>
AuthorDate: Thu Jan 28 22:13:57 2021 +
Commit: Jason Zaman  gentoo  org>
CommitDate: Mon Feb  1 01:21:42 2021 +
URL:
https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=82dbbae2

Work with xdg module disabled

These two cases I see when building on a system without graphical interface.
Move userdom_xdg_user_template into optional block
gpg module doesn't require a graphical front end, move xdg_read_data_files into 
optional block

Signed-off-by: Dave Sugar  tresys.com>
Signed-off-by: Jason Zaman  gentoo.org>

 policy/modules/apps/gpg.te  | 6 --
 policy/modules/system/userdomain.if | 8 +---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/policy/modules/apps/gpg.te b/policy/modules/apps/gpg.te
index cfdb685a..376e1a9f 100644
--- a/policy/modules/apps/gpg.te
+++ b/policy/modules/apps/gpg.te
@@ -359,8 +359,6 @@ miscfiles_read_localization(gpg_pinentry_t)
 
 userdom_use_user_terminals(gpg_pinentry_t)
 
-xdg_read_data_files(gpg_pinentry_t)
-
 tunable_policy(`use_nfs_home_dirs',`
fs_read_nfs_files(gpg_pinentry_t)
 ')
@@ -382,6 +380,10 @@ optional_policy(`
pulseaudio_run(gpg_pinentry_t, gpg_pinentry_roles)
 ')
 
+optional_policy(`
+   xdg_read_data_files(gpg_pinentry_t)
+')
+
 optional_policy(`
xserver_user_x_domain_template(gpg_pinentry, gpg_pinentry_t, 
gpg_pinentry_tmpfs_t)
 ')

diff --git a/policy/modules/system/userdomain.if 
b/policy/modules/system/userdomain.if
index 01135696..e14bdc01 100644
--- a/policy/modules/system/userdomain.if
+++ b/policy/modules/system/userdomain.if
@@ -1194,9 +1194,6 @@ template(`userdom_unpriv_user_template', `
fs_exec_noxattr($1_t)
')
 
-   # Allow users to manage xdg content in their home directories
-   userdom_xdg_user_template($1)
-
# Allow users to run TCP servers (bind to ports and accept connection 
from
# the same domain and outside users) disabling this forces FTP passive 
mode
# and may change other protocols
@@ -1239,6 +1236,11 @@ template(`userdom_unpriv_user_template', `
systemd_write_inherited_logind_inhibit_pipes($1_t)
')
 
+   # Allow users to manage xdg content in their home directories
+   optional_policy(`
+   userdom_xdg_user_template($1)
+   ')
+
# Allow controlling usbguard
optional_policy(`
tunable_policy(`usbguard_user_modify_rule_files',`

[gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/admin/, policy/modules/services/, policy/modules/system/

2021-01-31 Thread Jason Zaman

commit: 56d8835e88a2d97f33e8ed66fa8914979378b9c6
Author: Chris PeBenito  ieee  org>
AuthorDate: Thu Jan 28 16:39:49 2021 +
Commit: Jason Zaman  gentoo  org>
CommitDate: Mon Feb  1 01:21:42 2021 +
URL:
https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=56d8835e

various: Module version bump.

Signed-off-by: Chris PeBenito  ieee.org>
Signed-off-by: Jason Zaman  gentoo.org>

 policy/modules/admin/netutils.te | 2 +-
 policy/modules/services/apache.te| 2 +-
 policy/modules/services/aptcacher.te | 2 +-
 policy/modules/services/bind.te  | 2 +-
 policy/modules/services/colord.te| 2 +-
 policy/modules/services/cron.te  | 2 +-
 policy/modules/services/cups.te  | 2 +-
 policy/modules/services/devicekit.te | 2 +-
 policy/modules/services/dkim.te  | 2 +-
 policy/modules/services/entropyd.te  | 2 +-
 policy/modules/services/fail2ban.te  | 2 +-
 policy/modules/services/jabber.te| 2 +-
 policy/modules/services/l2tp.te  | 2 +-
 policy/modules/services/mailman.te   | 2 +-
 policy/modules/services/mon.te   | 2 +-
 policy/modules/services/mysql.te | 2 +-
 policy/modules/services/openvpn.te   | 2 +-
 policy/modules/services/postgrey.te  | 2 +-
 policy/modules/services/rpc.te   | 2 +-
 policy/modules/services/samba.te | 2 +-
 policy/modules/services/smartmon.te  | 2 +-
 policy/modules/services/squid.te | 2 +-
 policy/modules/services/tor.te   | 2 +-
 policy/modules/services/watchdog.te  | 2 +-
 policy/modules/services/xserver.te   | 2 +-
 policy/modules/system/sysnetwork.te  | 2 +-
 26 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/policy/modules/admin/netutils.te b/policy/modules/admin/netutils.te
index 1a0d3d7b..c4fc0286 100644
--- a/policy/modules/admin/netutils.te
+++ b/policy/modules/admin/netutils.te
@@ -1,4 +1,4 @@
-policy_module(netutils, 1.20.1)
+policy_module(netutils, 1.20.2)
 
 
 #

diff --git a/policy/modules/services/apache.te 
b/policy/modules/services/apache.te
index 35fafe56..229848c0 100644
--- a/policy/modules/services/apache.te
+++ b/policy/modules/services/apache.te
@@ -1,4 +1,4 @@
-policy_module(apache, 2.19.2)
+policy_module(apache, 2.19.3)
 
 
 #

diff --git a/policy/modules/services/aptcacher.te 
b/policy/modules/services/aptcacher.te
index d9089a77..fa3b2dd0 100644
--- a/policy/modules/services/aptcacher.te
+++ b/policy/modules/services/aptcacher.te
@@ -1,4 +1,4 @@
-policy_module(aptcacher, 1.1.0)
+policy_module(aptcacher, 1.1.1)
 
 
 #

diff --git a/policy/modules/services/bind.te b/policy/modules/services/bind.te
index 57ae7be3..11949946 100644
--- a/policy/modules/services/bind.te
+++ b/policy/modules/services/bind.te
@@ -1,4 +1,4 @@
-policy_module(bind, 1.22.2)
+policy_module(bind, 1.22.3)
 
 
 #

diff --git a/policy/modules/services/colord.te 
b/policy/modules/services/colord.te
index ca035d5e..c41d827b 100644
--- a/policy/modules/services/colord.te
+++ b/policy/modules/services/colord.te
@@ -1,4 +1,4 @@
-policy_module(colord, 1.6.1)
+policy_module(colord, 1.6.2)
 
 
 #

diff --git a/policy/modules/services/cron.te b/policy/modules/services/cron.te
index c4342f05..23e990ad 100644
--- a/policy/modules/services/cron.te
+++ b/policy/modules/services/cron.te
@@ -1,4 +1,4 @@
-policy_module(cron, 2.18.3)
+policy_module(cron, 2.18.4)
 
 gen_require(`
class passwd rootok;

diff --git a/policy/modules/services/cups.te b/policy/modules/services/cups.te
index f6e4a0e6..b6d8d41c 100644
--- a/policy/modules/services/cups.te
+++ b/policy/modules/services/cups.te
@@ -1,4 +1,4 @@
-policy_module(cups, 1.25.2)
+policy_module(cups, 1.25.3)
 
 
 #

diff --git a/policy/modules/services/devicekit.te 
b/policy/modules/services/devicekit.te
index 25f93898..feff1026 100644
--- a/policy/modules/services/devicekit.te
+++ b/policy/modules/services/devicekit.te
@@ -1,4 +1,4 @@
-policy_module(devicekit, 1.13.2)
+policy_module(devicekit, 1.13.3)
 
 
 #

diff --git a/policy/modules/services/dkim.te b/policy/modules/services/dkim.te
index 864d5b07..0b111b46 100644
--- a/policy/modules/services/dkim.te
+++ b/policy/modules/services/dkim.te
@@ -1,4 +1,4 @@
-policy_module(dkim, 1.8.0)
+policy_module(dkim, 1.8.1)
 
 
 #

diff --git a/policy/modules/services/entropyd.te 
b/policy/modules/services/entropyd.te
index f2405692..c46f0445 100644
--- a/policy/modules/services/entropyd.te
+++ b/policy/modules/services/entropyd.te
@@ -1,4 +1,4 @@
-policy_module(entropyd, 1.14.1)
+policy_module(entropyd, 1.14.2)
 
 
 #

diff --git a/policy/modules/services/fail2ban.te 
b/policy/modules/services/fail2ban.te
index 1e97cdfa..640905d4 100644
--- a/policy/modules/services/

[gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/services/

2021-01-31 Thread Jason Zaman

commit: 85682039cf3239aa4e8ba7c4300d6fdab463155f
Author: Dave Sugar  tresys  com>
AuthorDate: Wed Jan 27 18:29:36 2021 +
Commit: Jason Zaman  gentoo  org>
CommitDate: Mon Feb  1 01:21:42 2021 +
URL:
https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=85682039

pcs_snmpd_agent_t fix denials to allow it to read needed queues

Jan 27 18:16:51 audispd: node=virtual type=AVC msg=audit(1611771411.553:9337): 
avc:  denied  { search } for  pid=13880 comm="cibadmin" 
name="qb-6671-13880-13-bRhDEX" dev="tmpfs" ino=88809 
scontext=system_u:system_r:pcs_snmp_agent_t:s0 
tcontext=system_u:object_r:pacemaker_tmpfs_t:s0 tclass=dir permissive=0
Jan 27 19:53:46 audispd: node=virtual type=AVC msg=audit(1611777226.144:25975): 
avc:  denied  { getattr } for  pid=29489 comm="systemctl" name="/" dev="tmpfs" 
ino=14072 scontext=system_u:system_r:pcs_snmp_agent_t:s0 
tcontext=system_u:object_r:tmpfs_t:s0 tclass=filesystem permissive=0

Signed-off-by: Dave Sugar  tresys.com>
Signed-off-by: Jason Zaman  gentoo.org>

 policy/modules/services/pacemaker.te | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/policy/modules/services/pacemaker.te 
b/policy/modules/services/pacemaker.te
index fc934bc7..d69b5d9c 100644
--- a/policy/modules/services/pacemaker.te
+++ b/policy/modules/services/pacemaker.te
@@ -160,12 +160,13 @@ logging_log_filetrans(pcs_snmp_agent_t, 
pcs_snmp_agent_log_t, file)
 
 read_files_pattern(pcs_snmp_agent_t, pacemaker_t, pacemaker_t)
 stream_connect_pattern(pcs_snmp_agent_t, pacemaker_t, pacemaker_t, pacemaker_t)
-allow pcs_snmp_agent_t pacemaker_tmpfs_t:file mmap_rw_file_perms;
+mmap_rw_files_pattern(pcs_snmp_agent_t, pacemaker_tmpfs_t, pacemaker_tmpfs_t)
 
 corecmd_exec_bin(pcs_snmp_agent_t)
 
 files_read_usr_files(pcs_snmp_agent_t)
 
+fs_getattr_tmpfs(pcs_snmp_agent_t)
 fs_list_cgroup_dirs(pcs_snmp_agent_t)
 fs_read_cgroup_files(pcs_snmp_agent_t)

[gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/admin/, policy/modules/system/, policy/modules/services/

2021-01-31 Thread Jason Zaman

commit: 9ac5cf61e3dde52271310da0fea9a4210c744927
Author: Russell Coker  coker  com  au>
AuthorDate: Wed Jan 27 17:20:35 2021 +
Commit: Jason Zaman  gentoo  org>
CommitDate: Mon Feb  1 01:21:42 2021 +
URL:
https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=9ac5cf61

misc network patches with Dominick's changes*2

I think this one is good for merging now.

Signed-off-by: Russell Coker  coker.com.au>
Signed-off-by: Jason Zaman  gentoo.org>

 policy/modules/admin/netutils.te|  5 ++-
 policy/modules/services/dkim.te |  1 +
 policy/modules/services/mailman.te  |  1 +
 policy/modules/services/mon.te  |  3 ++
 policy/modules/services/samba.if| 76 +
 policy/modules/system/sysnetwork.fc |  1 +
 policy/modules/system/sysnetwork.te | 20 ++
 7 files changed, 106 insertions(+), 1 deletion(-)

diff --git a/policy/modules/admin/netutils.te b/policy/modules/admin/netutils.te
index 06a64a3e..1a0d3d7b 100644
--- a/policy/modules/admin/netutils.te
+++ b/policy/modules/admin/netutils.te
@@ -109,6 +109,7 @@ allow ping_t self:tcp_socket create_socket_perms;
 allow ping_t self:rawip_socket { create ioctl read write bind getopt setopt 
getattr };
 allow ping_t self:packet_socket { create ioctl read write bind getopt setopt };
 allow ping_t self:netlink_route_socket create_netlink_socket_perms;
+allow ping_t self:icmp_socket create;
 
 corenet_all_recvfrom_netlabel(ping_t)
 corenet_sendrecv_icmp_packets(ping_t)
@@ -156,13 +157,14 @@ allow traceroute_t self:capability { net_admin net_raw 
setgid setuid };
 allow traceroute_t self:fifo_file rw_inherited_fifo_file_perms;
 allow traceroute_t self:process signal;
 allow traceroute_t self:rawip_socket create_socket_perms;
-allow traceroute_t self:packet_socket create_socket_perms;
+allow traceroute_t self:packet_socket { map create_socket_perms };
 allow traceroute_t self:udp_socket create_socket_perms;
 
 can_exec(traceroute_t, traceroute_exec_t)
 
 kernel_read_system_state(traceroute_t)
 kernel_read_network_state(traceroute_t)
+kernel_search_fs_sysctls(traceroute_t)
 
 corecmd_search_bin(traceroute_t)
 
@@ -197,6 +199,7 @@ auth_use_nsswitch(traceroute_t)
 
 logging_send_syslog_msg(traceroute_t)
 
+miscfiles_read_generic_certs(traceroute_t)
 miscfiles_read_localization(traceroute_t)
 
 userdom_use_inherited_user_terminals(traceroute_t)

diff --git a/policy/modules/services/dkim.te b/policy/modules/services/dkim.te
index e744f3d7..864d5b07 100644
--- a/policy/modules/services/dkim.te
+++ b/policy/modules/services/dkim.te
@@ -35,6 +35,7 @@ kernel_read_vm_overcommit_sysctl(dkim_milter_t)
 
 corenet_udp_bind_generic_node(dkim_milter_t)
 corenet_udp_bind_all_unreserved_ports(dkim_milter_t)
+corenet_udp_bind_generic_port(dkim_milter_t)
 
 dev_read_urand(dkim_milter_t)
 # for cpu/online

diff --git a/policy/modules/services/mailman.te 
b/policy/modules/services/mailman.te
index 154eb301..47bb174b 100644
--- a/policy/modules/services/mailman.te
+++ b/policy/modules/services/mailman.te
@@ -112,6 +112,7 @@ corecmd_exec_bin(mailman_cgi_t)
 dev_read_urand(mailman_cgi_t)
 
 files_search_locks(mailman_cgi_t)
+files_read_usr_files(mailman_cgi_t)
 
 term_use_controlling_term(mailman_cgi_t)
 

diff --git a/policy/modules/services/mon.te b/policy/modules/services/mon.te
index 74a94b89..50a9c82f 100644
--- a/policy/modules/services/mon.te
+++ b/policy/modules/services/mon.te
@@ -58,6 +58,9 @@ manage_files_pattern(mon_t, mon_var_log_t, mon_var_log_t)
 manage_files_pattern(mon_t, mon_runtime_t, mon_runtime_t)
 files_runtime_filetrans(mon_t, mon_runtime_t, file)
 
+# to read fips_enabled
+kernel_read_crypto_sysctls(mon_t)
+
 kernel_read_kernel_sysctls(mon_t)
 kernel_read_network_state(mon_t)
 kernel_read_system_state(mon_t)

diff --git a/policy/modules/services/samba.if b/policy/modules/services/samba.if
index 62c3ae67..5e01db23 100644
--- a/policy/modules/services/samba.if
+++ b/policy/modules/services/samba.if
@@ -729,3 +729,79 @@ interface(`samba_admin',`
files_list_tmp($1)
admin_pattern($1, { swat_tmp_t smbd_tmp_t winbind_tmp_t })
 ')
+
+
+## 
+## start samba daemon
+## 
+## 
+## 
+## Domain allowed access.
+## 
+## 
+#
+interface(`samba_start',`
+   gen_require(`
+   type samba_unit_t;
+   ')
+
+   allow $1 samba_unit_t:file getattr;
+   allow $1 samba_unit_t:service start;
+')
+
+
+## 
+## stop samba daemon
+## 
+## 
+## 
+## Domain allowed access.
+## 
+## 
+#
+interface(`samba_stop',`
+   gen_require(`
+   type samba_unit_t;
+   ')
+
+   allow $1 samba_unit_t:file getattr;
+   allow $1 samba_unit_t:service stop;
+')
+
+
+## 
+## get status of samba daemon
+## 
+## 
+## 
+## Domain allowed access.
+## 
+## 
+#
+interface(`samba_status',`
+   gen_require(`
+

[gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/services/

2021-01-31 Thread Jason Zaman

commit: bf4b1f16a4f6a0b415d77ea028996cdadefde3e2
Author: Chris PeBenito  ieee  org>
AuthorDate: Thu Jan 28 19:57:08 2021 +
Commit: Jason Zaman  gentoo  org>
CommitDate: Mon Feb  1 01:21:42 2021 +
URL:
https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=bf4b1f16

aptcacher: Drop broken config interfaces.

The aptcacher_etc_t type does not exist in the policy.  The block in cron
will never be enabled because of this, so drop that too.

Signed-off-by: Chris PeBenito  ieee.org>
Signed-off-by: Jason Zaman  gentoo.org>

 policy/modules/services/aptcacher.if | 40 
 policy/modules/services/cron.te  |  5 -
 2 files changed, 45 deletions(-)

diff --git a/policy/modules/services/aptcacher.if 
b/policy/modules/services/aptcacher.if
index 8c99a699..12c1335a 100644
--- a/policy/modules/services/aptcacher.if
+++ b/policy/modules/services/aptcacher.if
@@ -63,43 +63,3 @@ interface(`aptcacher_stream_connect',`
files_search_runtime($1)
stream_connect_pattern($1, aptcacher_runtime_t, aptcacher_runtime_t, 
aptcacher_t)
 ')
-
-##
-## 
-## read aptcacher config
-## 
-## 
-## 
-## Domain allowed to read it.
-## 
-## 
-#
-interface(`aptcacher_read_config',`
-   gen_require(`
-   type aptcacher_etc_t;
-   ')
-
-   files_search_etc($1)
-   allow $1 aptcacher_etc_t:dir list_dir_perms;
-   allow $1 aptcacher_etc_t:file read_file_perms;
-')
-
-##
-## 
-## mmap and read aptcacher config
-## 
-## 
-## 
-## Domain allowed to read it.
-## 
-## 
-#
-interface(`aptcacher_mmap_read_config',`
-   gen_require(`
-   type aptcacher_etc_t;
-   ')
-
-   files_search_etc($1)
-   allow $1 aptcacher_etc_t:dir list_dir_perms;
-   allow $1 aptcacher_etc_t:file mmap_read_file_perms;
-')

diff --git a/policy/modules/services/cron.te b/policy/modules/services/cron.te
index 23e990ad..712a84dd 100644
--- a/policy/modules/services/cron.te
+++ b/policy/modules/services/cron.te
@@ -344,11 +344,6 @@ ifdef(`distro_debian',`
dpkg_manage_db(system_cronjob_t)
')
 
-   optional_policy(`
-   aptcacher_mmap_read_config(system_cronjob_t)
-   corenet_tcp_connect_aptcacher_port(system_cronjob_t)
-   ')
-
optional_policy(`
logwatch_search_cache_dir(crond_t)
')

[gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/services/

2021-01-31 Thread Jason Zaman

commit: 5029446ced5d230d805287ac8096db80bcc0217d
Author: Chris PeBenito  ieee  org>
AuthorDate: Thu Jan 28 19:29:26 2021 +
Commit: Jason Zaman  gentoo  org>
CommitDate: Mon Feb  1 01:21:42 2021 +
URL:
https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=5029446c

apache: Fix lint error.

Signed-off-by: Chris PeBenito  ieee.org>
Signed-off-by: Jason Zaman  gentoo.org>

 policy/modules/services/apache.fc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/policy/modules/services/apache.fc 
b/policy/modules/services/apache.fc
index 6c4ddba7..34d62881 100644
--- a/policy/modules/services/apache.fc
+++ b/policy/modules/services/apache.fc
@@ -182,7 +182,7 @@ ifndef(`distro_gentoo',`
 /var/log/roundcubemail(/.*)?   
gen_context(system_u:object_r:httpd_log_t,s0)
 /var/log/suphp\.log.*  --  
gen_context(system_u:object_r:httpd_log_t,s0)
 /var/log/z-push(/.*)?  
gen_context(system_u:object_r:httpd_sys_rw_content_t,s0)
-/var/log/php7..-fpm.log--  
gen_context(system_u:object_r:httpd_log_t,s0)
+/var/log/php[^/]+-fpm.log  --  
gen_context(system_u:object_r:httpd_log_t,s0)
 
 /run/apache.*  
gen_context(system_u:object_r:httpd_runtime_t,s0)
 /run/cherokee\.pid --  
gen_context(system_u:object_r:httpd_runtime_t,s0)

[gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/services/

2021-01-31 Thread Jason Zaman

commit: 220dd4819409d7c664b52140d67952c4627eb46e
Author: Chris PeBenito  ieee  org>
AuthorDate: Thu Jan 28 19:34:02 2021 +
Commit: Jason Zaman  gentoo  org>
CommitDate: Mon Feb  1 01:21:42 2021 +
URL:
https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=220dd481

apache: Really fix lint error.

Signed-off-by: Chris PeBenito  ieee.org>
Signed-off-by: Jason Zaman  gentoo.org>

 policy/modules/services/apache.fc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/policy/modules/services/apache.fc 
b/policy/modules/services/apache.fc
index 34d62881..433f2895 100644
--- a/policy/modules/services/apache.fc
+++ b/policy/modules/services/apache.fc
@@ -182,7 +182,7 @@ ifndef(`distro_gentoo',`
 /var/log/roundcubemail(/.*)?   
gen_context(system_u:object_r:httpd_log_t,s0)
 /var/log/suphp\.log.*  --  
gen_context(system_u:object_r:httpd_log_t,s0)
 /var/log/z-push(/.*)?  
gen_context(system_u:object_r:httpd_sys_rw_content_t,s0)
-/var/log/php[^/]+-fpm.log  --  
gen_context(system_u:object_r:httpd_log_t,s0)
+/var/log/php[^/]+-fpm\.log --  
gen_context(system_u:object_r:httpd_log_t,s0)
 
 /run/apache.*  
gen_context(system_u:object_r:httpd_runtime_t,s0)
 /run/cherokee\.pid --  
gen_context(system_u:object_r:httpd_runtime_t,s0)

[gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/services/

2021-01-31 Thread Jason Zaman

commit: b39af892a3459615c9941f545574d9561db23ab2
Author: Chris PeBenito  ieee  org>
AuthorDate: Thu Jan 28 16:27:54 2021 +
Commit: Jason Zaman  gentoo  org>
CommitDate: Mon Feb  1 01:21:42 2021 +
URL:
https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=b39af892

samba: Move service interface definitions.

Signed-off-by: Chris PeBenito  ieee.org>
Signed-off-by: Jason Zaman  gentoo.org>

 policy/modules/services/samba.if | 152 +++
 1 file changed, 76 insertions(+), 76 deletions(-)

diff --git a/policy/modules/services/samba.if b/policy/modules/services/samba.if
index 5e01db23..6af30d0c 100644
--- a/policy/modules/services/samba.if
+++ b/policy/modules/services/samba.if
@@ -328,6 +328,82 @@ interface(`samba_read_share_files',`
read_files_pattern($1, samba_share_t, samba_share_t)
 ')
 
+
+## 
+## start samba daemon
+## 
+## 
+## 
+## Domain allowed access.
+## 
+## 
+#
+interface(`samba_start',`
+   gen_require(`
+   type samba_unit_t;
+   ')
+
+   allow $1 samba_unit_t:file getattr;
+   allow $1 samba_unit_t:service start;
+')
+
+
+## 
+## stop samba daemon
+## 
+## 
+## 
+## Domain allowed access.
+## 
+## 
+#
+interface(`samba_stop',`
+   gen_require(`
+   type samba_unit_t;
+   ')
+
+   allow $1 samba_unit_t:file getattr;
+   allow $1 samba_unit_t:service stop;
+')
+
+
+## 
+## get status of samba daemon
+## 
+## 
+## 
+## Domain allowed access.
+## 
+## 
+#
+interface(`samba_status',`
+   gen_require(`
+   type samba_unit_t;
+   ')
+
+   allow $1 samba_unit_t:file getattr;
+   allow $1 samba_unit_t:service status;
+')
+
+
+## 
+## reload samba daemon
+## 
+## 
+## 
+## Domain allowed access.
+## 
+## 
+#
+interface(`samba_reload',`
+   gen_require(`
+   type samba_unit_t;
+   ')
+
+   allow $1 samba_unit_t:file getattr;
+   allow $1 samba_unit_t:service reload;
+')
+
 
 ## 
 ## Search samba var directories.
@@ -729,79 +805,3 @@ interface(`samba_admin',`
files_list_tmp($1)
admin_pattern($1, { swat_tmp_t smbd_tmp_t winbind_tmp_t })
 ')
-
-
-## 
-## start samba daemon
-## 
-## 
-## 
-## Domain allowed access.
-## 
-## 
-#
-interface(`samba_start',`
-   gen_require(`
-   type samba_unit_t;
-   ')
-
-   allow $1 samba_unit_t:file getattr;
-   allow $1 samba_unit_t:service start;
-')
-
-
-## 
-## stop samba daemon
-## 
-## 
-## 
-## Domain allowed access.
-## 
-## 
-#
-interface(`samba_stop',`
-   gen_require(`
-   type samba_unit_t;
-   ')
-
-   allow $1 samba_unit_t:file getattr;
-   allow $1 samba_unit_t:service stop;
-')
-
-
-## 
-## get status of samba daemon
-## 
-## 
-## 
-## Domain allowed access.
-## 
-## 
-#
-interface(`samba_status',`
-   gen_require(`
-   type samba_unit_t;
-   ')
-
-   allow $1 samba_unit_t:file getattr;
-   allow $1 samba_unit_t:service status;
-')
-
-
-## 
-## reload samba daemon
-## 
-## 
-## 
-## Domain allowed access.
-## 
-## 
-#
-interface(`samba_reload',`
-   gen_require(`
-   type samba_unit_t;
-   ')
-
-   allow $1 samba_unit_t:file getattr;
-   allow $1 samba_unit_t:service reload;
-')

[gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/services/

2021-01-31 Thread Jason Zaman

commit: 2ff03b51ae8c9acfe0d0d25105637550ce7d0ff5
Author: Chris PeBenito  ieee  org>
AuthorDate: Thu Jan 28 19:26:31 2021 +
Commit: Jason Zaman  gentoo  org>
CommitDate: Mon Feb  1 01:21:42 2021 +
URL:
https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=2ff03b51

apache, fail2ban, stunnel: Module version bump.

Signed-off-by: Chris PeBenito  ieee.org>
Signed-off-by: Jason Zaman  gentoo.org>

 policy/modules/services/apache.te   | 2 +-
 policy/modules/services/fail2ban.te | 2 +-
 policy/modules/services/stunnel.te  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/policy/modules/services/apache.te 
b/policy/modules/services/apache.te
index 229848c0..b1906d17 100644
--- a/policy/modules/services/apache.te
+++ b/policy/modules/services/apache.te
@@ -1,4 +1,4 @@
-policy_module(apache, 2.19.3)
+policy_module(apache, 2.19.4)
 
 
 #

diff --git a/policy/modules/services/fail2ban.te 
b/policy/modules/services/fail2ban.te
index 640905d4..41b9239f 100644
--- a/policy/modules/services/fail2ban.te
+++ b/policy/modules/services/fail2ban.te
@@ -1,4 +1,4 @@
-policy_module(fail2ban, 1.9.2)
+policy_module(fail2ban, 1.9.3)
 
 
 #

diff --git a/policy/modules/services/stunnel.te 
b/policy/modules/services/stunnel.te
index 3109b460..ecfe78a8 100644
--- a/policy/modules/services/stunnel.te
+++ b/policy/modules/services/stunnel.te
@@ -1,4 +1,4 @@
-policy_module(stunnel, 1.15.1)
+policy_module(stunnel, 1.15.2)
 
 
 #

[gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/services/

2021-01-31 Thread Jason Zaman

commit: f5c9fba7feac9bd937bf9de3783b2717fd145f50
Author: Chris PeBenito  ieee  org>
AuthorDate: Thu Jan 28 16:39:34 2021 +
Commit: Jason Zaman  gentoo  org>
CommitDate: Mon Feb  1 01:21:42 2021 +
URL:
https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=f5c9fba7

samba: Add missing userspace class requirements in unit interfaces.

Signed-off-by: Chris PeBenito  ieee.org>
Signed-off-by: Jason Zaman  gentoo.org>

 policy/modules/services/samba.if | 4 
 1 file changed, 4 insertions(+)

diff --git a/policy/modules/services/samba.if b/policy/modules/services/samba.if
index 6af30d0c..92eab06d 100644
--- a/policy/modules/services/samba.if
+++ b/policy/modules/services/samba.if
@@ -341,6 +341,7 @@ interface(`samba_read_share_files',`
 interface(`samba_start',`
gen_require(`
type samba_unit_t;
+   class service start;
')
 
allow $1 samba_unit_t:file getattr;
@@ -360,6 +361,7 @@ interface(`samba_start',`
 interface(`samba_stop',`
gen_require(`
type samba_unit_t;
+   class service stop;
')
 
allow $1 samba_unit_t:file getattr;
@@ -379,6 +381,7 @@ interface(`samba_stop',`
 interface(`samba_status',`
gen_require(`
type samba_unit_t;
+   class service status;
')
 
allow $1 samba_unit_t:file getattr;
@@ -398,6 +401,7 @@ interface(`samba_status',`
 interface(`samba_reload',`
gen_require(`
type samba_unit_t;
+   class service reload;
')
 
allow $1 samba_unit_t:file getattr;

[gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/system/

2021-01-31 Thread Jason Zaman

commit: f9897d936fcad0c175a4a54dc9e14561fef9236d
Author: Chris PeBenito  ieee  org>
AuthorDate: Thu Jan 28 16:30:40 2021 +
Commit: Jason Zaman  gentoo  org>
CommitDate: Mon Feb  1 01:21:42 2021 +
URL:
https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=f9897d93

sysnetwork: Merge dhcpc_manage_samba tunable block with existing samba block.

This moves the existing samba_manage_config(dhcpc_t) that is not tunable
into the tunable block.

Signed-off-by: Chris PeBenito  ieee.org>
Signed-off-by: Jason Zaman  gentoo.org>

 policy/modules/system/sysnetwork.te | 23 ++-
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/policy/modules/system/sysnetwork.te 
b/policy/modules/system/sysnetwork.te
index a8fe42d6..ee768012 100644
--- a/policy/modules/system/sysnetwork.te
+++ b/policy/modules/system/sysnetwork.te
@@ -184,18 +184,6 @@ ifdef(`init_systemd',`
init_search_units(dhcpc_t)
 ')
 
-optional_policy(`
-   tunable_policy(`dhcpc_manage_samba',`
-   samba_manage_var_files(dhcpc_t)
-   init_exec_script_files(dhcpc_t)
-   init_get_system_status(dhcpc_t)
-   samba_stop(dhcpc_t)
-   samba_start(dhcpc_t)
-   samba_reload(dhcpc_t)
-   samba_status(dhcpc_t)
-   ')
-')
-
 optional_policy(`
avahi_domtrans(dhcpc_t)
 ')
@@ -252,7 +240,16 @@ optional_policy(`
 ')
 
 optional_policy(`
-   samba_manage_config(dhcpc_t)
+   tunable_policy(`dhcpc_manage_samba',`
+   samba_manage_config(dhcpc_t)
+   samba_manage_var_files(dhcpc_t)
+   init_exec_script_files(dhcpc_t)
+   init_get_system_status(dhcpc_t)
+   samba_stop(dhcpc_t)
+   samba_start(dhcpc_t)
+   samba_reload(dhcpc_t)
+   samba_status(dhcpc_t)
+   ')
 ')
 
 optional_policy(`

[gentoo-commits] proj/hardened-refpolicy:master commit in: policy/support/

2021-01-31 Thread Jason Zaman

commit: 2a706fe10f808aac846cef19c5362a22a6e5253c
Author: Chris PeBenito  ieee  org>
AuthorDate: Thu Jan 28 15:51:39 2021 +
Commit: Jason Zaman  gentoo  org>
CommitDate: Mon Feb  1 01:21:42 2021 +
URL:
https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=2a706fe1

file_patterns.spt: Add a mmap_manage_files_pattern().

Signed-off-by: Chris PeBenito  ieee.org>
Signed-off-by: Jason Zaman  gentoo.org>

 policy/support/file_patterns.spt | 5 +
 1 file changed, 5 insertions(+)

diff --git a/policy/support/file_patterns.spt b/policy/support/file_patterns.spt
index 6ce53fa9..19fcf275 100644
--- a/policy/support/file_patterns.spt
+++ b/policy/support/file_patterns.spt
@@ -154,6 +154,11 @@ define(`manage_files_pattern',`
allow $1 $3:file manage_file_perms;
 ')
 
+define(`mmap_manage_files_pattern',`
+   allow $1 $2:dir rw_dir_perms;
+   allow $1 $3:file { manage_file_perms map };
+')
+
 define(`relabelfrom_files_pattern',`
allow $1 $2:dir search_dir_perms;
allow $1 $3:file relabelfrom_file_perms;

[gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/services/

2021-01-31 Thread Jason Zaman

commit: d2423ae4bde7048042e80957e3c727eb59e04c8b
Author: Russell Coker  coker  com  au>
AuthorDate: Wed Jan 27 03:15:50 2021 +
Commit: Jason Zaman  gentoo  org>
CommitDate: Mon Feb  1 01:21:42 2021 +
URL:
https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=d2423ae4

misc services patches with changes Dominick and Chris wanted

I think this one is ready to merge.

Signed-off-by: Russell Coker  coker.com.au>
Signed-off-by: Jason Zaman  gentoo.org>

 policy/modules/services/apache.fc|  6 +-
 policy/modules/services/apache.if| 22 
 policy/modules/services/apache.te| 15 --
 policy/modules/services/aptcacher.fc |  5 -
 policy/modules/services/aptcacher.if | 40 
 policy/modules/services/aptcacher.te |  2 ++
 policy/modules/services/bind.te  |  1 +
 policy/modules/services/colord.te| 10 +
 policy/modules/services/cron.te  | 12 +++
 policy/modules/services/cups.te  |  3 ++-
 policy/modules/services/devicekit.te |  2 ++
 policy/modules/services/entropyd.te  |  1 +
 policy/modules/services/fail2ban.te  |  2 ++
 policy/modules/services/jabber.te|  3 +++
 policy/modules/services/l2tp.te  |  1 +
 policy/modules/services/mon.te   |  7 ++-
 policy/modules/services/mysql.fc |  1 +
 policy/modules/services/mysql.te |  7 ++-
 policy/modules/services/openvpn.te   | 10 +
 policy/modules/services/postgrey.te  |  1 +
 policy/modules/services/rpc.te   |  1 +
 policy/modules/services/samba.te | 18 ++--
 policy/modules/services/smartmon.te  |  2 +-
 policy/modules/services/squid.te |  2 ++
 policy/modules/services/tor.te   |  1 +
 policy/modules/services/watchdog.te  |  2 ++
 policy/modules/services/xserver.if   |  1 +
 27 files changed, 168 insertions(+), 10 deletions(-)

diff --git a/policy/modules/services/apache.fc 
b/policy/modules/services/apache.fc
index 52879fe1..6c4ddba7 100644
--- a/policy/modules/services/apache.fc
+++ b/policy/modules/services/apache.fc
@@ -80,6 +80,8 @@ ifndef(`distro_gentoo',`
 /usr/sbin/hiawatha --  
gen_context(system_u:object_r:httpd_exec_t,s0)
 /usr/sbin/httpd\.event --  
gen_context(system_u:object_r:httpd_exec_t,s0)
 /usr/sbin/httpd(\.worker)? --  
gen_context(system_u:object_r:httpd_exec_t,s0)
+/usr/sbin/php.*-fpm--  
gen_context(system_u:object_r:httpd_exec_t,s0)
+/usr/sbin/php-fpm[^/]+ --  
gen_context(system_u:object_r:httpd_exec_t,s0)
 /usr/sbin/lighttpd --  
gen_context(system_u:object_r:httpd_exec_t,s0)
 ifndef(`distro_gentoo',`
 /usr/sbin/nginx--  
gen_context(system_u:object_r:httpd_exec_t,s0)
@@ -152,7 +154,7 @@ ifndef(`distro_gentoo',`
 /var/lib/php/session(/.*)? 
gen_context(system_u:object_r:httpd_runtime_t,s0)
 /var/lib/pootle/po(/.*)?   
gen_context(system_u:object_r:httpd_sys_rw_content_t,s0)
 /var/lib/rt3/data/RT-Shredder(/.*)?
gen_context(system_u:object_r:httpd_var_lib_t,s0)
-/var/lib/squirrelmail/prefs(/.*)?  
gen_context(system_u:object_r:httpd_squirrelmail_t,s0)
+/var/lib/squirrelmail(/.*)?
gen_context(system_u:object_r:httpd_squirrelmail_t,s0)
 /var/lib/stickshift/\.httpd\.d(/.*)?   
gen_context(system_u:object_r:httpd_config_t,s0)
 /var/lib/svn(/.*)? 
gen_context(system_u:object_r:httpd_sys_rw_content_t,s0)
 /var/lib/trac(/.*)?
gen_context(system_u:object_r:httpd_sys_content_t,s0)
@@ -180,6 +182,7 @@ ifndef(`distro_gentoo',`
 /var/log/roundcubemail(/.*)?   
gen_context(system_u:object_r:httpd_log_t,s0)
 /var/log/suphp\.log.*  --  
gen_context(system_u:object_r:httpd_log_t,s0)
 /var/log/z-push(/.*)?  
gen_context(system_u:object_r:httpd_sys_rw_content_t,s0)
+/var/log/php7..-fpm.log--  
gen_context(system_u:object_r:httpd_log_t,s0)
 
 /run/apache.*  
gen_context(system_u:object_r:httpd_runtime_t,s0)
 /run/cherokee\.pid --  
gen_context(system_u:object_r:httpd_runtime_t,s0)
@@ -188,6 +191,7 @@ ifndef(`distro_gentoo',`
 /run/httpd.*   
gen_context(system_u:object_r:httpd_runtime_t,s0)
 /run/lighttpd(/.*)?
gen_context(system_u:object_r:httpd_runtime_t,s0)
 /run/mod_.*

[gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/services/

2021-01-31 Thread Jason Zaman

commit: 3e5d54e1629c156c4076759ff10df78bd6067151
Author: Chris PeBenito  ieee  org>
AuthorDate: Thu Jan 28 15:55:54 2021 +
Commit: Jason Zaman  gentoo  org>
CommitDate: Mon Feb  1 01:21:42 2021 +
URL:
https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=3e5d54e1

samba: Fix samba_runtime_t alias use.

Signed-off-by: Chris PeBenito  ieee.org>
Signed-off-by: Jason Zaman  gentoo.org>

 policy/modules/services/samba.te | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/policy/modules/services/samba.te b/policy/modules/services/samba.te
index 10960805..1d7683a2 100644
--- a/policy/modules/services/samba.te
+++ b/policy/modules/services/samba.te
@@ -207,7 +207,7 @@ allow samba_net_t self:fifo_file rw_file_perms;
 
 allow samba_net_t samba_etc_t:file read_file_perms;
 
-allow samba_net_t samba_var_run_t:file { map read_file_perms };
+allow samba_net_t samba_runtime_t:file { map read_file_perms };
 
 manage_files_pattern(samba_net_t, samba_etc_t, samba_secrets_t)
 filetrans_pattern(samba_net_t, samba_etc_t, samba_secrets_t, file)

[gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/services/

2021-01-31 Thread Jason Zaman

commit: 0305b1b1d184ffac8b11e372ea4f8f8d78e3630d
Author: Chris PeBenito  ieee  org>
AuthorDate: Thu Jan 28 15:55:35 2021 +
Commit: Jason Zaman  gentoo  org>
CommitDate: Mon Feb  1 01:21:42 2021 +
URL:
https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=0305b1b1

cron: Make backup call for system_cronjob_t optional.

Signed-off-by: Chris PeBenito  ieee.org>
Signed-off-by: Jason Zaman  gentoo.org>

 policy/modules/services/cron.te | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/policy/modules/services/cron.te b/policy/modules/services/cron.te
index 72e1d8c4..c4342f05 100644
--- a/policy/modules/services/cron.te
+++ b/policy/modules/services/cron.te
@@ -309,8 +309,6 @@ init_start_all_units(system_cronjob_t)
 init_get_generic_units_status(system_cronjob_t)
 init_get_system_status(system_cronjob_t)
 
-backup_manage_store_files(system_cronjob_t)
-
 auth_manage_var_auth(crond_t)
 auth_use_pam(crond_t)
 
@@ -396,6 +394,10 @@ optional_policy(`
amavis_search_lib(crond_t)
 ')
 
+optional_policy(`
+   backup_manage_store_files(system_cronjob_t)
+')
+
 optional_policy(`
djbdns_search_tinydns_keys(crond_t)
djbdns_link_tinydns_keys(crond_t)

[gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/services/

2021-01-31 Thread Jason Zaman

commit: 44c7994f453c43349074368972d58e465e1f5d27
Author: Chris PeBenito  ieee  org>
AuthorDate: Thu Jan 28 15:53:04 2021 +
Commit: Jason Zaman  gentoo  org>
CommitDate: Mon Feb  1 01:21:42 2021 +
URL:
https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=44c7994f

apache, mysql, postgrey, samba, squid: Apply new mmap_manage_files_pattern().

Signed-off-by: Chris PeBenito  ieee.org>
Signed-off-by: Jason Zaman  gentoo.org>

 policy/modules/services/apache.if   |  6 ++
 policy/modules/services/apache.te   | 15 +--
 policy/modules/services/mysql.te|  6 ++
 policy/modules/services/postgrey.te |  3 +--
 policy/modules/services/samba.te| 15 +--
 policy/modules/services/squid.te|  3 +--
 6 files changed, 16 insertions(+), 32 deletions(-)

diff --git a/policy/modules/services/apache.if 
b/policy/modules/services/apache.if
index 44767359..1695af75 100644
--- a/policy/modules/services/apache.if
+++ b/policy/modules/services/apache.if
@@ -70,8 +70,7 @@ template(`apache_content_template',`
allow httpd_$1_script_t { httpd_$1_content_t httpd_$1_script_exec_t 
}:lnk_file read_lnk_file_perms;
 
manage_dirs_pattern(httpd_$1_script_t, httpd_$1_rw_content_t, 
httpd_$1_rw_content_t)
-   manage_files_pattern(httpd_$1_script_t, httpd_$1_rw_content_t, 
httpd_$1_rw_content_t)
-   allow httpd_$1_script_t httpd_$1_rw_content_t:file map;
+   mmap_manage_files_pattern(httpd_$1_script_t, httpd_$1_rw_content_t, 
httpd_$1_rw_content_t)
manage_lnk_files_pattern(httpd_$1_script_t, httpd_$1_rw_content_t, 
httpd_$1_rw_content_t)
manage_fifo_files_pattern(httpd_$1_script_t, httpd_$1_rw_content_t, 
httpd_$1_rw_content_t)
manage_sock_files_pattern(httpd_$1_script_t, httpd_$1_rw_content_t, 
httpd_$1_rw_content_t)
@@ -1025,8 +1024,7 @@ interface(`apache_manage_sys_rw_content',`
 
apache_search_sys_content($1)
manage_dirs_pattern($1, httpd_sys_rw_content_t, httpd_sys_rw_content_t)
-   manage_files_pattern($1,httpd_sys_rw_content_t, httpd_sys_rw_content_t)
-   allow $1 httpd_sys_rw_content_t:file map;
+   mmap_manage_files_pattern($1,httpd_sys_rw_content_t, 
httpd_sys_rw_content_t)
manage_lnk_files_pattern($1, httpd_sys_rw_content_t, 
httpd_sys_rw_content_t)
 ')
 

diff --git a/policy/modules/services/apache.te 
b/policy/modules/services/apache.te
index da43a1d8..35fafe56 100644
--- a/policy/modules/services/apache.te
+++ b/policy/modules/services/apache.te
@@ -378,10 +378,9 @@ allow httpd_t self:unix_stream_socket { accept connectto 
listen };
 allow httpd_t self:tcp_socket { accept listen };
 
 manage_dirs_pattern(httpd_t, httpd_cache_t, httpd_cache_t)
-manage_files_pattern(httpd_t, httpd_cache_t, httpd_cache_t)
+mmap_manage_files_pattern(httpd_t, httpd_cache_t, httpd_cache_t)
 manage_lnk_files_pattern(httpd_t, httpd_cache_t, httpd_cache_t)
 files_var_filetrans(httpd_t, httpd_cache_t, dir)
-allow httpd_t httpd_cache_t:file map;
 
 allow httpd_t httpd_config_t:dir list_dir_perms;
 read_files_pattern(httpd_t, httpd_config_t, httpd_config_t)
@@ -415,9 +414,8 @@ read_lnk_files_pattern(httpd_t, httpd_modules_t, 
httpd_modules_t)
 allow httpd_t httpd_rotatelogs_t:process signal_perms;
 
 manage_dirs_pattern(httpd_t, httpd_squirrelmail_t, httpd_squirrelmail_t)
-manage_files_pattern(httpd_t, httpd_squirrelmail_t, httpd_squirrelmail_t)
+mmap_manage_files_pattern(httpd_t, httpd_squirrelmail_t, httpd_squirrelmail_t)
 manage_lnk_files_pattern(httpd_t, httpd_squirrelmail_t, httpd_squirrelmail_t)
-allow httpd_t httpd_squirrelmail_t:file map;
 
 allow httpd_t httpd_suexec_exec_t:file read_file_perms;
 
@@ -441,8 +439,7 @@ manage_sock_files_pattern(httpd_t, httpd_tmpfs_t, 
httpd_tmpfs_t)
 fs_tmpfs_filetrans(httpd_t, httpd_tmpfs_t, { dir file lnk_file sock_file 
fifo_file })
 
 manage_dirs_pattern(httpd_t, httpd_var_lib_t, httpd_var_lib_t)
-manage_files_pattern(httpd_t, httpd_var_lib_t, httpd_var_lib_t)
-allow httpd_t httpd_var_lib_t:file map;
+mmap_manage_files_pattern(httpd_t, httpd_var_lib_t, httpd_var_lib_t)
 manage_lnk_files_pattern(httpd_t, httpd_var_lib_t, httpd_var_lib_t)
 files_var_lib_filetrans(httpd_t, httpd_var_lib_t, { dir file })
 
@@ -622,8 +619,7 @@ tunable_policy(`httpd_enable_cgi && httpd_unified && 
httpd_builtin_scripting',`
domtrans_pattern(httpd_t, httpdcontent, httpd_sys_script_t)
 
manage_dirs_pattern(httpd_t, httpdcontent, httpdcontent)
-   manage_files_pattern(httpd_t, httpdcontent, httpdcontent)
-   allow httpd_t httpdcontent:file map;
+   mmap_manage_files_pattern(httpd_t, httpdcontent, httpdcontent)
manage_fifo_files_pattern(httpd_t, httpdcontent, httpdcontent)
manage_lnk_files_pattern(httpd_t, httpdcontent, httpdcontent)
manage_sock_files_pattern(httpd_t, httpdcontent, httpdcontent)
@@ -908,8 +904,7 @@ optional_policy(`
 # Helper local policy
 #
 
-read_files_pattern(httpd_helper_t, httpd_config_t, httpd_config_t)

[gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/services/

2021-01-31 Thread Jason Zaman

commit: fba048b31aa18b9f42c843863cd2e750854c86ce
Author: Chris PeBenito  ieee  org>
AuthorDate: Thu Jan 28 15:55:09 2021 +
Commit: Jason Zaman  gentoo  org>
CommitDate: Mon Feb  1 01:21:42 2021 +
URL:
https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=fba048b3

devicekit, jabber, samba: Move lines.

Signed-off-by: Chris PeBenito  ieee.org>
Signed-off-by: Jason Zaman  gentoo.org>

 policy/modules/services/devicekit.te | 4 ++--
 policy/modules/services/jabber.te| 3 +--
 policy/modules/services/samba.te | 3 ++-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/policy/modules/services/devicekit.te 
b/policy/modules/services/devicekit.te
index b69c8113..25f93898 100644
--- a/policy/modules/services/devicekit.te
+++ b/policy/modules/services/devicekit.te
@@ -131,11 +131,11 @@ fs_mount_all_fs(devicekit_disk_t)
 fs_unmount_all_fs(devicekit_disk_t)
 fs_search_all(devicekit_disk_t)
 
-mount_rw_runtime_files(devicekit_disk_t)
-
 mls_file_read_all_levels(devicekit_disk_t)
 mls_file_write_to_clearance(devicekit_disk_t)
 
+mount_rw_runtime_files(devicekit_disk_t)
+
 storage_raw_read_fixed_disk(devicekit_disk_t)
 storage_raw_write_fixed_disk(devicekit_disk_t)
 storage_raw_read_removable_device(devicekit_disk_t)

diff --git a/policy/modules/services/jabber.te 
b/policy/modules/services/jabber.te
index 06273d09..30d53a8c 100644
--- a/policy/modules/services/jabber.te
+++ b/policy/modules/services/jabber.te
@@ -84,6 +84,7 @@ manage_files_pattern(jabberd_t, jabberd_log_t, jabberd_log_t)
 logging_log_filetrans(jabberd_t, jabberd_log_t, { file dir })
 
 manage_files_pattern(jabberd_domain, jabberd_spool_t, jabberd_spool_t)
+files_search_var_lib(jabberd_t)
 
 manage_files_pattern(jabberd_t, jabberd_runtime_t, jabberd_runtime_t)
 files_runtime_filetrans(jabberd_t, jabberd_runtime_t, file)
@@ -110,8 +111,6 @@ files_read_etc_runtime_files(jabberd_t)
 # usr for lua modules
 files_read_usr_files(jabberd_t)
 
-files_search_var_lib(jabberd_t)
-
 fs_search_auto_mountpoints(jabberd_t)
 
 miscfiles_read_generic_tls_privkey(jabberd_t)

diff --git a/policy/modules/services/samba.te b/policy/modules/services/samba.te
index 40b6684c..10960805 100644
--- a/policy/modules/services/samba.te
+++ b/policy/modules/services/samba.te
@@ -621,7 +621,6 @@ allow smbcontrol_t self:process { signal signull };
 allow smbcontrol_t { winbind_t nmbd_t smbd_t }:process { signal signull };
 read_files_pattern(smbcontrol_t, samba_runtime_t, samba_runtime_t)
 allow smbcontrol_t samba_runtime_t:dir rw_dir_perms;
-init_use_fds(smbcontrol_t)
 
 manage_files_pattern(smbcontrol_t, samba_var_t, samba_var_t)
 
@@ -638,6 +637,8 @@ files_search_var_lib(smbcontrol_t)
 
 term_use_console(smbcontrol_t)
 
+init_use_fds(smbcontrol_t)
+
 miscfiles_read_localization(smbcontrol_t)
 
 sysnet_use_ldap(smbcontrol_t)

[gentoo-commits] repo/gentoo:master commit in: games-arcade/jvgs/, games-arcade/jvgs/files/

2021-01-31 Thread Sam James

commit: afe11bf20c89d8e917f81930761d94f7fa754050
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb  1 02:07:13 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb  1 02:07:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afe11bf2

games-arcade/jvgs: unbundle tinyxml

Closes: https://bugs.gentoo.org/739084
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 .../jvgs/files/jvgs-0.5-unbundle-tinyxml.patch | 333 +
 games-arcade/jvgs/jvgs-0.5-r100.ebuild |  29 +-
 2 files changed, 357 insertions(+), 5 deletions(-)

diff --git a/games-arcade/jvgs/files/jvgs-0.5-unbundle-tinyxml.patch 
b/games-arcade/jvgs/files/jvgs-0.5-unbundle-tinyxml.patch
new file mode 100644
index 000..fd9c0d8702a
--- /dev/null
+++ b/games-arcade/jvgs/files/jvgs-0.5-unbundle-tinyxml.patch
@@ -0,0 +1,333 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 87b28ab..2ec725c 100644
+--- a/src/CMakeLists.txt
 b/src/CMakeLists.txt
+@@ -1,10 +1,14 @@
+ SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DTIXML_USE_STL" )
+ 
++find_package(PkgConfig REQUIRED)
++pkg_check_modules(TinyXml REQUIRED tinyxml)
++
+ INCLUDE_DIRECTORIES(
+ ${SDL_INCLUDE_DIR}
+ ${LUA_INCLUDE_DIR}
+ ${FREETYPE_INCLUDE_DIRS}
+ ${SDLMIXER_INCLUDE_DIR}
++${TINYXML_INCLUDE_DIRS}
+ ${ZLIB_INCLUDE_DIRS}
+ )
+ 
+@@ -12,7 +16,6 @@ ADD_SUBDIRECTORY( input )
+ ADD_SUBDIRECTORY( core )
+ ADD_SUBDIRECTORY( game )
+ ADD_SUBDIRECTORY( math )
+-ADD_SUBDIRECTORY( tinyxml )
+ ADD_SUBDIRECTORY( video )
+ ADD_SUBDIRECTORY( audio )
+ ADD_SUBDIRECTORY( sketch )
+@@ -25,5 +28,5 @@ ADD_EXECUTABLE(
+ )
+ 
+ TARGET_LINK_LIBRARIES(
+-jvgs bind input
++jvgs bind input ${TINYXML_LIBRARIES}
+ )
+diff --git a/src/core/PropertyMap.cpp b/src/core/PropertyMap.cpp
+index 190b317..3f7dd1a 100644
+--- a/src/core/PropertyMap.cpp
 b/src/core/PropertyMap.cpp
+@@ -1,7 +1,7 @@
+ #include "PropertyMap.h"
+ #include "LogManager.h"
+ 
+-#include "../tinyxml/tinyxml.h"
++#include "tinyxml.h"
+ using namespace std;
+ 
+ namespace jvgs
+diff --git a/src/core/XMLLoadable.cpp b/src/core/XMLLoadable.cpp
+index f5cbc46..b819184 100644
+--- a/src/core/XMLLoadable.cpp
 b/src/core/XMLLoadable.cpp
+@@ -1,7 +1,7 @@
+ #include "XMLLoadable.h"
+ #include "LogManager.h"
+ 
+-#include "../tinyxml/tinyxml.h"
++#include "tinyxml.h"
+ 
+ using namespace std;
+ 
+diff --git a/src/game/AbstractCamera.cpp b/src/game/AbstractCamera.cpp
+index b349418..725a2e2 100644
+--- a/src/game/AbstractCamera.cpp
 b/src/game/AbstractCamera.cpp
+@@ -5,7 +5,7 @@ using namespace jvgs::video;
+ 
+ using namespace jvgs::math;
+ 
+-#include "../tinyxml/tinyxml.h"
++#include "tinyxml.h"
+ 
+ namespace jvgs
+ {
+diff --git a/src/game/Animation.cpp b/src/game/Animation.cpp
+index ac563a6..6aa3b10 100644
+--- a/src/game/Animation.cpp
 b/src/game/Animation.cpp
+@@ -7,7 +7,7 @@ using namespace jvgs::sketch;
+ #include "../core/LogManager.h"
+ using namespace jvgs::core;
+ 
+-#include "../tinyxml/tinyxml.h"
++#include "tinyxml.h"
+ 
+ using namespace std;
+ 
+diff --git a/src/game/BullController.cpp b/src/game/BullController.cpp
+index 78f81af..56930b4 100644
+--- a/src/game/BullController.cpp
 b/src/game/BullController.cpp
+@@ -8,7 +8,7 @@ using namespace jvgs::core;
+ #include "../math/Vector2D.h"
+ using namespace jvgs::math;
+ 
+-#include "../tinyxml/tinyxml.h"
++#include "tinyxml.h"
+ 
+ using namespace std;
+ 
+diff --git a/src/game/CollisionResponsePositioner.cpp 
b/src/game/CollisionResponsePositioner.cpp
+index 8065efe..657c1c6 100644
+--- a/src/game/CollisionResponsePositioner.cpp
 b/src/game/CollisionResponsePositioner.cpp
+@@ -15,7 +15,7 @@ using namespace jvgs::sketch;
+ #include "../math/QuadTree.h"
+ using namespace jvgs::math;
+ 
+-#include "../tinyxml/tinyxml.h"
++#include "tinyxml.h"
+ 
+ #include 
+ using namespace std;
+diff --git a/src/game/DefaultInputController.cpp 
b/src/game/DefaultInputController.cpp
+index a05aec9..c6da502 100644
+--- a/src/game/DefaultInputController.cpp
 b/src/game/DefaultInputController.cpp
+@@ -7,7 +7,7 @@
+ #include "../input/InputManager.h"
+ using namespace jvgs::input;
+ 
+-#include "../tinyxml/tinyxml.h"
++#include "tinyxml.h"
+ 
+ using namespace jvgs::math;
+ 
+diff --git a/src/game/Entity.cpp b/src/game/Entity.cpp
+index 914297f..f353541 100644
+--- a/src/game/Entity.cpp
 b/src/game/Entity.cpp
+@@ -27,7 +27,7 @@ using namespace jvgs::video;
+ #include "../bind/ScriptManager.h"
+ using namespace jvgs::bind;
+ 
+-#include "../tinyxml/tinyxml.h"
++#include "tinyxml.h"
+ 
+ using namespace std;
+ using namespace jvgs::math;
+diff --git a/src/game/FlyStraightController.cpp 
b/src/game/FlyStraightController.cpp
+index 1217b62..62f8c1a 100644
+--- a/src/game/FlyStraightController.cpp
 b/src/game/FlyStraightController.cpp
+@@ -5,7 +5,7 @@
+ #include "../math/Vector2D.h"
+ using namespace jvgs::math;
+ 
+-#include ".

[gentoo-commits] repo/gentoo:master commit in: games-arcade/jvgs/

2021-01-31 Thread Sam James

commit: df698e7fb683b112df9d75f19bbf5d82a4a8ae28
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb  1 01:06:58 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb  1 02:07:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df698e7f

games-arcade/jvgs: fix installed binary

Actually install the binary we build.

Thanks-to: Samuel Bauer  yahoo.fr>
Closes: https://bugs.gentoo.org/687610
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 games-arcade/jvgs/jvgs-0.5-r1.ebuild | 10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/games-arcade/jvgs/jvgs-0.5-r1.ebuild 
b/games-arcade/jvgs/jvgs-0.5-r1.ebuild
index 45d527c885b..6fa5af29b09 100644
--- a/games-arcade/jvgs/jvgs-0.5-r1.ebuild
+++ b/games-arcade/jvgs/jvgs-0.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -26,8 +26,14 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${P}-src
 PATCHES=( "${FILESDIR}"/${PN}-0.5-fix-build-system.patch )
 
+src_prepare() {
+   sed -i "s:main.lua:/usr/share/${PN}/&:" src/main.cpp
+   default
+   eapply_user
+}
+
 src_install() {
-   dobin src/${PN}
+   dobin ${BUILD_DIR}/src/${PN}
 
insinto /usr/share/${PN}
doins -r main.lua resources

[gentoo-commits] proj/sci:master commit in: sci-visualization/fsleyes/

2021-01-31 Thread Horea Christian

commit: a3babd9de1be7a1cf9dd33b3835738e23c441f1f
Author: Horea Christian  chymera  eu>
AuthorDate: Mon Feb  1 01:54:25 2021 +
Commit: Horea Christian  gmail  com>
CommitDate: Mon Feb  1 01:54:25 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=a3babd9d

sci-visualization/fsleyes: keep old version

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Horea Christian  chymera.eu>

 ...fsleyes-0.34.2.ebuild => fsleyes-0.32.3.ebuild} | 53 ++
 sci-visualization/fsleyes/fsleyes-0.34.2.ebuild|  3 +-
 2 files changed, 25 insertions(+), 31 deletions(-)

diff --git a/sci-visualization/fsleyes/fsleyes-0.34.2.ebuild 
b/sci-visualization/fsleyes/fsleyes-0.32.3.ebuild
similarity index 56%
copy from sci-visualization/fsleyes/fsleyes-0.34.2.ebuild
copy to sci-visualization/fsleyes/fsleyes-0.32.3.ebuild
index b9b221a1e..5c98f015d 100644
--- a/sci-visualization/fsleyes/fsleyes-0.34.2.ebuild
+++ b/sci-visualization/fsleyes/fsleyes-0.32.3.ebuild
@@ -4,9 +4,8 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
 
-inherit xdg distutils-r1 desktop virtualx
+inherit distutils-r1 desktop virtualx
 
 DESCRIPTION="The new FSL image viewer, released with FSL 5.0.10"
 HOMEPAGE="https://git.fmrib.ox.ac.uk/fsl/fsleyes/fsleyes/tree/master";
@@ -18,58 +17,45 @@ SRC_URI="
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+IUSE="test"
 
 DEPEND="
test? (
${RDEPEND}
dev-python/mock[${PYTHON_USEDEP}]
+   dev-python/pytest[${PYTHON_USEDEP}]
)
+   dev-python/setuptools[${PYTHON_USEDEP}]
"
 
 RDEPEND="
-   >=dev-python/fslpy-3.1[${PYTHON_USEDEP}]
+   >=dev-python/fslpy-1.13.2[${PYTHON_USEDEP}]
=dev-python/jinja-2*[${PYTHON_USEDEP}]
>=dev-python/matplotlib-1.5.1[${PYTHON_USEDEP}]
>=dev-python/numpy-1.14.0[${PYTHON_USEDEP}]
-   >=dev-python/pillow-3.2.0[${PYTHON_USEDEP}]
+   >=dev-python/pillow-3.4.2[${PYTHON_USEDEP}]
>=dev-python/pyopengl-3.1.0[${PYTHON_USEDEP}]
>=dev-python/pyopengl_accelerate-3.1.0[${PYTHON_USEDEP}]
=dev-python/pyparsing-2*[${PYTHON_USEDEP}]
=dev-python/six-1*[${PYTHON_USEDEP}]
>=dev-python/wxpython-3.0.2.0[${PYTHON_USEDEP}]
>=dev-python/scipy-0.18[${PYTHON_USEDEP}]
-   >=sci-libs/nibabel-2.3[${PYTHON_USEDEP}]
-   >=sci-visualization/fsleyes-widgets-0.8.4[${PYTHON_USEDEP}]
-   >=sci-visualization/fsleyes-props-1.6.7[${PYTHON_USEDEP}]
+   sci-libs/nibabel[${PYTHON_USEDEP}]
+   sci-visualization/fsleyes-widgets[${PYTHON_USEDEP}]
+   sci-visualization/fsleyes-props[${PYTHON_USEDEP}]
"
+#=sci-libs/nibabel-2*[${PYTHON_USEDEP}]
 
 PATCHES=(
"${FILESDIR}/${PN}-0.26.2-fsldir.patch"
+   "${FILESDIR}/${PN}-0.32.0-coverage.patch"
"${FILESDIR}/${PN}-0.32.0-tests_timeout.patch"
"${FILESDIR}/${PN}-0.32.0-tests_fail.patch"
)
 
-distutils_enable_tests pytest
-
-python_prepare_all() {
-   # do not depend on pytest-cov
-   sed -i -e '/addopts/d' setup.cfg || die
-
-   # Fatal Python error: Segmentation fault
-   sed -i -e 's:test_crop:_&:' \
-   tests/test_ortho_cropmode.py || die
-   sed -i -e 's:test_fillSelection:_&:' \
-   tests/test_ortho_editmode.py || die
-
-   # KeyError: 'Unknown atlas ID: harvardoxford-cortical'
-   sed -i -e 's:test_atlaspanel_toggleOverlay:_&:' \
-   tests/test_atlaspanel.py || die
-
-   # This hangs forever
-   sed -i -e 's:test_lightbox:_&:' \
-   tests/test_layouts.py || die
-
-   distutils-r1_python_prepare_all
+src_prepare() {
+   sed -i -e "s/Pillow>=3.2.0,<6.0/Pillow>=3.2.0/g" requirements.txt
+   distutils-r1_src_prepare
 }
 
 python_install_all() {
@@ -77,9 +63,16 @@ python_install_all() {
doicon userdoc/images/fsleyes_icon.png
local size
for size in 16 32 128 256 512 ; do
-   newicon -s ${size} 
assets/icons/app_icon/${PN}.iconset/icon_${size}x${size}.png "${PN}.png"
+   doicon -s ${size} 
assets/icons/app_icon/${PN}.iconset/icon_${size}x${size}.png
done
-   make_desktop_entry fsleyes FSLeyes "${PN}"
+   make_desktop_entry fsleyes FSLeyes 
/usr/share/icons/hicolor/128x128/apps/icon_128x128.png
+}
+
+pkg_postinst() {
+   gnome2_icon_cache_update
+}
+pkg_postrm() {
+   gnome2_icon_cache_update
 }
 
 python_test() {

diff --git a/sci-visualization/fsleyes/fsleyes-0.34.2.ebuild 
b/sci-visualization/fsleyes/fsleyes-0.34.2.ebuild
index b9b221a1e..36533c5a8 100644
--- a/sci-visualization/fsleyes/fsleyes-0.34.2.ebuild
+++ b/sci-visualization/fsleyes/fsleyes-0.34.2.ebuild
@@ -17,7 +17,8 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+# hard masked dependency  >=dev-python/fslpy-3.1
+KEYWORDS=""
 
 DEPEND="
test? (

[gentoo-commits] proj/sci:master commit in: sci-visualization/fsleyes-widgets/

2021-01-31 Thread Horea Christian

commit: 720e1d6139727d6366b8d7ae69aedb5c297f113e
Author: Horea Christian  chymera  eu>
AuthorDate: Mon Feb  1 01:48:30 2021 +
Commit: Horea Christian  gmail  com>
CommitDate: Mon Feb  1 01:48:30 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=720e1d61

sci-visualization/fsleyes-widgets: keep old versions

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Horea Christian  chymera.eu>

 .../fsleyes-widgets/fsleyes-widgets-0.8.4.ebuild   | 47 ++
 1 file changed, 47 insertions(+)

diff --git a/sci-visualization/fsleyes-widgets/fsleyes-widgets-0.8.4.ebuild 
b/sci-visualization/fsleyes-widgets/fsleyes-widgets-0.8.4.ebuild
new file mode 100644
index 0..eac611cac
--- /dev/null
+++ b/sci-visualization/fsleyes-widgets/fsleyes-widgets-0.8.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1 virtualx
+
+MY_P="widgets-${PV}"
+
+DESCRIPTION="GUI widgets and utilities for the FSLeyes viewer"
+HOMEPAGE="https://git.fmrib.ox.ac.uk/fsl/fsleyes/fsleyes/tree/master";
+SRC_URI="https://git.fmrib.ox.ac.uk/fsl/fsleyes/widgets/-/archive/${PV}/${MY_P}.tar.gz
 -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="
+   test? (
+   dev-python/pytest[${PYTHON_USEDEP}]
+   )
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   "
+RDEPEND="
+   dev-python/deprecation[${PYTHON_USEDEP}]
+   =dev-python/numpy-1*[${PYTHON_USEDEP}]
+   dev-python/matplotlib[${PYTHON_USEDEP}]
+   =dev-python/six-1*[${PYTHON_USEDEP}]
+   dev-python/wxpython[${PYTHON_USEDEP}]
+   "
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+   "${FILESDIR}/fsleyes-widgets-0.8.4-coverage.patch"
+   "${FILESDIR}/fsleyes-widgets-0.8.4-tests.patch"
+)
+
+python_test() {
+   # If this could be set for the eclass, it might fix some of the tests:
+   # 
https://github.com/pauldmccarthy/fsleyes-widgets/issues/1#issuecomment-575387724
+   #xvfbargs="-screen 0 1920x1200x24 +extension RANDR"
+   virtx pytest --verbose || die
+}

[gentoo-commits] proj/sci:master commit in: sci-visualization/fsleyes-props/

2021-01-31 Thread Horea Christian

commit: e3edb6a6b3c72a2cf3a52504e46b33117316e5f1
Author: Horea Christian  chymera  eu>
AuthorDate: Mon Feb  1 01:46:36 2021 +
Commit: Horea Christian  gmail  com>
CommitDate: Mon Feb  1 01:46:36 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=e3edb6a6

sci-visualization/fsleyes-props: keep old version

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Horea Christian  chymera.eu>

 .../fsleyes-props/fsleyes-props-1.6.7.ebuild   | 46 ++
 1 file changed, 46 insertions(+)

diff --git a/sci-visualization/fsleyes-props/fsleyes-props-1.6.7.ebuild 
b/sci-visualization/fsleyes-props/fsleyes-props-1.6.7.ebuild
new file mode 100644
index 0..d9983906e
--- /dev/null
+++ b/sci-visualization/fsleyes-props/fsleyes-props-1.6.7.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit distutils-r1 virtualx
+
+MY_PN="props"
+
+DESCRIPTION="Object attribute management for the FSLeyes viewer"
+HOMEPAGE="https://git.fmrib.ox.ac.uk/fsl/fsleyes/fsleyes/tree/master";
+SRC_URI="https://git.fmrib.ox.ac.uk/fsl/fsleyes/${MY_PN}/-/archive/${PV}/${MY_PN}-${PV}.tar.gz";
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="
+   test? (
+   dev-python/pytest[${PYTHON_USEDEP}]
+   )
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   "
+RDEPEND="
+   dev-python/deprecation[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   dev-python/matplotlib[${PYTHON_USEDEP}]
+   dev-python/six[${PYTHON_USEDEP}]
+   dev-python/wxpython[${PYTHON_USEDEP}]
+   sci-visualization/fsleyes-widgets[${PYTHON_USEDEP}]
+   dev-python/fslpy[${PYTHON_USEDEP}]
+   "
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+PATCHES=(
+   "${FILESDIR}/fsleyes-props-1.6.7-coverage.patch"
+   "${FILESDIR}/fsleyes-props-1.6.7-tests.patch"
+)
+
+python_test() {
+   virtx pytest --verbose || die
+}

[gentoo-commits] repo/gentoo:master commit in: gui-libs/display-manager-init/

2021-01-31 Thread Matt Turner

commit: a8ac11c878369bfa15b5603b08c09f06cd80fbbe
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Feb  1 01:30:43 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Feb  1 01:31:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8ac11c8

gui-libs/display-manager-init: Add ~riscv keyword

Signed-off-by: Matt Turner  gentoo.org>

 gui-libs/display-manager-init/display-manager-init-1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gui-libs/display-manager-init/display-manager-init-1.0.ebuild 
b/gui-libs/display-manager-init/display-manager-init-1.0.ebuild
index 586c5ddc0f5..e78fa567607 100644
--- a/gui-libs/display-manager-init/display-manager-init-1.0.ebuild
+++ b/gui-libs/display-manager-init/display-manager-init-1.0.ebuild
@@ -7,7 +7,7 @@ DESCRIPTION="RC init files for starting display and login 
managers"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:X11";
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 
 S="${FILESDIR}"

[gentoo-commits] proj/sci:master commit in: dev-python/fslpy/

2021-01-31 Thread Horea Christian

commit: 309efaaf039e3b7f2502cc079450f46c66ed1678
Author: Horea Christian  chymera  eu>
AuthorDate: Mon Feb  1 01:26:09 2021 +
Commit: Horea Christian  gmail  com>
CommitDate: Mon Feb  1 01:26:31 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=309efaaf

dev-python/fslpy: partly revert f70ee4b8e441a7a03d4440c9672aef88664b6e81

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Horea Christian  chymera.eu>

 dev-python/fslpy/{fslpy-3.4.0.ebuild => fslpy-2.8.4.ebuild} | 10 +++---
 dev-python/fslpy/fslpy-3.4.0.ebuild |  3 ++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/dev-python/fslpy/fslpy-3.4.0.ebuild 
b/dev-python/fslpy/fslpy-2.8.4.ebuild
similarity index 89%
copy from dev-python/fslpy/fslpy-3.4.0.ebuild
copy to dev-python/fslpy/fslpy-2.8.4.ebuild
index a01f84ab8..ed427ded2 100644
--- a/dev-python/fslpy/fslpy-3.4.0.ebuild
+++ b/dev-python/fslpy/fslpy-2.8.4.ebuild
@@ -4,7 +4,6 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1 virtualx
 
@@ -15,7 +14,14 @@ 
SRC_URI="https://github.com/pauldmccarthy/${PN}/archive/${PV}.tar.gz -> ${P}.tar
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+IUSE="test"
 
+DEPEND="
+   test? (
+   dev-python/pytest[${PYTHON_USEDEP}]
+   )
+   dev-python/setuptools[${PYTHON_USEDEP}]
+"
 RDEPEND="
dev-python/h5py[${PYTHON_USEDEP}]
dev-python/indexed_gzip[${PYTHON_USEDEP}]
@@ -31,8 +37,6 @@ RDEPEND="
 
 PATCHES=( "${FILESDIR}/fslpy-2.7.0-coverage.patch" )
 
-distutils_enable_tests pytest
-
 python_test() {
virtx pytest --niters=50 -m "not (dicomtest or longtest or fsltest)" 
--verbose || die
 }

diff --git a/dev-python/fslpy/fslpy-3.4.0.ebuild 
b/dev-python/fslpy/fslpy-3.4.0.ebuild
index a01f84ab8..ee8dcf336 100644
--- a/dev-python/fslpy/fslpy-3.4.0.ebuild
+++ b/dev-python/fslpy/fslpy-3.4.0.ebuild
@@ -14,7 +14,8 @@ 
SRC_URI="https://github.com/pauldmccarthy/${PN}/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+# Fails with file collisions with =sci-biology/fsl-6.0.2-r1
+KEYWORDS=""
 
 RDEPEND="
dev-python/h5py[${PYTHON_USEDEP}]

[gentoo-commits] repo/gentoo:master commit in: net-misc/teamviewer/

2021-01-31 Thread Thomas Deutschmann

commit: b5bd3041b4f4da9a5e5a556469d1ee4dffe200f3
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon Feb  1 00:23:07 2021 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Feb  1 00:23:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5bd3041

net-misc/teamviewer: bump to v15.14.3

Closes: https://bugs.gentoo.org/751586
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann  gentoo.org>

 net-misc/teamviewer/Manifest   |  4 +-
 ...wer-15.5.3.ebuild => teamviewer-15.14.3.ebuild} | 54 +++---
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/net-misc/teamviewer/Manifest b/net-misc/teamviewer/Manifest
index b5760426f19..8504d7a88fc 100644
--- a/net-misc/teamviewer/Manifest
+++ b/net-misc/teamviewer/Manifest
@@ -1,2 +1,2 @@
-DIST teamviewer_15.5.3_amd64.tar.xz 13028200 BLAKE2B 
12eec74d2e737d8d091fa100f3a6ff56926257ddd7757f649d2acaacac55c29724690a9bc52bef9c9b966692f8d28d352dc5002b815b4b7e3fd535bb1b250105
 SHA512 
36a758759e1f0ebfc1e7cd559d5326f51704307373a96d4df1fae5d4e467cd638a9d2c7f4d40c7b2ad47ec4fc66e0f5b432596569b2226d92c18abe67ab01b50
-DIST teamviewer_15.5.3_i386.tar.xz 13562544 BLAKE2B 
55d16574968943ae5dd52d523b63ceadd1f74ec7a4440dc476e6498bb3c05cda395524af4d4d4b3b1b94eae5ea22b70bc91ee63c27be90986589d7a8ec50393e
 SHA512 
4022d179aedf8050ddb07f6ae44cac1a08f8f3e8a3b2593c2c3d97ba87f02d6b24db0247b173f64f38ed6128b148c025e0941e2695cf5fdbb443768e93dfd797
+DIST teamviewer_15.14.3_amd64.tar.xz 13216052 BLAKE2B 
d5fa55609a2bb6257c1fc95ec9dd3f330a4729c2af230600730fed06239b5cf2991733958790e254edb1d83191fd3467ae4b82547b089208799ee264c913506b
 SHA512 
2bdeb5563c48595ed6bbbaa21e3ab63f670da082bcef297052f974c62c15ec085385d055f9be6a6fabaa61aa57d213a8dd0aaa1700f9ff20ad8ced0655684d4f
+DIST teamviewer_15.14.3_i386.tar.xz 13733488 BLAKE2B 
14def908b2c2e86b49649264b0eab4b15594e15425b98333720f0025a0530cf3e2c350f54b996f6d48a6f44dd368899fec95c38ddeb6b909992fecf80a2bdc46
 SHA512 
02a2843424a19252546ce0598f0ec52dd4a0d02148e379c944b7976bba794858cc1ca58724bf5b9828b6dd38e3f3989bab8b17d7ca9285596fd450d2ce753668

diff --git a/net-misc/teamviewer/teamviewer-15.5.3.ebuild 
b/net-misc/teamviewer/teamviewer-15.14.3.ebuild
similarity index 76%
rename from net-misc/teamviewer/teamviewer-15.5.3.ebuild
rename to net-misc/teamviewer/teamviewer-15.14.3.ebuild
index d4da70a87a1..4636957e3f9 100644
--- a/net-misc/teamviewer/teamviewer-15.5.3.ebuild
+++ b/net-misc/teamviewer/teamviewer-15.14.3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 MY_PN=${PN}${PV/\.*}
-inherit desktop xdg-utils systemd
+inherit desktop systemd xdg
 
 DESCRIPTION="All-In-One Solution for Remote Access and Support over the 
Internet"
 HOMEPAGE="https://www.teamviewer.com";
@@ -31,7 +31,7 @@ RDEPEND="
!sys-auth/consolekit
 "
 
-# For consolekit incompatibility see 
https://forums.gentoo.org/viewtopic-p-8332956.html?sid=3cc21e5a27935e38975ee85bf03317ae#8332956
+# For consolekit incompatibility see 
https://forums.gentoo.org/viewtopic-p-8332956.html#8332956
 
 RESTRICT="bindist mirror"
 
@@ -109,28 +109,28 @@ src_install() {
 }
 
 pkg_postinst() {
-   xdg_icon_cache_update
-
-   elog "Please note that parallel installation of multiple versions of"
-   elog "TeamViewer is currently not supported at runtime. Bug #621818"
-   elog ""
-   elog "Before using TeamViewer, you need to start its daemon:"
-   elog "OpenRC:"
-   elog "# /etc/init.d/teamviewerd start"
-   elog "# rc-update add teamviewerd default"
-   elog
-   elog "Systemd:"
-   elog "# systemctl start teamviewerd.service"
-   elog "# systemctl enable teamviewerd.service"
-   elog
-   elog "To display additional command line options simply run:"
-   elog "$ teamviewer help"
-   elog
-   elog "Most likely TeamViewer will work normally only on systems with 
systemd"
-   elog "or elogind. See this thread for additional info:"
-   elog 
"https://forums.gentoo.org/viewtopic-p-8332956.html?sid=3cc21e5a27935e38975ee85bf03317ae#8332956";
-}
-
-pkg_postrm() {
-   xdg_icon_cache_update
+   xdg_pkg_postinst
+
+   if [[ -z "${REPLACING_VERSIONS}" ]]; then
+   # This is a new installation
+
+   elog "Please note that parallel installation of multiple 
versions of"
+   elog "TeamViewer is currently not supported at runtime. Bug 
#621818"
+   elog ""
+   elog "Before using TeamViewer, you need to start its daemon:"
+   elog "OpenRC:"
+   elog "# /etc/init.d/teamviewerd start"
+   elog "# rc-update add teamviewerd default"
+   elog
+   elog "Systemd:"
+   elog "# systemctl start teamviewerd.service"
+   elog "# systemctl enable teamvie

[gentoo-commits] repo/gentoo:master commit in: x11-apps/xinit/

2021-01-31 Thread Matt Turner

commit: 7d23816e9e9f9022618e04425c4a7c279c554fbf
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Jan 31 23:41:45 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Jan 31 23:43:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d23816e

x11-apps/xinit: Propagate ~riscv keywords

Signed-off-by: Matt Turner  gentoo.org>

 x11-apps/xinit/xinit-1.4.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-apps/xinit/xinit-1.4.1-r1.ebuild 
b/x11-apps/xinit/xinit-1.4.1-r1.ebuild
index 36ce2267f5c..a5d97f4e443 100644
--- a/x11-apps/xinit/xinit-1.4.1-r1.ebuild
+++ b/x11-apps/xinit/xinit-1.4.1-r1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 DESCRIPTION="X Window System initializer"
 
 LICENSE="${LICENSE} GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~arm-linux ~x86-linux"
 IUSE="twm"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: x11-base/xorg-server/

2021-01-31 Thread Matt Turner

commit: 5b5d96bb773ce856d27292df4fb5c934837d08cd
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Jan 31 23:42:06 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Jan 31 23:43:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b5d96bb

x11-base/xorg-server: Propagate ~riscv keywords

Signed-off-by: Matt Turner  gentoo.org>

 x11-base/xorg-server/xorg-server-1.20.10-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-base/xorg-server/xorg-server-1.20.10-r1.ebuild 
b/x11-base/xorg-server/xorg-server-1.20.10-r1.ebuild
index 76dc03e58d8..4d2f85351b5 100644
--- a/x11-base/xorg-server/xorg-server-1.20.10-r1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.20.10-r1.ebuild
@@ -10,7 +10,7 @@ 
EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git";
 DESCRIPTION="X.Org X servers"
 SLOT="0/${PV}"
 if [[ ${PV} != * ]]; then
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"

[gentoo-commits] repo/gentoo:master commit in: net-misc/curl/

2021-01-31 Thread Andreas Sturmlechner

commit: b6c3b87bc33bba6168572ac015ba50488ff35067
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Jan 29 20:40:31 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jan 31 23:41:33 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6c3b87b

net-misc/curl: Drop unused eutils, some cosmetics

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 net-misc/curl/curl-7.74.0-r4.ebuild | 184 ++--
 1 file changed, 94 insertions(+), 90 deletions(-)

diff --git a/net-misc/curl/curl-7.74.0-r4.ebuild 
b/net-misc/curl/curl-7.74.0-r4.ebuild
index c7d9410a7e0..a7f5ed1aa1d 100644
--- a/net-misc/curl/curl-7.74.0-r4.ebuild
+++ b/net-misc/curl/curl-7.74.0-r4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit autotools eutils prefix multilib-minimal
+inherit autotools prefix multilib-minimal
 
 DESCRIPTION="A Client that groks URLs"
 HOMEPAGE="https://curl.haxx.se/";
@@ -17,7 +17,22 @@ IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss 
+curl_ssl_openssl curl_ssl
 IUSE+=" nghttp3 quiche"
 IUSE+=" elibc_Winnt"
 
-#lead to lots of false negatives, bug #285669
+# c-ares must be disabled for threads
+# only one default ssl provider can be enabled
+REQUIRED_USE="
+   winssl? ( elibc_Winnt )
+   threads? ( !adns )
+   ssl? (
+   ^^ (
+   curl_ssl_gnutls
+   curl_ssl_mbedtls
+   curl_ssl_nss
+   curl_ssl_openssl
+   curl_ssl_winssl
+   )
+   )"
+
+# lead to lots of false negatives, bug #285669
 RESTRICT="!test? ( test )"
 
 RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
@@ -72,23 +87,7 @@ BDEPEND="virtual/pkgconfig
dev-lang/perl
)"
 
-# c-ares must be disabled for threads
-# only one default ssl provider can be enabled
-REQUIRED_USE="
-   winssl? ( elibc_Winnt )
-   threads? ( !adns )
-   ssl? (
-   ^^ (
-   curl_ssl_gnutls
-   curl_ssl_mbedtls
-   curl_ssl_nss
-   curl_ssl_openssl
-   curl_ssl_winssl
-   )
-   )"
-
-DOCS=( CHANGES README docs/FEATURES.md docs/INTERNALS.md \
-   docs/FAQ docs/BUGS.md docs/CONTRIBUTE.md )
+DOCS=( CHANGES README 
docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} )
 
 MULTILIB_WRAPPED_HEADERS=(
/usr/include/curl/curlbuild.h
@@ -98,15 +97,18 @@ MULTILIB_CHOST_TOOLS=(
/usr/bin/curl-config
 )
 
+PATCHES=(
+   "${FILESDIR}"/${PN}-7.30.0-prefix.patch
+   "${FILESDIR}"/${PN}-respect-cflags-3.patch
+   "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
+)
+
 src_prepare() {
-   eapply "${FILESDIR}"/${PN}-7.30.0-prefix.patch
-   eapply "${FILESDIR}"/${PN}-respect-cflags-3.patch
-   eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
+   default
 
sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
sed -i '/CURL_MAC_CFLAGS/d' configure.ac || die #637252
 
-   eapply_user
eprefixify curl-config.in
eautoreconf
 }
@@ -175,72 +177,74 @@ multilib_src_configure() {
# 3) --with/without options third.
# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
 
+   myconf+=(
+   $(use_enable alt-svc)
+   --enable-crypto-auth
+   --enable-dict
+   --disable-ech
+   --enable-file
+   $(use_enable ftp)
+   $(use_enable gopher)
+   $(use_enable hsts)
+   --enable-http
+   $(use_enable imap)
+   $(use_enable ldap)
+   $(use_enable ldap ldaps)
+   --disable-ntlm-wb
+   $(use_enable pop3)
+   --enable-rt
+   --enable-rtsp
+   $(use_enable samba smb)
+   $(use_with ssh libssh2)
+   $(use_enable smtp)
+   $(use_enable telnet)
+   $(use_enable tftp)
+   --enable-tls-srp
+   $(use_enable adns ares)
+   --enable-cookies
+   --enable-dateparse
+   --enable-dnsshuffle
+   --enable-doh
+   --enable-hidden-symbols
+   --enable-http-auth
+   $(use_enable ipv6)
+   --enable-largefile
+   --enable-manual
+   --enable-mime
+   --enable-netrc
+   $(use_enable progress-meter)
+   --enable-proxy
+   --disable-sspi
+   $(use_enable static-libs static)
+   $(use_enable threads threaded-resolver)
+   $(use_enable threads pthreads)
+   --disable-versioned-symbols
+   --without-amissl
+   --without-bearssl
+   --without-cyassl
+   --without-darwinssl
+

[gentoo-commits] repo/gentoo:master commit in: games-engines/dMagnetic/

2021-01-31 Thread James Le Cuirot

commit: f8eebb330965eb5eebe717485ddfacc82647c28d
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Jan 31 23:13:15 2021 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Jan 31 23:13:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8eebb33

games-engines/dMagnetic: Fix hprefixify call

dMagnetic.ini is generated now.

Package-Manager: Portage-3.0.14, Repoman-3.0.1
Signed-off-by: James Le Cuirot  gentoo.org>

 games-engines/dMagnetic/dMagnetic-0.30.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-engines/dMagnetic/dMagnetic-0.30.ebuild 
b/games-engines/dMagnetic/dMagnetic-0.30.ebuild
index 76297ab3de5..1e15cd42de8 100644
--- a/games-engines/dMagnetic/dMagnetic-0.30.ebuild
+++ b/games-engines/dMagnetic/dMagnetic-0.30.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
default
-   hprefixify ${PN}.ini src/toplevel/${PN}.c
+   hprefixify src/toplevel/${PN}{,_helpscreens}.c
 }
 
 src_compile() {

[gentoo-commits] proj/releng:consolidate-upload commit in: tools/

2021-01-31 Thread Matt Turner

commit: 22d3877eb4a7d7e7eb5c89269ae3bca660125df2
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Jan 31 23:00:32 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Jan 31 23:00:32 2021 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=22d3877e

tools: Correct ARM stage names

Signed-off-by: Matt Turner  gentoo.org>

 tools/catalyst-auto-arm.conf  | 8 
 tools/catalyst-auto-qemu-arm.conf | 8 
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf
index 829ff4c5..49495a2c 100644
--- a/tools/catalyst-auto-arm.conf
+++ b/tools/catalyst-auto-arm.conf
@@ -79,10 +79,10 @@ post_build() {
upload stage3-armv6j-systemd-${TIMESTAMP}*.xz*
;;
armv6j/stage3-hardfloat.spec)
-   upload stage3-armv6j-hardfloat-${TIMESTAMP}*.xz*
+   upload stage3-armv6j_hardfp-${TIMESTAMP}*.xz*
;;
armv6j/stage3-hardfloat-systemd.spec)
-   upload stage3-armv6j-hardfloat-systemd-${TIMESTAMP}*.xz*
+   upload stage3-armv6j_hardfp-systemd-${TIMESTAMP}*.xz*
;;
armv7a/stage3.spec)
upload stage3-armv7a-${TIMESTAMP}*.xz*
@@ -91,10 +91,10 @@ post_build() {
upload stage3-armv7a-systemd-${TIMESTAMP}*.xz*
;;
armv7a/stage3-hardfloat.spec)
-   upload stage3-armv7a-hardfloat-${TIMESTAMP}*.xz*
+   upload stage3-armv7a_hardfp-${TIMESTAMP}*.xz*
;;
armv7a/stage3-hardfloat-systemd.spec)
-   upload stage3-armv7a-hardfloat-systemd-${TIMESTAMP}*.xz*
+   upload stage3-armv7a_hardfp-systemd-${TIMESTAMP}*.xz*
;;
esac
 

diff --git a/tools/catalyst-auto-qemu-arm.conf 
b/tools/catalyst-auto-qemu-arm.conf
index 0e2d7826..e30178dc 100644
--- a/tools/catalyst-auto-qemu-arm.conf
+++ b/tools/catalyst-auto-qemu-arm.conf
@@ -80,10 +80,10 @@ post_build() {
upload stage3-armv6j-systemd-${TIMESTAMP}*.xz*
;;
armv6j/stage3-hardfloat.spec)
-   upload stage3-armv6j-hardfloat-${TIMESTAMP}*.xz*
+   upload stage3-armv6j_hardfp-${TIMESTAMP}*.xz*
;;
armv6j/stage3-hardfloat-systemd.spec)
-   upload stage3-armv6j-hardfloat-systemd-${TIMESTAMP}*.xz*
+   upload stage3-armv6j_hardfp-systemd-${TIMESTAMP}*.xz*
;;
armv7a/stage3.spec)
upload stage3-armv7a-${TIMESTAMP}*.xz*
@@ -92,10 +92,10 @@ post_build() {
upload stage3-armv7a-systemd-${TIMESTAMP}*.xz*
;;
armv7a/stage3-hardfloat.spec)
-   upload stage3-armv7a-hardfloat-${TIMESTAMP}*.xz*
+   upload stage3-armv7a_hardfp-${TIMESTAMP}*.xz*
;;
armv7a/stage3-hardfloat-systemd.spec)
-   upload stage3-armv7a-hardfloat-systemd-${TIMESTAMP}*.xz*
+   upload stage3-armv7a_hardfp-systemd-${TIMESTAMP}*.xz*
;;
esac

[gentoo-commits] proj/releng:consolidate-upload commit in: tools/

2021-01-31 Thread Matt Turner

commit: a309ae36ac174b984f4efb20525b0ba8509e91b1
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Jan 31 23:06:09 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Jan 31 23:06:09 2021 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=a309ae36

tools: Log non-uploaded stages when they finish

Signed-off-by: Matt Turner  gentoo.org>

 tools/catalyst-auto-alpha.conf  | 3 +++
 tools/catalyst-auto-arm.conf| 3 +++
 tools/catalyst-auto-arm64.conf  | 3 +++
 tools/catalyst-auto-hppa.conf   | 3 +++
 tools/catalyst-auto-ia64.conf   | 3 +++
 tools/catalyst-auto-ppc.conf| 3 +++
 tools/catalyst-auto-ppc64le.conf| 3 +++
 tools/catalyst-auto-qemu-arm.conf   | 3 +++
 tools/catalyst-auto-qemu-riscv.conf | 3 +++
 tools/catalyst-auto-s390.conf   | 3 +++
 tools/catalyst-auto-s390x.conf  | 3 +++
 tools/catalyst-auto-sparc64.conf| 3 +++
 12 files changed, 36 insertions(+)

diff --git a/tools/catalyst-auto-alpha.conf b/tools/catalyst-auto-alpha.conf
index f755c9b5..6f52056d 100644
--- a/tools/catalyst-auto-alpha.conf
+++ b/tools/catalyst-auto-alpha.conf
@@ -45,6 +45,9 @@ post_build() {
stage3.spec)
upload stage3-*${TIMESTAMP}*.bz2*
;;
+   *)
+   echo "Finished ${spec}"
+   ;;
esac
 
popd >/dev/null

diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf
index 49495a2c..a323f33d 100644
--- a/tools/catalyst-auto-arm.conf
+++ b/tools/catalyst-auto-arm.conf
@@ -96,6 +96,9 @@ post_build() {
armv7a/stage3-hardfloat-systemd.spec)
upload stage3-armv7a_hardfp-systemd-${TIMESTAMP}*.xz*
;;
+   *)
+   echo "Finished ${spec}"
+   ;;
esac
 
popd >/dev/null

diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index 5346153f..518fa972 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -40,6 +40,9 @@ post_build() {
systemd-stage3.spec)
upload stage3-${SUBARCH}-systemd-${TIMESTAMP}*.xz*
;;
+   *)
+   echo "Finished ${spec}"
+   ;;
esac
 
popd >/dev/null

diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index 8ad8f767..d666addf 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -57,6 +57,9 @@ post_build() {
hppa2.0/stage3.spec)
upload stage3-hppa2.0-*${TIMESTAMP}*.bz2*
;;
+   *)
+   echo "Finished ${spec}"
+   ;;
esac
 
popd >/dev/null

diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index 009d5fd9..054f28db 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -39,6 +39,9 @@ post_build() {
stage3.spec)
upload stage3-*${TIMESTAMP}*.xz*
;;
+   *)
+   echo "Finished ${spec}"
+   ;;
esac
 
popd >/dev/null

diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index 3a81822e..dd9904dd 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -48,6 +48,9 @@ post_build() {
ppc64/stage3.spec)
upload stage3-ppc64-*${TIMESTAMP}*.xz*
;;
+   *)
+   echo "Finished ${spec}"
+   ;;
esac
 
popd >/dev/null

diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
index a93975ca..2803268d 100644
--- a/tools/catalyst-auto-ppc64le.conf
+++ b/tools/catalyst-auto-ppc64le.conf
@@ -52,6 +52,9 @@ post_build() {
musl-hardened-stage3*.spec)
upload 
musl-hardened/stage3-ppc64le-musl-hardened-${TIMESTAMP}*.xz*
;;
+   *)
+   echo "Finished ${spec}"
+   ;;
esac
 
popd >/dev/null

diff --git a/tools/catalyst-auto-qemu-arm.conf 
b/tools/catalyst-auto-qemu-arm.conf
index e30178dc..efac2eb8 100644
--- a/tools/catalyst-auto-qemu-arm.conf
+++ b/tools/catalyst-auto-qemu-arm.conf
@@ -97,6 +97,9 @@ post_build() {
armv7a/stage3-hardfloat-systemd.spec)
upload stage3-armv7a_hardfp-systemd-${TIMESTAMP}*.xz*
;;
+   *)
+   echo "Finished ${spec}"
+   ;;
esac
 
popd >/dev/null

diff --git a/tools/catalyst-auto-qemu-riscv.conf 
b/tools/catalyst-auto-qemu-riscv.conf
index e809b598..261d6db4 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -51,6 +51,9 @@ post_build() {
stage3*lp64*.spec)
upload stage3-rv64_$(echo ${spec}|sed -e 
's:^stage3-::g' -e 's:\.spec$::g')-${TIMESTAMP}*.xz*
;;
+   *)
+   echo "Finished ${spec}"
+   ;;
esac
 
popd >/dev/null

1 2 3 >

1 - 100 of 255 matches

Mail list logo