date:20210315

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

2021-03-15 Thread Alessandro Barbieri

commit: 34cd25319d156c12ba87f238e3c3fe4ab495788e
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Tue Mar 16 00:54:37 2021 +
Commit: Alessandro Barbieri  gmail  com>
CommitDate: Tue Mar 16 00:55:18 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=34cd2531

eclass: install documentation in DOCDIR

Signed-off-by: Alessandro Barbieri  gmail.com>

 eclass/R-packages-guru.eclass | 37 -
 1 file changed, 28 insertions(+), 9 deletions(-)

diff --git a/eclass/R-packages-guru.eclass b/eclass/R-packages-guru.eclass
index 6419cfec..8475f975 100644
--- a/eclass/R-packages-guru.eclass
+++ b/eclass/R-packages-guru.eclass
@@ -11,6 +11,13 @@ IUSE="byte-compile"
 DEPEND="dev-lang/R"
 RDEPEND="${DEPEND}"
 
+dodocrm() {
+   if [ -e "${1}" ]; then
+   dodoc -r "${1}"
+   rm -rf "${1}" || die
+   fi
+}
+
 R-packages-guru_src_unpack() {
unpack ${A}
if [[ -d "${PN//_/.}" ]] && [[ ! -d "${P}" ]]; then
@@ -18,15 +25,11 @@ R-packages-guru_src_unpack() {
fi
 }
 
-if has "${EAPI:-0}" 0 1 2 3 4 5; then
-   R-packages-guru_src_prepare() {
-   epatch_user
-   }
-else
-   R-packages-guru_src_prepare() {
-   default
-   }
-fi
+R-packages-guru_src_prepare() {
+   rm -f LICENSE || die
+   default
+}
+
 
 R-packages-guru_src_compile() {
MAKEFLAGS="CFLAGS=${CFLAGS// /\\ } CXXFLAGS=${CXXFLAGS// /\\ } 
FFLAGS=${FFLAGS// /\\ } FCFLAGS=${FCFLAGS// /\\ } LDFLAGS=${LDFLAGS// /\\ }" \
@@ -34,6 +37,22 @@ R-packages-guru_src_compile() {
 }
 
 R-packages-guru_src_install() {
+   cd "${WORKDIR}"/${PN//_/.} || die
+
+   dodocrm examples || die
+#  dodocrm DESCRIPTION || die #keep this
+   dodocrm NEWS.md || die
+   dodocrm README.md || die
+   dodocrm html || die
+   docinto "${DOCSDIR}/html"
+   if [ -e doc ]; then
+   ls doc/*.html &>/dev/null && dodoc -r doc/*.html
+   rm -rf doc/*.html || die
+   docinto "${DOCSDIR}"
+   dodoc -r doc/.
+   rm -rf doc
+   fi
+
insinto /usr/$(get_libdir)/R/site-library
doins -r "${WORKDIR}"/${PN//_/.}
 }

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

2021-03-15 Thread Patrick McLean

commit: 0ba73b6976a989bf2abf8222bf6d4bd9cc728f59
Author: Patrick McLean  sony  com>
AuthorDate: Tue Mar 16 00:43:21 2021 +
Commit: Patrick McLean  gentoo  org>
CommitDate: Tue Mar 16 00:43:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ba73b69

sys-cluster/ceph-14.2.18: 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.17.ebuild => ceph-14.2.18.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index 75fbf254db9..09bcbe8bf97 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -1,3 +1,3 @@
 DIST ceph-14.2.16.tar.gz 130220625 BLAKE2B 
30fcf971dd3ebaad8decf0d8d3ade1b554c0f97844db037ca618fd3f133964c08248067dc82c525cbc7deb04949a3a3d07850a5f56e75bcb8e359957d31df85f
 SHA512 
94cab2c9711f5ee2c826ee27b474676c7bb8507c0761ed8d0a520a7e5182c4b353402061ffafbe9b95ac45603f023015752bffbbe0936f4835dfafc9476d3275
-DIST ceph-14.2.17.tar.gz 129270233 BLAKE2B 
1e20185f24b7bc806a37ee59fee24138556837722e27a7fb36da268e5c330bb4dac3601dac4373f404c528e55fa79420f965807d215a54f5db9205ebb877166f
 SHA512 
56ae460474afb8f208900c9ec6f55b120dd7229cb3297cb6f4f522cde8e693ede16d6064410074ea3c2a56df67c13fbbd102bce2d489e9b310544e374315b9eb
+DIST ceph-14.2.18.tar.gz 129268399 BLAKE2B 
31478316fc87a7a924ac653ad193adaa7c3f0e6c1ace8fe6158b139616eb7ed396f81045a4311d18ad8ac6ee555d921568da94e70cf74bbd4918b55e0e03f8ef
 SHA512 
56f9e7fffd2ae6fb70c4a09a3569dff2a17ffeebacbd3a8af22586d2feef654561d0942bb8d2c12b2f313aac268f38ebc3bfb23a287f634fe5a76805445c4d03
 DIST ceph-15.2.9.tar.gz 149518360 BLAKE2B 
3d1d2cf7e356587d77c1ca3e6b05078a3de656607007d38ff0369f5a76fb9e12a3f06929bcbf19ed5d3de7c8e402dc0972c0b3c7245f64e6f5d94a4a78bb1d00
 SHA512 
1f55b0a13bf06df782831d0c9d5f8617c22442ab97fb186e6ccb08183e02bf1756caf8633fa6b1cf156c3fb7b1bdff90a60a1249adfad0b9450036e2329bf8ff

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

[gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/

2021-03-15 Thread Lars Wendler

commit: 4997b2b8eb3f9f5afe2ba51229b88cec817f1410
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Mar 16 00:39:15 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Mar 16 00:39:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4997b2b8

dev-vcs/git: Removed old

Signed-off-by: Lars Wendler  gentoo.org>

 dev-vcs/git/Manifest  |  12 -
 dev-vcs/git/git-2.28.0.ebuild | 711 --
 dev-vcs/git/git-2.29.2.ebuild | 676 ---
 dev-vcs/git/git-2.30.0.ebuild | 676 ---
 dev-vcs/git/git-2.30.1.ebuild | 676 ---
 5 files changed, 2751 deletions(-)

diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 61e5e8babb6..d9dc1dd7954 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -1,30 +1,18 @@
 DIST git-2.26.2.tar.xz 6007864 BLAKE2B 
efce003a95e24dbb6e14feebd35874c9ed1a5c06d7f0722d4dfefae830613b64b81faa41d5952400fa382b385d15d48829f8ee3b4d065e134bd38fa0e10bf570
 SHA512 
5d92d07b171c5cd6e89a29c1211c73c1c900cd51c74d690aebfb4a3d0e93b541b09b42b6d6a1a82f5c3d953096771f9a8605c63be139f559f58698c1a0eabcfc
 DIST git-2.26.3.tar.xz 6009184 BLAKE2B 
12c0b8fb460024e7767919cac3e36ecb215e25566eb907e11495c086e1d43d790c2aa8edd178d53abc3f7eaee968a6c89e92a6575d4d11f9740567b357056aee
 SHA512 
a88f8ab156f12770590110b30da83631f19a349f3b7af25fd0a5e8f03c78daec0a4935e9a1a5637f100c147cc57fca4aa3386e18756a6382983e7baa7456e398
-DIST git-2.28.0.tar.xz 6117608 BLAKE2B 
81c834dfda5b8e3065d098e411eb2408a1e7ccfde9c447a4164c131c9c2c32dcfd888980bcd180952435c05976a4fa18c155830432170deff70aa1aa2989cd2a
 SHA512 
a6159c0a15e3c5f9603157d4010664a6d74e7d65b9fe97a03b36fac12607248ed57980d96565841e88eae343001c16732737d3af812608c8db011941df1a
 DIST git-2.28.1.tar.xz 6119248 BLAKE2B 
6a39d1c5c1dc69b8c7721a594104b51d2af691e1f2ef6a2f2bee99bd5b319c856cfccc4166cfd3426cf8eb58b3b4aea5ed2ae15061fba0f0f3e44c7d24e4
 SHA512 
6acd7f42eeaf4fcb085fe2ab3d65f53a264fd38ef84321b77eb7c21bbb146e42ec9f27cc36cd9f3569f6d1758742119efd0af9bf6414fe7c577c434ed154fb8f
-DIST git-2.29.2.tar.xz 6187988 BLAKE2B 
15c2446a266d7cc3032e4b3bd32f57a2c2ff3d377848f307225ea585883c993ed835c8ffe02202386360b94f5a1f4bd3124322f0034c0d65ed15aa28b7e45ffa
 SHA512 
34117628c6d43ac0940c43bffaa1bda7f12af863728f391492725a3e57d1bbda523cf7734e90f463fe9a9ae4e70fc1cc2523643dbb3c27377d98dc4736b0ea62
 DIST git-2.29.3.tar.xz 6189996 BLAKE2B 
9e30b7c4eab0d74a7d3d1387774958fc1ce7fde6239bd8daaa277304cde1f3249484fd703a1827c703ec9400ac2c1e7c288bd2956a3854521bf561437de58617
 SHA512 
3a21be5005675e5406964519f3c8441826b311274de8c5bacdc3ede564efef3d87f085682f31c89166a5022738a3cbd8e767d2bca3bd57d6f55b2451e36681dd
-DIST git-2.30.0.tar.xz 6325652 BLAKE2B 
c5a67ccb7790f1747d714b402f22de6bd5cf783de8765fade7af0ad51ac780c80d43ab22b33431b57db246a11ef073dfd291961476a3c9414339f133221cbea6
 SHA512 
2ce154d6e224e78d7da2ea9b954d8cf56bdfe43636b93dd5045a950a7362d3943866b4949eb5ed03528d6e5f0466c33c233b502d84430ed9d90326bcc696101d
-DIST git-2.30.1.tar.xz 6327976 BLAKE2B 
3b459d10a2b8d601e0882da8346bba1c0fb9aa01823e9cf9f6d50557d7cd6b6b89eea17209a5b3bfb199c37ae8bf33b730784686a166d7ed9ef36dd0975d5624
 SHA512 
b3567d251c73807857f05f46cae3acb4e0d876590d19c05509d5eb17fc3eee0ba97a1b2068070b399085f7a92aa2493c4833b98f65b8ef15fc279798caa3
 DIST git-2.30.2.tar.xz 6329820 BLAKE2B 
1c553c183d5426c524852bfba38b39196d9f0fb83854fec3291959474374db41a68a4118785412037ba16230662d94f03b05bb7ea577f0272552e63b68086f95
 SHA512 
4f7e1c30f8eee849d1febeda872d56c60c5d051a31726505a4c7bab11b274d3a2ab5588f910b7b49c5c0ec5228a18457f705c7b66e8bbdf809d3c75c59032b7e
 DIST git-2.31.0.tar.xz 6414252 BLAKE2B 
c9186c0e212767956cbabc685989408860600a19ff56637453f9cd45e143b6fb5b7104b188726506481782fcdfe3e7b28d5c9cf374172b81e5bfedf249292793
 SHA512 
b8f7608d4349c983c426494227b0ec9d032e67c775382a32675418f629f365817ac99a61c24e3a380bc5eb65351058dbf55d526890055acf58ad4f028022f513
 DIST git-htmldocs-2.26.2.tar.xz 1304788 BLAKE2B 
e0de88c5c41646d5fb9b54e2ee873c7904e1b85c67f971499f0227eb2dd59cabd4ffc58c468cf8a7a7466920af972dbc7f95d78003e487edac9a15a9c49b80a2
 SHA512 
b577693180b4fc035af211e3b83e98ad5e1bfbb98706924858df6558383b82ca05f870bdae90f8a14c8bf664f091ee928af52dcdebdfb98dc7387fdfe2e3a396
 DIST git-htmldocs-2.26.3.tar.xz 1305208 BLAKE2B 
d5bb834b00a9d0cd3cdcd671e33142595e4ac28be8eab2326263f548718d52cf141b7fa6afee8da05a15ac75252455945dd34d60ffe5cda6cf1d612b7ee35953
 SHA512 
ff6c912572d32a1f32ec4c73e07e1404155ccbf81509a741e25e9dbcf42e5348dce59c40b0bb5d64993d8a981e2afd773393b2aeacde457870aa1f03feb9a1a6
-DIST git-htmldocs-2.28.0.tar.xz 1347596 BLAKE2B 
9c447f951cc31eb306841d12a94aefd3bb9699f374f2919f7eed0789f6b49cd54df74ecddaa1475203a5dca33140787f53272774f71ccbb48e5da5f1ab6bfbde
 SHA512 
bbe7a7c221d1bb8d9852d5210a80b3d60c5b66f159591971abb2d9a08570cb7bf85686c7eba8cf37e04d37d63702906b308692a68c05fdbd0e3f3d60322003f0
 DIST git-htmldocs-2.28.1.tar.xz 1348296 BLAKE2B

[gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/

2021-03-15 Thread Lars Wendler

commit: 827f4687e05b0f1a52e1ff61149bd65f2de6be03
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Mar 16 00:38:31 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Mar 16 00:39:33 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=827f4687

dev-vcs/git: Bump to version 2.31.0. Removed old

Signed-off-by: Lars Wendler  gentoo.org>

 dev-vcs/git/Manifest | 6 +++---
 dev-vcs/git/{git-2.31.0_rc2.ebuild => git-2.31.0.ebuild} | 0
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 1a586840dc0..61e5e8babb6 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -7,7 +7,7 @@ DIST git-2.29.3.tar.xz 6189996 BLAKE2B 
9e30b7c4eab0d74a7d3d1387774958fc1ce7fde62
 DIST git-2.30.0.tar.xz 6325652 BLAKE2B 
c5a67ccb7790f1747d714b402f22de6bd5cf783de8765fade7af0ad51ac780c80d43ab22b33431b57db246a11ef073dfd291961476a3c9414339f133221cbea6
 SHA512 
2ce154d6e224e78d7da2ea9b954d8cf56bdfe43636b93dd5045a950a7362d3943866b4949eb5ed03528d6e5f0466c33c233b502d84430ed9d90326bcc696101d
 DIST git-2.30.1.tar.xz 6327976 BLAKE2B 
3b459d10a2b8d601e0882da8346bba1c0fb9aa01823e9cf9f6d50557d7cd6b6b89eea17209a5b3bfb199c37ae8bf33b730784686a166d7ed9ef36dd0975d5624
 SHA512 
b3567d251c73807857f05f46cae3acb4e0d876590d19c05509d5eb17fc3eee0ba97a1b2068070b399085f7a92aa2493c4833b98f65b8ef15fc279798caa3
 DIST git-2.30.2.tar.xz 6329820 BLAKE2B 
1c553c183d5426c524852bfba38b39196d9f0fb83854fec3291959474374db41a68a4118785412037ba16230662d94f03b05bb7ea577f0272552e63b68086f95
 SHA512 
4f7e1c30f8eee849d1febeda872d56c60c5d051a31726505a4c7bab11b274d3a2ab5588f910b7b49c5c0ec5228a18457f705c7b66e8bbdf809d3c75c59032b7e
-DIST git-2.31.0.rc2.tar.xz 6394212 BLAKE2B 
749b2d18969bdd3fd5d72273b9068775cf9c1042553879f8e7abcbbf3c0b8e9d99a5365939b8df5012dcc499c2bccb5651f7943f76389ae315bc1fbaa08298eb
 SHA512 
0e717c27320d6747e5f7c928765c91859a22f5a5de02a99bab2f0923283b5da2fd755a50ba527160ca23ffa8daf087dc4014441a58100cffbabe58fb7d9b64c3
+DIST git-2.31.0.tar.xz 6414252 BLAKE2B 
c9186c0e212767956cbabc685989408860600a19ff56637453f9cd45e143b6fb5b7104b188726506481782fcdfe3e7b28d5c9cf374172b81e5bfedf249292793
 SHA512 
b8f7608d4349c983c426494227b0ec9d032e67c775382a32675418f629f365817ac99a61c24e3a380bc5eb65351058dbf55d526890055acf58ad4f028022f513
 DIST git-htmldocs-2.26.2.tar.xz 1304788 BLAKE2B 
e0de88c5c41646d5fb9b54e2ee873c7904e1b85c67f971499f0227eb2dd59cabd4ffc58c468cf8a7a7466920af972dbc7f95d78003e487edac9a15a9c49b80a2
 SHA512 
b577693180b4fc035af211e3b83e98ad5e1bfbb98706924858df6558383b82ca05f870bdae90f8a14c8bf664f091ee928af52dcdebdfb98dc7387fdfe2e3a396
 DIST git-htmldocs-2.26.3.tar.xz 1305208 BLAKE2B 
d5bb834b00a9d0cd3cdcd671e33142595e4ac28be8eab2326263f548718d52cf141b7fa6afee8da05a15ac75252455945dd34d60ffe5cda6cf1d612b7ee35953
 SHA512 
ff6c912572d32a1f32ec4c73e07e1404155ccbf81509a741e25e9dbcf42e5348dce59c40b0bb5d64993d8a981e2afd773393b2aeacde457870aa1f03feb9a1a6
 DIST git-htmldocs-2.28.0.tar.xz 1347596 BLAKE2B 
9c447f951cc31eb306841d12a94aefd3bb9699f374f2919f7eed0789f6b49cd54df74ecddaa1475203a5dca33140787f53272774f71ccbb48e5da5f1ab6bfbde
 SHA512 
bbe7a7c221d1bb8d9852d5210a80b3d60c5b66f159591971abb2d9a08570cb7bf85686c7eba8cf37e04d37d63702906b308692a68c05fdbd0e3f3d60322003f0
@@ -17,7 +17,7 @@ DIST git-htmldocs-2.29.3.tar.xz 1365468 BLAKE2B 
b8b2d46a5b35f6962f06bd9837ddc613
 DIST git-htmldocs-2.30.0.tar.xz 1340536 BLAKE2B 
2204b276b941497e0ff5f1710c55b42f573b4eebd96619041db7afabb5a5d36252b2582b29e3d083abaf5da478810d056df83bdfa1d08c5396ffe03d0d858820
 SHA512 
3fc53a508497621c8af5ea26337407ed9489e768160c7063cfcc4bb53f51631ef968057f1498e37a901313aa08b4153533ca15a9bdfcbd04d2ed11256007db3e
 DIST git-htmldocs-2.30.1.tar.xz 1341796 BLAKE2B 
b282d16af234256ccb4e1099d42800d674b5ff4ea1e365557aa6672aac573b4e98e43ddbeb02291cd6925bfd217d2e8e99aae47e9f46fd06ad013fec87b8d3fe
 SHA512 
e2debb0dde49f1e6a5944ed35dfa62d6d2e6f71d745e6f6adfb477513f21004f04cd5de8e8444d4a24d9818c3cb85f5720848991a763fbc3541e89cfdf21dd49
 DIST git-htmldocs-2.30.2.tar.xz 1342648 BLAKE2B 
a81b2111a79b7b211f99c0ac2b3d397d627316fc1eab56f091088b4ff26d80c353efcea4154f84640dea952dddaf496f3c8f63d2c371d6ce97bf888fad2db237
 SHA512 
7fc8bb1a9e484f5f49ad41c89ee8e5059970e3091e1d72b86800f8d255fe00be3d8072194cbc913ef6d98aa014ba9e8efae062a9ae595f4dcafaa0c3e637d297
-DIST git-htmldocs-2.31.0.rc2.tar.xz 1357684 BLAKE2B 
8ea0ebc11650bf4f67e15fcdb1c6a7b8e33b5740e50c5817d09c6d4dfc23556b8735347807ec08d56c4124a38e3892c4690984a57d9f24b80a919b5a9820c5f2
 SHA512 
dfe7f2ef385ddfcdebe83f4f785bcf9c710357635cbc26702c6dcdd056e62075f937d92802c056dda678db3d9258ad7f75b8cc1d11ca86a26c022827c22ea10a
+DIST git-htmldocs-2.31.0.tar.xz 1357332 BLAKE2B 
06fe5fdde4193ffccf243eae8c112b6bf74b3a554283e0f688a47275a47de4c1c4dce9fe6dfa550885786ab8df46fa83fadd22746bc64e430af42785eda30583
 SHA512 
31a7d715454060bbc260a6001d971df0eea16c819de96a9316bb465a67661ebe805a8ea2f5f223c070b6aa1affd1e72970b223474e6221bf87ac3b233d229fdd

[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/files/, x11-misc/xscreensaver/

2021-03-15 Thread Sebastian Pipping

commit: a280a38195993da6ee358ff7aa0cf9ccf96bfd06
Author: Sebastian Pipping  gentoo  org>
AuthorDate: Tue Mar 16 00:14:47 2021 +
Commit: Sebastian Pipping  gentoo  org>
CommitDate: Tue Mar 16 00:16:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a280a381

x11-misc/xscreensaver: Fix sandbox issues for 5.45

Closes: https://bugs.gentoo.org/775683
Signed-off-by: Sebastian Pipping  gentoo.org>
Package-Manager: Portage-3.0.17, Repoman-3.0.2

 .../xscreensaver-5.45-configure.ac-sandbox.patch   | 146 +
 x11-misc/xscreensaver/xscreensaver-5.45.ebuild |   1 +
 2 files changed, 147 insertions(+)

diff --git 
a/x11-misc/xscreensaver/files/xscreensaver-5.45-configure.ac-sandbox.patch 
b/x11-misc/xscreensaver/files/xscreensaver-5.45-configure.ac-sandbox.patch
new file mode 100644
index 000..cee3a30897f
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.45-configure.ac-sandbox.patch
@@ -0,0 +1,146 @@
+From 6e4e7c657f6628109c9809561f2c5d7bf51c8c8e Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping 
+Date: Tue, 16 Mar 2021 00:55:54 +0100
+Subject: [PATCH] configure.ac: Stop asking rpm and dpkg things, we're on
+ Gentoo
+
+---
+ configure.ac | 115 ---
+ 1 file changed, 115 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 603b993..6ef2631 100644
+--- a/configure.ac
 b/configure.ac
+@@ -3917,25 +3917,6 @@ for d in /usr/share/fonts/X11 \
+ done
+ AC_MSG_RESULT($have_bitmap_fonts)
+ 
+-# In case we didn't guess the font directory properly, check RPMs and DEBs 
too.
+-if test $have_bitmap_fonts != yes ; then
+-  for r in 100dpi 75dpi ; do
+-for f in xfonts-$r \
+- xorg-x11-fonts-$r \
+- xorg-x11-fonts-ISO8859-1-$r \
+-  ; do
+-  if test $have_bitmap_fonts != yes ; then
+-AC_MSG_CHECKING(for $f)
+-if ( rpm -q "$f"  2>&- >&- ) ||
+-   ( dpkg -s "$f" 2>&- | grep -q '^Status:.*installed' ) ; then
+-  have_bitmap_fonts=yes
+-fi
+-AC_MSG_RESULT($have_bitmap_fonts)
+-  fi
+-done
+-  done
+-fi
+-
+ 
+ 
###
+ #
+@@ -4876,102 +4857,6 @@ for bad_choice in xscreensaver xscreensaver-demo 
xscreensaver-command ; do
+   fi
+ done
+ 
+-
+-# Now let's warn if there's a previous RPM version already installed.
+-# But don't bother with this test if we are currently *building* an RPM.
+-
+-if test -z "$RPM_PACKAGE_VERSION" ; then
+-
+-  rpmnames="xscreensaver xscreensaver-base xscreensaver-extras"
+-
+-  # M4 sucks!!
+-  changequote(X,Y)
+-  rpmv=`(rpm -qv $rpmnames) 2>/dev/null | \
+-sed -n 's/^[-a-z]*-\([0-9][0-9]*[.][0-9][0-9a-z]*\)-.*$/\1/p' | \
+-head -1`
+-  changequote([,])
+-
+-  if test \! -z "$rpmv" ; then
+-
+-# M4 sucks!!
+-changequote(A,B)
+-rpmbdir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)xscreensaver-demo$@\1@p'`
+-rpmhdir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)popsquares$@\1@p'`
+-rpmcdir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)popsquares\.xml$@\1@p'`
+-rpmadir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)XScreenSaver$@\1@p'`
+-changequote([,])
+-
+-err=" (DIFFERS)"
+-if test -z "$rpmbdir" ; then rpmbdir='???'
+-elif test "$rpmbdir" != "${bindir}/"   ; then 
rpmbdir="$rpmbdir$err";fi
+-
+-if test -z "$rpmhdir" ; then rpmhdir='???'
+-elif test "$rpmhdir" != "${HACKDIR}/"  ; then 
rpmhdir="$rpmhdir$err";fi
+-
+-if test -z "$rpmcdir" ; then rpmcdir='???'
+-elif test "$rpmcdir" != "${HACK_CONF_DIR}/"; then 
rpmcdir="$rpmcdir$err";fi
+-
+-if test -z "$rpmadir" ; then rpmadir='???'
+-elif test "$rpmadir" != "${APPDEFAULTS}/"  ; then 
rpmadir="$rpmadir$err";fi
+-
+-warning=no
+-warnL "There is already an installed RPM of xscreensaver"
+-warn2 "version \"$rpmv\" on this system."
+-echo ""
+-warn2 "It is currently installed in these directories:"
+-echo ""
+-warn2 "User programs: $rpmbdir$berr"
+-warn2 "Screen savers: $rpmhdir$herr"
+-warn2 "Configuration: $rpmcdir$cerr"
+-warn2 "App Defaults:  $rpmadir$aerr"
+-  fi
+-fi
+-
+-# Also warn if there's a Debian package installed.
+-#
+-debnames="xscreensaver xscreensaver-data xscreensaver-data-extra"
+-debv=''
+-for dpkg in $debnames ; do
+-  if test -z "$debv"; then
+-debv=`dpkg -s $dpkg 2>/dev/null | sed -n 's/^Version: \(.*\)$/\1/p'`
+-  fi
+-done
+-
+-if test \! -z "$debv" ; then
+-
+-  # M4 sucks!!
+-  changequote(A,B)
+-  debbdir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/bin/\)xscreensaver$@\1@p'`
+-  debhdir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)popsquares$@\1@p'`
+-  debcdir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)popsquares\.xml$@\1@p'`
+-  debadir=`dpkg -L $debnames 2>&- | sed -n 
's@^\(.*/\)XScreenSaver[^/]*$@\1@p'`
+-  changequote([,])
+-
+-  err=" (DIFFERS)"
+-  if test -z "$debbdir" ; then debbdir='???'
+-  elif test "$debbdir" !=

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

2021-03-15 Thread Sam James

commit: 9722be47e42f89ac14a0975901cf784f819281f2
Author: Sam James  gentoo  org>
AuthorDate: Tue Mar 16 00:10:34 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Mar 16 00:10:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9722be47

net-analyzer/rrdtool: add github upstream metadata

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

 net-analyzer/rrdtool/metadata.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/net-analyzer/rrdtool/metadata.xml 
b/net-analyzer/rrdtool/metadata.xml
index aaeb6e06406..d2dbe95efd3 100644
--- a/net-analyzer/rrdtool/metadata.xml
+++ b/net-analyzer/rrdtool/metadata.xml
@@ -10,4 +10,7 @@
Enable support for librados from 
sys-cluster/ceph
Build rrdcgi support

+   
+   oetiker/rrdtool-1.x
+

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

2021-03-15 Thread Sam James

commit: f7ffe7c1c16fed1706a108dd88984403aae8af56
Author: Sam James  gentoo  org>
AuthorDate: Tue Mar 16 00:10:13 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Mar 16 00:10:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7ffe7c1

net-analyzer/rrdtool: fix metadata indentation

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

 net-analyzer/rrdtool/metadata.xml | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/net-analyzer/rrdtool/metadata.xml 
b/net-analyzer/rrdtool/metadata.xml
index a6a291c9723..aaeb6e06406 100644
--- a/net-analyzer/rrdtool/metadata.xml
+++ b/net-analyzer/rrdtool/metadata.xml
@@ -1,13 +1,13 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-
-net...@gentoo.org
-Gentoo network monitoring and analysis project
-
-
-Enable support for graphing functions
-Enable support for librados from 
sys-cluster/ceph
-Build rrdcgi support
-
+   
+   net...@gentoo.org
+   Gentoo network monitoring and analysis project
+   
+   
+   Enable support for graphing functions
+   Enable support for librados from 
sys-cluster/ceph
+   Build rrdcgi support
+

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

2021-03-15 Thread Sam James

commit: 46f5ab5c0b7f841cb72601526a7b724c7bb0f6af
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 15 23:57:56 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 15 23:57:56 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46f5ab5c

net-analyzer/rrdtool: drop 1.7.2, 1.7.2-r1

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

 net-analyzer/rrdtool/rrdtool-1.7.2-r1.ebuild | 189 ---
 net-analyzer/rrdtool/rrdtool-1.7.2.ebuild| 189 ---
 2 files changed, 378 deletions(-)

diff --git a/net-analyzer/rrdtool/rrdtool-1.7.2-r1.ebuild 
b/net-analyzer/rrdtool/rrdtool-1.7.2-r1.ebuild
deleted file mode 100644
index ba8b9c45ce9..000
--- a/net-analyzer/rrdtool/rrdtool-1.7.2-r1.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-DISTUTILS_OPTIONAL=true
-DISTUTILS_SINGLE_IMPL=true
-GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python3_{7,8} )
-inherit autotools perl-module distutils-r1 flag-o-matic multilib
-
-MY_P=${P/_/-}
-
-DESCRIPTION="A system to store and display time-series data"
-HOMEPAGE="https://oss.oetiker.ch/rrdtool/;
-SRC_URI="https://oss.oetiker.ch/rrdtool/pub/${MY_P}.tar.gz;
-
-LICENSE="GPL-2"
-SLOT="0/8.0.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd 
test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="
-   >=dev-libs/glib-2.28.7:2[static-libs(+)?]
-   >=dev-libs/libxml2-2.7.8:2[static-libs(+)?]
-   dbi? ( dev-db/libdbi[static-libs(+)?] )
-   graph? (
-   >=media-libs/libpng-1.5.10:0=[static-libs(+)?]
-   >=x11-libs/cairo-1.10.2[svg,static-libs(+)?]
-   >=x11-libs/pango-1.28
-   )
-   lua? ( dev-lang/lua:0= )
-   perl? ( dev-lang/perl:= )
-   python? ( ${PYTHON_DEPS} )
-   rados? ( sys-cluster/ceph )
-   tcl? ( dev-lang/tcl:0= )
-   tcpd? ( sys-apps/tcp-wrappers )
-"
-
-DEPEND="
-   ${CDEPEND}
-   sys-apps/groff
-   virtual/pkgconfig
-   virtual/awk
-   test? ( sys-devel/bc )
-"
-RDEPEND="
-   ${CDEPEND}
-"
-PDEPEND="
-   ruby? ( ~dev-ruby/rrdtool-bindings-${PV} )
-"
-PATCHES=(
-   "${FILESDIR}"/${PN}-1.4.9-disable-rrd_graph-perl.patch
-   "${FILESDIR}"/${PN}-1.7.0-disable-rrd_graph-cgi.patch
-   "${FILESDIR}"/${PN}-1.7.1-configure.ac.patch
-)
-S=${WORKDIR}/${MY_P}
-
-python_compile() {
-   cd bindings/python || die
-   distutils-r1_python_compile
-}
-
-python_install() {
-   cd bindings/python || die
-   distutils-r1_python_install
-}
-
-pkg_setup() {
-   use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-   default
-   # At the next version bump, please see if you actually still need this
-   # before adding versions
-   if ! [ -f doc/rrdrados.pod ]; then
-   cp "${FILESDIR}"/${PN}-1.5.5-rrdrados.pod doc/rrdrados.pod
-   else
-   die "File already exists: doc/rrdrados.pod. Remove this code!"
-   fi
-
-   # bug 456810
-   # no time to sleep
-   sed -i \
-   -e 's|$LUA_CFLAGS|IGNORE_THIS_BAD_TEST|g' \
-   -e 's|^sleep 1$||g' \
-   -e '/^dnl.*png/s|^dnl||g' \
-   configure.ac || die
-
-   # Python bindings are built/installed manually
-   sed -i \
-   -e '/^all-local:/s| @COMP_PYTHON@||' \
-   bindings/Makefile.am || die
-
-   if ! use graph; then
-   sed -i \
-   -e '2s:rpn1::; 2s:rpn2::; 6s:create-with-source-4::;' \
-   -e '7s:xport1::; 7s:dcounter1::; 7s:vformatter1::' \
-   -e 's|graph1||g' \
-   tests/Makefile.am || die
-   fi
-
-   eautoreconf
-}
-
-src_configure() {
-   export rd_cv_gcc_flag__Werror=no
-   export rd_cv_ms_async=ok
-
-   filter-flags -ffast-math
-
-   export RRDDOCDIR=${EPREFIX}/usr/share/doc/${PF}
-
-   # to solve bug #260380
-   [[ ${CHOST} == *-solaris* ]] && append-flags -D__EXTENSIONS__
-
-   # Stub configure.ac
-   local myconf=()
-   if ! use tcpd; then
-   myconf+=( "--disable-libwrap" )
-   fi
-   if ! use dbi; then
-   myconf+=( "--disable-libdbi" )
-   fi
-   if ! use rados; then
-   myconf+=( "--disable-librados" )
-   fi
-
-   econf \
-   $(use_enable graph rrd_graph) \
-   $(use_enable lua lua-site-install) \
-   $(use_enable lua) \
-   $(use_enable perl perl-site-install) \
-   $(use_enable perl) \
-   $(use_enable python) \
-   $(use_enable rrdcgi) \
-   $(use_enable static-libs static) \
-

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

2021-03-15 Thread Sam James

commit: 231859817524d7ed84dcd83459355986ba923364
Author: Sam James  gentoo  org>
AuthorDate: Tue Mar 16 00:02:49 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Mar 16 00:06:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23185981

net-analyzer/rrdtool: modernise ebuild, fix dependencies

* Fix setuptools BDEPEND
* Use BDEPEND fully
* Sort phase definitions
* Drop unused eclass
* Add missing || dies
* Make style consistent (inc. Bash tests, semicolons)

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

 net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild | 85 +-
 1 file changed, 43 insertions(+), 42 deletions(-)

diff --git a/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild 
b/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild
index 8e87060d737..6dbe3765730 100644
--- a/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild
@@ -9,26 +9,30 @@ GENTOO_DEPEND_ON_PERL=no
 LUA_COMPAT=( lua5-{1..4} luajit )
 PYTHON_COMPAT=( python3_{7,8,9} )
 
-inherit autotools lua perl-module distutils-r1 flag-o-matic multilib
+inherit autotools lua perl-module distutils-r1 flag-o-matic
 
 MY_P=${P/_/-}
 
 DESCRIPTION="A system to store and display time-series data"
 HOMEPAGE="https://oss.oetiker.ch/rrdtool/;
 SRC_URI="https://oss.oetiker.ch/rrdtool/pub/${MY_P}.tar.gz;
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0/8.0.0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd 
test"
+
 RESTRICT="!test? ( test )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+REQUIRED_USE="
+   python? ( ${PYTHON_REQUIRED_USE} )
lua? (
${LUA_REQUIRED_USE}
test? ( graph )
-   )"
+   )
+"
 
-CDEPEND="
+RDEPEND="
>=dev-libs/glib-2.28.7:2[static-libs(+)?]
>=dev-libs/libxml2-2.7.8:2[static-libs(+)?]
dbi? ( dev-db/libdbi[static-libs(+)?] )
@@ -44,39 +48,25 @@ CDEPEND="
tcl? ( dev-lang/tcl:0= )
tcpd? ( sys-apps/tcp-wrappers )
 "
-
-DEPEND="
-   ${CDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
sys-apps/groff
virtual/pkgconfig
virtual/awk
-   test? ( sys-devel/bc )
-"
-RDEPEND="
-   ${CDEPEND}
-"
-BDEPEND="test? (
-   lua? ( ${LUA_DEPS} )
-)"
-PDEPEND="
-   ruby? ( ~dev-ruby/rrdtool-bindings-${PV} )
+   python? ( $(python_gen_cond_dep 
'dev-python/setuptools[${PYTHON_USEDEP}]') )
+   test? (
+   sys-devel/bc
+   lua? ( ${LUA_DEPS} )
+   )
 "
+
+PDEPEND="ruby? ( ~dev-ruby/rrdtool-bindings-${PV} )"
+
 PATCHES=(
"${FILESDIR}"/${PN}-1.4.9-disable-rrd_graph-perl.patch
"${FILESDIR}"/${PN}-1.7.0-disable-rrd_graph-cgi.patch
"${FILESDIR}"/${PN}-1.7.1-configure.ac.patch
 )
-S=${WORKDIR}/${MY_P}
-
-python_compile() {
-   cd bindings/python || die
-   distutils-r1_python_compile
-}
-
-python_install() {
-   cd bindings/python || die
-   distutils-r1_python_install
-}
 
 pkg_setup() {
use python && python-single-r1_pkg_setup
@@ -86,7 +76,7 @@ src_prepare() {
default
# At the next version bump, please see if you actually still need this
# before adding versions
-   if ! [ -f doc/rrdrados.pod ]; then
+   if ! [[ -f doc/rrdrados.pod ]] ; then
cp "${FILESDIR}"/${PN}-1.5.5-rrdrados.pod doc/rrdrados.pod
else
die "File already exists: doc/rrdrados.pod. Remove this code!"
@@ -105,7 +95,7 @@ src_prepare() {
-e '/^all-local:/s| @COMP_PYTHON@||' \
bindings/Makefile.am || die
 
-   if ! use graph; then
+   if ! use graph ; then
sed -i \
-e '2s:rpn1::; 2s:rpn2::; 6s:create-with-source-4::;' \
-e '7s:xport1::; 7s:dcounter1::; 7s:vformatter1::' \
@@ -122,20 +112,20 @@ src_configure() {
 
filter-flags -ffast-math
 
-   export RRDDOCDIR=${EPREFIX}/usr/share/doc/${PF}
+   export RRDDOCDIR="${EPREFIX}"/usr/share/doc/${PF}
 
# to solve bug #260380
[[ ${CHOST} == *-solaris* ]] && append-flags -D__EXTENSIONS__
 
# Stub configure.ac
local myconf=()
-   if ! use tcpd; then
+   if ! use tcpd ; then
myconf+=( "--disable-libwrap" )
fi
-   if ! use dbi; then
+   if ! use dbi ; then
myconf+=( "--disable-libdbi" )
fi
-   if ! use rados; then
+   if ! use rados ; then
myconf+=( "--disable-librados" )
fi
 
@@ -158,6 +148,11 @@ src_configure() {
${myconf[@]}
 }
 
+python_compile() {
+   cd bindings/python || die
+   distutils-r1_python_compile
+}
+
 lua_src_compile() {
pushd "${BUILD_DIR}"/bindings/lua || die "Failed to change to 
Lua-binding directory for

[gentoo-commits] repo/gentoo:master commit in: x11-misc/xlockmore/

2021-03-15 Thread Sam James

commit: 7acc010d34f1e9358aa02c663855271d2968dd38
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 15 23:44:10 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 15 23:44:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7acc010d

x11-misc/xlockmore: add 5.66

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

 x11-misc/xlockmore/Manifest  |   1 +
 x11-misc/xlockmore/xlockmore-5.66.ebuild | 120 +++
 2 files changed, 121 insertions(+)

diff --git a/x11-misc/xlockmore/Manifest b/x11-misc/xlockmore/Manifest
index d48d9210205..0a192762fa6 100644
--- a/x11-misc/xlockmore/Manifest
+++ b/x11-misc/xlockmore/Manifest
@@ -1,3 +1,4 @@
 DIST xlockmore-5.50.tar.xz 1632968 BLAKE2B 
2e692d16d70e3186ec1f31c192414b286f8815f2f428a6f7f43b3de0117c51c4ad2fbdfb91debe2ecb75c8683212b5d33bee62d81374552703d578b02d3af036
 SHA512 
627a905c4641d6083676a766931f23c06e2ac5af9b43447ccf03143d329d24b786aac6b248318929399b5fae98f1ec17e676466b5cbd09f180377c483694c569
 DIST xlockmore-5.65.tar.xz 1945636 BLAKE2B 
d026975551e8ceafdcc7b8d8b6e404634f329d8d1f65e153b51798981103a023479dd58f2485c774aaf58f5928ea28a9f409c733ccfc75f98b65302e7e478ac5
 SHA512 
ecbf7e5c087843265eb4a537b3fe06a0d86d5f67d88c45137b6a7f4f5b30522d44fb87b5628cd9e042f90af129863fd3a4c2b5e2305df2dc3dfd867a03469ad8
+DIST xlockmore-5.66.tar.xz 1995064 BLAKE2B 
630643f2968a5015dd35b4e1a24cd3d4e7ef9d6d75b0916416e93ab28bacb5a161983b036d9042a5686b2f17ba493ad510e2df9f7443488f9b988662e644ec7a
 SHA512 
d0a4665e23b32cc3370703e55396cd5c9659f836aa13a1737dd709632746cf9221acd66a529b9e05af981e5bef539e70582959b9d821854b93ef735ad1cd928d
 DIST xlockmore-5.66ALPHA12.tar.xz 2083320 BLAKE2B 
271c3e67076086759e325315bebb63a509adde6ee93a9cdae7c1022649231a34a9d944a94676ecee5fb53b3105766095f3e9f4f17df60de14fee1e6742b729c2
 SHA512 
e495dac3ce0cb1983ee2757198babc05adbadf3cad90c576af8dc83f4c49a45cdc3411106df910ccdc9701b842d7ead96cb2f253ccad094464e900e9548f963a

diff --git a/x11-misc/xlockmore/xlockmore-5.66.ebuild 
b/x11-misc/xlockmore/xlockmore-5.66.ebuild
new file mode 100644
index 000..e701a66751b
--- /dev/null
+++ b/x11-misc/xlockmore/xlockmore-5.66.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic pam
+
+DESCRIPTION="Just another screensaver application for X"
+HOMEPAGE="https://www.sillycycle.com/xlockmore.html;
+SRC_URI="
+   https://www.sillycycle.com/xlock/${P/_alpha/ALPHA}.tar.xz
+   
https://www.sillycycle.com/xlock/recent-releases/${P/_alpha/ALPHA}.tar.xz
+"
+S="${WORKDIR}/${P/_alpha/ALPHA}"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="crypt debug gtk imagemagick motif nas opengl pam truetype xinerama 
xlockrc vtlock"
+
+REQUIRED_USE="
+   || ( crypt pam )
+   pam? ( !xlockrc )
+   xlockrc? ( !pam )
+"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+   x11-libs/libX11
+   x11-libs/libXext
+   x11-libs/libXmu
+   x11-libs/libXpm
+   x11-libs/libXt
+   gtk? ( x11-libs/gtk+:2 )
+   imagemagick? ( media-gfx/imagemagick:= )
+   motif? ( >=x11-libs/motif-2.3:0 )
+   nas? ( media-libs/nas )
+   opengl? (
+   virtual/opengl
+   virtual/glu
+   truetype? ( >=media-libs/ftgl-2.1.3_rc5 )
+   )
+   pam? ( sys-libs/pam )
+   truetype? ( media-libs/freetype:2 )
+   xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="
+   ${RDEPEND}
+   x11-base/xorg-proto
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-5.46-freetype261.patch
+   "${FILESDIR}"/${PN}-5.47-CXX.patch
+   "${FILESDIR}"/${PN}-5.47-strip.patch
+   "${FILESDIR}"/${PN}-5.64_alpha0-LDFLAGS.patch
+)
+
+src_prepare() {
+   default
+
+   sed -i \
+   -e '/XLOCKLIBPATHS="-L/d' \
+   -e '/XMLOCKLIBPATHS="-L/d' \
+   -e 's|/lib|'"${EPREFIX}/$(get_libdir)"'|g' \
+   configure.ac || die
+
+   eautoreconf
+}
+
+src_configure() {
+   local myconf=()
+
+   if use opengl && use truetype; then
+   myconf=( --with-ftgl )
+   append-cppflags -DFTGL213
+   else
+   myconf=( --without-ftgl )
+   fi
+
+   myconf+=(
+   $(use_enable pam)
+   $(use_enable xlockrc)
+   $(use_enable vtlock)
+   $(use_with crypt)
+   $(use_with debug editres)
+   $(use_with gtk gtk2)
+   $(use_with imagemagick magick)
+   $(use_with motif)
+   $(use_with nas)
+   $(use_with opengl mesa)
+   $(use_with opengl)
+   $(use_with truetype freetype)
+   $(use_with truetype ttf)
+   $(use_with xinerama)
+   --disable-mb
+

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

2021-03-15 Thread Sam James

commit: 616d0d9979b37aef780314853279f7de5827cd81
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 15 23:52:40 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 15 23:52:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=616d0d99

net-analyzer/labrea: fix libdir

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

 net-analyzer/labrea/files/labrea-2.5-libdir.patch | 26 +++
 net-analyzer/labrea/labrea-2.5_p1.ebuild  | 14 +++-
 2 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/net-analyzer/labrea/files/labrea-2.5-libdir.patch 
b/net-analyzer/labrea/files/labrea-2.5-libdir.patch
new file mode 100644
index 000..039745205c3
--- /dev/null
+++ b/net-analyzer/labrea/files/labrea-2.5-libdir.patch
@@ -0,0 +1,26 @@
+--- a/configure.in
 b/configure.in
+@@ -82,9 +82,9 @@ AC_ARG_WITH(libpcap,
+   if cd $withval; then withval=`pwd`; cd $owd; fi
+   PCAPINC="-I$withval/include"
+   if test -f $withval/lib/libwpcap.a; then
+- PCAPLIB="-L$withval/lib -lwpcap"
++ PCAPLIB="-L$withval/${libdir} -lwpcap"
+   else
+- PCAPLIB="-L$withval/lib -lpcap"
++ PCAPLIB="-L$withval/${libdir} -lpcap"
+ fi
+  else
+ AC_ERROR(pcap.h, net/bpf.h, or libpcap.a not found in $withval)
+@@ -94,9 +94,9 @@ AC_ARG_WITH(libpcap,
+ [ if test -f ${prefix}/include/pcap.h; then
+  PCAPINC="-I${prefix}/include"
+  if test -f ${prefix}/lib/libwpcap.a; then
+-  PCAPLIB="-L${prefix}/lib -lwpcap"
++  PCAPLIB="-L${libdir} -lwpcap"
+  else
+-PCAPLIB="-L${prefix}/lib -lpcap"
++PCAPLIB="-L${libdir} -lpcap"
+  fi
+   elif test -f /usr/include/pcap/pcap.h; then
+  PCAPINC="-I/usr/include/pcap"

diff --git a/net-analyzer/labrea/labrea-2.5_p1.ebuild 
b/net-analyzer/labrea/labrea-2.5_p1.ebuild
index 5fc9881601f..a47abfc9e1a 100644
--- a/net-analyzer/labrea/labrea-2.5_p1.ebuild
+++ b/net-analyzer/labrea/labrea-2.5_p1.ebuild
@@ -1,12 +1,14 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit autotools
 
 DESCRIPTION="'Sticky' Honeypot and IDS"
 HOMEPAGE="http://labrea.sourceforge.net/;
 SRC_URI="mirror://sourceforge/${PN}/${P/_p*}-stable-${PV/*_p}.tar.gz"
+S="${WORKDIR}/${P/_p/-stable-}"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -16,15 +18,15 @@ DEPEND="
net-libs/libpcap
>=dev-libs/libdnet-1.7
 "
-RDEPEND="
-   ${DEPEND}
-"
+RDEPEND="${DEPEND}"
+
 DOCS=( AUTHORS ChangeLog README{,.first} TODO NEWS )
+
 PATCHES=(
"${FILESDIR}"/${P/_p/-stable-}-incdir.patch
"${FILESDIR}"/${P/_p*}-pcap_open.patch
+   "${FILESDIR}"/${PN}-2.5-libdir.patch
 )
-S=${WORKDIR}/${P/_p/-stable-}
 
 src_prepare() {
default
@@ -32,6 +34,8 @@ src_prepare() {
# autotools will overwrite this with the generic version
mv INSTALL README.first || die
 
+   mv configure.{in,ac} || die
+
eautoreconf
 }

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

2021-03-15 Thread Sam James

commit: 1054f69f75bc586bdceb0001b5a37ed07e0d78d3
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 15 23:56:18 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 15 23:56:22 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1054f69f

net-analyzer/xnetload: update EAPI 5 -> 7, fix libdir, colon-in-CFLAGS

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

 .../xnetload/files/xnetload-1.11.3-libdir.patch| 11 +++
 net-analyzer/xnetload/xnetload-1.11.3-r1.ebuild| 23 ++
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/net-analyzer/xnetload/files/xnetload-1.11.3-libdir.patch 
b/net-analyzer/xnetload/files/xnetload-1.11.3-libdir.patch
new file mode 100644
index 000..3bfbd619c11
--- /dev/null
+++ b/net-analyzer/xnetload/files/xnetload-1.11.3-libdir.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
 b/Makefile
+@@ -14,7 +14,7 @@ CC = gcc
+
+ # The next two lines are for building an optimized and stripped program.
+ CFLAGS += -Wall -DNDEBUG -I/usr/include
+-LFLAGS = $(LDFLAGS) -L/usr/lib
++LFLAGS = $(LDFLAGS)
+
+ # These three lines are for building Athlon optimized programs on my system.
+ #CC=gcc-3.1

diff --git a/net-analyzer/xnetload/xnetload-1.11.3-r1.ebuild 
b/net-analyzer/xnetload/xnetload-1.11.3-r1.ebuild
index d1caa9933a5..1b3e67000f2 100644
--- a/net-analyzer/xnetload/xnetload-1.11.3-r1.ebuild
+++ b/net-analyzer/xnetload/xnetload-1.11.3-r1.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 inherit toolchain-funcs
 
-DESCRIPTION="displays a count and a graph of the traffic over a specified 
network connection"
-LICENSE="GPL-2"
-HOMEPAGE="http://www.xs4all.nl/~rsmith/software/;
-SRC_URI="http://www.xs4all.nl/~rsmith/software/${P}.tar.gz;
+DESCRIPTION="Displays a count and a graph of the traffic over a specified 
network connection"
+HOMEPAGE="https://www.xs4all.nl/~rsmith/software/;
+SRC_URI="https://www.xs4all.nl/~rsmith/software/${P}.tar.gz;
 
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 sparc x86"
 
@@ -19,13 +20,19 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+   "${FILESDIR}/${PN}-1.11.3-libdir.patch"
+)
+
 src_prepare() {
sed -i \
-   -e 's:CFLAGS = -pipe -O2 -Wall:CFLAGS += -Wall:' \
-   -e 's:LFLAGS = -s -pipe:LFLAGS = $(LDFLAGS):' \
+   -e 's;CFLAGS = -pipe -O2 -Wall;CFLAGS += -Wall;' \
+   -e 's;LFLAGS = -s -pipe;LFLAGS = $(LDFLAGS);' \
-e 's:gcc -MM:$(CC) -MM:' \
-e 's:/usr/X11R6:/usr:g' \
Makefile || die
+
+   default
 }
 
 src_compile() {

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

2021-03-15 Thread Sam James

commit: 3d2e2a9cbe04ef4b900241c6ef0135a98f95e929
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 15 23:35:24 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 15 23:35:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d2e2a9c

net-analyzer/netselect: drop dead keywords

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

 net-analyzer/netselect/netselect-0.4-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/netselect/netselect-0.4-r2.ebuild 
b/net-analyzer/netselect/netselect-0.4-r2.ebuild
index d3d78753312..decda5e572d 100644
--- a/net-analyzer/netselect/netselect-0.4-r2.ebuild
+++ b/net-analyzer/netselect/netselect-0.4-r2.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ipv6"
 
 PATCHES=(

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

2021-03-15 Thread Sam James

commit: 75bf552a579f71ee671e10fab2c322d8084fab16
Author: Peter Levine  gmail  com>
AuthorDate: Wed Oct 23 19:13:46 2019 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 15 23:32:10 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75bf552a

net-analyzer/netselect: Add filecaps support

Closes: https://bugs.gentoo.org/564902
Closes: https://github.com/gentoo/gentoo/pull/13388
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Peter Levine  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 net-analyzer/netselect/netselect-0.4-r2.ebuild | 19 +--
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/net-analyzer/netselect/netselect-0.4-r2.ebuild 
b/net-analyzer/netselect/netselect-0.4-r2.ebuild
index 8ac47519b25..e887b8335a1 100644
--- a/net-analyzer/netselect/netselect-0.4-r2.ebuild
+++ b/net-analyzer/netselect/netselect-0.4-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit toolchain-funcs
+inherit fcaps toolchain-funcs
 
 DESCRIPTION="Ultrafast implementation of ping"
 HOMEPAGE="http://apenwarr.ca/netselect/;
@@ -23,12 +23,20 @@ PATCHES=(
 
 DOCS=( HISTORY README )
 
+FILECAPS=( -g wheel cap_net_raw /usr/bin/netselect )
+
 S=${WORKDIR}/${PN}-${P}
 
 src_prepare() {
use ipv6 && eapply "${WORKDIR}"/${PN}-0.4-ipv6.patch
 
default
+
+   # Don't warn about "root privileges required" when running as
+   # an unprivileged user with filecaps
+   if ! use prefix && use filecaps; then
+   sed -i -e '/if (geteuid () != 0)/,+2d' "${S}"/netselect.c || die
+   fi
 }
 
 src_compile() {
@@ -38,12 +46,11 @@ src_compile() {
 src_install() {
dobin netselect
 
-   if ! use prefix ; then
-   fowners root:wheel /usr/bin/netselect
-   fperms 4711 /usr/bin/netselect
-   fi
-
einstalldocs
 
doman netselect.1
 }
+
+pkg_postinst() {
+   ! use prefix && fcaps_pkg_postinst
+}

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

2021-03-15 Thread Sam James

commit: 17382e90578b701a3480063af93dfa21b7e2921c
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 15 23:33:50 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 15 23:33:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17382e90

net-analyzer/netselect: minor style adjustments

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

 net-analyzer/netselect/netselect-0.4-r2.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-analyzer/netselect/netselect-0.4-r2.ebuild 
b/net-analyzer/netselect/netselect-0.4-r2.ebuild
index e887b8335a1..d3d78753312 100644
--- a/net-analyzer/netselect/netselect-0.4-r2.ebuild
+++ b/net-analyzer/netselect/netselect-0.4-r2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit fcaps toolchain-funcs
 
 DESCRIPTION="Ultrafast implementation of ping"
@@ -10,6 +11,7 @@ SRC_URI="
https://github.com/apenwarr/${PN}/archive/${P}.tar.gz
ipv6? ( https://dev.gentoo.org/~jer/${P}-ipv6.patch.xz )
 "
+S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="BSD"
 SLOT="0"
@@ -25,8 +27,6 @@ DOCS=( HISTORY README )
 
 FILECAPS=( -g wheel cap_net_raw /usr/bin/netselect )
 
-S=${WORKDIR}/${PN}-${P}
-
 src_prepare() {
use ipv6 && eapply "${WORKDIR}"/${PN}-0.4-ipv6.patch

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

2021-03-15 Thread Sam James

commit: 69c0548447e9e2a35c8cbc897b0579652a116131
Author: Peter Levine  gmail  com>
AuthorDate: Tue Oct 22 07:15:01 2019 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 15 23:32:09 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69c05484

net-analyzer/netselect: Bump EAPI to 7

Package-Manager: Portage-2.3.77, Repoman-2.3.17
Signed-off-by: Peter Levine  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 net-analyzer/netselect/netselect-0.4-r2.ebuild | 49 ++
 1 file changed, 49 insertions(+)

diff --git a/net-analyzer/netselect/netselect-0.4-r2.ebuild 
b/net-analyzer/netselect/netselect-0.4-r2.ebuild
new file mode 100644
index 000..8ac47519b25
--- /dev/null
+++ b/net-analyzer/netselect/netselect-0.4-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="Ultrafast implementation of ping"
+HOMEPAGE="http://apenwarr.ca/netselect/;
+SRC_URI="
+   https://github.com/apenwarr/${PN}/archive/${P}.tar.gz
+   ipv6? ( https://dev.gentoo.org/~jer/${P}-ipv6.patch.xz )
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="ipv6"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-0.4-bsd.patch
+   "${FILESDIR}"/${PN}-0.4-flags.patch
+)
+
+DOCS=( HISTORY README )
+
+S=${WORKDIR}/${PN}-${P}
+
+src_prepare() {
+   use ipv6 && eapply "${WORKDIR}"/${PN}-0.4-ipv6.patch
+
+   default
+}
+
+src_compile() {
+   emake CC="$(tc-getCC)" LDFLAGS="${CFLAGS} ${LDFLAGS}"
+}
+
+src_install() {
+   dobin netselect
+
+   if ! use prefix ; then
+   fowners root:wheel /usr/bin/netselect
+   fperms 4711 /usr/bin/netselect
+   fi
+
+   einstalldocs
+
+   doman netselect.1
+}

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

2021-03-15 Thread Sam James

commit: 1bfbfa683b1e1c9d024d1d0bd03c4743d4d3afc0
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sun Mar  7 09:06:57 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 15 23:23:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bfbfa68

net-analyzer/sbd: EAPI7 bump

Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/19809
Signed-off-by: Sam James  gentoo.org>

 net-analyzer/sbd/sbd-1.37-r1.ebuild | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/net-analyzer/sbd/sbd-1.37-r1.ebuild 
b/net-analyzer/sbd/sbd-1.37-r1.ebuild
index 514310c7e94..6b87335cd5a 100644
--- a/net-analyzer/sbd/sbd-1.37-r1.ebuild
+++ b/net-analyzer/sbd/sbd-1.37-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -9,11 +9,12 @@ DESCRIPTION="Netcat-clone, designed to be portable and offer 
strong encryption"
 HOMEPAGE="http://tigerteam.se/dl/sbd/;
 SRC_URI="http://tigerteam.se/dl/sbd/${P}.tar.gz;
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc x86"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
 
 src_prepare() {
+   default
sed -i \
-e '/ -o /{ s| $(UNIX_LDFLAGS) $(LDFLAGS)||g;s|$(CFLAGS)|& 
$(LDFLAGS)|g }' \
Makefile || die

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

2021-03-15 Thread Sam James

commit: 6db0315d786c499a9526ce7ee71d3229fea8fd26
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 15 23:30:38 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 15 23:30:38 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6db0315d

net-analyzer/nethogs: fix adding capabilities

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

 net-analyzer/nethogs/nethogs-0.8.6-r1.ebuild | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-analyzer/nethogs/nethogs-0.8.6-r1.ebuild 
b/net-analyzer/nethogs/nethogs-0.8.6-r1.ebuild
index 16a6a36ff84..e0f115871a5 100644
--- a/net-analyzer/nethogs/nethogs-0.8.6-r1.ebuild
+++ b/net-analyzer/nethogs/nethogs-0.8.6-r1.ebuild
@@ -24,6 +24,10 @@ BDEPEND="
virtual/pkgconfig
 "
 
+FILECAPS=(
+   cap_net_admin,cap_net_raw usr/sbin/nethogs
+)
+
 src_compile() {
tc-export CC CXX
emake NCURSES_LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses )" "${PN}"
@@ -33,7 +37,3 @@ src_install() {
emake DESTDIR="${ED}" PREFIX="/usr" install
einstalldocs
 }
-
-pkg_postinst() {
-   ecaps cap_net_admin,cap_net_raw "${EROOT}/usr/bin/nethogs"
-}

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

2021-03-15 Thread Sam James

commit: c8fe7197c0d6656614285bca88190a06f80477a6
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 15 23:26:00 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 15 23:26:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8fe7197

net-analyzer/nethogs: keep stable keywords for 0.8.6-r1

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

 net-analyzer/nethogs/nethogs-0.8.6-r1.ebuild |  3 ++-
 net-analyzer/nethogs/nethogs-0.8.6.ebuild| 33 
 2 files changed, 2 insertions(+), 34 deletions(-)

diff --git a/net-analyzer/nethogs/nethogs-0.8.6-r1.ebuild 
b/net-analyzer/nethogs/nethogs-0.8.6-r1.ebuild
index 4cf2b0092cb..16a6a36ff84 100644
--- a/net-analyzer/nethogs/nethogs-0.8.6-r1.ebuild
+++ b/net-analyzer/nethogs/nethogs-0.8.6-r1.ebuild
@@ -11,7 +11,8 @@ 
SRC_URI="https://github.com/raboof/nethogs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~x86"
+KEYWORDS="amd64 ~arm ~ia64 x86"
+
 DOCS=( DESIGN README.decpcap.txt README.md )
 
 RDEPEND="

diff --git a/net-analyzer/nethogs/nethogs-0.8.6.ebuild 
b/net-analyzer/nethogs/nethogs-0.8.6.ebuild
deleted file mode 100644
index bef9dec145f..000
--- a/net-analyzer/nethogs/nethogs-0.8.6.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="A small 'net top' tool, grouping bandwidth by process"
-HOMEPAGE="https://github.com/raboof/nethogs;
-SRC_URI="https://github.com/raboof/nethogs/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 x86"
-
-RDEPEND="
-   net-libs/libpcap
-   sys-libs/ncurses:0=
-"
-DEPEND="
-   ${RDEPEND}
-   virtual/pkgconfig
-"
-
-src_compile() {
-   tc-export CC CXX
-   emake NCURSES_LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses )" ${PN}
-}
-
-src_install() {
-   emake DESTDIR="${ED}" PREFIX="/usr" install
-   dodoc DESIGN README.decpcap.txt README.md
-}

[gentoo-commits] repo/gentoo:master commit in: x11-misc/lineak-defaultplugin/

2021-03-15 Thread Sam James

commit: 0ac24ea014ff84776063e2fc337ec72a4ad621f9
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 15 23:12:26 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 15 23:12:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ac24ea0

x11-misc/lineak-defaultplugin: fix MisplacedVariable (EROOT)

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

 x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.9.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.9.0-r2.ebuild 
b/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.9.0-r2.ebuild
index 4d0bc08f139..cd584ce7ab0 100644
--- a/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.9.0-r2.ebuild
+++ b/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.9.0-r2.ebuild
@@ -40,6 +40,6 @@ src_prepare() {
 src_configure() {
econf \
$(use_enable debug) \
-   --with-lineak-plugindir="${EROOT}/usr/$(get_libdir)/lineakd" \
+   --with-lineak-plugindir="${EPREFIX}/usr/$(get_libdir)/lineakd" \
USER_LDFLAGS="${LDFLAGS}"
 }

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sisctrl/

2021-03-15 Thread Sam James

commit: 7f9e090198f6544422c3b26b35a7e387123a13d3
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 15 23:15:24 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 15 23:15:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f9e0901

x11-misc/sisctrl: modernise ebuild: BDEPEND, fix MisplacedVariable (EROOT)

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

 x11-misc/sisctrl/sisctrl-0.0.20051202-r1.ebuild | 11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/x11-misc/sisctrl/sisctrl-0.0.20051202-r1.ebuild 
b/x11-misc/sisctrl/sisctrl-0.0.20051202-r1.ebuild
index 53c9511c8cc..eca4dc54844 100644
--- a/x11-misc/sisctrl/sisctrl-0.0.20051202-r1.ebuild
+++ b/x11-misc/sisctrl/sisctrl-0.0.20051202-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit flag-o-matic
 
 DESCRIPTION="tool that allows you to tune SiS drivers from X"
@@ -12,6 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
+BDEPEND="virtual/pkgconfig"
 RDEPEND="
dev-libs/glib:2
x11-libs/gtk+:2
@@ -21,10 +23,11 @@ RDEPEND="
 "
 DEPEND="
${RDEPEND}
-   virtual/pkgconfig
x11-base/xorg-proto
 "
-DOCS="AUTHORS ChangeLog NEWS README"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
 PATCHES=(
"${FILESDIR}"/${P}-no-xv.patch
 )
@@ -32,5 +35,5 @@ PATCHES=(
 src_configure() {
append-libs -lm
econf \
-   --with-xv-path="${EROOT}/usr/$(get_libdir)"
+   --with-xv-path="${EPREFIX}/usr/$(get_libdir)"
 }

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

2021-03-15 Thread Sam James

commit: 8c4cdd5880de5f8ea6c65e360cfb21537fa14cf4
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Mon Feb 22 11:04:21 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 15 23:25:10 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c4cdd58

net-analyzer/nethogs: added capabilities

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Alessandro Barbieri  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/19587
Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nethogs/nethogs-0.8.6-r1.ebuild | 38 
 1 file changed, 38 insertions(+)

diff --git a/net-analyzer/nethogs/nethogs-0.8.6-r1.ebuild 
b/net-analyzer/nethogs/nethogs-0.8.6-r1.ebuild
new file mode 100644
index 000..4cf2b0092cb
--- /dev/null
+++ b/net-analyzer/nethogs/nethogs-0.8.6-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit fcaps toolchain-funcs
+
+DESCRIPTION="A small 'net top' tool, grouping bandwidth by process"
+HOMEPAGE="https://github.com/raboof/nethogs;
+SRC_URI="https://github.com/raboof/nethogs/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~x86"
+DOCS=( DESIGN README.decpcap.txt README.md )
+
+RDEPEND="
+   net-libs/libpcap
+   sys-libs/ncurses:0=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+   virtual/pkgconfig
+"
+
+src_compile() {
+   tc-export CC CXX
+   emake NCURSES_LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses )" "${PN}"
+}
+
+src_install() {
+   emake DESTDIR="${ED}" PREFIX="/usr" install
+   einstalldocs
+}
+
+pkg_postinst() {
+   ecaps cap_net_admin,cap_net_raw "${EROOT}/usr/bin/nethogs"
+}

[gentoo-commits] repo/gentoo:master commit in: x11-misc/lineak-xosdplugin/

2021-03-15 Thread Sam James

commit: df3ee2d1af56c777af81cd637e56e0edbdc7bac0
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 15 23:13:42 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 15 23:13:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df3ee2d1

x11-misc/lineak-xosdplugin: modernise ebuild, fix MisplacedVariable (EROOT)

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

 x11-misc/lineak-xosdplugin/lineak-xosdplugin-0.9.0-r2.ebuild | 12 
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/x11-misc/lineak-xosdplugin/lineak-xosdplugin-0.9.0-r2.ebuild 
b/x11-misc/lineak-xosdplugin/lineak-xosdplugin-0.9.0-r2.ebuild
index 5499b6eedf1..5ad5aca6757 100644
--- a/x11-misc/lineak-xosdplugin/lineak-xosdplugin-0.9.0-r2.ebuild
+++ b/x11-misc/lineak-xosdplugin/lineak-xosdplugin-0.9.0-r2.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit multilib
 
 MY_P=${P/.0/}
-
 DESCRIPTION="Xosd plugin for LINEAK"
 HOMEPAGE="http://lineak.sourceforge.net/;
 SRC_URI="mirror://sourceforge/lineak/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -19,11 +18,8 @@ DEPEND="
=x11-misc/lineakd-${PV}*
x11-libs/xosd
 "
-RDEPEND="
-   ${DEPEND}
-"
+RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/${MY_P}
 PATCHES=(
"${FILESDIR}"/${P}-gcc43.patch
 )
@@ -31,7 +27,7 @@ PATCHES=(
 src_configure() {
econf \
$(use_enable debug) \
-   --with-lineak-plugindir="${EROOT}/usr/$(get_libdir)/lineakd" \
+   --with-lineak-plugindir="${EPREFIX}/usr/$(get_libdir)/lineakd" \
--with-x
 }

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

2021-03-15 Thread Sam James

commit: d0564c67e4e9186030976dac202748719dc297d8
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sun Mar  7 08:51:56 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 15 23:23:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0564c67

net-analyzer/nbwmon: EAPI7 bump

Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/19808
Signed-off-by: Sam James  gentoo.org>

 net-analyzer/nbwmon/nbwmon-0.5.2.ebuild | 23 +++
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/net-analyzer/nbwmon/nbwmon-0.5.2.ebuild 
b/net-analyzer/nbwmon/nbwmon-0.5.2.ebuild
index f2c7742f396..613256373c4 100644
--- a/net-analyzer/nbwmon/nbwmon-0.5.2.ebuild
+++ b/net-analyzer/nbwmon/nbwmon-0.5.2.ebuild
@@ -1,27 +1,26 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils toolchain-funcs
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="ncurses bandwidth monitor"
-HOMEPAGE="http://causes.host.funtoo.org/?p=nbwmon 
https://github.com/causes-/nbwmon;
+HOMEPAGE="https://github.com/causes-/nbwmon;
 SRC_URI="https://github.com/causes-/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
-RDEPEND="
-   sys-libs/ncurses
-"
-DEPEND="
-   ${RDEPEND}
-   virtual/pkgconfig
-"
+RDEPEND="sys-libs/ncurses"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.5.2-tinfo.patch )
 
 src_prepare() {
-   epatch "${FILESDIR}"/${PN}-0.5.2-tinfo.patch
+   default
tc-export CC PKG_CONFIG
 }

[gentoo-commits] proj/gcc-patches:master commit in: 10.2.0/gentoo/

2021-03-15 Thread Sergei Trofimovich

commit: ff3a446afb9e0abb87869e85826454e85ef398c3
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Mar 15 22:55:21 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Mar 15 22:57:07 2021 +
URL:https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=ff3a446a

10.2.0: fix vtv build on slibtool

Reported-by: orbea  riseup.net
Bug: https://gcc.gnu.org/PR99172
Bug: https://bugs.gentoo.org/767706
Signed-off-by: Sergei Trofimovich  gentoo.org>

 10.2.0/gentoo/43_all_vtv-slibtool.patch | 62 +
 10.2.0/gentoo/README.history|  1 +
 2 files changed, 63 insertions(+)

diff --git a/10.2.0/gentoo/43_all_vtv-slibtool.patch 
b/10.2.0/gentoo/43_all_vtv-slibtool.patch
new file mode 100644
index 000..b5716f9
--- /dev/null
+++ b/10.2.0/gentoo/43_all_vtv-slibtool.patch
@@ -0,0 +1,62 @@
+https://bugs.gentoo.org/767706
+https://gcc.gnu.org/PR99172
+
+From c2be82058fb40f3ae891c68d185ff53e07f14f45 Mon Sep 17 00:00:00 2001
+From: Caroline Tice 
+Date: Fri, 12 Mar 2021 07:34:36 -0800
+Subject: [PATCH] libstdc++-v3: Update VTV vars for libtool link commands
+ [PR99172]
+
+This fixes PR 99172
+
+Currently when GCC is configured with --enable-vtable-verify, the
+libstdc++-v3 Makefiles add "-fvtable-verify=std
+-Wl,-u_vtable_map_vars_start,-u_vtable_map_vars_end" to libtool link
+commands. The "-fvtable-verify=std" piece causes alternate versions of
+libtool (such as slibtool) to fail, unable to find "-lvtv" (GNU
+libtool just removes that piece).
+
+This patch updates the libstdc++-v3 Makefiles to not pass
+"-fvtable-verify=std" to the libtool link commands.
+---
+ libstdc++-v3/src/Makefile.am | 4 +++-
+ libstdc++-v3/src/Makefile.in | 3 ++-
+
+--- a/libstdc++-v3/src/Makefile.am
 b/libstdc++-v3/src/Makefile.am
+@@ -214,12 +214,14 @@ compatibility-condvar.o: compatibility-condvar.cc
+ # set this option because CONFIG_CXXFLAGS has to be after
+ # OPTIMIZE_CXXFLAGS on the compile line so that -O2 can be overridden
+ # as the occasion calls for it.
+-AM_CXXFLAGS = \
++AM_CXXFLAGS_PRE = \
+   -std=gnu++98 \
+   $(glibcxx_compiler_pic_flag) \
+   $(XTEMPLATE_FLAGS) $(VTV_CXXFLAGS) \
+   $(WARN_CXXFLAGS) $(OPTIMIZE_CXXFLAGS) $(CONFIG_CXXFLAGS)
+ 
++AM_CXXFLAGS = $(filter-out -fvtable-verify=std,$(AM_CXXFLAGS_PRE))
++
+ # Libtool notes
+ 
+ # 1) In general, libtool expects an argument such as `--tag=CXX' when
+--- a/libstdc++-v3/src/Makefile.in
 b/libstdc++-v3/src/Makefile.in
+@@ -578,12 +578,13 @@ libstdc___la_LINK = $(CXXLINK) $(libstdc___la_LDFLAGS) 
$(lt_host_flags)
+ # set this option because CONFIG_CXXFLAGS has to be after
+ # OPTIMIZE_CXXFLAGS on the compile line so that -O2 can be overridden
+ # as the occasion calls for it.
+-AM_CXXFLAGS = \
++AM_CXXFLAGS_PRE = \
+   -std=gnu++98 \
+   $(glibcxx_compiler_pic_flag) \
+   $(XTEMPLATE_FLAGS) $(VTV_CXXFLAGS) \
+   $(WARN_CXXFLAGS) $(OPTIMIZE_CXXFLAGS) $(CONFIG_CXXFLAGS)
+ 
++AM_CXXFLAGS = $(filter-out -fvtable-verify=std,$(AM_CXXFLAGS_PRE))
+ 
+ # Libtool notes
+ 
+-- 
+2.30.2
+

diff --git a/10.2.0/gentoo/README.history b/10.2.0/gentoo/README.history
index 4ca261a..f195ae9 100644
--- a/10.2.0/gentoo/README.history
+++ b/10.2.0/gentoo/README.history
@@ -1,5 +1,6 @@
 7  TODO
+ 42_all_vmat-PR97236.patch
+   + 43_all_vtv-slibtool.patch
 
 6  29 Dec 2020
- 34_all_fundecl-ICE-PR95820.patch

[gentoo-commits] repo/gentoo:master commit in: dev-haskell/hackage-security/files/, dev-haskell/hackage-security/

2021-03-15 Thread Sergei Trofimovich

commit: 6cc33559cbb263018be861f18b66e798d7b35f14
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Mar 15 21:09:36 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Mar 15 22:32:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cc33559

dev-haskell/hackage-security: bump up to 0.6.0.1

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

 dev-haskell/hackage-security/Manifest  |  2 +
 0.1-disable-failing-aeson-canonical-test.patch | 13 +
 .../hackage-security-0.6.0.1-r1.ebuild | 63 ++
 dev-haskell/hackage-security/metadata.xml  | 12 ++---
 4 files changed, 82 insertions(+), 8 deletions(-)

diff --git a/dev-haskell/hackage-security/Manifest 
b/dev-haskell/hackage-security/Manifest
index 4b7cf8c6767..b087e633d8f 100644
--- a/dev-haskell/hackage-security/Manifest
+++ b/dev-haskell/hackage-security/Manifest
@@ -1 +1,3 @@
 DIST hackage-security-0.5.3.0.tar.gz 87119 BLAKE2B 
6e69b13d3ee16fbc6488e1e9d926ba07d97e9ad80c404ccfec60ff549e7eb2d40302ace8ac5f03ed5532c031f236f8a09edc8a3f8c7d4c2bb48743f88aa1
 SHA512 
57af812fb3911aed6ebdbc5de733e86a2bdc7845a07246c69346c59f654e7c4ae5bf20ad753cfe71dc1d7f47ce66a37fba49b178e8e6ff74002fc8ffb72d920d
+DIST hackage-security-0.6.0.1-r1.cabal 12313 BLAKE2B 
41dbb4a5b175fe49ab65dba01aa1cbd1a43fbf55fc9cd06697dc984f9a3917d3da5c9c3234e336b78372899848b0fa5adf09f0507617ed0835dfad1443eb62ab
 SHA512 
f4a8d2adde837af18587d74cf4191bc12dec22802aaafc4cd86968d893a41bf912d3649be339503063f8c698a4b8a62888ad50e0e58d3836cc55de100ca51e30
+DIST hackage-security-0.6.0.1.tar.gz 86006 BLAKE2B 
6d057da569beb4e30f91a630ec37247fd47a3467e6037ebf0c4391ff58d95d5477bea09f7d66ab6d0bbe49a445ea15d53ded884f9ea7922583a03ba7497cdd9a
 SHA512 
b83fdda3712c58bcc4237965e40bea16b9ce08f30c0671f45967e69a2eb85488e78a41c8d12b9f339f78f30cc50770a72e9e9a46e5ddf740a20bce4ea4e96fdb

diff --git 
a/dev-haskell/hackage-security/files/hackage-security-0.6.0.1-disable-failing-aeson-canonical-test.patch
 
b/dev-haskell/hackage-security/files/hackage-security-0.6.0.1-disable-failing-aeson-canonical-test.patch
new file mode 100644
index 000..fd83a5113c5
--- /dev/null
+++ 
b/dev-haskell/hackage-security/files/hackage-security-0.6.0.1-disable-failing-aeson-canonical-test.patch
@@ -0,0 +1,13 @@
+diff --git a/tests/TestSuite.hs b/tests/TestSuite.hs
+index 598e151..f62f1c5 100644
+--- a/tests/TestSuite.hs
 b/tests/TestSuite.hs
+@@ -70,7 +70,7 @@ tests = testGroup "hackage-security" [
+   testProperty "prop_roundtrip_canonical" 
JSON.prop_roundtrip_canonical
+ , testProperty "prop_roundtrip_pretty"JSON.prop_roundtrip_pretty
+ , testProperty "prop_canonical_pretty"JSON.prop_canonical_pretty
+-, testProperty "prop_aeson_canonical" JSON.prop_aeson_canonical
++-- , testProperty "prop_aeson_canonical" JSON.prop_aeson_canonical
+ ]
+   ]
+ 

diff --git a/dev-haskell/hackage-security/hackage-security-0.6.0.1-r1.ebuild 
b/dev-haskell/hackage-security/hackage-security-0.6.0.1-r1.ebuild
new file mode 100644
index 000..e10ab6c3c0b
--- /dev/null
+++ b/dev-haskell/hackage-security/hackage-security-0.6.0.1-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.7.
+# hackport: flags: -mtl21,+use-network-uri
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Hackage security library"
+HOMEPAGE="https://github.com/haskell/hackage-security;
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
+   https://hackage.haskell.org/package/${P}/revision/4.cabal -> 
${PF}.cabal"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+# keep in sync with ghc-8.10
+KEYWORDS="~amd64 ~x86"
+IUSE="+lukko"
+
+RDEPEND=">=dev-haskell/base16-bytestring-0.1.1:=[profile?] 
=dev-haskell/base64-bytestring-1.0:=[profile?] 
=dev-haskell/cabal-1.14:=[profile?] =dev-haskell/cryptohash-sha256-0.11:=[profile?] 
=dev-haskell/ed25519-0.0:=[profile?] 
=dev-haskell/mtl-2.2:=[profile?] =dev-haskell/network-2.6:=[profile?] 
=dev-haskell/network-uri-2.6:=[profile?] 
=dev-haskell/parsec-3.1:=[profile?] =dev-haskell/tar-0.5:=[profile?] =dev-haskell/zlib-0.5:=[profile?] =dev-lang/ghc-8.4.3:=
+   lukko? ( >=dev-haskell/lukko-0.1:=[profile?] 
https://github.com/haskell/hackage-security/issues/
+PATCHES=( 
"${FILESDIR}/hackage-security-0.6.0.1-disable-failing-aeson-canonical-test.patch"
  )
+
+src_prepare() {
+   default
+
+   cp "${DISTDIR}/${PF}.cabal" "${S}/${PN}.cabal" || die
+}
+
+src_configure() {
+   haskell-cabal_src_configure \
+   $(cabal_flag lukko lukko) \
+   --flag=-mtl21 \
+   --flag=use-network-uri
+}

diff --git a/dev-haskell/hackage-security/metadata.xml 
b/dev-haskell/hackage-security/metadata.xml
index

[gentoo-commits] repo/gentoo:master commit in: dev-haskell/cabal/

2021-03-15 Thread Sergei Trofimovich

commit: e22a1f7c6d9cc0525a374e9b257d200843472026
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Mar 15 21:06:57 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Mar 15 22:32:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e22a1f7c

dev-haskell/cabal: bump up to 3.2.1.0

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

 dev-haskell/cabal/Manifest|  1 +
 dev-haskell/cabal/cabal-3.2.1.0-r1.ebuild | 54 +++
 dev-haskell/cabal/metadata.xml|  8 -
 3 files changed, 55 insertions(+), 8 deletions(-)

diff --git a/dev-haskell/cabal/Manifest b/dev-haskell/cabal/Manifest
index d1a7a7a8108..ac7dbabfe31 100644
--- a/dev-haskell/cabal/Manifest
+++ b/dev-haskell/cabal/Manifest
@@ -1 +1,2 @@
 DIST Cabal-3.0.1.0.tar.gz 758808 BLAKE2B 
9a0cf7b055be4d6fa55c4dd44037263df54eff059cd22970383ffa1470317cdaeac8d81a521f8c48cf595fc22e64da031d508f6d2b58f32a613160b3e0cfcd67
 SHA512 
29a5ae9bad0398ab86c64cba9fb1ae3094d67013151a91c8c25b0e95b08d8fd683d1e85b064f7faf166966f855b261d2f131b727c82476a8514119a8922a6b06
+DIST Cabal-3.2.1.0.tar.gz 823331 BLAKE2B 
060f4808010f9eefd943312144c75e021bf02083c2a0805128da6c9b93da94ba13fe37cef1fbe27e41fe8a10610e088b923783f4b7bb57150532d3a3ea4a91fc
 SHA512 
279088a2ab9145efc03dbdd10941edcf6034137046ee3b659a8cf0ff075a03e3edff28fd01d432d39701c5a7e05a50b99cf8de95f05d3bd4e75edb3af0e3a598

diff --git a/dev-haskell/cabal/cabal-3.2.1.0-r1.ebuild 
b/dev-haskell/cabal/cabal-3.2.1.0-r1.ebuild
new file mode 100644
index 000..d18123f7001
--- /dev/null
+++ b/dev-haskell/cabal/cabal-3.2.1.0-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.7.
+#hackport: flags: -bundled-binary-generic
+
+# Drop test-suite due to "circular" dependencies with quickcheck
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+CABAL_FEATURES+=" nocabaldep" # in case installed Cabal is broken
+inherit haskell-cabal
+
+MY_PN="Cabal"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A framework for packaging Haskell software"
+HOMEPAGE="https://www.haskell.org/cabal/;
+SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz;
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" # ~ppc ~ppc64 ~ppc-macos 
~x86-macos ~x86-solaris
+IUSE=""
+
+RESTRICT=test # circular deps: cabal -> quickcheck -> cabal
+
+# GHC lower bound set to 8.0 to remove semigroups and fail dependencies.
+RDEPEND=" >=dev-haskell/mtl-2.1:=[profile?] =dev-haskell/parsec-3.1.13.0:=[profile?] 
=dev-haskell/text-1.2.3.0:=[profile?] =dev-lang/ghc-8.0:=
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+   default
+
+   # Cabal bootstraps with 'ghc --make' without package cleanup in 
environment.
+   # That causes module collisions at build:
+   # - pulseaudio: Distribution/Utils/Structured.hs:98:1: error: Ambiguous 
module name ‘Data.Time’: it was found in multiple packages: pulseaudio-0.0.2.1 
time-1.9.3
+   # - kinds: Distribution/Utils/Structured.hs:106:1: error: Ambiguous 
module name ‘Data.Kind’: it was found in multiple packages: base-4.14.1.0 
kinds-0.0.1.5
+   HCFLAGS="${HCFLAGS} -ignore-package=pulseaudio"
+   HCFLAGS="${HCFLAGS} -ignore-package=kinds"
+}
+
+src_configure() {
+   haskell-cabal_src_configure \
+   --flag=-bundled-binary-generic
+}
+
+CABAL_CORE_LIB_GHC_PV="PM:8.10.3 PM:8.10.4 PM:"

diff --git a/dev-haskell/cabal/metadata.xml b/dev-haskell/cabal/metadata.xml
index 97bee0727e4..b7878815d80 100644
--- a/dev-haskell/cabal/metadata.xml
+++ b/dev-haskell/cabal/metadata.xml
@@ -5,12 +5,4 @@
hask...@gentoo.org
Gentoo Haskell

-   
-   The Haskell Common Architecture for Building Applications and
-   Libraries: a framework defining a common interface for authors 
to more
-   easily build their Haskell applications in a portable way.
-   
-   The Haskell Cabal is part of a larger infrastructure for 
distributing,
-   organizing, and cataloging Haskell libraries and tools.
-

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

2021-03-15 Thread Sergei Trofimovich

commit: d6bcfd9a014f19c1f63d58ce035e686864983a10
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Mar 15 21:33:30 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Mar 15 22:33:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6bcfd9a

profiles/package.mask: mask dev-haskell/test-framework-th-prime for removal

Signed-off-by: Sergei Trofimovich  gentoo.org>

 profiles/package.mask | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index 591cb5b9c4e..3084a1d8d50 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,7 +33,13 @@
 #--- END OF EXAMPLES ---
 
 # Sergei Trofimovich  (2021-03-15)
-# Needs a port to ghc-8.10. No revdeps. Mask for removal.
+# Needs a port to ghc-8.10. No revdeps. Mask for removal
+# in a month.
+dev-haskell/test-framework-th-prime
+
+# Sergei Trofimovich  (2021-03-15)
+# Needs a port to ghc-8.10. No revdeps. Mask for removal
+# in a month.
 dev-haskell/encoding
 
 # Andreas Sturmlechner  (2021-03-15)

[gentoo-commits] repo/gentoo:master commit in: dev-haskell/language-lua/

2021-03-15 Thread Sergei Trofimovich

commit: e3d0212bf7569162a26e8c26c0c95dbd3c3a46e9
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Mar 15 21:41:39 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Mar 15 22:33:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3d0212b

dev-haskell/language-lua: allow ghc-8.10

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

 dev-haskell/language-lua/language-lua-0.11.0.1.ebuild | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/dev-haskell/language-lua/language-lua-0.11.0.1.ebuild 
b/dev-haskell/language-lua/language-lua-0.11.0.1.ebuild
index 7f916d15ee7..aec8100c465 100644
--- a/dev-haskell/language-lua/language-lua-0.11.0.1.ebuild
+++ b/dev-haskell/language-lua/language-lua-0.11.0.1.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
@@ -30,3 +30,10 @@ DEPEND="${RDEPEND}
dev-haskell/tasty-hunit
dev-haskell/tasty-quickcheck )
 "
+
+src_prepare() {
+   default
+
+   cabal_chdeps \
+   'base >= 4.5 && < 4.14' 'base >= 4.5'
+}

[gentoo-commits] repo/gentoo:master commit in: dev-games/goatee/

2021-03-15 Thread Sergei Trofimovich

commit: aa5f85226defc8cfa2ced0857b004fca782fd626
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Mar 15 19:36:57 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Mar 15 22:32:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa5f8522

dev-games/goatee: bump up to 0.4.0

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

 dev-games/goatee/Manifest|  1 +
 dev-games/goatee/goatee-0.4.0.ebuild | 26 ++
 dev-games/goatee/metadata.xml| 13 -
 3 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/dev-games/goatee/Manifest b/dev-games/goatee/Manifest
index b2881d985e1..584457f70e9 100644
--- a/dev-games/goatee/Manifest
+++ b/dev-games/goatee/Manifest
@@ -1 +1,2 @@
 DIST goatee-0.3.1.2.tar.gz 84576 BLAKE2B 
66eea2e0685279acadba0ae857786bc8bf5eec26d4856745f6a040ac220a824d02e7c9ccf36e38d81ad8a60e90972681f9e2ab2e5f67fa4af267e5f8bb5cc98c
 SHA512 
b8723679823dbb092346f8a6c556c3391888f004d609d6b61c73c9f590901abc5d4024d0ad4063692078637be0171d78e9a91c9436735423d597f310226ee9db
+DIST goatee-0.4.0.tar.gz 86585 BLAKE2B 
32d099fdc4acc66a89b8f17790a4c73d234e28e935f5c325a3dbcbd1c34edd24513a99eae5108f2bcd38ead402c209a4d09e2a57c65fb69c4dbd70a4f05903e7
 SHA512 
ccd53a3924528cb23ea58e5d9080ba2f6f10a3cb0b60d2f7a427f4be3d20cd9082466757394a82a63ccfd7cb13c1dc0d690084b66193ede0fe43e6ccf434706e

diff --git a/dev-games/goatee/goatee-0.4.0.ebuild 
b/dev-games/goatee/goatee-0.4.0.ebuild
new file mode 100644
index 000..2a66c208a01
--- /dev/null
+++ b/dev-games/goatee/goatee-0.4.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.7.
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A monadic take on a 2,500-year-old board game - library"
+HOMEPAGE="http://khumba.net/projects/goatee;
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz;
+
+LICENSE="AGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-haskell/mtl-2.1:=[profile?] =dev-haskell/parsec-3.1:=[profile?] =dev-lang/ghc-8.6.3:=
+"
+DEPEND="${RDEPEND}
+   >=dev-haskell/cabal-2.4.0.1
+   test? ( >=dev-haskell/hunit-1.2 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-   
-   ga...@gentoo.org
-   Gentoo Games Project
-   

hask...@gentoo.org
Gentoo Haskell

-   
-   Goatee is a Go library and game editor, written in Haskell.  It 
provides a
-   GUI for recording, studying, and editing game records.  
Underneath this is a
-   portable library for manipulating SGF files to build UIs and 
tools.  Goatee
-   aims to be full-featured by supporting all of the SGF spec and 
allowing for
-   full and easy customization of the game records you create.
-
-   This package is the shared library.
-

[gentoo-commits] repo/gentoo:master commit in: dev-haskell/th-utilities/

2021-03-15 Thread Sergei Trofimovich

commit: 84198d3f5003646cb57df15075bdb7705b247d9c
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Mar 15 19:42:55 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Mar 15 22:32:56 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84198d3f

dev-haskell/th-utilities: bump up to 0.2.4.1

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

 dev-haskell/th-utilities/Manifest  |  1 +
 .../th-utilities/th-utilities-0.2.4.1.ebuild   | 30 ++
 2 files changed, 31 insertions(+)

diff --git a/dev-haskell/th-utilities/Manifest 
b/dev-haskell/th-utilities/Manifest
index 57244e486db..76c6f5d1a4c 100644
--- a/dev-haskell/th-utilities/Manifest
+++ b/dev-haskell/th-utilities/Manifest
@@ -1 +1,2 @@
 DIST th-utilities-0.2.3.0.tar.gz 15577 BLAKE2B 
fad72515936ba6b7876ff731c7a1e12246014e191282028fc1bd1846dc704d4d1408e82e82a394a1f58350f961c5b7b7f5b9ae0cfbf09551fc5964433d42b113
 SHA512 
ee2ea3a9da44bd34cbf51d9f4ea14510eac9527f2f1a199390566e24f10ed84403f5450e47244b0cbfc4b5dc3a5c3f64ec596255f191d8bad83d9043a3ba
+DIST th-utilities-0.2.4.1.tar.gz 16134 BLAKE2B 
f8357f66c7d62f0fb902f933edb63a75474eea5bb90f80f192799ae0f2c3ce535d5888a53256331552661791277388b1cdae0bab472c3bb1d39bf79fe29f20b1
 SHA512 
b23272db62a0842af56efbc2f4cc0ebb8d0c900ecb3471fd2a984792da76ab57780d0960fa737fa0023dcd06e12b7585b586ae330005570046ba767101840d02

diff --git a/dev-haskell/th-utilities/th-utilities-0.2.4.1.ebuild 
b/dev-haskell/th-utilities/th-utilities-0.2.4.1.ebuild
new file mode 100644
index 000..9f840368975
--- /dev/null
+++ b/dev-haskell/th-utilities/th-utilities-0.2.4.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.7.
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Collection of useful functions for use with Template Haskell"
+HOMEPAGE="https://github.com/fpco/th-utilities#readme;
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz;
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/primitive:=[profile?]
+   dev-haskell/syb:=[profile?]
+   dev-haskell/text:=[profile?]
+   dev-haskell/th-orphans:=[profile?]
+   >=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+   >=dev-haskell/cabal-1.18.1.3
+   test? ( dev-haskell/hspec
+   dev-haskell/vector )
+"

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

2021-03-15 Thread Sergei Trofimovich

commit: 11877c508e1ba2f870d0b84b46ef1dcf13f98d42
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Mar 15 22:29:27 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Mar 15 22:33:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11877c50

profiles/package.mask: mask dev-haskell/network-protocol-xmpp for removal

Signed-off-by: Sergei Trofimovich  gentoo.org>

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

diff --git a/profiles/package.mask b/profiles/package.mask
index 3084a1d8d50..96c9d2f70ec 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -32,6 +32,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Sergei Trofimovich  (2021-03-15)
+# Needs a port to network-3. No revdeps. Mask for removal
+# in a month.
+dev-haskell/network-protocol-xmpp
+
 # Sergei Trofimovich  (2021-03-15)
 # Needs a port to ghc-8.10. No revdeps. Mask for removal
 # in a month.

[gentoo-commits] repo/gentoo:master commit in: dev-haskell/happstack-server/

2021-03-15 Thread Sergei Trofimovich

commit: 5ef7b6d83f0ae9eb84a6e04d84764f4b15ff8b7e
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Mar 15 21:10:44 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Mar 15 22:32:58 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ef7b6d8

dev-haskell/happstack-server: bump up to 7.6.1

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

 dev-haskell/happstack-server/Manifest  |  1 +
 .../happstack-server/happstack-server-7.6.1.ebuild | 55 ++
 2 files changed, 56 insertions(+)

diff --git a/dev-haskell/happstack-server/Manifest 
b/dev-haskell/happstack-server/Manifest
index b3efd76a4f9..8507f46b160 100644
--- a/dev-haskell/happstack-server/Manifest
+++ b/dev-haskell/happstack-server/Manifest
@@ -1 +1,2 @@
 DIST happstack-server-7.6.0.tar.gz 85715 BLAKE2B 
c4a673b6575a3131b29f00f4463431605bd26b469a366cbab3f87662b1e2c0ab43b4a6d205dec30ede009a71de38f27fcfcbd1ddf938ac1e4f419b1a31119c83
 SHA512 
cea814b470dd2d7a1dc3cf8a2724aa72e23f7832fc5292a7a1b3fbf8a6ef0980f13db777fadea3bdc5c9cb7dca7b35700ff2b94d6632ff7857a546a19ed1548f
+DIST happstack-server-7.6.1.tar.gz 84878 BLAKE2B 
5e146a317e41b039d24cac8dc41e7ebd707168193b5fc5cfe482ec53a3b31088438cffb5f91f741822e3ae1db19c98eaae6c1f0e012afebeebcda4182332bd1f
 SHA512 
e75bc986b16777563410ce42010a161790df5f5a575b253dac2a85ca7e724a9bf1a7485406f7235395d3a9adc3d8205dd3549fd718815390927aeed3c0b8a05e

diff --git a/dev-haskell/happstack-server/happstack-server-7.6.1.ebuild 
b/dev-haskell/happstack-server/happstack-server-7.6.1.ebuild
new file mode 100644
index 000..fd564869651
--- /dev/null
+++ b/dev-haskell/happstack-server/happstack-server-7.6.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.7.
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Web related tools and services"
+HOMEPAGE="http://happstack.com;
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz;
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+network-uri"
+
+RDEPEND=">=dev-haskell/base64-bytestring-1.0:=[profile?] 
=dev-haskell/blaze-html-0.5:=[profile?] 
=dev-haskell/hslogger-1.0.2:=[profile?]
+   dev-haskell/html:=[profile?]
+   >=dev-haskell/monad-control-0.3:=[profile?] 
=dev-haskell/mtl-2:=[profile?] =dev-haskell/semigroups-0.16:=[profile?]
+   >=dev-haskell/sendfile-0.7.1:=[profile?] 
=dev-haskell/system-filepath-0.3.1:=[profile?]
+   >=dev-haskell/text-0.10:=[profile?] =dev-haskell/threads-0.5:=[profile?]
+   >=dev-haskell/transformers-base-0.4:=[profile?] 
=dev-haskell/transformers-compat-0.3:=[profile?] 
=dev-haskell/utf8-string-0.3.4:=[profile?] 
=dev-lang/ghc-7.8.2:=
+   network-uri? ( >=dev-haskell/network-3.0.0:=[profile?] 
=dev-haskell/network-bsd-2.8.1:=[profile?] 
=dev-haskell/network-uri-2.6:=[profile?]

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

2021-03-15 Thread Sergei Trofimovich

commit: 66b6fd6c06fbb8f87f923fd938561ea2fb0c1840
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Mar 15 19:40:52 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Mar 15 22:32:56 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66b6fd6c

profiles/package.mask: mask dev-haskell/encoding for removal

Signed-off-by: Sergei Trofimovich  gentoo.org>

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

diff --git a/profiles/package.mask b/profiles/package.mask
index 96b5ad2161c..591cb5b9c4e 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -32,6 +32,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Sergei Trofimovich  (2021-03-15)
+# Needs a port to ghc-8.10. No revdeps. Mask for removal.
+dev-haskell/encoding
+
 # Andreas Sturmlechner  (2021-03-15)
 # Unmaintained for >1 year, blocking cleanup of deprecated libraries.
 # Succeeded by LXQt many years ago (see also: lxqt-base/lxqt-meta).

[gentoo-commits] repo/gentoo:master commit in: dev-haskell/cabal-install/, dev-haskell/cabal-install/files/

2021-03-15 Thread Sergei Trofimovich

commit: 270d5721400d5226738ebc04d07842e02f27fa32
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Mar 15 21:09:51 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Mar 15 22:32:58 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=270d5721

dev-haskell/cabal-install: bump up to 3.2.0.0

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

 dev-haskell/cabal-install/Manifest |  1 +
 .../cabal-install/cabal-install-3.2.0.0.ebuild | 74 ++
 .../files/cabal-install-3.2.0.0-rankntypes.patch   | 11 
 3 files changed, 86 insertions(+)

diff --git a/dev-haskell/cabal-install/Manifest 
b/dev-haskell/cabal-install/Manifest
index b2cccfa8c91..7a714dca594 100644
--- a/dev-haskell/cabal-install/Manifest
+++ b/dev-haskell/cabal-install/Manifest
@@ -1 +1,2 @@
 DIST cabal-install-3.0.0.0.tar.gz 654045 BLAKE2B 
5036948651098b83f073b5ce29e2aaa31e4382f07e8b1e79d206889bd9c74fb88789f4b1cbb3bddc6d03375a6e3a3e164d6bda4ea19e3f944904ab11d7693fce
 SHA512 
0b15313fc11bc6b6018e01b6a3a65242306977c16ce9333ea1191c1ce0020b180451235a7a65b47bc01791e05d1b246bf9d573fc7e981a46fcfc7da0fed04cca
+DIST cabal-install-3.2.0.0.tar.gz 632084 BLAKE2B 
55cdbddebed17489f1c031bd867de7868878aa289193b826dd8274860e4f08d48f71cad33af1b62da16f71629ae4ff5745c3ceeada1680dbcc222793eba49a06
 SHA512 
ad937b2df42b688e4608aa2b91a25daf1042e5573626202e5182cbfeca9acc5933194853405a6396c60d0d28d6d0d5c5276fd85cb6acf4be2c8cd12afe747062

diff --git a/dev-haskell/cabal-install/cabal-install-3.2.0.0.ebuild 
b/dev-haskell/cabal-install/cabal-install-3.2.0.0.ebuild
new file mode 100644
index 000..085a26c438f
--- /dev/null
+++ b/dev-haskell/cabal-install/cabal-install-3.2.0.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.5.
+# hackport: flags: 
-debug-conflict-sets,-debug-expensive-assertions,-debug-tracetree
+CABAL_FEATURES=""
+inherit haskell-cabal
+
+DESCRIPTION="The command-line interface for Cabal and Hackage"
+HOMEPAGE="https://www.haskell.org/cabal/;
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz;
+
+LICENSE="BSD"
+SLOT="0"
+# keep in sync with ghc-8.10
+KEYWORDS="~amd64 ~x86"
+IUSE="+native-dns"
+
+RDEPEND=">=dev-haskell/async-2.0:= =dev-haskell/base16-bytestring-0.1.1:= 
=dev-haskell/cabal-3.2:= =dev-haskell/cryptohash-sha256-0.11:= 
=dev-haskell/echo-0.1.3:= =dev-haskell/edit-distance-0.2.2:= =dev-haskell/fail-4.9:= =dev-haskell/hackage-security-0.6.0.0:= 
=dev-haskell/hashable-1.0:= =dev-haskell/http-4000.1.5:= =dev-haskell/lukko-0.1:= =dev-haskell/mtl-2.0:= =dev-haskell/network-2.6:= =dev-haskell/network-uri-2.6.0.2:= =dev-haskell/parsec-3.1.13.0:= =dev-haskell/random-1:= =dev-haskell/semigroups-0.18.3:= =dev-haskell/stm-2.0:= =dev-haskell/tar-0.5.0.3:= =dev-haskell/text-1.2.3:= =dev-haskell/zlib-0.5.3:= =dev-lang/ghc-7.10.1:=
+   native-dns? ( >=dev-haskell/resolv-0.1.1:= = 4.8  && < 4.14' 'base   >= 4.8'
+   #if use noprefs; then
+   #   epatch "${FILESDIR}/${PN}"-0.13.3-nopref.patch
+   #fi
+
+   # no chance to link to -threaded on ppc64, alpha and others
+   # who use UNREG, not only ARM
+   if ! ghc-supports-threaded-runtime; then
+   cabal_chdeps '-threaded' ' '
+   fi
+   eapply_user
+}
+
+src_configure() {
+   haskell-cabal_src_configure \
+   --flags=-debug-conflict-sets \
+   --flags=-debug-expensive-assertions \
+   --flags=-debug-tracetree \
+   $(cabal_flag native-dns native-dns)
+}

diff --git 
a/dev-haskell/cabal-install/files/cabal-install-3.2.0.0-rankntypes.patch 
b/dev-haskell/cabal-install/files/cabal-install-3.2.0.0-rankntypes.patch
new file mode 100644
index 000..fa98278a277
--- /dev/null
+++ b/dev-haskell/cabal-install/files/cabal-install-3.2.0.0-rankntypes.patch
@@ -0,0 +1,11 @@
+diff --git a/Distribution/Client/Sandbox.hs b/Distribution/Client/Sandbox.hs
+index 66b415d..6aa71bb 100644
+--- a/Distribution/Client/Sandbox.hs
 b/Distribution/Client/Sandbox.hs
+@@ -1,5 +1,6 @@
+ {-# LANGUAGE CPP #-}
+ {-# LANGUAGE FlexibleContexts #-}
++{-# LANGUAGE RankNTypes #-}
+ -
+ -- |
+ -- Module  :  Distribution.Client.Sandbox

[gentoo-commits] repo/gentoo:master commit in: dev-haskell/syb-with-class/

2021-03-15 Thread Sergei Trofimovich

commit: 6d316c685b205294a69d52f66744388006944876
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Mar 15 19:35:57 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Mar 15 22:32:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d316c68

dev-haskell/syb-with-class: bump up to 0.6.1.13

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

 dev-haskell/syb-with-class/Manifest|  1 +
 .../syb-with-class/syb-with-class-0.6.1.13.ebuild  | 25 ++
 2 files changed, 26 insertions(+)

diff --git a/dev-haskell/syb-with-class/Manifest 
b/dev-haskell/syb-with-class/Manifest
index 24ffcc42bf9..f723a6aa900 100644
--- a/dev-haskell/syb-with-class/Manifest
+++ b/dev-haskell/syb-with-class/Manifest
@@ -1 +1,2 @@
 DIST syb-with-class-0.6.1.11.tar.gz 13225 BLAKE2B 
3c7f25fb942025284bbfba49edc7b16ae04716e42337e8668188a80a193b05a06252a29ac2244a35fa25992bc23d7fa998ddaadb85f017112f903cffb89d4fba
 SHA512 
962eb1bcb63ce7cc1789996ad7191e3ab7c20f3c90828fb3535306ca8509ac210e70f42ebd6ac6fc075d50cc5c5e1c15bb735b5d6040c6348dc82453809330f9
+DIST syb-with-class-0.6.1.13.tar.gz 13225 BLAKE2B 
a218611f332037968513b3706bc35e903f335477fa490f0c709f085014e833f1969851a74ae0d2a40c6a085c9aec1bbd963a48d4362963d3a89fe8e399a790fc
 SHA512 
40082f8b97ae49929fb2b686a840656fd2a62936ddc4873f3af4bdfe128e213dff509185e412c3c58bd48ec32abcade8ed68dd257d221bb08f9d20433067f371

diff --git a/dev-haskell/syb-with-class/syb-with-class-0.6.1.13.ebuild 
b/dev-haskell/syb-with-class/syb-with-class-0.6.1.13.ebuild
new file mode 100644
index 000..7bd577793d3
--- /dev/null
+++ b/dev-haskell/syb-with-class/syb-with-class-0.6.1.13.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.7.
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Scrap Your Boilerplate With Class"
+HOMEPAGE="https://hackage.haskell.org/package/syb-with-class;
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz;
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+   >=dev-haskell/cabal-1.10
+   test? ( dev-haskell/hunit )
+"

[gentoo-commits] repo/gentoo:master commit in: dev-haskell/alex-tools/

2021-03-15 Thread Sergei Trofimovich

commit: 8edaa384022ab967f75bc59382b299c26eaa7368
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Mar 15 19:32:58 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Mar 15 22:32:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8edaa384

dev-haskell/alex-tools: allow ghc-8.10

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

 dev-haskell/alex-tools/alex-tools-0.4.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-haskell/alex-tools/alex-tools-0.4.ebuild 
b/dev-haskell/alex-tools/alex-tools-0.4.ebuild
index d33a9a66b59..f1f30eb55b2 100644
--- a/dev-haskell/alex-tools/alex-tools-0.4.ebuild
+++ b/dev-haskell/alex-tools/alex-tools-0.4.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
@@ -29,5 +29,5 @@ src_prepare() {
 
cabal_chdeps \
'base >=4.7 && <4.12' 'base >=4.7' \
-   'template-haskell >=2.9.0 && <2.14' 'template-haskell >=2.9.0 
&& <2.16'
+   'template-haskell >=2.9.0 && <2.14' 'template-haskell >=2.9.0'
 }

[gentoo-commits] repo/gentoo:master commit in: games-board/goatee-gtk/

2021-03-15 Thread Sergei Trofimovich

commit: 905dd1f2d0b851d589a3ebd344d04451e7657291
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Mar 15 19:37:47 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Mar 15 22:32:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=905dd1f2

games-board/goatee-gtk: bump up to 0.4.0

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

 games-board/goatee-gtk/Manifest|  1 +
 games-board/goatee-gtk/goatee-gtk-0.4.0.ebuild | 30 ++
 games-board/goatee-gtk/metadata.xml| 13 ---
 3 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/games-board/goatee-gtk/Manifest b/games-board/goatee-gtk/Manifest
index 352677c37fd..6b882940361 100644
--- a/games-board/goatee-gtk/Manifest
+++ b/games-board/goatee-gtk/Manifest
@@ -1 +1,2 @@
 DIST goatee-gtk-0.3.1.1.tar.gz 60560 BLAKE2B 
f58420c1b625b0be47da43ea006cbe68d465ed2ed44e640ad7ffd9f17d738f612321c42bb9bbf76404b1bfd91ae4baee73381881e5185afe653dd10992417dfc
 SHA512 
d745e981171fb1267d4765d90e4906b51a0cd7e7e3804c7f418feea21cc6f047e5e4e70f86f3ed3abbe11800e91ecd4669d566c194ad9b340941e509e6061f70
+DIST goatee-gtk-0.4.0.tar.gz 60655 BLAKE2B 
628a43c4e55f7d5d16052a798c5bf7b829aca08a0c27ae176548dbb908508cb5d8bb24d3ee48d8fc8a96e89b59200672a0ed1ab6d811312c7949cbaec4353fb0
 SHA512 
cb95f2703d21b83e86a5a31ec2a9896170a18e8e7660c657f72e85779af92beb07dea015f3608a6bab58d2ce745f6338a0a7e8c03f46f300bf357d5392672b68

diff --git a/games-board/goatee-gtk/goatee-gtk-0.4.0.ebuild 
b/games-board/goatee-gtk/goatee-gtk-0.4.0.ebuild
new file mode 100644
index 000..16c70308b22
--- /dev/null
+++ b/games-board/goatee-gtk/goatee-gtk-0.4.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.7.
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A monadic take on a 2,500-year-old board game - GTK+ UI"
+HOMEPAGE="http://khumba.net/projects/goatee;
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz;
+
+LICENSE="AGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-games/goatee-0.4:=[profile?] =dev-haskell/cairo-0.13:=[profile?] =dev-haskell/glib-0.13:=[profile?] =dev-haskell/gtk-0.13:=[profile?] =dev-haskell/mtl-2.1:=[profile?] =dev-haskell/parsec-3.1:=[profile?] =dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+   >=dev-haskell/cabal-2.2.0.1
+   test? ( >=dev-haskell/hunit-1.2 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-   
-   ga...@gentoo.org
-   Gentoo Games Project
-   

hask...@gentoo.org
Gentoo Haskell

-   
-   Goatee is a Go library and game editor, written in Haskell.  It 
provides a
-   GUI for recording, studying, and editing game records.  
Underneath this is a
-   portable library for manipulating SGF files to build UIs and 
tools.  Goatee
-   aims to be full-featured by supporting all of the SGF spec and 
allowing for
-   full and easy customization of the game records you create.
-
-   This package is the GTK+ UI.
-

[gentoo-commits] repo/gentoo:master commit in: dev-haskell/gtk2hs-buildtools/files/, dev-haskell/gtk2hs-buildtools/

2021-03-15 Thread Sergei Trofimovich

commit: 885d1e4a0d09e6316a0c98fa8c983751fb0864a7
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Mar 15 19:32:10 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Mar 15 22:32:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=885d1e4a

dev-haskell/gtk2hs-buildtools: allow gcc-11

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

 .../files/gtk2hs-buildtools-0.13.8.0-gcc-11.patch  | 32 +++
 .../gtk2hs-buildtools-0.13.8.0-r1.ebuild   | 37 ++
 2 files changed, 69 insertions(+)

diff --git 
a/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.13.8.0-gcc-11.patch 
b/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.13.8.0-gcc-11.patch
new file mode 100644
index 000..123c1359ff1
--- /dev/null
+++ 
b/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.13.8.0-gcc-11.patch
@@ -0,0 +1,32 @@
+Same fix as https://github.com/visq/language-c/issues/74
+
+"""
+Lexer: allow zeros as line numbers in preprocessed directives
+
+Starting from `gcc-11` initial line numbers not related to
+actual files are marked as zeros. See the "preprocessor:
+Better line info for  & "
+https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=6bf2ff0d52a9
+
+language-c's grammar did not allow it (by accident)
+
+```
+Prelude> Language.C.parseC (Data.ByteString.Char8.pack "# 0 \"/dev/null\"\n") 
Language.C.nopos
+Left :: [ERROR]  >>> Syntax Error !
+  Lexical error !
+  The character '#' does not fit here.
+```
+
+The change allows '0' in line numbers as well.
+"""
+--- a/c2hs/c/CLexer.x
 b/c2hs/c/CLexer.x
+@@ -130,7 +130,7 @@ $white+;
+ --  * allows further ints after the file name a la GCC; as the GCC CPP docu
+ --   doesn't say how many ints there can be, we allow an unbound number
+ --
+-\#$space*@int$space*(\"($infname|@charesc)*\"$space*)?(@int$space*)*$eol
++\#$space*@digits$space*(\"($infname|@charesc)*\"$space*)?(@int$space*)*$eol
+   { \pos len str -> setPos (adjustPos (take len str) pos) >> lexToken }
+ 
+ -- #pragma directive (K A12.8)

diff --git a/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.8.0-r1.ebuild 
b/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.8.0-r1.ebuild
new file mode 100644
index 000..30ffca890e9
--- /dev/null
+++ b/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.8.0-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Tools to build the Gtk2Hs suite of User Interface libraries"
+HOMEPAGE="http://projects.haskell.org/gtk2hs/;
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+closuresignals"
+
+RDEPEND=">=dev-haskell/cabal-1.24.0.0:=[profile?]
+   dev-haskell/fail:=[profile?]
+   dev-haskell/hashtables:=[profile?]
+   dev-haskell/random:=[profile?]
+   >=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+   dev-haskell/alex
+   >=dev-haskell/cabal-1.18.1.3
+   dev-haskell/happy
+"
+
+PATCHES=("${FILESDIR}"/${PN}-0.13.8.0-gcc-11.patch)
+
+src_configure() {
+   haskell-cabal_src_configure \
+   $(cabal_flag closuresignals closuresignals)
+}

[gentoo-commits] repo/gentoo:master commit in: dev-haskell/punycode/

2021-03-15 Thread Sergei Trofimovich

commit: 2f392b56328e7618b4e07eef16840a396bdbdc1b
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Mar 15 19:39:38 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Mar 15 22:32:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f392b56

dev-haskell/punycode: disable tests

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

 dev-haskell/punycode/punycode-2.0.ebuild | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/dev-haskell/punycode/punycode-2.0.ebuild 
b/dev-haskell/punycode/punycode-2.0.ebuild
index 5bf0e711c37..064e6d0602d 100644
--- a/dev-haskell/punycode/punycode-2.0.ebuild
+++ b/dev-haskell/punycode/punycode-2.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 # ebuild generated by hackport 0.3.2.
 
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="Encode unicode strings to ascii forms according to RFC 3492"
@@ -17,15 +17,15 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RESTRICT=test # runs slow, finds error
+RESTRICT=test # runs slow, finds error.
 
 RDEPEND="dev-haskell/cereal:=[profile?]
dev-haskell/mtl:=[profile?]
dev-haskell/text:=[profile?]
>=dev-lang/ghc-6.10.4:="
 DEPEND="${RDEPEND}
-   >=dev-haskell/cabal-1.8
-   test? ( dev-haskell/encoding
-   dev-haskell/hunit
-   dev-haskell/quickcheck
-   )"
+   >=dev-haskell/cabal-1.8"
+   # test? ( dev-haskell/encoding
+   #   dev-haskell/hunit
+   #   dev-haskell/quickcheck
+   # )"

[gentoo-commits] repo/gentoo:master commit in: dev-haskell/cairo/

2021-03-15 Thread Sergei Trofimovich

commit: d2017b411c8bffdd569d7826ee8080114aafc73d
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Mar 15 19:31:11 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Mar 15 22:32:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2017b41

dev-haskell/cairo: bump up to 0.13.8.1

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

 dev-haskell/cairo/Manifest  |  1 +
 dev-haskell/cairo/cairo-0.13.8.1.ebuild | 38 +
 2 files changed, 39 insertions(+)

diff --git a/dev-haskell/cairo/Manifest b/dev-haskell/cairo/Manifest
index 455b6b4e17a..409bdd94847 100644
--- a/dev-haskell/cairo/Manifest
+++ b/dev-haskell/cairo/Manifest
@@ -1 +1,2 @@
 DIST cairo-0.13.6.1.tar.gz 53029 BLAKE2B 
8363b436271bc1666116819d9ac39297e3a8c61e18ef7758e188e194a1a51fd8a335d61707cecc5f5d240fcf1f4c71add7be945ec8686e80b36de97c88ecfda6
 SHA512 
e268d27298c2b274eb12555ff67e4abb175a1269ed3087b9a5cf1a128252d8d390e3ef393e76f27b857558451fb0a137f4f44e095053a9ca20159a332b8878ef
+DIST cairo-0.13.8.1.tar.gz 53026 BLAKE2B 
a05302d41bda35d3864b675e08b9bc296a218d528d3f2ecda34325650cde67a127cb1d21f2bd8d92dfa9a5e768ff6e622a585b81ac5897d86b9d89227af8dda4
 SHA512 
9c4ec738fe6e335f635c3fa47a26edb9264ec5a9713ff8c0109f2cf321e21331009402d3715321b63f5423e32ad90a0dd3ca9ca83544d554be5463c9784ab727

diff --git a/dev-haskell/cairo/cairo-0.13.8.1.ebuild 
b/dev-haskell/cairo/cairo-0.13.8.1.ebuild
new file mode 100644
index 000..174a94c5d10
--- /dev/null
+++ b/dev-haskell/cairo/cairo-0.13.8.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.
+#hackport: flags: cairo_ps:postscript,cairo_pdf:pdf,cairo_svg:svg
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Binding to the Cairo library"
+HOMEPAGE="http://projects.haskell.org/gtk2hs/;
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz;
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+pdf +postscript +svg"
+
+RDEPEND="dev-haskell/mtl:=[profile?]
+   >=dev-haskell/text-1.0.0.0:=[profile?] =dev-haskell/utf8-string-0.2:=[profile?] 
=dev-lang/ghc-7.10.1:=
+   x11-libs/cairo
+"
+DEPEND="${RDEPEND}
+   >=dev-haskell/cabal-1.24 =dev-haskell/gtk2hs-buildtools-0.13.2.0

[gentoo-commits] repo/gentoo:master commit in: dev-haskell/ekg-core/

2021-03-15 Thread Sergei Trofimovich

commit: c070e834e0c6a50de15e903f2501ecdcea5e4b38
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Mar 15 21:30:09 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Mar 15 22:32:59 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c070e834

dev-haskell/ekg-core: bump up to 0.1.1.7

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

 dev-haskell/ekg-core/Manifest|  1 +
 dev-haskell/ekg-core/ekg-core-0.1.1.7.ebuild | 34 
 2 files changed, 35 insertions(+)

diff --git a/dev-haskell/ekg-core/Manifest b/dev-haskell/ekg-core/Manifest
index 32de9f5e2ac..ee8ecbb18e1 100644
--- a/dev-haskell/ekg-core/Manifest
+++ b/dev-haskell/ekg-core/Manifest
@@ -1 +1,2 @@
 DIST ekg-core-0.1.1.6.tar.gz 13454 BLAKE2B 
994e8e6395a9a298dcd6b48a4a122e449fc23fb6944f0565632308d3445825beb1f5177ea2debc4ca409e0d957b1cbfa3190347ed2e973e306a7c1637703f789
 SHA512 
5a654b6a036300234fc2a65acfee05703772581e0cb646f5462196ce8f30695f7838c34f01b6d840aa1999babe4d9d9b01c3d9b7cc199a1a9112b1792b08927d
+DIST ekg-core-0.1.1.7.tar.gz 13612 BLAKE2B 
d630fca0277890b6798c28ae83339d4de8491439edbe1ffbdb09177d382b9e3bb2f2ff43c12741061ae78e8c7e2b8bf499bb5748721df3378b3e78d19a5004bb
 SHA512 
68915d62d7851ff99877a478b948ed119462883463949f551a0d94efa60209f734af0578b1437fcefead3e2cc80570d1a844f6be3b5b90b2fc804f9c85aaca90

diff --git a/dev-haskell/ekg-core/ekg-core-0.1.1.7.ebuild 
b/dev-haskell/ekg-core/ekg-core-0.1.1.7.ebuild
new file mode 100644
index 000..18d209e7e28
--- /dev/null
+++ b/dev-haskell/ekg-core/ekg-core-0.1.1.7.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Tracking of system metrics"
+HOMEPAGE="https://github.com/tibbe/ekg-core;
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz;
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="=dev-lang/ghc-7.6.2:=
+"
+DEPEND="${RDEPEND}
+   >=dev-haskell/cabal-1.18
+"
+
+src_prepare() {
+   default
+
+   cabal_chdeps \
+   'base >= 4.6 && < 4.14' 'base >= 4.6' \
+   'ghc-prim < 0.6' 'ghc-prim'
+}

[gentoo-commits] repo/gentoo:master commit in: dev-haskell/hoauth2/

2021-03-15 Thread Sergei Trofimovich

commit: 0fecc1bb27f43bec03373c08c8ad205956c4b995
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Mar 15 21:31:25 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Mar 15 22:32:59 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fecc1bb

dev-haskell/hoauth2: bump up to 1.16.0

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

 dev-haskell/hoauth2/Manifest  |  1 +
 dev-haskell/hoauth2/hoauth2-1.16.0.ebuild | 40 +++
 2 files changed, 41 insertions(+)

diff --git a/dev-haskell/hoauth2/Manifest b/dev-haskell/hoauth2/Manifest
index 53cf80a49e4..9af62005808 100644
--- a/dev-haskell/hoauth2/Manifest
+++ b/dev-haskell/hoauth2/Manifest
@@ -1 +1,2 @@
 DIST hoauth2-1.11.0.tar.gz 18270 BLAKE2B 
8258e8e7a1bfe12ca0da09297c18354617cb525aee70418a85a56cd5421b4695aa22861e1368fbd2d0ac11ff155fd4cebb8d220ebc4b1f7c3403268682e11e95
 SHA512 
179c97045f33da6f6cb4c153b9be3482031ce8a150ad70defcbbbfa3c67ff10b31c86c45d845aa605b9c4d3ac921f4372bcd49fbb384e0c78409219bc0bf1607
+DIST hoauth2-1.16.0.tar.gz 18479 BLAKE2B 
ca9aa0d35d3bfb9ee3a9cbe62c2ecb1a0efd109c89600642a062fbcbe62cefae53f4810b38eb55b81c29c72e4b80aca8f746966ccbaf17ecc83883e2f6fc3528
 SHA512 
fe42759c2ccaf035bfa15d9276a7c8bf6608a7b74732c6950c2081616196296a73c34474989c1eda5fcfc15066626e1facf2f58b6977d5e00520290948731cb6

diff --git a/dev-haskell/hoauth2/hoauth2-1.16.0.ebuild 
b/dev-haskell/hoauth2/hoauth2-1.16.0.ebuild
new file mode 100644
index 000..ebe4fd23f0a
--- /dev/null
+++ b/dev-haskell/hoauth2/hoauth2-1.16.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.7.
+#hackport: flags: -test
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Haskell OAuth2 authentication client"
+HOMEPAGE="https://github.com/freizl/hoauth2;
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz;
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/aeson-1.3.0.0:=[profile?] 
=dev-haskell/binary-0.8.3:=[profile?]
+   >=dev-haskell/exceptions-0.8.3:=[profile?] 
=dev-haskell/http-conduit-2.1:=[profile?] 
=dev-haskell/http-types-0.11:=[profile?] 
=dev-haskell/microlens-0.4.0:=[profile?] 
=dev-haskell/text-0.11:=[profile?] =dev-haskell/unordered-containers-0.2.5:=[profile?]
+   >=dev-haskell/uri-bytestring-0.2.3.1:=[profile?] 
=dev-haskell/uri-bytestring-aeson-0.1:=[profile?] 
=dev-lang/ghc-8.0.1:=
+"
+DEPEND="${RDEPEND}
+   >=dev-haskell/cabal-2.4
+"
+
+src_configure() {
+   haskell-cabal_src_configure \
+   --flag=-test
+}

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/agda/

2021-03-15 Thread Sergei Trofimovich

commit: 332ed48e88b914b4122704fe8c501293ce403a3c
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Mar 15 19:34:46 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Mar 15 22:32:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=332ed48e

sci-mathematics/agda: allow ghc-8.10.4

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

 sci-mathematics/agda/agda-2.6.1.2.ebuild | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sci-mathematics/agda/agda-2.6.1.2.ebuild 
b/sci-mathematics/agda/agda-2.6.1.2.ebuild
index 3468e60ca04..a2a59db413d 100644
--- a/sci-mathematics/agda/agda-2.6.1.2.ebuild
+++ b/sci-mathematics/agda/agda-2.6.1.2.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
@@ -81,6 +81,9 @@ src_prepare() {
-i "${S}/${MY_PN}.cabal" \
|| die "Could not remove agda-mode from ${MY_PN}.cabal"
fi
+
+   cabal_chdeps \
+   'if impl(ghc >= 8.6.4) && impl(ghc < 8.10.3)' 'if impl(ghc >= 
8.6.4) && impl(ghc < 8.11.0)'
 }
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: dev-haskell/test-framework-th-prime/

2021-03-15 Thread Sergei Trofimovich

commit: bd4ee8b1c4ca856978b77b4713ebc114b8f06a6b
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Mar 15 19:33:47 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Mar 15 22:32:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd4ee8b1

dev-haskell/test-framework-th-prime: bump up to 0.0.10

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

 dev-haskell/test-framework-th-prime/Manifest   |  1 +
 .../test-framework-th-prime-0.0.10.ebuild  | 27 ++
 2 files changed, 28 insertions(+)

diff --git a/dev-haskell/test-framework-th-prime/Manifest 
b/dev-haskell/test-framework-th-prime/Manifest
index 738606e3c15..b25ec481530 100644
--- a/dev-haskell/test-framework-th-prime/Manifest
+++ b/dev-haskell/test-framework-th-prime/Manifest
@@ -1 +1,2 @@
+DIST test-framework-th-prime-0.0.10.tar.gz 4035 BLAKE2B 
44c0f454ec4018f8aeccc9e7eec33c25778d05e257ce910dd779ac6bbb2acf1d4b54a897d0625e78308def417f1aa1b77194fba353802f2fce7a6e954dea3fbb
 SHA512 
91298214c134821b298270c2770cab284131787a40293c01dba2e88a58f355d6811dea06bf14f237fea5d4aa80987790405644bc09ad64a4d7b4574e2bca97eb
 DIST test-framework-th-prime-0.0.9.tar.gz 3908 BLAKE2B 
4c8794bf66081ffd6eee2b6f0e9d8fd5f2218a90c2522398b13f440aade1244a62e91c3c1e11367f109babd2e78722d94beaac9be356ce55f25d118adfa3
 SHA512 
52f64b1705d51f45512da4270d8a80c93602d62a2c33eb3a0146f10a3f737395c9d0294af62cc3ff859dc8292338df892c0262216349109bb4f7b0beb09d3601

diff --git 
a/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.10.ebuild 
b/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.10.ebuild
new file mode 100644
index 000..f0c62e9157c
--- /dev/null
+++ b/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.10.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.7.
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Template Haskell for test framework"
+HOMEPAGE="https://hackage.haskell.org/package/test-framework-th-prime;
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz;
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/cpphs-0.2.1:=[profile?]
+   dev-haskell/haskell-src-exts:=[profile?]
+   dev-haskell/test-framework:=[profile?]
+   >=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+   >=dev-haskell/cabal-1.6
+"

[gentoo-commits] repo/gentoo:master commit in: dev-haskell/text/

2021-03-15 Thread Sergei Trofimovich

commit: 38c3b6355ab9a47a4de16d12dcc7444e72fbb056
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Mar 14 09:12:17 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Mar 15 22:32:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38c3b635

dev-haskell/text: bump up to 1.2.4.1_rc1

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

 dev-haskell/text/Manifest|  1 +
 dev-haskell/text/text-1.2.4.1_rc1.ebuild | 42 
 2 files changed, 43 insertions(+)

diff --git a/dev-haskell/text/Manifest b/dev-haskell/text/Manifest
index fe114558e9c..164a169d083 100644
--- a/dev-haskell/text/Manifest
+++ b/dev-haskell/text/Manifest
@@ -1 +1,2 @@
 DIST text-1.2.4.0.tar.gz 171477 BLAKE2B 
29bb6738f5c61e13b218cc57cb0c900fce25ecad190315aea4b0a92d5200e2d54aeeae26c8dfc88ddc74706549b820272fdb3877330c8e1e5bd119cac99deef3
 SHA512 
a4bd566c7d0aea1bfeacf27332e9cff3ad894e7eed9f826b7e4fc7fb85e272164d18a34a81c89dd1ea802951a80ec1d82000ebef05748d419ddfff792c4525e3
+DIST text-1.2.4.1_rc1.tar.gz 166148 BLAKE2B 
c79bbd90c9ccf99668d5a4f0e66b4c75fa7a531d9851355be8a9d859d99578d2e22977ee9514f1743927a8a4fa49d29c252abc39509dd0b6d09bffd96e1f5289
 SHA512 
27d014d6b870e6cba16ac4a0ac146872d89c363ad1ca786642554bde0cf3ae4876d69ba8dd2655bbdcb88076bf4f5e13b45929ff86cd2bd90d24e607ad7221c6

diff --git a/dev-haskell/text/text-1.2.4.1_rc1.ebuild 
b/dev-haskell/text/text-1.2.4.1_rc1.ebuild
new file mode 100644
index 000..6da0fe1d6e7
--- /dev/null
+++ b/dev-haskell/text/text-1.2.4.1_rc1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.
+#hackport: flags: -bytestring-builder,-developer
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # broken test-suite
+# break circular dependencies:
+# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
+CABAL_FEATURES+=" nocabaldep"
+inherit haskell-cabal
+
+MY_PV="$(ver_rs 4 -)"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="An efficient packed Unicode text type"
+HOMEPAGE="https://github.com/haskell/text;
+SRC_URI="https://github.com/haskell/${PN}/archive/v${MY_PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+# keep in sync with ghc-8.10.3
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+# break cyclic dependencies, test suite requires porting to >=QC-2.11
+RESTRICT=test
+RDEPEND=">=dev-lang/ghc-8.10.3:="
+
+DEPEND="${RDEPEND}
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CABAL_CORE_LIB_GHC_PV="PM:8.10.3 PM:8.10.4 PM:"
+
+src_configure() {
+   haskell-cabal_src_configure \
+   --flag=-bytestring-builder \
+   --flag=-developer
+}

[gentoo-commits] repo/gentoo:master commit in: dev-haskell/haddock-api/, dev-haskell/haddock-api/files/

2021-03-15 Thread Sergei Trofimovich

commit: e4d79c149e867ad4e3deff96032c6a14cca368cd
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Mar 14 09:56:33 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Mar 15 22:32:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4d79c14

dev-haskell/haddock-api: bump up to 2.24.0

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

 dev-haskell/haddock-api/Manifest   |   1 +
 .../files/haddock-api-2.24.0-ghc-8.10.2.patch  | 147 +
 dev-haskell/haddock-api/haddock-api-2.24.0.ebuild  |  39 ++
 3 files changed, 187 insertions(+)

diff --git a/dev-haskell/haddock-api/Manifest b/dev-haskell/haddock-api/Manifest
index 3e5c5f97313..de50c543982 100644
--- a/dev-haskell/haddock-api/Manifest
+++ b/dev-haskell/haddock-api/Manifest
@@ -1 +1,2 @@
 DIST haddock-api-2.23.1.tar.gz 200096 BLAKE2B 
0635881e198c1df3690f07185da7cc49f8eb92283d99c581756c86fb9f293b28608ac3eea9090abcc3afa12c646e584939df9b8c38b4844e9c462824426019f5
 SHA512 
fb7826102476a3f292da336f8f16c7a647df7c4432bed905815509fff0df164255c0856cc17663bb42479114ed9a418e6bcd214fb8594b245d401c9e091ac4ef
+DIST haddock-api-2.24.0.tar.gz 200478 BLAKE2B 
5c4f7be45066583e3d3afa0b1866070f2c05d71685526b0d915461f75208f13cf6bbf2b91cc820e1f229df9dbf240cfef150fb3a9929878cfdc02db9dc124c99
 SHA512 
dfbe5bcfd722dc92ec70aca2dd681da9e122f60ec3da5c9583c188f65b11bade314c64d4af1a3a51cf8f618d8bea943bd4052aa9860ece38ab10717b484ed057

diff --git a/dev-haskell/haddock-api/files/haddock-api-2.24.0-ghc-8.10.2.patch 
b/dev-haskell/haddock-api/files/haddock-api-2.24.0-ghc-8.10.2.patch
new file mode 100644
index 000..84c275fbb34
--- /dev/null
+++ b/dev-haskell/haddock-api/files/haddock-api-2.24.0-ghc-8.10.2.patch
@@ -0,0 +1,147 @@
+From e455bc18e15adf05a1f32bc7c4512eedb7ab889f Mon Sep 17 00:00:00 2001
+From: Alex Biehl 
+Date: Tue, 8 Dec 2020 19:42:52 +0100
+Subject: [PATCH 1/2] Changes for GHC#17566
+
+See https://gitlab.haskell.org/ghc/ghc/merge_requests/2469
+---
+ haddock-api/src/Haddock/Backends/LaTeX.hs |  2 +-
+ haddock-api/src/Haddock/Backends/Xhtml.hs |  2 +-
+ .../src/Haddock/Backends/Xhtml/Decl.hs|  4 ++-
+ haddock-api/src/Haddock/GhcUtils.hs   | 29 +--
+ haddock-api/src/Haddock/Types.hs  |  1 +
+ 5 files changed, 32 insertions(+), 6 deletions(-)
+
+diff --git a/haddock-api/src/Haddock/Backends/LaTeX.hs 
b/haddock-api/src/Haddock/Backends/LaTeX.hs
+index 647812f93..024a6c513 100644
+--- a/src/Haddock/Backends/LaTeX.hs
 b/src/Haddock/Backends/LaTeX.hs
+@@ -255,7 +255,7 @@ declNames :: LHsDecl DocNameI
+  , [DocName]   --   names being declared
+  )
+ declNames (L _ decl) = case decl of
+-  TyClD _ d  -> (empty, [tcdName d])
++  TyClD _ d  -> (empty, [tcdNameI d])
+   SigD _ (TypeSig _ lnames _ ) -> (empty, map unLoc lnames)
+   SigD _ (PatSynSig _ lnames _) -> (text "pattern", map unLoc lnames)
+   ForD _ (ForeignImport _ (L _ n) _ _) -> (empty, [n])
+diff --git a/haddock-api/src/Haddock/Backends/Xhtml.hs 
b/haddock-api/src/Haddock/Backends/Xhtml.hs
+index f80a9c05f..541f40c4f 100644
+--- a/src/Haddock/Backends/Xhtml.hs
 b/src/Haddock/Backends/Xhtml.hs
+@@ -407,7 +407,7 @@ ppJsonIndex odir maybe_source_url maybe_wiki_url unicode 
pkg qual_opt ifaces = d
+ exportSubs _ = []
+ 
+ exportName :: ExportItem DocNameI -> [IdP DocNameI]
+-exportName ExportDecl { expItemDecl } = getMainDeclBinder (unLoc 
expItemDecl)
++exportName ExportDecl { expItemDecl } = getMainDeclBinderI (unLoc 
expItemDecl)
+ exportName ExportNoDecl { expItemName } = [expItemName]
+ exportName _ = []
+ 
+diff --git a/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs 
b/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs
+index ef0ba1b67..30b8d43eb 100644
+--- a/src/Haddock/Backends/Xhtml/Decl.hs
 b/src/Haddock/Backends/Xhtml/Decl.hs
+@@ -536,6 +536,8 @@ ppClassDecl summary links instances fixities loc d subdocs
+ -- Only the fixity relevant to the class header
+ fixs = ppFixities [ f | f@(n,_) <- fixities, n == unLoc lname ] qual
+ 
++nm   = tcdNameI decl
++
+ hdr = ppClassHdr summary lctxt (unLoc lname) ltyvars lfds
+ 
+ -- Associated types
+@@ -794,7 +796,7 @@ ppDataDecl summary links instances fixities subdocs loc 
doc dataDecl pats
+   | otherwise = header_ +++ docSection curname pkg qual doc +++ constrBit +++ 
patternBit +++ instancesBit
+ 
+   where
+-docname   = tcdName dataDecl
++docname   = tcdNameI dataDecl
+ curname   = Just $ getName docname
+ cons  = dd_cons (tcdDataDefn dataDecl)
+ isH98 = case unLoc (head cons) of
+diff --git a/haddock-api/src/Haddock/GhcUtils.hs 
b/haddock-api/src/Haddock/GhcUtils.hs
+index 0874e7b4d..43fe3e774 100644
+--- a/src/Haddock/GhcUtils.hs
 b/src/Haddock/GhcUtils.hs
+@@ -58,8 +58,7 @@ moduleString = moduleNameString . moduleName
+ isNameSym :: Name -> Bool
+

[gentoo-commits] repo/gentoo:master commit in: dev-haskell/newtype/

2021-03-15 Thread Sergei Trofimovich

commit: 0ebb41cfa6b93e9ee679531ba658b01f36f0d322
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Mar 15 19:30:06 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Mar 15 22:32:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ebb41cf

dev-haskell/newtype: allow ghc-8.10

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

 dev-haskell/newtype/newtype-0.2.2.0.ebuild | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/dev-haskell/newtype/newtype-0.2.2.0.ebuild 
b/dev-haskell/newtype/newtype-0.2.2.0.ebuild
index 2b424a82192..f3a91654edf 100644
--- a/dev-haskell/newtype/newtype-0.2.2.0.ebuild
+++ b/dev-haskell/newtype/newtype-0.2.2.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
@@ -22,3 +22,10 @@ RDEPEND=">=dev-lang/ghc-7.8.2:=
 DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.18.1.3
 "
+
+src_prepare() {
+   default
+
+   cabal_chdeps \
+   'base >= 4.5 && < 4.14' 'base >= 4.5'
+}

[gentoo-commits] repo/gentoo:master commit in: dev-haskell/haddock/

2021-03-15 Thread Sergei Trofimovich

commit: ccb4c26a008388fae2db8610f5d6f2f943aeba4b
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Mar 14 09:57:03 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Mar 15 22:32:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccb4c26a

dev-haskell/haddock: bump up to 2.24.0

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

 dev-haskell/haddock/Manifest  |  1 +
 dev-haskell/haddock/haddock-2.24.0.ebuild | 35 +++
 2 files changed, 36 insertions(+)

diff --git a/dev-haskell/haddock/Manifest b/dev-haskell/haddock/Manifest
index c39a4a3f426..a900dd75f77 100644
--- a/dev-haskell/haddock/Manifest
+++ b/dev-haskell/haddock/Manifest
@@ -1 +1,2 @@
 DIST haddock-2.23.1.tar.gz 302698 BLAKE2B 
1dae0019ddc08c537aec2f0fa71f5bd1570db4061d22bf53f05aa0e211c3280d09c6a6481f704c34895e0bf70fd2b5ac95644dab23b05cc2b6fec59c845f86c5
 SHA512 
e69b3b5f2dcadeccc33696ee8d0646387860b98d86c08d4c07d829e3eabc4159adac0a11d408850ef54face5fa835ab8217d1057b14d8de8d758efbfc7a700db
+DIST haddock-2.24.0.tar.gz 303382 BLAKE2B 
3e0c9a92f4f96949ffbdcba4ae26643b715ca8bf930bb26610a3a4b73ddec9a361b00c9c5f529b79fe6e981f23bb9b95d3b0adeff52d1223d97653c7f2573036
 SHA512 
52748ea2c785faeb9af7c09f9da991e4db8d5b2703eee3824ee1f6c14c82d24b7939746359f147cbc940b2be0d6aac2a1c8ffe2f1b9746e3bc543252859a4003

diff --git a/dev-haskell/haddock/haddock-2.24.0.ebuild 
b/dev-haskell/haddock/haddock-2.24.0.ebuild
new file mode 100644
index 000..08f165ce877
--- /dev/null
+++ b/dev-haskell/haddock/haddock-2.24.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.
+#hackport: flags: -in-ghc-tree
+
+CABAL_FEATURES="" # broken test-suite
+inherit haskell-cabal
+
+DESCRIPTION="A documentation-generation tool for Haskell libraries"
+HOMEPAGE="https://www.haskell.org/haddock/;
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz;
+
+LICENSE="BSD"
+SLOT="0"
+# keep in sync with ghc-8.10
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RESTRICT=test # test suite unavailable on hackage
+
+RDEPEND="~dev-haskell/haddock-api-2.24.0:=
+   >=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+   >=dev-haskell/cabal-3.0.0.0"
+#  test? ( ~dev-haskell/haddock-test-0.0.1 )
+#"
+
+src_configure() {
+   haskell-cabal_src_configure \
+   --flag=-in-ghc-tree
+}

[gentoo-commits] repo/gentoo:master commit in: dev-haskell/haddock-library/

2021-03-15 Thread Sergei Trofimovich

commit: 8ad15123ad6126a3bc9553f48168204912ac8c70
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Mar 14 09:56:03 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Mar 15 22:32:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ad15123

dev-haskell/haddock-library: bump up to 1.9.0

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

 dev-haskell/haddock-library/Manifest   |  1 +
 .../haddock-library/haddock-library-1.9.0.ebuild   | 43 ++
 2 files changed, 44 insertions(+)

diff --git a/dev-haskell/haddock-library/Manifest 
b/dev-haskell/haddock-library/Manifest
index 078c648125d..d021b2c1e5f 100644
--- a/dev-haskell/haddock-library/Manifest
+++ b/dev-haskell/haddock-library/Manifest
@@ -1 +1,2 @@
 DIST haddock-library-1.8.0.tar.gz 30918 BLAKE2B 
a8bcf9e08f6596375186930cf4a98ae547c40d85eb0bd00b7aaf8212c3738e32cd51cea044206f3746d10d228b1e8b8a2ccdb28ae7c7957006f518d090a6ceed
 SHA512 
f84672b67dd4b18402efb8b40eb0e2cb912ecf894cfdedf61b0ada87392e63609cf1101d4fc793686cc4af354665661bf4dc902313bb466efee683a7c64bbe2b
+DIST haddock-library-1.9.0.tar.gz 31465 BLAKE2B 
785935a7f80831c000db796ed9d0071309de86d36c68d5677b6c948aa914c09a00582af500a25d2d751d96ef6ebb30696fba51a2ed84fa1b4850e5795ae5f55d
 SHA512 
ec41df15a849a59fc41a443ce233dfa6293f0d201ed1847bd8a7732bc0e2138bab2305c127bd60f51919d8eeeb6808eec7a0add38edacd059956d852167477b5

diff --git a/dev-haskell/haddock-library/haddock-library-1.9.0.ebuild 
b/dev-haskell/haddock-library/haddock-library-1.9.0.ebuild
new file mode 100644
index 000..59c2d563d11
--- /dev/null
+++ b/dev-haskell/haddock-library/haddock-library-1.9.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.
+
+CABAL_FEATURES="lib profile test-suite" # haddock hoogle hscolour
+inherit haskell-cabal
+
+DESCRIPTION="Library exposing some functionality of Haddock"
+HOMEPAGE="https://www.haskell.org/haddock/;
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz;
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+# keep in sync with ghc-8.10
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=">=dev-haskell/parsec-3.1.13.0:=[profile?] 
=dev-haskell/text-1.2.3.0:=[profile?] =dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+   >=dev-haskell/cabal-2.2
+   test? ( >=dev-haskell/hspec-2.4.4
+   >=dev-haskell/optparse-applicative-0.15
+   >=dev-haskell/tree-diff-0.1
+   >=dev-haskell/base-compat-0.9.3
+   >=dev-haskell/quickcheck-2.11 )
+"
+
+src_prepare() {
+   default
+
+   cabal_chdeps \
+   'base-compat  ^>= 0.9.3 || ^>= 0.11.0' 'base-compat  >= 0.9.3' \
+   'hspec  >= 2.4.4&& < 2.8' 'hspec
  >= 2.4.4' \
+   'optparse-applicative  ^>= 0.15' 'optparse-applicative  >= 
0.15' \
+   'QuickCheck   ^>= 2.11  || ^>= 2.13.2' 'QuickCheck   >= 2.11' \
+   'tree-diff ^>= 0.1' 'tree-diff >= 0.1'
+}

[gentoo-commits] repo/gentoo:master commit in: dev-lang/ghc/

2021-03-15 Thread Sergei Trofimovich

commit: 5028316752ed9746551da5e327338f08e1d3e010
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Mar 14 09:09:02 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Mar 15 22:32:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50283167

dev-lang/ghc: 8.10: restore keywords

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

 dev-lang/ghc/ghc-8.10.4.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dev-lang/ghc/ghc-8.10.4.ebuild b/dev-lang/ghc/ghc-8.10.4.ebuild
index a0a3d692f58..7257681ccbe 100644
--- a/dev-lang/ghc/ghc-8.10.4.ebuild
+++ b/dev-lang/ghc/ghc-8.10.4.ebuild
@@ -75,8 +75,7 @@ BUMP_LIBRARIES=(
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-# no binaries yet
-#KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="big-endian doc elfutils ghcbootstrap ghcmakebinary +gmp numa profile 
test"
 IUSE+=" binary"
 RESTRICT="!test? ( test )"

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

2021-03-15 Thread Sam James

commit: c1183f81933fb13484fe85c0dce24b274cdfa7a9
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 15 22:10:39 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 15 22:10:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1183f81

net-analyzer/packit: drop 1.6.1

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

 net-analyzer/packit/Manifest   |   1 -
 .../packit/files/packit-1.6.1-fno-common.patch | 251 -
 net-analyzer/packit/packit-1.6.1.ebuild|  33 ---
 3 files changed, 285 deletions(-)

diff --git a/net-analyzer/packit/Manifest b/net-analyzer/packit/Manifest
index 69e82515e9d..df96e38d0b6 100644
--- a/net-analyzer/packit/Manifest
+++ b/net-analyzer/packit/Manifest
@@ -1,2 +1 @@
-DIST packit-1.6.1.tar.gz 52643 BLAKE2B 
4b67c179140a21ec3dc8b5ae2e116a771fdbd860c3a880588a29346f04c956a80a59fcaf84f42ae6c505554e5b942964ed3f2d3a06d408e5b36850276832994a
 SHA512 
462470bfc755dc33418ae0a65237d0dcbbe04609de710883134bcb1e13cff9212cd9a28e888b2e839a06a566fa080ecd6c6668414f1cac2bde337c81d1ac58a2
 DIST packit-1.7.tar.gz 53192 BLAKE2B 
f5a7fcd0790e05be593be47c2339c3ecb14b2fd45308a273ecc9d5398087698605c2174a8440e870ccf35fd9d560bea11ca720e44045115c15757f6f98d00ac4
 SHA512 
4e7d13ef5387dc446e718792562dbf84f9e0b611196a3590ea8e8b4411ae30694b48f28ab632a0b692935adffb44757e65a4eb5ab942b5d625acbdc08d34aefd

diff --git a/net-analyzer/packit/files/packit-1.6.1-fno-common.patch 
b/net-analyzer/packit/files/packit-1.6.1-fno-common.patch
deleted file mode 100644
index f4813d868ab..000
--- a/net-analyzer/packit/files/packit-1.6.1-fno-common.patch
+++ /dev/null
@@ -1,251 +0,0 @@
 a/src/capture_defs.h
-+++ b/src/capture_defs.h
-@@ -30,12 +30,12 @@
- #define READ_TIMEOUT500
- #define SNAPLEN_DEFAULT 68
- 
--u_int16_t g_display;
--u_int16_t g_link_layer;
--u_int16_t g_dump_pkt;
--u_int16_t g_time_gmt;
--u_int16_t g_t_rst;
--u_int16_t g_snap_len;
--u_int32_t g_pkt_rst;
-+extern u_int16_t g_display;
-+extern u_int16_t g_link_layer;
-+extern u_int16_t g_dump_pkt;
-+extern u_int16_t g_time_gmt;
-+extern u_int16_t g_t_rst;
-+extern u_int16_t g_snap_len;
-+extern u_int32_t g_pkt_rst;
- 
- #endif /* __CAPTURE_DEFS_H */
 a/src/error.c
-+++ b/src/error.c
-@@ -26,6 +26,8 @@
- 
- #include "error.h"
- 
-+char error_buf[ERRBUF_MAXLEN];
-+
- void
- fatal_error(char *err,...)
- {
 a/src/error.h
-+++ b/src/error.h
-@@ -33,7 +33,7 @@
- #define SUCCESS   1
- #define FAILURE   -1
- 
--char error_buf[ERRBUF_MAXLEN];
-+extern char error_buf[ERRBUF_MAXLEN];
- 
- void fatal_error(char *,...);
- 
 a/src/globals.h
-+++ b/src/globals.h
-@@ -138,20 +138,20 @@
- #define P_INT64 0x7FFF
- #define P_UINT640x
- 
--char g_w_file[OPT_MAXLEN];
--char g_r_file[OPT_MAXLEN];
-+extern char g_w_file[OPT_MAXLEN];
-+extern char g_r_file[OPT_MAXLEN];
- 
--pcap_t *g_pkt;
--u_int8_t g_tr_fin;
--char *g_filter;
--char *g_device;
--u_int16_t g_hdr_len;
--u_int16_t g_pkt_len;
--u_int16_t g_verbose;
--u_int16_t g_resolve;
--u_int16_t g_p_mode;
--u_int64_t g_cnt;
--u_int64_t g_inj_cnt;
--u_int64_t g_cap_cnt;
-+extern pcap_t *g_pkt;
-+extern u_int8_t g_tr_fin;
-+extern char *g_filter;
-+extern char *g_device;
-+extern u_int16_t g_hdr_len;
-+extern u_int16_t g_pkt_len;
-+extern u_int16_t g_verbose;
-+extern u_int16_t g_resolve;
-+extern u_int16_t g_p_mode;
-+extern u_int64_t g_cnt;
-+extern u_int64_t g_inj_cnt;
-+extern u_int64_t g_cap_cnt;
- 
- #endif /* __GLOBALS_H */
 a/src/inject_defs.h
-+++ b/src/inject_defs.h
-@@ -30,7 +30,7 @@
- #ifndef __INJECTION_STRUCTS_H
- #define __INJECTION_STRUCTS_H
- 
--struct ip4hdr_opts
-+extern struct ip4hdr_opts
- {
- u_int16_t p;   /* protocol type */
- u_int16_t rand_p;
-@@ -59,7 +59,7 @@
- u_int16_t rand_d_addr;
- } g_ip4hdr_o;
- 
--struct tcphdr_opts
-+extern struct tcphdr_opts
- {
- u_int16_t s_port;  /* tcp source port */
- u_int16_t d_port;  /* tcp destination port */
-@@ -82,7 +82,7 @@
- 
- } g_thdr_o;
- 
--struct udphdr_opts
-+extern struct udphdr_opts
- {
- u_int16_t s_port;  /* udp source port */
- u_int16_t d_port;  /* udp destination port */
-@@ -90,7 +90,7 @@
- u_int16_t sum;  /* udp checksum */
- } g_uhdr_o;
- 
--struct icmp4hdr_opts
-+extern struct icmp4hdr_opts
- {
- u_int16_t type;/* icmp4 type */
- u_int16_t code;/* icmp4 code */
-@@ -132,7 +132,7 @@
- u_int32_t ttime;/* transmit timestamp */
- } g_i4hdr_o;
- 
--struct enethdr_opts
-+extern struct enethdr_opts
- {
- u_int16_t rand_s_addr;
- u_int16_t rand_d_addr;
-@@ -143,7 +143,7 @@
- u_int8_t dhw_addr[18];
- } g_ehdr_o;
- 
--struct arphdr_opts
-+extern struct arphdr_opts
- {
-

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

2021-03-15 Thread Sam James

commit: d443e83595e4a45975d57afa85b63307d396a7a5
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 15 22:10:07 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 15 22:10:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d443e835

net-analyzer/lft: drop 3.77, 3.79, 3.80, 3.90

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

 net-analyzer/lft/Manifest|  4 
 net-analyzer/lft/lft-3.77.ebuild | 26 --
 net-analyzer/lft/lft-3.79.ebuild | 26 --
 net-analyzer/lft/lft-3.80.ebuild | 27 ---
 net-analyzer/lft/lft-3.90.ebuild | 30 --
 5 files changed, 113 deletions(-)

diff --git a/net-analyzer/lft/Manifest b/net-analyzer/lft/Manifest
index c110350415b..9b6cb4681d0 100644
--- a/net-analyzer/lft/Manifest
+++ b/net-analyzer/lft/Manifest
@@ -1,5 +1 @@
-DIST lft-3.77.tar.gz 376369 BLAKE2B 
be518167608896a43b7e2ef1ca478f3fa9a9ced58737e607af348bd8929a2890356dc6041ce3ea9fa3273a954d4df151a4c6ff5fc5a0e26e25b3849bf83aac5d
 SHA512 
b06fa50cbccb40d275ac604b86c6aed4ee00700cde38fd579de06bb577280f154d0173c4788920410a5c2e0c8ed20d7adf07f15d0b98cf5ad4ea422651df60f1
-DIST lft-3.79.tar.gz 376655 BLAKE2B 
4c3affe00a09befc00029029a1da5d530d08bce317e616e7d996a8e31d22632cf43adbe519f4789313b59dc01f4c36d19860effd561b4f691eadcac05c935d6e
 SHA512 
83f35cb24966467a7da180ca8ac9d642e7ca6267a14e752a813f172956554c3d4b278a450d230535c15db1b14d415dca752ad05ed1cec8c1c7cf4953b90a646d
-DIST lft-3.8.tar.gz 376731 BLAKE2B 
e78e6d32cdaff8864e13477522dac92953d7ba44cb7d64e327eeb126411d6f6c022fe1e2011377df28bc948ae75193d1de2801ee12edc42a5cf70e2b56f5e8e5
 SHA512 
13ea176362096cc8c20500d61969483642f5d003263b529ec8d601786f621341107859510f9cafa5d365417beafce897bcc9cd631171e291ca3dc07fec1bd483
-DIST lft-3.9.tar.gz 377008 BLAKE2B 
ee56fde8ea25eddc9d7b7860c55f5f9d90a867fd54b5169fdfffd9c7276e38ed9f3855480472c0ed51e53db608e16a0f462f315c0e4b10794b69daab00aeb8b8
 SHA512 
9d95644eaa61a295d15381c35a8130642e3299a6e90a73bf4a1f369a3b9d8eee648497638f36f0ed5ae970d0307420ba30dbe4ac865767923fd618fbccddc806
 DIST lft-3.91.tar.gz 377135 BLAKE2B 
6b67438738ebab46e5c6c79c17f074042535e9eecb80827562fb6ca6550118ecb3e70118379c4cd0b99611189554fe117ebb3d76580130627b2a21d72c9b5253
 SHA512 
1d030e2def14330426eef4c81245c4cce5f09c560b65b319199b20d82e967b77a5d4e323e2e64a8c1bcf80d1f87ae871e3f24a7d9cbc19cd7a5be2d3204845e7

diff --git a/net-analyzer/lft/lft-3.77.ebuild b/net-analyzer/lft/lft-3.77.ebuild
deleted file mode 100644
index b79c445424c..000
--- a/net-analyzer/lft/lft-3.77.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Layer Four Traceroute (LFT) and WhoB"
-HOMEPAGE="http://pwhois.org/lft/;
-SRC_URI="http://pwhois.org/get/${P}.tar.gz;
-
-LICENSE="VOSTROM"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-DEPEND="
-   net-libs/libpcap
-"
-RDEPEND="
-   ${DEPEND}
-"
-
-DOCS=( CHANGELOG README TODO )
-
-src_prepare() {
-   default
-   sed -i Makefile.in -e 's:strip:true:g' || die
-}

diff --git a/net-analyzer/lft/lft-3.79.ebuild b/net-analyzer/lft/lft-3.79.ebuild
deleted file mode 100644
index 58a145bd725..000
--- a/net-analyzer/lft/lft-3.79.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Layer Four Traceroute (LFT) and WhoB"
-HOMEPAGE="http://pwhois.org/lft/;
-SRC_URI="http://pwhois.org/get/${P}.tar.gz;
-
-LICENSE="VOSTROM"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-DEPEND="
-   net-libs/libpcap
-"
-RDEPEND="
-   ${DEPEND}
-"
-
-DOCS=( CHANGELOG README TODO )
-
-src_prepare() {
-   default
-   sed -i Makefile.in -e 's:strip:true:g' || die
-}

diff --git a/net-analyzer/lft/lft-3.80.ebuild b/net-analyzer/lft/lft-3.80.ebuild
deleted file mode 100644
index bc7acaa2b65..000
--- a/net-analyzer/lft/lft-3.80.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Layer Four Traceroute (LFT) and WhoB"
-HOMEPAGE="http://pwhois.org/lft/;
-SRC_URI="http://pwhois.org/get/${P/0}.tar.gz;
-
-LICENSE="VOSTROM"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-DEPEND="
-   net-libs/libpcap
-"
-RDEPEND="
-   ${DEPEND}
-"
-S=${WORKDIR}/${P/0}
-
-DOCS=( CHANGELOG README TODO )
-
-src_prepare() {
-   default
-   sed -i Makefile.in -e 's:strip:true:g' || die
-}

diff --git a/net-analyzer/lft/lft-3.90.ebuild b/net-analyzer/lft/lft-3.90.ebuild
deleted file mode 100644
index d874cf1a0c8..000
--- a/net-analyzer/lft/lft-3.90.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-#

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

2021-03-15 Thread Sam James

commit: 02d280b97760b31b4ddd02650c363f894774ff8d
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 15 22:09:18 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 15 22:09:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02d280b9

net-analyzer/hydra: Stabilize 9.1 x86, #776532

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

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

diff --git a/net-analyzer/hydra/hydra-9.1.ebuild 
b/net-analyzer/hydra/hydra-9.1.ebuild
index 745536e8949..edfc864a713 100644
--- a/net-analyzer/hydra/hydra-9.1.ebuild
+++ b/net-analyzer/hydra/hydra-9.1.ebuild
@@ -10,7 +10,7 @@ 
SRC_URI="https://github.com/vanhauser-thc/thc-hydra/archive/v${PV}.tar.gz -> ${P
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="
debug firebird gcrypt gtk idn libressl memcached mongodb mysql ncurses
oracle pcre postgres rdp libssh subversion zlib

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

2021-03-15 Thread Sam James

commit: 1921961c44cb62937f5246eb81360eb7adf0627e
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 15 22:09:21 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 15 22:09:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1921961c

net-analyzer/ifstatus: Stabilize 2.0.0 x86, #776538

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

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

diff --git a/net-analyzer/ifstatus/ifstatus-2.0.0.ebuild 
b/net-analyzer/ifstatus/ifstatus-2.0.0.ebuild
index 85a203b8d40..0b58e01792d 100644
--- a/net-analyzer/ifstatus/ifstatus-2.0.0.ebuild
+++ b/net-analyzer/ifstatus/ifstatus-2.0.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 inherit toolchain-funcs
 
-KEYWORDS="amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~ppc x86"
 
 DESCRIPTION="A simple CLI program for displaying network statistics in real 
time"
 HOMEPAGE="http://ifstatus.sourceforge.net/;

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

2021-03-15 Thread Sam James

commit: 42f1a777ea4e4c042a82a71eb8acfd794277561b
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 15 22:09:25 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 15 22:09:25 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42f1a777

net-analyzer/lft: Stabilize 3.91-r1 x86, #776541

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

 net-analyzer/lft/lft-3.91-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/lft/lft-3.91-r1.ebuild 
b/net-analyzer/lft/lft-3.91-r1.ebuild
index f665ea7132f..3e57965afb2 100644
--- a/net-analyzer/lft/lft-3.91-r1.ebuild
+++ b/net-analyzer/lft/lft-3.91-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://pwhois.org/get/${P}.tar.gz;
 
 LICENSE="VOSTROM"
 SLOT="0"
-KEYWORDS="amd64 ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 DEPEND="
net-libs/libpcap

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

2021-03-15 Thread Sam James

commit: 80e9aefa97b079980355298bf2ac1f3e5808c4d1
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 15 22:09:29 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 15 22:09:29 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80e9aefa

net-analyzer/packit: Stabilize 1.7 x86, #776550

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

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

diff --git a/net-analyzer/packit/packit-1.7.ebuild 
b/net-analyzer/packit/packit-1.7.ebuild
index 676de9627fd..6f454fbc9ba 100644
--- a/net-analyzer/packit/packit-1.7.ebuild
+++ b/net-analyzer/packit/packit-1.7.ebuild
@@ -10,7 +10,7 @@ 
SRC_URI="https://github.com/resurrecting-open-source-projects/packit/archive/${P
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 DEPEND="
net-libs/libnet:1.1

[gentoo-commits] repo/gentoo:master commit in: x11-libs/c++-gtk-utils/

2021-03-15 Thread Sam James

commit: bbe05ce7d00d521ebbab0df5e9c7a5e1fd43697e
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 15 22:07:44 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 15 22:07:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbe05ce7

x11-libs/c++-gtk-utils: add 2.2 changelog

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

 x11-libs/c++-gtk-utils/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/x11-libs/c++-gtk-utils/metadata.xml 
b/x11-libs/c++-gtk-utils/metadata.xml
index 9378e9d7e25..4213bf121d9 100644
--- a/x11-libs/c++-gtk-utils/metadata.xml
+++ b/x11-libs/c++-gtk-utils/metadata.xml
@@ -7,5 +7,6 @@


cxx-gtk-utils
+   
http://cxx-gtk-utils.sourceforge.net/2.2/ChangeLog

[gentoo-commits] repo/gentoo:master commit in: x11-libs/c++-gtk-utils/

2021-03-15 Thread Sam James

commit: e3180b3b7613bf08d6c4751bc6ef0efbb7ea90c1
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 15 22:07:06 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 15 22:07:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3180b3b

x11-libs/c++-gtk-utils: add 2.2.20

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

 x11-libs/c++-gtk-utils/Manifest|  1 +
 x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.20.ebuild | 40 ++
 2 files changed, 41 insertions(+)

diff --git a/x11-libs/c++-gtk-utils/Manifest b/x11-libs/c++-gtk-utils/Manifest
index 5e27f0a323a..ec27b38368f 100644
--- a/x11-libs/c++-gtk-utils/Manifest
+++ b/x11-libs/c++-gtk-utils/Manifest
@@ -1,2 +1,3 @@
 DIST c++-gtk-utils-2.0.34.tar.gz 2865687 BLAKE2B 
4978bf9ce5ce364db5ad51bcb2d604ac2e7a22656e2affbc39785b7f27db6c75a77c1965e3524b6c617836aa5ae840c4ef45e0ea65eff01f12acb1ea770c04b2
 SHA512 
f155e50d152cd1444d282c47e995ea8cd93ead529d0cd86c11d548a266a567c83cf3367cdb82dd8d68af1bce28809c957d3e39595bcb0affe87db8f48718f6d4
 DIST c++-gtk-utils-2.2.19.tar.gz 3060284 BLAKE2B 
5edd6a5042cb79cc95e8080cd76d284dfa47641c8a01a6d80ff6cfdbecf5797b6a99a5b7f209c35e0da9a2bc5331225dd2f13f30bbcc3bbb04aaabdadb3cb643
 SHA512 
c6527cc32b6a14a5fe24705a91a6918863f418ec8a274d24c79b65e905efefab53a5e53edfa57b31ed8b14ab8d9d26b4876861cab37e3702df456feb84e1cc5c
+DIST c++-gtk-utils-2.2.20.tar.gz 3085409 BLAKE2B 
2b0ca2a3beb3ee82416cb1d731704f43398db06bd9bc03dea2875a2d6a1f80dc14b9fe418bea1467caf29d5ba9d8e4feefe7451bb69734561a580ed012755a41
 SHA512 
1e834c163f1c236e1a2fbdf92e93e98e88ebd6da04b87be52087fa7f7f395a9bd90e111958f3b9473938e7563182ed5c37fd2d2c4ef683933cb16f3b4665d1b3

diff --git a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.20.ebuild 
b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.20.ebuild
new file mode 100644
index 000..40a1c6ed5a6
--- /dev/null
+++ b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.20.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit virtualx
+
+DESCRIPTION="A number of classes and functions for programming GTK+ programs 
using C++"
+HOMEPAGE="http://cxx-gtk-utils.sourceforge.net/;
+SRC_URI="mirror://sourceforge/${PN/++/xx}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="+gtk nls"
+
+RDEPEND="
+   dev-libs/glib:2
+   gtk? ( x11-libs/gtk+:3 )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+   virtual/pkgconfig
+   nls? ( sys-devel/gettext )"
+
+src_configure() {
+   econf \
+   --disable-static \
+   --without-guile \
+   $(use_enable nls) \
+   $(use_with gtk)
+}
+
+src_test() {
+   virtx default
+}
+
+src_install() {
+   default
+   find "${ED}" -name '*.la' -delete || die
+}

[gentoo-commits] repo/gentoo:master commit in: x11-misc/trayer-srg/

2021-03-15 Thread Sam James

commit: 0981e0c364da9d0b236b9b8b5dfd288e55e1da67
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 15 22:02:01 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 15 22:02:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0981e0c3

x11-misc/trayer-srg: drop 1.1.7

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

 x11-misc/trayer-srg/Manifest|  1 -
 x11-misc/trayer-srg/trayer-srg-1.1.7.ebuild | 40 -
 2 files changed, 41 deletions(-)

diff --git a/x11-misc/trayer-srg/Manifest b/x11-misc/trayer-srg/Manifest
index 6ca5f2c5106..7f8792aa53f 100644
--- a/x11-misc/trayer-srg/Manifest
+++ b/x11-misc/trayer-srg/Manifest
@@ -1,2 +1 @@
-DIST trayer-srg-1.1.7.tar.gz 27987 BLAKE2B 
1609bebe91c7b2d3934d68075fa16f393896b7f9300dd6aecd7aa8666a7f3474711fbbc9dae5f72ed5ba8b63d0275f590a5a82ea4547b640a75a81012fc5
 SHA512 
5bb049af01c3f3f62dc8a5c1932985b92c98e4e2083aebd1dc09256746e097239be54ebc739801773878882a5c8f168a4a13bdac292388f79079ad52c41b2cad
 DIST trayer-srg-1.1.8.tar.gz 28025 BLAKE2B 
3eca8faf7237e1941a611a85a4460310dda1a8d89cb96ae2ac7d77c47a7f8b4fa4bb1a2bcc549fef285ca14a74dce23d9af1b349bb5b0ff9d3bf4abe1ed06351
 SHA512 
5ae92fdcee64ad1ca59846874dcd4bd4859adeeb80a86f1ed97d62e6306f8ec62d1ee26dba251257242dc25d158a6a550e69f2fcc8739242a2311e37fe1ce310

diff --git a/x11-misc/trayer-srg/trayer-srg-1.1.7.ebuild 
b/x11-misc/trayer-srg/trayer-srg-1.1.7.ebuild
deleted file mode 100644
index 45e6091acf6..000
--- a/x11-misc/trayer-srg/trayer-srg-1.1.7.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="trayer fork with multi monitor support and cleaned up codebase"
-HOMEPAGE="https://github.com/sargon/trayer-srg;
-SRC_URI="https://github.com/sargon/${PN}/archive/${P/-srg/}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="MIT GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-   x11-libs/gdk-pixbuf:2
-   x11-libs/gtk+:2
-   x11-libs/libX11
-"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig
-"
-
-S="${WORKDIR}"/${PN}-trayer-${PV}
-
-src_configure() {
-   # Custom configure script
-   ./configure --prefix="${EPREFIX}" || die
-}
-
-src_compile() {
-   emake DEVEL=1 TARGET=${PN} CC="$(tc-getCC)"
-}
-
-src_install() {
-   dobin ${PN}
-   einstalldocs
-}

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/flow-tools/files/, net-analyzer/flow-tools/

2021-03-15 Thread Sam James

commit: ba2bb6a122f97c46c4925fb9c73790f3d4ded388
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 15 21:58:53 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 15 22:01:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba2bb6a1

net-analyzer/flow-tools: drop 0.68.5.1-r11

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

 net-analyzer/flow-tools/Manifest   |  1 -
 .../files/flow-tools-0.68.5.1-syslog.patch | 47 ---
 .../flow-tools/flow-tools-0.68.5.1-r11.ebuild  | 68 --
 3 files changed, 116 deletions(-)

diff --git a/net-analyzer/flow-tools/Manifest b/net-analyzer/flow-tools/Manifest
index 11214dc160a..958d870d3dc 100644
--- a/net-analyzer/flow-tools/Manifest
+++ b/net-analyzer/flow-tools/Manifest
@@ -1,2 +1 @@
-DIST flow-tools-0.68.5.1.tar.bz2 914062 BLAKE2B 
8a987c1aac53a1370045ab11c51ce2de7b8db4074432e86e701153469163870cf1cf9da9e2267ed934d240de4b4bf2391b4681012b82db7e4205207b7fa4
 SHA512 
ae17ba39854daa8ef3deecd3a554bb6d1fa47648cb791d8225a40bec13f65bf0692871660b2c3490d133b1251875c323d066bb0c0483eceb0707cec9b7714c57
 DIST flow-tools-0.68.6.tar.gz 1078778 BLAKE2B 
8a6179e44f2efa90bb2c3ace73bfbb8a928c1d7aabc8f47a778ca7361a92c13f2df168194bdd9c489c175079c1bd977f6ad9852711a62d99649d1f44609d746b
 SHA512 
fc3d0650ace93ec2180340624648b5967fd7f094900f8409e751b439eb659c9623e2ee55effeb74164ec6b15f0a1edd8ed7735ccfacfd72af08e9c5c0d65b740

diff --git a/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-syslog.patch 
b/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-syslog.patch
deleted file mode 100644
index cb17471072b..000
--- a/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-syslog.patch
+++ /dev/null
@@ -1,47 +0,0 @@
 a/lib/fterr.c
-+++ b/lib/fterr.c
-@@ -112,7 +112,7 @@
- fprintf(((fterr_file) ? fterr_file : stderr), "%s\n", buf2);
- 
-   if (fterr_flags & FTERR_SYSLOG)
--syslog(LOG_INFO, buf);
-+syslog(LOG_INFO, "%s", buf);
- 
- } /* fterr_info */
- 
-@@ -134,7 +134,7 @@
- 
-   if (fterr_flags & FTERR_SYSLOG) {
- snprintf(buf2, 1024, "%s: %s", buf, strerror(errno));
--syslog(LOG_INFO, buf2);
-+syslog(LOG_INFO, "%s", buf2);
-   }
- 
-   if (fterr_exit)
-@@ -159,7 +159,7 @@
-   }
- 
-   if (fterr_flags & FTERR_SYSLOG)
--syslog(LOG_INFO, buf);
-+syslog(LOG_INFO, "%s", buf);
- 
-   if (fterr_exit)
- fterr_exit(code);
-@@ -183,7 +183,7 @@
-   }
- 
-   if (fterr_flags & FTERR_SYSLOG)
--syslog(LOG_INFO, buf);
-+syslog(LOG_INFO, "%s", buf);
- 
- } /* fterr_warnx */
- 
-@@ -205,7 +205,7 @@
- 
-   if (fterr_flags & FTERR_SYSLOG) {
- snprintf(buf2, 1024, "%s: %s", buf, strerror(errno));
--syslog(LOG_INFO, buf2);
-+syslog(LOG_INFO, "%s", buf2);
-   }
- 
- } /* fterr_warn */

diff --git a/net-analyzer/flow-tools/flow-tools-0.68.5.1-r11.ebuild 
b/net-analyzer/flow-tools/flow-tools-0.68.5.1-r11.ebuild
deleted file mode 100644
index d1f4fc95e62..000
--- a/net-analyzer/flow-tools/flow-tools-0.68.5.1-r11.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="library and programs to process reports from NetFlow data"
-HOMEPAGE="https://code.google.com/p/flow-tools/;
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.bz2;
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="debug libressl mysql postgres ssl static-libs"
-
-RDEPEND="
-   acct-group/flows
-   acct-user/flows
-   sys-apps/tcp-wrappers
-   sys-libs/zlib
-   mysql? ( dev-db/mysql-connector-c:0= )
-   postgres? ( dev-db/postgresql:* )
-   ssl? (
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
-   )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-   sys-devel/flex
-   sys-devel/bison"
-
-DOCS=( ChangeLog README SECURITY TODO )
-
-PATCHES=(
-   "${FILESDIR}"/${P}-run.patch
-   "${FILESDIR}"/${P}-syslog.patch
-   "${FILESDIR}"/${P}-openssl11.patch
-   "${FILESDIR}"/${P}-fno-common.patch
-)
-
-src_configure() {
-   econf \
-   $(use_enable static-libs static) \
-   $(usex mysql --with-mysql '') \
-   $(usex postgres --with-postgresql=yes --with-postgresql=no) \
-   $(usex ssl --with-openssl '') \
-   --sysconfdir=/etc/flow-tools
-}
-
-src_install() {
-   default
-
-   find "${D}" -name '*.la' -delete || die
-
-   exeinto /var/lib/flows/bin
-   doexe "${FILESDIR}"/linkme
-
-   keepdir /var/lib/flows/ft
-
-   newinitd "${FILESDIR}/flowcapture.initd" flowcapture
-   newconfd "${FILESDIR}/flowcapture.confd" flowcapture
-
-   fowners flows:flows /var/lib/flows
-   fowners flows:flows /var/lib/flows/bin
-   fowners flows:flows /var/lib/flows/ft
-
-   fperms 0755 /var/lib/flows
-   fperms 0755 /var/lib/flows/bin
-}

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

2021-03-15 Thread Sam James

commit: 6c9b3eddfee95a0fd06e279643434f1af9ec5e8f
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 15 22:01:10 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 15 22:01:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c9b3edd

net-analyzer/amap: drop 5.4

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

 net-analyzer/amap/amap-5.4.ebuild | 72 ---
 1 file changed, 72 deletions(-)

diff --git a/net-analyzer/amap/amap-5.4.ebuild 
b/net-analyzer/amap/amap-5.4.ebuild
deleted file mode 100644
index ef97cd2aec1..000
--- a/net-analyzer/amap/amap-5.4.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A network scanning tool for pentesters"
-HOMEPAGE="https://www.thc.org/thc-amap/;
-SRC_URI="https://www.thc.org/releases/${P}.tar.gz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="ssl"
-
-DEPEND="
-   dev-libs/libpcre
-   ssl? ( >=dev-libs/openssl-0.9.6j )
-"
-RDEPEND="
-   ${DEPEND}
-   !sci-biology/amap
-"
-
-src_prepare() {
-   rm -r pcre-3.9 || die
-   sed -i -e "s:etc/:share/amap/:g" amap-lib.c || die
-   # Above change requires below change. See sources...
-   sed -i '/strlen(AMAP_PREFIX/s: 5 : 12 :' amap-lib.c || die
-   sed -i 's:/usr/local:/usr:' amap.h || die
-   # Files to be updated are at different location, bug 207839.
-   sed -i '/AMAP_RESOURCE/s:www:freeworld:' amap.h || die
-
-   sed -i '/DATADIR/s:/etc:/share/amap:' Makefile.am || die
-
-   epatch "${FILESDIR}"/4.8-system-pcre.patch
-}
-
-src_configure() {
-   # non-autotools configure script
-   ./configure || die
-   sed -i \
-   -e '/^XDEFINES=/s:=.*:=:' \
-   -e '/^XLIBS=/s:=.*:=:' \
-   -e '/^XLIBPATHS/s:=.*:=:' \
-   -e '/^XIPATHS=/s:=.*:=:' \
-   -e "/^CC=/d" \
-   Makefile || die
-   if use ssl ; then
-   sed -i \
-   -e '/^XDEFINES=/s:=:=-DOPENSSL:' \
-   -e '/^XLIBS=/s:=:=-lcrypto -lssl:' \
-   Makefile || die
-   fi
-   sed -i Makefile \
-   -e '/-o amap/{s|(OPT) |(OPT) $(LDFLAGS) |g}' \
-   || die
-}
-
-src_compile() {
-   emake CC=$(tc-getCC) OPT="${CFLAGS}"
-}
-
-src_install() {
-   dobin amap amapcrap
-   insinto /usr/share/amap
-   doins appdefs.*
-
-   doman ${PN}.1
-   dodoc README TODO CHANGES
-}

[gentoo-commits] repo/gentoo:master commit in: x11-misc/trayer/

2021-03-15 Thread Sam James

commit: 4c3b7dd44aa1530b2ebfd5315ec092ce9d2ee44a
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 15 22:01:50 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 15 22:01:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c3b7dd4

x11-misc/trayer: drop 1.0-r3

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

 x11-misc/trayer/Manifest |  1 -
 x11-misc/trayer/trayer-1.0-r3.ebuild | 43 
 2 files changed, 44 deletions(-)

diff --git a/x11-misc/trayer/Manifest b/x11-misc/trayer/Manifest
index a2fa373bc41..ee5cb7c5e9a 100644
--- a/x11-misc/trayer/Manifest
+++ b/x11-misc/trayer/Manifest
@@ -1,2 +1 @@
 DIST trayer-1.0-sourceforge.tar.gz 29713 BLAKE2B 
6a874781979c512e4fea06b0dcef30be73821e502553ebdad38ab2e152d070f6633dd6f8059d5532a51648ea10cbdfd752a65da11d2a992687a6f3ee4d289d01
 SHA512 
9903a78a1c185515e87552732449937daa23187d54a3ccbf19bc9fc569d6a440600c879fe78edbea3eff6b66a1f3fc5054d474dfeaca53af3521a6f18b454049
-DIST trayer-1.0.tar.gz 30445 BLAKE2B 
f95df1496392064b803e712e57a4ec76ed6e9a62dadb254eb044954e38620590cd486dc37d46d56598a7f2db5f27051db47e78df2d788092ccf3cdb7707978e0
 SHA512 
c46093ee18908b7cf8e52d2f10adeb0eefc90562b87862a5459cc4563e53528107ee1dba47b1cb88e378bdac40d64a1d8cb9ecbf014aef997c44f242b49534f7

diff --git a/x11-misc/trayer/trayer-1.0-r3.ebuild 
b/x11-misc/trayer/trayer-1.0-r3.ebuild
deleted file mode 100644
index f130f5ec280..000
--- a/x11-misc/trayer/trayer-1.0-r3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="Lightweight GTK+ based systray for UNIX desktop"
-HOMEPAGE="http://home.gna.org/fvwm-crystal/;
-SRC_URI="http://download.gna.org/fvwm-crystal/trayer/${P}.tar.gz;
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND="
-   dev-libs/glib:2
-   x11-libs/gdk-pixbuf:2
-   x11-libs/gtk+:2
-   x11-libs/libX11
-"
-DEPEND="
-   ${RDEPEND}
-   virtual/pkgconfig
-"
-
-PATCHES=(
-   "${FILESDIR}"/${P}-dont-include-gdk-pixbuf-xlib.patch
-   "${FILESDIR}"/${P}-dont-include-libXmu.patch
-   "${FILESDIR}"/${P}-as-needed-and-pre-stripped.patch
-)
-
-src_compile() {
-   tc-export PKG_CONFIG
-
-   emake -j1 CC=$(tc-getCC) CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}"
-}
-
-src_install() {
-   dobin trayer
-   doman trayer.1
-   einstalldocs
-}

[gentoo-commits] repo/gentoo:master commit in: x11-misc/xfishtank/, x11-misc/xfishtank/files/

2021-03-15 Thread Sam James

commit: 39ee7e51db8ae02b0631d4c77a8084803924f0bc
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 15 22:00:14 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 15 22:01:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39ee7e51

x11-misc/xfishtank: drop 2.1-r2

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

 x11-misc/xfishtank/Manifest|  1 -
 .../xfishtank/files/xfishtank-2.1-implicits.patch  | 75 --
 x11-misc/xfishtank/xfishtank-2.1-r2.ebuild | 34 --
 3 files changed, 110 deletions(-)

diff --git a/x11-misc/xfishtank/Manifest b/x11-misc/xfishtank/Manifest
index ca1d5ddc5b5..2763902dcbb 100644
--- a/x11-misc/xfishtank/Manifest
+++ b/x11-misc/xfishtank/Manifest
@@ -1,2 +1 @@
-DIST xfishtank-2.1tp.tar.gz 187513 BLAKE2B 
e2acec91ef52776bee82ea1b4df347b7fe509377687e74422d6dff81d7fce8a4009e4d0f45327a8401e4ae9782440d9f6478d1dd501c6e4e7d595d94b2d40b1a
 SHA512 
641efa1104685d94589c2d9d365108308cb1b0dd238dbba6dc333c5922bda371536c0e26a63645351ac245a18f2386e4c47b4a1fc2a7f4b0400d37db846976a1
 DIST xfishtank-2.5.tar.gz 153464 BLAKE2B 
0bb3121b84c3d08ea2251a70f9ad569e90fe6299ad3ee4942ec83d80483fcf4db0b0079161c28ff63461597f76b0d0532a65c1bde8aa821ff6bc92be189843f2
 SHA512 
1bfe16737bdbc2b7cf74abb98408bf632d8881f15753005424f84eba4afca756b07fa7ad424df800ee3f3e46e033b8f60142877bcd9a7e4e806e318ee283721f

diff --git a/x11-misc/xfishtank/files/xfishtank-2.1-implicits.patch 
b/x11-misc/xfishtank/files/xfishtank-2.1-implicits.patch
deleted file mode 100644
index b00118631be..000
--- a/x11-misc/xfishtank/files/xfishtank-2.1-implicits.patch
+++ /dev/null
@@ -1,75 +0,0 @@
 a/read.c
-+++ b/read.c
-@@ -1,5 +1,7 @@
- #include 
- #include 
-+#include 
-+#include 
- #include "compact.h"
- #include "medcut.h"
- 
 a/medcut.c
-+++ b/medcut.c
-@@ -1,4 +1,5 @@
- #include 
-+#include 
- #include "medcut.h"
- 
- #define RED 0
 a/xfish.c
-+++ b/xfish.c
-@@ -46,6 +46,9 @@
- #endif
- 
- #include 
-+#include 
-+#include 
-+#include 
- #ifdef sgi
- #define _BSD_SIGNALS
- #endif
-@@ -848,8 +850,8 @@
-   struct colr_data colrs[256];
- 
-   colormap = XDefaultColormap(Dpy, screen);
-
--  if (colormap == NULL)
-+  if (colormap == 0)
-   {
-   return;
-   }
-@@ -1812,9 +1814,11 @@
- high_res_sleep(seconds)
- double  seconds;
- {
--int fds = 0;
-+fd_set  fds;
- struct timeval timeout;
- 
-+FD_ZERO();
-+
- timeout.tv_sec = seconds;
- timeout.tv_usec = (seconds - timeout.tv_sec) * 100.0;
- select(0, , , , );
 a/makeh.c
-+++ b/makeh.c
-@@ -1,6 +1,6 @@
--
-+#include 
- #include 
--
-+#include 
- main()
- {
-   FILE *fp;
 a/gifread.c
-+++ b/gifread.c
-@@ -56,6 +56,8 @@
- 
- #include 
- #include 
-+#include 
-+#include 
- #if  defined(SYSV) || defined(SVR4)
- #include 
- #else /* SYSV */

diff --git a/x11-misc/xfishtank/xfishtank-2.1-r2.ebuild 
b/x11-misc/xfishtank/xfishtank-2.1-r2.ebuild
deleted file mode 100644
index 3e5fbb14c7e..000
--- a/x11-misc/xfishtank/xfishtank-2.1-r2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-MY_P=${P}tp
-
-DESCRIPTION="Turns your root window into an aquarium"
-HOMEPAGE="http://www.ibiblio.org/pub/Linux/X11/demos/;
-SRC_URI="http://www.ibiblio.org/pub/Linux/X11/demos/${MY_P}.tar.gz;
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-linux"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-   x11-libs/libXt
-   x11-libs/libXext"
-DEPEND="${RDEPEND}
-   x11-base/xorg-proto
-   x11-misc/imake"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=( "${FILESDIR}"/${P}-implicits.patch )
-
-src_compile() {
-   xmkmf || die
-   emake CDEBUGFLAGS="${CFLAGS}" CC="$(tc-getCC)" \
-   EXTRA_LDOPTIONS="${LDFLAGS}" ${PN}
-}

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

2021-03-15 Thread Sam James

commit: 77ac9273f6ba60cf38df347977ddd61a61149d1e
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 15 21:57:55 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 15 22:01:25 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77ac9273

net-analyzer/darkstat: drop 3.0.719-r2

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

 net-analyzer/darkstat/darkstat-3.0.719-r2.ebuild | 67 
 1 file changed, 67 deletions(-)

diff --git a/net-analyzer/darkstat/darkstat-3.0.719-r2.ebuild 
b/net-analyzer/darkstat/darkstat-3.0.719-r2.ebuild
deleted file mode 100644
index 041df6e159d..000
--- a/net-analyzer/darkstat/darkstat-3.0.719-r2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Network traffic analyzer with cute web interface"
-HOMEPAGE="https://unix4lyfe.org/darkstat/;
-SRC_URI="https://unix4lyfe.org/${PN}/${P}.tar.bz2;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-DEPEND="
-   acct-user/darkstat
-   dev-libs/libbsd
-   net-libs/libpcap
-   sys-libs/zlib
-"
-RDEPEND="
-   ${DEPEND}
-"
-
-DARKSTAT_CHROOT_DIR=${DARKSTAT_CHROOT_DIR:-/var/lib/darkstat}
-
-DOCS=( AUTHORS ChangeLog README NEWS )
-
-src_prepare() {
-   default
-
-   sed -i -e 's|-flto||g' configure.ac || die
-
-   eautoreconf
-}
-
-src_configure() {
-   econf --disable-debug --with-privdrop-user=darkstat
-}
-
-src_install() {
-   default
-
-   newinitd "${FILESDIR}"/darkstat-initd darkstat
-   newconfd "${FILESDIR}"/darkstat-confd darkstat
-
-   sed -i -e "s:__CHROOT__:${DARKSTAT_CHROOT_DIR}:g" 
"${D}"/etc/conf.d/darkstat || die
-   sed -i -e "s:__CHROOT__:${DARKSTAT_CHROOT_DIR}:g" 
"${D}"/etc/init.d/darkstat || die
-
-   keepdir "${DARKSTAT_CHROOT_DIR}"
-   chown darkstat:0 "${D}${DARKSTAT_CHROOT_DIR}"
-}
-
-pkg_postinst() {
-   # Workaround bug #141619
-   DARKSTAT_CHROOT_DIR=`sed -n 's/^#CHROOT=\(.*\)/\1/p' 
"${ROOT}"etc/conf.d/darkstat`
-   chown darkstat:0 "${ROOT}${DARKSTAT_CHROOT_DIR}"
-
-   elog "To start different darkstat instances which will listen on a 
different"
-   elog "interfaces create in /etc/init.d directory the 'darkstat.if' 
symlink to"
-   elog "darkstat script where 'if' is the name of the interface."
-   elog "Also in /etc/conf.d directory copy darkstat to darkstat.if"
-   elog "and edit it to change default values."
-   elog
-   elog "darkstat's default chroot directory is: 
\"${ROOT}${DARKSTAT_CHROOT_DIR}\""
-}

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

2021-03-15 Thread Sam James

commit: 6bd1b9b36f1bf2b638f82b73d33a2414e4c60804
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 15 21:57:23 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 15 22:01:25 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bd1b9b3

net-analyzer/cutter: drop 1.03-r1

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

 net-analyzer/cutter/Manifest  |  1 -
 net-analyzer/cutter/cutter-1.03-r1.ebuild | 28 
 2 files changed, 29 deletions(-)

diff --git a/net-analyzer/cutter/Manifest b/net-analyzer/cutter/Manifest
index cc59c2538cd..9cd1ba973c9 100644
--- a/net-analyzer/cutter/Manifest
+++ b/net-analyzer/cutter/Manifest
@@ -1,2 +1 @@
-DIST cutter-1.03.tgz 13176 BLAKE2B 
d879d849be77c34d3e1882cbe500be71e631a5047116828ab07f8ab07b5bbb853e19b6e8b7dd5c42a73ce7b5c2825228cbeae07ec875e83da7bd1bd1c6f34a7a
 SHA512 
821e8abf496e22b86bdd855fb1c9c51648a276ebb572edd2ccb172ae7025a38794df37dfe153c1807785ecec279c34b9df5e2bcc2de582b3a88ee3776cf46eea
 DIST cutter-1.04.tgz 13680 BLAKE2B 
373e5e0c0fb14224974ff399c7db0a69dc5568394a881be2c285437050a1ec4cfb26acbcdd593d22519f34a32760bdbe342a96c2a4d55547f7c06bc49806e228
 SHA512 
79c17ec8c17e696a79aa8b11fda347f2e6929eb35f9a37da450acf6aff7ab9471e13eaef24708f90f3f0c2791fade2eb93b98df3d3ae4eef0c408abc7b3a

diff --git a/net-analyzer/cutter/cutter-1.03-r1.ebuild 
b/net-analyzer/cutter/cutter-1.03-r1.ebuild
deleted file mode 100644
index 7e3806ff08d..000
--- a/net-analyzer/cutter/cutter-1.03-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="TCP/IP Connection cutting on Linux Firewalls and Routers"
-HOMEPAGE="http://www.digitage.co.uk/digitage/software/linux-security/cutter;
-SRC_URI="http://www.digitage.co.uk/digitage/files/${PN}/${P}.tgz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-src_prepare() {
-   epatch "${FILESDIR}"/${P}-debian.patch
-   rm -f Makefile # implicit rules are better ;x
-}
-
-src_compile() {
-   emake cutter CC="$(tc-getCC)"
-}
-
-src_install() {
-   dosbin cutter
-   dodoc README
-   doman debian/cutter.8
-}

[gentoo-commits] repo/gentoo:master commit in: x11-misc/xkeycaps/files/, x11-misc/xkeycaps/

2021-03-15 Thread Sam James

commit: a065f4cd7d229e6d599331b25e9cf82f6a4c6c29
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 15 22:00:44 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 15 22:01:29 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a065f4cd

x11-misc/xkeycaps: drop 2.47-r2

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

 x11-misc/xkeycaps/files/xkeycaps-2.47-man.patch | 12 ---
 x11-misc/xkeycaps/xkeycaps-2.47-r2.ebuild   | 45 -
 2 files changed, 57 deletions(-)

diff --git a/x11-misc/xkeycaps/files/xkeycaps-2.47-man.patch 
b/x11-misc/xkeycaps/files/xkeycaps-2.47-man.patch
deleted file mode 100644
index f68629ef3ea..000
--- a/x11-misc/xkeycaps/files/xkeycaps-2.47-man.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur xkeycaps-2.47.orig/xkeycaps.man xkeycaps-2.47/xkeycaps.man
 xkeycaps-2.47.orig/xkeycaps.man2006-01-02 02:22:17.0 +0200
-+++ xkeycaps-2.47/xkeycaps.man 2008-12-07 22:51:38.0 +0200
-@@ -267,7 +267,7 @@
- the physical keys: it is immutable (unless you repaint your keyboard...)
- .TP 10
- .B \fIChord\fP
--This term refers to a set of two or more keys held down simultaniously (by
-+This term refers to a set of two or more keys held down simultaneously (by
- analogy with piano keyboards.)  All but one of the keys will generally be
- Modifier Keys.  Sometimes \fIConstellation\fP is used to mean the same thing.
- .TP 10

diff --git a/x11-misc/xkeycaps/xkeycaps-2.47-r2.ebuild 
b/x11-misc/xkeycaps/xkeycaps-2.47-r2.ebuild
deleted file mode 100644
index 0c3b4ce21aa..000
--- a/x11-misc/xkeycaps/xkeycaps-2.47-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="GUI frontend to xmodmap"
-HOMEPAGE="https://packages.qa.debian.org/x/xkeycaps.html;
-SRC_URI="mirror://debian/pool/main/x/${PN}/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND="x11-misc/xbitmaps
-   x11-libs/libX11
-   x11-libs/libXmu
-   x11-libs/libXt
-   x11-libs/libXaw
-   x11-libs/libXext"
-DEPEND="${RDEPEND}
-   x11-base/xorg-proto
-   x11-misc/imake
-   >=sys-apps/sed-4"
-
-DOCS=( README defining.txt hierarchy.txt sgi-microsoft.txt )
-PATCHES=(
-   "${FILESDIR}"/${P}-Imakefile.patch
-   "${FILESDIR}"/${P}-man.patch
-)
-
-src_compile() {
-   xmkmf || die
-   sed -i -e "s,all:: xkeycaps.\$(MANSUFFIX).html,all:: ,g" \
-   Makefile || die
-   emake EXTRA_LDOPTIONS="${LDFLAGS}" CC="$(tc-getCC)" \
-   CDEBUGFLAGS="${CFLAGS}"
-}
-
-src_install() {
-   default
-   newman ${PN}.man ${PN}.1
-}

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

2021-03-15 Thread Sam James

commit: e4b2eba0b070af607fc90747819bcd3e06668086
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 15 21:59:29 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 15 22:01:27 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4b2eba0

app-misc/oneko: drop 1.2-r2, 1.2_p5

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

 app-misc/oneko/Manifest|  2 --
 app-misc/oneko/oneko-1.2-r2.ebuild | 71 --
 app-misc/oneko/oneko-1.2_p5.ebuild | 59 ---
 3 files changed, 132 deletions(-)

diff --git a/app-misc/oneko/Manifest b/app-misc/oneko/Manifest
index f469fcaa153..55ced1b3978 100644
--- a/app-misc/oneko/Manifest
+++ b/app-misc/oneko/Manifest
@@ -1,6 +1,4 @@
 DIST oneko-1.2-cat.png 223 BLAKE2B 
35eb9a8aa7e49aa00a7a689187b598ee837b9236715ed62ffc37a94f9afdd54cac9c251eb82a85cbf7ef31af36c010d54310d79f079cf43a6ba3761ee3b18c34
 SHA512 
f3543be2bac0d14d3db5fe6bc33cf59caae743d547993fe010c79d2bfc6f8720d608026d692733b7519d5b6b99db09f58f34af9bd2d8fcc3556b6994734f24bf
 DIST oneko-1.2-dog.png 236 BLAKE2B 
8aa4bb11d75283784e7bef8eb6d887706d90cf6370cfa41433d32bffbb23db0b775e5a23fe9b19ef0d9426d5e98e583b599e477427c3223f4a225f1904da7ad1
 SHA512 
11e4a4ecfba26a0ea782846ca288da7ba3f68629dc8f4b0d7987923f06afe57971d53c9161ed13711a9a1f737ea3d8ec76f559311dd10234dca49cfa9d20f533
-DIST oneko-1.2-sakura-nobsd.patch.bz2 2967 BLAKE2B 
128fe382d81fdd18f077d015fcad41613baae00171149a2d4fd253bb03595ca4c7be16640531140af90edf176754fad2bf7e4d5ae27471bf7079b3a558788189
 SHA512 
dbab7471b1c76d8bd7b0c0f9512ce274d98b7e96e8f1cb781a07b031d3a23c0c716222465dee16ad77f658c681116e71e6f8f50ab45ee8f24d132e24fed6849e
-DIST oneko-1.2.sakura.5.tar.gz 76825 BLAKE2B 
e6fbb02823a25e71b6b26d067ca898352d26971bd6595b2f8d33205bf268238e277f8a0a980178704857d50042acd0cb1663d9eb0549764934153864b3602ed1
 SHA512 
328bc267c027dc2bf9f4d0bf7a3a5cfb0f77e7ffe566dad58ba8728a8d72f905ef0b1b92fea77179d1e79886aea8a6b27cda44dc227d96b69ed34b4fdde3ec15
 DIST oneko_1.2.sakura.6-14.debian.tar.xz 10996 BLAKE2B 
4507243c28371d99976a3ef4d015b53f6dc1e28a0e841c55da18710bfc3825786dc8ee8ce06b5af1ca41445661d6f5c10225b80c6802ab5d2de06dab09de10e0
 SHA512 
35656ade57e57ba400b6e2d0f9dcfa1b41a7002f874f1113db080d9e75e390ff0e1f4ec169fbcf1cbea135988500501c65a2f520eaab196b8d92ef4feb993baf
 DIST oneko_1.2.sakura.6.orig.tar.gz 64623 BLAKE2B 
262f9373b1739c0181a52377dd72c5f35bd9d8e4e54364304704bb6794216585a7617525ccf439cef4783556aa732ac84f60a45424021b5963d69485c21a15fe
 SHA512 
3f06b1c23ac6e3d9864530904bccbe0fdbeebb512233e3ae44d2b45b2e6e50480081f46b048994c9415dca05691a0796357d86b4b7e8dc0bbcf1642ae348

diff --git a/app-misc/oneko/oneko-1.2-r2.ebuild 
b/app-misc/oneko/oneko-1.2-r2.ebuild
deleted file mode 100644
index 8ef1f755b8e..000
--- a/app-misc/oneko/oneko-1.2-r2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A cat, dog and others which chase the mouse or windows around the 
screen"
-HOMEPAGE="http://www.daidouji.com/oneko/;
-SRC_URI="http://www.daidouji.com/oneko/distfiles/${P}.sakura.5.tar.gz
-   mirror://gentoo/${P}-cat.png
-   mirror://gentoo/${P}-dog.png
-   mirror://gentoo/${P}-sakura-nobsd.patch.bz2"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-
-RDEPEND="
-   x11-libs/libX11
-   x11-libs/libXext
-"
-DEPEND="
-   ${RDEPEND}
-   app-text/rman
-   x11-base/xorg-proto
-   x11-misc/gccmakedep
-   x11-misc/imake
-"
-
-S=${WORKDIR}/oneko-${PV}.sakura.5
-
-src_prepare() {
-   epatch \
-   "${WORKDIR}"/${P}-sakura-nobsd.patch \
-   "${FILESDIR}"/${P}-include.patch
-}
-
-src_configure() {
-   xmkmf -a || die
-}
-
-src_compile() {
-   emake \
-   CC="$(tc-getCC)" \
-   CCOPTIONS="${CFLAGS}" \
-   EXTRA_LDOPTIONS="${LDFLAGS}"
-}
-
-src_install() {
-   dobin oneko
-   newman oneko._man oneko.1x
-   dodoc README README-NEW README-SUPP
-   newicon "${DISTDIR}/${P}-cat.png" "cat.png"
-   newicon "${DISTDIR}/${P}-dog.png" "dog.png"
-   make_desktop_entry "oneko" "oneko (cat)" "cat" "Game;Amusement"
-   make_desktop_entry "oneko -dog" "oneko (dog)" "dog" "Game;Amusement"
-   make_desktop_entry "killall -TERM oneko" "oneko kill" "" 
"Game;Amusement"
-}
-
-pkg_postinst() {
-   elog "To kill oneko, type the following in a terminal:"
-   elog ""
-   elog "killall oneko"
-   elog ""
-   elog "If your mouse cursor changes to the default black cross"
-   elog "after running ${PN}, you should emerge x11-apps/xsetroot"
-   elog "and run:"
-   elog ""
-   elog "xsetroot -cursor_name left_ptr"
-   elog ""
-}

diff --git a/app-misc/oneko/oneko-1.2_p5.ebuild 
b/app-misc/oneko/oneko-1.2_p5.ebuild
deleted file mode

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/bwm-ng/files/, net-analyzer/bwm-ng/

2021-03-15 Thread Sam James

commit: facb6509f5460c9ada1f28cf251e8bf0a919
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 15 21:56:31 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 15 22:01:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=facb6566

net-analyzer/bwm-ng: drop 0.6.1-r1

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

 net-analyzer/bwm-ng/Manifest   |   1 -
 net-analyzer/bwm-ng/bwm-ng-0.6.1-r1.ebuild |  38 ---
 .../files/bwm-ng-0.6.1-fix-buildsystem.patch   |  93 
 .../bwm-ng/files/bwm-ng-0.6.1-static-inline.patch  | 256 -
 4 files changed, 388 deletions(-)

diff --git a/net-analyzer/bwm-ng/Manifest b/net-analyzer/bwm-ng/Manifest
index 3a067d36e83..82ed4d73eac 100644
--- a/net-analyzer/bwm-ng/Manifest
+++ b/net-analyzer/bwm-ng/Manifest
@@ -1,3 +1,2 @@
-DIST bwm-ng-0.6.1.tar.gz 162620 BLAKE2B 
28e201ac681fcb1d79afead8a7d2c31d52bfa9ee1ebc132d3cd1080a7edd8ddcc8c0cd6df1897d23a1c79a4a5d9157214a8f3224bd5f8f2c1a12cad96ec188bd
 SHA512 
3f8d4a10f5cbf743d6aee9c6170f334c4274224a2f1886f04338c9a1bf0cf13af5be4aaea0445c9e5b5d361915cc3a93bbfe7c4abf69a0d24e42bc414d8056cd
 DIST bwm-ng-0.6.2.tar.gz 70079 BLAKE2B 
4e0c5dd73bdcaabf5138ce842e5ce50709ba3bc0792f11ebee2640b6246f5bd740fcf8ad79b7dcffabdbc8f44c5ec2d925b20cf28609f8735e537f6920f92aba
 SHA512 
4a7f141692f96dfab0c1729a7df36f5213a75ddb891b967b2cf951419daea7b84354c276705a0ee7c09f4ed26948ca068f65a04b8f9d18b2b8ed2df97b5e3b0a
 DIST bwm-ng-0.6.3.tar.gz 70094 BLAKE2B 
bfc5007470a2e4d7f50dc43dc33898f5bcb34a0eaeeb0f53ed74029299ac2b732d343eaf725144a05b778ad8a204c5d546f0ea0b6aaf997995e2e7a6bc3c6cf6
 SHA512 
85ce29e6ffa9643b4e7c1d731f4e928ddca8cfdc71c86b65ec4e55058b951eb8da9ab80139145300518223589d5fece5bdc11ede91a1ea394d569993ccdb0ab8

diff --git a/net-analyzer/bwm-ng/bwm-ng-0.6.1-r1.ebuild 
b/net-analyzer/bwm-ng/bwm-ng-0.6.1-r1.ebuild
deleted file mode 100644
index 51311ad8055..000
--- a/net-analyzer/bwm-ng/bwm-ng-0.6.1-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Bandwidth Monitor NG is a small and simple console-based 
bandwidth monitor"
-SRC_URI="http://www.gropp.org/bwm-ng/${P}.tar.gz;
-HOMEPAGE="http://www.gropp.org/;
-
-KEYWORDS="amd64 ~arm ppc x86"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="csv html"
-
-RDEPEND="sys-libs/ncurses:0=
-   >=sys-apps/net-tools-1.60-r1"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-   "${FILESDIR}"/${P}-fix-buildsystem.patch
-   "${FILESDIR}"/${P}-static-inline.patch
-)
-
-src_prepare() {
-   default
-   mv configure.{in,ac} || die
-   eautoreconf
-}
-
-src_configure() {
-   econf \
-   $(use_enable csv) \
-   $(use_enable html) \
-   --enable-ncurses \
-   --with-procnetdev
-}

diff --git a/net-analyzer/bwm-ng/files/bwm-ng-0.6.1-fix-buildsystem.patch 
b/net-analyzer/bwm-ng/files/bwm-ng-0.6.1-fix-buildsystem.patch
deleted file mode 100644
index 04c14392d66..000
--- a/net-analyzer/bwm-ng/files/bwm-ng-0.6.1-fix-buildsystem.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-* Fix broken buildsystem
-* Fix ncurses underlinking caused by missing "-ltinfo" in $LIBS
-https://bugs.gentoo.org/show_bug.cgi?id=561718
-
 a/configure.in
-+++ b/configure.in
-@@ -3,7 +3,7 @@
- 
- AC_INIT([bwm-ng],[0.6.1],[bw...@gropp.org],[bwm-ng])
- AC_CONFIG_SRCDIR(src/bwm-ng.c)
--AM_INIT_AUTOMAKE([gnu])
-+AM_INIT_AUTOMAKE([gnu subdir-objects])
- AC_CONFIG_HEADERS(config.h)
- AC_CONFIG_MACRO_DIR(./)
- AC_LANG([C])
-@@ -28,44 +28,12 @@
- AC_CHECK_TYPES(unsigned long long)
- 
- # Checks for libraries.
--CURSES_CHECKED="0"
-+AC_ARG_ENABLE([ncurses],
-+  AS_HELP_STRING([--enable-ncurses], [Enable feature ncurses]))
- 
--AC_ARG_WITH([curses],AS_HELP_STRING([--with-curses],[with curses 
(ARG=PATH)]),[
--if [ test $withval != "no" ]; then
--OLD_CPPFLAGS=$CPPFLAGS
--if [ test $withval != "yes" ]; then
--CPPFLAGS="$CPPFLAGS -I$withval"
--fi
--AC_CHECK_LIB([curses],[newterm,timeout],,[ CPPFLAGS=$OLD_CPPFLAGS ])
--CURSES_CHECKED="1"
--else
--CURSES_CHECKED="1"
--fi  
--])
--
--
--if [ test $CURSES_CHECKED != "1" ]; then
--AC_ARG_WITH([ncurses],AS_HELP_STRING([--with-ncurses],[prefer ncurses over 
curses (ARG=PATH)]),[
--if [ test $withval != "no" ]; then
--OLD_CPPFLAGS=$CPPFLAGS
--if [ test $withval != "yes" ]; then
--CPPFLAGS="$CPPFLAGS -I$withval"
--fi
--AC_CHECK_LIB([ncurses],[newterm,timeout],,[ CPPFLAGS=$OLD_CPPFLAGS ])
--CURSES_CHECKED="1"
--else
--CURSES_CHECKED="1"
--fi
-+AS_IF([test "x$enable_ncurses" != "xno"], [
-+  PKG_CHECK_MODULES([NCURSES], [ncurses], [AC_DEFINE([HAVE_LIBNCURSES], 
[1], [Define to 1 if you have the `ncurses' library (-lncurses).])])
- ])
--fi
--
--
--
--if [ test $CURSES_CHECKED != "1" ]; then
--AC_CHECK_LIB([curses],[initscr,timeout],,[

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

2021-03-15 Thread Ulrich Müller

commit: 3c199f550b02fe6c5e1662487eb87ef3a803c8cc
Author: Ulrich Müller  gentoo  org>
AuthorDate: Mon Mar 15 22:00:58 2021 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Mon Mar 15 22:00:58 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c199f55

app-emacs/nxml-gentoo-schemas: Remove old

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Ulrich Müller  gentoo.org>

 app-emacs/nxml-gentoo-schemas/Manifest |  1 -
 .../nxml-gentoo-schemas-20210203.ebuild| 24 --
 2 files changed, 25 deletions(-)

diff --git a/app-emacs/nxml-gentoo-schemas/Manifest 
b/app-emacs/nxml-gentoo-schemas/Manifest
index f10067864e0..3ae11883efd 100644
--- a/app-emacs/nxml-gentoo-schemas/Manifest
+++ b/app-emacs/nxml-gentoo-schemas/Manifest
@@ -1,3 +1,2 @@
 DIST nxml-gentoo-schemas-20200303.tar.xz 8452 BLAKE2B 
bee7e3d58b03e3aaefcd09d93a9b6919ae6b4892ac09e218ac68cbbc048e28def8b49cc4c583ddad04da61d61bb76386f0c0f33e12d2c8a938447e3f590854d5
 SHA512 
42f8ee48e349423db156d585bdd2c1d333f69693ac541bc44f8c1d0bae412b1793e1d86fc527287225040aa9b4b791ad2922196cf750de6029b4c77eebdc62de
-DIST nxml-gentoo-schemas-20210203.tar.xz 8440 BLAKE2B 
733c7949bd39a94e657c829c478b76229cfbe2edca6f973f45a91423fb573ed6ff5717ef7bca74733266d7ff5b31f5426d06df51d79263422dba1467234ae8ba
 SHA512 
bdd28b40d0748f595b6ac035686605b7d7a08e9802d0e497893329b4cbc1195f4e785befb8afe6362eb8eb45132f3928f394546412ba463c47977587b6f88b3d
 DIST nxml-gentoo-schemas-20210314.tar.xz 8512 BLAKE2B 
9219644c1a0dbc7afc78c0c4f2623d9d71bbd4f62c387eb025e001e756262107d59f739d695c172ae4ef54049b98f4c3e92bc630be39bcf2f6727d8b0ea27247
 SHA512 
a092f48f3fe69df0bc51b3e5dd11a6ef09f4074589ffe9872f4936548caf14554fef8cd8ab42626f621c0163a23879698ad12a0818b52cc4b4a4f384a98afd6c

diff --git a/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20210203.ebuild 
b/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20210203.ebuild
deleted file mode 100644
index b8b974d2577..000
--- a/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20210203.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit elisp
-
-DESCRIPTION="Extension for nxml-mode with Gentoo-specific schemas"
-HOMEPAGE="https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/;
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz;
-
-LICENSE="HPND MIT GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-SITEFILE="60${PN}-gentoo.el"
-
-src_compile() { :; }
-
-src_install() {
-   insinto "${SITEETC}/${PN}"
-   doins schemas.xml *.rnc
-   elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-}

[gentoo-commits] repo/gentoo:master commit in: x11-misc/xkeycaps/

2021-03-15 Thread Sam James

commit: 11001c9600977112e661545fed8498d045a99bb3
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 15 21:55:21 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 15 21:55:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11001c96

x11-misc/xkeycaps: Stabilize 2.47_p7 ppc64, #776475

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

 x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild 
b/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild
index 0ef3edff983..bef2b91b62d 100644
--- a/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild
+++ b/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 
 RDEPEND="
x11-libs/libX11

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

2021-03-15 Thread Sam James

commit: 9cb2f626dc0fa9a75e1fbd417a6bdd29f5ab4850
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 15 21:55:36 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 15 21:55:36 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cb2f626

net-analyzer/tcpstat: Stabilize 1.5_p8 ppc64, #776559

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

 net-analyzer/tcpstat/tcpstat-1.5_p8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/tcpstat/tcpstat-1.5_p8.ebuild 
b/net-analyzer/tcpstat/tcpstat-1.5_p8.ebuild
index 44b7aac3242..d881e2538dc 100644
--- a/net-analyzer/tcpstat/tcpstat-1.5_p8.ebuild
+++ b/net-analyzer/tcpstat/tcpstat-1.5_p8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ppc64 ~sparc ~x86"
 IUSE="ipv6"
 
 DEPEND="

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

2021-03-15 Thread Sam James

commit: 3d72b84ecf0e54a98947e30423bc4408ddde89c4
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 15 21:55:29 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 15 21:55:29 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d72b84e

net-analyzer/amap: Stabilize 5.4-r1 ppc64, #776505

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

 net-analyzer/amap/amap-5.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/amap/amap-5.4-r1.ebuild 
b/net-analyzer/amap/amap-5.4-r1.ebuild
index 179c4aeb13f..2703bd6e4bd 100644
--- a/net-analyzer/amap/amap-5.4-r1.ebuild
+++ b/net-analyzer/amap/amap-5.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.thc.org/releases/${P}.tar.gz;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="libressl ssl"
 
 DEPEND="

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

2021-03-15 Thread Sam James

commit: 491f8fb4087958f8b77f717aa930408e09840a0e
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 15 21:55:32 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 15 21:55:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=491f8fb4

net-analyzer/dnstracer: Stabilize 1.10 ppc64, #776523

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

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

diff --git a/net-analyzer/dnstracer/dnstracer-1.10.ebuild 
b/net-analyzer/dnstracer/dnstracer-1.10.ebuild
index ce0b4cf48bb..c989ddeffa1 100644
--- a/net-analyzer/dnstracer/dnstracer-1.10.ebuild
+++ b/net-analyzer/dnstracer/dnstracer-1.10.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux"
 
 BDEPEND="dev-lang/perl"

[gentoo-commits] repo/gentoo:master commit in: x11-misc/xlockmore/

2021-03-15 Thread Sam James

commit: c38807e8d8fcf665597a12b8bd313bbe4c2f4010
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 15 21:55:25 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 15 21:55:25 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c38807e8

x11-misc/xlockmore: Stabilize 5.65-r1 ppc64, #776478

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

 x11-misc/xlockmore/xlockmore-5.65-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/xlockmore/xlockmore-5.65-r1.ebuild 
b/x11-misc/xlockmore/xlockmore-5.65-r1.ebuild
index 9fe377e6ed0..600c7b14b22 100644
--- a/x11-misc/xlockmore/xlockmore-5.65-r1.ebuild
+++ b/x11-misc/xlockmore/xlockmore-5.65-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 ~sparc x86"
 IUSE="crypt debug gtk imagemagick motif nas opengl pam truetype xinerama 
xlockrc vtlock"
 
 REQUIRED_USE="

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

2021-03-15 Thread Sam James

commit: bca94ee3745b2f138b265f28c93220fff498d22f
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 15 21:55:40 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 15 21:55:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bca94ee3

net-analyzer/tcptrace: Stabilize 6.6.7_p6 ppc64, #776562

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

 net-analyzer/tcptrace/tcptrace-6.6.7_p6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/tcptrace/tcptrace-6.6.7_p6.ebuild 
b/net-analyzer/tcptrace/tcptrace-6.6.7_p6.ebuild
index cb35d6444fb..272209f94e5 100644
--- a/net-analyzer/tcptrace/tcptrace-6.6.7_p6.ebuild
+++ b/net-analyzer/tcptrace/tcptrace-6.6.7_p6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ppc64 ~x86"
 
 DEPEND="
net-libs/libpcap

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

2021-03-15 Thread Sam James

commit: 3b8b9bc44e1fcb130df49ae5f1d04560870d8174
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 15 21:55:10 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 15 21:55:10 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b8b9bc4

app-misc/banner: Stabilize 1.3.5 ppc64, #776430

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

 app-misc/banner/banner-1.3.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/banner/banner-1.3.5.ebuild 
b/app-misc/banner/banner-1.3.5.ebuild
index 3bc94cf6a7f..04ec4557b92 100644
--- a/app-misc/banner/banner-1.3.5.ebuild
+++ b/app-misc/banner/banner-1.3.5.ebuild
@@ -9,7 +9,7 @@ 
SRC_URI="https://github.com/pronovic/${PN}/archive/BANNER_V${PV}.tar.gz;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux 
~x86-linux"
+KEYWORDS="~alpha amd64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux 
~x86-linux"
 
 S="${WORKDIR}/${PN}-${PN^^}_V${PV}"

[gentoo-commits] repo/gentoo:master commit in: x11-misc/trayer/

2021-03-15 Thread Sam James

commit: cf5f3c222a7b3ee3e2589d1be517b0b2b396772b
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 15 21:55:07 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 15 21:55:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf5f3c22

x11-misc/trayer: Stabilize 1.0-r4 ppc64, #776409

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

 x11-misc/trayer/trayer-1.0-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/trayer/trayer-1.0-r4.ebuild 
b/x11-misc/trayer/trayer-1.0-r4.ebuild
index 0f54b5f24b3..d83e08e8ded 100644
--- a/x11-misc/trayer/trayer-1.0-r4.ebuild
+++ b/x11-misc/trayer/trayer-1.0-r4.ebuild
@@ -10,7 +10,7 @@ 
SRC_URI="https://sourceforge.net/projects/fvwm-crystal/files/${PN}/${PV}/${P}.ta
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 
 RDEPEND="
dev-libs/glib:2

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

2021-03-15 Thread Sam James

commit: cf6139d3afe1d475ae125a05293d1f88ffc81961
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 15 21:55:14 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 15 21:55:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf6139d3

app-misc/oneko: Stabilize 1.2_p6_p14-r1 ppc64, #776433

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

 app-misc/oneko/oneko-1.2_p6_p14-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/oneko/oneko-1.2_p6_p14-r1.ebuild 
b/app-misc/oneko/oneko-1.2_p6_p14-r1.ebuild
index 9a0aa666a6f..262843e5b3d 100644
--- a/app-misc/oneko/oneko-1.2_p6_p14-r1.ebuild
+++ b/app-misc/oneko/oneko-1.2_p6_p14-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 
 RDEPEND="
x11-libs/libX11

[gentoo-commits] repo/gentoo:master commit in: x11-misc/xfishtank/

2021-03-15 Thread Sam James

commit: 1602bc0ffecb96608a11b90952fb8d754d232a0c
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 15 21:55:17 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 15 21:55:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1602bc0f

x11-misc/xfishtank: Stabilize 2.5 ppc64, #776469

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

 x11-misc/xfishtank/xfishtank-2.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/xfishtank/xfishtank-2.5.ebuild 
b/x11-misc/xfishtank/xfishtank-2.5.ebuild
index ab236f2799f..7ef03d5d699 100644
--- a/x11-misc/xfishtank/xfishtank-2.5.ebuild
+++ b/x11-misc/xfishtank/xfishtank-2.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz;
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~x86-linux"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-linux"
 
 RDEPEND="
media-libs/imlib2[X]

[gentoo-commits] repo/gentoo:master commit in: dev-db/lmdb/

2021-03-15 Thread Sam James

commit: 5b7c3682d3b6df73e023a3ab2c486b994b97ac10
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 15 21:55:03 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 15 21:55:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b7c3682

dev-db/lmdb: Stabilize 0.9.28 ppc64, #776280

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

 dev-db/lmdb/lmdb-0.9.28.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/lmdb/lmdb-0.9.28.ebuild b/dev-db/lmdb/lmdb-0.9.28.ebuild
index bae420e37c5..8e41dc907e6 100644
--- a/dev-db/lmdb/lmdb-0.9.28.ebuild
+++ b/dev-db/lmdb/lmdb-0.9.28.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://git.openldap.org/openldap/openldap/-/archive/${MY_P}/openldap-$
 
 LICENSE="OPENLDAP"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 DEPEND=""

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

2021-03-15 Thread Sam James

commit: 0eec01035cb3650b797926b1695f615988278c6b
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 15 21:54:28 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 15 21:54:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0eec0103

net-analyzer/fwlogwatch: Stabilize 1.5 x86, #776529

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

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

diff --git a/net-analyzer/fwlogwatch/fwlogwatch-1.5.ebuild 
b/net-analyzer/fwlogwatch/fwlogwatch-1.5.ebuild
index e22a2de6a64..76955ecc565 100644
--- a/net-analyzer/fwlogwatch/fwlogwatch-1.5.ebuild
+++ b/net-analyzer/fwlogwatch/fwlogwatch-1.5.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="A packet filter and firewall log analyzer"
 HOMEPAGE="http://fwlogwatch.inside-security.de/;
 SRC_URI="http://fwlogwatch.inside-security.de/sw/${P}.tar.bz2;
 
-KEYWORDS="amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 LICENSE="GPL-1"
 SLOT="0"
 IUSE="geoip nls zlib"

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

2021-03-15 Thread Sam James

commit: f71cddf2f99b1986aee229fc05fd929bb44ebe4e
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 15 21:54:17 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 15 21:54:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f71cddf2

net-analyzer/darkstat: Stabilize 3.0.719-r3 x86, #776520

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

 net-analyzer/darkstat/darkstat-3.0.719-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/darkstat/darkstat-3.0.719-r3.ebuild 
b/net-analyzer/darkstat/darkstat-3.0.719-r3.ebuild
index a741a6ceb34..f14539d204e 100644
--- a/net-analyzer/darkstat/darkstat-3.0.719-r3.ebuild
+++ b/net-analyzer/darkstat/darkstat-3.0.719-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://unix4lyfe.org/${PN}/${P}.tar.bz2;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 DEPEND="
acct-user/darkstat

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

2021-03-15 Thread Sam James

commit: 2ffc0c797c12557475aea1bfb724eb4fdfaf4ab4
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 15 21:54:09 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 15 21:54:09 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ffc0c79

net-analyzer/bwm-ng: Stabilize 0.6.2 x86, #776514

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

 net-analyzer/bwm-ng/bwm-ng-0.6.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/bwm-ng/bwm-ng-0.6.2.ebuild 
b/net-analyzer/bwm-ng/bwm-ng-0.6.2.ebuild
index b1cd3818847..2b7bf683dc9 100644
--- a/net-analyzer/bwm-ng/bwm-ng-0.6.2.ebuild
+++ b/net-analyzer/bwm-ng/bwm-ng-0.6.2.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="Bandwidth Monitor NG is a small and simple 
console-based bandwidth
 HOMEPAGE="http://www.gropp.org/;
 SRC_URI="https://github.com/vgropp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="amd64 ~arm ppc ~x86"
+KEYWORDS="amd64 ~arm ppc x86"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="+csv +html"

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

2021-03-15 Thread Sam James

commit: c737713e8d8dbb7c90ade67baa49d09076836a57
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 15 21:54:05 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 15 21:54:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c737713e

net-analyzer/arpwatch: Stabilize 3.1-r1 x86, #776511

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

 net-analyzer/arpwatch/arpwatch-3.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/arpwatch/arpwatch-3.1-r1.ebuild 
b/net-analyzer/arpwatch/arpwatch-3.1-r1.ebuild
index a4c80131d8a..88148ee795c 100644
--- a/net-analyzer/arpwatch/arpwatch-3.1-r1.ebuild
+++ b/net-analyzer/arpwatch/arpwatch-3.1-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
https://dev.gentoo.org/~jer/ethercodes.dat-${ETHERCODES_DATE}.xz
 "
 
-KEYWORDS="amd64 ~hppa ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~sparc x86"
 IUSE="selinux"
 
 DEPEND="

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

2021-03-15 Thread Sam James

commit: 8737d388b378e43d9daa208283677d70fe1ac9b4
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 15 21:54:13 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 15 21:54:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8737d388

net-analyzer/cutter: Stabilize 1.04 x86, #776517

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

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

diff --git a/net-analyzer/cutter/cutter-1.04.ebuild 
b/net-analyzer/cutter/cutter-1.04.ebuild
index 6764ea2b674..46cc52cc6f2 100644
--- a/net-analyzer/cutter/cutter-1.04.ebuild
+++ b/net-analyzer/cutter/cutter-1.04.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="http://www.digitage.co.uk/digitage/files/${PN}/${P}.tgz;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 PATCHES=(
"${FILESDIR}"/${PN}-1.03-debian.patch

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

2021-03-15 Thread Sam James

commit: 571f23ca9db591c1c8dc26a1d10feb911ab1f2f9
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 15 21:54:24 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 15 21:54:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=571f23ca

net-analyzer/flow-tools: Stabilize 0.68.6-r1 x86, #776526

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

 net-analyzer/flow-tools/flow-tools-0.68.6-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/flow-tools/flow-tools-0.68.6-r1.ebuild 
b/net-analyzer/flow-tools/flow-tools-0.68.6-r1.ebuild
index 972f6efd964..0f7a1e00b1e 100644
--- a/net-analyzer/flow-tools/flow-tools-0.68.6-r1.ebuild
+++ b/net-analyzer/flow-tools/flow-tools-0.68.6-r1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/5u623l20/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="debug libressl mysql postgres ssl static-libs"
 
 RDEPEND="

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

2021-03-15 Thread Sam James

commit: 3b2f670c7dc9d1f0a50e6533c0fe57f71d8ac5a1
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 15 21:54:21 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 15 21:54:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b2f670c

net-analyzer/dnstracer: Stabilize 1.10 x86, #776523

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

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

diff --git a/net-analyzer/dnstracer/dnstracer-1.10.ebuild 
b/net-analyzer/dnstracer/dnstracer-1.10.ebuild
index 0404a78acb9..ce0b4cf48bb 100644
--- a/net-analyzer/dnstracer/dnstracer-1.10.ebuild
+++ b/net-analyzer/dnstracer/dnstracer-1.10.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux"
 
 BDEPEND="dev-lang/perl"

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

2021-03-15 Thread Sam James

commit: 06932e674e5b5289e93ec5ac7b2cf2f2cd324879
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 15 21:53:12 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 15 21:53:12 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06932e67

net-analyzer/ifstatus: Stabilize 2.0.0 amd64, #776538

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

 net-analyzer/ifstatus/ifstatus-2.0.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/ifstatus/ifstatus-2.0.0.ebuild 
b/net-analyzer/ifstatus/ifstatus-2.0.0.ebuild
index 7b2612d29fe..85a203b8d40 100644
--- a/net-analyzer/ifstatus/ifstatus-2.0.0.ebuild
+++ b/net-analyzer/ifstatus/ifstatus-2.0.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 inherit toolchain-funcs
 
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~x86"
 
 DESCRIPTION="A simple CLI program for displaying network statistics in real 
time"
 HOMEPAGE="http://ifstatus.sourceforge.net/;

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

2021-03-15 Thread Sam James

commit: 61d1dca2440f859fe50b482245cff798c606947e
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 15 21:53:30 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 15 21:53:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61d1dca2

net-analyzer/tcptrace: Stabilize 6.6.7_p6 amd64, #776562

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

 net-analyzer/tcptrace/tcptrace-6.6.7_p6.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/tcptrace/tcptrace-6.6.7_p6.ebuild 
b/net-analyzer/tcptrace/tcptrace-6.6.7_p6.ebuild
index f08f5f8fd7d..cb35d6444fb 100644
--- a/net-analyzer/tcptrace/tcptrace-6.6.7_p6.ebuild
+++ b/net-analyzer/tcptrace/tcptrace-6.6.7_p6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 
 DEPEND="
net-libs/libpcap

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

2021-03-15 Thread Sam James

commit: 3b7030cdfed346ae44daa1f35b24b61a564c6e83
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 15 21:53:01 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 15 21:53:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b7030cd

net-analyzer/dnstracer: Stabilize 1.10 amd64, #776523

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

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

diff --git a/net-analyzer/dnstracer/dnstracer-1.10.ebuild 
b/net-analyzer/dnstracer/dnstracer-1.10.ebuild
index f45b0273f5f..0404a78acb9 100644
--- a/net-analyzer/dnstracer/dnstracer-1.10.ebuild
+++ b/net-analyzer/dnstracer/dnstracer-1.10.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux"
 
 BDEPEND="dev-lang/perl"

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

2021-03-15 Thread Sam James

commit: 4a2e4cc8915ba437d3aa1bf3abcafbcd2fa7d2e1
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 15 21:53:26 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 15 21:53:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a2e4cc8

net-analyzer/tcpstat: Stabilize 1.5_p8 amd64, #776559

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

 net-analyzer/tcpstat/tcpstat-1.5_p8.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/tcpstat/tcpstat-1.5_p8.ebuild 
b/net-analyzer/tcpstat/tcpstat-1.5_p8.ebuild
index a7ffbe9723e..44b7aac3242 100644
--- a/net-analyzer/tcpstat/tcpstat-1.5_p8.ebuild
+++ b/net-analyzer/tcpstat/tcpstat-1.5_p8.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
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="ipv6"
 
 DEPEND="

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

2021-03-15 Thread Sam James

commit: 0a3cacb9353a3493c72214b8049d4a721629c77d
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 15 21:53:22 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 15 21:53:22 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a3cacb9

net-analyzer/packit: Stabilize 1.7 amd64, #776550

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

 net-analyzer/packit/packit-1.7.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/packit/packit-1.7.ebuild 
b/net-analyzer/packit/packit-1.7.ebuild
index 5059d8e159a..676de9627fd 100644
--- a/net-analyzer/packit/packit-1.7.ebuild
+++ b/net-analyzer/packit/packit-1.7.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
@@ -10,7 +10,7 @@ 
SRC_URI="https://github.com/resurrecting-open-source-projects/packit/archive/${P
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 DEPEND="
net-libs/libnet:1.1

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

2021-03-15 Thread Sam James

commit: 8573964e81d58cc36d64f7119742bac07c110e75
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 15 21:53:08 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 15 21:53:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8573964e

net-analyzer/fwlogwatch: Stabilize 1.5 amd64, #776529

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

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

diff --git a/net-analyzer/fwlogwatch/fwlogwatch-1.5.ebuild 
b/net-analyzer/fwlogwatch/fwlogwatch-1.5.ebuild
index bd1e751f1e7..e22a2de6a64 100644
--- a/net-analyzer/fwlogwatch/fwlogwatch-1.5.ebuild
+++ b/net-analyzer/fwlogwatch/fwlogwatch-1.5.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="A packet filter and firewall log analyzer"
 HOMEPAGE="http://fwlogwatch.inside-security.de/;
 SRC_URI="http://fwlogwatch.inside-security.de/sw/${P}.tar.bz2;
 
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc ~x86"
 LICENSE="GPL-1"
 SLOT="0"
 IUSE="geoip nls zlib"

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

2021-03-15 Thread Sam James

commit: 30d05608496d0f1d62cf133aba10d7ba435052e7
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 15 21:53:16 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 15 21:53:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30d05608

net-analyzer/lft: Stabilize 3.91-r1 amd64, #776541

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

 net-analyzer/lft/lft-3.91-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/lft/lft-3.91-r1.ebuild 
b/net-analyzer/lft/lft-3.91-r1.ebuild
index f1fbf871c18..f665ea7132f 100644
--- a/net-analyzer/lft/lft-3.91-r1.ebuild
+++ b/net-analyzer/lft/lft-3.91-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://pwhois.org/get/${P}.tar.gz;
 
 LICENSE="VOSTROM"
 SLOT="0"
-KEYWORDS="~amd64 ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 DEPEND="
net-libs/libpcap

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

2021-03-15 Thread Sam James

commit: e4d45391bc2ec0199a6b49ee81f7935646b872dd
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 15 21:53:04 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 15 21:53:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4d45391

net-analyzer/flow-tools: Stabilize 0.68.6-r1 amd64, #776526

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

 net-analyzer/flow-tools/flow-tools-0.68.6-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/flow-tools/flow-tools-0.68.6-r1.ebuild 
b/net-analyzer/flow-tools/flow-tools-0.68.6-r1.ebuild
index 203402f825d..972f6efd964 100644
--- a/net-analyzer/flow-tools/flow-tools-0.68.6-r1.ebuild
+++ b/net-analyzer/flow-tools/flow-tools-0.68.6-r1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/5u623l20/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ppc ~x86"
+KEYWORDS="amd64 ppc ~x86"
 IUSE="debug libressl mysql postgres ssl static-libs"
 
 RDEPEND="

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

2021-03-15 Thread Michał Górny

commit: 3c1f620817261f7fe1fe961efff0c82c3c2d7e77
Author: Michał Górny  gentoo  org>
AuthorDate: Mon Mar 15 21:41:20 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon Mar 15 21:44:43 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c1f6208

dev-python/twine: Bump to 3.4.0

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/twine/Manifest   |  1 +
 dev-python/twine/twine-3.4.0.ebuild | 56 +
 2 files changed, 57 insertions(+)

diff --git a/dev-python/twine/Manifest b/dev-python/twine/Manifest
index 565838b1acc..a91b4e931df 100644
--- a/dev-python/twine/Manifest
+++ b/dev-python/twine/Manifest
@@ -1 +1,2 @@
 DIST twine-3.3.0.tar.gz 148996 BLAKE2B 
60668acd0481534631ca0ecf3c755df7e9e46c6d183d0f1c73ed7467cfecc144878d6ccf7ef2ee62efa17eb5629f5ed74c77c8ae4d57ef16530fad31afe40d97
 SHA512 
94fc7a9b3f2b5fc7c06baf55debf4fd55f6a2b4c4321c9bff46b844166769ce8bdcab10355c4967998149b62e13b26e11a30ff66042bfdd5af24d448321fd291
+DIST twine-3.4.0.tar.gz 211582 BLAKE2B 
6b309880e96142a666f0113343f6a7a604ec6058f58429befa4709366d8dd8b6ddd0d2cd69d74653d12a74a615e6e3ad6b7d96892aa5beab00c934be2fc4b8d6
 SHA512 
6ce4757048fe7b5ada8a384fa185e80cee8412ef7f0561f55a5cbec39c0069522b57e403f148b9b55c55330a577873a5e9597ca0a6b0fb0cce6b377c8df07e4e

diff --git a/dev-python/twine/twine-3.4.0.ebuild 
b/dev-python/twine/twine-3.4.0.ebuild
new file mode 100644
index 000..e71049c037c
--- /dev/null
+++ b/dev-python/twine/twine-3.4.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of utilities for publishing packages on PyPI"
+HOMEPAGE="https://twine.readthedocs.io/ https://github.com/pypa/twine 
https://pypi.org/project/twine/;
+SRC_URI="https://github.com/pypa/twine/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 
~x64-macos"
+
+RDEPEND="
+   >=dev-python/colorama-0.4.3[${PYTHON_USEDEP}]
+   >=dev-python/importlib_metadata-3.6[${PYTHON_USEDEP}]
+   >=dev-python/keyring-15.1[${PYTHON_USEDEP}]
+   dev-python/packaging[${PYTHON_USEDEP}]
+   >=dev-python/pkginfo-1.4.2[${PYTHON_USEDEP}]
+   >=dev-python/readme_renderer-21.0[${PYTHON_USEDEP}]
+   >=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
+   >=dev-python/requests-toolbelt-0.8.0[${PYTHON_USEDEP}]
+   >=dev-python/rfc3986-1.4.0[${PYTHON_USEDEP}]
+   >=dev-python/tqdm-4.14[${PYTHON_USEDEP}]
+"
+BDEPEND="
+   dev-python/setuptools_scm[${PYTHON_USEDEP}]
+   test? (
+   dev-python/jaraco-envs[${PYTHON_USEDEP}]
+   dev-python/jaraco-functools[${PYTHON_USEDEP}]
+   dev-python/munch[${PYTHON_USEDEP}]
+   dev-python/portend[${PYTHON_USEDEP}]
+   dev-python/pretend[${PYTHON_USEDEP}]
+   dev-python/pypiserver[${PYTHON_USEDEP}]
+   dev-python/pytest[${PYTHON_USEDEP}]
+   )
+"
+
+distutils_enable_tests --install pytest
+
+python_prepare_all() {
+   # requires internet
+   rm -f tests/test_integration.py || die
+   # pytest-socket dep relevant only to test_integration, and upstream
+   # disables it anyway
+   sed -i -e '/--disable-socket/d' pytest.ini || die
+   sed -i -e '/--cov/d' pytest.ini || die
+
+   distutils-r1_python_prepare_all
+   export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}

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

2021-03-15 Thread Michał Górny

commit: 852221f384e65333e83b347657582499a264d8e4
Author: Michał Górny  gentoo  org>
AuthorDate: Mon Mar 15 21:42:54 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon Mar 15 21:44:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=852221f3

dev-python/httpx: Bump to 0.17.1

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/httpx/Manifest|  1 +
 dev-python/httpx/httpx-0.17.1.ebuild | 46 
 2 files changed, 47 insertions(+)

diff --git a/dev-python/httpx/Manifest b/dev-python/httpx/Manifest
index 5f476ecf403..8232ca75543 100644
--- a/dev-python/httpx/Manifest
+++ b/dev-python/httpx/Manifest
@@ -1,2 +1,3 @@
 DIST httpx-0.16.1.tar.gz 965347 BLAKE2B 
a6c5bcdda595ffcfb824194564ebd93760a9180e60665a9540fc6a2822b1be4273b940fee61cb4b49c2d97a5f4d71b1caf32deddec18d2fb636465b3868aece4
 SHA512 
d76b2c94c655c187ab150f20b16906034574d017a67c4a06c456d55071434cc0ba7752bdceda86aa6b1a1fe9109fa11594e4ea679cd7d2a77898fb40fa5153d3
 DIST httpx-0.17.0.tar.gz 1651681 BLAKE2B 
46eec46d5f2006667ab51e5e4d98c1a22783351d9e2fa50ccab2431bf6e52dd9b124d50b32f151fc171561c913d879cfec4f717ea22fd2a333c13190368ab505
 SHA512 
9471c404c02481a10d42e10e36a55cd55cdecd2cd98a8f3ca1f453a7f1ad7f1ce3b292b8fe583b1c95119f27c0b2eefc756b4e4ed353e3383c12009f3bde21cd
+DIST httpx-0.17.1.tar.gz 1651788 BLAKE2B 
445e61dba5a2648191f57352b664a33785af01bb9ca29c7f553d10111894d0b4011a6987bdea880dd3fc87a60ddee7813a2d51e12178277b60ac27ac6fa930ef
 SHA512 
260040e266144f56b8d1cd085e0d97f2b570c685560fd2bc6baca633e8c9e88a666d0ba072048d63f826dd380df7116ce676dcfb48406e39a7480c44f73368c6

diff --git a/dev-python/httpx/httpx-0.17.1.ebuild 
b/dev-python/httpx/httpx-0.17.1.ebuild
new file mode 100644
index 000..8c321dc80c6
--- /dev/null
+++ b/dev-python/httpx/httpx-0.17.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Fully-featured HTTP client which provides sync and async APIs"
+HOMEPAGE="https://www.python-httpx.org/;
+SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+   dev-python/certifi[${PYTHON_USEDEP}]
+   dev-python/sniffio[${PYTHON_USEDEP}]
+   =dev-python/httpcore-0.12.1[${PYTHON_USEDEP}]
+   >=dev-python/rfc3986-1.3[${PYTHON_USEDEP}]
+

[gentoo-commits] repo/gentoo:master commit in: x11-misc/xkbd/, x11-misc/xkbd/files/

2021-03-15 Thread Sam James

commit: 8d14975f22f58971fda19896b9ddce28c16da4e5
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 15 21:28:13 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 15 21:34:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d14975f

x11-misc/xkbd: drop 0.8.16-r1

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

 x11-misc/xkbd/Manifest |  1 -
 .../files/xkbd-0.8.15-fix-keysyms-search.patch | 13 
 .../xkbd/files/xkbd-0.8.15-increase-delay.patch| 22 -
 x11-misc/xkbd/files/xkbd-0.8.16-desktop.patch  | 19 ---
 x11-misc/xkbd/files/xkbd-0.8.16-fix-geometry.patch | 36 -
 x11-misc/xkbd/xkbd-0.8.16-r1.ebuild| 37 --
 6 files changed, 128 deletions(-)

diff --git a/x11-misc/xkbd/Manifest b/x11-misc/xkbd/Manifest
index 83c85c52734..98bc0f06063 100644
--- a/x11-misc/xkbd/Manifest
+++ b/x11-misc/xkbd/Manifest
@@ -1,2 +1 @@
-DIST xkbd-0.8.16.tar.gz 347616 BLAKE2B 
a7ee906d6ae3328d5366b88ebe960b6fdf84a5cad1c1db4b1a0056fc5842196699dfa749c3c0398054bc54073b422798c0efaf57c8116d05b6754c84d6abae03
 SHA512 
8410f722cb93069eea26f9d1ed6b9fea76ed5222b8586c2f78ccc1a0f040a964e165df0611ce72c108dbc7adeec31515595c81be3867e68c0cadd8846d985d4a
 DIST xkbd-0.8.18.tar.gz 50421 BLAKE2B 
7652f33cdf00584cc55fcb9dbced9d92c57cf6383b6164d8c026bf88c962e7469b094de7454b451745feb396fbe5ad561193c9d4de8e7b9f65c27a55e7cf478c
 SHA512 
335e18e76e6bf8b7142eb785c9003e8a3d80719e6737149be8e1178bd7281fada6808ea0b18538caf3c3fa1d62778a3d6a45a1fa8b3b0845dca19f3e62942831

diff --git a/x11-misc/xkbd/files/xkbd-0.8.15-fix-keysyms-search.patch 
b/x11-misc/xkbd/files/xkbd-0.8.15-fix-keysyms-search.patch
deleted file mode 100644
index ff30537add4..000
--- a/x11-misc/xkbd/files/xkbd-0.8.15-fix-keysyms-search.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://bugs.gentoo.org/287075
-
 a/src/libvirtkeys.c
-+++ b/src/libvirtkeys.c
-@@ -341,7 +341,7 @@
- 
-   for (keycode = 0; ((keycode < (maxKeycode - minKeycode + 1)) && 
!found); keycode++)
-   {
--  for (column = 0; ((column < keysymsPerKeycode) && !found); 
column++)
-+  for (column = 0; ((column < (keysymsPerKeycode > 4 ? 4 : 
keysymsPerKeycode)) && !found); column++)
-   {
-   if (keymap[(keycode * keysymsPerKeycode + column)] == 
ks)
-   {

diff --git a/x11-misc/xkbd/files/xkbd-0.8.15-increase-delay.patch 
b/x11-misc/xkbd/files/xkbd-0.8.15-increase-delay.patch
deleted file mode 100644
index deadcd7cddb..000
--- a/x11-misc/xkbd/files/xkbd-0.8.15-increase-delay.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ruN xkbd-0.8.15/data/en_GB.qwerty.xkbd.in 
xkbd-0.8.15-new/data/en_GB.qwerty.xkbd.in
 xkbd-0.8.15/data/en_GB.qwerty.xkbd.in  2003-08-10 10:46:29.0 
-0700
-+++ xkbd-0.8.15-new/data/en_GB.qwerty.xkbd.in  2008-03-23 02:52:52.0 
-0700
-@@ -24,6 +24,7 @@
- 
- # button style, can be rounded ( default ), square or plain
- button_style square
-+repeat_delay 50
- 
- 
- #
-diff -ruN xkbd-0.8.15/data/en_US.qwerty.xkbd.in 
xkbd-0.8.15-new/data/en_US.qwerty.xkbd.in
 xkbd-0.8.15/data/en_US.qwerty.xkbd.in  2002-11-28 03:46:04.0 
-0800
-+++ xkbd-0.8.15-new/data/en_US.qwerty.xkbd.in  2008-03-23 02:50:39.0 
-0700
-@@ -26,6 +26,7 @@
- 
- # button style, can be rounded ( default ), square or plain
- # button_style plain
-+repeat_delay 50
- 
- 
- 

diff --git a/x11-misc/xkbd/files/xkbd-0.8.16-desktop.patch 
b/x11-misc/xkbd/files/xkbd-0.8.16-desktop.patch
deleted file mode 100644
index 987270d1d39..000
--- a/x11-misc/xkbd/files/xkbd-0.8.16-desktop.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Fixes following QA issues:
- * QA Notice: This package installs one or more .desktop files that do not
- * pass validation.
- * 
- * /usr/share/applications/inputmethods/xkbd.desktop: error: (will be 
fatal in the future): value "xkbd.png" for key "Icon" in group "Desktop Entry" 
is an icon name with an extension, but there should be no extension as 
described in the Icon Theme Specification if the value is not an absolute path
- * /usr/share/applications/inputmethods/xkbd.desktop: error: value 
"Panel;Utility;MB" for key "Categories" in group "Desktop Entry" contains an 
unregistered value "MB"; values extending the format should start with "X-"
- * /usr/share/applications/inputmethods/xkbd.desktop: error: value 
"Panel;Utility;MB" for key "Categories" in group "Desktop Entry" contains an 
unregistered value "Panel"; values extending the format should start with "X-"
- * 
 a/xkbd.desktop 2003-09-29 20:29:35.0 +0300
-+++ b/xkbd.desktop 2017-02-16 16:23:40.927035269 +0200
-@@ -3,6 +3,6 @@
- Comment=Virtual Keyboard
- Exec=xkbd
- Type=Application
--Icon=xkbd.png
--Categories=Panel;Utility;MB
-+Icon=xkbd
-+Categories=Utility;Accessibility
- X-MB-INPUT-MECHANSIM=True

diff --git

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

2021-03-15 Thread Sam James

commit: 45047b95bd51f4e6626278282c4ed8471dff0830
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 15 21:32:41 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 15 21:38:36 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45047b95

net-analyzer/argus: drop 3.0.8.2-r3, 3.0.8.2-r4

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

 net-analyzer/argus/Manifest|  1 -
 net-analyzer/argus/argus-3.0.8.2-r3.ebuild | 84 -
 net-analyzer/argus/argus-3.0.8.2-r4.ebuild | 85 --
 .../argus/files/argus-3.0.8.2-fno-common.patch | 45 
 net-analyzer/argus/files/argus-3.0.8.2-rpc.patch   | 45 
 5 files changed, 260 deletions(-)

diff --git a/net-analyzer/argus/Manifest b/net-analyzer/argus/Manifest
index 960cce267b5..196e3c62193 100644
--- a/net-analyzer/argus/Manifest
+++ b/net-analyzer/argus/Manifest
@@ -1,2 +1 @@
-DIST argus-3.0.8.2.tar.gz 524749 BLAKE2B 
4d93fd8acd71b198da712961d75f0e813f5ed3fde841e77b8a10c3a9b89571902b7597969a4be12437c97ffc69ba5ebefaee8b684c5d2d4ce4f1309c1cfd1199
 SHA512 
146795880d8697e065ed23d2fbab226846d55db0b71945c5a4cab2896e48ceb6e1671ccb4e00dc3b0f984525bac4ced3773f3b9e70c3ea5f7c6972fe9bd94313
 DIST argus-3.0.8.3.tar.gz 524549 BLAKE2B 
f905784c12d28d4440a7a6954441ce4f0865125a87e3d740edd5785e729f8b5b45967d97aef4f72802d2166b76176e15c6f15ec99b87ae1d14849ae92c65ad76
 SHA512 
f66db5b3bb1305825b76a7eda413d5805d65182aabef647e27716cfd629327b3aab8c299bc8af419199ac655cef4ac3bfcb83c059080e98b042e09f79f01d82a

diff --git a/net-analyzer/argus/argus-3.0.8.2-r3.ebuild 
b/net-analyzer/argus/argus-3.0.8.2-r3.ebuild
deleted file mode 100644
index 47656c47be5..000
--- a/net-analyzer/argus/argus-3.0.8.2-r3.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools epatch
-
-DESCRIPTION="network Audit Record Generation and Utilization System"
-HOMEPAGE="https://www.qosient.com/argus/;
-SRC_URI="https://www.qosient.com/argus/dev/${P/_rc/.rc.}.tar.gz;
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="debug +libtirpc sasl tcpd"
-
-RDEPEND="
-   acct-group/argus
-   acct-user/argus
-   net-libs/libnsl:=
-   net-libs/libpcap
-   sys-libs/zlib
-   !libtirpc? ( sys-libs/glibc[rpc(-)] )
-   libtirpc? ( net-libs/libtirpc )
-   sasl? ( dev-libs/cyrus-sasl )
-   tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-"
-DEPEND="
-   ${RDEPEND}
-   >=sys-devel/bison-1.28
-   >=sys-devel/flex-2.4.6
-"
-
-S=${WORKDIR}/${P/_rc/.rc.}
-
-src_prepare() {
-   find . -type f -execdir chmod +w {} \; #561360
-   sed -e 's:/etc/argus.conf:/etc/argus/argus.conf:' \
-   -i argus/argus.c \
-   -i support/Config/argus.conf \
-   -i man/man8/argus.8 \
-   -i man/man5/argus.conf.5 || die
-
-   sed -e 's:#\(ARGUS_SETUSER_ID=\).*:\1argus:' \
-   -e 's:#\(ARGUS_SETGROUP_ID=\).*:\1argus:' \
-   -e 's:\(#ARGUS_CHROOT_DIR=\).*:\1/var/lib/argus:' \
-   -i support/Config/argus.conf || die
-   epatch \
-   
"${FILESDIR}"/${PN}-3.0.8.1-disable-tcp-wrappers-automagic.patch \
-   "${FILESDIR}"/${PN}-3.0.5-Makefile.patch \
-   "${FILESDIR}"/${PN}-3.0.7.3-DLT_IPNET.patch \
-   "${FILESDIR}"/${PN}-3.0.8.2-rpc.patch
-
-   epatch_user
-   eautoreconf
-}
-
-src_configure() {
-   use debug && touch .debug # enable debugging
-   econf $(use_with libtirpc) $(use_with tcpd wrappers) $(use_with sasl)
-}
-
-src_compile() {
-   emake CCOPT="${CFLAGS} ${LDFLAGS}"
-}
-
-src_install() {
-   doman man/man5/*.5 man/man8/*.8
-
-   dosbin bin/argus{,bug}
-
-   dodoc ChangeLog CREDITS README
-
-   insinto /etc/argus
-   doins support/Config/argus.conf
-
-   newinitd "${FILESDIR}/argus.initd" argus
-   keepdir /var/lib/argus
-}
-
-pkg_postinst() {
-   elog "Note, if you modify ARGUS_DAEMON value in argus.conf it's quite"
-   elog "possible that the init script will fail to work."
-}

diff --git a/net-analyzer/argus/argus-3.0.8.2-r4.ebuild 
b/net-analyzer/argus/argus-3.0.8.2-r4.ebuild
deleted file mode 100644
index dd6e555ef54..000
--- a/net-analyzer/argus/argus-3.0.8.2-r4.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="network Audit Record Generation and Utilization System"
-HOMEPAGE="https://openargus.org/;
-SRC_URI="https://www.qosient.com/argus/dev/${P/_rc/.rc.}.tar.gz;
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="debug +libtirpc sasl tcpd"
-
-RDEPEND="
-   acct-group/argus
-

1 2 3 4 5 6 >

1 - 100 of 515 matches

Mail list logo