[gentoo-commits] repo/gentoo:master commit in: sys-kernel/gentoo-sources/

2021-03-30 Thread Alice Ferrazzi
commit: 5b9a69816725fae002399a2cf2e07cdb78d8eaa0
Author: Alice Ferrazzi  gentoo  org>
AuthorDate: Wed Mar 31 06:54:46 2021 +
Commit: Alice Ferrazzi  gentoo  org>
CommitDate: Wed Mar 31 06:55:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b9a6981

sys-kernel/gentoo-sources: Linux patch 5.10.27

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

 sys-kernel/gentoo-sources/Manifest |  3 +++
 .../gentoo-sources/gentoo-sources-5.10.27.ebuild   | 28 ++
 2 files changed, 31 insertions(+)

diff --git a/sys-kernel/gentoo-sources/Manifest 
b/sys-kernel/gentoo-sources/Manifest
index 20217a62446..ebebd1c1223 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -67,6 +67,9 @@ DIST genpatches-5.10-28.extras.tar.xz 1772 BLAKE2B 
a38628309a29e636ab6499464d360
 DIST genpatches-5.10-29.base.tar.xz 932392 BLAKE2B 
eff5249f3471134c5601aaabf1b470dcdf7d2e38c79ff79cc8bd4a0cf33e0dcce63e7e01370eda084c02862af422b442953e3ea4e8a8a6f012df5d8ebf8cca8b
 SHA512 
0909fa9f9fb62dc87e5a18cb15aedf483c9a3c3470e917768e86d0b7eb4bf1240c1ab2b0f406e1c26819cbe7924f1898019c8a2b7981f1c6e8081c92f67de1a7
 DIST genpatches-5.10-29.experimental.tar.xz 16556 BLAKE2B 
1e7a36814db26d89f8455b241a1fd0dca3e46b8bb5715c5675e4fa8e790eac723f80c23d53755ae26f66777c0937b80ee57ab46d5cd6db2cc60614ab1bf4934b
 SHA512 
2fef7301b5cb97e1616329e07a09734e8c3728511b1b9a19afba8e59f6e5651034936470f3d4ce665b94088579359030b0c6610426056c12adf8e72023f54dd2
 DIST genpatches-5.10-29.extras.tar.xz 1772 BLAKE2B 
30b3a5b57b99b046872907007fabffbed366cae11aebc2979129716be3c779ccfd87c6834f2e4b77dc1131c603ced8ffdd089c11264abc8b70d7590cdd191562
 SHA512 
ea9c1408543fa3b0a3a32ac11c7cd2591d7a5df73139b4ddff752b7a37963806fcea422f0cf23b8153b84e8dab1ed8169e51cce105c75c255d6ed91c03955a06
+DIST genpatches-5.10-30.base.tar.xz 991908 BLAKE2B 
524e7e66358b3bf311f1347e6a8c8daeed82e6a71340e51157a207580e4e028f230caea696c1e611d57d129113948938a62ef105adcf8f09c5041baedde93aa4
 SHA512 
3986617d71cd582ece369693624f0013cd88b57a65c3a051975da30931973b161e01fce104abc6d2f08295a2c27e536b98782435c1110086175c7fd5051d62d1
+DIST genpatches-5.10-30.experimental.tar.xz 16544 BLAKE2B 
3d9225f0f460fe316053360606a8284faccef03af7e22e1156045e71a24ea83fa900258cc80439089b0d5b54ac2022f548bc3f47fc04d7645d3c27033bc9f2bb
 SHA512 
fce31c497391aff783eab83aa3a23949e13009a0422b6b5b1cbf295e133b8140215690c56c9550bd8b532e95490e40626a33bff152da066933e5a5270e392953
+DIST genpatches-5.10-30.extras.tar.xz 1772 BLAKE2B 
7fd98f16922f7a3ea703a5dd2622152b761a47fb7da8a108281e4a9ecb37f9295347a23081b2859039b8b47049ac530d74a05358b7fdb4a8c9a97fffd8103c44
 SHA512 
ca23be16f47ebea149496eafb0ce9c6068a3a46be01abf9d95b5e693e5a5063e7692003bc23658269d55f923233f1124854515a3f35a94dc385410c6978e25ac
 DIST genpatches-5.11-11.base.tar.xz 410528 BLAKE2B 
cdc71103e3cf40231cddb71f320c10cb2f948636fd48d1d1df66d6cd535b2f291f22a7da0db9b8fea40e64ad503abe4542506cd928409cf1ac0c8e0944a44435
 SHA512 
451628c197f3544438f41fd5a604d451981c4e352ea40a53b60492b6f1b57438281c00b0209064cd7a46b57a70ae307a2108549cebef8574955fe0b66d277fc9
 DIST genpatches-5.11-11.experimental.tar.xz 69424 BLAKE2B 
ae65060ce4bc38d46cae60bdf62809217a2f2b32ebc5f89af4bf95c460c643a474f7b0da89de83bb8747f30c2e4ca6a6754b37b825688b9df3307f3608213704
 SHA512 
92983999fcc1f710c80ecc48fb8510302d840e2f3ae39fe78aa369d8ace4bd9b85b7f3073d2d1d302cf48270595539bdf2e44894c53833c52c13fa60690c760b
 DIST genpatches-5.11-11.extras.tar.xz 1772 BLAKE2B 
aa1f6397aae7927d1aac1d29e98d8535b6e8f7b2b6b2009594497b846946cb5dda2dd3dac69a1f29989b54aa2ef9e2879418145a525865179f32e7ab76987e66
 SHA512 
a72b4fb93e09919aadc9c1d306d3817135f3e4160e1b10f69367e3cb49b1502706dd9cd6e399945f946cbecf047d53f8100459acda04dce231890fe9fe212a08

diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.10.27.ebuild 
b/sys-kernel/gentoo-sources/gentoo-sources-5.10.27.ebuild
new file mode 100644
index 000..a75f472c533
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.10.27.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="30"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches";
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the 
${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+   kernel-2_pkg_postinst
+   einfo "For more info on this patchset, and how to report problems, see:"
+   einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+   kernel-2_pkg_postrm
+}



[gentoo-commits] repo/proj/prefix:master commit in: scripts/

2021-03-30 Thread Fabian Groffen
commit: 7ca9acf145b59b0efb129a52788308e7764971bf
Author: Fabian Groffen  gentoo  org>
AuthorDate: Wed Mar 31 06:51:08 2021 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Wed Mar 31 06:51:08 2021 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=7ca9acf1

scripts/bootstrap-prefix: ensure stage1 gcc wrapper is functional

In the these days quite uncommon case of calling the stage functions
directly, stage1's gcc wrapper would use the unset variable STAGE1_PATH.
This variable is normally set in the interactive proze that re-defines
PATH to remove any unwanted stuff.

Avoid this dependency by storing the original value of PATH right at the
startup of the script, such that stage1 can refer to it, whether or not
called from the interactive wrapper or not.

Thanks Sargun Dhillon in bug #779145.

Closes: https://bugs.gentoo.org/779145
Signed-off-by: Fabian Groffen  gentoo.org>

 scripts/bootstrap-prefix.sh | 8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 6789abd382..dd534d0aac 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1447,6 +1447,7 @@ bootstrap_stage1() {
# we're working with now, bug #650284
[[ -x ${ROOT}/tmp/usr/bin/bash ]] \
|| (bootstrap_bash) || return 1
+
# Some host tools need to be wrapped to be useful for us.
# We put them in tmp/usr/local/bin, to not accidentally
# be identified as stage1-installed like in bug #615410.
@@ -1475,7 +1476,7 @@ bootstrap_stage1() {
# We need to direct the system gcc to find the 
system binutils.
cat >> "${ROOT}"/tmp/usr/local/bin/gcc <<-EOF
#! /bin/sh
-   PATH="${STAGE1_PATH}" export PATH
+   PATH="${ORIGINAL_PATH}" export PATH
exec "\${0##*/}" "\$@"
EOF
cp "${ROOT}"/tmp/usr/local/bin/g{cc,++}
@@ -2768,7 +2769,6 @@ EOF
# location seems ok
break
done
-   export STAGE1_PATH=${PATH}
export 
PATH="$EPREFIX/usr/bin:$EPREFIX/bin:$EPREFIX/tmp/usr/bin:$EPREFIX/tmp/bin:$EPREFIX/tmp/usr/local/bin:${PATH}"
 
cat << EOF
@@ -3078,9 +3078,6 @@ case ${CHOST} in
powerpc-*darwin*)
DARWIN_USE_GCC=1  # must use GCC, Clang is impossible
;;
-#  arm64-*darwin*)
-#  DARWIN_USE_GCC=0  # cannot use GCC yet (needs silicon support)
-#  ;;
*-darwin*)
# normalise value of DARWIN_USE_GCC
case ${DARWIN_USE_GCC} in
@@ -3138,6 +3135,7 @@ elif [[ -z $1 ]] ; then
 fi
 
 ROOT="$1"
+ORIGINAL_PATH="${PATH}"
 set_helper_vars
 
 case $ROOT in



[gentoo-commits] repo/gentoo:master commit in: sys-kernel/gentoo-sources/

2021-03-30 Thread Alice Ferrazzi
commit: 5c1f691eae6180c4183ad873c36998c1c9ebc10d
Author: Alice Ferrazzi  gentoo  org>
AuthorDate: Wed Mar 31 06:46:14 2021 +
Commit: Alice Ferrazzi  gentoo  org>
CommitDate: Wed Mar 31 06:47:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c1f691e

sys-kernel/gentoo-sources: Linux patch 5.11.11

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

 sys-kernel/gentoo-sources/Manifest |  3 +++
 .../gentoo-sources/gentoo-sources-5.11.11.ebuild   | 28 ++
 2 files changed, 31 insertions(+)

diff --git a/sys-kernel/gentoo-sources/Manifest 
b/sys-kernel/gentoo-sources/Manifest
index 869a66d0635..20217a62446 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -76,6 +76,9 @@ DIST genpatches-5.11-12.extras.tar.xz 1768 BLAKE2B 
b590414d965e422aeb00a1cf719f9
 DIST genpatches-5.11-13.base.tar.xz 437712 BLAKE2B 
3120f9e413b8bf9c0630a9d11eae4c77d0162f67e1b84f9a84b3ea9321ddda5ce2872d61d9451bc363ff23c3fe8bc409693ac903641ca4f1e42c405099b77fef
 SHA512 
7c2488f2e5e857b50f5616f90f743df308686d5e671cb2186bc647ac74e79eb04550d7f6f1d12623d847cd168dcbaa431bbdf128e57863672b084addf8ac0c2d
 DIST genpatches-5.11-13.experimental.tar.xz 68148 BLAKE2B 
4e8470e3fa3d9791a95e930a7be1b74f9eb7e5abc78181b5f52e46d734276b181ac0874a2bfe8f10b8871880781ba1896b95a3efa0e1e13fb677e44a1dc4ae23
 SHA512 
e00cf1bb1fdc833cd2242a439d6568bd4e716ced61496db5e6ed267569ce2b7e352fc75d52989cabf8cba327ad3ffc508466adc1b612e1beb0321d5c3ba44066
 DIST genpatches-5.11-13.extras.tar.xz 1772 BLAKE2B 
86e00dbb0dd3a48b83fc4c73d6c10f4dd0031bbb34a0f1b0e2cbc263ad6eadf55b32fff5e4c9bae5077101d90b2fb42758ad5517004a57661f2befdc745576ee
 SHA512 
e8233834781ba3e6582ae26d8bef09490e755e9daca0396a8e94fe3dc65f49c399c422b1143a00eeb693b2f6885ade600d599c89165dba809b578d601aaedda1
+DIST genpatches-5.11-14.base.tar.xz 512392 BLAKE2B 
96c67f4b7029c2368e14e3b02dc45dbe4e72108cda692483b32f6e036bd27e82faef0a950e9ede69bdbd8152bc2f88d446eaf04055d135f654753074fffb1ec2
 SHA512 
6ec28a0c1084046ebb4d201a550866a202d6a2852f5ffc8e327861fd8e964a22ab0a565fd99277010fd2d6038fd0d81f2bd126faa78a351d97c7310dd30904bc
+DIST genpatches-5.11-14.experimental.tar.xz 68172 BLAKE2B 
ea082fc1705ce3ce95d97d5e4e7c656ca4a4b3968d3a47e39e70b95f2a15a41fed42353b7269033748058ba872273f7961ed4ba486f56523ba7e676bd7a249c8
 SHA512 
39f1ea31e148398cb3e2d85786bfcf13f978ae8af9ee685d452f61182536fc9b00810547988c209d2388293b9a67ef4a17654011add54f22a613dd481de24ae5
+DIST genpatches-5.11-14.extras.tar.xz 1772 BLAKE2B 
811235dc06b33befddfc22a9e018d1e5447fcf361f637e3a58de2c14fa5860fd8ce027db43892a332eb0ffa99311a357b170ba2bd37a7a4c4888307dd8cc6354
 SHA512 
0a8fc3dfa7efbbf393b1f2ae65f6cc4bd440a5e4bc6a36eaacb5ca25cba5a154fd19621124c025143da1ff499ef24463efd58437b76147fed1bee7e4ec1155e7
 DIST genpatches-5.11-7.base.tar.xz 309432 BLAKE2B 
2ada3d18e2c5e55c56d00ce460083b1bcc0d4643f4ebc82a74acef6722c93c1585b9d4034692f5e332c39c0fa9a8661378e677710c5774c0a7e74bed0e0eec9f
 SHA512 
87fa07527691a7b0c466db8625eb8892b8e7400af1f131265cb8e2e66e551f47a32d7cba9be6167d00e1f584de414bdb1409b504dad70e6139817999fb34a346
 DIST genpatches-5.11-7.experimental.tar.xz 6440 BLAKE2B 
dd939c3f624cc84589cab0c3772c72d232038c32eb9a61f64d927a3e1f1de8a6af2c0dbff89ff542ff5332ecd4a7fe6e526db446373b63dc6591cfc801d94356
 SHA512 
c9a3702767bee74ab0ab13eb1ac65346ea8edc62feea5992a4b6a5ee564c15ffd4c3d21299f50d1996cf59ebce2fc03a15927398b2394428fc78cee3b6fc22d2
 DIST genpatches-5.11-7.extras.tar.xz 1772 BLAKE2B 
cdd50d5c8d837cab21d3d06a259b3db19aad9de31e592665e5274e288fa66257bb20eb6b15770732de25bf9be3b901bdc497f5fa301ec7f025de4384dd657120
 SHA512 
29b62027052e57645b23ba3615697195e324aca7a1af5a46fe0b1d8d2c8a170979c6713c538788577ca22dc8b0d05d4070e656172f6c9388b8ff9a027b33cb5d

diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.11.11.ebuild 
b/sys-kernel/gentoo-sources/gentoo-sources-5.11.11.ebuild
new file mode 100644
index 000..0be2f31b243
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.11.11.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="14"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches";
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the 
${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+   kernel-2_pkg_postinst
+   einfo "For more info on this patchset, and how to report problems, see:"
+   einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+   kernel-2_pkg_postrm
+}



[gentoo-commits] proj/portage:master commit in: repoman/lib/repoman/

2021-03-30 Thread Zac Medico
commit: 1b0cbed41a380e9603b12b1f1dec1e6dd42a8aeb
Author: Zac Medico  gentoo  org>
AuthorDate: Wed Mar 31 06:33:04 2021 +
Commit: Zac Medico  gentoo  org>
CommitDate: Wed Mar 31 06:33:32 2021 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=1b0cbed4

repoman/lib/repoman/argparser.py: W0611: Unused import sys (unused-import)

Signed-off-by: Zac Medico  gentoo.org>

 repoman/lib/repoman/argparser.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/repoman/lib/repoman/argparser.py b/repoman/lib/repoman/argparser.py
index 47215693c..495fdfa60 100644
--- a/repoman/lib/repoman/argparser.py
+++ b/repoman/lib/repoman/argparser.py
@@ -6,7 +6,6 @@
 
 import argparse
 import logging
-import sys
 
 # import our initialized portage instance
 from repoman._portage import portage



[gentoo-commits] repo/gentoo:master commit in: media-libs/openexr/files/, media-libs/openexr/

2021-03-30 Thread Joonas Niilola
commit: 58d2ffc5446d020cde8d473c32485ad5f2e4c6f1
Author: Bernd Waibel  posteo  net>
AuthorDate: Fri Mar 26 16:46:35 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Mar 31 06:29:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58d2ffc5

media-libs/openexr: drop 2.3.0

Security cleanup

Bug: https://bugs.gentoo.org/770229
Bug: https://bugs.gentoo.org/762862
Bug: https://bugs.gentoo.org/746794
Bug: https://bugs.gentoo.org/717474
Bug: https://bugs.gentoo.org/656680
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Bernd Waibel  posteo.net>
Signed-off-by: Joonas Niilola  gentoo.org>

 media-libs/openexr/Manifest|   1 -
 ...penexr-2.2.0-Install-missing-header-files.patch |  60 ---
 .../openexr-2.2.0-fix-config.h-collision.patch |  43 
 .../openexr-2.2.0-fix-cpuid-on-abi_x86_32.patch|  75 -
 .../openexr/files/openexr-2.3.0-bigendian.patch|  71 -
 .../openexr/files/openexr-2.3.0-bigendian2.patch   |  17 ---
 .../openexr/files/openexr-2.3.0-fix-bashisms.patch | 117 -
 .../files/openexr-2.3.0-fix-build-system.patch |  68 
 .../files/openexr-2.3.0-skip-bogus-tests.patch |  31 --
 .../files/openexr-2.3.0-tests-32bits-2.patch   |  17 ---
 .../openexr/files/openexr-2.3.0-tests-32bits.patch |  36 ---
 media-libs/openexr/openexr-2.3.0.ebuild|  79 --
 12 files changed, 615 deletions(-)

diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index 44ef0c20a7c..bdbd8277f8a 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -1,2 +1 @@
-DIST openexr-2.3.0.tar.gz 18412067 BLAKE2B 
c73c4db4e414010ed8cc9f9631f3e8b17f47edf89b4ecb459aa00ff54a316b3bb1489e332bc029e0917ac4ffe7e152082244102029fd375f183da6741788dab7
 SHA512 
003f5bb3bd010be1ad9ff1798643ef711c683c8191625fe9b59070c9cb0c649c277cd506d890c6b239d9cbab80e83e16f1c1d1d74117c916ee3a80e061953123
 DIST openexr-2.5.5.tar.gz 27536865 BLAKE2B 
d0c0b2fd39b2cfafb60b6d0de3960063ff62341cf22be519f874c0c83f05cb604c5d503bb8b88514c71c5a54a79afa80a7fd00c2df15ec2193f6b3cffdc117c6
 SHA512 
e511af26a8fe2175a641fd25d2dcc6ef807e00bee2aff06a4784125f916ffd47fe376fe0621d385b604180a239bbfee063f8ceee3f7b731fde3c38558e9fdcdf

diff --git 
a/media-libs/openexr/files/openexr-2.2.0-Install-missing-header-files.patch 
b/media-libs/openexr/files/openexr-2.2.0-Install-missing-header-files.patch
deleted file mode 100644
index 1075cd9a30f..000
--- a/media-libs/openexr/files/openexr-2.2.0-Install-missing-header-files.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From a018f82655402421a995565dd4a5192259cbc207 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs 
-Date: Sat, 23 Sep 2017 10:36:40 +0100
-Subject: [PATCH] OpenEXR: Install missing header files
-
-Some header files are not installed via Autotools, but are with
-CMake which breaks compatibility with certain programs. This patch
-enables Autotools to install these header files.
-
-Signed-off by: Jonathan Scruggs 

- OpenEXR/IlmImf/Makefile.am |  3 ++-
- OpenEXR/IlmImfUtil/Makefile.am | 17 +
- 2 files changed, 19 insertions(+), 1 deletion(-)
-
-diff --git a/IlmImf/Makefile.am b/IlmImf/Makefile.am
-index a7c219c..b7b96ac 100644
 a/IlmImf/Makefile.am
-+++ b/IlmImf/Makefile.am
-@@ -162,7 +162,8 @@ libIlmImfinclude_HEADERS = ImfForward.h ImfAttribute.h 
ImfBoxAttribute.h \
-  ImfMisc.h  \
-  ImfPartHelper.h \
-  ImfDeepImageState.h \
-- ImfDeepImageStateAttribute.h
-+ ImfDeepImageStateAttribute.h \
-+ ImfFloatVectorAttribute.h
- 
- noinst_HEADERS = ImfCompressor.h\
-ImfRleCompressor.h \
-diff --git a/IlmImfUtil/Makefile.am b/IlmImfUtil/Makefile.am
-index 8005ee1..e1d3674 100644
 a/IlmImfUtil/Makefile.am
-+++ b/IlmImfUtil/Makefile.am
-@@ -33,6 +33,23 @@ libIlmImfUtil_la_LIBADD =  -L$(top_builddir)/IlmImf 
$(ILMBASE_LIBS) -lIlmImf
- 
- libIlmImfUtilincludedir = $(includedir)/OpenEXR
- 
-+libIlmImfUtilinclude_HEADERS = ImfFlatImage.h \
-+ ImfDeepImage.h \
-+ ImfDeepImageChannel.h \
-+ ImfImageLevel.h \
-+ ImfDeepImageLevel.h \
-+ ImfDeepImageIO.h \
-+ ImfImageChannelRenaming.h \
-+ ImfImageIO.h \
-+ ImfFlatImageChannel.h \
-+ ImfImage.h \
-+ ImfFlatImageLevel.h \
-+ ImfImageDataWindow.h \
-+ ImfSampleCountChannel.h \
-+ ImfFlatImageIO.h \
-+ ImfImageChannel.h
-+
-+
- EXTRA_DIST = CMakeLists.txt
- 
- INCLUDES = \
--- 
-2.14.1

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/openvas-scanner/, net-analyzer/openvas-scanner/files/

2021-03-30 Thread Joonas Niilola
commit: c0c542fa48334cdbc3be019d30cb7b26927fe356
Author: Jonas Licht  fem  tu-ilmenau  de>
AuthorDate: Fri Mar 26 11:29:06 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Mar 31 06:28:56 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0c542fa

net-analyzer/openvas-scanner: fix build with lld

Closes: https://bugs.gentoo.org/740560
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Jonas Licht  fem.tu-ilmenau.de>
Closes: https://github.com/gentoo/gentoo/pull/20124
Signed-off-by: Joonas Niilola  gentoo.org>

 ...penvas-scanner-7.0.1-fix-linking-with-lld.patch | 33 ++
 .../openvas-scanner/openvas-scanner-20.8.1.ebuild  |  1 +
 .../openvas-scanner/openvas-scanner-7.0.1.ebuild   |  1 +
 3 files changed, 35 insertions(+)

diff --git 
a/net-analyzer/openvas-scanner/files/openvas-scanner-7.0.1-fix-linking-with-lld.patch
 
b/net-analyzer/openvas-scanner/files/openvas-scanner-7.0.1-fix-linking-with-lld.patch
new file mode 100644
index 000..2b31a7c7d22
--- /dev/null
+++ 
b/net-analyzer/openvas-scanner/files/openvas-scanner-7.0.1-fix-linking-with-lld.patch
@@ -0,0 +1,33 @@
+diff --git a/nasl/CMakeLists.txt b/nasl/CMakeLists.txt
+index b594679c..adf9a221 100644
+--- a/nasl/CMakeLists.txt
 b/nasl/CMakeLists.txt
+@@ -87,6 +87,28 @@ endif (NOT KSBA)
+ message (STATUS "Looking for pcap...")
+ find_library (PCAP pcap)
+ 
++message (STATUS "Looking for pcap... ${PCAP}")
++if (NOT PCAP)
++  message (SEND_ERROR "The pcap library is required.")
++endif (NOT PCAP)
++
++message (STATUS "Looking for pcap-config...")
++find_program (PCAP_CONFIG pcap-config)
++
++if (PCAP_CONFIG)
++  message (STATUS "Looking for pcap-config... ${PCAP_CONFIG}")
++  execute_process (COMMAND pcap-config --libs
++OUTPUT_VARIABLE PCAP_LDFLAGS
++OUTPUT_STRIP_TRAILING_WHITESPACE)
++  execute_process (COMMAND pcap-config --cflags
++OUTPUT_VARIABLE PCAP_CFLAGS
++OUTPUT_STRIP_TRAILING_WHITESPACE)
++else (PCAP_CONFIG)
++  message (STATUS "pcap-config not found, using defaults...")
++  set (PCAP_LDFLAGS "-L/usr/lib -lpcap")
++  set (PCAP_CFLAGS "-I/usr/include")
++endif (PCAP_CONFIG)
++
+ find_library (GPGME gpgme)
+ message (STATUS "Looking for gpgme... ${GPGME}")
+ if (NOT GPGME)

diff --git a/net-analyzer/openvas-scanner/openvas-scanner-20.8.1.ebuild 
b/net-analyzer/openvas-scanner/openvas-scanner-20.8.1.ebuild
index 22bdb9fec93..5d4642e49c5 100644
--- a/net-analyzer/openvas-scanner/openvas-scanner-20.8.1.ebuild
+++ b/net-analyzer/openvas-scanner/openvas-scanner-20.8.1.ebuild
@@ -51,6 +51,7 @@ BDEPEND="
 
 PATCHES=(
"${FILESDIR}"/${PN}-7.0.1-disable-automagic-dep.patch
+   "${FILESDIR}"/${PN}-7.0.1-fix-linking-with-lld.patch
#qa fix for rpath
"${FILESDIR}"/${P}-rpath-qa-fix.patch
 )

diff --git a/net-analyzer/openvas-scanner/openvas-scanner-7.0.1.ebuild 
b/net-analyzer/openvas-scanner/openvas-scanner-7.0.1.ebuild
index 1fc5a911179..6b20b2711f2 100644
--- a/net-analyzer/openvas-scanner/openvas-scanner-7.0.1.ebuild
+++ b/net-analyzer/openvas-scanner/openvas-scanner-7.0.1.ebuild
@@ -50,6 +50,7 @@ BDEPEND="
 
 PATCHES=(
"${FILESDIR}"/${P}-disable-automagic-dep.patch
+   "${FILESDIR}"/${P}-fix-linking-with-lld.patch
 )
 
 BUILD_DIR="${WORKDIR}/${MY_PN}-${PV}_build"



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

2021-03-30 Thread Joonas Niilola
commit: 7895366b05a859cca2edd7db8e58c55d1cbfda5d
Author: Bernd Waibel  posteo  net>
AuthorDate: Wed Mar 31 06:30:43 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Mar 31 06:30:43 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7895366b

profiles: clean openexr related packages

Signed-off-by: Bernd Waibel  posteo.net>
Signed-off-by: Joonas Niilola  gentoo.org>

 profiles/package.mask | 16 
 1 file changed, 16 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index 1c0d97fbfde..2b4ecb60fcf 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -374,22 +374,6 @@ dev-ml/core_extended
 # bug #729098
 ~sci-libs/proj-8.0.0
 
-# Bernd Waibel  (2021-02-27)
-# Mask until removal of media-gfx/openexr_viewers.
-# Version has several vulnerabilities. See #717474
-=media-libs/ilmbase-2.3.0
-
-# Bernd Waibel  (2021-02-27)
-# Mask until removal of media-gfx/openexr_viewers.
-# Version has several vulnerabilities. See #717474
-=media-libs/openexr-2.3.0
-
-# Bernd Waibel  (2021-02-27)
-# No longer actively supported upstream.
-# Removal needed to clean-up {ilmbase,openexr}-2.3.0
-# Masked for removal in 30 days.
-media-gfx/openexr_viewers
-
 # Sam James  (2021-02-18)
 # 0.9.27 included a regression wrt deletes
 # bug #768948



[gentoo-commits] repo/gentoo:master commit in: media-gfx/openexr_viewers/, media-gfx/openexr_viewers/files/

2021-03-30 Thread Joonas Niilola
commit: 7e7987b872728dfbb033d5ec3b75ef0c017020ff
Author: Bernd Waibel  posteo  net>
AuthorDate: Fri Mar 26 16:36:25 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Mar 31 06:29:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e7987b8

media-gfx/openexr_viewers: last rite

Signed-off-by: Bernd Waibel  posteo.net>
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/openexr_viewers/Manifest |  1 -
 .../openexr_viewers-2.3.0--with-cg-libdir.patch| 23 --
 .../openexr_viewers-2.3.0-fix-configure.patch  | 83 --
 media-gfx/openexr_viewers/metadata.xml | 13 
 .../openexr_viewers/openexr_viewers-2.3.0.ebuild   | 68 --
 5 files changed, 188 deletions(-)

diff --git a/media-gfx/openexr_viewers/Manifest 
b/media-gfx/openexr_viewers/Manifest
deleted file mode 100644
index dd864f9214f..000
--- a/media-gfx/openexr_viewers/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST openexr_viewers-2.3.0.tar.gz 532154 BLAKE2B 
353c69a6efbdab6ef7669f531be22b34c11cce3cc790b513eb99d323fc5e1827cb4b0656eab2db61ee89f01c02169c3c855cc475964156f31928ae08e015
 SHA512 
2b7ce7c75733f390bec5c3f9c49edc08da2631e3a45ae20a732dddf9fd813137c3124d0c6e90450fa2b9068f0c40c76374ee7ff9cf0d8697080b2b180c624c5d

diff --git 
a/media-gfx/openexr_viewers/files/openexr_viewers-2.3.0--with-cg-libdir.patch 
b/media-gfx/openexr_viewers/files/openexr_viewers-2.3.0--with-cg-libdir.patch
deleted file mode 100644
index 9d118e362d4..000
--- 
a/media-gfx/openexr_viewers/files/openexr_viewers-2.3.0--with-cg-libdir.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/m4/path.cb.m4 b/m4/path.cb.m4
-index 7e38708..b5675b1 100644
 a/m4/path.cb.m4
-+++ b/m4/path.cb.m4
-@@ -10,9 +10,17 @@ dnl
- AC_ARG_WITH(cg-prefix,[  --with-cg-prefix=PFX  Prefix where Cg is installed 
(optional)],
-   cg_prefix="$withval", cg_prefix="")
- 
-+AC_ARG_WITH(cg-libdir, [  --with-cg-libdir=PATH Directory where Cg libraries 
are installed (optional)],
-+  cg_libdir="$withval", cg_libdir="")
-+
-   if test x$cg_prefix != x ; then
- CG_CXXFLAGS="-I$cg_prefix/include"
--CG_LDFLAGS="-L$cg_prefix/lib -lGL -lCg -lCgGL -lGLU -lpthread -lglut"
-+if test x$cg_libdir != x; then
-+   CG_LDFLAGS="-L$cg_libdir"
-+else
-+   CG_LDFLAGS="-L$cg_prefix/lib"
-+fi
-+CG_LDFLAGS="$CG_LDFLAGS -lGL -lCg -lCgGL -lGLU -lpthread -lglut"
-   else
- case $host_os in
-   darwin*)

diff --git 
a/media-gfx/openexr_viewers/files/openexr_viewers-2.3.0-fix-configure.patch 
b/media-gfx/openexr_viewers/files/openexr_viewers-2.3.0-fix-configure.patch
deleted file mode 100644
index f9d51d5045b..000
--- a/media-gfx/openexr_viewers/files/openexr_viewers-2.3.0-fix-configure.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 0ae7531..f2cdfee 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -4,8 +4,7 @@ AC_SUBST(OPENEXR_VIEWERS_VERSION, 2.3.0)
- AC_CANONICAL_HOST
- AC_CONFIG_SRCDIR(playexr/main.cpp)
- AM_CONFIG_HEADER(config/OpenEXR_ViewersConfig.h)
--AM_INIT_AUTOMAKE(1.6.3)  dnl Require automake 1.6.3 or better
--AM_MAINTAINER_MODE
-+AM_INIT_AUTOMAKE
- 
- 
- LIBTOOL_CURRENT=24
-@@ -19,7 +18,7 @@ AC_PROG_CXX
- AC_PROG_INSTALL
- AC_PROG_CC
- AC_PROG_LN_S
--AC_PROG_LIBTOOL
-+LT_INIT
- AC_PROG_MAKE_SET
- 
- dnl
-@@ -124,19 +109,8 @@ AC_ARG_ENABLE(threading,
-   [multithread="${enableval}"], [multithread=yes])
- 
- if test x$PKG_CONFIG == xno && test "x${multithread}" != xno ; then
--ACX_PTHREAD(
--[
--  AC_DEFINE(HAVE_PTHREAD)
--  OPENEXR_LIBS="$PTHREAD_LIBS $OPENEXR_LIBS"
--  OPENEXR_CXXFLAGS="$OPENEXR_CXXFLAGS $PTHREAD_CFLAGS"
--  OPENEXR_CTL_LIBS="$PTHREAD_LIBS $OPENEXR_CTL_LIBS"
--  OPENEXR_CTL_CXXFLAGS="$OPENEXR_CTL_CXXFLAGS $PTHREAD_CFLAGS"
--  CC="$PTHREAD_CC"
--  
--  AM_POSIX_SEM()
--],
--[AC_MSG_ERROR([POSIX thread support required])])
--AC_MSG_NOTICE([multithread true, LIBS = $LIBS, CC = $CC, CXXFLAGS = 
$CXXFLAGS])
-+AX_PTHREAD
-+  AC_DEFINE([HAVE_PTHREAD], [1], [define if POSIX thread support is 
available])
- fi
- 
- 
-@@ -233,10 +155,13 @@ AM_PATH_FLTK(have_fltk=yes, have_fltk=no)
- dnl
- dnl check for Cg
- dnl
--if test "${have_fltk}" = yes; then
-+AC_ARG_ENABLE(cg, AS_HELP_STRING([--enable-cg],
-+  [enable nvidia cg support [[default: test]]]), 
[want_cg="${enableval}"], [want_cg=yes])
-+
-+if test "${have_fltk}" = yes -a "${want_cg}" != no; then
-   AM_PATH_CG(have_cg=yes, have_cg=no)
-   if test "${have_cg}" = yes; then
--AC_DEFINE(HAVE_FRAGMENT_SHADERS)
-+AC_DEFINE([HAVE_FRAGMENT_SHADERS], [1], [define if Cg support is 
available])
-   fi
- else have_cg=no
- fi
-@@ -251,20 +176,10 @@ AC_C_CONST
- AC_C_INLINE
- AC_TYPE_SIZE_T
- 
--dnl gcc optimization
--AC_MSG_CHECKING(for gcc optimization flags)
--old_cflags=$CFLAGS
--CFLAGS="$CFLAGS -pipe"
--AC_TRY_COMPILE([#include ],
--[ printf ("hello, wo

[gentoo-commits] repo/gentoo:master commit in: media-libs/ilmbase/, media-libs/ilmbase/files/

2021-03-30 Thread Joonas Niilola
commit: 792f139668feb8c2e395be745ac7e436ad5d396d
Author: Bernd Waibel  posteo  net>
AuthorDate: Fri Mar 26 16:49:03 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Mar 31 06:29:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=792f1396

media-libs/ilmbase: drop 2.3.0

Security cleanup

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Bernd Waibel  posteo.net>
Signed-off-by: Joonas Niilola  gentoo.org>

 media-libs/ilmbase/Manifest|   1 -
 .../ilmbase/files/ilmbase-2.3.0-fix-bashisms.patch | 214 -
 .../ilmbase/files/ilmbase-2.3.0-testBox.patch  | 104 --
 media-libs/ilmbase/ilmbase-2.3.0.ebuild|  40 
 4 files changed, 359 deletions(-)

diff --git a/media-libs/ilmbase/Manifest b/media-libs/ilmbase/Manifest
index ea176ee0222..a14cb246858 100644
--- a/media-libs/ilmbase/Manifest
+++ b/media-libs/ilmbase/Manifest
@@ -1,2 +1 @@
-DIST ilmbase-2.3.0.tar.gz 595490 BLAKE2B 
db956fe7dbabf94632eb98635f4ebda8e937f26e26ed69f33743069fa2bf6d5ed3711f00eb33377c98b4f8ea367bbfc51b11d4cb884ce02238b537857cc19a9c
 SHA512 
db0804a7c37c2a97f9dbf81b20f40f7fdea73242baa2759d9dc3728e6849e7ecae0e178fa1c710add980d050499151650675e4b2cda6cbbaa61aca406a1f929a
 DIST ilmbase-2.5.5.tar.gz 27536865 BLAKE2B 
d0c0b2fd39b2cfafb60b6d0de3960063ff62341cf22be519f874c0c83f05cb604c5d503bb8b88514c71c5a54a79afa80a7fd00c2df15ec2193f6b3cffdc117c6
 SHA512 
e511af26a8fe2175a641fd25d2dcc6ef807e00bee2aff06a4784125f916ffd47fe376fe0621d385b604180a239bbfee063f8ceee3f7b731fde3c38558e9fdcdf

diff --git a/media-libs/ilmbase/files/ilmbase-2.3.0-fix-bashisms.patch 
b/media-libs/ilmbase/files/ilmbase-2.3.0-fix-bashisms.patch
deleted file mode 100644
index 21428529391..000
--- a/media-libs/ilmbase/files/ilmbase-2.3.0-fix-bashisms.patch
+++ /dev/null
@@ -1,214 +0,0 @@
 a/configure
-+++ b/configure
-@@ -15253,7 +15253,7 @@ else
- fi
- 
- 
--if test "${cxxstd}" == 17 ; then
-+if test "${cxxstd}" = 17 ; then
-   ax_cxx_compile_alternatives="17 1z"
ax_cxx_compile_cxx17_required=true
-   ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
-@@ -16966,7 +16966,7 @@ $as_echo "$as_me: WARNING: C++17 is not
- 
-   CXXFLAGS="$CXXFLAGS -std=c++17"
- else
--  if test "${cxxstd}" == 14 ; then
-+  if test "${cxxstd}" = 14 ; then
- ax_cxx_compile_alternatives="14 1y"
ax_cxx_compile_cxx14_required=true
-   ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
-@@ -17874,7 +17874,7 @@ $as_echo "#define HAVE_CXX14 1" >>confde
- 
-   CXXFLAGS="$CXXFLAGS -std=c++14"
-   else
--if test "${cxxstd}" == 11 ; then
-+if test "${cxxstd}" = 11 ; then
- ax_cxx_compile_alternatives="11 0x"
ax_cxx_compile_cxx11_required=true
-   ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
-@@ -18542,7 +18542,7 @@ $as_echo "#define HAVE_CXX11 1" >>confde
- 
-   CXXFLAGS="$CXXFLAGS -std=c++11"
- else
--  if test "${cxxstd}" == 03 ; then
-+  if test "${cxxstd}" = 03 ; then
- $as_echo "#define ILMBASE_FORCE_CXX03 1" >>confdefs.h
- 
- CXXFLAGS="$CXXFLAGS -std=c++03"
-@@ -21827,11 +21827,11 @@ $as_echo "#define HAVE_CXX17 1" >>confde
-   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: C++17 is not yet 
standardized, so the checks may change in incompatible ways anytime" >&5
- $as_echo "$as_me: WARNING: C++17 is not yet standardized, so the checks may 
change in incompatible ways anytime" >&2;}
- 
--if test "$HAVE_CXX14" == 1 ; then
-+if test "$HAVE_CXX14" = 1 ; then
- CXXFLAGS="$CXXFLAGS -std=c++14"
-   cxxstd = 14
- else
--  if test "$HAVE_CXX11" == 1 ; then
-+  if test "$HAVE_CXX11" = 1 ; then
-   CXXFLAGS="$CXXFLAGS -std=c++11"
- cxxstd = 11
-   fi
-@@ -22768,7 +22768,7 @@ LIB_SUFFIX=""
- lib_suffix_valid="no"
- 
- lib_namespace=""
--if test "x${library_namespace_versioning}" == xyes ; then
-+if test "x${library_namespace_versioning}" = xyes ; then
- cat >>confdefs.h <<_ACEOF
- #define IMATH_INTERNAL_NAMESPACE Imath_${ILMBASE_VERSION_API}
- _ACEOF
-@@ -22787,7 +22787,7 @@ _ACEOF
- lib_namespace="${ILMBASE_VERSION_API}"
- LIB_SUFFIX="${ILMBASE_VERSION_API}"
- lib_suffix_valid="yes"
--elif test "x${library_namespace_versioning}" == xno ; then
-+elif test "x${library_namespace_versioning}" = xno ; then
- cat >>confdefs.h <<_ACEOF
- #define IMATH_INTERNAL_NAMESPACE Imath
- _ACEOF
-@@ -22823,7 +22823,7 @@ _ACEOF
- fi
- 
- 
--if test "x${lib_suffix_valid}" == xyes ; then
-+if test "x${lib_suffix_valid}" = xyes ; then
- LIB_SUFFIX_DASH="-${LIB_SUFFIX}"
- 
-  if true; then
-@@ -22858,7 +22858,7 @@ else
- fi
- 
- 
--if test "x${custom_public_namespace}" == xyes ; then
-+if test "x${custom_public_namespace}" = xyes ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Enabling 'custom user 
namespace' requires an additional argument, reverting to default" >&5
- $as_echo "$as_me: WARNING: Enabling 'custom user na

[gentoo-commits] proj/portage:master commit in: repoman/lib/repoman/

2021-03-30 Thread Zac Medico
commit: 3964690033e37c097b7ba2e207c0962144761757
Author: Zac Medico  gentoo  org>
AuthorDate: Wed Mar 31 06:25:04 2021 +
Commit: Zac Medico  gentoo  org>
CommitDate: Wed Mar 31 06:26:56 2021 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=39646900

repoman: correct parse_args local sys.argv reference

Signed-off-by: Zac Medico  gentoo.org>

 repoman/lib/repoman/argparser.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/repoman/lib/repoman/argparser.py b/repoman/lib/repoman/argparser.py
index 6d545ccca..47215693c 100644
--- a/repoman/lib/repoman/argparser.py
+++ b/repoman/lib/repoman/argparser.py
@@ -1,5 +1,5 @@
 # repoman: Argument parser
-# Copyright 2007-2019 Gentoo Authors
+# Copyright 2007-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 """This module contains functions used in Repoman to parse CLI arguments."""
@@ -222,7 +222,7 @@ def parse_args(argv, repoman_default_opts):
if not opts.ignore_default_opts:
default_opts = util.shlex_split(repoman_default_opts)
if default_opts:
-   opts = parser.parse_args(default_opts + sys.argv[1:])
+   opts = parser.parse_args(default_opts + argv[1:])
 
args = []
if opts.mode is not None:



[gentoo-commits] repo/gentoo:master commit in: net-nds/jxplorer/

2021-03-30 Thread Andreas Sturmlechner
commit: ace87d4c8abcb25d7bcdaabeba5cf08e0ac6e8b1
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Mar 30 19:55:13 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Mar 31 06:07:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ace87d4c

net-nds/jxplorer: Drop 3.3.1 and 3.3.1.1, EAPI5--

Closes: https://bugs.gentoo.org/779361
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 net-nds/jxplorer/Manifest|  2 -
 net-nds/jxplorer/jxplorer-3.3.1.1.ebuild | 68 
 net-nds/jxplorer/jxplorer-3.3.1.ebuild   | 68 
 3 files changed, 138 deletions(-)

diff --git a/net-nds/jxplorer/Manifest b/net-nds/jxplorer/Manifest
index 53d948eb5ae..fdffa915747 100644
--- a/net-nds/jxplorer/Manifest
+++ b/net-nds/jxplorer/Manifest
@@ -1,3 +1 @@
-DIST jxplorer-3.3.1-project.zip 4500476 BLAKE2B 
6e5fb357c19ab9fd8a40f38d01fc650b793e8a6058c5e94336a46690283afb8e8a0a489cbab225da8f85f10d9a54fe938cab752b3648264d43c751441fd0991a
 SHA512 
a40bfd8a4c868a1ced1e31d45298916b4371ae781521755d784e4c027781d298f066af5390918b42024022cff5d3f0ab6a79bc6b15a1ff0adcfc1e8b79a67ca9
-DIST jxplorer-3.3.1.1-project.zip 4566815 BLAKE2B 
420277d44da94d5c54b0ac4a1bb67381785a4f4270be9ce1e5a07da00d7056bde8ab799a524e891176229579085e606482357f11d5567024017119ff09492995
 SHA512 
aa7c1c976f5987055abeb97aba865e9cdbc657d5baca199ff83c97ac5017c9d48869c8ee6346a7cf07b236b04059043256d0545c7b6cc37d97c81de2f9015d03
 DIST jxplorer-3.3.1.2-project.zip 4625538 BLAKE2B 
b1bfb552dd4524f4d0fde4ff15617bf3e50629c0f879f05ee87c9f301afa9a5a4c544c8bb85d5b9639fe809f030752f9e96c321a4e6d20fda7aa55097363bdeb
 SHA512 
6c95de48b2abd41a4926de3bd9bd203e266676028e12d1f1c93d8ef6f10b233eefcb122c8c075d6758b43c85e30fdc4b01d55811e5fcbdcd64d353c6f0fef94a

diff --git a/net-nds/jxplorer/jxplorer-3.3.1.1.ebuild 
b/net-nds/jxplorer/jxplorer-3.3.1.1.ebuild
deleted file mode 100644
index c780b19b163..000
--- a/net-nds/jxplorer/jxplorer-3.3.1.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2 prefix virtualx
-
-DESCRIPTION="A fully functional ldap browser written in java"
-HOMEPAGE="http://jxplorer.org/";
-SRC_URI="mirror://sourceforge/${PN}/${PN}-${PV}-project.zip"
-LICENSE="CAOSL"
-
-IUSE=""
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND=">=virtual/jre-1.5
-   >=dev-java/javahelp-2.0.02_p46:0"
-DEPEND=">=virtual/jdk-1.5
-   test? ( dev-java/junit:0 )
-   ${RDEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_GENTOO_CLASSPATH="javahelp"
-EANT_TEST_ANT_TASKS="ant-junit"
-
-src_prepare() {
-   rm -v jars/*.jar || die
-   sed -i -e 's/http://jxplorer.org/";
-SRC_URI="mirror://sourceforge/${PN}/${PN}-${PV}-project.zip"
-LICENSE="CAOSL"
-
-IUSE=""
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND=">=virtual/jre-1.5
-   >=dev-java/javahelp-2.0.02_p46:0"
-DEPEND=">=virtual/jdk-1.5
-   test? ( dev-java/junit:0 )
-   ${RDEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_GENTOO_CLASSPATH="javahelp"
-EANT_TEST_ANT_TASKS="ant-junit"
-
-src_prepare() {
-   rm -v jars/*.jar || die
-   sed -i -e 's/

[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-03-30 Thread Sam James
commit: 8fda71b2c9d8ac9f4f8529f6b3ebdceeb025908b
Author: Sam James  gentoo  org>
AuthorDate: Sat Mar 27 21:24:48 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 05:34:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fda71b2

autotools.eclass: consistent references to bugs in comments

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

 eclass/autotools.eclass | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass
index af5cd3d9a20..0ddd344b76e 100644
--- a/eclass/autotools.eclass
+++ b/eclass/autotools.eclass
@@ -78,7 +78,7 @@ if [[ -n ${WANT_AUTOMAKE} ]]; then
case ${WANT_AUTOMAKE} in
# Even if the package doesn't use automake, we still need to 
depend
# on it because we run aclocal to process m4 macros.  This 
matches
-   # the autoreconf tool, so this requirement is correct.  #401605
+   # the autoreconf tool, so this requirement is correct, bug 
#401605.
none) ;;
latest)
# Use SLOT deps if we can.  For EAPI=0, we get pretty 
close.
@@ -188,13 +188,13 @@ unset _automake_atom _autoconf_atom
 eautoreconf() {
local x g
 
-   # Subdirs often share a common build dir #529404.  If so, we can't 
safely
+   # Subdirs often share a common build dir, bug #529404.  If so, we can't 
safely
# run in parallel because many tools clobber the content in there.  
Libtool
# and automake both `rm && cp` while aclocal reads the output.  We 
might be
# able to handle this if we split the steps and grab locks on the dirs 
the
# tools actually write to.  Then we'd run all the common tools that use
# those inputs.  Doing this in bash does not scale easily.
-   # If we do re-enable parallel support, make sure #426512 is handled.
+   # If we do re-enable parallel support, make sure bug #426512 is handled.
if [[ -z ${AT_NO_RECURSIVE} ]] ; then
# Take care of subdirs
for x in $(autotools_check_macro_val AC_CONFIG_SUBDIRS) ; do
@@ -300,8 +300,8 @@ eaclocal_amflags() {
[[ -e ${amflags_file} ]] || continue
# setup the env in case the pkg does something crazy
# in their ACLOCAL_AMFLAGS.  like run a shell script
-   # which turns around and runs autotools. #365401
-   # or split across multiple lines. #383525
+   # which turns around and runs autotools (bug #365401)
+   # or split across multiple lines (bug #383525)
autotools_env_setup
aclocal_opts=$(sed -n \
"/^ACLOCAL_AMFLAGS[[:space:]]*=/{ \
@@ -323,7 +323,7 @@ eaclocal_amflags() {
 # specified parametes. The name of the tool run is the same of the function
 # without e prefix.
 # They also force installing the support files for safety.
-# Respects AT_M4DIR for additional directories to search for macro's.
+# Respects AT_M4DIR for additional directories to search for macros.
 eaclocal() {
[[ ! -f aclocal.m4 || -n $(grep -e 'generated.*by aclocal' aclocal.m4) 
]] && \
autotools_run_tool --at-m4flags aclocal "$@" $(eaclocal_amflags)
@@ -372,7 +372,7 @@ eautoconf() {
fi
 
# Install config.guess and config.sub which are required by many macros
-   # in Autoconf >=2.70.
+   # in autoconf >=2.70.
local _gnuconfig
case ${EAPI:-0} in
0|1|2|3|4|5|6)
@@ -430,7 +430,7 @@ eautomake() {
|| extra_opts+=( --foreign )
 
# Older versions of automake do not support --force-missing.  But we 
want
-   # to use this whenever possible to update random bundled files #133489.
+   # to use this whenever possible to update random bundled files, bug 
#133489.
case $(_automake_version) in
1.4|1.4[.-]*) ;;
*) extra_opts+=( --force-missing ) ;;
@@ -534,7 +534,7 @@ autotools_run_tool() {
 
autotools_env_setup
 
-   # Allow people to pass in full paths. #549268
+   # Allow people to pass in full paths, bug #549268
local STDERR_TARGET="${T}/${1##*/}.out"
# most of the time, there will only be one run, but if there are
# more, make sure we get unique log filenames



[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-03-30 Thread Sam James
commit: 306067aa62f06e1e5ddcfd2a49e7ac124fb649c8
Author: Sam James  gentoo  org>
AuthorDate: Sat Mar 27 20:43:11 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 05:34:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=306067aa

autotools.eclass: fix whitespace/phrasing in comment

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

 eclass/autotools.eclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass
index 0ddd344b76e..f54454597ee 100644
--- a/eclass/autotools.eclass
+++ b/eclass/autotools.eclass
@@ -64,9 +64,9 @@ inherit libtool
 # version.
 # If a newer slot is stable on any arch, and is NOT reflected in this list,
 # then circular dependencies may arise during emerge @system bootstraps.
-# 
-# See bug 312315 and 465732 for further information and context.
-# 
+#
+# See bug #312315 and bug #465732 for further information and context.
+#
 # Do NOT change this variable in your ebuilds!
 # If you want to force a newer minor version, you can specify the correct
 # WANT value by using a colon:  :



[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-03-30 Thread Sam James
commit: 0439e032a4564d80bc51143085235619cba316e7
Author: Sam James  gentoo  org>
AuthorDate: Sat Mar 27 20:41:32 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 05:34:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0439e032

autotools.eclass: minor cosmetic changes to various elogs

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

 eclass/autotools.eclass | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass
index f54454597ee..3e6906cb469 100644
--- a/eclass/autotools.eclass
+++ b/eclass/autotools.eclass
@@ -524,11 +524,11 @@ autotools_run_tool() {
done
 
if [[ ${EBUILD_PHASE} != "unpack" && ${EBUILD_PHASE} != "prepare" ]]; 
then
-   ewarn "QA Warning: running $1 in ${EBUILD_PHASE} phase"
+   ewarn "QA Warning: running '$1' in ${EBUILD_PHASE} phase"
fi
 
if ${missing_ok} && ! type -P ${1} >/dev/null ; then
-   einfo "Skipping '$*' due $1 not installed"
+   einfo "Skipping '$*' because '$1' not installed"
return 0
fi
 
@@ -563,13 +563,13 @@ autotools_run_tool() {
"$@" >> "${STDERR_TARGET}" 2>&1
if ! eend $? && ${autofail} ; then
echo
-   eerror "Failed Running $1 !"
+   eerror "Failed running '$1'!"
eerror
-   eerror "Include in your bugreport the contents of:"
+   eerror "Include in your bug report the contents of:"
eerror
eerror "  ${STDERR_TARGET}"
echo
-   die "Failed Running $1 !"
+   die "Failed running '$1'!"
fi
 }
 



[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-03-30 Thread Sam James
commit: 53c3321385d41fb49db03168b0c2482b129ef8e8
Author: Sam James  gentoo  org>
AuthorDate: Sat Mar 27 21:27:43 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 05:28:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53c33213

autotools.eclass: mark WANT_AUTO*, AUTOTOOLS_AUTO_DEPEND as @PRE_INHERIT

These must be defined before the point of inherit because
*DEPEND in the eclass (depending on these) in global scope.

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

 eclass/autotools.eclass | 4 
 1 file changed, 4 insertions(+)

diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass
index e51e02f4b43..d89ba13c8a8 100644
--- a/eclass/autotools.eclass
+++ b/eclass/autotools.eclass
@@ -34,16 +34,19 @@ esac
 inherit libtool
 
 # @ECLASS-VARIABLE: WANT_AUTOCONF
+# @PRE_INHERIT
 # @DESCRIPTION:
 # The major version of autoconf your package needs
 : ${WANT_AUTOCONF:=latest}
 
 # @ECLASS-VARIABLE: WANT_AUTOMAKE
+# @PRE_INHERIT
 # @DESCRIPTION:
 # The major version of automake your package needs
 : ${WANT_AUTOMAKE:=latest}
 
 # @ECLASS-VARIABLE: WANT_LIBTOOL
+# @PRE_INHERIT
 # @DESCRIPTION:
 # Do you want libtool?  Valid values here are "latest" and "none".
 : ${WANT_LIBTOOL:=latest}
@@ -117,6 +120,7 @@ AUTOTOOLS_DEPEND="${_automake_atom}
 RDEPEND=""
 
 # @ECLASS-VARIABLE: AUTOTOOLS_AUTO_DEPEND
+# @PRE_INHERIT
 # @DESCRIPTION:
 # Set to 'no' to disable automatically adding to DEPEND.  This lets
 # ebuilds form conditional depends by using ${AUTOTOOLS_DEPEND} in



[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-03-30 Thread Sam James
commit: ab16d23705441b2d7bb2bb13efb86d77a3b82cb9
Author: Sam James  gentoo  org>
AuthorDate: Sat Mar 27 21:20:59 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 05:31:25 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab16d237

autotools.eclass: mark AT_SYS_M4DIR variable as @DEFAULT_UNSET

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

 eclass/autotools.eclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass
index d89ba13c8a8..af5cd3d9a20 100644
--- a/eclass/autotools.eclass
+++ b/eclass/autotools.eclass
@@ -169,6 +169,7 @@ unset _automake_atom _autoconf_atom
 : ${AT_M4DIR:=}
 
 # @ECLASS-VARIABLE: AT_SYS_M4DIR
+# @DEFAULT_UNSET
 # @INTERNAL
 # @DESCRIPTION:
 # For system integrators, a list of additional aclocal search paths.



[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-03-30 Thread Sam James
commit: 37f32368f449cb6870be8346b7b2d1e4dcb1d049
Author: Sam James  gentoo  org>
AuthorDate: Sat Mar 27 20:49:19 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 05:28:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37f32368

autotools.eclass: mark AT_M4DIR as @DEFAULT_UNSET

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

 eclass/autotools.eclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass
index 4ae360aa24d..e51e02f4b43 100644
--- a/eclass/autotools.eclass
+++ b/eclass/autotools.eclass
@@ -159,6 +159,7 @@ unset _automake_atom _autoconf_atom
 # particular options
 
 # @ECLASS-VARIABLE: AT_M4DIR
+# @DEFAULT_UNSET
 # @DESCRIPTION:
 # Additional director(y|ies) aclocal should search
 : ${AT_M4DIR:=}



[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-03-30 Thread Sam James
commit: 88037804285588beec438e8388f0eb220bc8bcab
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 31 05:05:25 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 05:20:02 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88037804

darcs.eclass: mark darcs_patchcount, darcs_fetch as @INTERNAL

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

 eclass/darcs.eclass | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/eclass/darcs.eclass b/eclass/darcs.eclass
index b617cb57c66..1ed886fb4dc 100644
--- a/eclass/darcs.eclass
+++ b/eclass/darcs.eclass
@@ -101,6 +101,7 @@ case ${EAPI:-0} in
 esac
 
 # @FUNCTION: darcs_patchcount
+# @INTERNAL
 # @DESCRIPTION:
 # Internal function to determine amount of patches in repository.
 darcs_patchcount() {
@@ -110,6 +111,7 @@ darcs_patchcount() {
 }
 
 # @FUNCTION: darcs_fetch
+# @INTERNAL
 # @DESCRIPTION:
 # Internal function is called from darcs_src_unpack
 darcs_fetch() {



[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-03-30 Thread Sam James
commit: 3f1cd0c161eeec3a5b0173da31f8949fa5eb38b5
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 31 05:12:08 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 05:20:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f1cd0c1

eclass: normalise email format in @AUTHOR

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

 eclass/java-ant-2.eclass  | 5 +++--
 eclass/java-osgi.eclass   | 4 ++--
 eclass/java-pkg-simple.eclass | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/eclass/java-ant-2.eclass b/eclass/java-ant-2.eclass
index 733d1d1f6bf..69e3f7d46d8 100644
--- a/eclass/java-ant-2.eclass
+++ b/eclass/java-ant-2.eclass
@@ -1,11 +1,12 @@
-# Copyright 2004-2019 Gentoo Authors
+# Copyright 2004-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: java-ant-2.eclass
 # @MAINTAINER:
 # j...@gentoo.org
 # @AUTHOR:
-# kiorky (kio...@cryptelium.net), Petteri Räty (betelge...@gentoo.org)
+# kiorky 
+# Petteri Räty 
 # @BLURB: eclass for ant based Java packages
 # @DESCRIPTION:
 # Eclass for Ant-based Java packages. Provides support for both automatic and

diff --git a/eclass/java-osgi.eclass b/eclass/java-osgi.eclass
index bb8c1d8575b..f9a77b8490f 100644
--- a/eclass/java-osgi.eclass
+++ b/eclass/java-osgi.eclass
@@ -1,11 +1,11 @@
-# Copyright 2007-2015 Gentoo Foundation
+# Copyright 2007-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: java-osgi.eclass
 # @MAINTAINER:
 # j...@gentoo.org
 # @AUTHOR:
-# Java maintainers (j...@gentoo.org)
+# Java maintainers 
 # @BLURB: Java OSGi eclass
 # @DESCRIPTION:
 # This eclass provides functionality which is used by packages that need to be

diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass
index a1ab0afb316..ca03fea78cf 100644
--- a/eclass/java-pkg-simple.eclass
+++ b/eclass/java-pkg-simple.eclass
@@ -1,11 +1,11 @@
-# Copyright 2004-2020 Gentoo Authors
+# Copyright 2004-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: java-pkg-simple.eclass
 # @MAINTAINER:
 # j...@gentoo.org
 # @AUTHOR:
-# Java maintainers (j...@gentoo.org)
+# Java maintainers 
 # @BLURB: Eclass for packaging Java software with ease.
 # @DESCRIPTION:
 # This class is intended to build pure Java packages from Java sources



[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-03-30 Thread Sam James
commit: e7f9a9667c485bcc10993daa45318abfec23648d
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 31 05:07:05 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 05:20:02 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7f9a966

linux-mod.eclass: mark MODULES_OPTIONAL_USE_* as @PRE_INHERIT

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

 eclass/linux-mod.eclass | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/eclass/linux-mod.eclass b/eclass/linux-mod.eclass
index e0444eacc61..11b0fd0cfb5 100644
--- a/eclass/linux-mod.eclass
+++ b/eclass/linux-mod.eclass
@@ -18,11 +18,13 @@
 # These are as follows:
 
 # @ECLASS-VARIABLE: MODULES_OPTIONAL_USE
+# @PRE_INHERIT
 # @DESCRIPTION:
 # A string containing the USE flag to use for making this eclass optional
 # The recommended non-empty value is 'modules'
 
 # @ECLASS-VARIABLE: MODULES_OPTIONAL_USE_IUSE_DEFAULT
+# @PRE_INHERIT
 # @DESCRIPTION:
 # A boolean to control the IUSE default state for the MODULES_OPTIONAL_USE USE
 # flag. Default value is unset (false). True represented by 1 or 'on', other



[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-03-30 Thread Sam James
commit: 47b1461fc02fff2878c8fac1f77d6358beebdb78
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 31 04:29:41 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 05:19:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47b1461f

ros-catkin.eclass: mark CATKIN_HAS_MESSAGES, CATKIN_MESSAGES_TRANSITIVE_DEPS as 
@PRE_INHERIT

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

 eclass/ros-catkin.eclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/eclass/ros-catkin.eclass b/eclass/ros-catkin.eclass
index 2779a0353ec..b6f10ce6202 100644
--- a/eclass/ros-catkin.eclass
+++ b/eclass/ros-catkin.eclass
@@ -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
 
 # @ECLASS: ros-catkin.eclass
@@ -61,11 +61,13 @@ DEPEND="${RDEPEND}
 "
 
 # @ECLASS-VARIABLE: CATKIN_HAS_MESSAGES
+# @PRE_INHERIT
 # @DESCRIPTION:
 # Set it to a non-empty value before inherit to tell the eclass the package 
has messages to build.
 # Messages will be built based on ROS_MESSAGES USE_EXPANDed variable.
 
 # @ECLASS-VARIABLE: CATKIN_MESSAGES_TRANSITIVE_DEPS
+# @PRE_INHERIT
 # @DESCRIPTION:
 # Some messages have dependencies on other messages.
 # In that case, CATKIN_MESSAGES_TRANSITIVE_DEPS should contain a 
space-separated list of atoms



[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-03-30 Thread Sam James
commit: a4e92ae9990ef28fe0d231e4b1c812c9d52179e0
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 31 04:25:09 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 05:19:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4e92ae9

ruby-fakegem.eclass: mark RUBY_FAKEGEM_{NAME, VERSION} as @PRE_INHERIT

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

 eclass/ruby-fakegem.eclass | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/eclass/ruby-fakegem.eclass b/eclass/ruby-fakegem.eclass
index 6fee9eb3e15..715c1df44f6 100644
--- a/eclass/ruby-fakegem.eclass
+++ b/eclass/ruby-fakegem.eclass
@@ -17,12 +17,14 @@
 inherit ruby-ng
 
 # @ECLASS-VARIABLE: RUBY_FAKEGEM_NAME
+# @PRE_INHERIT
 # @DESCRIPTION:
 # Sets the Gem name for the generated fake gemspec.
 # This variable MUST be set before inheriting the eclass.
 RUBY_FAKEGEM_NAME="${RUBY_FAKEGEM_NAME:-${PN}}"
 
 # @ECLASS-VARIABLE: RUBY_FAKEGEM_VERSION
+# @PRE_INHERIT
 # @DESCRIPTION:
 # Sets the Gem version for the generated fake gemspec.
 # This variable MUST be set before inheriting the eclass.



[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-03-30 Thread Sam James
commit: 6217928cb75e8a4be3ef99c04d34e41480385e9d
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 31 04:37:21 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 05:19:58 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6217928c

subversion.eclass: mark various variables as @USER_VARIABLE

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

 eclass/subversion.eclass | 5 +
 1 file changed, 5 insertions(+)

diff --git a/eclass/subversion.eclass b/eclass/subversion.eclass
index 48cab5a01ae..6ed8a62dbe3 100644
--- a/eclass/subversion.eclass
+++ b/eclass/subversion.eclass
@@ -152,6 +152,8 @@ ESVN_PATCHES="${ESVN_PATCHES:-}"
 ESVN_RESTRICT="${ESVN_RESTRICT:-}"
 
 # @ECLASS-VARIABLE: ESVN_OFFLINE
+# @USER_VARIABLE
+# @DEFAULT_UNSET
 # @DESCRIPTION:
 # Set this variable to a non-empty value to disable the automatic updating of
 # an svn source tree. This is intended to be set outside the subversion source
@@ -159,6 +161,7 @@ ESVN_RESTRICT="${ESVN_RESTRICT:-}"
 ESVN_OFFLINE="${ESVN_OFFLINE:-${EVCS_OFFLINE}}"
 
 # @ECLASS-VARIABLE: ESVN_UMASK
+# @USER_VARIABLE
 # @DESCRIPTION:
 # Set this variable to a custom umask. This is intended to be set by users.
 # By setting this to something like 002, it can make life easier for people
@@ -169,6 +172,7 @@ ESVN_OFFLINE="${ESVN_OFFLINE:-${EVCS_OFFLINE}}"
 ESVN_UMASK="${ESVN_UMASK:-${EVCS_UMASK}}"
 
 # @ECLASS-VARIABLE: ESVN_UP_FREQ
+# @USER_VARIABLE
 # @DESCRIPTION:
 # Set the minimum number of hours between svn up'ing in any given svn module. 
This is particularly
 # useful for split KDE ebuilds where we want to ensure that all submodules are 
compiled for the same
@@ -176,6 +180,7 @@ ESVN_UMASK="${ESVN_UMASK:-${EVCS_UMASK}}"
 ESVN_UP_FREQ="${ESVN_UP_FREQ:=}"
 
 # @ECLASS-VARIABLE: ESCM_LOGDIR
+# @USER_VARIABLE
 # @DESCRIPTION:
 # User configuration variable. If set to a path such as e.g. /var/log/scm any
 # package inheriting from subversion.eclass will record svn revision to



[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-03-30 Thread Sam James
commit: 8fc42a25da7fbefa7e2fb283ab94e3bd4c825484
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 31 04:38:43 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 05:19:59 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fc42a25

cvs.eclass: mark ECVS_OFFLINE as @USER_VARIABLE

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

 eclass/cvs.eclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eclass/cvs.eclass b/eclass/cvs.eclass
index 134e25a846a..a8e5ee4cc9a 100644
--- a/eclass/cvs.eclass
+++ b/eclass/cvs.eclass
@@ -62,6 +62,7 @@ _CVS_ECLASS=1
 # CVS options given after the cvs checkout command.
 
 # @ECLASS-VARIABLE: ECVS_OFFLINE
+# @USER_VARIABLE
 # @DESCRIPTION:
 # Set this variable to a non-empty value to disable the automatic updating of
 # a CVS source tree. This is intended to be set outside the cvs source



[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-03-30 Thread Sam James
commit: f53e05dc7490f6780060c566476465f90f109a4a
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 31 05:04:25 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 05:20:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f53e05dc

ghc-package.eclass: mark ghc-getghcpkg as @INTERNAL

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

 eclass/ghc-package.eclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eclass/ghc-package.eclass b/eclass/ghc-package.eclass
index 72d668ca0e2..7e8a5aa0cba 100644
--- a/eclass/ghc-package.eclass
+++ b/eclass/ghc-package.eclass
@@ -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
 
 # @ECLASS: ghc-package.eclass
@@ -37,6 +37,7 @@ ghc-getghc() {
 }
 
 # @FUNCTION: ghc-getghcpkg
+# @INTERNAL
 # @DESCRIPTION:
 # Internal function determines returns the name of the ghc-pkg executable
 ghc-getghcpkg() {



[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-03-30 Thread Sam James
commit: 1e1406a67c26a8ecaaf8d1d2f09fc5170660c16b
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 31 04:38:20 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 05:19:58 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e1406a6

darcs.eclass: mark EDARCS_OFFLINE as @USER_VARIABLE

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

 eclass/darcs.eclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eclass/darcs.eclass b/eclass/darcs.eclass
index 12e7289cc7d..b617cb57c66 100644
--- a/eclass/darcs.eclass
+++ b/eclass/darcs.eclass
@@ -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
 
 # @ECLASS: darcs.eclass
@@ -71,6 +71,7 @@ SRC_URI=""
 : ${EDARCS_REPOSITORY:=}
 
 # @ECLASS-VARIABLE: EDARCS_OFFLINE
+# @USER_VARIABLE
 # @DESCRIPTION:
 # Set this variable to a non-empty value to disable the automatic updating of
 # a darcs repository. This is intended to be set outside the darcs source



[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-03-30 Thread Sam James
commit: 04062d9654cd5bdde94a46d9c9b8635092faf122
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 31 04:11:01 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 05:19:48 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04062d96

perl-module.eclass: mark DIST_TEST_OVERRIDE as @USER_VARIABLE

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

 eclass/perl-module.eclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass
index 00bffe3e4a1..4c43c0e67ea 100644
--- a/eclass/perl-module.eclass
+++ b/eclass/perl-module.eclass
@@ -359,6 +359,7 @@ perl-module_src_compile() {
 #   network  : do not try to disable network tests
 
 # @ECLASS-VARIABLE: DIST_TEST_OVERRIDE
+# @USER_VARIABLE
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # (EAPI=6 and later) Variable that controls if tests are run in the test phase



[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-03-30 Thread Sam James
commit: 7ab7094cbdd1b534cbf91a386691fb0e890ab091
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 31 04:35:46 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 05:19:56 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ab7094c

cmake-multilib.eclass: mark CMAKE_ECLASS as @PRE_INHERIT

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

 eclass/cmake-multilib.eclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eclass/cmake-multilib.eclass b/eclass/cmake-multilib.eclass
index e6d8fe64a02..1266b5b42ed 100644
--- a/eclass/cmake-multilib.eclass
+++ b/eclass/cmake-multilib.eclass
@@ -20,6 +20,7 @@
 # phase rather than 'default'.
 
 # @ECLASS-VARIABLE: CMAKE_ECLASS
+# @PRE_INHERIT
 # @DESCRIPTION:
 # Default is "cmake-utils" for compatibility in EAPI-7. Specify "cmake" for
 # ebuilds that ported to cmake.eclass already. Future EAPI is "cmake" only.



[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-03-30 Thread Sam James
commit: 9557a12f028bd1e8b77a2807e24af4886b17b874
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 31 04:41:50 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 05:20:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9557a12f

portability.eclass: drop blank invalid @RETURN

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

 eclass/portability.eclass | 1 -
 1 file changed, 1 deletion(-)

diff --git a/eclass/portability.eclass b/eclass/portability.eclass
index eef3cd7d344..3b085d6c4e7 100644
--- a/eclass/portability.eclass
+++ b/eclass/portability.eclass
@@ -13,7 +13,6 @@ _PORTABILITY_ECLASS=1
 
 # @FUNCTION: treecopy
 # @USAGE:  [orig2 orig3 ] 
-# @RETURN:
 # @DESCRIPTION:
 # mimic cp --parents copy, but working on BSD userland as well
 treecopy() {



[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-03-30 Thread Sam James
commit: 7e2afe96134fe7ef6058058814ce8a0b1183cdb6
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 31 04:30:32 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 05:19:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e2afe96

libretro-core.eclass: mark LIBRETRO_COMMIT_SHA, LIBRETRO_REPO_NAME as 
@PRE_INHERIT

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

 eclass/libretro-core.eclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/eclass/libretro-core.eclass b/eclass/libretro-core.eclass
index f5f63065f22..ff7b629d63b 100644
--- a/eclass/libretro-core.eclass
+++ b/eclass/libretro-core.eclass
@@ -1,4 +1,4 @@
-# Copyright 2018-2020 Gentoo Authors
+# Copyright 2018-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: libretro-core.eclass
@@ -53,11 +53,13 @@ if [[ -z "${LIBRETRO_CORE_NAME}" ]]; then
 fi
 
 # @ECLASS-VARIABLE: LIBRETRO_COMMIT_SHA
+# @PRE_INHERIT
 # @DESCRIPTION:
 # Commit SHA used for SRC_URI will die if not set in < ebuilds.
 # Needs to be set before inherit.
 
 # @ECLASS-VARIABLE: LIBRETRO_REPO_NAME
+# @PRE_INHERIT
 # @REQUIRED
 # @DESCRIPTION:
 # Contains the real repo name of the core formatted as "repouser/reponame".



[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-03-30 Thread Sam James
commit: 63ca0790a0c61d65a4ddf1bd2f6a68fd9536552e
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 31 04:34:48 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 05:19:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63ca0790

mozlinguas-v2.eclass: mark various variables as @PRE_INHERIT, @DEFAULT_UNSET

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

 eclass/mozlinguas-v2.eclass | 13 +
 1 file changed, 13 insertions(+)

diff --git a/eclass/mozlinguas-v2.eclass b/eclass/mozlinguas-v2.eclass
index be01ef6aca5..423f0bdcc71 100644
--- a/eclass/mozlinguas-v2.eclass
+++ b/eclass/mozlinguas-v2.eclass
@@ -28,6 +28,7 @@ esac
 EXPORT_FUNCTIONS src_unpack src_compile src_install
 
 # @ECLASS-VARIABLE: MOZ_LANGS
+# @DEFAULT_UNSET
 # @DESCRIPTION:
 # Array containing the list of language pack xpis available for
 # this release. The list can be updated with scripts/get_langs.sh from the
@@ -35,34 +36,40 @@ EXPORT_FUNCTIONS src_unpack src_compile src_install
 : ${MOZ_LANGS:=()}
 
 # @ECLASS-VARIABLE: MOZ_PV
+# @DEFAULT_UNSET
 # @DESCRIPTION:
 # Ebuild package version converted to equivalent upstream version.
 # Defaults to ${PV}, and should be overridden for alphas, betas, and RCs
 : ${MOZ_PV:="${PV}"}
 
 # @ECLASS-VARIABLE: MOZ_PN
+# @DEFAULT_UNSET
 # @DESCRIPTION:
 # Ebuild package name converted to equivalent upstream name.
 # Defaults to ${PN}, and should be overridden for binary ebuilds.
 : ${MOZ_PN:="${PN}"}
 
 # @ECLASS-VARIABLE: MOZ_P
+# @DEFAULT_UNSET
 # @DESCRIPTION:
 # Ebuild package name + version converted to upstream equivalent.
 # Defaults to ${MOZ_PN}-${MOZ_PV}
 : ${MOZ_P:="${MOZ_PN}-${MOZ_PV}"}
 
 # @ECLASS-VARIABLE: MOZ_FTP_URI
+# @DEFAULT_UNSET
 # @DESCRIPTION:
 # The ftp URI prefix for the release tarballs and language packs.
 : ${MOZ_FTP_URI:=""}
 
 # @ECLASS-VARIABLE: MOZ_HTTP_URI
+# @PRE_INHERIT
 # @DESCRIPTION:
 # The http URI prefix for the release tarballs and language packs.
 : ${MOZ_HTTP_URI:=""}
 
 # @ECLASS-VARIABLE: MOZ_LANGPACK_HTTP_URI
+# @PRE_INHERIT
 # @DESCRIPTION:
 # An alternative http URI if it differs from official mozilla URI.
 # Defaults to whatever MOZ_HTTP_URI was set to.
@@ -91,6 +98,8 @@ EXPORT_FUNCTIONS src_unpack src_compile src_install
 : ${MOZ_LANGPACK_UNOFFICIAL:=""}
 
 # @ECLASS-VARIABLE: MOZ_GENERATE_LANGPACKS
+# @PRE_INHERIT
+# @DEFAULT_UNSET
 # @DESCRIPTION:
 # This flag specifies whether or not the langpacks should be
 # generated directly during the build process, rather than
@@ -106,6 +115,8 @@ EXPORT_FUNCTIONS src_unpack src_compile src_install
 : ${MOZ_L10N_SOURCEDIR:="${WORKDIR}/l10n-sources"}
 
 # @ECLASS-VARIABLE: MOZ_L10N_URI_PREFIX
+# @PRE_INHERIT
+# @DEFAULT_UNSET
 # @DESCRIPTION:
 # The full URI prefix of the distfile for each l10n locale.  The
 # AB_CD and MOZ_L10N_URI_SUFFIX will be appended to this to complete the
@@ -115,12 +126,14 @@ EXPORT_FUNCTIONS src_unpack src_compile src_install
 : ${MOZ_L10N_URI_PREFIX:=""}
 
 # @ECLASS-VARIABLE: MOZ_L10N_URI_SUFFIX
+# @DEFAULT_UNSET
 # @DESCRIPTION:
 # The suffix of l10n source distfiles.
 # Defaults to '.tar.xz'
 : ${MOZ_L10N_URI_SUFFIX:=".tar.xz"}
 
 # @ECLASS-VARIABLE: MOZ_FORCE_UPSTREAM_L10N
+# @DEFAULT_UNSET
 # @DESCRIPTION:
 # Set this to use upstream langpaks even if the package normally
 # shouldn't (ie it is an alpha or beta package)



[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-03-30 Thread Sam James
commit: 4269564026d211614f4b85a23148ec65d1ed15cc
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 31 04:28:42 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 05:19:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42695640

aspell-dict-r1.eclass: mark ASPELL_{LANG, VERSION} as @PRE_INHERIT

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

 eclass/aspell-dict-r1.eclass | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/eclass/aspell-dict-r1.eclass b/eclass/aspell-dict-r1.eclass
index 4d0e64ed4e7..24bc5ff2799 100644
--- a/eclass/aspell-dict-r1.eclass
+++ b/eclass/aspell-dict-r1.eclass
@@ -15,6 +15,7 @@
 # Support for aspell-0.60 has been added by Sergey Ulanov.
 
 # @ECLASS-VARIABLE: ASPELL_LANG
+# @PRE_INHERIT
 # @REQUIRED
 # @DESCRIPTION:
 # Pure cleartext string that is included into DESCRIPTION.
@@ -28,6 +29,7 @@
 readonly ASPELL_SPELLANG=${PN/aspell-/}
 
 # @ECLASS-VARIABLE: ASPELL_VERSION
+# @PRE_INHERIT
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # What major version of Aspell is this dictionary for? Valid values are 5, 6 
or undefined.



[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-03-30 Thread Sam James
commit: 66ed9e448dd60cefec5ab2345057feb9c1b35045
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 31 04:36:23 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 05:19:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66ed9e44

cdrom.eclass: mark CDROM_OPTIONAL as @PRE_INHERIT

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

 eclass/cdrom.eclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eclass/cdrom.eclass b/eclass/cdrom.eclass
index 79f43761452..623a19867d4 100644
--- a/eclass/cdrom.eclass
+++ b/eclass/cdrom.eclass
@@ -21,6 +21,7 @@ inherit portability
 
 # @ECLASS-VARIABLE: CDROM_OPTIONAL
 # @DEFAULT_UNSET
+# @PRE_INHERIT
 # @DESCRIPTION:
 # By default, the eclass sets PROPERTIES="interactive" on the assumption
 # that people will be using these.  If your package optionally supports



[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-03-30 Thread Sam James
commit: e5d93414c75747792ecc5125edddefc3dc3f0faf
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 31 04:32:17 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 05:19:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5d93414

xorg-2.eclass: set various variables as @PRE_INHERIT

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

 eclass/xorg-2.eclass | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/eclass/xorg-2.eclass b/eclass/xorg-2.eclass
index 21b3da5374a..e6ec80523ae 100644
--- a/eclass/xorg-2.eclass
+++ b/eclass/xorg-2.eclass
@@ -43,6 +43,7 @@ if [[ ${CATEGORY} = media-fonts ]]; then
 fi
 
 # @ECLASS-VARIABLE: XORG_MULTILIB
+# @PRE_INHERIT
 # @DESCRIPTION:
 # If set to 'yes', the multilib support for package will be enabled. Set
 # before inheriting this eclass.
@@ -68,18 +69,21 @@ EXPORT_FUNCTIONS ${EXPORTED_FUNCTIONS}
 IUSE=""
 
 # @ECLASS-VARIABLE: XORG_EAUTORECONF
+# @PRE_INHERIT
 # @DESCRIPTION:
 # If set to 'yes' and configure.ac exists, eautoreconf will run. Set
 # before inheriting this eclass.
 : ${XORG_EAUTORECONF:="no"}
 
 # @ECLASS-VARIABLE: XORG_BASE_INDIVIDUAL_URI
+# @PRE_INHERIT
 # @DESCRIPTION:
 # Set up SRC_URI for individual modular releases. If set to an empty
 # string, no SRC_URI will be provided by the eclass.
 : ${XORG_BASE_INDIVIDUAL_URI="https://www.x.org/releases/individual"}
 
 # @ECLASS-VARIABLE: XORG_MODULE
+# @PRE_INHERIT
 # @DESCRIPTION:
 # The subdirectory to download source from. Possible settings are app,
 # doc, data, util, driver, font, lib, proto, xserver. Set above the
@@ -99,6 +103,7 @@ if [[ ${XORG_MODULE} == auto ]]; then
 fi
 
 # @ECLASS-VARIABLE: XORG_PACKAGE_NAME
+# @PRE_INHERIT
 # @DESCRIPTION:
 # For git checkout the git repository might differ from package name.
 # This variable can be used for proper directory specification
@@ -148,6 +153,7 @@ if [[ ${FONT} == yes ]]; then
>=x11-apps/mkfontscale-1.2.0"
 
# @ECLASS-VARIABLE: FONT_DIR
+   # @PRE_INHERIT
# @DESCRIPTION:
# If you're creating a font package and the suffix of PN is not equal to
# the subdirectory of /usr/share/fonts/ it should install into, set



[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-03-30 Thread Sam James
commit: ed07c55f8e744a9bcf496761ed348f7e4ae03d8d
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 31 04:28:16 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 05:19:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed07c55f

postgres-multi.eclass: mark POSTGRES_COMPAT as @PRE_INHERIT

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

 eclass/postgres-multi.eclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eclass/postgres-multi.eclass b/eclass/postgres-multi.eclass
index 106f1ee3ead..acaa5077217 100644
--- a/eclass/postgres-multi.eclass
+++ b/eclass/postgres-multi.eclass
@@ -25,6 +25,7 @@ esac
 
 
 # @ECLASS-VARIABLE: POSTGRES_COMPAT
+# @PRE_INHERIT
 # @REQUIRED
 # @DESCRIPTION:
 # A Bash array containing a list of compatible PostgreSQL slots as



[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-03-30 Thread Sam James
commit: f1c3a62fc8a6ed71db2b068ec13497a81308a0bf
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 31 04:23:33 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 05:19:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1c3a62f

php-ext-pecl-r3.eclass: mark PHP_EXT_PECL_{PKG, FILENAME} as @PRE_INHERIT

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

 eclass/php-ext-pecl-r3.eclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/eclass/php-ext-pecl-r3.eclass b/eclass/php-ext-pecl-r3.eclass
index 8df60a37205..19040a7e762 100644
--- a/eclass/php-ext-pecl-r3.eclass
+++ b/eclass/php-ext-pecl-r3.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: php-ext-pecl-r3.eclass
@@ -11,6 +11,7 @@
 # see https://pecl.php.net/
 
 # @ECLASS-VARIABLE: PHP_EXT_PECL_PKG
+# @PRE_INHERIT
 # @DESCRIPTION:
 # Set in ebuild before inheriting this eclass if the tarball name
 # differs from ${PN/pecl-/} so that SRC_URI and HOMEPAGE get set
@@ -22,6 +23,7 @@
 [[ -z "${PHP_EXT_PECL_PKG}" ]] && PHP_EXT_PECL_PKG="${PN/pecl-/}"
 
 # @ECLASS-VARIABLE: PHP_EXT_PECL_FILENAME
+# @PRE_INHERIT
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # Set in ebuild before inheriting this eclass if the tarball name



[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-03-30 Thread Sam James
commit: a4dd4d26dd77d95dcf138cf489d469b70f75f001
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 31 04:27:44 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 05:19:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4dd4d26

php-ext-source-r3.eclass: mark PHP_EXT_{NAME, NEEDED_USE} as @PRE_INHERIT

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

 eclass/php-ext-source-r3.eclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/eclass/php-ext-source-r3.eclass b/eclass/php-ext-source-r3.eclass
index b2eae22fb74..a782081b72a 100644
--- a/eclass/php-ext-source-r3.eclass
+++ b/eclass/php-ext-source-r3.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: php-ext-source-r3.eclass
@@ -22,6 +22,7 @@ case ${EAPI:-0} in
 esac
 
 # @ECLASS-VARIABLE: PHP_EXT_NAME
+# @PRE_INHERIT
 # @REQUIRED
 # @DESCRIPTION:
 # The extension name. This must be set, otherwise the eclass dies.
@@ -87,6 +88,7 @@ esac
 : ${PHP_INI_NAME:=${PHP_EXT_NAME}}
 
 # @ECLASS-VARIABLE: PHP_EXT_NEEDED_USE
+# @PRE_INHERIT
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # A list of USE flags to append to each PHP target selected



[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-03-30 Thread Sam James
commit: 46db8bc20293025cd301aed6781838d3acb6bc77
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 31 04:20:27 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 05:19:43 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46db8bc2

dune.eclass: mark DUNE_PKG_NAME as @PRE_INHERIT

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

 eclass/dune.eclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eclass/dune.eclass b/eclass/dune.eclass
index 03857d25a2d..a6b499cfbdb 100644
--- a/eclass/dune.eclass
+++ b/eclass/dune.eclass
@@ -15,6 +15,7 @@
 # src_install for dune-based packages.
 
 # @ECLASS-VARIABLE: DUNE_PKG_NAME
+# @PRE_INHERIT
 # @DESCRIPTION:
 # Sets the actual dune package name, if different from gentoo package name.
 # Set before inheriting the eclass.



[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-03-30 Thread Sam James
commit: 2d140488643543e90642799c809675583c6e2bd3
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 31 04:26:40 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 05:19:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d140488

qt5-build.eclass: mark VIRTUALX_REQUIRED as @PRE_INHERIT

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

 eclass/qt5-build.eclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 6698b69b32f..e94f3f33a10 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -51,6 +51,7 @@ esac
 # system to obtain the global qmodule.pri file.
 
 # @ECLASS-VARIABLE: VIRTUALX_REQUIRED
+# @PRE_INHERIT
 # @DESCRIPTION:
 # For proper description see virtualx.eclass man page.
 # Here we redefine default value to be manual, if your package needs virtualx



[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-03-30 Thread Sam James
commit: 3cb40b5a79f2b9e5dcecf0b4172ee97c5f0d1ed9
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 31 04:31:17 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 05:19:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cb40b5a

ant-tasks.eclass: mark ANT_TASK_DEPNAME as @PRE_INHERIT

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

 eclass/ant-tasks.eclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eclass/ant-tasks.eclass b/eclass/ant-tasks.eclass
index 4ca054f4bf1..ea347fd706a 100644
--- a/eclass/ant-tasks.eclass
+++ b/eclass/ant-tasks.eclass
@@ -53,6 +53,7 @@ ANT_TASK_JREVER=${ANT_TASK_JREVER-1.8}
 ANT_TASK_NAME="${PN#ant-}"
 
 # @ECLASS-VARIABLE: ANT_TASK_DEPNAME
+# @PRE_INHERIT
 # @DESCRIPTION:
 # Specifies JAVA_PKG_NAME (PN{-SLOT} used with java-pkg_jar-from) of the 
package
 # that this one depends on. Defaults to the name of ant task, ebuild can



[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-03-30 Thread Sam James
commit: 65cec8910a06030c0155be60c4139f205d281fbf
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 31 04:22:41 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 05:19:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65cec891

oasis.eclass: mark various OASIS_* as @PRE_INHERIT

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

 eclass/oasis.eclass | 4 
 1 file changed, 4 insertions(+)

diff --git a/eclass/oasis.eclass b/eclass/oasis.eclass
index 83e68ae7533..42ad9368f73 100644
--- a/eclass/oasis.eclass
+++ b/eclass/oasis.eclass
@@ -19,6 +19,7 @@
 # Ebuilds using oasis.eclass must be EAPI>=3.
 
 # @ECLASS-VARIABLE: OASIS_BUILD_DOCS
+# @PRE_INHERIT
 # @DESCRIPTION:
 # Will make oasis_src_compile build the documentation if this variable is
 # defined and the doc useflag is enabled.
@@ -27,6 +28,7 @@
 # Set before inheriting the eclass.
 
 # @ECLASS-VARIABLE: OASIS_BUILD_TESTS
+# @PRE_INHERIT
 # @DESCRIPTION:
 # Will make oasis_src_configure enable building the tests if the test useflag 
is
 # enabled. oasis_src_test will then run them.
@@ -38,6 +40,7 @@
 
 
 # @ECLASS-VARIABLE: OASIS_NO_DEBUG
+# @PRE_INHERIT
 # @DESCRIPTION:
 # Disable debug useflag usage. Old oasis versions did not support it so we 
allow
 # disabling it in those cases.
@@ -45,6 +48,7 @@
 # Set before inheriting the eclass.
 
 # @ECLASS-VARIABLE: OASIS_DOC_DIR
+# @PRE_INHERIT
 # @DESCRIPTION:
 # Specify where to install documentation. Default is for ocamldoc HTML.
 # Change it before inherit if this is not what you want.



[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-03-30 Thread Sam James
commit: 0baf057a0e77996a367314911255ba6837fac51d
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 31 04:26:00 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 05:19:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0baf057a

perl-module.eclass: mark DIST_EXAMPLES as @PRE_INHERIT

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

 eclass/perl-module.eclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass
index 7a839bc7288..00bffe3e4a1 100644
--- a/eclass/perl-module.eclass
+++ b/eclass/perl-module.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: perl-module.eclass
@@ -172,6 +172,7 @@ LICENSE="${LICENSE:-|| ( Artistic GPL-1+ )}"
 # Named MODULE_SECTION in EAPI=5.
 
 # @ECLASS-VARIABLE: DIST_EXAMPLES
+# @PRE_INHERIT
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # (EAPI=6 and later) This Bash array allows passing a list of example files to 
be installed



[gentoo-commits] repo/gentoo:master commit in: net-vpn/mullvad-netns/

2021-03-30 Thread Patrick McLean
commit: 6af1e3177be8de03bdb95bb5b1534ff4ff57af70
Author: Patrick McLean  gentoo  org>
AuthorDate: Wed Mar 31 04:20:43 2021 +
Commit: Patrick McLean  gentoo  org>
CommitDate: Wed Mar 31 04:21:25 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6af1e317

net-vpn/mullvad-netns-0.3: Version bump

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Patrick McLean  gentoo.org>

 net-vpn/mullvad-netns/Manifest |  1 +
 net-vpn/mullvad-netns/mullvad-netns-0.3.ebuild | 34 ++
 2 files changed, 35 insertions(+)

diff --git a/net-vpn/mullvad-netns/Manifest b/net-vpn/mullvad-netns/Manifest
index 16498a9f93b..9264f5aec42 100644
--- a/net-vpn/mullvad-netns/Manifest
+++ b/net-vpn/mullvad-netns/Manifest
@@ -1 +1,2 @@
 DIST mullvad-netns-0.2.tar.gz 12087 BLAKE2B 
43f578a8a2d7f0317de9c2c0bc19f49a37ad7754dfcb50a5d698313fe6470ec6f2580d2e7629ac95dbeeddd6c1ac6d660b142c5c801830624c14e6c0e781dc6e
 SHA512 
6f0942841fce19b35adb38b73ae7d692f22e551cf6bccd9c67acf6d248fe7d2684a6a20b9b6459429caf333e68c4d6e460632068b5eebd6a29654a46fb2ab64e
+DIST mullvad-netns-0.3.tar.gz 12164 BLAKE2B 
e980e28c4dd734e5dc429354a2ab0fe9b653679af1d75122bd83f807d67fe289bc77471b6d5decc068f540bb321de0882f0daa7cf500d4e7ef85547da0e1b547
 SHA512 
fedc7e7a0c6aeb10ed00a82652d08b31e80f6c4077a6dc50c18410a20bb7bee4f8c9d74f54add711cff1c037722546c24db697fdecaaeeae91125f57c30ad138

diff --git a/net-vpn/mullvad-netns/mullvad-netns-0.3.ebuild 
b/net-vpn/mullvad-netns/mullvad-netns-0.3.ebuild
new file mode 100644
index 000..854abf1cf3e
--- /dev/null
+++ b/net-vpn/mullvad-netns/mullvad-netns-0.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} =~ [9]{4,} ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/chutz/mullvad-netns.git";
+else
+   SRC_URI="https://github.com/chutz/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Script to run a command within a Mullvad network namespace"
+HOMEPAGE="https://github.com/chutz/mullvad-netns";
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+RDEPEND="
+   app-misc/jq
+   app-shells/bash
+   net-misc/curl[ipv6,ssl]
+   net-vpn/wireguard-tools
+   sys-apps/baselayout
+   sys-apps/coreutils
+   sys-apps/grep
+   sys-apps/iproute2[ipv6]
+   sys-apps/util-linux
+"
+BDEPEND="
+   sys-apps/coreutils
+   sys-devel/make
+"



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

2021-03-30 Thread Yixun Lan
commit: 8db413c924cc36925bbfa77a72961f456e92bbc9
Author: Yixun Lan  gentoo  org>
AuthorDate: Wed Mar 31 03:07:15 2021 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Wed Mar 31 03:15:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8db413c9

dev-util/babeltrace: version bump 1.5.8

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Yixun Lan  gentoo.org>

 dev-util/babeltrace/Manifest|  1 +
 dev-util/babeltrace/babeltrace-1.5.8.ebuild | 35 +
 2 files changed, 36 insertions(+)

diff --git a/dev-util/babeltrace/Manifest b/dev-util/babeltrace/Manifest
index 6de0f10a97e..fa44d517761 100644
--- a/dev-util/babeltrace/Manifest
+++ b/dev-util/babeltrace/Manifest
@@ -1 +1,2 @@
 DIST babeltrace-1.2.4.tar.bz2 995829 BLAKE2B 
99b4455000dd403bc86917ce1c5c6f32b7df8754c61197a03cbd3ec28c5756ae858965b81b06ed8cd72b910c2f0e5885c986d229f607f5c9179688cd1ccdd3b5
 SHA512 
5cfd4572519ec53ad531d333ac5e1df026ebd1a200e0fbec59c892cad5273316e07482a4199a1cb2dcb4994310b04b259748de169c4a7c1ddafd7e185f32c5f9
+DIST babeltrace-1.5.8.tar.bz2 992610 BLAKE2B 
3d47f9ba40b406271a0b35e441968718c93e8744f95b56f79acf8359001ebffb4966931f2860d48ced4f0d98261b37156564a0d798bf8d9e0ed465c05355cc5d
 SHA512 
827749ae8507efd433bb97ef668628837a3ff15b5be5097af5621d46055c6f10401da0be1f9d9f843a96c8c307b33745e04284d166e275e03b7ddb0a7dd57e96

diff --git a/dev-util/babeltrace/babeltrace-1.5.8.ebuild 
b/dev-util/babeltrace/babeltrace-1.5.8.ebuild
new file mode 100644
index 000..71efdaf0b7a
--- /dev/null
+++ b/dev-util/babeltrace/babeltrace-1.5.8.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils
+
+DESCRIPTION="A command-line tool and library to read and convert trace files"
+HOMEPAGE="https://babeltrace.org/";
+SRC_URI="https://www.efficios.com/files/${PN}/${P}.tar.bz2";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-libs/glib:2
+   dev-libs/popt
+   dev-libs/elfutils
+   sys-apps/util-linux
+   "
+
+DEPEND="${RDEPEND}
+   sys-devel/bison
+   sys-devel/flex
+   "
+src_configure() {
+   econf $(use_enable test glibtest)
+}
+
+src_install() {
+   default
+   find "${D}" -name '*.la' -delete || die
+}



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

2021-03-30 Thread Yixun Lan
commit: f27ec0a4ef1b669171cc19f59711aea7d113d92d
Author: Yixun Lan  gentoo  org>
AuthorDate: Wed Mar 31 03:15:15 2021 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Wed Mar 31 03:15:38 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f27ec0a4

dev-util/babeltrace: disable python-bindings explicitly

haven't tested python-bindings, so disable it for now
someone really need this should file a bug ..

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Yixun Lan  gentoo.org>

 dev-util/babeltrace/babeltrace-1.5.8.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev-util/babeltrace/babeltrace-1.5.8.ebuild 
b/dev-util/babeltrace/babeltrace-1.5.8.ebuild
index 71efdaf0b7a..0186c4a6342 100644
--- a/dev-util/babeltrace/babeltrace-1.5.8.ebuild
+++ b/dev-util/babeltrace/babeltrace-1.5.8.ebuild
@@ -26,7 +26,8 @@ DEPEND="${RDEPEND}
sys-devel/flex
"
 src_configure() {
-   econf $(use_enable test glibtest)
+   econf $(use_enable test glibtest) \
+   --disable-python-bindings
 }
 
 src_install() {



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

2021-03-30 Thread Matt Turner
commit: d1de52287873a49f179ca1dce9a8d93158ea8890
Author: Matt Turner  gentoo  org>
AuthorDate: Wed Mar 31 02:24:00 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Wed Mar 31 02:30:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1de5228

x11-base/xorg-server: Move x11-libs/xtrans to DEPEND

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

 x11-base/xorg-server/xorg-server-1.20.10-r3.ebuild | 2 +-
 x11-base/xorg-server/xorg-server-.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-base/xorg-server/xorg-server-1.20.10-r3.ebuild 
b/x11-base/xorg-server/xorg-server-1.20.10-r3.ebuild
index 1313a94507e..c410566df1f 100644
--- a/x11-base/xorg-server/xorg-server-1.20.10-r3.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.20.10-r3.ebuild
@@ -33,7 +33,6 @@ CDEPEND="
>=x11-libs/libxkbfile-1.0.4
>=x11-libs/libxshmfence-1.1
>=x11-libs/pixman-0.27.2
-   >=x11-libs/xtrans-1.3.5
>=x11-misc/xbitmaps-1.0.1
>=x11-misc/xkeyboard-config-2.4.1-r3
dmx? (
@@ -88,6 +87,7 @@ CDEPEND="
 "
 DEPEND="${CDEPEND}
>=x11-base/xorg-proto-2018.4
+   >=x11-libs/xtrans-1.3.5
dmx? (
doc? (
|| (

diff --git a/x11-base/xorg-server/xorg-server-.ebuild 
b/x11-base/xorg-server/xorg-server-.ebuild
index 5ee3bf110b6..5d98633a352 100644
--- a/x11-base/xorg-server/xorg-server-.ebuild
+++ b/x11-base/xorg-server/xorg-server-.ebuild
@@ -34,7 +34,6 @@ CDEPEND="
>=x11-libs/libxkbfile-1.0.4
>=x11-libs/libxshmfence-1.1
>=x11-libs/pixman-0.27.2
-   >=x11-libs/xtrans-1.3.5
>=x11-misc/xbitmaps-1.0.1
>=x11-misc/xkeyboard-config-2.4.1-r3
dmx? (
@@ -89,6 +88,7 @@ CDEPEND="
 "
 DEPEND="${CDEPEND}
>=x11-base/xorg-proto-2018.4
+   >=x11-libs/xtrans-1.3.5
dmx? (
doc? (
|| (



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

2021-03-30 Thread Matt Turner
commit: 4b2a6caa2b1eaa66333dd756fbed7d9a09353b0f
Author: Matt Turner  gentoo  org>
AuthorDate: Wed Mar 31 02:25:32 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Wed Mar 31 02:30:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b2a6caa

x11-base/xorg-server: BDEPEND on dev-util/wayland-scanner

Closes: https://bugs.gentoo.org/774078
Signed-off-by: Matt Turner  gentoo.org>

 x11-base/xorg-server/xorg-server-1.20.10-r3.ebuild | 1 +
 x11-base/xorg-server/xorg-server-.ebuild   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/x11-base/xorg-server/xorg-server-1.20.10-r3.ebuild 
b/x11-base/xorg-server/xorg-server-1.20.10-r3.ebuild
index c410566df1f..e5ffdf551e0 100644
--- a/x11-base/xorg-server/xorg-server-1.20.10-r3.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.20.10-r3.ebuild
@@ -104,6 +104,7 @@ RDEPEND="${CDEPEND}
 "
 BDEPEND="
sys-devel/flex
+   wayland? ( dev-util/wayland-scanner )
 "
 PDEPEND="
xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )"

diff --git a/x11-base/xorg-server/xorg-server-.ebuild 
b/x11-base/xorg-server/xorg-server-.ebuild
index 5d98633a352..7b4a9180cd7 100644
--- a/x11-base/xorg-server/xorg-server-.ebuild
+++ b/x11-base/xorg-server/xorg-server-.ebuild
@@ -105,6 +105,7 @@ RDEPEND="${CDEPEND}
 "
 BDEPEND="
sys-devel/flex
+   wayland? ( dev-util/wayland-scanner )
 "
 PDEPEND="
xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )"



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

2021-03-30 Thread Matt Turner
commit: 2d4c43888f62d56a8d60e813e4703e50a09f0146
Author: Matt Turner  gentoo  org>
AuthorDate: Wed Mar 31 02:18:13 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Wed Mar 31 02:30:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d4c4388

x11-base/xorg-server: Use BDEPEND

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

 x11-base/xorg-server/xorg-server-1.20.10-r3.ebuild | 10 +-
 x11-base/xorg-server/xorg-server-.ebuild   | 10 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/x11-base/xorg-server/xorg-server-1.20.10-r3.ebuild 
b/x11-base/xorg-server/xorg-server-1.20.10-r3.ebuild
index b815b67a839..1313a94507e 100644
--- a/x11-base/xorg-server/xorg-server-1.20.10-r3.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.20.10-r3.ebuild
@@ -86,9 +86,7 @@ CDEPEND="
)
!!x11-drivers/nvidia-drivers[-libglvnd(+)]
 "
-
 DEPEND="${CDEPEND}
-   sys-devel/flex
>=x11-base/xorg-proto-2018.4
dmx? (
doc? (
@@ -98,13 +96,15 @@ DEPEND="${CDEPEND}
www-client/w3m
)
)
-   )"
-
+   )
+"
 RDEPEND="${CDEPEND}
!systemd? ( gui-libs/display-manager-init )
selinux? ( sec-policy/selinux-xserver )
 "
-
+BDEPEND="
+   sys-devel/flex
+"
 PDEPEND="
xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )"
 

diff --git a/x11-base/xorg-server/xorg-server-.ebuild 
b/x11-base/xorg-server/xorg-server-.ebuild
index b77e074e480..5ee3bf110b6 100644
--- a/x11-base/xorg-server/xorg-server-.ebuild
+++ b/x11-base/xorg-server/xorg-server-.ebuild
@@ -87,9 +87,7 @@ CDEPEND="
)
!!x11-drivers/nvidia-drivers[-libglvnd(+)]
 "
-
 DEPEND="${CDEPEND}
-   sys-devel/flex
>=x11-base/xorg-proto-2018.4
dmx? (
doc? (
@@ -99,13 +97,15 @@ DEPEND="${CDEPEND}
www-client/w3m
)
)
-   )"
-
+   )
+"
 RDEPEND="${CDEPEND}
!systemd? ( gui-libs/display-manager-init )
selinux? ( sec-policy/selinux-xserver )
 "
-
+BDEPEND="
+   sys-devel/flex
+"
 PDEPEND="
xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )"
 



[gentoo-commits] repo/gentoo:master commit in: net-dialup/mgetty/

2021-03-30 Thread Sam James
commit: d8c755eca9293da124d34a7f366a72cb980706f0
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 31 02:23:48 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 02:23:48 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8c755ec

net-dialup/mgetty: Stabilize 1.2.1-r3 arm, #779433

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

 net-dialup/mgetty/mgetty-1.2.1-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dialup/mgetty/mgetty-1.2.1-r3.ebuild 
b/net-dialup/mgetty/mgetty-1.2.1-r3.ebuild
index 6853b313d5e..b0142154c53 100644
--- a/net-dialup/mgetty/mgetty-1.2.1-r3.ebuild
+++ b/net-dialup/mgetty/mgetty-1.2.1-r3.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc 
x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
 IUSE="+fax fidonet split-usr"
 
 PATCHES=(



[gentoo-commits] repo/gentoo:master commit in: sys-apps/pciutils/

2021-03-30 Thread Sam James
commit: 38139cb70e1af1e5228ee31387d7fa9711769246
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 31 02:24:02 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 02:24:02 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38139cb7

sys-apps/pciutils: Stabilize 3.7.0 arm64, #774660

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

 sys-apps/pciutils/pciutils-3.7.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/pciutils/pciutils-3.7.0.ebuild 
b/sys-apps/pciutils/pciutils-3.7.0.ebuild
index e33fe9417ed..40d177a4c26 100644
--- a/sys-apps/pciutils/pciutils-3.7.0.ebuild
+++ b/sys-apps/pciutils/pciutils-3.7.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mj.ucw.cz/download/linux/pci/${P}.tar.gz";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="dns +kmod static-libs +udev zlib"
 
 # Have the sub-libs in RDEPEND with [static-libs] since, logically,



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

2021-03-30 Thread Sam James
commit: fd33f23ef021003ada55167de75fb2ae1e3299fb
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 31 02:23:43 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 02:23:43 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd33f23e

media-libs/dav1d: Stabilize 0.8.2 arm, #774741

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

 media-libs/dav1d/dav1d-0.8.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/dav1d/dav1d-0.8.2.ebuild 
b/media-libs/dav1d/dav1d-0.8.2.ebuild
index 6972440afa9..0bea1955ab5 100644
--- a/media-libs/dav1d/dav1d-0.8.2.ebuild
+++ b/media-libs/dav1d/dav1d-0.8.2.ebuild
@@ -8,7 +8,7 @@ if [[ "${PV}" == "" ]]; then
SCM="git-r3"
EGIT_REPO_URI="https://code.videolan.org/videolan/dav1d";
 else
-   KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~sparc x86"
+   KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~sparc x86"

SRC_URI="https://code.videolan.org/videolan/dav1d/-/archive/${PV}/${P}.tar.bz2";
 fi
 



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

2021-03-30 Thread Sam James
commit: 92d043fa565debe7141fe737238fd6da925d1eeb
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 31 02:24:08 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 02:24:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92d043fa

media-libs/dav1d: Stabilize 0.8.2 arm64, #774741

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

 media-libs/dav1d/dav1d-0.8.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/dav1d/dav1d-0.8.2.ebuild 
b/media-libs/dav1d/dav1d-0.8.2.ebuild
index 0bea1955ab5..8cb72bbfcc9 100644
--- a/media-libs/dav1d/dav1d-0.8.2.ebuild
+++ b/media-libs/dav1d/dav1d-0.8.2.ebuild
@@ -8,7 +8,7 @@ if [[ "${PV}" == "" ]]; then
SCM="git-r3"
EGIT_REPO_URI="https://code.videolan.org/videolan/dav1d";
 else
-   KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~sparc x86"
+   KEYWORDS="amd64 arm arm64 ppc ppc64 ~sparc x86"

SRC_URI="https://code.videolan.org/videolan/dav1d/-/archive/${PV}/${P}.tar.bz2";
 fi
 



[gentoo-commits] repo/gentoo:master commit in: sys-apps/pciutils/

2021-03-30 Thread Sam James
commit: 6dfcee606d3eed4f10e3eecc80337b91fee8f19f
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 31 02:23:37 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 02:23:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6dfcee60

sys-apps/pciutils: Stabilize 3.7.0 arm, #774660

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

 sys-apps/pciutils/pciutils-3.7.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/pciutils/pciutils-3.7.0.ebuild 
b/sys-apps/pciutils/pciutils-3.7.0.ebuild
index f1026ab519b..e33fe9417ed 100644
--- a/sys-apps/pciutils/pciutils-3.7.0.ebuild
+++ b/sys-apps/pciutils/pciutils-3.7.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mj.ucw.cz/download/linux/pci/${P}.tar.gz";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="dns +kmod static-libs +udev zlib"
 
 # Have the sub-libs in RDEPEND with [static-libs] since, logically,



[gentoo-commits] repo/gentoo:master commit in: net-fs/s3fs/

2021-03-30 Thread Sam James
commit: 0b3fa6b2ffc048c80ad88da657dc9e25b49d6c77
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 31 02:21:53 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 02:21:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b3fa6b2

net-fs/s3fs: Stabilize 1.86 amd64, #779334

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

 net-fs/s3fs/s3fs-1.86.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-fs/s3fs/s3fs-1.86.ebuild b/net-fs/s3fs/s3fs-1.86.ebuild
index e0f2f260686..29e2862df29 100644
--- a/net-fs/s3fs/s3fs-1.86.ebuild
+++ b/net-fs/s3fs/s3fs-1.86.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="gnutls nettle nss +openssl test"
 REQUIRED_USE="
^^ ( gnutls nss openssl )



[gentoo-commits] repo/gentoo:master commit in: app-admin/monit/

2021-03-30 Thread Sam James
commit: dbee4f63647bc972b5b6b660b2d05008d8ac7b5a
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 31 02:21:47 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 02:21:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbee4f63

app-admin/monit: Stabilize 5.27.2 amd64, #779331

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

 app-admin/monit/monit-5.27.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/monit/monit-5.27.2.ebuild 
b/app-admin/monit/monit-5.27.2.ebuild
index da9ce154be3..89edd3be0a4 100644
--- a/app-admin/monit/monit-5.27.2.ebuild
+++ b/app-admin/monit/monit-5.27.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz";
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ppc ~ppc64 x86 ~amd64-linux"
+KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux"
 IUSE="ipv6 libressl pam ssl"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: sys-apps/pciutils/

2021-03-30 Thread Sam James
commit: d839bf3cc1f595d94247a1a707664d64ade3dbfd
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 31 02:21:42 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 02:21:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d839bf3c

sys-apps/pciutils: Stabilize 3.7.0 amd64, #774660

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

 sys-apps/pciutils/pciutils-3.7.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/pciutils/pciutils-3.7.0.ebuild 
b/sys-apps/pciutils/pciutils-3.7.0.ebuild
index 5f2028a8600..666f298117e 100644
--- a/sys-apps/pciutils/pciutils-3.7.0.ebuild
+++ b/sys-apps/pciutils/pciutils-3.7.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
@@ -11,7 +11,7 @@ SRC_URI="https://mj.ucw.cz/download/linux/pci/${P}.tar.gz";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="dns +kmod static-libs +udev zlib"
 
 # Have the sub-libs in RDEPEND with [static-libs] since, logically,



[gentoo-commits] repo/gentoo:master commit in: sys-apps/pciutils/

2021-03-30 Thread Sam James
commit: ccb2194717c5ae2f82a8966a60d5a1055a60c5f4
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 31 02:22:23 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 02:22:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccb21947

sys-apps/pciutils: Stabilize 3.7.0 x86, #774660

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

 sys-apps/pciutils/pciutils-3.7.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/pciutils/pciutils-3.7.0.ebuild 
b/sys-apps/pciutils/pciutils-3.7.0.ebuild
index 666f298117e..f1026ab519b 100644
--- a/sys-apps/pciutils/pciutils-3.7.0.ebuild
+++ b/sys-apps/pciutils/pciutils-3.7.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mj.ucw.cz/download/linux/pci/${P}.tar.gz";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="dns +kmod static-libs +udev zlib"
 
 # Have the sub-libs in RDEPEND with [static-libs] since, logically,



[gentoo-commits] repo/gentoo:master commit in: net-nds/jxplorer/

2021-03-30 Thread Sam James
commit: c10bd85ce1ccc84f5df2649a1dbd5a13ef33156f
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 31 02:22:00 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 02:22:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c10bd85c

net-nds/jxplorer: Stabilize 3.3.1.2 amd64, #779361

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

 net-nds/jxplorer/jxplorer-3.3.1.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-nds/jxplorer/jxplorer-3.3.1.2.ebuild 
b/net-nds/jxplorer/jxplorer-3.3.1.2.ebuild
index 22c8ec3e8a8..04c1abce5c5 100644
--- a/net-nds/jxplorer/jxplorer-3.3.1.2.ebuild
+++ b/net-nds/jxplorer/jxplorer-3.3.1.2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}"
 LICENSE="CAOSL"
 SLOT="0"
 IUSE=""
-KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 RESTRICT="test"
 
 COMMON_DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-dialup/mgetty/

2021-03-30 Thread Sam James
commit: 4c0ac2e03d083705329baefc923b7d46ecd1b34c
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 31 02:22:06 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 02:22:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c0ac2e0

net-dialup/mgetty: Stabilize 1.2.1-r3 amd64, #779433

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

 net-dialup/mgetty/mgetty-1.2.1-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dialup/mgetty/mgetty-1.2.1-r3.ebuild 
b/net-dialup/mgetty/mgetty-1.2.1-r3.ebuild
index 2b28a60b9c5..6853b313d5e 100644
--- a/net-dialup/mgetty/mgetty-1.2.1-r3.ebuild
+++ b/net-dialup/mgetty/mgetty-1.2.1-r3.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc 
x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc 
x86"
 IUSE="+fax fidonet split-usr"
 
 PATCHES=(



[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-03-30 Thread Sam James
commit: ec07a2cde0ae740c0f2500130775e2e25312cd6c
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 31 02:06:46 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 02:06:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec07a2cd

golang-vcs-snapshot.eclass: fix @BLURB syntax

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

 eclass/golang-vcs-snapshot.eclass | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/eclass/golang-vcs-snapshot.eclass 
b/eclass/golang-vcs-snapshot.eclass
index 306db1f26c9..abdb7fa119d 100644
--- a/eclass/golang-vcs-snapshot.eclass
+++ b/eclass/golang-vcs-snapshot.eclass
@@ -1,12 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: golang-vcs-snapshot.eclass
 # @MAINTAINER:
 # William Hubbs 
 # @SUPPORTED_EAPIS: 5 6 7
-# @BLURB: support eclass for unpacking VCS snapshot tarballs for
-# software written in the Go programming language
+# @BLURB: eclass to unpack VCS snapshot tarballs for Go software
 # @DESCRIPTION:
 # This eclass provides a convenience src_unpack() which unpacks the
 # first tarball mentioned in SRC_URI to its appropriate location in



[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-03-30 Thread Sam James
commit: 3ce007c2b0d5b27e560b959b268116ac2b00fd6d
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 31 02:11:30 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 02:11:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ce007c2

ruby-ng.eclass: add @DESCRIPTION as extension of @RETURN

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

 eclass/ruby-ng.eclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass
index e52c507d801..1933049f4ac 100644
--- a/eclass/ruby-ng.eclass
+++ b/eclass/ruby-ng.eclass
@@ -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
 
 # @ECLASS: ruby-ng.eclass
@@ -111,6 +111,7 @@ ruby_implementation_depend() {
 # @FUNCTION: _ruby_get_all_impls
 # @INTERNAL
 # @RETURN: list of valid values in USE_RUBY
+# @DESCRIPTION:
 # Return a list of valid implementations in USE_RUBY, skipping the old
 # implementations that are no longer supported.
 _ruby_get_all_impls() {



[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-03-30 Thread Sam James
commit: c1294ad44d5d610f924eded9a7ec2a606c18b93d
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 31 02:08:50 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 02:08:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1294ad4

postgres-multi.eclass: fix @AUTHOR tag

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

 eclass/postgres-multi.eclass | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/eclass/postgres-multi.eclass b/eclass/postgres-multi.eclass
index 49d5c6a9c68..106f1ee3ead 100644
--- a/eclass/postgres-multi.eclass
+++ b/eclass/postgres-multi.eclass
@@ -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
 
 inherit multibuild postgres
@@ -8,7 +8,8 @@ EXPORT_FUNCTIONS pkg_setup src_prepare src_compile src_install 
src_test
 # @ECLASS: postgres-multi.eclass
 # @MAINTAINER:
 # PostgreSQL 
-# @AUTHOR: Aaron W. Swenson 
+# @AUTHOR:
+# Aaron W. Swenson 
 # @SUPPORTED_EAPIS: 5 6 7
 # @BLURB: An eclass to build PostgreSQL-related packages against multiple slots
 # @DESCRIPTION:



[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-03-30 Thread Sam James
commit: 486cdf1a9e3e05fb5dcc5903e4542b9714ca8204
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 31 02:12:45 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 02:13:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=486cdf1a

mozextension.eclass: fix EclassDocError in parsing no @DESCRIPTION

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

 eclass/mozextension.eclass | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/eclass/mozextension.eclass b/eclass/mozextension.eclass
index c6276908b9f..3966dfd9f53 100644
--- a/eclass/mozextension.eclass
+++ b/eclass/mozextension.eclass
@@ -1,11 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 #
+
 # @ECLASS: mozextension.eclass
 # @MAINTAINER:
 # Mozilla team 
-# @BLURB: Install extensions for use in mozilla products.
-#
+# @BLURB: Install extensions for use in Mozilla products.
+
 if [[ ! ${_MOZEXTENSION} ]]; then
 
 # @ECLASS-VARIABLE: MOZEXTENSION_TARGET



[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-03-30 Thread Sam James
commit: 91c77e2c290029446b2a55a6ad5e74c8ef5fba5c
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 31 02:09:29 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 02:09:29 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91c77e2c

openib.eclass: explicitly mark as maintainer-needed

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

 eclass/openib.eclass | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/eclass/openib.eclass b/eclass/openib.eclass
index a36f5cd85d0..7810062fae3 100644
--- a/eclass/openib.eclass
+++ b/eclass/openib.eclass
@@ -1,9 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: openib.eclass
+# @MAINTAINER:
+# maintainer-nee...@gentoo.org
 # @AUTHOR:
-# Original Author: Alexey Shvetsov 
+# Author: Alexey Shvetsov 
 # @BLURB: Simplify working with OFED packages
 
 inherit eutils rpm versionator



[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-03-30 Thread Sam James
commit: d85267e74fcd44ef42ca0cb90c7a1a46d772a8da
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 31 02:11:00 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 02:11:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d85267e7

java-utils-2.eclass: fix @RETURN syntax

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

 eclass/java-utils-2.eclass | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass
index 861d8b24a71..a5c06a689ce 100644
--- a/eclass/java-utils-2.eclass
+++ b/eclass/java-utils-2.eclass
@@ -2591,14 +2591,14 @@ java-pkg_needs-vm() {
 
 # @FUNCTION: java-pkg_get-current-vm
 # @INTERNAL
-# @RETURN - The current VM being used
+# @RETURN: The current VM being used
 java-pkg_get-current-vm() {
java-config -f
 }
 
 # @FUNCTION: java-pkg_get-vm-vendor
 # @INTERNAL
-# @RETURN - The vendor of the current VM
+# @RETURN: The vendor of the current VM
 java-pkg_get-vm-vendor() {
debug-print-function ${FUNCNAME} $*
 
@@ -2609,7 +2609,7 @@ java-pkg_get-vm-vendor() {
 
 # @FUNCTION: java-pkg_get-vm-version
 # @INTERNAL
-# @RETURN - The version of the current VM
+# @RETURN: The version of the current VM
 java-pkg_get-vm-version() {
debug-print-function ${FUNCNAME} $*
 
@@ -2618,12 +2618,12 @@ java-pkg_get-vm-version() {
 
 # @FUNCTION: java-pkg_build-vm-from-handle
 # @INTERNAL
+# @RETURN: VM handle of an available JDK
 # @DESCRIPTION:
 # Selects a build vm from a list of vm handles. First checks for the system-vm
 # beeing usable, then steps through the listed handles till a suitable vm is
 # found.
 #
-# @RETURN - VM handle of an available JDK
 java-pkg_build-vm-from-handle() {
debug-print-function ${FUNCNAME} "$*"
 



[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-03-30 Thread Sam James
commit: d16f8a6b5e559ea9ea09568a68cb0e641dcb0257
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 31 02:07:29 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 02:07:29 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d16f8a6b

java-utils-2.eclass: drop non-existent @DESCRIPTION for function

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

 eclass/java-utils-2.eclass | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass
index b0d4d8acbef..861d8b24a71 100644
--- a/eclass/java-utils-2.eclass
+++ b/eclass/java-utils-2.eclass
@@ -1,4 +1,4 @@
-# Copyright 2004-2020 Gentoo Authors
+# Copyright 2004-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: java-utils-2.eclass
@@ -1484,7 +1484,6 @@ java-pkg_ensure-vm-version-sufficient() {
 
 # @FUNCTION: java-pkg_is-vm-version-sufficient
 # @INTERNAL
-# @DESCRIPTION:
 # @RETURN: zero - VM is sufficient; non-zero - VM is not sufficient
 java-pkg_is-vm-version-sufficient() {
debug-print-function ${FUNCNAME} $*



[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-03-30 Thread Sam James
commit: 4055629267b44e1c3544d5da44d3e9f37b80e7f7
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 31 02:09:54 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 02:09:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40556292

php-pear-r2.eclass: fix @DESCRIPTION syntax

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

 eclass/php-pear-r2.eclass | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/eclass/php-pear-r2.eclass b/eclass/php-pear-r2.eclass
index d3887492047..f0fe4b96f8e 100644
--- a/eclass/php-pear-r2.eclass
+++ b/eclass/php-pear-r2.eclass
@@ -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
 
 # @ECLASS: php-pear-r2.eclass
@@ -39,7 +39,8 @@ RDEPEND=">=dev-php/pear-1.8.1"
 
 # @ECLASS-VARIABLE: PEAR-P
 # @INTERNAL
-# @DESCRIPTION: Combines PHP_PEAR_PKG_NAME and PEAR_PV
+# @DESCRIPTION:
+# Combines PHP_PEAR_PKG_NAME and PEAR_PV
 PEAR_P="${PHP_PEAR_PKG_NAME}-${PEAR_PV}"
 
 # @ECLASS-VARIABLE: PHP_PEAR_DOMAIN



[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-03-30 Thread Sam James
commit: dea6bb10ccfed3e7c5f529dbaf8d9bf59337898a
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 31 00:59:49 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 02:02:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dea6bb10

emboss-r2.eclass: mark EBO_DESCRIPTION as @PRE_INHERIT

As per @DESCRIPTION.

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

 eclass/emboss-r2.eclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eclass/emboss-r2.eclass b/eclass/emboss-r2.eclass
index 1f09805f854..680b7b7e4d6 100644
--- a/eclass/emboss-r2.eclass
+++ b/eclass/emboss-r2.eclass
@@ -23,6 +23,7 @@
 # inherit emboss-r2
 
 # @ECLASS-VARIABLE: EBO_DESCRIPTION
+# @PRE_INHERIT
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # Completes the generic description of the embassy module as follows:



[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-03-30 Thread Sam James
commit: 949d6f573ad8376e0fd3f34cb0037332eaae08f3
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 31 01:18:20 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 02:02:56 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=949d6f57

cargo.eclass: consistent comment whitespace

Signed-off-by: Sam James  gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/20208
Signed-off-by: Sam James  gentoo.org>

 eclass/cargo.eclass | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/eclass/cargo.eclass b/eclass/cargo.eclass
index e763ac3468c..e2894b4588b 100644
--- a/eclass/cargo.eclass
+++ b/eclass/cargo.eclass
@@ -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
 
 # @ECLASS: cargo.eclass
@@ -204,7 +204,6 @@ cargo_src_unpack() {
 # @FUNCTION: cargo_live_src_unpack
 # @DESCRIPTION:
 # Runs 'cargo fetch' and vendors downloaded crates for offline use, used in 
live ebuilds
-
 cargo_live_src_unpack() {
debug-print-function ${FUNCNAME} "$@"
 
@@ -316,7 +315,6 @@ cargo_live_src_unpack() {
 # In some cases crates may need '--no-default-features' option,
 # as there is no way to disable single feature, except disabling all.
 # It can be passed directly to cargo_src_configure().
-
 cargo_src_configure() {
debug-print-function ${FUNCNAME} "$@"
 
@@ -361,7 +359,6 @@ cargo_src_compile() {
 # In come case workspaces need alternative --path parameter
 # default is '--path ./' if nothing specified.
 # '--path ./somedir' can be passed directly to cargo_src_install()
-
 cargo_src_install() {
debug-print-function ${FUNCNAME} "$@"
 



[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-03-30 Thread Sam James
commit: 9f829c2c446fc00ca070be4182401ec949d07b1d
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 31 01:12:27 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 02:02:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f829c2c

golang-base.eclass: s/eapi/EAPI/

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

 eclass/golang-base.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/golang-base.eclass b/eclass/golang-base.eclass
index e700d17a4d8..8e859d0fdf6 100644
--- a/eclass/golang-base.eclass
+++ b/eclass/golang-base.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: golang-base.eclass
@@ -15,7 +15,7 @@ case "${EAPI:-0}" in
5|6|7)
;;
*)
-   die "${ECLASS}: Unsupported eapi (EAPI=${EAPI})"
+   die "${ECLASS}: Unsupported EAPI (EAPI=${EAPI})"
;;
 esac
 



[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-03-30 Thread Sam James
commit: 1ef235929b6571f88be96b8f01a240e931349928
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 31 01:00:44 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 02:02:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ef23592

office-ext-r1.eclass: mark OFFICE_EXTENSIONS, OFFICE_REQ_USE as @PRE_INHERIT

Controls IUSE and *DEPEND in global scope.

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

 eclass/office-ext-r1.eclass | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/eclass/office-ext-r1.eclass b/eclass/office-ext-r1.eclass
index a1649ac8d6a..a81eea4b610 100644
--- a/eclass/office-ext-r1.eclass
+++ b/eclass/office-ext-r1.eclass
@@ -20,6 +20,7 @@ esac
 EXPORT_FUNCTIONS src_unpack src_install
 
 # @ECLASS-VARIABLE: OFFICE_REQ_USE
+# @PRE_INHERIT
 # @DESCRIPTION:
 # Useflags required on office implementation for the extension.
 #
@@ -45,6 +46,7 @@ fi
 [[ -z ${OFFICE_IMPLEMENTATIONS} ]] && OFFICE_IMPLEMENTATIONS=( "libreoffice" )
 
 # @ECLASS-VARIABLE: OFFICE_EXTENSIONS
+# @PRE_INHERIT
 # @REQUIRED
 # @DESCRIPTION:
 # Array containing list of extensions to install.



[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-03-30 Thread Sam James
commit: 38fa9be14d380d9ce61a74f87ee9bb0db001452d
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 31 00:37:00 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 02:02:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38fa9be1

pax-utils.eclass: document _pax_list_files and mark as @INTERNAL

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

 eclass/pax-utils.eclass | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/eclass/pax-utils.eclass b/eclass/pax-utils.eclass
index 1e109c884b1..209e4831f96 100644
--- a/eclass/pax-utils.eclass
+++ b/eclass/pax-utils.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: pax-utils.eclass
@@ -176,6 +176,10 @@ host-is-pax() {
 # them elsewhere as they are not supported (i.e. they may be removed
 # or their function may change arbitrarily).
 
+# @FUNCTION: _pax_list_files
+# @INTERNAL
+# @USAGE:  [items]
+# @DESCRIPTION:
 # Display a list of things, one per line, indented a bit, using the
 # display command in $1.
 _pax_list_files() {



[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-03-30 Thread Sam James
commit: 2ac04694dab68b99b0fc5812eed7e8f5ff9e88df
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 31 00:49:06 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 02:02:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ac04694

ssl-cert.eclass: mark SSL_CERT_MANDATORY, SSL_CERT_USE, SSL_DEPS_SKIP as 
@PRE_INHERIT

All manipulate dependencies or IUSE in global scope.

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

 eclass/ssl-cert.eclass | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/eclass/ssl-cert.eclass b/eclass/ssl-cert.eclass
index fdd6775ffc7..ee7364513a0 100644
--- a/eclass/ssl-cert.eclass
+++ b/eclass/ssl-cert.eclass
@@ -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
 
 # @ECLASS: ssl-cert.eclass
@@ -26,16 +26,19 @@ case "${EAPI:-0}" in
 esac
 
 # @ECLASS-VARIABLE: SSL_CERT_MANDATORY
+# @PRE_INHERIT
 # @DESCRIPTION:
 # Set to non zero if ssl-cert is mandatory for ebuild.
 : ${SSL_CERT_MANDATORY:=0}
 
 # @ECLASS-VARIABLE: SSL_CERT_USE
+# @PRE_INHERIT
 # @DESCRIPTION:
 # Use flag to append dependency to.
 : ${SSL_CERT_USE:=ssl}
 
 # @ECLASS-VARIABLE: SSL_DEPS_SKIP
+# @PRE_INHERIT
 # @DESCRIPTION:
 # Set to non zero to skip adding to DEPEND and IUSE.
 : ${SSL_DEPS_SKIP:=0}



[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-03-30 Thread Sam James
commit: e81779f227220898f30c4bb8f49e0d4a72f8ea11
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 31 01:16:29 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 02:02:56 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e81779f2

texlive-module.eclass: mark TEXLIVE_MODULE_*_CONTENTS as @PRE_INHERIT

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

 eclass/texlive-module.eclass | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/eclass/texlive-module.eclass b/eclass/texlive-module.eclass
index 15988fb4b54..22b74237a4f 100644
--- a/eclass/texlive-module.eclass
+++ b/eclass/texlive-module.eclass
@@ -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
 
 # @ECLASS: texlive-module.eclass
@@ -24,6 +24,7 @@
 # bash array.
 
 # @ECLASS-VARIABLE: TEXLIVE_MODULE_CONTENTS
+# @PRE_INHERIT
 # @REQUIRED
 # @DESCRIPTION:
 # The list of packages that will be installed. This variable will be expanded 
to
@@ -31,12 +32,14 @@
 # foo -> texlive-module-foo-${PV}.tar.xz
 
 # @ECLASS-VARIABLE: TEXLIVE_MODULE_DOC_CONTENTS
+# @PRE_INHERIT
 # @REQUIRED
 # @DESCRIPTION:
 # The list of packages that will be installed if the doc useflag is enabled.
 # Expansion to SRC_URI is the same as for TEXLIVE_MODULE_CONTENTS.
 
 # @ECLASS-VARIABLE: TEXLIVE_MODULE_SRC_CONTENTS
+# @PRE_INHERIT
 # @REQUIRED
 # @DESCRIPTION:
 # The list of packages that will be installed if the source useflag is enabled.



[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-03-30 Thread Sam James
commit: 22146a7a7bda1ad1a7a6ec5da05135005d3204cd
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 31 02:00:29 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 02:02:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22146a7a

postgres.eclass: fix @AUTHOR definition

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

 eclass/postgres.eclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eclass/postgres.eclass b/eclass/postgres.eclass
index bcd7e0adebe..7652a862518 100644
--- a/eclass/postgres.eclass
+++ b/eclass/postgres.eclass
@@ -7,7 +7,8 @@ EXPORT_FUNCTIONS pkg_setup
 # @ECLASS: postgres.eclass
 # @MAINTAINER:
 # PostgreSQL 
-# @AUTHOR: Aaron W. Swenson 
+# @AUTHOR:
+# Aaron W. Swenson 
 # @SUPPORTED_EAPIS: 5 6 7
 # @BLURB: An eclass for PostgreSQL-related packages
 # @DESCRIPTION:



[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-03-30 Thread Sam James
commit: 10426a3a32e924a47d0c2a0f341b37ad0756c54b
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 31 00:39:26 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 02:02:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10426a3a

postgres.eclass: mark POSTGRES_COMPAT, POSTGRES_USEDEP as @PRE_INHERIT

Clearly stated as such in @DESCRIPTION.

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

 eclass/postgres.eclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/eclass/postgres.eclass b/eclass/postgres.eclass
index 2e2ac85ead6..bcd7e0adebe 100644
--- a/eclass/postgres.eclass
+++ b/eclass/postgres.eclass
@@ -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
 
 inherit user
@@ -32,6 +32,7 @@ _POSTGRES_ALL_VERSIONS=(  13 12 11 10 9.6 9.5 9.4 9.3 9.2 
)
 
 
 # @ECLASS-VARIABLE: POSTGRES_COMPAT
+# @PRE_INHERIT
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # A Bash array containing a list of compatible PostgreSQL slots as
@@ -49,6 +50,7 @@ _POSTGRES_ALL_VERSIONS=(  13 12 11 10 9.6 9.5 9.4 9.3 9.2 
)
 POSTGRES_DEP="dev-db/postgresql:="
 
 # @ECLASS-VARIABLE: POSTGRES_USEDEP
+# @PRE_INHERIT
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # Add the 2-Style and/or 4-Style use dependencies without brackets to be used



[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-03-30 Thread Sam James
commit: ed5cd707909a74a1d230070ea70fbd37ddbd02ec
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 31 00:22:05 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 02:02:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed5cd707

dotnet.eclass: mark USE_DOTNET as @PRE_INHERIT

We use it to control IUSE in global scope.

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

 eclass/dotnet.eclass | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/eclass/dotnet.eclass b/eclass/dotnet.eclass
index ae861daf6e7..fd25ad1d585 100644
--- a/eclass/dotnet.eclass
+++ b/eclass/dotnet.eclass
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: dotnet.eclass
-# @MAINTAINER: dot...@gentoo.org
+# @MAINTAINER:
+# dot...@gentoo.org
 # @SUPPORTED_EAPIS: 1 2 3 4 5 6 7
 # @BLURB: common settings and functions for mono and dotnet related packages
 # @DESCRIPTION:
@@ -24,6 +25,7 @@ esac
 inherit mono-env
 
 # @ECLASS-VARIABLE: USE_DOTNET
+# @PRE_INHERIT
 # @DESCRIPTION:
 # Use flags added to IUSE
 



[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-03-30 Thread Sam James
commit: 6704b0d5dead784a89124b2da6862d61654bf104
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 31 00:28:18 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 02:02:43 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6704b0d5

virtualx.eclass: mark VIRTUALX_REQUIRED as @PRE_INHERIT

Controls various dependencies in global scope.

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

 eclass/virtualx.eclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass
index fa16784bd94..a95f8a7e1c1 100644
--- a/eclass/virtualx.eclass
+++ b/eclass/virtualx.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: virtualx.eclass
@@ -25,6 +25,7 @@ esac
 [[ ${EAPI} == [45] ]] && inherit eutils
 
 # @ECLASS-VARIABLE: VIRTUALX_REQUIRED
+# @PRE_INHERIT
 # @DESCRIPTION:
 # Variable specifying the dependency on xorg-server and xhost.
 # Possible special values are "always" and "manual", which specify



[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-03-30 Thread Sam James
commit: 408a5dc1d82fb7af0ee932ea793937d89e3b05db
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 31 00:32:16 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 02:02:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=408a5dc1

elisp.eclass: mark NEED_EMACS as @PRE_INHERIT

Obviously controls dependency in global scope,
as the DESCRIPTION indicates.

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

 eclass/elisp.eclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eclass/elisp.eclass b/eclass/elisp.eclass
index 7876928c7fb..a092041009b 100644
--- a/eclass/elisp.eclass
+++ b/eclass/elisp.eclass
@@ -1,4 +1,4 @@
-# Copyright 2002-2020 Gentoo Authors
+# Copyright 2002-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: elisp.eclass
@@ -27,6 +27,7 @@
 # ${PN}.el in src_unpack().
 
 # @ECLASS-VARIABLE: NEED_EMACS
+# @PRE_INHERIT
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # If you need anything different from Emacs 23, use the NEED_EMACS



[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-03-30 Thread Sam James
commit: 107f1e5e9e750be886c0419123eda02ef2f1a496
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 31 00:49:41 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 02:02:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=107f1e5e

ssl-cert.eclass: explicitly mark as maintainer-needed

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

 eclass/ssl-cert.eclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eclass/ssl-cert.eclass b/eclass/ssl-cert.eclass
index ee7364513a0..f2be814470d 100644
--- a/eclass/ssl-cert.eclass
+++ b/eclass/ssl-cert.eclass
@@ -3,6 +3,7 @@
 
 # @ECLASS: ssl-cert.eclass
 # @MAINTAINER:
+# maintainer-nee...@gentoo.org
 # @AUTHOR:
 # Max Kalika 
 # @SUPPORTED_EAPIS: 1 2 3 4 5 6 7



[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-03-30 Thread Sam James
commit: 6ac96d02b89753a55881da303e64e08ea9774f50
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 31 00:51:25 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 02:02:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ac96d02

ssl-cert.eclass: mark various functions as @INTERNAL

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

 eclass/ssl-cert.eclass | 13 ++---
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/eclass/ssl-cert.eclass b/eclass/ssl-cert.eclass
index f2be814470d..a774f9b8b9e 100644
--- a/eclass/ssl-cert.eclass
+++ b/eclass/ssl-cert.eclass
@@ -65,12 +65,12 @@ if [[ "${SSL_DEPS_SKIP}" == "0" ]]; then
 fi
 
 # @FUNCTION: gen_cnf
+# @INTERNAL
 # @USAGE:
 # @DESCRIPTION:
 # Initializes variables and generates the needed
 # OpenSSL configuration file and a CA serial file
 #
-# Access: private
 gen_cnf() {
# Location of the config file
SSL_CONF="${T}/${$}ssl.cnf"
@@ -117,13 +117,13 @@ gen_cnf() {
 }
 
 # @FUNCTION: get_base
+# @INTERNAL
 # @USAGE: [if_ca]
 # @RETURN: 
 # @DESCRIPTION:
 # Simple function to determine whether we're creating
 # a CA (which should only be done once) or final part
 #
-# Access: private
 get_base() {
if [ "${1}" ] ; then
echo "${T}/${$}ca"
@@ -133,11 +133,11 @@ get_base() {
 }
 
 # @FUNCTION: gen_key
+# @INTERNAL
 # @USAGE: 
 # @DESCRIPTION:
 # Generates an RSA key
 #
-# Access: private
 gen_key() {
local base=$(get_base "$1")
ebegin "Generating ${SSL_BITS} bit RSA key${1:+ for CA}"
@@ -153,12 +153,12 @@ gen_key() {
 }
 
 # @FUNCTION: gen_csr
+# @INTERNAL
 # @USAGE: 
 # @DESCRIPTION:
 # Generates a certificate signing request using
 # the key made by gen_key()
 #
-# Access: private
 gen_csr() {
local base=$(get_base "$1")
ebegin "Generating Certificate Signing Request${1:+ for CA}"
@@ -170,6 +170,7 @@ gen_csr() {
 }
 
 # @FUNCTION: gen_crt
+# @INTERNAL
 # @USAGE: 
 # @DESCRIPTION:
 # Generates either a self-signed CA certificate using
@@ -177,7 +178,6 @@ gen_csr() {
 # a signed server certificate using the CA cert previously
 # created by gen_crt()
 #
-# Access: private
 gen_crt() {
local base=$(get_base "$1")
if [ "${1}" ] ; then
@@ -200,12 +200,12 @@ gen_crt() {
 }
 
 # @FUNCTION: gen_pem
+# @INTERNAL
 # @USAGE: 
 # @DESCRIPTION:
 # Generates a PEM file by concatinating the key
 # and cert file created by gen_key() and gen_cert()
 #
-# Access: private
 gen_pem() {
local base=$(get_base "$1")
ebegin "Generating PEM Certificate"
@@ -224,7 +224,6 @@ gen_pem() {
 #
 # Example: "install_cert /foo/bar" installs ${ROOT}/foo/bar.{key,csr,crt,pem}
 #
-# Access: public
 install_cert() {
if [ $# -lt 1 ] ; then
eerror "At least one argument needed"



[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-03-30 Thread Sam James
commit: 75aff778eb91d9cfe572f8e27273c026f6e15ddf
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 31 00:30:25 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 02:02:43 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75aff778

opam.eclass: mark OPAM_INSTALLER_DEP as @PRE_INHERIT

Controls whether we depend on opam-installer or not
in global scope.

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

 eclass/opam.eclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eclass/opam.eclass b/eclass/opam.eclass
index 338ba842cd9..2789e32d315 100644
--- a/eclass/opam.eclass
+++ b/eclass/opam.eclass
@@ -22,6 +22,7 @@ esac
 QA_FLAGS_IGNORED='.*'
 
 # @ECLASS-VARIABLE: OPAM_INSTALLER_DEP
+# @PRE_INHERIT
 # @DESCRIPTION:
 # Override dependency for OPAM_INSTALLER
 : ${OPAM_INSTALLER_DEP:="dev-ml/opam-installer"}



[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-03-30 Thread Sam James
commit: e56943242d29c5bd216d5bb605616cf5c3ef6178
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 31 00:47:06 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 02:02:48 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5694324

ruby-single.eclass: mark USE_RUBY as @PRE_INHERIT

As per @DESCRIPTION.

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

 eclass/ruby-single.eclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eclass/ruby-single.eclass b/eclass/ruby-single.eclass
index 4ca5f5ef207..bf339bc9b60 100644
--- a/eclass/ruby-single.eclass
+++ b/eclass/ruby-single.eclass
@@ -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
 
 # @ECLASS: ruby-single.eclass
@@ -39,6 +39,7 @@ inherit ruby-utils
 
 # @ECLASS-VARIABLE: USE_RUBY
 # @DEFAULT_UNSET
+# @PRE_INHERIT
 # @REQUIRED
 # @DESCRIPTION:
 # This variable contains a space separated list of targets (see above) a 
package



[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-03-30 Thread Sam James
commit: f22fd46a6f73c8fcdb77b3b93f0f044222783c09
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 31 01:10:31 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 02:02:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f22fd46a

java-pkg-2.eclass: mark JAVA_PKG_IUSE as @PRE_INHERIT

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

 eclass/java-pkg-2.eclass | 8 ++--
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/eclass/java-pkg-2.eclass b/eclass/java-pkg-2.eclass
index bd5e92da6a2..4b690be1375 100644
--- a/eclass/java-pkg-2.eclass
+++ b/eclass/java-pkg-2.eclass
@@ -1,4 +1,4 @@
-# Copyright 2004-2015 Gentoo Foundation
+# Copyright 2004-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: java-pkg-2.eclass
@@ -14,6 +14,7 @@
 inherit java-utils-2
 
 # @ECLASS-VARIABLE: JAVA_PKG_IUSE
+# @PRE_INHERIT
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # Use JAVA_PKG_IUSE instead of IUSE for doc, source and examples so that
@@ -42,7 +43,6 @@ esac
 # @FUNCTION: java-pkg-2_pkg_setup
 # @DESCRIPTION:
 # pkg_setup initializes the Java environment
-
 java-pkg-2_pkg_setup() {
java-pkg_init
 }
@@ -51,7 +51,6 @@ java-pkg-2_pkg_setup() {
 # @FUNCTION: java-pkg-2_src_prepare
 # @DESCRIPTION:
 # wrapper for java-utils-2_src_prepare
-
 java-pkg-2_src_prepare() {
java-utils-2_src_prepare
 }
@@ -72,7 +71,6 @@ java-pkg-2_src_prepare() {
 #   EANT_EXTRA_ARGS - extra arguments to pass to eant
 #   EANT_ANT_TASKS - modifies the ANT_TASKS variable in the eant environment
 # @CODE
-
 java-pkg-2_src_compile() {
if [[ -e "${EANT_BUILD_XML:=build.xml}" ]]; then
# auto generate classpath
@@ -96,7 +94,6 @@ java-pkg-2_src_compile() {
 # @FUNCTION: java-pkg-2_src_test
 # @DESCRIPTION:
 # src_test, not exported.
-
 java-pkg-2_src_test() {
[[ -e "${EANT_BUILD_XML:=build.xml}" ]] || return
 
@@ -149,7 +146,6 @@ java-pkg-2_src_test() {
 # @FUNCTION: java-pkg-2_pkg_preinst
 # @DESCRIPTION:
 # wrapper for java-utils-2_pkg_preinst
-
 java-pkg-2_pkg_preinst() {
java-utils-2_pkg_preinst
 }



[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-03-30 Thread Sam James
commit: cecf2d30f500af0a79ab292014e8bacdc2165eec
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 31 00:31:10 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 02:02:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cecf2d30

cron.eclass: drop incorrect (and misplaced) comment re bug assignment

cron-bugs@ is not the maintainer but this message regarding
bug assignment isn't needed. We would make them the maintainer
if they still existed.

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

 eclass/cron.eclass | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/eclass/cron.eclass b/eclass/cron.eclass
index b9f436a4a5a..5548b190f9a 100644
--- a/eclass/cron.eclass
+++ b/eclass/cron.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: cron.eclass
@@ -16,7 +16,6 @@
 # NOTE on defaults: the default settings in the below functions were
 # chosen based on the most common setting among cron ebuilds.
 #
-# Please assign any bugs regarding this eclass to cron-b...@gentoo.org.
 
 inherit eutils flag-o-matic
 



[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-03-30 Thread Sam James
commit: a14fbbb4742d6d2ecb2ec22935833c31cd4ae90e
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 31 00:25:46 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 02:02:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a14fbbb4

cvs.eclass: mark ECVS_AUTH as @PRE_INHERIT

Controls the OpenSSH dependency depending on its
value in global scope.

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

 eclass/cvs.eclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eclass/cvs.eclass b/eclass/cvs.eclass
index dd3cbe135a3..134e25a846a 100644
--- a/eclass/cvs.eclass
+++ b/eclass/cvs.eclass
@@ -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
 
 # @ECLASS: cvs.eclass
@@ -131,6 +131,7 @@ _CVS_ECLASS=1
 #: ${ECVS_BRANCH:="HEAD"}
 
 # @ECLASS-VARIABLE: ECVS_AUTH
+# @PRE_INHERIT
 # @DESCRIPTION:
 # Authentication method to use
 #



[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-03-30 Thread Sam James
commit: 1f755c1973e944ef5088e1a05d82132719cc36e9
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 31 00:20:34 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 02:02:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f755c19

cmake.eclass: mark CMAKE_MAKEFILE_GENERATOR as @PRE_INHERIT

We use this to control our dependencies in global scope.

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

 eclass/cmake.eclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index 196c60e0b15..c0ec4f2f355 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -48,6 +48,7 @@ _CMAKE_ECLASS=1
 # Set to enable in-source build.
 
 # @ECLASS-VARIABLE: CMAKE_MAKEFILE_GENERATOR
+# @PRE_INHERIT
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # Specify a makefile generator to be used by cmake.



[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-03-30 Thread Sam James
commit: f87d90021b5cb2167af5fff6e4eec8c295df104d
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 31 00:16:08 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 02:02:38 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f87d9002

webapp.eclass: mark variables as @PRE_INHERIT

* WEBAPP_NO_AUTO_INSTALL
Modifies IUSE in global scope.

* WEBAPP_OPTIONAL
Modifies *DEPEND in global scope.

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

 eclass/webapp.eclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/eclass/webapp.eclass b/eclass/webapp.eclass
index b0a8f7a34d4..6907ef1c321 100644
--- a/eclass/webapp.eclass
+++ b/eclass/webapp.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: webapp.eclass
@@ -16,12 +16,14 @@
 WEBAPP_DEPEND=">=app-admin/webapp-config-1.50.15"
 
 # @ECLASS-VARIABLE: WEBAPP_NO_AUTO_INSTALL
+# @PRE_INHERIT
 # @DESCRIPTION:
 # An ebuild sets this to `yes' if an automatic installation and/or upgrade is
 # not possible. The ebuild should overwrite pkg_postinst() and explain the
 # reason for this BEFORE calling webapp_pkg_postinst().
 
 # @ECLASS-VARIABLE: WEBAPP_OPTIONAL
+# @PRE_INHERIT
 # @DESCRIPTION:
 # An ebuild sets this to `yes' to make webapp support optional, in which case
 # you also need to take care of USE-flags and dependencies.



[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-03-30 Thread Sam James
commit: fa2c0aca5c011717293354fd564971196be4edaf
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 31 00:23:22 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 02:02:41 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa2c0aca

tmpfiles.eclass: mark TMPFILES_OPTIONAL as @PRE_INHERIT

It controls the virtual/tmpfiles dependency in global scope.

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

 eclass/tmpfiles.eclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eclass/tmpfiles.eclass b/eclass/tmpfiles.eclass
index 63234382164..b9238a6434a 100644
--- a/eclass/tmpfiles.eclass
+++ b/eclass/tmpfiles.eclass
@@ -1,4 +1,4 @@
-# Copyright 2016-2019 Gentoo Authors
+# Copyright 2016-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: tmpfiles.eclass
@@ -61,6 +61,7 @@ case "${EAPI}" in
 esac
 
 # @ECLASS-VARIABLE: TMPFILES_OPTIONAL
+# @PRE_INHERIT
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # When not empty, disables the dependency on virtual/tmpfiles.



[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-03-30 Thread Sam James
commit: ab0730612d991bffc71d474510e463b2d89fe8cc
Author: Sam James  gentoo  org>
AuthorDate: Sun Mar 28 04:40:46 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 02:02:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab073061

ant-tasks.eclass: explicitly mark ANT_TASK_*VER as @PRE_INHERIT

They manage dependencies and the description clearly states
they should be used before inherit.

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

 eclass/ant-tasks.eclass | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/eclass/ant-tasks.eclass b/eclass/ant-tasks.eclass
index 42f801a84d7..b03f3e4aa36 100644
--- a/eclass/ant-tasks.eclass
+++ b/eclass/ant-tasks.eclass
@@ -1,4 +1,4 @@
-# Copyright 2007-2020 Gentoo Authors
+# Copyright 2007-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: ant-tasks.eclass
@@ -33,12 +33,14 @@ inherit java-pkg-2 java-ant-2
 EXPORT_FUNCTIONS src_unpack src_compile src_install
 
 # @ECLASS-VARIABLE: ANT_TASK_JDKVER
+# @PRE_INHERIT
 # @DESCRIPTION:
 # Affects the >=virtual/jdk version set in DEPEND string. Defaults to 1.8, can
 # be overridden from ebuild BEFORE inheriting this eclass.
 ANT_TASK_JDKVER=${ANT_TASK_JDKVER-1.8}
 
 # @ECLASS-VARIABLE: ANT_TASK_JREVER
+# @PRE_INHERIT
 # @DESCRIPTION:
 # Affects the >=virtual/jre version set in DEPEND string. Defaults to 1.8, can
 # be overridden from ebuild BEFORE inheriting this eclass.
@@ -60,12 +62,14 @@ ANT_TASK_NAME="${PN#ant-}"
 ANT_TASK_DEPNAME=${ANT_TASK_DEPNAME-${ANT_TASK_NAME}}
 
 # @ECLASS-VARIABLE: ANT_TASK_DISABLE_VM_DEPS
+# @PRE_INHERIT
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # If set, no JDK/JRE deps are added.
 
 # @VARIABLE: ANT_TASK_PV
 # @INTERNAL
+# @DESCRIPTION:
 # Version of ant-core this task is intended to register and thus load with.
 ANT_TASK_PV="${PV}"
 



[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-03-30 Thread Sam James
commit: 1b3171157c7f5797dd8a6b12e526f927e8844b00
Author: Sam James  gentoo  org>
AuthorDate: Sun Mar 28 04:42:49 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 02:02:36 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b317115

ant-tasks.eclass: use HTTPS for HOMEPAGE

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

 eclass/ant-tasks.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/ant-tasks.eclass b/eclass/ant-tasks.eclass
index b03f3e4aa36..4ca054f4bf1 100644
--- a/eclass/ant-tasks.eclass
+++ b/eclass/ant-tasks.eclass
@@ -84,7 +84,7 @@ MY_P="apache-ant-${MY_PV}"
 
 # Default values for standard ebuild variables, can be overridden from ebuild.
 DESCRIPTION="Apache Ant's optional tasks depending on ${ANT_TASK_DEPNAME}"
-HOMEPAGE="http://ant.apache.org/";
+HOMEPAGE="https://ant.apache.org/";
 SRC_URI="${UPSTREAM_PREFIX}/${MY_P}-src.tar.bz2
${GENTOO_PREFIX}/ant-${PV}-gentoo.tar.bz2"
 LICENSE="Apache-2.0"



[gentoo-commits] repo/gentoo:master commit in: eclass/

2021-03-30 Thread Sam James
commit: f4a6af7fd17a53f54d495a20af1351af50226c0a
Author: Sam James  gentoo  org>
AuthorDate: Sun Mar 28 04:44:24 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 31 02:02:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4a6af7f

check-reqs.eclass: fix @INTERNAL/@DESCRIPTION order

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

 eclass/check-reqs.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/check-reqs.eclass b/eclass/check-reqs.eclass
index a45cbd15fee..5c4a420ee06 100644
--- a/eclass/check-reqs.eclass
+++ b/eclass/check-reqs.eclass
@@ -1,4 +1,4 @@
-# Copyright 2004-2020 Gentoo Authors
+# Copyright 2004-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: check-reqs.eclass
@@ -350,8 +350,8 @@ check-reqs_unsatisfied() {
${msg} "There is NOT at least ${sizeunit} ${location}"
 
# @ECLASS-VARIABLE: CHECKREQS_FAILED
-   # @DESCRIPTION:
# @INTERNAL
+   # @DESCRIPTION:
# If set the checks failed and eclass should abort the build.
# Internal, do not set yourself.
CHECKREQS_FAILED="true"



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/ceph/

2021-03-30 Thread Patrick McLean
commit: 0ba56ce037efe324ddb6d84dc3ab7781dd61c985
Author: Patrick McLean  sony  com>
AuthorDate: Wed Mar 31 01:56:18 2021 +
Commit: Patrick McLean  gentoo  org>
CommitDate: Wed Mar 31 01:56:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ba56ce0

sys-cluster/ceph-14.2.19: Version bump

Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Patrick McLean  gentoo.org>

 sys-cluster/ceph/Manifest | 2 +-
 sys-cluster/ceph/{ceph-14.2.18.ebuild => ceph-14.2.19.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index 306588a477a..6bb1b6cdb29 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -1,4 +1,4 @@
 DIST ceph-14.2.16.tar.gz 130220625 BLAKE2B 
30fcf971dd3ebaad8decf0d8d3ade1b554c0f97844db037ca618fd3f133964c08248067dc82c525cbc7deb04949a3a3d07850a5f56e75bcb8e359957d31df85f
 SHA512 
94cab2c9711f5ee2c826ee27b474676c7bb8507c0761ed8d0a520a7e5182c4b353402061ffafbe9b95ac45603f023015752bffbbe0936f4835dfafc9476d3275
-DIST ceph-14.2.18.tar.gz 129268399 BLAKE2B 
31478316fc87a7a924ac653ad193adaa7c3f0e6c1ace8fe6158b139616eb7ed396f81045a4311d18ad8ac6ee555d921568da94e70cf74bbd4918b55e0e03f8ef
 SHA512 
56f9e7fffd2ae6fb70c4a09a3569dff2a17ffeebacbd3a8af22586d2feef654561d0942bb8d2c12b2f313aac268f38ebc3bfb23a287f634fe5a76805445c4d03
+DIST ceph-14.2.19.tar.gz 129290834 BLAKE2B 
d1de69afcdacd4507a4d1d230a9a4cbd75067f7efa67c01b9f7100d29bf91b7196a36df6514d307affc3194bd83f1e91b5c274b424d0cb1931c9457f6321dc36
 SHA512 
69e3adba292d003e364f3b7eb16878992a3f3015a1ad0b73a9bd9b4ccb2f2f46518833346d40e024b62274985d30b684e1927e533a34a1e357a1780812c231fa
 DIST ceph-15.2.10.tar.gz 148500214 BLAKE2B 
c24679bc5e41da45b093dcd01fa103fd3dff45ddc7d244acebd182547851f426dd140e24ae5afafd71d797b185d6825fbdb9b84abd5c7ead41d5f29b06ed01fa
 SHA512 
20202c07a068f99d5ce56b1969f703f996ad34c201ea3ab9bb05ea278afac71ccba43fb03e9de641dc3ab9692eecfcc6f52ff1ac03e13a1dc2f939bd8159fc2d
 DIST ceph-15.2.9.tar.gz 149518360 BLAKE2B 
3d1d2cf7e356587d77c1ca3e6b05078a3de656607007d38ff0369f5a76fb9e12a3f06929bcbf19ed5d3de7c8e402dc0972c0b3c7245f64e6f5d94a4a78bb1d00
 SHA512 
1f55b0a13bf06df782831d0c9d5f8617c22442ab97fb186e6ccb08183e02bf1756caf8633fa6b1cf156c3fb7b1bdff90a60a1249adfad0b9450036e2329bf8ff

diff --git a/sys-cluster/ceph/ceph-14.2.18.ebuild 
b/sys-cluster/ceph/ceph-14.2.19.ebuild
similarity index 100%
rename from sys-cluster/ceph/ceph-14.2.18.ebuild
rename to sys-cluster/ceph/ceph-14.2.19.ebuild



[gentoo-commits] proj/netifrc:master commit in: init.d/

2021-03-30 Thread Patrick McLean
commit: bef5edf9d2d1fcd982ae19a7cb05dc2d58b854e7
Author: Patrick McLean  gentoo  org>
AuthorDate: Wed Mar 31 01:06:31 2021 +
Commit: Patrick McLean  gentoo  org>
CommitDate: Wed Mar 31 01:10:48 2021 +
URL:https://gitweb.gentoo.org/proj/netifrc.git/commit/?id=bef5edf9

net.lo.in: quote variables in _configure_variables

The variables being passed to eval aren't quoted either in the before-eval
scope, or in what is passed to eval. Make sure they are quoted.

Signed-off-by: Patrick McLean  gentoo.org>

 init.d/net.lo.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/init.d/net.lo.in b/init.d/net.lo.in
index 06304e1..0bb69f3 100644
--- a/init.d/net.lo.in
+++ b/init.d/net.lo.in
@@ -225,9 +225,9 @@ _configure_variables()
for var in ${_config_vars}; do
local v=
for t; do
-   eval v=\$${var}_${t}
+   eval v="\"\$${var}_${t}\""
if [ -n "${v}" ]; then
-   eval ${var}_${IFVAR}=\$${var}_${t}
+   eval "${var}_${IFVAR}=\"\$${var}_${t}\""
continue 2
fi
done



[gentoo-commits] proj/netifrc:master commit in: net/

2021-03-30 Thread Patrick McLean
commit: 4143e26dd4a56c08fbb99e18913eaafaf2a04f32
Author: Patrick McLean  gentoo  org>
AuthorDate: Wed Mar 31 01:07:57 2021 +
Commit: Patrick McLean  gentoo  org>
CommitDate: Wed Mar 31 01:11:03 2021 +
URL:https://gitweb.gentoo.org/proj/netifrc.git/commit/?id=4143e26d

net/iproute2.sh: in _get_mac_address, don't return multiple addresses

Currently if a device has virtual functions configured, ip will list the mac
addresses for the virtual functions on a device as well as the device itself.
This makes _get_mac_address return these addresses as well, causing functions
that consume this output to fail in "interesting" ways. This makes sure it only
returns 1 address.

Also don't set the mac variable to the address of the interface from sysfs, then
proceed to overwrite it with a call to "ip".

Signed-off-by: Patrick McLean  gentoo.org>

 net/iproute2.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/net/iproute2.sh b/net/iproute2.sh
index 46f0e48..bd7333e 100644
--- a/net/iproute2.sh
+++ b/net/iproute2.sh
@@ -91,10 +91,9 @@ _set_flag()
 _get_mac_address()
 {
local mac=
-   read -r mac < /sys/class/net/"${IFACE}"/address || return 1
-   local mac=$(LC_ALL=C _ip link show "${IFACE}" | sed -n \
+   mac=$(LC_ALL=C _ip link show "${IFACE}" | sed -n \
-e 'y/abcdef/ABCDEF/' \
-   -e '/link\// s/^.*\<\(..:..:..:..:..:..\)\>.*/\1/p')
+   -e '/link\// s/^.*\<\(..:..:..:..:..:..\)\>.*/\1/p' | head -n1)
 
case "${mac}" in
00:00:00:00:00:00) return 1 ;;



[gentoo-commits] repo/gentoo:master commit in: sys-process/audit/

2021-03-30 Thread Thomas Deutschmann
commit: 5373a2cab22d081f6427af2a8a6c9faee91bc767
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Mar 30 23:22:20 2021 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Mar 30 23:39:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5373a2ca

sys-process/audit: bump to v3.0.1

Bug: https://bugs.gentoo.org/779430
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann  gentoo.org>

 sys-process/audit/Manifest   |   1 +
 sys-process/audit/audit-3.0.1.ebuild | 154 +++
 2 files changed, 155 insertions(+)

diff --git a/sys-process/audit/Manifest b/sys-process/audit/Manifest
index 3b6989b4a53..b2f62466967 100644
--- a/sys-process/audit/Manifest
+++ b/sys-process/audit/Manifest
@@ -1,3 +1,4 @@
 DIST audit-017e6c6ab95df55f34e339d2139def83e5dada1f.patch 852 BLAKE2B 
60d8b813f57338ce267a09913e68a0726acf5cf878cd2893fe2493f80d2b0ac1e0504dc7a72e85134ae2597b268cb1772b4e7c6c2f19149fc905f6928e2db47f
 SHA512 
78e32c05b6896d37bacf0938954fbce7486a528dabd55421f1715438fe489171f9157059050abdcb3f673258aa28b4a11f643ddb7824f3499a195dbbe634f101
 DIST audit-2.8.5_p80866dc78b5d.tar.gz 552094 BLAKE2B 
adb936a314ef2f11828ee00f3513631e06e2df09e37e68be27b1b694e278116d2f486dbde7ed57c77d9ff0bcd09309ea841959c7a66caed6770f367d65dd14f4
 SHA512 
7ec103bf076cfac7906748162e78835f1f65dd9d68e3a7466346e0473075beb47897adf88ab9ba0eb42db1953372aafb16cc040674b9a9c887730c062b82540a
+DIST audit-3.0.1.tar.gz 1180286 BLAKE2B 
f29687ebc76f4eb88184cce1a3da0b8ca4464b2f81f56d71048ac4a64a713f33d6964e46e78b73c72b6ac2495f80114866773b3b86753c1d0dead25df73f7c43
 SHA512 
ad2897c9f539681f0f65b08cd0e650c528957fd4799755c2bcc47f869e04272aad31684c46847124d7b42dde243a16ba2754936890189610814c7007c0381d8c
 DIST audit-3.0.tar.gz 1109442 BLAKE2B 
f9c94f7163522068f5f37163a242cb913acc87b5465f7f8550fad27ac1dc673fd7a98e208bd5e6fb136eac1fdadd659e599e7722426937481bbf8c66d86a1617
 SHA512 
b82ec73c85a8ebb5108b526673d6fe08cbe0b51376788f3ea6ed5747c4612158462893e719496dffbd723f833f84383a2d1d55fd78a3ed985ecfd19545060c88

diff --git a/sys-process/audit/audit-3.0.1.ebuild 
b/sys-process/audit/audit-3.0.1.ebuild
new file mode 100644
index 000..bc901e6325b
--- /dev/null
+++ b/sys-process/audit/audit-3.0.1.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit multilib multilib-minimal toolchain-funcs python-r1 linux-info systemd 
usr-ldscript
+
+DESCRIPTION="Userspace utilities for storing and processing auditing records"
+HOMEPAGE="https://people.redhat.com/sgrubb/audit/";
+SRC_URI="https://people.redhat.com/sgrubb/audit/${P}.tar.gz";
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc 
~x86"
+IUSE="gssapi ldap python static-libs"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+# Testcases are pretty useless as they are built for RedHat users/groups and 
kernels.
+RESTRICT="test"
+
+RDEPEND="gssapi? ( virtual/krb5 )
+   ldap? ( net-nds/openldap )
+   sys-libs/libcap-ng
+   python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+   >=sys-kernel/linux-headers-2.6.34" # This is linux specific.
+BDEPEND="python? ( dev-lang/swig:0 )"
+
+CONFIG_CHECK="~AUDIT"
+
+src_prepare() {
+   # audisp-remote moved in multilib_src_install_all
+   sed -i \
+   -e "s,/sbin/audisp-remote,${EPREFIX}/usr/sbin/audisp-remote," \
+   audisp/plugins/remote/au-remote.conf || die
+
+   # Disable installing sample rules so they can be installed as docs.
+   echo -e '%:\n\t:' | tee rules/Makefile.{am,in} >/dev/null
+
+   default
+}
+
+multilib_src_configure() {
+   local -a myeconfargs=(
+   --sbindir="${EPREFIX}/sbin"
+   $(use_enable gssapi gssapi-krb5)
+   $(use_enable ldap zos-remote)
+   $(use_enable static-libs static)
+   --enable-systemd
+   --without-golang
+   --without-python
+   --without-python3
+   )
+   ECONF_SOURCE=${S} econf "${myeconfargs[@]}"
+
+   if multilib_is_native_abi && use python; then
+   python_configure() {
+   mkdir -p "${BUILD_DIR}"
+   pushd "${BUILD_DIR}" &>/dev/null || die
+   ECONF_SOURCE=${S} econf "${myeconfargs[@]}" 
--with-python3
+   popd &>/dev/null || die
+   }
+   python_foreach_impl python_configure
+   fi
+}
+
+src_configure() {
+   tc-export_build_env BUILD_{CC,CPP}
+   local -x CC_FOR_BUILD="${BUILD_CC}"
+   local -x CPP_FOR_BUILD="${BUILD_CPP}"
+   multilib-minimal_src_configure
+}
+
+multilib_src_compile() {
+   if multilib_is_native_abi; then
+   default
+
+   local native_build="${BUILD_DIR}"
+   pyth

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

2021-03-30 Thread Sam James
commit: e44e1ccc95b08bca1f9d1fa356bf5a123ffcc82c
Author: Sam James  gentoo  org>
AuthorDate: Tue Mar 30 23:26:30 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Mar 30 23:26:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e44e1ccc

net-libs/libbtbb: Revert "drop old" (restore stable version)

ubertooth has a stable version so needs a stable net-libs/libbtbb.
This reverts commit 9820e1418912ba9d7723b9caa66462bfe7396940.

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

 net-libs/libbtbb/Manifest |   2 +
 net-libs/libbtbb/libbtbb-2018.08.1.ebuild | 150 ++
 net-libs/libbtbb/libbtbb-2018.12.1.ebuild | 150 ++
 3 files changed, 302 insertions(+)

diff --git a/net-libs/libbtbb/Manifest b/net-libs/libbtbb/Manifest
index 512e1bc72a5..db5113ea61a 100644
--- a/net-libs/libbtbb/Manifest
+++ b/net-libs/libbtbb/Manifest
@@ -1 +1,3 @@
+DIST libbtbb-2018-08-R1.tar.gz 310542 BLAKE2B 
0ae945c530c476caadfd7786f34eca4d7efd71c2f27a37c7b0242a1d3fba80e985c76a0635a354184aa80039ca8ac11f59778f550cbe9bb7e8a535723396cab0
 SHA512 
63fa995b51f2246b6f27d8aa1bd7a5c0276414df9d13d432d9a1a7ad78ac06e4c67fe3dcf00cf1634f11d6e999f13633591a3347d4e533fff4f131f8deee922e
+DIST libbtbb-2018-12-R1.tar.gz 310437 BLAKE2B 
8fec246e05c47df424840f159d97bbb8c6554b2ce72344b63602cb034eb712bf8ee9f280e7bbb5104dc0b9788818ea14cf53d09af0938b1bc1dcede5463b36ce
 SHA512 
5c41bb4f0fdeedc1064de973daa4d396f73ff10b6e28266a43f029cbfa8a7f2db5e3b764410efb50ef79c56ba1fac0d242bb547c0a883d0dc3c06cc9e993332c
 DIST libbtbb-2020-12-R1.tar.gz 308434 BLAKE2B 
0f802f3c5eef0c434d0468a72104cf63e6bf5f29467e1606d2892751cd8b4824639e3847c0b8305ace926667434e668d75b6d4544e8e026b07872bafbb09c90b
 SHA512 
a3dc2c8d27e4b85aae4847ac39f871ecf800ebf911aacd01682da6c50b13f3247c7d683bce855f2cf59b56a29c661223a2c22e98a8d86e8edaccd57af282bac6

diff --git a/net-libs/libbtbb/libbtbb-2018.08.1.ebuild 
b/net-libs/libbtbb/libbtbb-2018.08.1.ebuild
new file mode 100644
index 000..a1587cd739a
--- /dev/null
+++ b/net-libs/libbtbb/libbtbb-2018.08.1.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib cmake-utils
+
+DESCRIPTION="A library to decode Bluetooth baseband packets"
+HOMEPAGE="http://libbtbb.sourceforge.net/";
+
+if [[ ${PV} == "" ]] ; then
+   EGIT_REPO_URI="https://github.com/greatscottgadgets/libbtbb.git";
+   inherit git-r3
+else
+   MY_PV=${PV/\./-}
+   MY_PV=${MY_PV/./-R}
+   S=${WORKDIR}/${PN}-${MY_PV}
+   
SRC_URI="https://github.com/greatscottgadgets/${PN}/archive/${MY_PV}.tar.gz -> 
${PN}-${MY_PV}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+IUSE="static-libs wireshark-plugins"
+
+RDEPEND="
+   wireshark-plugins? (
+   >=net-analyzer/wireshark-1.8.3-r1:=
+   )
+"
+DEPEND="${RDEPEND}
+   wireshark-plugins? ( dev-libs/glib
+   virtual/pkgconfig )"
+
+get_PV() { local pv=$(best_version $1); pv=${pv#$1-}; pv=${pv%-r*}; 
pv=${pv//_}; echo ${pv}; }
+
+which_plugins() {
+   if has_version '>=net-analyzer/wireshark-2.2.0'; then
+   plugins=""
+   elif has_version '>=net-analyzer/wireshark-1.12.0'; then
+   plugins="btbb btbredr"
+   elif has_version '=net-analyzer/wireshark-2.0';  then
+   CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
+   else
+   
CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
+   fi
+   BUILD_DIR="${WORKDIR}"/${i}_build
+   cmake-utils_src_prepare
+   done
+   fi
+}
+
+src_configure() {
+   CMAKE_USE_DIR="${S}"
+   BUILD_DIR="${S}"_build
+   local mycmakeargs=(
+   -DENABLE_PYTHON=OFF
+   -DBUILD_STATIC_LIB=$(usex static-libs)
+   -DBUILD_ROOT="${ED}"
+   )
+   cmake-utils_src_configure
+
+   if use wireshark-plugins; then
+   for i in ${plugins}
+   do
+   if has_version '>=net-analyzer/wireshark-2.0';  then
+   CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
+   else
+   
CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
+   fi
+   BUILD_DIR="${WORKDIR}"/${i}_build
+   local mycmakeargs=(
+   
-DCMAKE_INSTALL_LIBDIR="/usr/$(get_libdir)/wireshark/plugins/$(get_PV 
net-analyzer/wireshark)"
+   )
+   cmake-utils_src_configure
+   done
+   fi
+}
+
+src_compile() {
+   CMAKE_USE_DIR="${S}"
+   BUILD_DIR="${S}"_build
+   cmake-utils_src_compile
+
+   if use wireshark-plugins; then
+   for i in ${plugins}
+   do
+ 

[gentoo-commits] repo/gentoo:master commit in: net-wireless/ubertooth/

2021-03-30 Thread Sam James
commit: 37fec9fd6d75c8cab44a0470371f3b587be9c176
Author: Sam James  gentoo  org>
AuthorDate: Tue Mar 30 23:24:52 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Mar 30 23:24:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37fec9fd

net-wireless/ubertooth: Revert "drop old" (restore stable version)

kismet is stable so needs a stable version of ubertooth in tree.
This reverts commit 192e85579ff29966aaeca626319646a5f85261f2.

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

 net-wireless/ubertooth/Manifest   |  1 +
 net-wireless/ubertooth/ubertooth-2018.12.1.ebuild | 71 +++
 2 files changed, 72 insertions(+)

diff --git a/net-wireless/ubertooth/Manifest b/net-wireless/ubertooth/Manifest
index 5c58d150391..03ea22126d6 100644
--- a/net-wireless/ubertooth/Manifest
+++ b/net-wireless/ubertooth/Manifest
@@ -1 +1,2 @@
+DIST ubertooth-2018-12-R1.tar.xz 704208 BLAKE2B 
7a17830a0ed417a737d78aa22c5a6a270a67b350a3a5e9a0aebabd4b38547d8d35551e061ea3d5260996f8fe1a366c75c8773d5e3a6abf37a0930f93200da3fc
 SHA512 
409fdb403d6a3fa84b92757e0fd8672b1403ba3d24888fbde4d6d6923d8e0796914c20d38e2fc58909f81fcb8a0b6290bcf91282bb02354c310e6e91ad85e23b
 DIST ubertooth-2020-12-R1.tar.xz 763952 BLAKE2B 
592c5fa689e0f944875bd777dedfd83394ebe5c9c65c1ac2c19006a949daeda8440dc102e537cf97b4547e0730df8f47d5c2a420d84d5dc770577b6039e16b28
 SHA512 
f127cae09d9b20dc34ffad080871f4505cbeccc1117e0e4e841ecf4a30f578d02b67b52786d7a82bdfc43d06562919008c076f8eb9befc7e4bd95def05a3864c

diff --git a/net-wireless/ubertooth/ubertooth-2018.12.1.ebuild 
b/net-wireless/ubertooth/ubertooth-2018.12.1.ebuild
new file mode 100644
index 000..d71069e391f
--- /dev/null
+++ b/net-wireless/ubertooth/ubertooth-2018.12.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit cmake udev
+
+HOMEPAGE="http://ubertooth.sourceforge.net/";
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+bluez static-libs +ubertooth1-firmware +udev"
+
+DEPEND="bluez? ( net-wireless/bluez:= )
+   >=net-libs/libbtbb-${PV}:=[static-libs?]
+   static-libs? ( dev-libs/libusb[static-libs] )
+   virtual/libusb:1="
+RDEPEND="${DEPEND}
+   udev? ( virtual/udev )"
+
+MY_PV=${PV/\./-}
+MY_PV=${MY_PV/./-R}
+if [[ ${PV} == "" ]] ; then
+   EGIT_REPO_URI="https://github.com/greatscottgadgets/ubertooth.git";
+   inherit git-r3
+   S="${WORKDIR}/${P}/host"
+else
+   S="${WORKDIR}/${PN}-${MY_PV}/host"
+   
SRC_URI="https://github.com/greatscottgadgets/${PN}/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.xz";
+   KEYWORDS="amd64 arm x86"
+fi
+DESCRIPTION="open source wireless development platform suitable for Bluetooth 
experimentation"
+
+#readd firmware building, but do it right
+#USE="-fortran -mudflap -nls -openmp -multilib" crossdev --without-headers 
--genv 'EXTRA_ECONF="--with-mode=thumb --with-cpu=cortex-m3 --with-float=soft"' 
-s4 -t arm-cortexm3-eabi
+
+PATCHES=( "${FILESDIR}"/"${P}"-gcc-10.patch )
+
+src_configure() {
+   local mycmakeargs=(
+   -DUSE_BLUEZ=$(usex bluez)
+   -DBUILD_STATIC_LIB=$(usex static-libs)
+   -DINSTALL_UDEV_RULES=$(usex udev)
+   -DENABLE_PYTHON=false
+   )
+   if use udev; then
+   mycmakeargs+=(
+   -DUDEV_RULES_GROUP=usb
+   -DUDEV_RULES_PATH="$(get_udevdir)/rules.d"
+   )
+   fi
+   cmake_src_configure
+}
+
+src_install() {
+   cmake_src_install
+
+   insinto /usr/share/${PN}
+   pushd "${WORKDIR}/${PN}-${MY_PV}" || die
+   if [[ ${PV} == "" ]] ; then
+   ewarn "Firmware isn't available for git releases, we assume you 
are already"
+   ewarn "on the latest and/or can build your own."
+   else
+   use ubertooth1-firmware && newins 
ubertooth-one-firmware-bin/bluetooth_rxtx.dfu ${PN}-one-${PV}-bluetooth_rxtx.dfu
+   use ubertooth1-firmware && newins 
ubertooth-one-firmware-bin/bluetooth_rx_only.dfu 
${PN}-one-${PV}-bluetooth_rx_only.dfu
+   fi
+   popd
+
+   elog "Everyone can read from the ubertooth, but to talk to it"
+   elog "your user needs to be in the usb group."
+}



[gentoo-commits] repo/gentoo:master commit in: lxde-base/menu-cache/

2021-03-30 Thread Andreas Sturmlechner
commit: 6235768e783e72337da6a2abadf646b1a061b9aa
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Mar 30 22:48:25 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Mar 30 22:48:25 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6235768e

lxde-base/menu-cache: Drop 1.1.0 (r0)

Bug: https://bugs.gentoo.org/776373
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 lxde-base/menu-cache/menu-cache-1.1.0.ebuild | 28 
 1 file changed, 28 deletions(-)

diff --git a/lxde-base/menu-cache/menu-cache-1.1.0.ebuild 
b/lxde-base/menu-cache/menu-cache-1.1.0.ebuild
deleted file mode 100644
index 409d5823d80..000
--- a/lxde-base/menu-cache/menu-cache-1.1.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Library to create and utilize caches to speed up freedesktop 
application menus"
-HOMEPAGE="https://lxde.org/";
-SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
-
-LICENSE="LGPL-2.1+"
-# ABI is v2. See Makefile.am
-SLOT="0/2"
-KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-libs/glib:2
-   x11-libs/libfm-extra"
-DEPEND="${RDEPEND}
-   sys-devel/gettext
-   virtual/pkgconfig"
-
-# Fix for gcc 10 / -fno-common
-# https://github.com/lxde/menu-cache/pull/19
-PATCHES="${FILESDIR}/${P}-fno-common.diff"
-
-src_configure() {
-   econf "--disable-static"
-}



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

2021-03-30 Thread Andreas Sturmlechner
commit: fd8a4ca916d23148b4cb0d8f0476b9bd8ec3c75f
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Mar 30 22:57:21 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Mar 30 22:57:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd8a4ca9

profiles: Add https://bugs.gentoo.org/776373
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 profiles/package.mask | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/profiles/package.mask b/profiles/package.mask
index d7b1df8005a..1c0d97fbfde 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -163,6 +163,8 @@ dev-haskell/encoding
  (2021-03-15)



  1   2   3   4   5   >