[gentoo-commits] repo/gentoo:master commit in: net-mail/dovecot/

2019-08-07 Thread Eray Aslan
commit: 63226975641987c8e48036b19ae2c05e0ad9896a
Author: Eray Aslan  gentoo  org>
AuthorDate: Thu Aug  8 05:53:11 2019 +
Commit: Eray Aslan  gentoo  org>
CommitDate: Thu Aug  8 05:53:11 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63226975

net-mail/dovecot: remove old

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Eray Aslan  gentoo.org>

 net-mail/dovecot/Manifest   |   5 -
 net-mail/dovecot/dovecot-2.3.5.1.ebuild | 294 
 net-mail/dovecot/dovecot-2.3.5.2.ebuild | 294 
 net-mail/dovecot/dovecot-2.3.7.ebuild   | 292 ---
 4 files changed, 885 deletions(-)

diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index fdf7e81dd84..078f5158c00 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -1,11 +1,6 @@
 DIST dovecot-2.2-pigeonhole-0.4.24.1.tar.gz 1810959 BLAKE2B 
f24b28dc7422ea4f379e372adf33ebbf7cbb146d55b01dbf40580767a14adf695b0a2726f591c0c34436bd93a8b48ee8a8c4307fffc6b082d9c028ce93e29a0a
 SHA512 
99af8a1f4588d821c7000133c5c173ab05640d3411b826a0978db2d60c9a59d5b330ca2d38aa25aa1163f6d1b669dc97b8303e2bceda554f67d0029d5d0b34fd
 DIST dovecot-2.2.36.3.tar.gz 6270735 BLAKE2B 
90bd6f7cd3769040215f574bb368c1ad835041fff54273e2477be2d2e057c1700472b08a24ed3a7cad469bd39449d94986bc6801373bb97a63975ddbb54cefa5
 SHA512 
47611dbde7ee854ad323dcdb726757c7172376761fa774f28fce3f9d74ed590319d812f0555abed5f8178c326c3cb7661ac0b708ca5982914e255cec60f72e35
-DIST dovecot-2.3-pigeonhole-0.5.5.tar.gz 1847487 BLAKE2B 
9574388566778a4011ce6546021675ed9e07ba0d874dc4163e4cea10096f3bb8a434f198c3bb446b628ee18402afe94bd90b7123b3cf4d47e4095ddad12d9bfc
 SHA512 
21519fc9b1152a947b64ce4251e1a4bdbe003b48233b1856a32696f9c1e29f730268c56eb38f9431bbfac345e6cd42e8c78c87d0702f39ebf20c6d326dcdbb94
 DIST dovecot-2.3-pigeonhole-0.5.6.tar.gz 1854287 BLAKE2B 
a26edf2a298d8c3de0d9977d56583bd2e0933495c5f554871a38d7b9e31701ebf3587d221c5ec398721a9c34816918c41b069de39c13f879334f9776fede1a17
 SHA512 
998a046d2eb5ff7bba615fd1a3efdfb1e7e1dabf191257f7fa2882074acc1735a0a4c11c5f31bab1e964b0118f1a8e9e51b3d5529b8fff6d1312c9a8257d9c20
 DIST dovecot-2.3-pigeonhole-0.5.7.1.tar.gz 1857291 BLAKE2B 
09763c87099ac50fbe86870855b100379a9b2a72d6077438bbf1f76ff3aed162ad781be27e6587a9742819137f6636f142a220f3b46d3c46115b10cbf4cb2efc
 SHA512 
121eac4ad8bc1ddc55c554d00338bb553590b6aedffcb11e34f6cba102d59bd34580cb7218bd5fe820038c004d12db73f7a27ca135c3d4a12c4449bae3216355
-DIST dovecot-2.3-pigeonhole-0.5.7.tar.gz 1856779 BLAKE2B 
ce9fe5570f058ceed6ef5ea5f732b079e7924bcdc8910cb13e8686898b654705ea006286cbb19105975f83d6c96a0256106b6f0ec10f561cd6040311be2087d8
 SHA512 
f58098ae13b41a6378080340240928083514a541f2fe3c8f516853455ab27635e0c47587a101aca5eb4e97ec8afe6a5dd5360c46e956b009ae971316e491f1b8
-DIST dovecot-2.3.5.1.tar.gz 6953150 BLAKE2B 
04484325e7b87f78c0aa6e3c769bc921e9dc62562cd8705b99166b7291b794f434b088dcf6512bc21c96d8937475cafa4d49c6ac611cb07f74a0d20e15e185c7
 SHA512 
e87754461fb0b065acd0ff10dc955000a2fe5baffed69efaf328ce9268f90140e9de444bc68e0bd48b565c7622885a79b1f90ff3dd2335c0c2362d05d9e73e8a
-DIST dovecot-2.3.5.2.tar.gz 6953228 BLAKE2B 
d3634ca0621349ed82c552b416bd633497ce9e4bdd5df30c2e35da1ab70a5934e2dda2b88ac6bbebeebc23918d9dcfb7a0976b1b51fba5eefd14327b2b2ea734
 SHA512 
041ec1c33c6accb5c89d96d7ab2f7dd59795f496c17faea1906e7977983e4a387aa855a238376515c09532731634d9d42e6d6be22659062855241847ea0213d5
 DIST dovecot-2.3.6.tar.gz 6980135 BLAKE2B 
59ce625aafb96092cbd687aa0d5ccc3d7697228606978efa89bbf50e608915e381abb79348197aaf3b3fa046618bcf88acdc77420f9f028035653b8cb9843009
 SHA512 
ec28af2efcbd4ab534298c3342709251074dcdb0f0f4bcad0d24b996b273387e2ce557d7ab54abafb69be3ed7dd61f25c82b9710d78156932e2eff7f941c9eb2
 DIST dovecot-2.3.7.1.tar.gz 7076500 BLAKE2B 
fba84e324de44a4f463769ee8b99ddc532f3ac3fad3c55a1035a367c7b186850cd49c3c45ecea439469e84abf2ae26dcfc8f454c3d2dab43be0fd89721c8053f
 SHA512 
9addfe2be9ae745ac9164e1658e6638df96bd611d45f172e2cd1cb2c6596e4ce534674e9eea3c1d17f497555061031916e0fb9a9fbc6de0eb6034e2fd0bed3b9
-DIST dovecot-2.3.7.tar.gz 7074117 BLAKE2B 
30aa02cc1dbd83f2ecc65f7b27543d3a1614c857e3d432454f13e4108cb4a15fc37c8c07835a2eaeb6b03077066fba2ed947e30f033926f52213a7446dd096eb
 SHA512 
a8828b6cdf0ada0d317a4606d88370f1360415dadcf0f3a6f157d76396bcaf7379d85114d9747011b429ee94bee8eff7de8d0b6cf25e2618af15fdfba8ae4508

diff --git a/net-mail/dovecot/dovecot-2.3.5.1.ebuild 
b/net-mail/dovecot/dovecot-2.3.5.1.ebuild
deleted file mode 100644
index f708782a71c..000
--- a/net-mail/dovecot/dovecot-2.3.5.1.ebuild
+++ /dev/null
@@ -1,294 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# do not add a ssl USE flag.  ssl is mandatory
-SSL_DEPS_SKIP=1
-inherit autotools eapi7-ver ssl-cert systemd user
-
-MY_P="${P/_/.}"
-#MY_S="${PN}-ce-${PV}"
-major_minor="$(ver_cut 1-2)"
-sieve_version="0.5.5"
-if [[ 

[gentoo-commits] repo/gentoo:master commit in: mail-mta/postfix/, mail-mta/postfix/files/

2019-08-07 Thread Eray Aslan
commit: 41c3137131f3c139d46630694a8e96474c24e6c8
Author: Eray Aslan  gentoo  org>
AuthorDate: Thu Aug  8 05:43:17 2019 +
Commit: Eray Aslan  gentoo  org>
CommitDate: Thu Aug  8 05:43:17 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41c31371

mail-mta/postfix: remove old

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Eray Aslan  gentoo.org>

 mail-mta/postfix/Manifest  |   3 -
 .../postfix/files/postfix-libressl-eccurve.patch   |  16 -
 .../postfix/files/postfix-libressl-runtime.patch   | 102 ---
 .../files/postfix-libressl-session-tickets.patch   |  11 -
 mail-mta/postfix/files/postfix-libressl.patch  |  17 --
 mail-mta/postfix/files/postfix-linux-5.patch   |  23 --
 mail-mta/postfix/postfix-3.2.4.ebuild  | 308 
 mail-mta/postfix/postfix-3.3.1-r1.ebuild   | 300 ---
 mail-mta/postfix/postfix-3.3.4.ebuild  | 309 
 mail-mta/postfix/postfix-3.4.5.ebuild  | 324 -
 10 files changed, 1413 deletions(-)

diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index b94bafd3271..23ba1de0693 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -1,7 +1,4 @@
 DIST postfix-2.10.9.tar.gz 3820525 BLAKE2B 
ed1fc10f016cdc63fe2b86c68cca270c98348417babf6d8e05f76fa2550f5cbca95825f14cf54897e66323cdbe6132a1046402b853b6f000ade630277278c748
 SHA512 
c77df7ccc051bd72271dc5298da0ca4e45397b1ba96fc8be31e095f5b15cd30ebc0b29cf638e76efc65503cb241efd937f2d64aaa97243402c35e2927b7a7b91
-DIST postfix-3.2.4.tar.gz 4390376 BLAKE2B 
132a6b467f9156d716a92cc7beae0f9a7c47e6a2045e83726a5e7305e6f9bf666ebcfb93a9ab1a96ec988431661059d62e926287bd13089eeb4bab3e8f4b9fc7
 SHA512 
6dc583d3b1c98f5c8d6486351bee9f92a98b5379cd0d76d26a382379c112317e7a2a58c3a200477a6d0f831c73395257d1a63170df17ea8a65a4048a7df391f8
-DIST postfix-3.3.1.tar.gz 4420912 BLAKE2B 
065fd04cdfa343a6c50a629e8da47fad71465df790ca88adcad4efc7ab273330c39998c6bf503587b8bcba3d87bb98b1be6413e49449e2241258a99217473c11
 SHA512 
2307f50f8b7dab1db46ebe4ae30bc5682a25b9c49ae5ae65aa95b4620bb5450dd5929977c0f34b9e73a92ca6af36fd8e24167732420a1a2d89167c7a3b197276
-DIST postfix-3.3.4.tar.gz 4429964 BLAKE2B 
58812a75e7f8e2e89dce3dd8cb8b779c4b90995ce9d1885cec0fc475c8dc267741ea6c7af6e82fc80e3f71244964df9a5fe776c3b09e5e0cad1f59424dfab6b3
 SHA512 
fccc524167ea3b85f4fe0fc4ad8312f6d684c1900e7c5c355d4522513f74b588bbfcfd28074a8b69ce038982fcaa359abf585a296df4046184c7da6d0405d0ee
 DIST postfix-3.4.5.tar.gz 4581301 BLAKE2B 
9de66cab6eea610fc83e4629980b3e201b4e3f9185729cb84933aa940b64b7818d0439c5145ea0b635666db92c970e1974f4f439cd3b733c58e1fe5794c046fa
 SHA512 
af59d960b40799f7667935bef8fafb93ae6dcb70abaa77a15cf498571f37fa0429f411f9f08b1b6bfa588d3f572260d14d6d5409f0cd1e82b1c59928b2124c94
 DIST postfix-3.4.6.tar.gz 4571771 BLAKE2B 
e08b2e6c01fe54fcc7439182783190f4adb81758a1bbcc1bfec71e02dca91a779308f624e081837f7e2deec8666f10bc51238e90cc952de6c8371fb18790604f
 SHA512 
96430d60cf58b9876e52a742dbfe3ca1da4ec82eeea5cd35c6ee4e69714ddd5601561a6663aac51a34b2d64db4f7678d7c5d720ec9ead807b5d7e87e37434961
 DIST postfix-3.5-20190724.tar.gz 4606145 BLAKE2B 
e197542d71d953ca1b86e8bd4bc433a50b52d0ad2aa0874680d1c611be1cf9fdbf309b29884fb7bb7707a5d3380de5131fb5361fceb359048ca0106e5576f7b6
 SHA512 
eb08681c8660073681ab5c8b6c36acebddaf4f8780b69583117293ba275d03a1bd94f7c08cbcd0dd65f010a480867e419cd008eb9c29a9b95a2101b5ad3b34a0

diff --git a/mail-mta/postfix/files/postfix-libressl-eccurve.patch 
b/mail-mta/postfix/files/postfix-libressl-eccurve.patch
deleted file mode 100644
index 7ce14fd17ad..000
--- a/mail-mta/postfix/files/postfix-libressl-eccurve.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Bug: https://bugs.gentoo.org/659224
-$OpenBSD: patch-src_tls_tls_dh_c,v 1.2 2017/02/04 22:09:44 sthen Exp $
-
-Fix building with LibreSSL
-
 src/tls/tls_dh.c.orig  Mon Dec 26 18:47:24 2016
-+++ src/tls/tls_dh.c   Sat Feb  4 01:45:39 2017
-@@ -314,7 +314,7 @@ voidtls_auto_eecdh_curves(SSL_CTX *ctx)
-  * This is a NOP in OpenSSL 1.1.0 and later, where curves are always
-  * auto-negotiated.
-  */
--#if OPENSSL_VERSION_NUMBER < 0x1010UL
-+#if OPENSSL_VERSION_NUMBER < 0x1010UL || defined(LIBRESSL_VERSION_NUMBER)
- if (SSL_CTX_set_ecdh_auto(ctx, 1) <= 0) {
-   msg_warn("failed to enable automatic ECDHE curve selection");
-   tls_print_errors();

diff --git a/mail-mta/postfix/files/postfix-libressl-runtime.patch 
b/mail-mta/postfix/files/postfix-libressl-runtime.patch
deleted file mode 100644
index 814088610a8..000
--- a/mail-mta/postfix/files/postfix-libressl-runtime.patch
+++ /dev/null
@@ -1,102 +0,0 @@
 src/posttls-finger/posttls-finger.c.orig   2016-08-27 20:27:50 UTC
-+++ src/posttls-finger/posttls-finger.c
-@@ -1511,7 +1511,8 @@ static int finger(STATE *state)
- return (0);
- }
- 
--#if defined(USE_TLS) && OPENSSL_VERSION_NUMBER < 0x1010L
-+#if 

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

2019-08-07 Thread Michał Górny
commit: 42e938aefdf1bf869bc8ed457b3b93bfe1843140
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Aug  8 03:35:38 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Aug  8 03:35:38 2019 +
URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=42e938ae

Bump pkgcheck2html

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

 pkgcheck2html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgcheck2html b/pkgcheck2html
index 934abd4..517a940 16
--- a/pkgcheck2html
+++ b/pkgcheck2html
@@ -1 +1 @@
-Subproject commit 934abd4b9add0451cef810871c850381910cc324
+Subproject commit 517a940e50092970701e9955873eb7a4962579f3



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

2019-08-07 Thread Joonas Niilola
commit: e70a21e39f8ca22c1316866563b70763b1503451
Author: Conrad Kostecki  kostecki  com>
AuthorDate: Wed Aug  7 20:14:11 2019 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Aug  8 03:32:41 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e70a21e3

app-misc/glcdprocdriver: drop ~ppc keyword

Due usage of , it can't be compiled anymore on ~ppc.

Bug: https://bugs.gentoo.org/691672
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Conrad Kostecki  kostecki.com>
Signed-off-by: Joonas Niilola  gentoo.org>

 app-misc/glcdprocdriver/glcdprocdriver-0.1.2.ebuild | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app-misc/glcdprocdriver/glcdprocdriver-0.1.2.ebuild 
b/app-misc/glcdprocdriver/glcdprocdriver-0.1.2.ebuild
index 3a914692ace..baabf0037ba 100644
--- a/app-misc/glcdprocdriver/glcdprocdriver-0.1.2.ebuild
+++ b/app-misc/glcdprocdriver/glcdprocdriver-0.1.2.ebuild
@@ -9,11 +9,13 @@ MY_P="${MY_PN}-${PV}"
 inherit toolchain-funcs
 
 DESCRIPTION="A glue between the graphlcd-base library from the GraphLCD 
project"
-HOMEPAGE="https://lucianm.github.io/GLCDprocDriver
-   https://github.com/lucianm/GLCDprocDriver;
+HOMEPAGE="
+   https://lucianm.github.io/GLCDprocDriver
+   https://github.com/lucianm/GLCDprocDriver
+"
 SRC_URI="https://github.com/lucianm/${MY_PN}/archive/0.1.2.tar.gz -> 
${MY_P}.tar.gz"
 
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 x86"
 SLOT="0"
 LICENSE="GPL-2"
 



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

2019-08-07 Thread Joonas Niilola
commit: 7330a6332370d71843f98b290e166f2294958257
Author: Conrad Kostecki  kostecki  com>
AuthorDate: Wed Aug  7 20:15:22 2019 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Aug  8 03:32:41 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7330a633

app-misc/graphlcd-base: drop ~ppc keyword

Due usage of , it can't be compiled anymore on ~ppc.

Bug: https://bugs.gentoo.org/691672
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Conrad Kostecki  kostecki.com>
Closes: https://github.com/gentoo/gentoo/pull/12636
Signed-off-by: Joonas Niilola  gentoo.org>

 app-misc/graphlcd-base/graphlcd-base-1.0.2.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app-misc/graphlcd-base/graphlcd-base-1.0.2.ebuild 
b/app-misc/graphlcd-base/graphlcd-base-1.0.2.ebuild
index ed6379c3013..9c5ac5cb28c 100644
--- a/app-misc/graphlcd-base/graphlcd-base-1.0.2.ebuild
+++ b/app-misc/graphlcd-base/graphlcd-base-1.0.2.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Contains the lowlevel lcd drivers for GraphLCD"
 HOMEPAGE="https://projects.vdr-developer.org/projects/graphlcd-base;
 
SRC_URI="https://projects.vdr-developer.org/git/${PN}.git/snapshot/${P}.tar.bz2;
 
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 x86"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE="fontconfig freetype g15 graphicsmagick imagemagick lcd_devices_ax206dpf 
lcd_devices_picolcd_256x64 lcd_devices_vnc"
@@ -27,6 +27,7 @@ RDEPEND="
 "
 
 DEPEND="${RDEPEND}"
+
 BDEPEND="virtual/pkgconfig"
 
 DOCS=( "HISTORY" "README" "TODO" "docs/." )



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

2019-08-07 Thread Joonas Niilola
commit: 1afcd664f3a0b20cc46312f2f5ca4ce4f26a2da4
Author: Conrad Kostecki  kostecki  com>
AuthorDate: Wed Aug  7 20:11:27 2019 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Aug  8 03:32:41 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1afcd664

profiles: powerpc/package.use.mask: mask glcd driver on ppc/ppc64

Closes: https://bugs.gentoo.org/691672
Signed-off-by: Conrad Kostecki  kostecki.com>
Signed-off-by: Joonas Niilola  gentoo.org>

 profiles/arch/powerpc/package.use.mask   | 4 
 profiles/arch/powerpc/ppc64/package.use.mask | 4 
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/profiles/arch/powerpc/package.use.mask 
b/profiles/arch/powerpc/package.use.mask
index e2078893c7e..377af9fd96a 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Conrad Kostecki  (2019-08-07)
+# app-misc/graphlcd-base won't work on PowerPC/PowerPC64
+app-misc/lcdproc lcd_devices_glcd
+
 # Matt Turner  (2019-08-04)
 # Dependency app-crypt/jitterentropy is keyworded for ppc/ppc64
 sys-apps/rng-tools -jitterentropy

diff --git a/profiles/arch/powerpc/ppc64/package.use.mask 
b/profiles/arch/powerpc/ppc64/package.use.mask
index 1df4798079d..1c3a08553bb 100644
--- a/profiles/arch/powerpc/ppc64/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/package.use.mask
@@ -1,10 +1,6 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Conrad Kostecki  (2019-07-21)
-# app-misc/graphlcd-base won't work on PowerPC
-app-misc/lcdproc lcd_devices_glcd
-
 # Jimi Huotari  (2019-07-28)
 # Mask unkeyworded, untested dependencies.
 # https://bugs.gentoo.org/689606



[gentoo-commits] repo/gentoo:master commit in: x11-libs/libdlo/

2019-08-07 Thread Joonas Niilola
commit: 94fc13dc4d7370eee4c09e270ae1c6b1ae47d1d5
Author: Conrad Kostecki  kostecki  com>
AuthorDate: Wed Aug  7 19:59:42 2019 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Aug  8 03:32:40 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94fc13dc

x11-libs/libdlo: add ~ppc keyword

Thanks to ernsteiswuerfel, ~ppc keyword can be added.

Bug: https://bugs.gentoo.org/690412
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Conrad Kostecki  kostecki.com>
Signed-off-by: Joonas Niilola  gentoo.org>

 x11-libs/libdlo/libdlo-0.1.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/libdlo/libdlo-0.1.2-r1.ebuild 
b/x11-libs/libdlo/libdlo-0.1.2-r1.ebuild
index a299b2e70e8..1b720a84b95 100644
--- a/x11-libs/libdlo/libdlo-0.1.2-r1.ebuild
+++ b/x11-libs/libdlo/libdlo-0.1.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://people.freedesktop.org/~berniet/${P}.tar.gz;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="static-libs test-program"
 
 RDEPEND="virtual/libusb:0="



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

2019-08-07 Thread Joonas Niilola
commit: f51b1c728725f6bac3d5f5fea63367f0c4c9f5a5
Author: Conrad Kostecki  kostecki  com>
AuthorDate: Wed Aug  7 20:00:49 2019 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Aug  8 03:32:41 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f51b1c72

dev-libs/serdisplib: add ~ppc keyword

Thanks to ernsteiswuerfel, ~ppc keyword can be added.

Closes: https://bugs.gentoo.org/690412
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Conrad Kostecki  kostecki.com>
Closes: https://github.com/gentoo/gentoo/pull/12635
Signed-off-by: Joonas Niilola  gentoo.org>

 dev-libs/serdisplib/serdisplib-2.01.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-libs/serdisplib/serdisplib-2.01.ebuild 
b/dev-libs/serdisplib/serdisplib-2.01.ebuild
index 85de825917e..0a3e778a8d1 100644
--- a/dev-libs/serdisplib/serdisplib-2.01.ebuild
+++ b/dev-libs/serdisplib/serdisplib-2.01.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="threads tools"
 
 # Define the list of valid lcd devices.



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

2019-08-07 Thread Michał Górny
commit: ba3501fb4fa1781dd981e7190c124f5884c150b6
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Aug  8 03:21:35 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Aug  8 03:31:28 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba3501fb

dev-python/cmd2: Bump to 0.9.16

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

 dev-python/cmd2/Manifest   |  1 +
 dev-python/cmd2/cmd2-0.9.16.ebuild | 44 ++
 2 files changed, 45 insertions(+)

diff --git a/dev-python/cmd2/Manifest b/dev-python/cmd2/Manifest
index a25469b04ee..ec432c4df5b 100644
--- a/dev-python/cmd2/Manifest
+++ b/dev-python/cmd2/Manifest
@@ -3,3 +3,4 @@ DIST cmd2-0.7.9.tar.gz 71298 BLAKE2B 
d1623e2d6a7ac66058b5a43a9688ba850962fa7b565
 DIST cmd2-0.8.9.tar.gz 112543 BLAKE2B 
b55edd450abcff863a34252b724919ace9f65b62b8175f28a1bb4fb64692a67723339a887dac45e87f37db71773689cfa213038740a4b3d165bf95f9cdad1d0e
 SHA512 
80c80b67f8a1709156450fa476215a5466cca2853102f6012f1d83867a311d86a68d441dcea9895b62add731b3d00a7c3ecefde939b4f2ccd61d058ef9386a84
 DIST cmd2-0.9.14.tar.gz 530199 BLAKE2B 
a503e71959927e01986028da423c11f971972df0826f95cb06ca0594d9b90c19a5502ec19d741ea7a30b0ab9fb6f9d33fb5c20fc37c01695039b69979b862410
 SHA512 
4a606fc821f32dccb53b0558645850b383f814ae79f65e491376638960c5951ddff3ff860190d6ffe37b9fd616f44659793c1b1389eb76fbb369726cc1108c77
 DIST cmd2-0.9.15.tar.gz 550232 BLAKE2B 
b9e57ca150ee94cfc38bf394f9a3a8de06c4e63c8787944491fc5802781c3afc585d075b07b636c673dd20e50cd1222a7cd146a6284abc0f87873ccb915ec2a3
 SHA512 
6a2405e6b83200fb53cc251a4095fea6dfe0d7edd26875aee5121267d7615599aef4d84592be2b72b9cbd38e22e25f320d4c334b82e360140d517b65f2be25a8
+DIST cmd2-0.9.16.tar.gz 550919 BLAKE2B 
0c8fa50bc1df503b17fc1c753ddac755968a0d4886921baf5f1113cbe7d8928b6ee0be49c93e697e00a1951deaee5c35403da74ad4d14fabf566dbe8abf27bfc
 SHA512 
63b973e63fe48675a25c76b5c79d3838aad8fea62e50287cc72f2dc431e798535fc24caf589a2358012e6c8c601e8b46ac08b0da63ca64e46727890657d7ddfa

diff --git a/dev-python/cmd2/cmd2-0.9.16.ebuild 
b/dev-python/cmd2/cmd2-0.9.16.ebuild
new file mode 100644
index 000..715f6032dc2
--- /dev/null
+++ b/dev-python/cmd2/cmd2-0.9.16.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Extra features for standard library's cmd module"
+HOMEPAGE="https://github.com/python-cmd2/cmd2;
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   dev-python/attrs[${PYTHON_USEDEP}]
+   >=dev-python/colorama-0.3.7[${PYTHON_USEDEP}]
+   >=dev-python/pyperclip-1.6[${PYTHON_USEDEP}]
+   dev-python/six[${PYTHON_USEDEP}]
+   dev-python/wcwidth[${PYTHON_USEDEP}]
+"
+DEPEND="
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   dev-python/setuptools_scm[${PYTHON_USEDEP}]
+   test? (
+   ${RDEPEND}
+   $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' 
python3_5)
+   dev-python/pytest[${PYTHON_USEDEP}]
+   )
+"
+
+python_test() {
+   # test rely on very specific text wrapping...
+   local -x COLUMNS=80
+   pytest -vv || die
+}
+
+src_test() {
+   virtx distutils-r1_src_test
+}



[gentoo-commits] repo/gentoo:master commit in: sci-libs/dcmtk/

2019-08-07 Thread Joonas Niilola
commit: 1c0a96eebf56ee5850e74d3eddde572eb7df6557
Author: Horea Christian  chymera  eu>
AuthorDate: Thu May 16 21:20:20 2019 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Aug  8 03:14:26 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c0a96ee

sci-libs/dcmtk: version bump 3.6.4

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Horea Christian  chymera.eu>
Closes: https://github.com/gentoo/gentoo/pull/12024
Signed-off-by: Joonas Niilola  gentoo.org>

 sci-libs/dcmtk/Manifest   |  1 +
 sci-libs/dcmtk/dcmtk-3.6.4.ebuild | 86 +++
 2 files changed, 87 insertions(+)

diff --git a/sci-libs/dcmtk/Manifest b/sci-libs/dcmtk/Manifest
index fd3e552a864..85301030809 100644
--- a/sci-libs/dcmtk/Manifest
+++ b/sci-libs/dcmtk/Manifest
@@ -1 +1,2 @@
 DIST dcmtk-3.6.3.tar.gz 6269785 BLAKE2B 
8f0797840fa5ab4ffb60e46f65b16739d3ed0cb7591b20cbfba81a59de97344a663f73bed8fc7f349a99accc46fd2fde3cff021861bde6f07957a433a4db67a3
 SHA512 
5b907422d2d80e417ae8239e159d1300da4ed8db7e92cee619cc1d37116165e8824f8a9103605e07a95b1bffe94bbd2d5e05125f068281d241e8e78755d0b5e8
+DIST dcmtk-3.6.4.tar.gz 6402734 BLAKE2B 
2d362789e7819089b7da46a9601fa5d53b8e8aab1ac7d30bf1180b3da0645d015a177c97188dc9255c6962a9d7246cf287b20824a78fbe9612b9bc277e68d294
 SHA512 
735f85d04410437a5163b154f43c8a299aff7a8f810605ce6c5027ae4569ff1323a69f70a2603805cec9d826a31166fd904bb53c3edc1137bfc41ba2902c2261

diff --git a/sci-libs/dcmtk/dcmtk-3.6.4.ebuild 
b/sci-libs/dcmtk/dcmtk-3.6.4.ebuild
new file mode 100644
index 000..4678a05c1f3
--- /dev/null
+++ b/sci-libs/dcmtk/dcmtk-3.6.4.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="The DICOM Toolkit"
+HOMEPAGE="https://dicom.offis.de/dcmtk.php.en;
+SRC_URI="http://dicom.offis.de/download/dcmtk/release/${P}.tar.gz;
+
+LICENSE="OFFIS"
+KEYWORDS="~amd64 ~arm ~x86"
+SLOT="0"
+IUSE="doc png ssl tcpd tiff +threads xml zlib"
+
+RDEPEND="
+   dev-libs/icu:=
+   virtual/jpeg:0
+   png? ( media-libs/libpng:* )
+   ssl? ( dev-libs/openssl:0= )
+   tcpd? ( sys-apps/tcp-wrappers )
+   tiff? ( media-libs/tiff:0 )
+   xml? ( dev-libs/libxml2:2 )
+   zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+   media-gfx/graphviz
+   doc? ( app-doc/doxygen )"
+
+src_prepare() {
+   cmake-utils_src_prepare
+
+   sed -e "s:share/doc/dcmtk:&-${PV}:" \
+   -e "s:DIR \"/:DIR \"/usr/:" \
+   -e "s:usr/etc:etc:" \
+   -e "s:/lib\":/$(get_libdir)\":" \
+   -e "s:COPYRIGHT::" \
+   -i CMakeLists.txt || die
+   sed -e 's:${CMAKE_INSTALL_PREFIX}/::' \
+   -i dcmwlm/data/CMakeLists.txt doxygen/CMakeLists.txt || die
+   # Temporary workaround: docs are not built with CMake
+   sed -i -e '/include/d' doxygen/Makefile.in || die
+
+   # fix -D deprecation warnings
+   sed -i -e "s|_BSD_SOURCE|_DEFAULT_SOURCE|g" \
+   "${S}"/config/configure.in \
+   "${S}"/CMakeLists.txt || die
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DBUILD_SHARED_LIBS=ON
+   -DDCMTK_WITH_ICU=ON
+   -DDCMTK_WITH_TIFF=$(usex tiff)
+   -DDCMTK_WITH_PNG=$(usex png)
+   -DDCMTK_WITH_XML=$(usex xml)
+   -DDCMTK_WITH_ZLIB=$(usex zlib)
+   -DDCMTK_WITH_OPENSSL=$(usex ssl)
+   -DDCMTK_WITH_DOXYGEN=$(usex doc)
+   -DDCMTK_WITH_THREADS=$(usex threads)
+   )
+
+   cmake-utils_src_configure
+
+   if use doc; then
+   cd "${S}"/doxygen || die
+   econf
+   fi
+}
+
+src_compile() {
+   cmake-utils_src_compile
+
+   if use doc; then
+   emake -C "${S}"/doxygen
+   fi
+}
+
+src_install() {
+   doman doxygen/manpages/man1/*
+
+   if use doc; then
+   local HTML_DOCS=( "${S}"/doxygen/htmldocs/. )
+   fi
+   cmake-utils_src_install
+}



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

2019-08-07 Thread Zac Medico
commit: 6ecfc8a51132aca2786d2a8349fd8f83bc984cb7
Author: Bernardo Meurer  gmail  com>
AuthorDate: Thu Aug  8 01:28:37 2019 +
Commit: Zac Medico  gentoo  org>
CommitDate: Thu Aug  8 01:52:07 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ecfc8a5

sys-apps/yarn: bump to 1.17.3

Closes: https://bugs.gentoo.org/691726
Closes: https://github.com/gentoo/gentoo/pull/12639
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Bernardo Meurer  standard.ai>
Signed-off-by: Zac Medico  gentoo.org>

 sys-apps/yarn/Manifest   |  1 +
 sys-apps/yarn/yarn-1.17.3.ebuild | 39 +++
 2 files changed, 40 insertions(+)

diff --git a/sys-apps/yarn/Manifest b/sys-apps/yarn/Manifest
index 279dfded80b..be981e0d2fb 100644
--- a/sys-apps/yarn/Manifest
+++ b/sys-apps/yarn/Manifest
@@ -3,4 +3,5 @@ DIST yarn-v1.12.3.tar.gz 1166553 BLAKE2B 
8e0c56c46522eeccaa558dd1fccdca40e83d03d
 DIST yarn-v1.13.0.tar.gz 1169613 BLAKE2B 
5fc730c0b456d67702ef5305223cfd933c4c8f1d13364ff383294f8ae2b7b3f400476ff32b9aa0b27c497116660ea295691831e4e9bf50cb699d03d2dcd99e6e
 SHA512 
5277f0d9e79fbfc8a6b7864c3e1bc554fe38582cf7f21b83c641ecf98aabc78c014caef94ebd26877578ae1fb6370e6242ad2b70cfd569fa2d099a3da936f90c
 DIST yarn-v1.15.2.tar.gz 1169927 BLAKE2B 
1ebf899b1f34dd3b6fea4fa001b1edda62dd4c8964099b8a1bc858a1b28b7ccbab3aa3e229bc7882892763db414ed4f7cfbe2deb636d2a8675da87df1754a835
 SHA512 
0e1a9a19ed8571829db8ee36776841c9793bcbc936938d87deecd875604c4ef70d72058ac7bc429095ac540422917bda1103761b224daf3f026e8a9499a051af
 DIST yarn-v1.16.0.tar.gz 1172930 BLAKE2B 
1dbb754ae0af3b9666bb03057f587854407b3587fc4304e8282c759d5ea0cbee12eed58e526808893d3cf8e29c4ec69b13a28a6f6908bcdb8c9126d1a408
 SHA512 
71f7a6c8696758a035ce8a5452079b4cf7fc0b85a43c867e4c99a4970704009e2eea858fb49780cebb1a99a18687ff9bd5759ef16e75cb3008982e0059b591d6
+DIST yarn-v1.17.3.tar.gz 1240577 BLAKE2B 
a5b0fdd014928181da63a322bdc030e4aefd4033d27f49a37225aa2cb3199339dd06e9f74aaa442bfb4692b0470fda40102a41b52a1369c8b84282bae5bc46a6
 SHA512 
0a003ca3b9d165a42f99e17f581c76142edff56ff45f9f53d8868b62a80ca3aeb7ef07e9e66304b0cdd85e826d294b299e998324a97f8061619ea4beb0e37b84
 DIST yarn-v1.9.4.tar.gz 937393 BLAKE2B 
188e270b2a8b5b357b85101eda2552d675e3f41d30bc7b45266f34831cbcfc00feefe452c420f3aaefad7423c2af342d5fdb859ec6420faf689b680b5acda00f
 SHA512 
1e3a908cf47a2fe46d7ce8db549b91cd0b3372c7c43c6b0029f1060b044a0a65e5bc3323f4ed6baf20bbbcb49ba358a6bb8f2691a591e4d3e8a01bc31372cb5b

diff --git a/sys-apps/yarn/yarn-1.17.3.ebuild b/sys-apps/yarn/yarn-1.17.3.ebuild
new file mode 100644
index 000..6366d148523
--- /dev/null
+++ b/sys-apps/yarn/yarn-1.17.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="${PN}-v${PV}"
+
+DESCRIPTION="Fast, reliable, and secure node dependency management"
+HOMEPAGE="https://yarnpkg.com;
+SRC_URI="https://github.com/yarnpkg/yarn/releases/download/v${PV}/${MY_P}.tar.gz;
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="!dev-util/cmdtest
+   net-libs/nodejs"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+   default
+   sed -i 's/"installationMethod": "tar"/"installationMethod": 
"portage"/g' "${S}/package.json" || die
+}
+
+src_install() {
+   local install_dir="/usr/$(get_libdir)/node_modules/yarn" path shebang
+   insinto "${install_dir}"
+   doins -r .
+   dosym "../$(get_libdir)/node_modules/yarn/bin/yarn.js" "/usr/bin/yarn"
+
+   while read -r -d '' path; do
+   read -r shebang < "${ED}${path}" || die
+   [[ "${shebang}" == \#\!* ]] || continue
+   fperms +x "${path}"
+   done < <(find "${ED}" -type f -printf '/%P\0' || die)
+}



[gentoo-commits] proj/sci:master commit in: scripts/, sci-libs/blas-reference/files/, profiles/, ...

2019-08-07 Thread Benda XU
commit: e105f0f6a215d6fd15b58cb8a669e3f119c12169
Author: Benda Xu  gentoo  org>
AuthorDate: Thu Aug  8 00:54:40 2019 +
Commit: Benda XU  gentoo  org>
CommitDate: Thu Aug  8 01:20:00 2019 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=e105f0f6

virtual/{{c,}blas,lapack{,e}}: replaced by counterparts in ::gentoo.

  sci-libs/{{c,}blas,lapack{,e}}-reference: Remove.

  Remove BLAS/LAPACK migration scripts.
  Remove outdated documentation on BLAS/LAPACK.
  Update README.md to point to the new framework in ::gentoo.

Reference: https://wiki.gentoo.org/wiki/Blas-lapack-switch

Closes: https://github.com/gentoo/sci/issues/805
Closes: https://github.com/gentoo/sci/issues/926
Closes: https://github.com/gentoo/sci/issues/734
Closes: https://github.com/gentoo/sci/issues/897
Closes: https://github.com/gentoo/sci/issues/925

Package-Manager: Portage-2.3.69, Repoman-2.3.12
Signed-off-by: Benda Xu  gentoo.org>

 README.md  |  13 +-
 docs/proj/blas-lapack.xml  | 492 ---
 docs/proj/index.xml|   1 -
 docs/proj/linalg.xml   | 530 -
 profiles/package.mask  |   4 -
 .../blas-reference-20161223-r100.ebuild| 110 -
 .../blas-reference-20171112-r100.ebuild| 109 -
 .../blas-reference/blas-reference-.ebuild  | 108 -
 .../files/lapack-fix-build-system.patch|  92 
 .../lapack-reference-3.7.0-fix-build-system.patch  |  56 ---
 sci-libs/blas-reference/metadata.xml   |  20 -
 .../cblas-reference-20110218-r100.ebuild   | 144 --
 .../cblas-reference-20151113-r100.ebuild   | 126 -
 .../cblas-reference-20161223-r101.ebuild   | 124 -
 .../files/lapack-fix-build-system.patch| 124 -
 .../lapack-reference-3.7.0-fix-build-system.patch  |  61 ---
 sci-libs/cblas-reference/metadata.xml  |  21 -
 .../lapack-reference/files/3.3.1-blas-libs.patch   |  35 --
 .../lapack-reference/files/3.3.1-xblas-libs.patch  |  44 --
 .../files/lapack-3.4.1-cmake.patch | 208 
 .../files/lapack-3.6.1-fix-build-system.patch  |  88 
 .../files/lapack-fix-build-system.patch|  92 
 .../lapack-reference-3.7.0-fix-build-system.patch  |  56 ---
 .../lapack-reference-3.7.0-r100.ebuild | 121 -
 .../lapack-reference-3.8.0-r100.ebuild | 120 -
 .../lapack-reference/lapack-reference-.ebuild  | 124 -
 sci-libs/lapack-reference/metadata.xml |  25 -
 .../files/lapack-fix-build-system.patch|  92 
 .../lapacke-reference-3.5.0.ebuild |  95 
 .../lapacke-reference-3.6.0-r2.ebuild  | 102 
 .../lapacke-reference-.ebuild  |  95 
 sci-libs/lapacke-reference/metadata.xml|  19 -
 scripts/lapack-migration.sh|  25 -
 scripts/sci-lapack |  18 -
 virtual/blas/blas-2.1-r5.ebuild|  53 ---
 virtual/blas/blas-3.6-r100.ebuild  |  53 ---
 virtual/blas/blas-3.7-r100.ebuild  |  53 ---
 virtual/blas/metadata.xml  |  16 -
 virtual/cblas/cblas-2.0-r4.ebuild  |  34 --
 virtual/cblas/cblas-3.6-r100.ebuild|  34 --
 virtual/cblas/cblas-3.7-r100.ebuild|  34 --
 virtual/cblas/metadata.xml |  16 -
 virtual/lapack/lapack-3.6-r100.ebuild  |  40 --
 virtual/lapack/lapack-3.7-r100.ebuild  |  40 --
 virtual/lapack/metadata.xml|  17 -
 virtual/lapacke/lapacke-3.6.ebuild |  24 -
 virtual/lapacke/metadata.xml   |  16 -
 47 files changed, 4 insertions(+), 3920 deletions(-)

diff --git a/README.md b/README.md
index 6283a58a3..d3748dc1b 100644
--- a/README.md
+++ b/README.md
@@ -14,16 +14,11 @@ wget 
https://gitweb.gentoo.org/proj/sci.git/plain/metadata/science.conf -O /etc/
 
 To start using the overlay you now only need to get the ebuilds, via `emerge 
--sync`.
 
-### BLAS and LAPACK Migration
+### BLAS and LAPACK
 
-There is a long-standing BLAS and LAPACK stack incompatibility between the 
Science Overlay and the Base Gentoo Overlay.
-A fix [is being considered](https://github.com/gentoo/sci/issues/805), bit is 
still not scheduled for implementation.
-In the mean time, the most automated and up-to-date solution (building on [the 
original one](https://wiki.gentoo.org/wiki/User_talk:Houseofsuns)) is to run 
(as root, and after having installed the overlay):
-
-```
-cd ${EPREFIX}/var/lib/overlays/science/scripts
-./lapack-migration.sh
-```
+[The BLAS and LAPACK switching 
framework](https://wiki.gentoo.org/wiki/Blas-lapack-switch)
+in ::gentoo has been implemented. The Science overlay will no longer

[gentoo-commits] repo/gentoo:master commit in: app-emulation/containers-storage/

2019-08-07 Thread Zac Medico
commit: af5eb55f66e3d5f82135a047bcc8b4b3742d7dfe
Author: Zac Medico  gentoo  org>
AuthorDate: Wed Aug  7 23:41:26 2019 +
Commit: Zac Medico  gentoo  org>
CommitDate: Wed Aug  7 23:41:26 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af5eb55f

app-emulation/containers-storage: Bump to version 1.13.1

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Zac Medico  gentoo.org>

 app-emulation/containers-storage/Manifest  |   1 +
 .../containers-storage-1.13.1.ebuild   | 110 +
 2 files changed, 111 insertions(+)

diff --git a/app-emulation/containers-storage/Manifest 
b/app-emulation/containers-storage/Manifest
index 2c97b469015..a11d4ce2e0c 100644
--- a/app-emulation/containers-storage/Manifest
+++ b/app-emulation/containers-storage/Manifest
@@ -1,2 +1,3 @@
 DIST containers-storage-1.12.16.tar.gz 5970004 BLAKE2B 
0e9f473c9315acb22b94c9cd17072659afe2270e05d7c7c595d0563bd4d96420b3ecaaaeaf61ce4a10647e40c7177b7483aadf62ce40237dea10c23cb91bba62
 SHA512 
17a073bb338547c1e64065a1a0013e083565abeb6aa366989160c90dfb6bd6d306ea25fc938194b607b0cc74918b1ff40b12ea274b3df771e2d848b2bbab2b5c
+DIST containers-storage-1.13.1.tar.gz 5983556 BLAKE2B 
1d0b6aba0464603fb26c45beecdb9b4afe6566dff4698da980ad6f9736a6d810ec41334f181d5709f78bab986e704c965b1967ed591348cd687d9cb92875321d
 SHA512 
9fa686f44dda3d363f7c623abc9baa0911e26eb5e7dbb7bc60da259fe8d52411cb25fb98e2c8db10a5a80ebf04d07af8390acd48d26706f913900b19e58eac9f
 DIST github.com-pquerna-ffjson-e517b90714f7c0eabe6d2e570a5886ae077d6db6.tar.gz 
103470 BLAKE2B 
81f0f6ea6648997cb61723d09d456802e60a3d1eb35134c4bbc8af5943b955b1402fe2b3f8d0d4d2d0293ab256a9be66d53262d5f79ca00bf8c18ded39dc44f4
 SHA512 
fadca5a7bd0c0578b23281720a08c505054f3497daeee8efa36b5acafa4118feb4b8a96c4acb4c279d72ebcd50846307cfbb846a355b62f350c961f9102c93a6

diff --git a/app-emulation/containers-storage/containers-storage-1.13.1.ebuild 
b/app-emulation/containers-storage/containers-storage-1.13.1.ebuild
new file mode 100644
index 000..a472e58367b
--- /dev/null
+++ b/app-emulation/containers-storage/containers-storage-1.13.1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGO_VENDOR=(
+   "github.com/pquerna/ffjson e517b90714f7c0eabe6d2e570a5886ae077d6db6"
+)
+
+inherit golang-vcs-snapshot
+
+KEYWORDS="~amd64"
+DESCRIPTION="containers/storage library"
+HOMEPAGE="https://github.com/containers/storage;
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="btrfs +device-mapper ostree test"
+EGO_PN="${HOMEPAGE#*//}"
+EGIT_COMMIT="v${PV}"
+SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
+   ${EGO_VENDOR_URI}"
+RDEPEND="
+   btrfs? ( sys-fs/btrfs-progs )
+   device-mapper? ( sys-fs/lvm2:= )
+   ostree? (
+   dev-libs/glib:=
+   dev-util/ostree:=
+   )"
+DEPEND="${RDEPEND}
+   dev-go/go-md2man
+   test? (
+   sys-fs/btrfs-progs
+   sys-fs/lvm2
+   sys-apps/util-linux
+   )"
+RESTRICT="test? ( userpriv ) !test? ( test )"
+
+src_unpack() {
+   golang-vcs-snapshot_src_unpack
+}
+
+src_prepare() {
+   default
+
+   [[ -f ${S}/src/${EGO_PN}/hack/btrfs_tag.sh ]] || die
+   use btrfs || { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
+   "${S}/src/${EGO_PN}/hack/btrfs_tag.sh" || die; }
+
+   [[ -f ${S}/src/${EGO_PN}/hack/libdm_tag.sh ]] || die
+   use device-mapper || { echo -e "#!/bin/sh\necho btrfs_noversion 
exclude_graphdriver_devicemapper" > \
+   "${S}/src/${EGO_PN}/hack/libdm_tag.sh" || die; }
+
+   [[ -f ${S}/src/${EGO_PN}/hack/ostree_tag.sh ]] || die
+   use ostree || { echo -e "#!/bin/sh\ntrue" > \
+   "${S}/src/${EGO_PN}/hack/ostree_tag.sh" || die; }
+
+   sed -e 's:TestChrootUntarPath(:_\0:' \
+   -i "${S}/src/${EGO_PN}/pkg/chrootarchive/archive_test.go" || die
+   sed -e 's:TestTarUntar(:_\0:' \
+   -e 's:TestTarWithOptionsChownOptsAlwaysOverridesIdPair(:_\0:' \
+   -e 's:TestTarWithOptions(:_\0:' \
+   -i "${S}/src/${EGO_PN}/pkg/archive/archive_test.go" || die
+   sed -e 's:TestTarUntarWithXattr(:_\0:' \
+   -e 's:TestTarWithBlockCharFifo(:_\0:' \
+   -i "${S}/src/${EGO_PN}/pkg/archive/archive_unix_test.go" || die
+   sed -e 's:TestTarUntarWithXattr(:_\0:' \
+   -i "${S}/src/${EGO_PN}/pkg/archive/archive_test.go" || die
+   sed -e 's:TestApplyLayer(:_\0:' \
+   -i "${S}/src/${EGO_PN}/pkg/archive/changes_test.go" || die
+   sed -e 's:TestApplyLayerInvalidFilenames(:_\0:' \
+   -e 's:TestApplyLayerInvalidHardlink(:_\0:' \
+   -e 's:TestApplyLayerInvalidSymlink(:_\0:' \
+   -e 's:TestApplyLayerWhiteouts(:_\0:' \
+   -i "${S}/src/${EGO_PN}/pkg/archive/diff_test.go" || die
+   

[gentoo-commits] repo/gentoo:master commit in: app-emulation/containers-storage/

2019-08-07 Thread Zac Medico
commit: 24a45e403a7c371948d5a54318b806781fb88c3a
Author: Zac Medico  gentoo  org>
AuthorDate: Wed Aug  7 23:34:28 2019 +
Commit: Zac Medico  gentoo  org>
CommitDate: Wed Aug  7 23:34:28 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24a45e40

app-emulation/containers-storage: Remove old versions

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Zac Medico  gentoo.org>

 app-emulation/containers-storage/Manifest  |   3 -
 .../containers-storage-1.12.10.ebuild  | 110 -
 .../containers-storage-1.12.15.ebuild  | 110 -
 .../containers-storage-1.12.9.ebuild   | 110 -
 4 files changed, 333 deletions(-)

diff --git a/app-emulation/containers-storage/Manifest 
b/app-emulation/containers-storage/Manifest
index 8aaa370a6f9..2c97b469015 100644
--- a/app-emulation/containers-storage/Manifest
+++ b/app-emulation/containers-storage/Manifest
@@ -1,5 +1,2 @@
-DIST containers-storage-1.12.10.tar.gz 1593313 BLAKE2B 
4b0c412304dc6b3aa79064a6071abfdd325cffd7405c50d57008f3139cfd9afd450a21773e4463650b63720210381e58e11b8c019efcf0297377821c3b76c276
 SHA512 
83b7e353efe89192e1c956742202395981849f68d53967df14a6952e36c458a2a2adaed4cf7d959e3b73114906deb5056591b8fc3aefbc83b85f9f5dd378f031
-DIST containers-storage-1.12.15.tar.gz 5968064 BLAKE2B 
180583da6271c23f828ba5d91e8f1db64ac1aa8f9bb1f308b59e0eb0bdcd7afb94509aa0556bfc86a4e182cbdb6501b9c51b58499a61c2773254b03a6c3bc621
 SHA512 
523e4d35995fa169701551f91362fafd67f25ad1cbe733a5ae2614a198a4d71c5b5f319a539dd5a6a38e79ca46b8979ed62918a3bd69fb39d8d14d259f197408
 DIST containers-storage-1.12.16.tar.gz 5970004 BLAKE2B 
0e9f473c9315acb22b94c9cd17072659afe2270e05d7c7c595d0563bd4d96420b3ecaaaeaf61ce4a10647e40c7177b7483aadf62ce40237dea10c23cb91bba62
 SHA512 
17a073bb338547c1e64065a1a0013e083565abeb6aa366989160c90dfb6bd6d306ea25fc938194b607b0cc74918b1ff40b12ea274b3df771e2d848b2bbab2b5c
-DIST containers-storage-1.12.9.tar.gz 1593286 BLAKE2B 
f53ef233e3d08dad84cda9154271254f9fe04e951643f20e8ab5bd37456e4eeb7083c1810656072c2b4bdeea0f6188871d4db566363c8363d2c2087ab9a4d3cb
 SHA512 
0b5ad6cb52b4b74da7c574ec6841d74b92ef20f853e8d8fed83e0f9d529a7749692225e26ae4ab89fbd2a6202651c8a3a44a57bc1f42bcbb755fdba26e9cb3fd
 DIST github.com-pquerna-ffjson-e517b90714f7c0eabe6d2e570a5886ae077d6db6.tar.gz 
103470 BLAKE2B 
81f0f6ea6648997cb61723d09d456802e60a3d1eb35134c4bbc8af5943b955b1402fe2b3f8d0d4d2d0293ab256a9be66d53262d5f79ca00bf8c18ded39dc44f4
 SHA512 
fadca5a7bd0c0578b23281720a08c505054f3497daeee8efa36b5acafa4118feb4b8a96c4acb4c279d72ebcd50846307cfbb846a355b62f350c961f9102c93a6

diff --git a/app-emulation/containers-storage/containers-storage-1.12.10.ebuild 
b/app-emulation/containers-storage/containers-storage-1.12.10.ebuild
deleted file mode 100644
index 312d2cda060..000
--- a/app-emulation/containers-storage/containers-storage-1.12.10.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGO_VENDOR=(
-   "github.com/pquerna/ffjson e517b90714f7c0eabe6d2e570a5886ae077d6db6"
-)
-
-inherit golang-vcs-snapshot
-
-KEYWORDS="~amd64"
-DESCRIPTION="containers/storage library"
-HOMEPAGE="https://github.com/containers/storage;
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="btrfs +device-mapper ostree test"
-EGO_PN="${HOMEPAGE#*//}"
-EGIT_COMMIT="v${PV}"
-SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
-   ${EGO_VENDOR_URI}"
-RDEPEND="
-   btrfs? ( sys-fs/btrfs-progs )
-   device-mapper? ( sys-fs/lvm2:= )
-   ostree? (
-   dev-libs/glib:=
-   dev-util/ostree:=
-   )"
-DEPEND="${RDEPEND}
-   dev-go/go-md2man
-   test? (
-   sys-fs/btrfs-progs
-   sys-fs/lvm2
-   sys-apps/util-linux
-   )"
-RESTRICT="test? ( userpriv ) !test? ( test )"
-
-src_unpack() {
-   golang-vcs-snapshot_src_unpack
-}
-
-src_prepare() {
-   default
-
-   [[ -f ${S}/src/${EGO_PN}/hack/btrfs_tag.sh ]] || die
-   use btrfs || { echo -e "#!/bin/sh\necho btrfs_noversion 
exclude_graphdriver_btrfs" > \
-   "${S}/src/${EGO_PN}/hack/btrfs_tag.sh" || die; }
-
-   [[ -f ${S}/src/${EGO_PN}/hack/libdm_tag.sh ]] || die
-   use device-mapper || { echo -e "#!/bin/sh\necho btrfs_noversion 
exclude_graphdriver_devicemapper" > \
-   "${S}/src/${EGO_PN}/hack/libdm_tag.sh" || die; }
-
-   [[ -f ${S}/src/${EGO_PN}/hack/ostree_tag.sh ]] || die
-   use ostree || { echo -e "#!/bin/sh\ntrue" > \
-   "${S}/src/${EGO_PN}/hack/ostree_tag.sh" || die; }
-
-   sed -e 's:TestChrootUntarPath(:_\0:' \
-   -i "${S}/src/${EGO_PN}/pkg/chrootarchive/archive_test.go" || die
-   sed -e 's:TestTarUntar(:_\0:' \
-   -e 's:TestTarWithOptionsChownOptsAlwaysOverridesIdPair(:_\0:' \
-   -e 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/containers-storage/

2019-08-07 Thread Zac Medico
commit: ed90da501fed0c2bb20ded6190622de4d03db16e
Author: Zac Medico  gentoo  org>
AuthorDate: Wed Aug  7 23:31:04 2019 +
Commit: Zac Medico  gentoo  org>
CommitDate: Wed Aug  7 23:33:17 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed90da50

app-emulation/containers-storage: fix USE=-btrfs

Closes: https://bugs.gentoo.org/691694
Reported-by: Toralf Förster  gentoo.org>
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Zac Medico  gentoo.org>

 app-emulation/containers-storage/containers-storage-1.12.16.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/containers-storage/containers-storage-1.12.16.ebuild 
b/app-emulation/containers-storage/containers-storage-1.12.16.ebuild
index 23a29fc2a6f..a472e58367b 100644
--- a/app-emulation/containers-storage/containers-storage-1.12.16.ebuild
+++ b/app-emulation/containers-storage/containers-storage-1.12.16.ebuild
@@ -43,7 +43,7 @@ src_prepare() {
default
 
[[ -f ${S}/src/${EGO_PN}/hack/btrfs_tag.sh ]] || die
-   use btrfs || { echo -e "#!/bin/sh\necho btrfs_noversion" > \
+   use btrfs || { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
"${S}/src/${EGO_PN}/hack/btrfs_tag.sh" || die; }
 
[[ -f ${S}/src/${EGO_PN}/hack/libdm_tag.sh ]] || die



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

2019-08-07 Thread Thomas Deutschmann
commit: 749c2aebe946f093d6f4f9a6a36620436c1d9e68
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Aug  7 20:23:03 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Aug  7 20:25:54 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=749c2aeb

dev-libs/jemalloc: bump to v5.2.1

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Thomas Deutschmann  gentoo.org>

 dev-libs/jemalloc/Manifest  |  1 +
 dev-libs/jemalloc/jemalloc-5.2.1.ebuild | 61 +
 2 files changed, 62 insertions(+)

diff --git a/dev-libs/jemalloc/Manifest b/dev-libs/jemalloc/Manifest
index ff71053391b..1316504 100644
--- a/dev-libs/jemalloc/Manifest
+++ b/dev-libs/jemalloc/Manifest
@@ -4,3 +4,4 @@ DIST jemalloc-4.5.0.tar.bz2 449992 BLAKE2B 
6141c71f7f5f9cee91a59eeed9c69b0a69b3c
 DIST jemalloc-5.0.1.tar.bz2 499300 BLAKE2B 
551933fcd93315968cbf89bfadc40313717ff216141af8a131f2333d10090438ddf36fbfdc0ee831cbec6f930ae15aa9cfaafae72ed4f38dd97b00712ca918e8
 SHA512 
8cb5957a5724eb2bbad120cf0028ea8b2b14b4a416c1751b7c967351a7fd51135058ea0d3c4dc1d127c86f3aa7e9fd5ef101857110aabfdb7789427791c432c3
 DIST jemalloc-5.1.0.tar.bz2 515622 BLAKE2B 
3c8b35d30fca0018e3e32452e6fa41c7ac59f9f2f7d4bc243237fde95025ab5a7562fb86b5afe2ca9b7bb072f7baf6ac7589a4862d9ebaafddae187d93e20da0
 SHA512 
d9abebe54d303ca931b8c31c1033f23ff5fb060f2377ec8386f4d79c352e65c78ed34f680c352dac14f7d7115d10245782d553d988bc13df2eb34a2f0942ef6f
 DIST jemalloc-5.2.0.tar.bz2 543892 BLAKE2B 
042dd32452713d0524ae8aedbd3aa96a420037ae3ff0345bbf56a7839ae6ba9e0c700034fab9d5c7b6f4cbb43e2d8199b412901afce16c2785a816d439166e6d
 SHA512 
e3be4d534770126caf10f2684aed9fe4ba1422dd47625fe50343cfb750f26eff869fcc7d1e30a96dd6c73f6614c4bbcd560fd24fc26b55ac731c43e60fd05234
+DIST jemalloc-5.2.1.tar.bz2 554279 BLAKE2B 
52cb8cd5e5807a750a7e5e9ee005afd61144d821d7f7029a5eca998fd61787a7271338dee3de586ddf93f5fdbddc2c2ca03ba64375a70096f273a6aa173da431
 SHA512 
0bbb77564d767cef0c6fe1b97b705d368ddb360d55596945aea8c3ba5889fbce10479d85ad492c91d987caacdbbdccc706aa3688e321460069f00c05814fae02

diff --git a/dev-libs/jemalloc/jemalloc-5.2.1.ebuild 
b/dev-libs/jemalloc/jemalloc-5.2.1.ebuild
new file mode 100644
index 000..3e82a451db0
--- /dev/null
+++ b/dev-libs/jemalloc/jemalloc-5.2.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools toolchain-funcs multilib-minimal
+
+DESCRIPTION="Jemalloc is a general-purpose scalable concurrent allocator"
+HOMEPAGE="http://jemalloc.net/ https://github.com/jemalloc/jemalloc;
+SRC_URI="https://github.com/jemalloc/jemalloc/releases/download/${PV}/${P}.tar.bz2;
+
+LICENSE="BSD"
+SLOT="0/2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 
~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+IUSE="debug hardened lazy-lock prof static-libs stats xmalloc"
+HTML_DOCS=( doc/jemalloc.html )
+PATCHES=( "${FILESDIR}/${PN}-5.2.0-gentoo-fixups.patch" )
+
+MULTILIB_WRAPPED_HEADERS=( /usr/include/jemalloc/jemalloc.h )
+# autotools-utils.eclass auto-adds configure options when static-libs is in 
IUSE
+# but jemalloc doesn't implement them in its configure; need this here to
+# supress the warnings until automagic is removed from the eclass
+QA_CONFIGURE_OPTIONS="--enable-static --disable-static --enable-shared 
--disable-shared"
+
+src_prepare() {
+   default
+   eautoreconf
+}
+
+multilib_src_configure() {
+   local myconf=()
+
+   if use hardened ; then
+   myconf+=( --disable-syscall )
+   fi
+
+   ECONF_SOURCE="${S}" \
+   econf  \
+   $(use_enable debug) \
+   $(use_enable lazy-lock) \
+   $(use_enable prof) \
+   $(use_enable stats) \
+   $(use_enable xmalloc) \
+   "${myconf[@]}"
+}
+
+multilib_src_install() {
+   # Copy man file which the Makefile looks for
+   cp "${S}/doc/jemalloc.3" "${BUILD_DIR}/doc" || die
+   emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+   if [[ ${CHOST} == *-darwin* ]] ; then
+   # fixup install_name, #437362
+   install_name_tool \
+   -id "${EPREFIX}"/usr/$(get_libdir)/libjemalloc.2.dylib \
+   "${ED}"/usr/$(get_libdir)/libjemalloc.2.dylib || die
+   fi
+   use static-libs || find "${ED}" -name '*.a' -delete
+}



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

2019-08-07 Thread Thomas Deutschmann
commit: c1bbbe478dad48e842ceb89f61a099ab0a5c5806
Author: Han Han  gmail  com>
AuthorDate: Sat Jul 27 14:34:06 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Aug  7 20:25:53 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1bbbe47

dev-libs/jemalloc: Add USE flag prof

Add USE flag prof to enable or disable allocation profiling.

Signed-off-by: Han Han  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/12556
Signed-off-by: Thomas Deutschmann  gentoo.org>

 dev-libs/jemalloc/jemalloc-5.0.1.ebuild | 3 ++-
 dev-libs/jemalloc/jemalloc-5.1.0.ebuild | 3 ++-
 dev-libs/jemalloc/jemalloc-5.2.0.ebuild | 3 ++-
 dev-libs/jemalloc/metadata.xml  | 1 +
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/dev-libs/jemalloc/jemalloc-5.0.1.ebuild 
b/dev-libs/jemalloc/jemalloc-5.0.1.ebuild
index f5ad09f06a6..ddad51b8e61 100644
--- a/dev-libs/jemalloc/jemalloc-5.0.1.ebuild
+++ b/dev-libs/jemalloc/jemalloc-5.0.1.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/jemalloc/jemalloc/releases/download/${PV}/${P}.tar.b
 LICENSE="BSD"
 SLOT="0/2"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 
~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-IUSE="debug hardened +hugepages lazy-lock static-libs stats xmalloc"
+IUSE="debug hardened +hugepages lazy-lock prof static-libs stats xmalloc"
 HTML_DOCS=( doc/jemalloc.html )
 PATCHES=( "${FILESDIR}/${PN}-5.0.1-strip-optimization.patch"
"${FILESDIR}/${PN}-4.5.0-fix_html_install.patch"
@@ -40,6 +40,7 @@ multilib_src_configure() {
$(use_enable debug) \
$(use_enable lazy-lock) \
$(use_enable hugepages thp) \
+   $(use_enable prof) \
$(use_enable stats) \
$(use_enable xmalloc) \
"${myconf[@]}"

diff --git a/dev-libs/jemalloc/jemalloc-5.1.0.ebuild 
b/dev-libs/jemalloc/jemalloc-5.1.0.ebuild
index 7eda36ea909..3a7b8d7c3de 100644
--- a/dev-libs/jemalloc/jemalloc-5.1.0.ebuild
+++ b/dev-libs/jemalloc/jemalloc-5.1.0.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/jemalloc/jemalloc/releases/download/${PV}/${P}.tar.b
 LICENSE="BSD"
 SLOT="0/2"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 
~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-IUSE="debug hardened lazy-lock static-libs stats xmalloc"
+IUSE="debug hardened lazy-lock prof static-libs stats xmalloc"
 HTML_DOCS=( doc/jemalloc.html )
 PATCHES=( "${FILESDIR}/${PN}-5.0.1-strip-optimization.patch"
"${FILESDIR}/${PN}-4.5.0-fix_html_install.patch"
@@ -39,6 +39,7 @@ multilib_src_configure() {
econf  \
$(use_enable debug) \
$(use_enable lazy-lock) \
+   $(use_enable prof) \
$(use_enable stats) \
$(use_enable xmalloc) \
"${myconf[@]}"

diff --git a/dev-libs/jemalloc/jemalloc-5.2.0.ebuild 
b/dev-libs/jemalloc/jemalloc-5.2.0.ebuild
index 16ced36e757..3e82a451db0 100644
--- a/dev-libs/jemalloc/jemalloc-5.2.0.ebuild
+++ b/dev-libs/jemalloc/jemalloc-5.2.0.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/jemalloc/jemalloc/releases/download/${PV}/${P}.tar.b
 LICENSE="BSD"
 SLOT="0/2"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 
~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-IUSE="debug hardened lazy-lock static-libs stats xmalloc"
+IUSE="debug hardened lazy-lock prof static-libs stats xmalloc"
 HTML_DOCS=( doc/jemalloc.html )
 PATCHES=( "${FILESDIR}/${PN}-5.2.0-gentoo-fixups.patch" )
 
@@ -38,6 +38,7 @@ multilib_src_configure() {
econf  \
$(use_enable debug) \
$(use_enable lazy-lock) \
+   $(use_enable prof) \
$(use_enable stats) \
$(use_enable xmalloc) \
"${myconf[@]}"

diff --git a/dev-libs/jemalloc/metadata.xml b/dev-libs/jemalloc/metadata.xml
index 848a0a7987d..14624ae1ff1 100644
--- a/dev-libs/jemalloc/metadata.xml
+++ b/dev-libs/jemalloc/metadata.xml
@@ -11,6 +11,7 @@

Enable transparent huge page 
support
Enable lazy locking (only lock when 
multi-threaded)
+   Enable allocation profiling
Enable statistics 
calculation/reporting
Add support for xmalloc 
(abort-on-out-of-memory)




[gentoo-commits] repo/gentoo:master commit in: app-arch/lbzip2/files/, app-arch/lbzip2/

2019-08-07 Thread Matt Turner
commit: cec154c3438eee983aa3eccbb2c9ebc072d781b0
Author: Matt Turner  gentoo  org>
AuthorDate: Wed Aug  7 19:02:07 2019 +
Commit: Matt Turner  gentoo  org>
CommitDate: Wed Aug  7 19:13:42 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cec154c3

app-arch/lbzip2: Add patch to fix unaligned access

Also remove unnecessary eautoreconf since Whissi was nice enough to run
make dist when he made the snapshot tarball.

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

 .../files/lbzip2-2.5_p20181227-fix-unaligned.patch | 33 ++
 ...81227.ebuild => lbzip2-2.5_p20181227-r1.ebuild} |  9 +-
 2 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/app-arch/lbzip2/files/lbzip2-2.5_p20181227-fix-unaligned.patch 
b/app-arch/lbzip2/files/lbzip2-2.5_p20181227-fix-unaligned.patch
new file mode 100644
index 000..c23d1afc4ca
--- /dev/null
+++ b/app-arch/lbzip2/files/lbzip2-2.5_p20181227-fix-unaligned.patch
@@ -0,0 +1,33 @@
+https://github.com/kjn/lbzip2/pull/25
+
+From d570020ade2add591b97e61927545a005a2d4a6f Mon Sep 17 00:00:00 2001
+From: Matt Turner 
+Date: Wed, 7 Aug 2019 11:47:04 -0700
+Subject: [PATCH] Align zero-length array to avoid unaligned accesses
+
+When make_tree() creates the left-justified base table (uint64_t *B)
+it does so with 64-bit stores:
+
+B[k] = sofar;
+
+But B points to memory in the zero-length array "uint32_t tt[0]" at the
+end of struct decoder_state. Since tt's type is uint32_t, it is only
+aligned to a four byte boundary, and so the 64-bit store in make_tree()
+causes an unaligned trap on strict platforms like sparc.
+---
+ src/decode.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/decode.h b/src/decode.h
+index c9a9086..7c0ca3f 100644
+--- a/src/decode.h
 b/src/decode.h
+@@ -62,7 +62,7 @@ struct decoder_state {
+   uint8_t rle_char; /* current character */
+   uint8_t rle_prev; /* prevoius character */
+ 
+-  uint32_t tt[0];
++  uint32_t tt[0] __attribute__((aligned (8)));
+ };
+ 
+ 

diff --git a/app-arch/lbzip2/lbzip2-2.5_p20181227.ebuild 
b/app-arch/lbzip2/lbzip2-2.5_p20181227-r1.ebuild
similarity index 92%
rename from app-arch/lbzip2/lbzip2-2.5_p20181227.ebuild
rename to app-arch/lbzip2/lbzip2-2.5_p20181227-r1.ebuild
index 04fa9267b15..7dc8fcd267f 100644
--- a/app-arch/lbzip2/lbzip2-2.5_p20181227.ebuild
+++ b/app-arch/lbzip2/lbzip2-2.5_p20181227-r1.ebuild
@@ -3,8 +3,6 @@
 
 EAPI="7"
 
-inherit autotools
-
 DESCRIPTION="Parallel bzip2 utility"
 HOMEPAGE="https://github.com/kjn/lbzip2/;
 SRC_URI="https://dev.gentoo.org/~whissi/dist/${PN}/${P}.tar.gz;
@@ -19,14 +17,9 @@ DEPEND=""
 
 PATCHES=(
"${FILESDIR}"/${PN}-2.3-s_isreg.patch
+   "${FILESDIR}"/${P}-fix-unaligned.patch
 )
 
-src_prepare() {
-   default
-
-   eautoreconf
-}
-
 src_configure() {
local myeconfargs=(
--disable-silent-rules



[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb-connector-c/, dev-db/mariadb-connector-c/files/

2019-08-07 Thread Thomas Deutschmann
commit: cc67804b489142b48cb3c9316c5b92324068794f
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Aug  7 18:59:34 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Aug  7 19:12:24 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc67804b

dev-db/mariadb-connector-c: bump to v3.1.3

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Thomas Deutschmann  gentoo.org>

 dev-db/mariadb-connector-c/Manifest|  1 +
 ...riadb-connector-c-3.1.3-fix-pkconfig-file.patch | 21 ++
 .../mariadb-connector-c-3.1.3.ebuild   | 86 ++
 3 files changed, 108 insertions(+)

diff --git a/dev-db/mariadb-connector-c/Manifest 
b/dev-db/mariadb-connector-c/Manifest
index 9581259d514..da04c0403d7 100644
--- a/dev-db/mariadb-connector-c/Manifest
+++ b/dev-db/mariadb-connector-c/Manifest
@@ -1,3 +1,4 @@
 DIST mariadb-connector-c-3.0.6-src.tar.gz 666819 BLAKE2B 
7245c0e13e569454d1cc70e3579afcbd53c64a0a7e828012b38d73f7d737a81b4fdf0363bd1b156dae783806a51773dbceb2ea06621bd4a73773edb78a70249a
 SHA512 
6a41efacff1840eb8ddd8b34d8894b51f260444c76a1344f9ac9b675fd8492d44716338e4c11594d80118b12d90f75430304282650bce0d5f64179df6cc14d8e
 DIST mariadb-connector-c-3.0.9-src.tar.gz 668142 BLAKE2B 
f61f855c334268b1cb079abc566a600093d7e0bdd164c22045000e337f43d2b57d14988cba1b3fd2f6316f6e0d949be7e67ac73410ddb1abc66e0faa16422946
 SHA512 
6f45bcd4bee07f6d72d1c4fee0bdb903ef4fa879eb7508156bc885a5657caf69b145d95647c4bc663eb2a2b03569b41ef9d87ca532b77901c2f67fd608048a1a
 DIST mariadb-connector-c-3.1.2-src.tar.gz 735530 BLAKE2B 
c441cb69b0affaaa5ed87a9e81232ef2dfab305bf5d92ad60ad0198508294c1153ad517347d2af1336722149200a1a62ddd4c289913b09de0195c9da79279305
 SHA512 
8ad0ec5aea07a04e7ac9da6af3d067755dd8f22deed071de2321c581374b5ed1e4d6bab048b231655d3c2a3722b2b99f276d95046c659f867cbd58d772fb17bb
+DIST mariadb-connector-c-3.1.3-src.tar.gz 738250 BLAKE2B 
a3ea70d2dc226b7c8e907dddaa39e280a76fac7b0a8a74971aa9cc6c1fadf3e5cb96fb3f55e29a639a899d5eeb30dd28d4cfaef0256f030af86909d68e9f85dc
 SHA512 
ca3809a5f1a33317962908ee40d5c339ba6b02c5c8818bf12af9b78eb2289efad711ab74ac7706d711951b22957ba897b5e80b60e8df44924ca70569a4e1c5e7

diff --git 
a/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.1.3-fix-pkconfig-file.patch
 
b/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.1.3-fix-pkconfig-file.patch
new file mode 100644
index 000..ea4798ea943
--- /dev/null
+++ 
b/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.1.3-fix-pkconfig-file.patch
@@ -0,0 +1,21 @@
+--- a/mariadb_config/libmariadb.pc.in
 b/mariadb_config/libmariadb.pc.in
+@@ -7,14 +7,13 @@
+ #
+ 
+ prefix=@CMAKE_INSTALL_PREFIX@
+-includedir=${prefix}/@INSTALL_INCLUDEDIR@/@SUFFIX_INSTALL_DIR@
+-libdir=${prefix}/@INSTALL_LIBDIR@/@SUFFIX_INSTALL_DIR@
++includedir=${prefix}/include
++libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
+ 
+ Name: libmariadb
+ Version: @CPACK_PACKAGE_VERSION@
++URL: https://mariadb.com/kb/en/library/mariadb-connector-c/
+ Description: MariaDB Connector/C dynamic library
+-Cflags: -I${includedir}
++Cflags: -I${includedir}/mariadb
+ Libs: -L${libdir} -lmariadb
+ Libs.private: @extra_dynamic_LDFLAGS@
+-
+-

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.3.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.3.ebuild
new file mode 100644
index 000..234dbab6974
--- /dev/null
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.3.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VCS_INHERIT=""
+if [[ "${PV}" ==  ]] ; then
+   VCS_INHERIT="git-r3"
+   EGIT_REPO_URI="https://github.com/MariaDB/mariadb-connector-c.git;
+else
+   MY_PN=${PN#mariadb-}
+   MY_PV=${PV/_b/-b}
+   
SRC_URI="https://downloads.mariadb.org/f/${MY_PN}-${PV%_beta}/${PN}-${MY_PV}-src.tar.gz?serve
 -> ${P}-src.tar.gz"
+   S="${WORKDIR%/}/${PN}-${MY_PV}-src"
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+fi
+
+inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT}
+
+MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config )
+
+MULTILIB_WRAPPED_HEADERS+=(
+   /usr/include/mariadb/mariadb_version.h
+)
+
+DESCRIPTION="C client library for MariaDB/MySQL"
+HOMEPAGE="https://mariadb.org/;
+LICENSE="LGPL-2.1"
+
+SLOT="0/3"
+IUSE="+curl gnutls kerberos libressl +ssl static-libs test"
+
+DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
+   virtual/libiconv:=[${MULTILIB_USEDEP}]
+   curl? ( net-misc/curl:0=[${MULTILIB_USEDEP}] )
+   kerberos? ( || ( app-crypt/mit-krb5[${MULTILIB_USEDEP}]
+   app-crypt/heimdal[${MULTILIB_USEDEP}] ) )
+   ssl? (
+   gnutls? ( >=net-libs/gnutls-3.3.24:0=[${MULTILIB_USEDEP}] )
+   !gnutls? (
+   libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+   !libressl? ( 

[gentoo-commits] repo/gentoo:master commit in: sys-fs/ncdu/

2019-08-07 Thread Thomas Deutschmann
commit: 5ff9acce357d31c43d31445ceca10b9409eea199
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Aug  7 18:57:30 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Aug  7 19:12:22 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ff9acce

sys-fs/ncdu: bump to v1.14.1

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Thomas Deutschmann  gentoo.org>

 sys-fs/ncdu/Manifest   |  1 +
 sys-fs/ncdu/ncdu-1.14.1.ebuild | 20 
 2 files changed, 21 insertions(+)

diff --git a/sys-fs/ncdu/Manifest b/sys-fs/ncdu/Manifest
index 3706503633a..6da187ba6b9 100644
--- a/sys-fs/ncdu/Manifest
+++ b/sys-fs/ncdu/Manifest
@@ -1,2 +1,3 @@
 DIST ncdu-1.13.tar.gz 143819 BLAKE2B 
8ba489dab1cbafec5b1d9b437b44aa7aa5d79ed7b6938f7904465c4d3803390307bfdfed531641fa186873005ce7f0c37db058855ffcd4ce45888bfbffd03c3b
 SHA512 
f1f417caa9bd9e9d9aa6311962b461e48301cf9eab5d0f57073e25df01f96ded05dd093627b95b43afc659ad99aed869efd4a98d723f5835b100747b5525a60c
+DIST ncdu-1.14.1.tar.gz 146346 BLAKE2B 
50152647389cb08c236a47c8f85b93c7a42ba9a94b84dee313b7887614e5612ad9c0158a878872e08ffc3e85f4a7b91d292dfa0ae0471e194e6cec2b25a9355e
 SHA512 
7db9115f7ba20d43c47bc7187347658d7a4dc36da6ffdc54308d3966a431c24b87c3266854d69685c3ea5e29805b5a631805a783d6431e30bd83c411b398515d
 DIST ncdu-1.14.tar.gz 145911 BLAKE2B 
27b9350d5f12bb0c3a972b81e325e305fce2ffb73194e26a70a4fcac79805e5addfe18483e56dcfcb1e24bad4c3ef418ffba5a0c15d4916db5aa0961aec6
 SHA512 
9583d86f66ae9ab19e5d373d90e0d85504807f726fe6656e593ab09f83ba4ff22c0bec6fcfec216c4d9ac0b3725899ff1d9fe6cca1e3d5fd1c76cd4636b65c1f

diff --git a/sys-fs/ncdu/ncdu-1.14.1.ebuild b/sys-fs/ncdu/ncdu-1.14.1.ebuild
new file mode 100644
index 000..27a003fb9d2
--- /dev/null
+++ b/sys-fs/ncdu/ncdu-1.14.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="NCurses Disk Usage"
+HOMEPAGE="https://dev.yorhel.nl/ncdu/;
+SRC_URI="https://dev.yorhel.nl/download/${P}.tar.gz;
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux 
~x64-macos"
+
+RDEPEND="
+   sys-libs/ncurses:0=[unicode]
+"
+DEPEND="
+   ${RDEPEND}
+   virtual/pkgconfig
+"



[gentoo-commits] repo/gentoo:master commit in: net-dns/pdns/

2019-08-07 Thread Sven Wegener
commit: 8b735f4fe5818d70ab95d1148bf17668a65f1c32
Author: Sven Wegener  gentoo  org>
AuthorDate: Wed Aug  7 18:59:05 2019 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Wed Aug  7 18:59:42 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b735f4f

net-dns/pdns: Cleanup

Bug: https://bugs.gentoo.org/691086
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Sven Wegener  gentoo.org>

 net-dns/pdns/Manifest   |   1 -
 net-dns/pdns/pdns-4.1.10.ebuild | 157 
 2 files changed, 158 deletions(-)

diff --git a/net-dns/pdns/Manifest b/net-dns/pdns/Manifest
index 89397ffbe5a..83921db6ace 100644
--- a/net-dns/pdns/Manifest
+++ b/net-dns/pdns/Manifest
@@ -1,3 +1,2 @@
-DIST pdns-4.1.10.tar.bz2 1117663 BLAKE2B 
9c1b8c608862b42019c6b753af950f940455538b439824e10d28a79a4f04fe926decf86f286d79c850f39e0df345d646ba774e5557cce1d44f6c120d8b2892a3
 SHA512 
59a7a52468f6daae8de01bb2b08d812906ef58047026369895341cfff253a5b9ba29d6a6b43a822f1632641eec34fa1afa6fbb5b0ba5e72ecce8e61787892136
 DIST pdns-4.1.11.tar.bz2 1118103 BLAKE2B 
f4ba0c463c7ff5f2185b33956ef7749b5ca6496ce850a189ec5a537d174e1391784f2c0c2af3bc7b68d2f1e01ec57c8731dc07a7690905ab7a6e386a1a8f3e4d
 SHA512 
18215f523a39d48c8756bc13ecae1bd78967c2d66619d93ddaafb13062690002a9bdfe1d337796820706692c449286c7b9e9b8d45933684d32acbc20e490c0c4
 DIST pdns-4.2.0-rc2.tar.bz2 1245187 BLAKE2B 
30ee03752dafa02f5618ba26def1cb8d49b0f7f004b54fcb8d7640b0d60897ac9a9b13e918ab3aaee1d679af772aacd0591e9c9cd3bf6b1af79305e06cac1cdb
 SHA512 
695589980fc35e73fc0e72f57034e2cfefd7b046100dc6f8740ac94dd50ee068453c72aa2ee5626e6cccfca1eeb5e3f036b844039db52d5c45f070d291002122

diff --git a/net-dns/pdns/pdns-4.1.10.ebuild b/net-dns/pdns/pdns-4.1.10.ebuild
deleted file mode 100644
index ad05ab44820..000
--- a/net-dns/pdns/pdns-4.1.10.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit multilib user
-
-DESCRIPTION="The PowerDNS Daemon"
-HOMEPAGE="https://www.powerdns.com/;
-SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-# other possible flags:
-# db2: we lack the dep
-# oracle: dito (need Oracle Client Libraries)
-# xdb: (almost) dead, surely not supported
-
-IUSE="botan debug doc geoip ldap libressl lua luajit mydns mysql opendbx 
postgres protobuf remote sodium sqlite systemd tools tinydns test"
-
-REQUIRED_USE="mydns? ( mysql )"
-
-RDEPEND="
-   libressl? ( dev-libs/libressl:= )
-   !libressl? ( dev-libs/openssl:= )
-   >=dev-libs/boost-1.35:=
-   botan? ( dev-libs/botan:2= )
-   lua? (
-   !luajit? ( dev-lang/lua:= )
-   luajit? ( dev-lang/luajit:= )
-   )
-   mysql? ( dev-db/mysql-connector-c )
-   postgres? ( dev-db/postgresql:= )
-   ldap? ( >=net-nds/openldap-2.0.27-r4 app-crypt/mit-krb5 )
-   sqlite? ( dev-db/sqlite:3 )
-   opendbx? ( dev-db/opendbx )
-   geoip? ( >=dev-cpp/yaml-cpp-0.5.1:= dev-libs/geoip )
-   sodium? ( dev-libs/libsodium:= )
-   tinydns? ( >=dev-db/tinycdb-0.77 )
-   protobuf? ( dev-libs/protobuf )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
-   doc? ( app-doc/doxygen )"
-
-S="${WORKDIR}"/${P/_/-}
-
-src_configure() {
-   local dynmodules="pipe bind" # the default backends, always enabled
-
-   #use db2 && dynmodules+=" db2"
-   use ldap && dynmodules+=" ldap"
-   use lua && dynmodules+=" lua"
-   use mydns && dynmodules+=" mydns"
-   use mysql && dynmodules+=" gmysql"
-   use opendbx && dynmodules+=" opendbx"
-   #use oracle && dynmodules+=" goracle oracle"
-   use postgres && dynmodules+=" gpgsql"
-   use remote && dynmodules+=" remote"
-   use sqlite && dynmodules+=" gsqlite3"
-   use tinydns && dynmodules+=" tinydns"
-   use geoip && dynmodules+=" geoip"
-   #use xdb && dynmodules+=" xdb"
-
-   econf \
-   --disable-static \
-   --sysconfdir=/etc/powerdns \
-   --libdir=/usr/$(get_libdir)/powerdns \
-   --with-modules= \
-   --with-dynmodules="${dynmodules}" \
-   --with-mysql-lib=/usr/$(get_libdir) \
-   $(use_enable botan) \
-   $(use_enable debug verbose-logging) \
-   $(use_enable test unit-tests) \
-   $(use_enable tools) \
-   $(use_enable systemd) \
-   $(use_enable sodium libsodium) \
-   $(usex lua "$(use_with !luajit lua) $(use_with luajit)" \
-   '--without-lua --without-luajit') \
-   $(use_with protobuf) \
-   ${myconf}
-}
-
-src_compile() {
-   default
-   use doc && emake -C codedocs codedocs
-}
-
-src_install() {
-   default
-
-   mv "${D}"/etc/powerdns/pdns.conf{-dist,}
-
-   fperms 0700 /etc/powerdns
-  

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

2019-08-07 Thread Georgy Yakovlev
commit: 73388d195c967accd3e9e7330a546bd9a81401da
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Wed Aug  7 18:44:36 2019 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Wed Aug  7 18:49:03 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73388d19

media-libs/libvpx: add ppc64le patch for 1.8.0

Closes: https://bugs.gentoo.org/688138
Acked-by: Mike Gilbert  gentoo.org>
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Georgy Yakovlev  gentoo.org>

 .../files/libvpx-1.8.0-ppc64le-disable-vsx.patch   | 28 ++
 media-libs/libvpx/libvpx-1.8.0-r1.ebuild   |  1 +
 media-libs/libvpx/libvpx-1.8.0.ebuild  |  1 +
 3 files changed, 30 insertions(+)

diff --git a/media-libs/libvpx/files/libvpx-1.8.0-ppc64le-disable-vsx.patch 
b/media-libs/libvpx/files/libvpx-1.8.0-ppc64le-disable-vsx.patch
new file mode 100644
index 000..5c6a36ca867
--- /dev/null
+++ b/media-libs/libvpx/files/libvpx-1.8.0-ppc64le-disable-vsx.patch
@@ -0,0 +1,28 @@
+From 7bf48f92e884fc01c28a4652ea0883b28744519d Mon Sep 17 00:00:00 2001
+From: Johann 
+Date: Mon, 10 Jun 2019 14:35:03 -0700
+Subject: [PATCH] ppc: disable vsx optimizations with hbd
+
+vsx optimizations do not support 32 bit tran_low_t values.
+
+BUG=webm:1563
+
+Change-Id: I9e6348078f6e4855acfd381133eb840a435b7f81
+---
+
+diff --git a/build/make/configure.sh b/build/make/configure.sh
+index e950353..4a874f1 100644
+--- a/build/make/configure.sh
 b/build/make/configure.sh
+@@ -1239,7 +1239,10 @@
+ ppc64le*)
+   link_with_cc=gcc
+   setup_gnu_toolchain
+-  check_gcc_machine_option "vsx"
++  # Only enable vsx optimizations when vp9_highbitdepth is not enabled.
++  # https://bugs.chromium.org/p/webm/issues/detail?id=1538
++  enabled vp9_highbitdepth || check_gcc_machine_option "vsx"
++  enabled vsx || RTCD_OPTIONS="${RTCD_OPTIONS}--disable-vsx "
+   if [ -n "${tune_cpu}" ]; then
+ case ${tune_cpu} in
+   power?)

diff --git a/media-libs/libvpx/libvpx-1.8.0-r1.ebuild 
b/media-libs/libvpx/libvpx-1.8.0-r1.ebuild
index b75c00c5ca4..c45449b70d2 100644
--- a/media-libs/libvpx/libvpx-1.8.0-r1.ebuild
+++ b/media-libs/libvpx/libvpx-1.8.0-r1.ebuild
@@ -42,6 +42,7 @@ DEPEND="abi_x86_32? ( dev-lang/yasm )
 
 PATCHES=(
"${FILESDIR}/libvpx-1.3.0-sparc-configure.patch" # 501010
+   "${FILESDIR}/libvpx-1.8.0-ppc64le-disable-vsx.patch" #688138
 )
 
 src_configure() {

diff --git a/media-libs/libvpx/libvpx-1.8.0.ebuild 
b/media-libs/libvpx/libvpx-1.8.0.ebuild
index 73214ce5133..cc1164e1ea8 100644
--- a/media-libs/libvpx/libvpx-1.8.0.ebuild
+++ b/media-libs/libvpx/libvpx-1.8.0.ebuild
@@ -46,6 +46,7 @@ DEPEND="abi_x86_32? ( dev-lang/yasm )
 
 PATCHES=(
"${FILESDIR}/libvpx-1.3.0-sparc-configure.patch" # 501010
+   "${FILESDIR}/libvpx-1.8.0-ppc64le-disable-vsx.patch" #688138
 )
 
 src_configure() {



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

2019-08-07 Thread Joonas Niilola
commit: 29888e3202978f866bd0f2494711d2defd2290ed
Author: Nick Erdmann  nirf  de>
AuthorDate: Sat Aug  3 15:07:53 2019 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Aug  7 18:28:16 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29888e32

dev-lang/zig: remove zig-0.4.0.ebuild

Signed-off-by: Nick Erdmann  nirf.de>
Closes: https://github.com/gentoo/gentoo/pull/12606
Signed-off-by: Joonas Niilola  gentoo.org>

 dev-lang/zig/zig-0.4.0-r1.ebuild |  2 ++
 dev-lang/zig/zig-0.4.0.ebuild| 56 
 2 files changed, 2 insertions(+), 56 deletions(-)

diff --git a/dev-lang/zig/zig-0.4.0-r1.ebuild b/dev-lang/zig/zig-0.4.0-r1.ebuild
index de7dd259a3d..bedd9d7ba9b 100644
--- a/dev-lang/zig/zig-0.4.0-r1.ebuild
+++ b/dev-lang/zig/zig-0.4.0-r1.ebuild
@@ -38,6 +38,8 @@ PATCHES=(
"${FILESDIR}/zig-0.4.0-r1-suppress-warnings.patch"
 )
 
+LLVM_MAX_SLOT=8
+
 src_prepare() {
if use experimental; then
sed -i '/^NEED_TARGET(/d' cmake/Findllvm.cmake || die "unable 
to modify cmake/Findllvm.cmake"

diff --git a/dev-lang/zig/zig-0.4.0.ebuild b/dev-lang/zig/zig-0.4.0.ebuild
deleted file mode 100644
index 606e696a4c5..000
--- a/dev-lang/zig/zig-0.4.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-DESCRIPTION="A robust, optimal, and maintainable programming language"
-HOMEPAGE="https://ziglang.org/;
-LICENSE="MIT"
-SLOT="0"
-IUSE="+experimental"
-
-if [[ ${PV} ==  ]]; then
-   EGIT_REPO_URI="https://github.com/ziglang/zig.git;
-   inherit git-r3
-else
-   SRC_URI="https://github.com/ziglang/zig/archive/${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64"
-fi
-
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430 NVPTX
-   PowerPC Sparc SystemZ WebAssembly X86 XCore )
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-# According to zig's author, zig builds that do not support all targets are not
-# supported by the upstream project.
-LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]}
-
-RDEPEND="
-   sys-devel/llvm:8
-   !experimental? ( sys-devel/llvm:8[${LLVM_TARGET_USEDEPS// /,}] )
-"
-
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-   if use experimental; then
-   sed -i '/^NEED_TARGET(/d' cmake/Findllvm.cmake || die "unable 
to modify cmake/Findllvm.cmake"
-   fi
-
-   sed -i '/^install(TARGETS zig_cpp/d' CMakeLists.txt || die "unable to 
modify CMakeLists.txt"
-   sed -i '/install(TARGETS embedded/d' CMakeLists.txt || die "unable to 
modify CMakeLists.txt"
-
-   # Suppress error messages
-   sed -i '/if(NOT(CMAKE_BUILD_TYPE/,/endif()/d' cmake/Findllvm.cmake || 
die "unable to modify cmake/Findllvm.cmake"
-
-   cmake-utils_src_prepare
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DBUILD_SHARED_LIBS=OFF
-   )
-
-   cmake-utils_src_configure
-}



[gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/files/, dev-lang/zig/

2019-08-07 Thread Joonas Niilola
commit: d71767d8b9454f990c4f220aacc316e2914b7af6
Author: Nick Erdmann  nirf  de>
AuthorDate: Sat Aug  3 15:05:42 2019 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Aug  7 18:27:26 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d71767d8

dev-lang/zig: switch to EAPI=6, use patch files

Signed-off-by: Nick Erdmann  nirf.de>
Signed-off-by: Joonas Niilola  gentoo.org>

 .../zig/files/zig-0.4.0-r1-build-artifacts.patch   | 61 ++
 .../zig/files/zig-0.4.0-r1-suppress-warnings.patch | 31 +++
 dev-lang/zig/zig-0.4.0-r1.ebuild   | 47 +
 3 files changed, 139 insertions(+)

diff --git a/dev-lang/zig/files/zig-0.4.0-r1-build-artifacts.patch 
b/dev-lang/zig/files/zig-0.4.0-r1-build-artifacts.patch
new file mode 100644
index 000..11868e93a8a
--- /dev/null
+++ b/dev-lang/zig/files/zig-0.4.0-r1-build-artifacts.patch
@@ -0,0 +1,61 @@
+From 81767a658d07219a402384f98a7553abcbbd2e70 Mon Sep 17 00:00:00 2001
+From: Marc Tiehuis 
+Date: Thu, 18 Apr 2019 18:58:12 +1200
+Subject: [PATCH] Don't install stage2 artifacts
+
+Fixes #2220.
+---
+ CMakeLists.txt  | 11 ++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1b017a881..047d538e8 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -58,6 +58,16 @@ endif()
+ 
+ set(ZIG_CPP_LIB_DIR "${CMAKE_BINARY_DIR}/zig_cpp")
+ 
++# Handle multi-config builds and place each into a common lib. The VS 
generator
++# for example will append a Debug folder by default if not explicitly 
specified.
++set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${ZIG_CPP_LIB_DIR})
++set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${ZIG_CPP_LIB_DIR})
++foreach(CONFIG_TYPE ${CMAKE_CONFIGURATION_TYPES})
++string(TOUPPER ${CONFIG_TYPE} CONFIG_TYPE)
++set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${CONFIG_TYPE} ${ZIG_CPP_LIB_DIR})
++set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_${CONFIG_TYPE} ${ZIG_CPP_LIB_DIR})
++endforeach(CONFIG_TYPE CMAKE_CONFIGURATION_TYPES)
++
+ if(ZIG_FORCE_EXTERNAL_LLD)
+ find_package(lld)
+ include_directories(${LLVM_INCLUDE_DIRS})
+@@ -253,7 +263,6 @@ else()
+ embedded_lld_wasm
+ embedded_lld_lib
+ )
+-install(TARGETS embedded_lld_elf embedded_lld_coff embedded_lld_mingw 
embedded_lld_wasm embedded_lld_lib DESTINATION "${ZIG_CPP_LIB_DIR}")
+ endif()
+ 
+ # No patches have been applied to SoftFloat-3e
+
+From 40fe6afdad1a8676b5d3a5dd23d6d50d6ea9f059 Mon Sep 17 00:00:00 2001
+From: Marc Tiehuis 
+Date: Wed, 1 May 2019 17:39:23 +1200
+Subject: [PATCH] Don't install zig_cpp lib for stage2 target
+
+Missed in last commit. See #2220.
+---
+ CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 047d538e8..9881ce1de 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -6671,6 +6681,5 @@
+ endif()
+ install(TARGETS zig DESTINATION bin)
+-install(TARGETS zig_cpp DESTINATION "${ZIG_CPP_LIB_DIR}")
+ 
+ foreach(file ${ZIG_C_HEADER_FILES})
+ get_filename_component(file_dir "${C_HEADERS_DEST}/${file}" DIRECTORY)

diff --git a/dev-lang/zig/files/zig-0.4.0-r1-suppress-warnings.patch 
b/dev-lang/zig/files/zig-0.4.0-r1-suppress-warnings.patch
new file mode 100644
index 000..1dc92f88ecb
--- /dev/null
+++ b/dev-lang/zig/files/zig-0.4.0-r1-suppress-warnings.patch
@@ -0,0 +1,31 @@
+Don't attempt to look for static libraries that we're not going to use.
+The warnings are only triggered when building with portage.
+
+--- a/cmake/Findllvm.cmake
 b/cmake/Findllvm.cmake
+@@ -50,25 +50,6 @@
+ endif()
+ endfunction(NEED_TARGET)
+ 
+-if(NOT(CMAKE_BUILD_TYPE STREQUAL "Debug") OR ZIG_STATIC)
+-  execute_process(
+-  COMMAND ${LLVM_CONFIG_EXE} --libfiles --link-static
+-  OUTPUT_VARIABLE LLVM_LIBRARIES_SPACES
+-  OUTPUT_STRIP_TRAILING_WHITESPACE)
+-  string(REPLACE " " ";" LLVM_LIBRARIES "${LLVM_LIBRARIES_SPACES}")
+-
+-  execute_process(
+-  COMMAND ${LLVM_CONFIG_EXE} --system-libs --link-static
+-  OUTPUT_VARIABLE LLVM_SYSTEM_LIBS_SPACES
+-  OUTPUT_STRIP_TRAILING_WHITESPACE)
+-  string(REPLACE " " ";" LLVM_SYSTEM_LIBS "${LLVM_SYSTEM_LIBS_SPACES}")
+-
+-  execute_process(
+-  COMMAND ${LLVM_CONFIG_EXE} --libdir --link-static
+-  OUTPUT_VARIABLE LLVM_LIBDIRS_SPACES
+-  OUTPUT_STRIP_TRAILING_WHITESPACE)
+-  string(REPLACE " " ";" LLVM_LIBDIRS "${LLVM_LIBDIRS_SPACES}")
+-endif()
+ if(NOT LLVM_LIBRARIES)
+   execute_process(
+   COMMAND ${LLVM_CONFIG_EXE} --libs

diff --git a/dev-lang/zig/zig-0.4.0-r1.ebuild b/dev-lang/zig/zig-0.4.0-r1.ebuild
new file mode 100644
index 000..de7dd259a3d
--- /dev/null
+++ b/dev-lang/zig/zig-0.4.0-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils llvm
+
+DESCRIPTION="A robust, optimal, and maintainable programming language"
+HOMEPAGE="https://ziglang.org/;
+LICENSE="MIT"

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

2019-08-07 Thread Kent Fredric
commit: d9bb3682f421c106289cb346b1d35e4ef88a471b
Author: Kent Fredric  gentoo  org>
AuthorDate: Wed Aug  7 13:27:31 2019 +
Commit: Kent Fredric  gentoo  org>
CommitDate: Wed Aug  7 17:46:11 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9bb3682

dev-lang/parrot: Add subslot deps for readline and gmp

Package-Manager: Portage-2.3.66, Repoman-2.3.16
Signed-off-by: Kent Fredric  gentoo.org>

 dev-lang/parrot/{parrot-7.1.0.ebuild => parrot-7.1.0-r1.ebuild}   | 4 ++--
 dev-lang/parrot/{parrot-7.11.0.ebuild => parrot-7.11.0-r1.ebuild} | 4 ++--
 dev-lang/parrot/{parrot-7.5.0.ebuild => parrot-7.5.0-r1.ebuild}   | 4 ++--
 dev-lang/parrot/{parrot-8.1.0.ebuild => parrot-8.1.0-r1.ebuild}   | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dev-lang/parrot/parrot-7.1.0.ebuild 
b/dev-lang/parrot/parrot-7.1.0-r1.ebuild
similarity index 97%
rename from dev-lang/parrot/parrot-7.1.0.ebuild
rename to dev-lang/parrot/parrot-7.1.0-r1.ebuild
index 148ef1c2d81..e6a5cc6a3e3 100644
--- a/dev-lang/parrot/parrot-7.1.0.ebuild
+++ b/dev-lang/parrot/parrot-7.1.0-r1.ebuild
@@ -17,13 +17,13 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos"
 IUSE="opengl nls doc examples gdbm gmp ssl +unicode pcre"
 
-RDEPEND="sys-libs/readline
+RDEPEND="sys-libs/readline:0=
dev-libs/libffi
opengl? ( media-libs/freeglut )
nls? ( sys-devel/gettext )
unicode? ( >=dev-libs/icu-2.6:= )
gdbm? ( >=sys-libs/gdbm-1.8.3-r1 )
-   gmp? ( >=dev-libs/gmp-4.1.4 )
+   gmp? ( >=dev-libs/gmp-4.1.4:0= )
ssl? ( dev-libs/openssl:0= )
pcre? ( dev-libs/libpcre )
doc? ( dev-perl/JSON )"

diff --git a/dev-lang/parrot/parrot-7.11.0.ebuild 
b/dev-lang/parrot/parrot-7.11.0-r1.ebuild
similarity index 97%
rename from dev-lang/parrot/parrot-7.11.0.ebuild
rename to dev-lang/parrot/parrot-7.11.0-r1.ebuild
index 9655f5fbc60..17a2bdbe85b 100644
--- a/dev-lang/parrot/parrot-7.11.0.ebuild
+++ b/dev-lang/parrot/parrot-7.11.0-r1.ebuild
@@ -17,13 +17,13 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos"
 IUSE="opengl nls doc examples gdbm +gmp ssl +unicode pcre"
 
-RDEPEND="sys-libs/readline
+RDEPEND="sys-libs/readline:0=
dev-libs/libffi
opengl? ( media-libs/freeglut )
nls? ( sys-devel/gettext )
unicode? ( >=dev-libs/icu-2.6:= )
gdbm? ( >=sys-libs/gdbm-1.8.3-r1 )
-   gmp? ( >=dev-libs/gmp-4.1.4 )
+   gmp? ( >=dev-libs/gmp-4.1.4:0= )
ssl? ( dev-libs/openssl:0= )
pcre? ( dev-libs/libpcre )
doc? ( dev-perl/JSON )"

diff --git a/dev-lang/parrot/parrot-7.5.0.ebuild 
b/dev-lang/parrot/parrot-7.5.0-r1.ebuild
similarity index 97%
rename from dev-lang/parrot/parrot-7.5.0.ebuild
rename to dev-lang/parrot/parrot-7.5.0-r1.ebuild
index 9655f5fbc60..17a2bdbe85b 100644
--- a/dev-lang/parrot/parrot-7.5.0.ebuild
+++ b/dev-lang/parrot/parrot-7.5.0-r1.ebuild
@@ -17,13 +17,13 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos"
 IUSE="opengl nls doc examples gdbm +gmp ssl +unicode pcre"
 
-RDEPEND="sys-libs/readline
+RDEPEND="sys-libs/readline:0=
dev-libs/libffi
opengl? ( media-libs/freeglut )
nls? ( sys-devel/gettext )
unicode? ( >=dev-libs/icu-2.6:= )
gdbm? ( >=sys-libs/gdbm-1.8.3-r1 )
-   gmp? ( >=dev-libs/gmp-4.1.4 )
+   gmp? ( >=dev-libs/gmp-4.1.4:0= )
ssl? ( dev-libs/openssl:0= )
pcre? ( dev-libs/libpcre )
doc? ( dev-perl/JSON )"

diff --git a/dev-lang/parrot/parrot-8.1.0.ebuild 
b/dev-lang/parrot/parrot-8.1.0-r1.ebuild
similarity index 97%
rename from dev-lang/parrot/parrot-8.1.0.ebuild
rename to dev-lang/parrot/parrot-8.1.0-r1.ebuild
index dc938a69dfc..c723b916dac 100644
--- a/dev-lang/parrot/parrot-8.1.0.ebuild
+++ b/dev-lang/parrot/parrot-8.1.0-r1.ebuild
@@ -17,14 +17,14 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos"
 IUSE="opengl nls doc examples gdbm +gmp ssl +unicode pcre"
 
-RDEPEND="sys-libs/readline
+RDEPEND="sys-libs/readline:0=
dev-libs/libffi
net-libs/libnsl:0=
opengl? ( media-libs/freeglut )
nls? ( sys-devel/gettext )
unicode? ( >=dev-libs/icu-2.6:= )
gdbm? ( >=sys-libs/gdbm-1.8.3-r1 )
-   gmp? ( >=dev-libs/gmp-4.1.4 )
+   gmp? ( >=dev-libs/gmp-4.1.4:0= )
ssl? ( dev-libs/openssl:0= )
pcre? ( dev-libs/libpcre )
doc? ( dev-perl/JSON )"



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

2019-08-07 Thread Kent Fredric
commit: 609f14e782dd4c15662d1946e2aa6ca0b65ba26a
Author: Kent Fredric  gentoo  org>
AuthorDate: Wed Aug  7 17:45:11 2019 +
Commit: Kent Fredric  gentoo  org>
CommitDate: Wed Aug  7 17:46:20 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=609f14e7

dev-lang/parrot: -r1 bump for EAPI7

Looks like no new releases are happening in the near future, so
bumping the last release by one -r step for EAPI7 conversion

- All use of "|| die" removed from builtins (these have auto-died'
  since EAPI4 )
- Rework doc handling logic to avoid use of banned "dohtml"
- Stripped auxilliary copies of docs in "docs/${PF}/parrot/${PV}"
- Remove excess indirection of "doc/${PF}/editor/editor"
- Unified docs, examples, and html handling with "einstalldocs"

Package-Manager: Portage-2.3.66, Repoman-2.3.16
Signed-off-by: Kent Fredric  gentoo.org>

 dev-lang/parrot/parrot-8.1.0-r2.ebuild | 101 +
 1 file changed, 101 insertions(+)

diff --git a/dev-lang/parrot/parrot-8.1.0-r2.ebuild 
b/dev-lang/parrot/parrot-8.1.0-r2.ebuild
new file mode 100644
index 000..85f839ba76a
--- /dev/null
+++ b/dev-lang/parrot/parrot-8.1.0-r2.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils multilib
+
+# weird failures
+RESTRICT="test"
+
+DESCRIPTION="Virtual machine designed to compile and execute bytecode for 
dynamic languages"
+HOMEPAGE="http://www.parrot.org/;
+SRC_URI="ftp://ftp.parrot.org/pub/parrot/releases/all/${PV}/${P}.tar.gz;
+
+LICENSE="Artistic-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos"
+IUSE="opengl nls doc examples gdbm +gmp ssl +unicode pcre"
+
+CDEPEND="sys-libs/readline:0=
+   dev-libs/libffi
+   net-libs/libnsl:0=
+   opengl? ( media-libs/freeglut )
+   nls? ( sys-devel/gettext )
+   unicode? ( >=dev-libs/icu-2.6:= )
+   gdbm? ( >=sys-libs/gdbm-1.8.3-r1 )
+   gmp? ( >=dev-libs/gmp-4.1.4:0= )
+   ssl? ( dev-libs/openssl:0= )
+   pcre? ( dev-libs/libpcre )
+"
+RDEPEND="${CDEPEND}
+   doc? ( dev-perl/JSON )"
+DEPEND="${CDEPEND}"
+BDEPEND="dev-lang/perl[doc?]
+   ${RDEPEND}"
+
+src_configure() {
+   myconf="--disable-rpath"
+   use unicode || myconf+=" --without-icu"
+   use ssl || myconf+=" --without-crypto"
+   use gdbm|| myconf+=" --without-gdbm"
+   use nls || myconf+=" --without-gettext"
+   use gmp || myconf+=" --without-gmp"
+   use opengl  || myconf+=" --without-opengl"
+   use pcre|| myconf+=" --without-pcre"
+
+   perl Configure.pl \
+   --ccflags="${CFLAGS}" \
+   --linkflags="${LDFLAGS}" \
+   --prefix="${EPREFIX}"/usr \
+   --libdir="${EPREFIX}"/usr/$(get_libdir) \
+   --mandir="${EPREFIX}"/usr/share/man \
+   --sysconfdir="${EPREFIX}"/etc \
+   --sharedstatedir="${EPREFIX}"/var/lib/parrot \
+   $myconf || die
+}
+
+src_compile() {
+   export 
LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}"${S}"/blib/lib
+   # occasionally dies in parallel make
+   emake -j1
+   if use doc ; then
+   emake -j1 html
+   fi
+}
+
+src_test() {
+   emake -j1 test
+}
+
+src_install() {
+   emake -j1 install-dev DESTDIR="${D}" 
DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
+   dosym parrot-ops2c /usr/bin/ops2c
+   rm -vfr "${ED}/usr/share/doc/${PF}/parrot" || die "Unable to prune 
excess docs"
+   DOCS=(
+   CREDITS
+   ChangeLog
+   DONORS.pod
+   PBC_COMPAT
+   PLATFORMS
+   README.pod
+   RESPONSIBLE_PARTIES
+   TODO
+   )
+   use doc && DOCS+=( editor )
+   use examples && DOCS+=( examples )
+   use doc && HTML_DOCS=(
+   docs/html/developer.html
+   docs/html/DONORS.pod.html
+   docs/html/index.html
+   docs/html/ops.html
+   docs/html/parrotbug.html
+   docs/html/pdds.html
+   docs/html/pmc.html
+   docs/html/tools.html
+   docs/html/docs
+   docs/html/src
+   docs/html/tools
+   )
+   einstalldocs
+}



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

2019-08-07 Thread Kent Fredric
commit: 19c04bea48fb0abe47ec092a6a54bbb011bf834f
Author: Kent Fredric  gentoo  org>
AuthorDate: Wed Aug  7 13:46:32 2019 +
Commit: Kent Fredric  gentoo  org>
CommitDate: Wed Aug  7 17:46:16 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19c04bea

dev-lang/parrot: Use relative paths for ops2c symlink

Package-Manager: Portage-2.3.66, Repoman-2.3.16
Signed-off-by: Kent Fredric  gentoo.org>

 dev-lang/parrot/parrot-7.1.0-r1.ebuild  | 2 +-
 dev-lang/parrot/parrot-7.11.0-r1.ebuild | 2 +-
 dev-lang/parrot/parrot-7.5.0-r1.ebuild  | 2 +-
 dev-lang/parrot/parrot-8.1.0-r1.ebuild  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-lang/parrot/parrot-7.1.0-r1.ebuild 
b/dev-lang/parrot/parrot-7.1.0-r1.ebuild
index e6a5cc6a3e3..3ba3c774a34 100644
--- a/dev-lang/parrot/parrot-7.1.0-r1.ebuild
+++ b/dev-lang/parrot/parrot-7.1.0-r1.ebuild
@@ -68,7 +68,7 @@ src_test() {
 src_install() {
emake -j1 install-dev DESTDIR="${D}" 
DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" || die
dodoc CREDITS DONORS.pod PBC_COMPAT PLATFORMS RESPONSIBLE_PARTIES TODO 
|| die
-   dosym /usr/bin/parrot-ops2c /usr/bin/ops2c || die
+   dosym parrot-ops2c /usr/bin/ops2c || die
if use examples; then
insinto "/usr/share/doc/${PF}/examples"
doins -r examples/* || die

diff --git a/dev-lang/parrot/parrot-7.11.0-r1.ebuild 
b/dev-lang/parrot/parrot-7.11.0-r1.ebuild
index 17a2bdbe85b..ecedd1c6ff5 100644
--- a/dev-lang/parrot/parrot-7.11.0-r1.ebuild
+++ b/dev-lang/parrot/parrot-7.11.0-r1.ebuild
@@ -68,7 +68,7 @@ src_test() {
 src_install() {
emake -j1 install-dev DESTDIR="${D}" 
DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" || die
dodoc CREDITS DONORS.pod PBC_COMPAT PLATFORMS RESPONSIBLE_PARTIES TODO 
|| die
-   dosym /usr/bin/parrot-ops2c /usr/bin/ops2c || die
+   dosym parrot-ops2c /usr/bin/ops2c || die
if use examples; then
insinto "/usr/share/doc/${PF}/examples"
doins -r examples/* || die

diff --git a/dev-lang/parrot/parrot-7.5.0-r1.ebuild 
b/dev-lang/parrot/parrot-7.5.0-r1.ebuild
index 17a2bdbe85b..ecedd1c6ff5 100644
--- a/dev-lang/parrot/parrot-7.5.0-r1.ebuild
+++ b/dev-lang/parrot/parrot-7.5.0-r1.ebuild
@@ -68,7 +68,7 @@ src_test() {
 src_install() {
emake -j1 install-dev DESTDIR="${D}" 
DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" || die
dodoc CREDITS DONORS.pod PBC_COMPAT PLATFORMS RESPONSIBLE_PARTIES TODO 
|| die
-   dosym /usr/bin/parrot-ops2c /usr/bin/ops2c || die
+   dosym parrot-ops2c /usr/bin/ops2c || die
if use examples; then
insinto "/usr/share/doc/${PF}/examples"
doins -r examples/* || die

diff --git a/dev-lang/parrot/parrot-8.1.0-r1.ebuild 
b/dev-lang/parrot/parrot-8.1.0-r1.ebuild
index c723b916dac..271931b3b1a 100644
--- a/dev-lang/parrot/parrot-8.1.0-r1.ebuild
+++ b/dev-lang/parrot/parrot-8.1.0-r1.ebuild
@@ -69,7 +69,7 @@ src_test() {
 src_install() {
emake -j1 install-dev DESTDIR="${D}" 
DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" || die
dodoc CREDITS DONORS.pod PBC_COMPAT PLATFORMS RESPONSIBLE_PARTIES TODO 
|| die
-   dosym /usr/bin/parrot-ops2c /usr/bin/ops2c || die
+   dosym parrot-ops2c /usr/bin/ops2c || die
if use examples; then
insinto "/usr/share/doc/${PF}/examples"
doins -r examples/* || die



[gentoo-commits] repo/gentoo:master commit in: dev-libs/roct-thunk-interface/

2019-08-07 Thread Craig Andrews
commit: b32753ba763ba9c57b866bfadf4f97cf1a6a5e2d
Author: Craig Andrews  gentoo  org>
AuthorDate: Mon Jul 22 20:22:51 2019 +
Commit: Craig Andrews  gentoo  org>
CommitDate: Wed Aug  7 17:38:44 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b32753ba

dev-libs/roct-thunk-interface: add - version

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Craig Andrews  gentoo.org>

 .../roct-thunk-interface-.ebuild   | 42 ++
 1 file changed, 42 insertions(+)

diff --git a/dev-libs/roct-thunk-interface/roct-thunk-interface-.ebuild 
b/dev-libs/roct-thunk-interface/roct-thunk-interface-.ebuild
new file mode 100644
index 000..28db57d3c71
--- /dev/null
+++ b/dev-libs/roct-thunk-interface/roct-thunk-interface-.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils linux-info
+
+if [[ ${PV} == * ]] ; then
+   
EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/;
+   inherit git-r3
+else
+   
SRC_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/roc-${PV}.tar.gz
 -> ${P}.tar.gz"
+   S="${WORKDIR}/ROCT-Thunk-Interface-roc-${PV}"
+   KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Radeon Open Compute Thunk Interface"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface;
+CONFIG_CHECK="~HSA_AMD"
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND="sys-process/numactl
+   sys-apps/pciutils"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+   sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i 
CMakeLists.txt || die
+   cmake-utils_src_prepare
+}
+src_configure() {
+   local mycmakeargs=(
+   -DCPACK_PACKAGING_INSTALL_PREFIX=/usr
+   )
+   cmake-utils_src_configure
+}
+src_compile() {
+   cmake-utils_src_compile build-dev
+}
+src_install() {
+   cmake-utils_src_install install-dev
+}



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

2019-08-07 Thread Craig Andrews
commit: cbbf4171e8b7e8df1b02c3872ef4eca7d10c0206
Author: Craig Andrews  gentoo  org>
AuthorDate: Wed Jul 24 18:47:11 2019 +
Commit: Craig Andrews  gentoo  org>
CommitDate: Wed Aug  7 17:38:44 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbbf4171

dev-libs/rocr-runtime: 2.6.0 version bump

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Craig Andrews  gentoo.org>

 dev-libs/rocr-runtime/Manifest  |  1 +
 dev-libs/rocr-runtime/rocr-runtime-2.6.0.ebuild | 34 +
 2 files changed, 35 insertions(+)

diff --git a/dev-libs/rocr-runtime/Manifest b/dev-libs/rocr-runtime/Manifest
index 1049c994c5b..6c90d6896c4 100644
--- a/dev-libs/rocr-runtime/Manifest
+++ b/dev-libs/rocr-runtime/Manifest
@@ -1 +1,2 @@
 DIST rocr-runtime-2.0.0.tar.gz 313087 BLAKE2B 
5fe5ea99728f7d7337c9e8a174a31d4ca8bdd559fad3400955ba6d86947d5bf9004094d78548cab2cb2089bfd028d0e4dfdd4d5fd7b41bed73feeebf2f33b705
 SHA512 
662d3d8fff8aeb17557df67207d885edc1266bb9800ec46ecab28bbd6ace7fbffb9e4092d74beb0366cacfe8873b1b257bcf2f8345d81a9b6657a7adcfc53c0c
+DIST rocr-runtime-2.6.0.tar.gz 318296 BLAKE2B 
c04e04db32f650def8a7973fa73f0c0e9b99412b13676a05e9c4283ea07958ffe14f7c54002db469ddfd506f349087bd66fff138b7e7b19c41f4ca8789a7c384
 SHA512 
3b88cf4e1cb6fca6b4361a612abc2c02466d4f716838665d02f16b6fa975b5f69795622d6b96a01b796165980d2888be7eedd77957a7fd44fac19a0ea581f6b8

diff --git a/dev-libs/rocr-runtime/rocr-runtime-2.6.0.ebuild 
b/dev-libs/rocr-runtime/rocr-runtime-2.6.0.ebuild
new file mode 100644
index 000..dc4aad01c29
--- /dev/null
+++ b/dev-libs/rocr-runtime/rocr-runtime-2.6.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+if [[ ${PV} == * ]] ; then
+   EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/;
+   inherit git-r3
+   S="${WORKDIR}/${P}/src"
+else
+   
SRC_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/roc-${PV}.tar.gz
 -> ${P}.tar.gz"
+   S="${WORKDIR}/ROCR-Runtime-roc-${PV}/src"
+   KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Radeon Open Compute Runtime"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCR-Runtime;
+PATCHES=(
+   "${FILESDIR}/${PN}-2.0.0-cmake-install-paths.patch"
+)
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND="sys-process/numactl"
+DEPEND="${RDEPEND}
+   dev-libs/roct-thunk-interface"
+
+src_prepare() {
+   sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i 
CMakeLists.txt || die
+   cmake-utils_src_prepare
+}



[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm-roc/

2019-08-07 Thread Craig Andrews
commit: 5b5b9c1a381ef0ef549e146f0e0c76c1242dbc2b
Author: Craig Andrews  gentoo  org>
AuthorDate: Fri Jul 26 18:15:57 2019 +
Commit: Craig Andrews  gentoo  org>
CommitDate: Wed Aug  7 17:38:45 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b5b9c1a

sys-devel/llvm-roc: Radeon Open Compute llvm, clang, and lld

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Craig Andrews  gentoo.org>

 sys-devel/llvm-roc/Manifest  |  3 +++
 sys-devel/llvm-roc/llvm-roc-2.6.0.ebuild | 39 
 sys-devel/llvm-roc/metadata.xml  | 14 
 3 files changed, 56 insertions(+)

diff --git a/sys-devel/llvm-roc/Manifest b/sys-devel/llvm-roc/Manifest
new file mode 100644
index 000..422ab6500ca
--- /dev/null
+++ b/sys-devel/llvm-roc/Manifest
@@ -0,0 +1,3 @@
+DIST clang-roc-2.6.0.tar.gz 18831605 BLAKE2B 
c54b811afc57d42b32e6c38ef219eb8a1bdba47f2a58505249bf5057708c6873b28387c1fa05a8a6c1bfb02cb71b4ca96e69a72d9f0cc03bb393fa1033d86a41
 SHA512 
41a3595961eb4b57ac8b2d7483f53628ffe5f064a40a7331fbfa1daad2f1491e1062a1189a15a00586341fdeb73978db67c058a23e00982d32b987cc41a63b43
+DIST lld-roc-ocl-2.6.0.tar.gz 1508227 BLAKE2B 
39182669e38ec21cdd30f180981631abfa55c1ddc9f923e44f251a12e27da55409d7dfebd454b2706c88ebc0259455020fbe5db8d3543a353810bacde2396104
 SHA512 
19f300760be83c165a03ff2d48b014b3bcb3f7703c9430c3146b964e23ae30ea07ff579402bdce613e995004b063bced7329719e801c585e6e885b0ab473ce8a
+DIST llvm-roc-ocl-2.6.0.tar.gz 48417665 BLAKE2B 
9b7ff7cc57d98b2076994d3a5585563430fdad5975b89459aea34d585adf330d3d49d2ef611a70fd546878d84bc64d2c196dbf9f19e78ab2b4a5e63266ffb2d3
 SHA512 
89d5c97b8bf97242d72176768f8d12b218ab258fff9d154e3c3ff382b5563c2d6997ee5cf145e5f2c34e2cf4f9dd268906750a014a874a2038683ef5f173b872

diff --git a/sys-devel/llvm-roc/llvm-roc-2.6.0.ebuild 
b/sys-devel/llvm-roc/llvm-roc-2.6.0.ebuild
new file mode 100644
index 000..63d3cc7cf47
--- /dev/null
+++ b/sys-devel/llvm-roc/llvm-roc-2.6.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="Radeon Open Compute llvm,lld,clang"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm/;
+SRC_URI="https://github.com/RadeonOpenCompute/llvm/archive/roc-ocl-${PV}.tar.gz
 -> llvm-roc-ocl-${PV}.tar.gz
+ https://github.com/RadeonOpenCompute/clang/archive/roc-${PV}.tar.gz 
-> clang-roc-${PV}.tar.gz
+ https://github.com/RadeonOpenCompute/lld/archive/roc-ocl-${PV}.tar.gz 
-> lld-roc-ocl-${PV}.tar.gz"
+
+LICENSE="UoI-NCSA rc BSD public-domain"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="virtual/cblas
+dev-libs/rocr-runtime"
+DEPEND="${RDEPEND}"
+
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+S="${WORKDIR}/llvm-roc-ocl-${PV}"
+
+src_unpack() {
+   unpack ${A}
+   ln -s "${WORKDIR}/clang-roc-${PV}" 
"${WORKDIR}/llvm-roc-ocl-${PV}/tools/clang"
+   ln -s "${WORKDIR}/lld-roc-ocl-${PV}" 
"${WORKDIR}/llvm-roc-ocl-${PV}/tools/lld"
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/roc"
+   -DLLVM_TARGETS_TO_BUILD="AMDGPU;X86" "${S}"
+   )
+   cmake-utils_src_configure
+}

diff --git a/sys-devel/llvm-roc/metadata.xml b/sys-devel/llvm-roc/metadata.xml
new file mode 100644
index 000..971e48876cf
--- /dev/null
+++ b/sys-devel/llvm-roc/metadata.xml
@@ -0,0 +1,14 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+
+candr...@gentoo.org
+Craig Andrews
+
+
+RadeonOpenCompute/llvm
+
+
+Radeon Open Compute llvm, clang, and lld
+
+



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

2019-08-07 Thread Craig Andrews
commit: 8f1b624402f001aab885c4cb1f88d022f3ef25db
Author: Craig Andrews  gentoo  org>
AuthorDate: Thu Jul 25 19:45:30 2019 +
Commit: Craig Andrews  gentoo  org>
CommitDate: Wed Aug  7 17:38:45 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f1b6244

dev-util/rocm-cmake: Radeon Open Compute CMake Modules

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Craig Andrews  gentoo.org>

 dev-util/rocm-cmake/Manifest   |  1 +
 dev-util/rocm-cmake/metadata.xml   | 14 ++
 dev-util/rocm-cmake/rocm-cmake-0.2.ebuild  | 25 +
 dev-util/rocm-cmake/rocm-cmake-.ebuild | 25 +
 4 files changed, 65 insertions(+)

diff --git a/dev-util/rocm-cmake/Manifest b/dev-util/rocm-cmake/Manifest
new file mode 100644
index 000..24991e568f1
--- /dev/null
+++ b/dev-util/rocm-cmake/Manifest
@@ -0,0 +1 @@
+DIST rocm-cmake-0.2.tar.gz 12729 BLAKE2B 
6380e077cdc0dcc8c40c487789bd4405a9104e0c55e68df0587c74ea140c329b28ef224bea0d9d529ddaca2c3b874e64be840f96191b8bae7d662de5854756b6
 SHA512 
b2ebd749fb99ac6dbeac005bb0de5ca57e12ae3590d560c0fd03371f2dd0fc6e7862e0bc96046b98b8248770852c6ee64dd349f22405e77d8a210884246213bd

diff --git a/dev-util/rocm-cmake/metadata.xml b/dev-util/rocm-cmake/metadata.xml
new file mode 100644
index 000..a82bb12bfd8
--- /dev/null
+++ b/dev-util/rocm-cmake/metadata.xml
@@ -0,0 +1,14 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+
+candr...@gentoo.org
+Craig Andrews
+
+
+RadeonOpenCompute/rocm-cmake
+
+
+Radeon Open Compute CMake Modules
+
+

diff --git a/dev-util/rocm-cmake/rocm-cmake-0.2.ebuild 
b/dev-util/rocm-cmake/rocm-cmake-0.2.ebuild
new file mode 100644
index 000..eee840d3674
--- /dev/null
+++ b/dev-util/rocm-cmake/rocm-cmake-0.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+if [[ ${PV} == * ]] ; then
+   EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocm-cmake/;
+   inherit git-r3
+else
+   
SRC_URI="https://github.com/RadeonOpenCompute/rocm-cmake/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
+   KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Radeon Open Compute CMake Modules"
+HOMEPAGE="https://github.com/RadeonOpenCompute/rocm-cmake;
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="test"
+
+src_prepare() {
+   sed -e "s:set(ROCM_INSTALL_LIBDIR lib):set(ROCM_INSTALL_LIBDIR 
$(get_libdir)):" -i "${S}/share/rocm/cmake/ROCMInstallTargets.cmake" || die
+   cmake-utils_src_prepare
+}

diff --git a/dev-util/rocm-cmake/rocm-cmake-.ebuild 
b/dev-util/rocm-cmake/rocm-cmake-.ebuild
new file mode 100644
index 000..eee840d3674
--- /dev/null
+++ b/dev-util/rocm-cmake/rocm-cmake-.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+if [[ ${PV} == * ]] ; then
+   EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocm-cmake/;
+   inherit git-r3
+else
+   
SRC_URI="https://github.com/RadeonOpenCompute/rocm-cmake/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
+   KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Radeon Open Compute CMake Modules"
+HOMEPAGE="https://github.com/RadeonOpenCompute/rocm-cmake;
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="test"
+
+src_prepare() {
+   sed -e "s:set(ROCM_INSTALL_LIBDIR lib):set(ROCM_INSTALL_LIBDIR 
$(get_libdir)):" -i "${S}/share/rocm/cmake/ROCMInstallTargets.cmake" || die
+   cmake-utils_src_prepare
+}



[gentoo-commits] repo/gentoo:master commit in: dev-libs/rocm-hostcall/, dev-libs/rocm-hostcall/files/

2019-08-07 Thread Craig Andrews
commit: b8ca3b0862eb435d6259550372bb655908123d07
Author: Craig Andrews  gentoo  org>
AuthorDate: Wed Jul 31 15:22:09 2019 +
Commit: Craig Andrews  gentoo  org>
CommitDate: Wed Aug  7 17:38:46 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8ca3b08

dev-libs/rocm-hostcall: Radeon Open Compute hostcall API

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Craig Andrews  gentoo.org>

 dev-libs/rocm-hostcall/Manifest|  1 +
 .../rocm-hostcall-2.7.0-install-correctly.patch| 39 ++
 dev-libs/rocm-hostcall/metadata.xml| 14 
 dev-libs/rocm-hostcall/rocm-hostcall-2.7.0.ebuild  | 34 +++
 4 files changed, 88 insertions(+)

diff --git a/dev-libs/rocm-hostcall/Manifest b/dev-libs/rocm-hostcall/Manifest
new file mode 100644
index 000..ca774830c73
--- /dev/null
+++ b/dev-libs/rocm-hostcall/Manifest
@@ -0,0 +1 @@
+DIST rocm-hostcall-2.7.0.tar.gz 1500771 BLAKE2B 
275ad4cab34d554f8a131101eda474926f7270a44a0af9941d8f1233c29b44b3efb3ba83c6b541d501a3e2fc751c591c0f6a993563bbacf539b5bcd04b23963b
 SHA512 
afb4a7318c2e137db6ac0502041ed53e63783ec1ab458962b1b16f0f2f28e09ce2ae70d048b858740eca8bf06328858400a68bed4e91d7cfc4b7714a66d85bc9

diff --git 
a/dev-libs/rocm-hostcall/files/rocm-hostcall-2.7.0-install-correctly.patch 
b/dev-libs/rocm-hostcall/files/rocm-hostcall-2.7.0-install-correctly.patch
new file mode 100644
index 000..f419674886a
--- /dev/null
+++ b/dev-libs/rocm-hostcall/files/rocm-hostcall-2.7.0-install-correctly.patch
@@ -0,0 +1,39 @@
+https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/pull/18
+
+From 345025de5c6c470e36505ff70978b168c05a1a71 Mon Sep 17 00:00:00 2001
+From: Craig Andrews 
+Date: Wed, 31 Jul 2019 11:18:56 -0400
+Subject: [PATCH] Install to standard locations using GNUInstallDirs
+
+Some distributions require 64 bit libraries to be installed to lib64, for 
example.
+Using GNUInstallDirs ensures that files are installed to the expected 
locations.
+---
+ CMakeLists.txt | 8 +---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0f524e6..009bab7 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -5,6 +5,8 @@ if (NOT UNIX)
+ message(FATAL_ERROR "No Windows support due to lack of signals")
+ endif()
+ 
++include(GNUInstallDirs)
++
+ find_path(HSA_HEADER hsa/hsa.h PATHS /opt/rocm/include)
+ if (NOT EXISTS ${HSA_HEADER})
+ message(FATAL_ERROR "Cannot find HSA headers. Please check the 
CMAKE_PREFIX_PATH")
+@@ -34,9 +36,9 @@ target_compile_options(amd_hostcall
+ target_compile_definitions(amd_hostcall
+   PRIVATE "${AMD_HOSTCALL_PRIVATE_COMPILE_DEFINITIONS}")
+ 
+-set(INCLUDE_INSTALL_DIR include)
+-set(LIB_INSTALL_DIR lib)
+-set(SHARE_INSTALL_DIR share)
++set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR})
++set(LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR})
++set(SHARE_INSTALL_DIR ${CMAKE_INSTALL_DATADIR})
+ set(CONFIG_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/amd_hostcall)
+ 
+ install(TARGETS amd_hostcall

diff --git a/dev-libs/rocm-hostcall/metadata.xml 
b/dev-libs/rocm-hostcall/metadata.xml
new file mode 100644
index 000..6b2718fcba0
--- /dev/null
+++ b/dev-libs/rocm-hostcall/metadata.xml
@@ -0,0 +1,14 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+
+candr...@gentoo.org
+Craig Andrews
+
+
+RadeonOpenCompute/ROCm-CompilerSupport
+
+
+Radeon Open Compute hostcall API
+
+

diff --git a/dev-libs/rocm-hostcall/rocm-hostcall-2.7.0.ebuild 
b/dev-libs/rocm-hostcall/rocm-hostcall-2.7.0.ebuild
new file mode 100644
index 000..848a8f3a540
--- /dev/null
+++ b/dev-libs/rocm-hostcall/rocm-hostcall-2.7.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+if [[ ${PV} == * ]] ; then
+   
EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/;
+   inherit git-r3
+   S="${WORKDIR}/${P}/lib/hostcall"
+else
+   
SRC_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/roc-${PV}.tar.gz
 -> ${P}.tar.gz"
+   S="${WORKDIR}/ROCm-CompilerSupport-roc-${PV}/lib/hostcall"
+   KEYWORDS="~amd64"
+fi
+PATCHES=(
+   "${FILESDIR}/${P}-install-correctly.patch"
+)
+
+DESCRIPTION="Radeon Open Compute hostcall API"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport;
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND="dev-libs/rocr-runtime"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+   local mycmakeargs=(
+   -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
+   )
+   cmake-utils_src_configure
+}



[gentoo-commits] repo/gentoo:master commit in: dev-libs/roct-thunk-interface/files/, dev-libs/roct-thunk-interface/

2019-08-07 Thread Craig Andrews
commit: fc8f4d08b34d046fb9729c78f25b6e02f09de23d
Author: Craig Andrews  gentoo  org>
AuthorDate: Mon Jul 22 20:22:19 2019 +
Commit: Craig Andrews  gentoo  org>
CommitDate: Wed Aug  7 17:38:41 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc8f4d08

dev-libs/roct-thunk-interface: 2.6.0 version bump

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Craig Andrews  gentoo.org>

 dev-libs/roct-thunk-interface/Manifest |  1 +
 ...hunk-interface-2.6.0-correctly-install-pc.patch | 25 +
 ...t-thunk-interface-2.6.0-correctly-install.patch | 25 +
 .../roct-thunk-interface-2.6.0-pc-prefix.patch | 22 
 .../roct-thunk-interface-2.6.0.ebuild  | 41 ++
 5 files changed, 114 insertions(+)

diff --git a/dev-libs/roct-thunk-interface/Manifest 
b/dev-libs/roct-thunk-interface/Manifest
index 5a78b9fd36a..8ba10b79341 100644
--- a/dev-libs/roct-thunk-interface/Manifest
+++ b/dev-libs/roct-thunk-interface/Manifest
@@ -1 +1,2 @@
 DIST roct-thunk-interface-2.0.0.tar.gz 1958218 BLAKE2B 
c1ba89cac9a18964e040e6b1e57a464216e7086c400e3360cfca6f376ac90b0b1afbb3a2a4d995581d1829ca57afe62bf6f2ac59cc103a48d384a8e52b1457d0
 SHA512 
7d2e35df2bec201bcc977328d7d36b921f76b57a0c54fc2332eb1faf3a722b6a3a1e3b1658e93b216ed68b965426c463a2dbf52a22af64ce1dcc9fad0f27ca9c
+DIST roct-thunk-interface-2.6.0.tar.gz 1957383 BLAKE2B 
0335d4e219978d16bc8dbc77c6e1fb315f424ddf9225eb14968d4f8233348b358151f2baf279dc2a6e422da7839b704c847f1311b21d69e07738f3fca3235452
 SHA512 
e54f7cefa1854fb9967e373bd3ef5a0236987ebb26c21728ef5676e73cf63be6e9a49c1ce52d1156caa970473f214e02f25370e2cd7381c1f74a0b8cd5b2bc7f

diff --git 
a/dev-libs/roct-thunk-interface/files/roct-thunk-interface-2.6.0-correctly-install-pc.patch
 
b/dev-libs/roct-thunk-interface/files/roct-thunk-interface-2.6.0-correctly-install-pc.patch
new file mode 100644
index 000..4d0680415ce
--- /dev/null
+++ 
b/dev-libs/roct-thunk-interface/files/roct-thunk-interface-2.6.0-correctly-install-pc.patch
@@ -0,0 +1,25 @@
+https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/pull/39
+
+From 032a3e38c62b84ec56fad70d24cf82ee65d8c80b Mon Sep 17 00:00:00 2001
+From: Craig Andrews 
+Date: Mon, 22 Jul 2019 17:06:16 -0400
+Subject: [PATCH] Install libhsakmt.pc to the standard location
+
+pkgconfig files should be installed to /usr/share/pkgconfig/, not 
/usr/libhsakmt/
+---
+ hsakmt-dev.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hsakmt-dev.txt b/hsakmt-dev.txt
+index eb0d3e2..195cc6c 100644
+--- a/hsakmt-dev.txt
 b/hsakmt-dev.txt
+@@ -43,7 +43,7 @@ set ( BUILD_VERSION_PATCH @BUILD_VERSION_PATCH@ )
+ set ( CMAKE_VERBOSE_MAKEFILE on )
+ 
+ ## Set the install targets
+-install ( FILES libhsakmt.pc DESTINATION libhsakmt )
++install ( FILES libhsakmt.pc DESTINATION 
${CMAKE_INSTALL_PREFIX}/share/pkgconfig )
+ install ( DIRECTORY ${SOURCE_DIR}/include/ DESTINATION 
${CMAKE_INSTALL_INCLUDEDIR}/${HSAKMT_COMPONENT} )
+ 
+ 

diff --git 
a/dev-libs/roct-thunk-interface/files/roct-thunk-interface-2.6.0-correctly-install.patch
 
b/dev-libs/roct-thunk-interface/files/roct-thunk-interface-2.6.0-correctly-install.patch
new file mode 100644
index 000..961d2978a2d
--- /dev/null
+++ 
b/dev-libs/roct-thunk-interface/files/roct-thunk-interface-2.6.0-correctly-install.patch
@@ -0,0 +1,25 @@
+https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/pull/38
+
+From 1362864410579c35eb2ec428384ad883cb8b24b1 Mon Sep 17 00:00:00 2001
+From: Craig Andrews 
+Date: Mon, 22 Jul 2019 16:18:08 -0400
+Subject: [PATCH] Install LICENSE.md to DOCDIR
+
+LICENSE.md should be installed to the DOCDIR, not /usr/libhsakmt
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e020132..398da3e 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -145,7 +145,7 @@ add_custom_target ( package-dev DEPENDS build-dev
+ 
+ ## Add the install directives for the runtime library.
+ install ( TARGETS ${HSAKMT_TARGET} DESTINATION ${CMAKE_INSTALL_LIBDIR} )
+-install ( FILES ${SOURCE_DIR}/LICENSE.md DESTINATION libhsakmt )
++install ( FILES ${SOURCE_DIR}/LICENSE.md DESTINATION ${CMAKE_INSTALL_DOCDIR} )
+ 
+ ## Add the packaging directives for the runtime library.
+ set ( CPACK_PACKAGE_NAME ${HSAKMT_PACKAGE} )

diff --git 
a/dev-libs/roct-thunk-interface/files/roct-thunk-interface-2.6.0-pc-prefix.patch
 
b/dev-libs/roct-thunk-interface/files/roct-thunk-interface-2.6.0-pc-prefix.patch
new file mode 100644
index 000..0b4a716e6c9
--- /dev/null
+++ 
b/dev-libs/roct-thunk-interface/files/roct-thunk-interface-2.6.0-pc-prefix.patch
@@ -0,0 +1,22 @@
+https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/pull/40
+
+From fb42a02230ed5140b3ac3beadb38ca39eb9ea463 Mon Sep 17 00:00:00 2001
+From: Craig Andrews 
+Date: Mon, 22 Jul 2019 17:17:09 -0400
+Subject: [PATCH] Use CMAKE_INSTALL_PREFIX in pkgconfig
+
+The 

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

2019-08-07 Thread Craig Andrews
commit: 333d0df0bb1fab5dacde1605951bcf0422fbda29
Author: Craig Andrews  gentoo  org>
AuthorDate: Fri Jul 26 20:34:32 2019 +
Commit: Craig Andrews  gentoo  org>
CommitDate: Wed Aug  7 17:38:46 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=333d0df0

dev-libs/rocm-device-libs: Radeon Open Compute Device Libraries

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Craig Andrews  gentoo.org>

 dev-libs/rocm-device-libs/Manifest |  1 +
 dev-libs/rocm-device-libs/metadata.xml | 14 +
 .../rocm-device-libs/rocm-device-libs-2.6.0.ebuild | 34 ++
 .../rocm-device-libs/rocm-device-libs-.ebuild  | 34 ++
 4 files changed, 83 insertions(+)

diff --git a/dev-libs/rocm-device-libs/Manifest 
b/dev-libs/rocm-device-libs/Manifest
new file mode 100644
index 000..cc781e9e0e8
--- /dev/null
+++ b/dev-libs/rocm-device-libs/Manifest
@@ -0,0 +1 @@
+DIST rocm-device-libs-2.6.0.tar.gz 221981 BLAKE2B 
6350fafb31453daf015886bc2d3d2ba59b805fafdf12372fcad8f328c9e7c74d4e54093817b07961d7be77b990780038f7a7b91d5ab63650a92bf107e0be4a40
 SHA512 
4262c956ea8c212c2707acf74ee27f609a6faee1bee7c3fd436b2a4adbedf1b072b611e6143cc315bd4e9d1e306d874aa0f4629cff9301bd28be65fd16867180

diff --git a/dev-libs/rocm-device-libs/metadata.xml 
b/dev-libs/rocm-device-libs/metadata.xml
new file mode 100644
index 000..e7986fbb2ae
--- /dev/null
+++ b/dev-libs/rocm-device-libs/metadata.xml
@@ -0,0 +1,14 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+
+candr...@gentoo.org
+Craig Andrews
+
+
+RadeonOpenCompute/ROCm-Device-Libs
+
+
+Radeon Open Compute Device Libraries
+
+

diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-2.6.0.ebuild 
b/dev-libs/rocm-device-libs/rocm-device-libs-2.6.0.ebuild
new file mode 100644
index 000..91d53a41976
--- /dev/null
+++ b/dev-libs/rocm-device-libs/rocm-device-libs-2.6.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+if [[ ${PV} == * ]] ; then
+   EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/;
+   inherit git-r3
+   S="${WORKDIR}/${P}/src"
+else
+   
SRC_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/roc-ocl-${PV}.tar.gz
 -> ${P}.tar.gz"
+   S="${WORKDIR}/ROCm-Device-Libs-roc-ocl-${PV}"
+   KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Radeon Open Compute Device Libraries"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-Device-Libs;
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND="dev-libs/rocr-runtime
+   sys-devel/llvm-roc:="
+DEPEND="${RDEPEND}"
+
+src_configure() {
+   local mycmakeargs=(
+   -DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
+   -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
+   )
+   cmake-utils_src_configure
+}

diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-.ebuild 
b/dev-libs/rocm-device-libs/rocm-device-libs-.ebuild
new file mode 100644
index 000..91d53a41976
--- /dev/null
+++ b/dev-libs/rocm-device-libs/rocm-device-libs-.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+if [[ ${PV} == * ]] ; then
+   EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/;
+   inherit git-r3
+   S="${WORKDIR}/${P}/src"
+else
+   
SRC_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/roc-ocl-${PV}.tar.gz
 -> ${P}.tar.gz"
+   S="${WORKDIR}/ROCm-Device-Libs-roc-ocl-${PV}"
+   KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Radeon Open Compute Device Libraries"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-Device-Libs;
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND="dev-libs/rocr-runtime
+   sys-devel/llvm-roc:="
+DEPEND="${RDEPEND}"
+
+src_configure() {
+   local mycmakeargs=(
+   -DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
+   -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
+   )
+   cmake-utils_src_configure
+}



[gentoo-commits] repo/gentoo:master commit in: dev-util/rocminfo/files/, dev-util/rocminfo/

2019-08-07 Thread Craig Andrews
commit: 95977d266eb00c29804dc6543a805a7575b2c04a
Author: Craig Andrews  gentoo  org>
AuthorDate: Thu Jul 25 22:02:35 2019 +
Commit: Craig Andrews  gentoo  org>
CommitDate: Wed Aug  7 17:38:45 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95977d26

dev-util/rocminfo: ROCm Application for Reporting System Info

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Craig Andrews  gentoo.org>

 dev-util/rocminfo/Manifest |  1 +
 .../files/rocminfo-2.6.0-cmake-variables.patch | 31 +++
 dev-util/rocminfo/metadata.xml | 14 +
 dev-util/rocminfo/rocminfo-2.6.0.ebuild| 36 ++
 4 files changed, 82 insertions(+)

diff --git a/dev-util/rocminfo/Manifest b/dev-util/rocminfo/Manifest
new file mode 100644
index 000..28fcd10b1e6
--- /dev/null
+++ b/dev-util/rocminfo/Manifest
@@ -0,0 +1 @@
+DIST rocminfo-2.6.0.tar.gz 12293 BLAKE2B 
b08725b45f48e78841da9d6e57bb19a441a423e20f853d16024c620914059abf3cb2e61c12ae6fdfdb85eb3e984d488ae9975ab3fd2fcc529ecb576c6816fc92
 SHA512 
e2dae7e2e02b674b3ad959a3dffdcd8f550842edfd0eac5866259a6a12de1a5f935afbdcb37845fa189d0937c41186f0eb8be08e7b346ddef959d5dd7b62dca7

diff --git a/dev-util/rocminfo/files/rocminfo-2.6.0-cmake-variables.patch 
b/dev-util/rocminfo/files/rocminfo-2.6.0-cmake-variables.patch
new file mode 100644
index 000..1678f504327
--- /dev/null
+++ b/dev-util/rocminfo/files/rocminfo-2.6.0-cmake-variables.patch
@@ -0,0 +1,31 @@
+https://github.com/RadeonOpenCompute/rocminfo/pull/17
+
+From c9bfc4b3db029b8502f900cd9bb545a675ca0898 Mon Sep 17 00:00:00 2001
+From: Craig Andrews 
+Date: Thu, 25 Jul 2019 17:59:51 -0400
+Subject: [PATCH] Use CACHE variables, allow overriding
+ ROCR_LIB_DIR/ROCR_INC_DIR
+
+CACHE variables allow for variables to be documented, and 
ROCR_LIB_DIR/ROCR_INC_DIR should be overridable as they'll have different 
values on different Linux distributions.
+---
+ CMakeLists.txt | 7 ---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b5fa9dd..f8f430f 100755
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -43,9 +43,10 @@ endif()
+ #
+ 
+ # Required Defines first:
+-
+-set(ROCR_INC_DIR ${ROCM_DIR}/include)
+-set(ROCR_LIB_DIR ${ROCM_DIR}/lib)
++set(ROCRTST_BLD_BITS CACHE "64" STRING "Either 32 or 64")
++set(ROCM_DIR CACHE PATH "Root for RocM install")
++set(ROCR_INC_DIR ${ROCM_DIR}/include CACHE PATH "Path for RocM includes")
++set(ROCR_LIB_DIR ${ROCM_DIR}/lib CACHE PATH "Path for RocM libraries")
+ #
+ # Determine ROCR Header files are present
+ #

diff --git a/dev-util/rocminfo/metadata.xml b/dev-util/rocminfo/metadata.xml
new file mode 100644
index 000..c7439799c48
--- /dev/null
+++ b/dev-util/rocminfo/metadata.xml
@@ -0,0 +1,14 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+
+candr...@gentoo.org
+Craig Andrews
+
+
+RadeonOpenCompute/rocminfo
+
+
+ROCm Application for Reporting System Info
+
+

diff --git a/dev-util/rocminfo/rocminfo-2.6.0.ebuild 
b/dev-util/rocminfo/rocminfo-2.6.0.ebuild
new file mode 100644
index 000..9d2f7d5e0eb
--- /dev/null
+++ b/dev-util/rocminfo/rocminfo-2.6.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+if [[ ${PV} == * ]] ; then
+   EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocminfo/;
+   inherit git-r3
+else
+   
SRC_URI="https://github.com/RadeonOpenCompute/rocminfo/archive/roc-${PV}.tar.gz 
-> ${P}.tar.gz"
+   KEYWORDS="~amd64"
+   S="${WORKDIR}/rocminfo-roc-${PV}"
+fi
+
+DESCRIPTION="ROCm Application for Reporting System Info"
+HOMEPAGE="https://github.com/RadeonOpenCompute/rocminfo;
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND="dev-libs/rocr-runtime"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+   "${FILESDIR}/${P}-cmake-variables.patch"
+)
+
+src_configure() {
+   local mycmakeargs=(
+   -DROCM_DIR="${ESYSROOT}/usr"
+   -DROCR_INC_DIR="${ESYSROOT}/usr/include"
+   -DROCR_LIB_DIR="${EPREFIX}/usr/$(get_libdir)/hsa"
+   )
+   cmake-utils_src_configure
+}



[gentoo-commits] repo/gentoo:master commit in: dev-libs/rocm-comgr/files/, dev-libs/rocm-comgr/

2019-08-07 Thread Craig Andrews
commit: c0aa27dab035db39ddc15bc22c0aba651513fead
Author: Craig Andrews  gentoo  org>
AuthorDate: Wed Jul 31 15:53:28 2019 +
Commit: Craig Andrews  gentoo  org>
CommitDate: Wed Aug  7 17:38:46 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0aa27da

dev-libs/rocm-comgr: Radeon Open Compute Code Object Manager

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Craig Andrews  gentoo.org>

 dev-libs/rocm-comgr/Manifest   |  1 +
 .../files/rocm-comgr-2.6.0-correctly-install.patch | 44 +++
 .../files/rocm-comgr-2.6.0-dependencies.patch  | 63 ++
 .../files/rocm-comgr-2.6.0-find-clang.patch| 26 +
 .../files/rocm-comgr-2.6.0-find-lld-includes.patch | 43 +++
 dev-libs/rocm-comgr/metadata.xml   | 14 +
 dev-libs/rocm-comgr/rocm-comgr-2.6.0.ebuild| 45 
 7 files changed, 236 insertions(+)

diff --git a/dev-libs/rocm-comgr/Manifest b/dev-libs/rocm-comgr/Manifest
new file mode 100644
index 000..8e7150e7fd2
--- /dev/null
+++ b/dev-libs/rocm-comgr/Manifest
@@ -0,0 +1 @@
+DIST rocm-comgr-2.6.0.tar.gz 1484343 BLAKE2B 
fcb496b4997d672640e3f75622e74085eeb9dfe83c88ae025530389d3cdca7628155168060e71f7a3ff915e933ffe70c7026720dc124d128d16ef4df397525e7
 SHA512 
b14e90603d2b6e17f6b0335ea35da2e5d7e31710f301d7a7f7751a45d996e3dbbfbf84a03e2e911e8798e72e77b87b5cd88317e897cb4de3ee5cf0e7c3222d68

diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-correctly-install.patch 
b/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-correctly-install.patch
new file mode 100644
index 000..74206760f39
--- /dev/null
+++ b/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-correctly-install.patch
@@ -0,0 +1,44 @@
+From 98f589636729b1e25625db6880fbd7820dcf9e40 Mon Sep 17 00:00:00 2001
+From: Craig Andrews 
+Date: Wed, 31 Jul 2019 10:04:11 -0400
+Subject: [PATCH] Install to standard locations using GNUInstallDirs
+
+Some distributions require 64 bit libraries to be installed to lib64, for 
example.
+Using GNUInstallDirs ensures that files are installed to the expected 
locations.
+---
+ CMakeLists.txt | 8 +---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 454b830..a89af16 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -1,5 +1,7 @@
+ cmake_minimum_required(VERSION 3.2.0)
+ 
++include (GNUInstallDirs)
++
+ # Build ROCM-Compiler-Support with ccache if the package is present.
+ set(ROCM_COMPILER_SUPPORT_CCACHE_BUILD OFF CACHE BOOL "Set to ON for a ccache 
enabled build")
+ if(ROCM_COMPILER_SUPPORT_CCACHE_BUILD)
+@@ -146,17 +148,17 @@ configure_file("cmake/${AMD_COMGR_CONFIG_NAME}.in"
+ 
+ install(TARGETS amd_comgr
+   EXPORT amd_comgr_export
+-  DESTINATION lib)
++  DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+ install(FILES
+   "include/amd_comgr.h"
+-  DESTINATION include)
++  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+ 
+ install(FILES
+   "README.md"
+   "LICENSE.txt"
+   "NOTICES.txt"
+-  DESTINATION share/amd_comgr)
++  DESTINATION ${CMAKE_INSTALL_DATADIR}/amd_comgr)
+ 
+ # Generate the install-tree package.
+ set(AMD_COMGR_PREFIX_CODE "

diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-dependencies.patch 
b/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-dependencies.patch
new file mode 100644
index 000..47f03716829
--- /dev/null
+++ b/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-dependencies.patch
@@ -0,0 +1,63 @@
+https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/pull/19
+
+--- comgr/CMakeLists.old   2019-07-19 17:19:26.080276421 +0200
 comgr/CMakeLists.txt   2019-07-19 18:17:25.780163592 +0200
+@@ -185,7 +185,11 @@
+ include_directories(./yaml-cpp/include)
+ 
+ set(CLANG_LIBS
+-  clangFrontendTool)
++  clangFrontendTool
++  clangFrontend
++  clangBasic
++  clangDriver
++  clangSerialization)
+ 
+ set(LLD_LIBS
+   lldELF
+@@ -193,8 +197,19 @@
+ 
+ llvm_map_components_to_libnames(LLVM_LIBS
+   ${LLVM_TARGETS_TO_BUILD}
++  Option
+   DebugInfoDWARF
+-  Symbolize)
++  Symbolize
++  Support
++  Object
++  BitWriter
++  MC
++  MCParser
++  MCDisassembler
++  Core
++  IRReader
++  CodeGen
++  Linker)
+ 
+ target_link_libraries(amd_comgr
+   PUBLIC
+@@ -203,8 +218,8 @@
+ ${AMD_COMGR_PRIVATE_LINKER_OPTIONS}
+ yaml-cpp
+ ${CLANG_LIBS}
+-${LLD_LIBS}
+ ${LLVM_LIBS}
++${LLD_LIBS}
+ )
+ 
+ if (NOT UNIX)
+@@ -238,3 +253,14 @@
+ if (NOT CPack_CMake_INCLUDED)
+   include(CPack)
+ endif()
++
++MESSAGE(STATUS "<<< Gentoo configuration >>>
++Build type  ${CMAKE_BUILD_TYPE}
++Install path${CMAKE_INSTALL_PREFIX}
++Compiler flags:
++C   ${CMAKE_C_FLAGS}
++C++ ${CMAKE_CXX_FLAGS}
++Linker flags:
++Executable  ${CMAKE_EXE_LINKER_FLAGS}
++Module  ${CMAKE_MODULE_LINKER_FLAGS}
++Shared  ${CMAKE_SHARED_LINKER_FLAGS}\n")

diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-find-clang.patch 

[gentoo-commits] repo/gentoo:master commit in: dev-libs/rocm-opencl-driver/, dev-libs/rocm-opencl-driver/files/

2019-08-07 Thread Craig Andrews
commit: 98d3c369ac79bacb3516c3b8a39647d8409a6682
Author: Craig Andrews  gentoo  org>
AuthorDate: Fri Jul 26 18:21:10 2019 +
Commit: Craig Andrews  gentoo  org>
CommitDate: Wed Aug  7 17:38:46 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98d3c369

dev-libs/rocm-opencl-driver: Radeon Open Compute OpenCL Compatible Runtime

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Craig Andrews  gentoo.org>

 dev-libs/rocm-opencl-driver/Manifest   |  1 +
 ...ocm-opencl-driver-2.6.0-install-correctly.patch | 49 ++
 .../rocm-opencl-driver-2.6.0-install-header.patch  | 19 +
 dev-libs/rocm-opencl-driver/metadata.xml   | 14 +++
 .../rocm-opencl-driver-2.6.0.ebuild| 46 
 5 files changed, 129 insertions(+)

diff --git a/dev-libs/rocm-opencl-driver/Manifest 
b/dev-libs/rocm-opencl-driver/Manifest
new file mode 100644
index 000..825e4bf6fab
--- /dev/null
+++ b/dev-libs/rocm-opencl-driver/Manifest
@@ -0,0 +1 @@
+DIST rocm-opencl-driver-2.6.0.tar.gz 21311 BLAKE2B 
f17219b577ccd58de052d5936953fd78588a0b042ce002853b10c05e6f6d433edcd90045c15dcd2f2c31ccef89f8b420ef756a1dd1613702efcc8868163878d1
 SHA512 
7b8bf646d9a36b09d75a0408301c2f1771daad95b8075b1671ca0c8b1f5826e8cd9de8935946858268dc89863a0ee054b4dde3040c84dd37e90f28c7ffa6e097

diff --git 
a/dev-libs/rocm-opencl-driver/files/rocm-opencl-driver-2.6.0-install-correctly.patch
 
b/dev-libs/rocm-opencl-driver/files/rocm-opencl-driver-2.6.0-install-correctly.patch
new file mode 100644
index 000..d70f0977ec8
--- /dev/null
+++ 
b/dev-libs/rocm-opencl-driver/files/rocm-opencl-driver-2.6.0-install-correctly.patch
@@ -0,0 +1,49 @@
+https://github.com/RadeonOpenCompute/ROCm-OpenCL-Driver/pull/85
+
+From 8819a684c9b6e154abedc041b3da545aab353d67 Mon Sep 17 00:00:00 2001
+From: Craig Andrews 
+Date: Fri, 26 Jul 2019 15:54:59 -0400
+Subject: [PATCH] Use GNUInstallDirs to install to standard locations
+
+Some distributions require 64 bit libraries to be installed to lib64, for 
example.
+Using GNUInstallDirs ensures that files are installed to the expected 
locations.
+---
+ CMakeLists.txt| 3 +++
+ src/driver/CMakeLists.txt | 2 +-
+ src/roc-cl/CMakeLists.txt | 2 +-
+ 3 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d1759b7..d21e9da 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -42,6 +42,9 @@
+ 
+ cmake_minimum_required(VERSION 2.8)
+ 
++## Include common cmake modules
++include ( GNUInstallDirs )
++
+ # Build ROCm-OpenCL-Driver with ccache if the package is present.
+ set(ROCM_OPENCL_DRIVER_CCACHE_BUILD OFF CACHE BOOL "Set to ON for a ccache 
enabled build")
+ if(ROCM_OPENCL_DRIVER_CCACHE_BUILD)
+diff --git a/src/driver/CMakeLists.txt b/src/driver/CMakeLists.txt
+index 7046e34..55ed13f 100644
+--- a/src/driver/CMakeLists.txt
 b/src/driver/CMakeLists.txt
+@@ -90,4 +90,4 @@ target_link_libraries(opencl_driver
+ target_link_libraries(opencl_driver ${llvm_libs})
+ target_include_directories(opencl_driver PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+ 
+-install(TARGETS opencl_driver DESTINATION lib)
++install(TARGETS opencl_driver DESTINATION ${CMAKE_INSTALL_LIBDIR} )
+diff --git a/src/roc-cl/CMakeLists.txt b/src/roc-cl/CMakeLists.txt
+index 5037453..a8e2801 100644
+--- a/src/roc-cl/CMakeLists.txt
 b/src/roc-cl/CMakeLists.txt
+@@ -54,4 +54,4 @@ link_directories(${LLVM_LIBRARY_DIRS})
+ add_executable(roc-cl ${sources})
+ target_link_libraries(roc-cl opencl_driver)
+ 
+-install(TARGETS roc-cl RUNTIME DESTINATION bin)
++install(TARGETS roc-cl RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} )

diff --git 
a/dev-libs/rocm-opencl-driver/files/rocm-opencl-driver-2.6.0-install-header.patch
 
b/dev-libs/rocm-opencl-driver/files/rocm-opencl-driver-2.6.0-install-header.patch
new file mode 100644
index 000..b37100994e0
--- /dev/null
+++ 
b/dev-libs/rocm-opencl-driver/files/rocm-opencl-driver-2.6.0-install-header.patch
@@ -0,0 +1,19 @@
+From 1258a99decf96092de8ea512150209e14152ed9c Mon Sep 17 00:00:00 2001
+From: Craig Andrews 
+Date: Tue, 30 Jul 2019 16:46:20 -0400
+Subject: [PATCH] Install AmdCompiler.h header
+
+ROCm-OpenCL-Runtime uses AmdCompiler.h so it should be installed to the system 
and made available for use
+---
+ src/driver/CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/driver/CMakeLists.txt b/src/driver/CMakeLists.txt
+index 55ed13f..8f68fb7 100644
+--- a/src/driver/CMakeLists.txt
 b/src/driver/CMakeLists.txt
+@@ -91,3 +91,4 @@ target_link_libraries(opencl_driver ${llvm_libs})
+ target_include_directories(opencl_driver PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+ 
+ install(TARGETS opencl_driver DESTINATION ${CMAKE_INSTALL_LIBDIR} )
++install(FILES AmdCompiler.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})

diff --git a/dev-libs/rocm-opencl-driver/metadata.xml 
b/dev-libs/rocm-opencl-driver/metadata.xml
new file mode 100644
index 

[gentoo-commits] repo/gentoo:master commit in: dev-libs/rocm-comgr/files/, dev-libs/rocm-comgr/

2019-08-07 Thread Craig Andrews
commit: a14f0a3fbd2d7cb7ec3f2f04f16598be2b1b9000
Author: Craig Andrews  gentoo  org>
AuthorDate: Wed Jul 31 16:18:13 2019 +
Commit: Craig Andrews  gentoo  org>
CommitDate: Wed Aug  7 17:38:47 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a14f0a3f

dev-libs/rocm-comgr: Radeon Open Compute Code Object Manager

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Craig Andrews  gentoo.org>

 .../files/rocm-comgr-2.6.0-dependencies.patch  | 25 --
 .../files/rocm-comgr-2.6.0-unbundle-yaml-cpp.patch | 30 ++
 dev-libs/rocm-comgr/rocm-comgr-2.6.0.ebuild|  7 ++---
 3 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-dependencies.patch 
b/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-dependencies.patch
index 47f03716829..bce19d168b0 100644
--- a/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-dependencies.patch
+++ b/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-dependencies.patch
@@ -36,28 +36,3 @@ 
https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/pull/19
  
  target_link_libraries(amd_comgr
PUBLIC
-@@ -203,8 +218,8 @@
- ${AMD_COMGR_PRIVATE_LINKER_OPTIONS}
- yaml-cpp
- ${CLANG_LIBS}
--${LLD_LIBS}
- ${LLVM_LIBS}
-+${LLD_LIBS}
- )
- 
- if (NOT UNIX)
-@@ -238,3 +253,14 @@
- if (NOT CPack_CMake_INCLUDED)
-   include(CPack)
- endif()
-+
-+MESSAGE(STATUS "<<< Gentoo configuration >>>
-+Build type  ${CMAKE_BUILD_TYPE}
-+Install path${CMAKE_INSTALL_PREFIX}
-+Compiler flags:
-+C   ${CMAKE_C_FLAGS}
-+C++ ${CMAKE_CXX_FLAGS}
-+Linker flags:
-+Executable  ${CMAKE_EXE_LINKER_FLAGS}
-+Module  ${CMAKE_MODULE_LINKER_FLAGS}
-+Shared  ${CMAKE_SHARED_LINKER_FLAGS}\n")

diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-unbundle-yaml-cpp.patch 
b/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-unbundle-yaml-cpp.patch
new file mode 100644
index 000..d61f4c2a200
--- /dev/null
+++ b/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-unbundle-yaml-cpp.patch
@@ -0,0 +1,30 @@
+diff --git a/lib/comgr/CMakeLists.txt b/lib/comgr/CMakeLists.txt
+index 454b830..70e2526 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -90,12 +90,8 @@ if (UNIX)
+ -Wl,--no-undefined)
+ endif()
+   endif()
+-  # FIXME: Remove when yaml-cpp is removed from the build.
+-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+ else()
+   list(APPEND AMD_COMGR_PRIVATE_COMPILE_OPTIONS "/W0" "/wd4244")
+-  # FIXME: Make this private once yaml-cpp is removed from the build.
+-  add_definitions(-D_HAS_EXCEPTIONS=0)
+ endif()
+ 
+ # Windows is strict about visibility of exports in shared libraries, so we ask
+@@ -179,10 +175,8 @@ install(EXPORT amd_comgr_export
+   DESTINATION "${AMD_COMGR_PACKAGE_PREFIX}"
+   FILE "${AMD_COMGR_TARGETS_NAME}")
+ 
+-set(YAML_CPP_BUILD_TESTS OFF CACHE BOOL "Enable testing" FORCE)
+-set(YAML_CPP_BUILD_TOOLS OFF CACHE BOOL "Enable parse tools" FORCE)
+-add_subdirectory(yaml-cpp EXCLUDE_FROM_ALL)
+-include_directories(./yaml-cpp/include)
++find_package(yaml-cpp REQUIRED)
++include_directories(${YAML_CPP_INCLUDE_DIR})
+ 
+ set(CLANG_LIBS
+   clangFrontendTool)

diff --git a/dev-libs/rocm-comgr/rocm-comgr-2.6.0.ebuild 
b/dev-libs/rocm-comgr/rocm-comgr-2.6.0.ebuild
index 0f058da194b..c000ce55ab7 100644
--- a/dev-libs/rocm-comgr/rocm-comgr-2.6.0.ebuild
+++ b/dev-libs/rocm-comgr/rocm-comgr-2.6.0.ebuild
@@ -19,6 +19,7 @@ PATCHES=(
"${FILESDIR}/${P}-find-clang.patch"
"${FILESDIR}/${P}-find-lld-includes.patch"
"${FILESDIR}/${P}-dependencies.patch"
+   "${FILESDIR}/${P}-unbundle-yaml-cpp.patch"
 )
 
 DESCRIPTION="Radeon Open Compute Code Object Manager"
@@ -27,12 +28,12 @@ LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
 
 RDEPEND="dev-libs/rocm-device-libs
-   dev-cpp/yaml-cpp
-   sys-devel/llvm-roc"
+   dev-cpp/yaml-cpp:=
+   sys-devel/llvm-roc:="
 DEPEND="${RDEPEND}"
 
 src_prepare() {
-#  rm -rf yaml-cpp || die
+   rm -rf yaml-cpp || die
cmake-utils_src_prepare
 }
 



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

2019-08-07 Thread Craig Andrews
commit: 735e70751a6ca277349ff68c86c754b3e8c36026
Author: Craig Andrews  gentoo  org>
AuthorDate: Wed Jul 24 18:48:47 2019 +
Commit: Craig Andrews  gentoo  org>
CommitDate: Wed Aug  7 17:38:45 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=735e7075

dev-libs/rocr-runtime: add - version

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Craig Andrews  gentoo.org>

 dev-libs/rocr-runtime/rocr-runtime-.ebuild | 31 ++
 1 file changed, 31 insertions(+)

diff --git a/dev-libs/rocr-runtime/rocr-runtime-.ebuild 
b/dev-libs/rocr-runtime/rocr-runtime-.ebuild
new file mode 100644
index 000..a31193337a6
--- /dev/null
+++ b/dev-libs/rocr-runtime/rocr-runtime-.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+if [[ ${PV} == * ]] ; then
+   EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/;
+   inherit git-r3
+   S="${WORKDIR}/${P}/src"
+else
+   
SRC_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/roc-${PV}.tar.gz
 -> ${P}.tar.gz"
+   S="${WORKDIR}/ROCR-Runtime-roc-${PV}/src"
+   KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Radeon Open Compute Runtime"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCR-Runtime;
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND="sys-process/numactl"
+DEPEND="${RDEPEND}
+   dev-libs/roct-thunk-interface"
+
+src_prepare() {
+   sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i 
CMakeLists.txt || die
+   cmake-utils_src_prepare
+}



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

2019-08-07 Thread Matt Turner
commit: 6a97acbbcdd98d8e449acc2c0359b389c57d39e2
Author: Matt Turner  gentoo  org>
AuthorDate: Wed Aug  7 17:01:41 2019 +
Commit: Matt Turner  gentoo  org>
CommitDate: Wed Aug  7 17:03:38 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a97acbb

media-libs/mesa: Version bump to 19.1.4

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

 media-libs/mesa/Manifest   |   1 +
 media-libs/mesa/mesa-19.1.4.ebuild | 540 +
 2 files changed, 541 insertions(+)

diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index ef0c1c24e2f..3bbd7ac2972 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,2 +1,3 @@
 DIST mesa-19.0.8.tar.xz 11967592 BLAKE2B 
91a46b67bdb8cb3ab4c7337be7c2b0dc6ab5ec8cc126afc2d8af8d056bff0392a5b443c26304bf4c68472eb6ba16d29ca248c1fc0c0f2dd6af03d3e10d3ec1b3
 SHA512 
fbddc3a74f223564343027380af776b3fa5d63fe1af4e34121273235d1c6eced96439f601eb19bf658eb927aff3965b520f0329fcbd4650f3112167303e1746d
 DIST mesa-19.1.3.tar.xz 10935604 BLAKE2B 
4dfda4b3ef7a2d53b20a7a0c81b08901d6b88431b6b56679b8d97d6f2f57ce18f6dcdbae9b79c5d02b9175f47db629833da6012658295fe456829ef07a5ff087
 SHA512 
787310c43089142209ff7db298489b0815b630577680d5ce1bc3f796eed3772ba41f03e5e773b77ae084c191ed4e365eac1753166ce60f12b8f5974d55762eeb
+DIST mesa-19.1.4.tar.xz 10938008 BLAKE2B 
4745fc7e844397378fe1adf61bcd5b54aad11ec0b375ced85fd80ced01227432b491ad8b7ba7d9013190cfbb451bc11cdb7c8af0e1f298dd5d793d3ce43aa92b
 SHA512 
234032d917c9b378c3f6ceb921677b64e549344c3957331810b50fd73e0dccd2f4f62e2bd39e619590f389bc58fdab10fab4b88f7c117557cbeb1dda049b9fc5

diff --git a/media-libs/mesa/mesa-19.1.4.ebuild 
b/media-libs/mesa/mesa-19.1.4.ebuild
new file mode 100644
index 000..0fd4ae716a5
--- /dev/null
+++ b/media-libs/mesa/mesa-19.1.4.ebuild
@@ -0,0 +1,540 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_5 python3_6 python3_7 )
+
+inherit llvm meson multilib-minimal pax-utils python-any-r1
+
+OPENGL_DIR="xorg-x11"
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/;
+
+if [[ ${PV} ==  ]]; then
+   EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git;
+   EXPERIMENTAL="true"
+   inherit git-r3
+else
+   SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz;
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris 
~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="
+   !test? ( test )
+"
+
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris nouveau vc4 virgl 
vivante vmware"
+for card in ${VIDEO_CARDS}; do
+   IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+   +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd 
+llvm
+   lm_sensors opencl osmesa pax_kernel pic selinux test unwind vaapi 
valgrind
+   vdpau vulkan vulkan-overlay wayland xa xvmc"
+
+REQUIRED_USE="
+   d3d9?   ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 
video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
+   gles1?  ( egl )
+   gles2?  ( egl )
+   vulkan? ( dri3
+ || ( video_cards_i965 video_cards_iris 
video_cards_radeonsi )
+ video_cards_radeonsi? ( llvm ) )
+   vulkan-overlay? ( vulkan )
+   wayland? ( egl gbm )
+   video_cards_freedreno?  ( gallium )
+   video_cards_intel?  ( classic )
+   video_cards_i915?   ( || ( classic gallium ) )
+   video_cards_i965?   ( classic )
+   video_cards_iris?   ( gallium )
+   video_cards_nouveau? ( || ( classic gallium ) )
+   video_cards_radeon? ( || ( classic gallium )
+ gallium? ( x86? ( llvm ) 
amd64? ( llvm ) ) )
+   video_cards_r100?   ( classic )
+   video_cards_r200?   ( classic )
+   video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
+   video_cards_r600?   ( gallium )
+   video_cards_radeonsi?   ( gallium llvm )
+   video_cards_vc4? ( gallium )
+   video_cards_virgl? ( gallium )
+   video_cards_vivante? ( gallium gbm )
+   video_cards_vmware? ( gallium )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.97"
+RDEPEND="
+   !app-eselect/eselect-mesa
+   >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+   >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+   >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+   >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
+   >=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
+   >=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+   >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
+   

[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb/files/, dev-db/mariadb/

2019-08-07 Thread Brian Evans
commit: c50fef32cdf155707ff367f2990996be6c010b1f
Author: Brian Evans  gentoo  org>
AuthorDate: Wed Aug  7 16:53:24 2019 +
Commit: Brian Evans  gentoo  org>
CommitDate: Wed Aug  7 16:54:09 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c50fef32

dev-db/mariadb: Revbump for critical replication bug

MDEV-20247 Replication hangs with "preparing" and never starts
Include upstream fix

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Brian Evans  gentoo.org>

 .../files/MDEV-20247-replication-10.2.patch| 108 ++
 dev-db/mariadb/files/MDEV-20247-replication.patch  | 121 +
 ...db-10.1.41.ebuild => mariadb-10.1.41-r1.ebuild} |   1 +
 ...db-10.2.26.ebuild => mariadb-10.2.26-r1.ebuild} |   1 +
 ...db-10.3.17.ebuild => mariadb-10.3.17-r1.ebuild} |   1 +
 ...iadb-10.4.7.ebuild => mariadb-10.4.7-r1.ebuild} |   1 +
 6 files changed, 233 insertions(+)

diff --git a/dev-db/mariadb/files/MDEV-20247-replication-10.2.patch 
b/dev-db/mariadb/files/MDEV-20247-replication-10.2.patch
new file mode 100644
index 000..193f2dd7750
--- /dev/null
+++ b/dev-db/mariadb/files/MDEV-20247-replication-10.2.patch
@@ -0,0 +1,108 @@
+From 47f8a18fec604983e47fdf7c822d94b26d85cade Mon Sep 17 00:00:00 2001
+From: Thirunarayanan Balathandayuthapani 
+Date: Wed, 7 Aug 2019 12:35:04 +0530
+Subject: [PATCH] MDEV-20247 Replication hangs with "preparing" and never
+ starts
+
+- The commit ab6dd774082c57f48d998e03655c06b672799b2d wrongly sets the
+condition inside innobase_srv_conc_enter_innodb().  Problem is that
+InnoDB makes the thread to sleep indefinitely if it is a replication
+slave thread.
+
+Thanks to Sujatha Sivakumar for contributing the replication test case.
+---
+ .../r/rpl_sync_with_innodb_thd_conc.result| 13 ++
+ .../rpl/t/rpl_sync_with_innodb_thd_conc.test  | 41 +++
+ storage/innobase/handler/ha_innodb.cc |  6 +--
+ 4 files changed, 60 insertions(+), 6 deletions(-)
+ create mode 100644 mysql-test/suite/rpl/r/rpl_sync_with_innodb_thd_conc.result
+ create mode 100644 mysql-test/suite/rpl/t/rpl_sync_with_innodb_thd_conc.test
+
+diff --git a/mysql-test/suite/rpl/r/rpl_sync_with_innodb_thd_conc.result 
b/mysql-test/suite/rpl/r/rpl_sync_with_innodb_thd_conc.result
+new file mode 100644
+index ..0ed894336a1c
+--- /dev/null
 b/mysql-test/suite/rpl/r/rpl_sync_with_innodb_thd_conc.result
+@@ -0,0 +1,18 @@
++include/master-slave.inc
++[connection master]
++connection slave;
++SET @old_innodb_thread_concurrency := @@innodb_thread_concurrency;
++SET @old_innodb_thread_sleep_delay := @@innodb_thread_sleep_delay;
++SET GLOBAL innodb_thread_concurrency = 100;
++connection master;
++CREATE TABLE t(f INT) ENGINE=INNODB;
++INSERT INTO t VALUES (10);
++connection slave;
++include/diff_tables.inc [master:t, slave:t]
++"= Clean up==="
++connection master;
++DROP TABLE t;
++connection slave;
++SET GLOBAL innodb_thread_concurrency = @old_innodb_thread_concurrency;
++SET GLOBAL innodb_thread_sleep_delay = @old_innodb_thread_sleep_delay;
++include/rpl_end.inc
+diff --git a/mysql-test/suite/rpl/t/rpl_sync_with_innodb_thd_conc.test 
b/mysql-test/suite/rpl/t/rpl_sync_with_innodb_thd_conc.test
+new file mode 100644
+index ..b4c2971d2fbc
+--- /dev/null
 b/mysql-test/suite/rpl/t/rpl_sync_with_innodb_thd_conc.test
+@@ -0,0 +1,41 @@
++#  Purpose 
++#
++# Test verifies that replication shouldn't hang when number of active threads
++# on the slave server are less than the allowed innodb_thread_concurrency 
value.
++#
++#  Implementation 
++#
++# Steps:
++#0 - Have master slave replication setup with engine being Innodb.
++#1 - Configure innodb_thread_concurrency = 100.
++#2 - Do some DML on master and sync the slave with master.
++#3 - Ensure replication doesn't hang.
++#
++#  References 
++#
++# MDEV-20247: Replication hangs with "preparing" and never starts
++#
++
++--source include/master-slave.inc
++--source include/have_innodb.inc
++
++--connection slave
++SET @old_innodb_thread_concurrency := @@innodb_thread_concurrency;
++SET @old_innodb_thread_sleep_delay := @@innodb_thread_sleep_delay;
++SET GLOBAL innodb_thread_concurrency = 100;
++
++--connection master
++CREATE TABLE t(f INT) ENGINE=INNODB;
++INSERT INTO t VALUES (10);
++--sync_slave_with_master
++
++--let $diff_tables=master:t, slave:t
++--source include/diff_tables.inc
++
++--echo "= Clean up==="
++--connection master
++DROP TABLE t;
++--sync_slave_with_master
++SET GLOBAL innodb_thread_concurrency = @old_innodb_thread_concurrency;
++SET GLOBAL innodb_thread_sleep_delay = @old_innodb_thread_sleep_delay;
++--source include/rpl_end.inc
+diff --git a/storage/innobase/handler/ha_innodb.cc 
b/storage/innobase/handler/ha_innodb.cc
+index 081fcbd9c51e..5dfe240631b8 100644
+--- a/storage/innobase/handler/ha_innodb.cc
 b/storage/innobase/handler/ha_innodb.cc
+@@ -1686,9 +1686,9 @@ 

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

2019-08-07 Thread Thomas Deutschmann
commit: 2c39fa464d763fac62f86ba89b98e6ddf8895d76
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Aug  7 16:49:43 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Aug  7 16:49:43 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c39fa46

sys-kernel/linux-firmware: move stable keywords

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Thomas Deutschmann  gentoo.org>

 sys-kernel/linux-firmware/linux-firmware-20190726-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-kernel/linux-firmware/linux-firmware-20190726-r2.ebuild 
b/sys-kernel/linux-firmware/linux-firmware-20190726-r2.ebuild
index 0dfd117b3b8..83a5df63b99 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20190726-r2.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20190726-r2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == * ]]; then
 else
GIT_COMMIT="dff98c6c57383fe343407bcb7b6e775e0b87274f"

SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${GIT_COMMIT}.tar.gz
 -> ${P}.tar.gz"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86"
+   KEYWORDS="alpha amd64 arm arm64 hppa ia64 mips ppc ppc64 s390 sh sparc 
x86"
 fi
 
 DESCRIPTION="Linux firmware files"



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

2019-08-07 Thread Thomas Deutschmann
commit: 08319e33ccb1f8ab6ed628f8b9f772fd75454436
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Aug  7 16:48:36 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Aug  7 16:48:36 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08319e33

sys-kernel/genkernel: bump to v4.0.0_beta11

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Thomas Deutschmann  gentoo.org>

 sys-kernel/genkernel/Manifest   | 2 +-
 .../{genkernel-4.0.0_beta10.ebuild => genkernel-4.0.0_beta11.ebuild}| 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index 7140714b1f9..ad1a5625b98 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -24,7 +24,7 @@ DIST genkernel-3.5.2.4.tar.xz 318152 BLAKE2B 
101bd8011b73699a3d8410fcb93adca2417
 DIST genkernel-3.5.2.5.tar.xz 318652 BLAKE2B 
9b0e1b07f61b54edc1d263cc679b36d7e9062fd1e7cf11fc9442cf60b217274bc73425150ca963b6a91cd504d7817a852fa5bf4ad7634ff8d1ec3b43748ded41
 SHA512 
096aa77f4a52afefcef81ff6c7eb281e539af304854572389e38bbdd735ca723c7a5f2f7163fa9f387e3a2a78a2ba117260f1c8396ed4e51e12a91ad0fb0ff90
 DIST genkernel-3.5.3.2.tar.xz 320644 BLAKE2B 
14eaf05aab02287c3dbb98f1a596e73bcbea39ceb2c8e44c5bdbb77b656958cee666f4353a2401bad531c2a7a98ee11b2531b251c19edc86db517cf3cc2869ec
 SHA512 
1bee8ebdb8c2c30e90e0a1c573ad09b0eb79da54f0829859305eb50ffab95e69aa219ce82d4969140dea3d8788d66d3490fc03d38e190b533666e9278c7f96a6
 DIST genkernel-3.5.3.3.tar.xz 331180 BLAKE2B 
0f83b973505ccb0a92ae24e92509710bf96991f36ca55975ffefdf1bd3e835bd72bb413688468a05e6a5fff2ec16e64816f8ccfe2530c9f1e9169d19a86a2231
 SHA512 
9170731f59a1476aa597549ac55feb3583bed249e50d1697292571caf25c5ca746a1db9e811f2009d55aea21d739ef0ab3e385acd81504bbbccc8f7346205d71
-DIST genkernel-4.0.0_beta10.tar.xz 395268 BLAKE2B 
02fdcf9a8f1a7b5c383eca8f3a6d0d1df1d29becfa1d6a27ed8b29b41ac122ef06457ea9925d3d39c1e669b6e16f876198f0a40343fb052cb1d957010aa7ecc7
 SHA512 
510e15230f940848de4cf3ea3c5e15224666d30427765a7faf153fd08c607a4e03486b15d3b01bd68a7297b70d80a8b38d14db9e572351a18abaae3975d22e00
+DIST genkernel-4.0.0_beta11.tar.xz 399760 BLAKE2B 
a61680dfd538d82cee9e3d9d4bf50fdbf447070419ebbe84c26aa8e69367d18ffb1eda963000a2f360b90a31002a05254e874fa0b2d0a480562c4f15bbf9467f
 SHA512 
f8d1242d7ef0c85c8183a653a2a5a811f3fbdd31787ae53b24e954370f3999c5bff918758fedaa87ae8f6ff2a94a8ccdebafa07aea9ef60ead3412fd22af6b33
 DIST gnupg-1.4.11.tar.bz2 3407075 BLAKE2B 
85d35d2e4da65d54add1010ea0486b943b328785e28c4efcaa2b65daafd53410a355d1df79ae45c5f7767d2eb7ff1f0b9637f417e65b084d2c760a281abd317a
 SHA512 
97e7b8b0f972cc2f7cabdb0e013cbee1c33e7d48407d040cca5c2037e32abe1c2100194be7d3b569d4f05eb16b24c205a5b83f06718f0241f8d4ee174f1c37ae
 DIST gnupg-1.4.22.tar.bz2 3746546 BLAKE2B 
9a2d37eeab10f2a7353804098e865ad45db846696a00a47f5bebf47145f79e0d2bf9c01c0195e2fe79af07946a3feac0d4589656c3e698a3a548ff1dd74ce759
 SHA512 
c03acac0fa55761470bb085d78a44e2b99ebb187e8396cbb031a184b1e40bef2a40c91da07755d1a20610a3daa6aa1eefea2d12a0dbd5a79a45466166419c708
 DIST gnupg-1.4.23.tar.bz2 3749353 BLAKE2B 
ec5e6bef0c7bb2a65813d7852cebeaa24c4855f9d9d9e802070da50b89fff56b747682933aa766dd130f849efcfe28f7aa74f3153405429bcf3845ef29c6dd6e
 SHA512 
78dc52a2010202a4afc8814b29fda657a6c9fe230d5e7db11ae040edd2b0ca819e1baa4dbd6c0d04d36cd353df484e83f52d17759d2891c2cf7025c0b5d36612

diff --git a/sys-kernel/genkernel/genkernel-4.0.0_beta10.ebuild 
b/sys-kernel/genkernel/genkernel-4.0.0_beta11.ebuild
similarity index 100%
rename from sys-kernel/genkernel/genkernel-4.0.0_beta10.ebuild
rename to sys-kernel/genkernel/genkernel-4.0.0_beta11.ebuild



[gentoo-commits] repo/gentoo:master commit in: net-p2p/bitcoind/, net-p2p/bitcoind/files/

2019-08-07 Thread Craig Andrews
commit: b3cb7b8967205cf814ab9eadc50aa7466814e4c6
Author: Luke Dashjr  utopios  org>
AuthorDate: Mon May 20 03:38:24 2019 +
Commit: Craig Andrews  gentoo  org>
CommitDate: Wed Aug  7 16:27:52 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3cb7b89

net-p2p/bitcoind: Bump to 0.18.0

Closes: https://bugs.gentoo.org/685912

Signed-off-by: Luke Dashjr  utopios.org>
Signed-off-by: Craig Andrews  gentoo.org>

 net-p2p/bitcoind/Manifest  |   2 +
 net-p2p/bitcoind/bitcoind-0.18.0.ebuild| 173 +
 net-p2p/bitcoind/files/0.18.0-daemon-fix.patch |  12 ++
 .../bitcoind-0.18.0-raii_event_tests-always.patch  |  70 +
 4 files changed, 257 insertions(+)

diff --git a/net-p2p/bitcoind/Manifest b/net-p2p/bitcoind/Manifest
index c3a90d5a2b6..6498fdc5f9f 100644
--- a/net-p2p/bitcoind/Manifest
+++ b/net-p2p/bitcoind/Manifest
@@ -1,4 +1,6 @@
 DIST bitcoin-0.16.3.knots20180918.patches.tar.xz 466344 BLAKE2B 
c45b96513e4b6317e6a2a55cc3b47302fbe56fb87717ae0197010694013331b5d071b85a11a73c76f08f39e9f0294d3475e89ee63272047df83893de4dbaa390
 SHA512 
2c3540acc668aeef4b8f01774219736d95395201ddeaccaf70e0bad4a89f05cdd5ffaf630bae0577656efb3580fae92ce0ee4bb1a720ea757ca59e3fd66e1893
 DIST bitcoin-0.17.1.knots20181229.patches.tar.xz 475988 BLAKE2B 
ce19ccbbeaac48f24b2833858a186494f84cb54ac380c42104f4d16b0a6acb44bc7a83c1b11311e2c566326d7067530ea5f34404def5f22b4825e2fa15aca22d
 SHA512 
da89f9510ee523c712aa137512dda752ab8d115eb8a45a999aa742555621f557694db34162a1f6979922268a3e22563883ea6d9d9a47e5c7613235c0ff06fda0
+DIST bitcoin-0.18.0.knots20190502.patches.tar.xz 400252 BLAKE2B 
0303bba89b3595a115ec8e5e743c362fc5feb0072ae493455cf3bcf1085b7f44d6b10142c05cb7ea59fadc630095de3a5f648007eb28f79551f2415db5c4f560
 SHA512 
b4c30c63cb6c770e04abd18e626db6e095b0d8b5aaf59e64b55eb8e19d4fdb559a3a2b939ab0e09967b4d3465b560e1379fa21b8efb3f25c22f84a2a1c655d16
 DIST bitcoin-v0.16.3.tar.gz 6658712 BLAKE2B 
2c20b32ea30aed264115d1bd336b62fa28de69cbf116385508718efd7ff22537c3bd402c0965e0f6ddd8e79fc8b51f388f52f885847d36207a24523e927ca63e
 SHA512 
2da25f56fe9b1f5a81815c14e70ff1a69ec15f742424e2c24d71303a71d57c8050dea5d5ba57425bbe0a01a3995ad9b30f0beea5dbafd1632a627cd3fd9a984d
 DIST bitcoin-v0.17.1.tar.gz 6224852 BLAKE2B 
efc86768ee2d23db83496ff9e62bc86d10c4d24a7343f4c706a4d336aeb94087b2d496db53e393beb5a9dc228bb9fe957ca89254c2fdaf9980b03029efbac2f8
 SHA512 
ef911ac6b49075a4f3d8db7f9f4dc59590d49847006fa36d7b8cce1634945d418accd95b12da505df38314fb7768f544863169d4b26b230e88dd627a83947466
+DIST bitcoin-v0.18.0.tar.gz 6533794 BLAKE2B 
0eb7830e215757efb024be7aff73108c4a8e2f80a204ca71f1b3b6015933a1ab740ad006e58c473c4b9609b3e47885ba6564472a3514335ab6d7f99d32903822
 SHA512 
a2e38754d459fac0786eaa43f23c62ee326167f325d98964546217bcdc4f68ab88314bfb674ca4efd4cbc21fc3950bd029e1375ee101e0c72bbae7197fc31cf2

diff --git a/net-p2p/bitcoind/bitcoind-0.18.0.ebuild 
b/net-p2p/bitcoind/bitcoind-0.18.0.ebuild
new file mode 100644
index 000..813f8093491
--- /dev/null
+++ b/net-p2p/bitcoind/bitcoind-0.18.0.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DB_VER="4.8"
+inherit autotools bash-completion-r1 db-use systemd user
+
+BITCOINCORE_COMMITHASH="2472733a24a9364e4c6233ccd04166a26a68cc65"
+KNOTS_PV="${PV}.knots20190502"
+KNOTS_P="bitcoin-${KNOTS_PV}"
+
+DESCRIPTION="Original Bitcoin crypto-currency wallet for automated services"
+HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/;
+SRC_URI="
+   
https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> 
bitcoin-v${PV}.tar.gz
+   
https://bitcoinknots.org/files/0.18.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> 
${KNOTS_P}.patches.tar.xz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+asm +bitcoin_policy_rbf examples knots libressl +system-leveldb test 
upnp +wallet zeromq"
+
+DEPEND="
+   >=dev-libs/boost-1.52.0:=[threads(+)]
+   dev-libs/libevent:=
+   >=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery]
+   >=dev-libs/univalue-1.0.4:=
+   system-leveldb? ( virtual/bitcoin-leveldb )
+   !libressl? ( dev-libs/openssl:0=[-bindist] )
+   libressl? ( dev-libs/libressl:0= )
+   upnp? ( >=net-libs/miniupnpc-1.9.20150916:= )
+   wallet? ( sys-libs/db:$(db_ver_to_slot "${DB_VER}")=[cxx] )
+   zeromq? ( net-libs/zeromq:= )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( doc/bips.md doc/bitcoin-conf.md doc/descriptors.md doc/files.md 
doc/JSON-RPC-interface.md doc/psbt.md doc/reduce-traffic.md 
doc/release-notes.md doc/REST-interface.md doc/tor.md )
+
+S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}"
+
+PATCHES=(
+   "${FILESDIR}/${P}-raii_event_tests-always.patch"
+)
+
+pkg_pretend() {
+   if use knots; then
+   elog "You are building ${PN} from Bitcoin Knots."
+   elog "For more 

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

2019-08-07 Thread Craig Andrews
commit: 4e2f42214851ebc4c93f2150ec1ef8c41a86c167
Author: Luke Dashjr  utopios  org>
AuthorDate: Mon May 20 03:46:48 2019 +
Commit: Craig Andrews  gentoo  org>
CommitDate: Wed Aug  7 16:27:52 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e2f4221

dev-util/bitcoin-tx: Bump to 0.18.0

Signed-off-by: Luke Dashjr  utopios.org>
Signed-off-by: Craig Andrews  gentoo.org>

 dev-util/bitcoin-tx/Manifest |   2 +
 dev-util/bitcoin-tx/bitcoin-tx-0.18.0.ebuild | 100 +++
 2 files changed, 102 insertions(+)

diff --git a/dev-util/bitcoin-tx/Manifest b/dev-util/bitcoin-tx/Manifest
index c3a90d5a2b6..6498fdc5f9f 100644
--- a/dev-util/bitcoin-tx/Manifest
+++ b/dev-util/bitcoin-tx/Manifest
@@ -1,4 +1,6 @@
 DIST bitcoin-0.16.3.knots20180918.patches.tar.xz 466344 BLAKE2B 
c45b96513e4b6317e6a2a55cc3b47302fbe56fb87717ae0197010694013331b5d071b85a11a73c76f08f39e9f0294d3475e89ee63272047df83893de4dbaa390
 SHA512 
2c3540acc668aeef4b8f01774219736d95395201ddeaccaf70e0bad4a89f05cdd5ffaf630bae0577656efb3580fae92ce0ee4bb1a720ea757ca59e3fd66e1893
 DIST bitcoin-0.17.1.knots20181229.patches.tar.xz 475988 BLAKE2B 
ce19ccbbeaac48f24b2833858a186494f84cb54ac380c42104f4d16b0a6acb44bc7a83c1b11311e2c566326d7067530ea5f34404def5f22b4825e2fa15aca22d
 SHA512 
da89f9510ee523c712aa137512dda752ab8d115eb8a45a999aa742555621f557694db34162a1f6979922268a3e22563883ea6d9d9a47e5c7613235c0ff06fda0
+DIST bitcoin-0.18.0.knots20190502.patches.tar.xz 400252 BLAKE2B 
0303bba89b3595a115ec8e5e743c362fc5feb0072ae493455cf3bcf1085b7f44d6b10142c05cb7ea59fadc630095de3a5f648007eb28f79551f2415db5c4f560
 SHA512 
b4c30c63cb6c770e04abd18e626db6e095b0d8b5aaf59e64b55eb8e19d4fdb559a3a2b939ab0e09967b4d3465b560e1379fa21b8efb3f25c22f84a2a1c655d16
 DIST bitcoin-v0.16.3.tar.gz 6658712 BLAKE2B 
2c20b32ea30aed264115d1bd336b62fa28de69cbf116385508718efd7ff22537c3bd402c0965e0f6ddd8e79fc8b51f388f52f885847d36207a24523e927ca63e
 SHA512 
2da25f56fe9b1f5a81815c14e70ff1a69ec15f742424e2c24d71303a71d57c8050dea5d5ba57425bbe0a01a3995ad9b30f0beea5dbafd1632a627cd3fd9a984d
 DIST bitcoin-v0.17.1.tar.gz 6224852 BLAKE2B 
efc86768ee2d23db83496ff9e62bc86d10c4d24a7343f4c706a4d336aeb94087b2d496db53e393beb5a9dc228bb9fe957ca89254c2fdaf9980b03029efbac2f8
 SHA512 
ef911ac6b49075a4f3d8db7f9f4dc59590d49847006fa36d7b8cce1634945d418accd95b12da505df38314fb7768f544863169d4b26b230e88dd627a83947466
+DIST bitcoin-v0.18.0.tar.gz 6533794 BLAKE2B 
0eb7830e215757efb024be7aff73108c4a8e2f80a204ca71f1b3b6015933a1ab740ad006e58c473c4b9609b3e47885ba6564472a3514335ab6d7f99d32903822
 SHA512 
a2e38754d459fac0786eaa43f23c62ee326167f325d98964546217bcdc4f68ab88314bfb674ca4efd4cbc21fc3950bd029e1375ee101e0c72bbae7197fc31cf2

diff --git a/dev-util/bitcoin-tx/bitcoin-tx-0.18.0.ebuild 
b/dev-util/bitcoin-tx/bitcoin-tx-0.18.0.ebuild
new file mode 100644
index 000..9c64bb0e597
--- /dev/null
+++ b/dev-util/bitcoin-tx/bitcoin-tx-0.18.0.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1
+
+BITCOINCORE_COMMITHASH="2472733a24a9364e4c6233ccd04166a26a68cc65"
+KNOTS_PV="${PV}.knots20190502"
+KNOTS_P="bitcoin-${KNOTS_PV}"
+
+DESCRIPTION="Command-line Bitcoin transaction tool"
+HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/;
+SRC_URI="
+   
https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> 
bitcoin-v${PV}.tar.gz
+   
https://bitcoinknots.org/files/0.18.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> 
${KNOTS_P}.patches.tar.xz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="knots libressl"
+
+DEPEND="
+   >=dev-libs/boost-1.52.0:=[threads(+)]
+   >=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery]
+   >=dev-libs/univalue-1.0.4:=
+   !libressl? ( dev-libs/openssl:0=[-bindist] )
+   libressl? ( dev-libs/libressl:0= )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( doc/bips.md doc/release-notes.md )
+
+S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}"
+
+pkg_pretend() {
+   if use knots; then
+   elog "You are building ${PN} from Bitcoin Knots."
+   elog "For more information, see:"
+   elog 
"https://bitcoinknots.org/files/0.18.x/${KNOTS_PV}/${KNOTS_P}.desc.html;
+   else
+   elog "You are building ${PN} from Bitcoin Core."
+   elog "For more information, see:"
+   elog "https://bitcoincore.org/en/2019/05/02/release-${PV}/;
+   fi
+}
+
+src_prepare() {
+   local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
+
+   eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch"
+
+   if use knots; then
+   eapply "${knots_patchdir}/${KNOTS_P}.f.patch"
+   eapply "${knots_patchdir}/${KNOTS_P}.branding.patch"
+   eapply "${knots_patchdir}/${KNOTS_P}.ts.patch"
+   fi
+
+   eapply_user
+
+   echo 

[gentoo-commits] repo/gentoo:master commit in: net-p2p/bitcoin-cli/

2019-08-07 Thread Craig Andrews
commit: 4fa2be97fa08b66d2f1b3674d696e99cb17259a1
Author: Luke Dashjr  utopios  org>
AuthorDate: Mon May 20 03:45:00 2019 +
Commit: Craig Andrews  gentoo  org>
CommitDate: Wed Aug  7 16:27:52 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fa2be97

net-p2p/bitcoin-cli: Bump to 0.18.0

Signed-off-by: Luke Dashjr  utopios.org>
Signed-off-by: Craig Andrews  gentoo.org>

 net-p2p/bitcoin-cli/Manifest  |  2 +
 net-p2p/bitcoin-cli/bitcoin-cli-0.18.0.ebuild | 99 +++
 2 files changed, 101 insertions(+)

diff --git a/net-p2p/bitcoin-cli/Manifest b/net-p2p/bitcoin-cli/Manifest
index c3a90d5a2b6..6498fdc5f9f 100644
--- a/net-p2p/bitcoin-cli/Manifest
+++ b/net-p2p/bitcoin-cli/Manifest
@@ -1,4 +1,6 @@
 DIST bitcoin-0.16.3.knots20180918.patches.tar.xz 466344 BLAKE2B 
c45b96513e4b6317e6a2a55cc3b47302fbe56fb87717ae0197010694013331b5d071b85a11a73c76f08f39e9f0294d3475e89ee63272047df83893de4dbaa390
 SHA512 
2c3540acc668aeef4b8f01774219736d95395201ddeaccaf70e0bad4a89f05cdd5ffaf630bae0577656efb3580fae92ce0ee4bb1a720ea757ca59e3fd66e1893
 DIST bitcoin-0.17.1.knots20181229.patches.tar.xz 475988 BLAKE2B 
ce19ccbbeaac48f24b2833858a186494f84cb54ac380c42104f4d16b0a6acb44bc7a83c1b11311e2c566326d7067530ea5f34404def5f22b4825e2fa15aca22d
 SHA512 
da89f9510ee523c712aa137512dda752ab8d115eb8a45a999aa742555621f557694db34162a1f6979922268a3e22563883ea6d9d9a47e5c7613235c0ff06fda0
+DIST bitcoin-0.18.0.knots20190502.patches.tar.xz 400252 BLAKE2B 
0303bba89b3595a115ec8e5e743c362fc5feb0072ae493455cf3bcf1085b7f44d6b10142c05cb7ea59fadc630095de3a5f648007eb28f79551f2415db5c4f560
 SHA512 
b4c30c63cb6c770e04abd18e626db6e095b0d8b5aaf59e64b55eb8e19d4fdb559a3a2b939ab0e09967b4d3465b560e1379fa21b8efb3f25c22f84a2a1c655d16
 DIST bitcoin-v0.16.3.tar.gz 6658712 BLAKE2B 
2c20b32ea30aed264115d1bd336b62fa28de69cbf116385508718efd7ff22537c3bd402c0965e0f6ddd8e79fc8b51f388f52f885847d36207a24523e927ca63e
 SHA512 
2da25f56fe9b1f5a81815c14e70ff1a69ec15f742424e2c24d71303a71d57c8050dea5d5ba57425bbe0a01a3995ad9b30f0beea5dbafd1632a627cd3fd9a984d
 DIST bitcoin-v0.17.1.tar.gz 6224852 BLAKE2B 
efc86768ee2d23db83496ff9e62bc86d10c4d24a7343f4c706a4d336aeb94087b2d496db53e393beb5a9dc228bb9fe957ca89254c2fdaf9980b03029efbac2f8
 SHA512 
ef911ac6b49075a4f3d8db7f9f4dc59590d49847006fa36d7b8cce1634945d418accd95b12da505df38314fb7768f544863169d4b26b230e88dd627a83947466
+DIST bitcoin-v0.18.0.tar.gz 6533794 BLAKE2B 
0eb7830e215757efb024be7aff73108c4a8e2f80a204ca71f1b3b6015933a1ab740ad006e58c473c4b9609b3e47885ba6564472a3514335ab6d7f99d32903822
 SHA512 
a2e38754d459fac0786eaa43f23c62ee326167f325d98964546217bcdc4f68ab88314bfb674ca4efd4cbc21fc3950bd029e1375ee101e0c72bbae7197fc31cf2

diff --git a/net-p2p/bitcoin-cli/bitcoin-cli-0.18.0.ebuild 
b/net-p2p/bitcoin-cli/bitcoin-cli-0.18.0.ebuild
new file mode 100644
index 000..e7b263ed02b
--- /dev/null
+++ b/net-p2p/bitcoin-cli/bitcoin-cli-0.18.0.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1
+
+BITCOINCORE_COMMITHASH="2472733a24a9364e4c6233ccd04166a26a68cc65"
+KNOTS_PV="${PV}.knots20190502"
+KNOTS_P="bitcoin-${KNOTS_PV}"
+
+DESCRIPTION="Command-line JSON-RPC client specifically for interfacing with 
bitcoind"
+HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/;
+SRC_URI="
+   
https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> 
bitcoin-v${PV}.tar.gz
+   
https://bitcoinknots.org/files/0.18.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> 
${KNOTS_P}.patches.tar.xz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="knots libressl"
+
+DEPEND="
+   >=dev-libs/boost-1.52.0:=[threads(+)]
+   dev-libs/libevent:=
+   >=dev-libs/univalue-1.0.4:=
+   !libressl? ( dev-libs/openssl:0=[-bindist] )
+   libressl? ( dev-libs/libressl:0= )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( doc/release-notes.md )
+
+S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}"
+
+pkg_pretend() {
+   if use knots; then
+   elog "You are building ${PN} from Bitcoin Knots."
+   elog "For more information, see:"
+   elog 
"https://bitcoinknots.org/files/0.18.x/${KNOTS_PV}/${KNOTS_P}.desc.html;
+   else
+   elog "You are building ${PN} from Bitcoin Core."
+   elog "For more information, see:"
+   elog "https://bitcoincore.org/en/2019/05/02/release-${PV}/;
+   fi
+}
+
+src_prepare() {
+   local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
+
+   eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch"
+
+   if use knots; then
+   eapply "${knots_patchdir}/${KNOTS_P}.f.patch"
+   eapply "${knots_patchdir}/${KNOTS_P}.branding.patch"
+   eapply "${knots_patchdir}/${KNOTS_P}.ts.patch"
+   fi
+
+   eapply_user
+
+   echo 

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

2019-08-07 Thread Craig Andrews
commit: 3943dc7b0f21e5f35f695da784a03c11af170f91
Author: Luke Dashjr  utopios  org>
AuthorDate: Mon May 20 03:48:26 2019 +
Commit: Craig Andrews  gentoo  org>
CommitDate: Wed Aug  7 16:27:53 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3943dc7b

net-libs/libbitcoinconsensus: Bump to 0.18.0

Signed-off-by: Luke Dashjr  utopios.org>
Signed-off-by: Craig Andrews  gentoo.org>

 net-libs/libbitcoinconsensus/Manifest  |  2 +
 .../libbitcoinconsensus-0.18.0.ebuild  | 97 ++
 2 files changed, 99 insertions(+)

diff --git a/net-libs/libbitcoinconsensus/Manifest 
b/net-libs/libbitcoinconsensus/Manifest
index c3a90d5a2b6..6498fdc5f9f 100644
--- a/net-libs/libbitcoinconsensus/Manifest
+++ b/net-libs/libbitcoinconsensus/Manifest
@@ -1,4 +1,6 @@
 DIST bitcoin-0.16.3.knots20180918.patches.tar.xz 466344 BLAKE2B 
c45b96513e4b6317e6a2a55cc3b47302fbe56fb87717ae0197010694013331b5d071b85a11a73c76f08f39e9f0294d3475e89ee63272047df83893de4dbaa390
 SHA512 
2c3540acc668aeef4b8f01774219736d95395201ddeaccaf70e0bad4a89f05cdd5ffaf630bae0577656efb3580fae92ce0ee4bb1a720ea757ca59e3fd66e1893
 DIST bitcoin-0.17.1.knots20181229.patches.tar.xz 475988 BLAKE2B 
ce19ccbbeaac48f24b2833858a186494f84cb54ac380c42104f4d16b0a6acb44bc7a83c1b11311e2c566326d7067530ea5f34404def5f22b4825e2fa15aca22d
 SHA512 
da89f9510ee523c712aa137512dda752ab8d115eb8a45a999aa742555621f557694db34162a1f6979922268a3e22563883ea6d9d9a47e5c7613235c0ff06fda0
+DIST bitcoin-0.18.0.knots20190502.patches.tar.xz 400252 BLAKE2B 
0303bba89b3595a115ec8e5e743c362fc5feb0072ae493455cf3bcf1085b7f44d6b10142c05cb7ea59fadc630095de3a5f648007eb28f79551f2415db5c4f560
 SHA512 
b4c30c63cb6c770e04abd18e626db6e095b0d8b5aaf59e64b55eb8e19d4fdb559a3a2b939ab0e09967b4d3465b560e1379fa21b8efb3f25c22f84a2a1c655d16
 DIST bitcoin-v0.16.3.tar.gz 6658712 BLAKE2B 
2c20b32ea30aed264115d1bd336b62fa28de69cbf116385508718efd7ff22537c3bd402c0965e0f6ddd8e79fc8b51f388f52f885847d36207a24523e927ca63e
 SHA512 
2da25f56fe9b1f5a81815c14e70ff1a69ec15f742424e2c24d71303a71d57c8050dea5d5ba57425bbe0a01a3995ad9b30f0beea5dbafd1632a627cd3fd9a984d
 DIST bitcoin-v0.17.1.tar.gz 6224852 BLAKE2B 
efc86768ee2d23db83496ff9e62bc86d10c4d24a7343f4c706a4d336aeb94087b2d496db53e393beb5a9dc228bb9fe957ca89254c2fdaf9980b03029efbac2f8
 SHA512 
ef911ac6b49075a4f3d8db7f9f4dc59590d49847006fa36d7b8cce1634945d418accd95b12da505df38314fb7768f544863169d4b26b230e88dd627a83947466
+DIST bitcoin-v0.18.0.tar.gz 6533794 BLAKE2B 
0eb7830e215757efb024be7aff73108c4a8e2f80a204ca71f1b3b6015933a1ab740ad006e58c473c4b9609b3e47885ba6564472a3514335ab6d7f99d32903822
 SHA512 
a2e38754d459fac0786eaa43f23c62ee326167f325d98964546217bcdc4f68ab88314bfb674ca4efd4cbc21fc3950bd029e1375ee101e0c72bbae7197fc31cf2

diff --git a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.18.0.ebuild 
b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.18.0.ebuild
new file mode 100644
index 000..5a7d5d90d9c
--- /dev/null
+++ b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.18.0.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+BITCOINCORE_COMMITHASH="2472733a24a9364e4c6233ccd04166a26a68cc65"
+KNOTS_PV="${PV}.knots20190502"
+KNOTS_P="bitcoin-${KNOTS_PV}"
+
+DESCRIPTION="Bitcoin Core consensus library"
+HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/;
+SRC_URI="
+   
https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> 
bitcoin-v${PV}.tar.gz
+   
https://bitcoinknots.org/files/0.18.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> 
${KNOTS_P}.patches.tar.xz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+asm knots libressl"
+
+DEPEND="
+   >=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery]
+   !libressl? ( dev-libs/openssl:0=[-bindist] )
+   libressl? ( dev-libs/libressl:0= )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( doc/bips.md doc/release-notes.md doc/shared-libraries.md )
+
+S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}"
+
+pkg_pretend() {
+   if use knots; then
+   elog "You are building ${PN} from Bitcoin Knots."
+   elog "For more information, see:"
+   elog 
"https://bitcoinknots.org/files/0.18.x/${KNOTS_PV}/${KNOTS_P}.desc.html;
+   else
+   elog "You are building ${PN} from Bitcoin Core."
+   elog "For more information, see:"
+   elog "https://bitcoincore.org/en/2019/05/02/release-${PV}/;
+   fi
+}
+
+src_prepare() {
+   local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
+
+   eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch"
+
+   if use knots; then
+   eapply "${knots_patchdir}/${KNOTS_P}.f.patch"
+   eapply "${knots_patchdir}/${KNOTS_P}.branding.patch"
+   eapply "${knots_patchdir}/${KNOTS_P}.ts.patch"
+   fi
+
+   

[gentoo-commits] repo/gentoo:master commit in: net-p2p/bitcoin-qt/

2019-08-07 Thread Craig Andrews
commit: b1b19e03f308d782c44f47e6eccbbd1ce94d3acc
Author: Luke Dashjr  utopios  org>
AuthorDate: Mon May 20 03:34:45 2019 +
Commit: Craig Andrews  gentoo  org>
CommitDate: Wed Aug  7 16:27:52 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1b19e03

net-p2p/bitcoin-qt: Bump to 0.18.0

Signed-off-by: Luke Dashjr  utopios.org>
Signed-off-by: Craig Andrews  gentoo.org>

 net-p2p/bitcoin-qt/Manifest |   2 +
 net-p2p/bitcoin-qt/bitcoin-qt-0.18.0.ebuild | 184 
 2 files changed, 186 insertions(+)

diff --git a/net-p2p/bitcoin-qt/Manifest b/net-p2p/bitcoin-qt/Manifest
index c3a90d5a2b6..6498fdc5f9f 100644
--- a/net-p2p/bitcoin-qt/Manifest
+++ b/net-p2p/bitcoin-qt/Manifest
@@ -1,4 +1,6 @@
 DIST bitcoin-0.16.3.knots20180918.patches.tar.xz 466344 BLAKE2B 
c45b96513e4b6317e6a2a55cc3b47302fbe56fb87717ae0197010694013331b5d071b85a11a73c76f08f39e9f0294d3475e89ee63272047df83893de4dbaa390
 SHA512 
2c3540acc668aeef4b8f01774219736d95395201ddeaccaf70e0bad4a89f05cdd5ffaf630bae0577656efb3580fae92ce0ee4bb1a720ea757ca59e3fd66e1893
 DIST bitcoin-0.17.1.knots20181229.patches.tar.xz 475988 BLAKE2B 
ce19ccbbeaac48f24b2833858a186494f84cb54ac380c42104f4d16b0a6acb44bc7a83c1b11311e2c566326d7067530ea5f34404def5f22b4825e2fa15aca22d
 SHA512 
da89f9510ee523c712aa137512dda752ab8d115eb8a45a999aa742555621f557694db34162a1f6979922268a3e22563883ea6d9d9a47e5c7613235c0ff06fda0
+DIST bitcoin-0.18.0.knots20190502.patches.tar.xz 400252 BLAKE2B 
0303bba89b3595a115ec8e5e743c362fc5feb0072ae493455cf3bcf1085b7f44d6b10142c05cb7ea59fadc630095de3a5f648007eb28f79551f2415db5c4f560
 SHA512 
b4c30c63cb6c770e04abd18e626db6e095b0d8b5aaf59e64b55eb8e19d4fdb559a3a2b939ab0e09967b4d3465b560e1379fa21b8efb3f25c22f84a2a1c655d16
 DIST bitcoin-v0.16.3.tar.gz 6658712 BLAKE2B 
2c20b32ea30aed264115d1bd336b62fa28de69cbf116385508718efd7ff22537c3bd402c0965e0f6ddd8e79fc8b51f388f52f885847d36207a24523e927ca63e
 SHA512 
2da25f56fe9b1f5a81815c14e70ff1a69ec15f742424e2c24d71303a71d57c8050dea5d5ba57425bbe0a01a3995ad9b30f0beea5dbafd1632a627cd3fd9a984d
 DIST bitcoin-v0.17.1.tar.gz 6224852 BLAKE2B 
efc86768ee2d23db83496ff9e62bc86d10c4d24a7343f4c706a4d336aeb94087b2d496db53e393beb5a9dc228bb9fe957ca89254c2fdaf9980b03029efbac2f8
 SHA512 
ef911ac6b49075a4f3d8db7f9f4dc59590d49847006fa36d7b8cce1634945d418accd95b12da505df38314fb7768f544863169d4b26b230e88dd627a83947466
+DIST bitcoin-v0.18.0.tar.gz 6533794 BLAKE2B 
0eb7830e215757efb024be7aff73108c4a8e2f80a204ca71f1b3b6015933a1ab740ad006e58c473c4b9609b3e47885ba6564472a3514335ab6d7f99d32903822
 SHA512 
a2e38754d459fac0786eaa43f23c62ee326167f325d98964546217bcdc4f68ab88314bfb674ca4efd4cbc21fc3950bd029e1375ee101e0c72bbae7197fc31cf2

diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.18.0.ebuild 
b/net-p2p/bitcoin-qt/bitcoin-qt-0.18.0.ebuild
new file mode 100644
index 000..f682896336f
--- /dev/null
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.18.0.ebuild
@@ -0,0 +1,184 @@
+# Copyright 2010-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DB_VER="4.8"
+inherit autotools bash-completion-r1 db-use gnome2-utils xdg-utils
+
+BITCOINCORE_COMMITHASH="2472733a24a9364e4c6233ccd04166a26a68cc65"
+KNOTS_PV="${PV}.knots20190502"
+KNOTS_P="bitcoin-${KNOTS_PV}"
+
+DESCRIPTION="An end-user Qt GUI for the Bitcoin crypto-currency"
+HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/;
+SRC_URI="
+   
https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> 
bitcoin-v${PV}.tar.gz
+   
https://bitcoinknots.org/files/0.18.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> 
${KNOTS_P}.patches.tar.xz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="+asm +bip70 +bitcoin_policy_rbf dbus kde knots libressl +qrcode 
+system-leveldb test upnp +wallet zeromq"
+
+RDEPEND="
+   >=dev-libs/boost-1.52.0:=[threads(+)]
+   >=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery]
+   >=dev-libs/univalue-1.0.4:=
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5
+   dev-qt/qtwidgets:5
+   system-leveldb? ( virtual/bitcoin-leveldb )
+   bip70? ( dev-libs/protobuf:= )
+   dbus? ( dev-qt/qtdbus:5 )
+   dev-libs/libevent:=
+   !libressl? ( dev-libs/openssl:0=[-bindist] )
+   libressl? ( dev-libs/libressl:0= )
+   qrcode? (
+   media-gfx/qrencode:=
+   )
+   upnp? ( >=net-libs/miniupnpc-1.9.20150916:= )
+   wallet? ( sys-libs/db:$(db_ver_to_slot "${DB_VER}")=[cxx] )
+   zeromq? ( net-libs/zeromq:= )
+"
+DEPEND="${RDEPEND}
+   dev-qt/linguist-tools:5
+   knots? (
+   gnome-base/librsvg
+   media-gfx/imagemagick[png]
+   )
+"
+
+DOCS=( doc/bips.md doc/bitcoin-conf.md doc/descriptors.md doc/files.md 
doc/JSON-RPC-interface.md doc/psbt.md doc/reduce-traffic.md 
doc/release-notes.md doc/REST-interface.md doc/tor.md )
+

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

2019-08-07 Thread Joonas Niilola
commit: dbb0ea18114c6cc994bb6291212bbd792b1d8ab8
Author: Petr Vaněk  atlas  cz>
AuthorDate: Tue Aug  6 09:09:53 2019 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Aug  7 16:26:56 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbb0ea18

net-analyzer/sslsplit: Remove old version

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Petr Vaněk  atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/12621
Signed-off-by: Joonas Niilola  gentoo.org>

 net-analyzer/sslsplit/Manifest  |  1 -
 net-analyzer/sslsplit/sslsplit-0.5.2.ebuild | 44 -
 2 files changed, 45 deletions(-)

diff --git a/net-analyzer/sslsplit/Manifest b/net-analyzer/sslsplit/Manifest
index f2d8ea30a7d..489c8c08bb3 100644
--- a/net-analyzer/sslsplit/Manifest
+++ b/net-analyzer/sslsplit/Manifest
@@ -1,2 +1 @@
-DIST sslsplit-0.5.2.tar.gz 1526606 BLAKE2B 
2eb9e1525072626cfdfdfe344a61d92cf340a87dbbabfd06c5a7b46ce6dd0305b27949f91260fe192ecf97484676600e39f79a74995b45fb5b59138726cfbffe
 SHA512 
5f0560dbf89355ad0ef443df2fb0358046efd8c35be6c45f27b04495fd6194c826ef1c7b261683e7f22eb14436293d00395329284d9e709e1188c3c885251935
 DIST sslsplit-0.5.4.tar.gz 1750390 BLAKE2B 
4ab9014c91938397c469bdc49dd307c47375047f018a5caaf8b32eb84596d2fbe623702349dc85776071363b2167c6ee8918604c6bf2843d357ffe64df36bb1b
 SHA512 
5220cbf26a2d5201c4b36207ec52b290f95002c6d5a4d828868d163cff528095add8b333ecb844b86b4e83f62934aa840f80d3838d00997acd50b6e30cee7aed

diff --git a/net-analyzer/sslsplit/sslsplit-0.5.2.ebuild 
b/net-analyzer/sslsplit/sslsplit-0.5.2.ebuild
deleted file mode 100644
index f823d37044f..000
--- a/net-analyzer/sslsplit/sslsplit-0.5.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic
-
-DESCRIPTION="Transparent SSL/TLS interception"
-HOMEPAGE="https://www.roe.ch/SSLsplit;
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="elibc_musl test"
-
-if [[ ${PV} == * ]] ; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/droe/${PN};
-   EGIT_BRANCH="develop"
-else
-   SRC_URI="https://github.com/droe/${PN}/archive/${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64 ~x86"
-fi
-
-RDEPEND="
-   elibc_musl? ( sys-libs/fts-standalone )
-   dev-libs/libevent[ssl,threads]
-   dev-libs/openssl:0="
-DEPEND="${RDEPEND}
-   test? ( dev-libs/check )"
-
-src_prepare() {
-   default
-
-   use elibc_musl && append-libs "-lfts"
-
-   sed -i 's/-D_FORTIFY_SOURCE=2 //g' GNUmakefile || die
-   sed -i 's/\/SSLSPLIT_FEATURES/g' GNUmakefile version.c || die
-   sed -i '/opts_suite/d' main.t.c || die
-}
-
-src_install() {
-   emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-   dodoc AUTHORS.md NEWS.md README.md
-}



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

2019-08-07 Thread Joonas Niilola
commit: 6d7e40d27f49d4d2015a3ec81e12da91b6d25b73
Author: Petr Vaněk  atlas  cz>
AuthorDate: Tue Aug  6 08:58:30 2019 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Aug  7 16:26:55 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d7e40d2

net-analyzer/sslsplit: Bump to version 0.5.4

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Petr Vaněk  atlas.cz>
Signed-off-by: Joonas Niilola  gentoo.org>

 net-analyzer/sslsplit/Manifest |  1 +
 .../sslsplit/files/sslsplit-0.5.4-install.patch| 26 +++
 net-analyzer/sslsplit/sslsplit-0.5.4.ebuild| 50 ++
 3 files changed, 77 insertions(+)

diff --git a/net-analyzer/sslsplit/Manifest b/net-analyzer/sslsplit/Manifest
index c214847d798..f2d8ea30a7d 100644
--- a/net-analyzer/sslsplit/Manifest
+++ b/net-analyzer/sslsplit/Manifest
@@ -1 +1,2 @@
 DIST sslsplit-0.5.2.tar.gz 1526606 BLAKE2B 
2eb9e1525072626cfdfdfe344a61d92cf340a87dbbabfd06c5a7b46ce6dd0305b27949f91260fe192ecf97484676600e39f79a74995b45fb5b59138726cfbffe
 SHA512 
5f0560dbf89355ad0ef443df2fb0358046efd8c35be6c45f27b04495fd6194c826ef1c7b261683e7f22eb14436293d00395329284d9e709e1188c3c885251935
+DIST sslsplit-0.5.4.tar.gz 1750390 BLAKE2B 
4ab9014c91938397c469bdc49dd307c47375047f018a5caaf8b32eb84596d2fbe623702349dc85776071363b2167c6ee8918604c6bf2843d357ffe64df36bb1b
 SHA512 
5220cbf26a2d5201c4b36207ec52b290f95002c6d5a4d828868d163cff528095add8b333ecb844b86b4e83f62934aa840f80d3838d00997acd50b6e30cee7aed

diff --git a/net-analyzer/sslsplit/files/sslsplit-0.5.4-install.patch 
b/net-analyzer/sslsplit/files/sslsplit-0.5.4-install.patch
new file mode 100644
index 000..65959f3e109
--- /dev/null
+++ b/net-analyzer/sslsplit/files/sslsplit-0.5.4-install.patch
@@ -0,0 +1,26 @@
+diff --git a/GNUmakefile b/GNUmakefile
+index ebdcf0a..02cb4b7 100644
+--- a/GNUmakefile
 b/GNUmakefile
+@@ -519,21 +519,12 @@ $(TARGET).conf.5: $(TARGET).conf.5.in $(MKFS) FORCE
+ 
+ install: $(TARGET) $(TARGET).conf $(TARGET).1 $(TARGET).conf.5
+   test -d $(DESTDIR)$(PREFIX)/bin || $(MKDIR) -p $(DESTDIR)$(PREFIX)/bin
+-  test -d $(DESTDIR)$(PREFIX)/$(TARGET) || \
+-  $(MKDIR) -p $(DESTDIR)$(PREFIX)/sslsplit
+   test -d $(DESTDIR)$(PREFIX)/$(MANDIR)/man1 || \
+   $(MKDIR) -p $(DESTDIR)$(PREFIX)/$(MANDIR)/man1
+   test -d $(DESTDIR)$(PREFIX)/$(MANDIR)/man5 || \
+   $(MKDIR) -p $(DESTDIR)$(PREFIX)/$(MANDIR)/man5
+-  test -d $(DESTDIR)/var/log/$(TARGET) || \
+-  $(MKDIR) -p $(DESTDIR)/var/log/$(TARGET)
+-  test -d $(DESTDIR)/var/run/$(TARGET) || \
+-  $(MKDIR) -p $(DESTDIR)/var/run/$(TARGET)
+   $(INSTALL) $(BINOWNERFLAGS) -m $(BINMODE) \
+   $(TARGET) $(DESTDIR)$(PREFIX)/bin/
+-  $(INSTALL) $(CNFOWNERFLAGS) -m $(CNFMODE) \
+-  $(TARGET).conf \
+-  $(DESTDIR)$(PREFIX)/$(TARGET)/$(TARGET).conf.sample
+   $(INSTALL) $(MANOWNERFLAGS) -m $(MANMODE) \
+   $(TARGET).1 $(DESTDIR)$(PREFIX)/$(MANDIR)/man1/
+   $(INSTALL) $(MANOWNERFLAGS) -m $(MANMODE) \

diff --git a/net-analyzer/sslsplit/sslsplit-0.5.4.ebuild 
b/net-analyzer/sslsplit/sslsplit-0.5.4.ebuild
new file mode 100644
index 000..af09469872b
--- /dev/null
+++ b/net-analyzer/sslsplit/sslsplit-0.5.4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+DESCRIPTION="Transparent SSL/TLS interception"
+HOMEPAGE="https://www.roe.ch/SSLsplit;
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="elibc_musl test"
+
+if [[ ${PV} == * ]] ; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/droe/${PN};
+   EGIT_BRANCH="develop"
+else
+   SRC_URI="https://github.com/droe/${PN}/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+RDEPEND="
+   dev-libs/libevent[ssl,threads]
+   dev-libs/openssl:0=
+   net-libs/libnet:1.1
+   elibc_musl? ( sys-libs/fts-standalone )"
+DEPEND="${RDEPEND}
+   test? ( dev-libs/check )"
+BDEPEND=""
+
+PATCHES=(
+   "${FILESDIR}/${P}-install.patch"
+)
+
+src_prepare() {
+   default
+
+   use elibc_musl && append-libs "-lfts"
+
+   sed -i -e 's/-D_FORTIFY_SOURCE=2 //g' \
+   -e 's/\/SSLSPLIT_FEATURES/g' GNUmakefile || die
+   sed -i '/opts_suite/d' main.t.c || die
+}
+
+src_install() {
+   emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+   dodoc AUTHORS.md NEWS.md README.md sslsplit.conf
+}



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

2019-08-07 Thread Joonas Niilola
commit: 0d1b8df0eebfadd1f1e8e9c6eadb39d5c7efd444
Author: Petr Vaněk  atlas  cz>
AuthorDate: Tue Aug  6 09:07:49 2019 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Aug  7 16:26:55 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d1b8df0

net-analyzer/sslsplit: update  ebuild, EAPI-7 Bump

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Petr Vaněk  atlas.cz>
Signed-off-by: Joonas Niilola  gentoo.org>

 net-analyzer/sslsplit/sslsplit-.ebuild | 14 --
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/net-analyzer/sslsplit/sslsplit-.ebuild 
b/net-analyzer/sslsplit/sslsplit-.ebuild
index f013b4bb555..5ea7c49b62c 100644
--- a/net-analyzer/sslsplit/sslsplit-.ebuild
+++ b/net-analyzer/sslsplit/sslsplit-.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit flag-o-matic
 
@@ -22,23 +22,25 @@ else
 fi
 
 RDEPEND="
-   elibc_musl? ( sys-libs/fts-standalone )
dev-libs/libevent[ssl,threads]
-   dev-libs/openssl:0="
+   dev-libs/openssl:0=
+   net-libs/libnet:1.1
+   elibc_musl? ( sys-libs/fts-standalone )"
 DEPEND="${RDEPEND}
test? ( dev-libs/check )"
+BDEPEND=""
 
 src_prepare() {
default
 
use elibc_musl && append-libs "-lfts"
 
-   sed -i 's/-D_FORTIFY_SOURCE=2 //g' GNUmakefile || die
-   sed -i 's/\/SSLSPLIT_FEATURES/g' GNUmakefile build.c || die
+   sed -i -e 's/-D_FORTIFY_SOURCE=2 //g' \
+   -e 's/\/SSLSPLIT_FEATURES/g' GNUmakefile || die
sed -i '/opts_suite/d' main.t.c || die
 }
 
 src_install() {
-   emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+   emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" 
SYSCONFDIR="${EPREFIX}/etc" install
dodoc AUTHORS.md NEWS.md README.md
 }



[gentoo-commits] repo/gentoo:master commit in: app-metrics/elasticsearch_exporter/

2019-08-07 Thread Manuel Rüger
commit: 978d1ed410ae39401cd26d161ec73aa8e1def3ca
Author: Manuel Rüger  gentoo  org>
AuthorDate: Wed Aug  7 16:15:10 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Wed Aug  7 16:15:40 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=978d1ed4

app-metrics/elasticsearch_exporter: Version bump to 1.1.0

Package-Manager: Portage-2.3.71, Repoman-2.3.16
Signed-off-by: Manuel Rüger  gentoo.org>

 app-metrics/elasticsearch_exporter/Manifest|  1 +
 .../elasticsearch_exporter-1.1.0.ebuild| 49 ++
 2 files changed, 50 insertions(+)

diff --git a/app-metrics/elasticsearch_exporter/Manifest 
b/app-metrics/elasticsearch_exporter/Manifest
index ff844f70c7e..a4e956c24c4 100644
--- a/app-metrics/elasticsearch_exporter/Manifest
+++ b/app-metrics/elasticsearch_exporter/Manifest
@@ -1,3 +1,4 @@
 DIST elasticsearch_exporter-1.0.2.tar.gz 207764 BLAKE2B 
f626c53d04e05912d1db480d6078b44fb6a05e42ec1751bfc2ddd45ff2f0bc0550517e16b10064adcf8c2ab2db175011543a2953fff1624cd575318e6fad943b
 SHA512 
f610660761d761a26b840a969008763ecb19bdc07ab4a076cec7fc40f7d00a68e863fb72b0ea3b56446621a99fa31384ab79789a2e6526fc5b12dcc20df3c684
 DIST elasticsearch_exporter-1.0.4_rc1.tar.gz 212553 BLAKE2B 
9f6f8f0117af4e59a483eda378df8a2ac5419a5319a02f69210250be952dc6cd401f0c20dbc3d416446d3af183750919f190112795652180d64ea3f6c62f5a56
 SHA512 
073fcce3417ae2147076b0fbbe3387494f9e2e8613284f03c6761d5e81d50aba648c6b47d423d79209d0b9221963951c21b2fa44aabe29c1eb0c36546dd140eb
+DIST elasticsearch_exporter-1.1.0.tar.gz 316279 BLAKE2B 
86e994ea0765a231b8ebaeaf495fa160ce53795e191e25cf82994214b53c62f03030b27040e95b770dc526ed2b772961b12ac73700b0da9f8994d532a0958789
 SHA512 
81cd7a44a2cd07bde7e716eac688c06ca93059de5ba7e1d3e009683b133f8c84c91a09a9e4775a558a3856389e165ce8ec2f04bd856b7b39b8f4a6072623b103
 DIST elasticsearch_exporter-1.1.0_rc1.tar.gz 314275 BLAKE2B 
1548cbecb6f5a0ae70ffb7a1ccceedbc5e9f980841b9ddb47f56c522a0f0fdc4f9c0613ec95c6a8705f1affd8d713e70d6cfaeacd84cd552a21466a490cac387
 SHA512 
ba571fec3cdbc32279008ddfc6b72b093fef4ba4ee0eaed98000cecadf81f61adcce24989f36c8dc6abde51129ed638473267e2636ec669ac30440338001930e

diff --git 
a/app-metrics/elasticsearch_exporter/elasticsearch_exporter-1.1.0.ebuild 
b/app-metrics/elasticsearch_exporter/elasticsearch_exporter-1.1.0.ebuild
new file mode 100644
index 000..cedeaf364c0
--- /dev/null
+++ b/app-metrics/elasticsearch_exporter/elasticsearch_exporter-1.1.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user golang-build golang-vcs-snapshot
+
+MY_PV=${PV/_/}
+
+EGO_PN="github.com/justwatchcom/elasticsearch_exporter"
+EXPORTER_COMMIT="fe20e49"
+ARCHIVE_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Elasticsearch stats exporter for Prometheus"
+HOMEPAGE="https://github.com/justwatchcom/elasticsearch_exporter;
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-util/promu"
+
+pkg_setup() {
+   enewgroup ${PN}
+   enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+   default
+   sed -i -e "/-s$/d" -e "s/{{.Revision}}/${EXPORTER_COMMIT}/" 
src/${EGO_PN}/.promu.yml || die
+}
+
+src_compile() {
+   pushd src/${EGO_PN} || die
+   mkdir -p bin || die
+   GOPATH="${S}" promu build -v --prefix bin || die
+   popd || die
+}
+
+src_install() {
+   pushd src/${EGO_PN} || die
+   dobin bin/elasticsearch_exporter
+   dodoc {README,CHANGELOG}.md
+   popd || die
+   keepdir /var/log/elasticsearch_exporter
+   fowners ${PN}:${PN} /var/log/elasticsearch_exporter
+   newinitd "${FILESDIR}"/${PN}.initd ${PN}
+   newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}



[gentoo-commits] repo/gentoo:master commit in: www-apps/grafana-bin/

2019-08-07 Thread Manuel Rüger
commit: 114a293b7b2ce474885515254c4d05e55aa9384b
Author: Manuel Rüger  gentoo  org>
AuthorDate: Wed Aug  7 16:12:24 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Wed Aug  7 16:15:32 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=114a293b

www-apps/grafana-bin: Version bump to 6.3.2

Package-Manager: Portage-2.3.71, Repoman-2.3.16
Signed-off-by: Manuel Rüger  gentoo.org>

 www-apps/grafana-bin/Manifest |  1 +
 www-apps/grafana-bin/grafana-bin-6.3.2.ebuild | 71 +++
 2 files changed, 72 insertions(+)

diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
index 4b68bc59a87..9f1b410b1da 100644
--- a/www-apps/grafana-bin/Manifest
+++ b/www-apps/grafana-bin/Manifest
@@ -6,3 +6,4 @@ DIST grafana-bin-6.2.2.tar.gz 58512782 BLAKE2B 
3c837f1477890995e93d15d86c744e115
 DIST grafana-bin-6.2.4.tar.gz 58513773 BLAKE2B 
1f8e82de6f57ba35f96eb71220634a024574abe30d7389d5f39fadf5c9938b9f7ccf21b48787b068cc187c244cd9707538c5958a3292b683f8cb855898abdb12
 SHA512 
bf3ecf454057fc902df5bafcc227c917b1a16fffde4bf6d5c47e2a6f815bfbe21b5956acdb46549db77e2a0497c268544c87a69df88ec0971ca6b188d6cac77c
 DIST grafana-bin-6.2.5.tar.gz 58512371 BLAKE2B 
6b56930c620e25948a6f1d662c7fb5632d3ca0a6476b605e9623d9b96e1c29e400bb3e17613e32aaf79bda5f6e7451867d0a14b7f9c1f4d47e8f92c13a226311
 SHA512 
b260616f0df47ce97084648d392a405b78ada4ff3aa8c8414da463ad865549e3118ab084cbba6edb7e427109dc19a5ab1ecc723d28a564e98d654df4dbb92b64
 DIST grafana-bin-6.3.0.tar.gz 58757508 BLAKE2B 
ab927f448a46b5433a8afa6ea63fdb3b11fac33de6b75bb0f342329cf9ac36a3ff31e652627175b386c757db85cfd42c64f470e0c3b1533d6fd953651051e473
 SHA512 
d6522b576e96a2fbb5243d2e8f6055113d6205e18b0db905c6cd49bc1dce7215889e313b794c5f2e79640983a171326d2b046ab479fee8fa6aa5f93df47d60fd
+DIST grafana-bin-6.3.2.tar.gz 58757623 BLAKE2B 
91fc5a6af7076d121673d76ca13e47884dd498cdc6c9a53dfdf068f4710a8f802a64a5f81dc0c311f696285cd50d0490b5baf123a9f43eb2e5ea2e2387113852
 SHA512 
d758b57755a30af3eee86e8c3e302c9288473c947edbedace7dabbfa125faeb9453aa3e37ae983cd6c6954edb97235a4d4df26ea5ff65cdc903c3ef6b8c62958

diff --git a/www-apps/grafana-bin/grafana-bin-6.3.2.ebuild 
b/www-apps/grafana-bin/grafana-bin-6.3.2.ebuild
new file mode 100644
index 000..ed520bacd97
--- /dev/null
+++ b/www-apps/grafana-bin/grafana-bin-6.3.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit user systemd
+
+MY_PN=${PN/-bin/}
+MY_PV=${PV/_beta/-beta}
+S=${WORKDIR}/${MY_PN}-${MY_PV}
+
+DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB 
& OpenTSDB"
+HOMEPAGE="https://grafana.org;
+SRC_URI="https://dl.grafana.com/oss/release/grafana-${PV}.linux-amd64.tar.gz 
-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+   media-libs/fontconfig"
+
+QA_EXECSTACK="usr/share/grafana/tools/phantomjs/phantomjs"
+QA_PREBUILT="usr/bin/grafana-* ${QA_EXECSTACK}"
+QA_PRESTRIPPED=${QA_PREBUILT}
+
+pkg_setup() {
+   enewgroup grafana
+   enewuser grafana -1 -1 /usr/share/grafana grafana
+}
+
+src_install() {
+   keepdir /etc/grafana
+   insinto /etc/grafana
+   newins "${S}"/conf/sample.ini grafana.ini
+   rm "${S}"/conf/sample.ini || die
+
+   # Frontend assets
+   insinto /usr/share/${MY_PN}
+   doins -r public conf
+
+   dobin bin/grafana-cli
+   dobin bin/grafana-server
+
+   exeinto /usr/share/grafana/tools/phantomjs
+   doexe tools/phantomjs/phantomjs
+
+   insinto /usr/share/grafana/tools/phantomjs
+   doins tools/phantomjs/render.js
+
+   newconfd "${FILESDIR}"/grafana.confd grafana
+   newinitd "${FILESDIR}"/grafana.initd.3 grafana
+   systemd_newunit "${FILESDIR}"/grafana.service grafana.service
+
+   keepdir /var/{lib,log}/grafana
+   keepdir /var/lib/grafana/{dashboards,plugins}
+   fowners grafana:grafana /var/{lib,log}/grafana
+   fowners grafana:grafana /var/lib/grafana/{dashboards,plugins}
+   fperms 0750 /var/{lib,log}/grafana
+   fperms 0750 /var/lib/grafana/{dashboards,plugins}
+}
+
+postinst() {
+   elog "${PN} has built-in log rotation. Please see [log.file] section of"
+   elog "/etc/grafana/grafana.ini for related settings."
+   elog
+   elog "You may add your own custom configuration for app-admin/logrotate 
if you"
+   elog "wish to use external rotation of logs. In this case, you also 
need to make"
+   elog "sure the built-in rotation is turned off."
+}



[gentoo-commits] repo/gentoo:master commit in: www-apps/grafana-bin/

2019-08-07 Thread Manuel Rüger
commit: c6ff9c07c7fd577e73b0c274641c7cad53d89dc6
Author: Manuel Rüger  gentoo  org>
AuthorDate: Wed Aug  7 16:12:59 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Wed Aug  7 16:15:37 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6ff9c07

www-apps/grafana-bin: Remove old

Package-Manager: Portage-2.3.71, Repoman-2.3.16
Signed-off-by: Manuel Rüger  gentoo.org>

 www-apps/grafana-bin/Manifest |  4 --
 www-apps/grafana-bin/grafana-bin-6.2.1.ebuild | 71 ---
 www-apps/grafana-bin/grafana-bin-6.2.2.ebuild | 71 ---
 www-apps/grafana-bin/grafana-bin-6.2.4.ebuild | 71 ---
 www-apps/grafana-bin/grafana-bin-6.3.0.ebuild | 71 ---
 5 files changed, 288 deletions(-)

diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
index 9f1b410b1da..99f179a34ab 100644
--- a/www-apps/grafana-bin/Manifest
+++ b/www-apps/grafana-bin/Manifest
@@ -1,9 +1,5 @@
 DIST grafana-bin-5.4.3.tar.gz 55228439 BLAKE2B 
63ee14b1ab074f453c8f1b870b8c0c51365106cb2af59fa20f56805f7add7fec29bc5ecd7e2ffc1f3f6811049e839893433e14b1871cb2aea359f58537b9e0dc
 SHA512 
781466c7477ecb4fbca59006600adc3569d0ee2158da3b75831b1934fd39456030471d4508fbf2d3296d3660dcc8b92782295d7afe458229bad1d64de88ad33b
 DIST grafana-bin-5.4.4.tar.gz 55227302 BLAKE2B 
f80fcf4447de6eb2f8a450650eb054da6a426e61142c2882cb5faef91b1d9779b77016b822d2f9082c81fe7b6ec14f23996132d880067bd956ac6260b171388e
 SHA512 
c95a3e9b40fdd8fff88c01a66efdda1fc64c258a768bdf65f738562b0c039020de1aa2500cbaa93dff4220715c57ce803ca0ff01344d63a9b8548e4d27dc1af1
 DIST grafana-bin-6.1.6.tar.gz 56569580 BLAKE2B 
b8122e5ec6104ba211d7d331fd99e3caaea6b4bc2cdeae3315ea84abc6634723d106fb19b27f68ad5f5f0ff84648f8ea84254a3b0c96519702349acfeb6bd753
 SHA512 
b8851df5a00b752777c168446326603c5e00ed66e7217551c75a976961c9de1f5a5bf0d262068866ecd0dae685a09ac8829db2bb5201c32e1ecaed6bafc149e4
-DIST grafana-bin-6.2.1.tar.gz 58508207 BLAKE2B 
5f543b105768f5151fe868b43927984a9dac4a0987192c2d7d6b2b1b0a1d636fbc4beb898d55a707f5d220785a7c56b0163f834e27293f67b55acaf7c54811a0
 SHA512 
9a35e953686f8ad0d75d3e2fdfb713fe6cac95ffc56ec4ee78bbbc6d753611675b5bf48e45652cc8a76af38e2358754a415a5b09f660e3a5508a2434b882ec91
-DIST grafana-bin-6.2.2.tar.gz 58512782 BLAKE2B 
3c837f1477890995e93d15d86c744e1158b6167b8cde7b101ee579befb0c8577a70fd0fb722999ef30e823f21d89ee525eb20d147327bbc4bbbffc774b67157f
 SHA512 
24a1f685a76b8bdf4876f498daf43ae316a8e6fc89dcc9d3aed67cfd360baff1cb48c1118753afcb845ddebbbebfa195d369036786e09b8ca00d78cb1f60e6f2
-DIST grafana-bin-6.2.4.tar.gz 58513773 BLAKE2B 
1f8e82de6f57ba35f96eb71220634a024574abe30d7389d5f39fadf5c9938b9f7ccf21b48787b068cc187c244cd9707538c5958a3292b683f8cb855898abdb12
 SHA512 
bf3ecf454057fc902df5bafcc227c917b1a16fffde4bf6d5c47e2a6f815bfbe21b5956acdb46549db77e2a0497c268544c87a69df88ec0971ca6b188d6cac77c
 DIST grafana-bin-6.2.5.tar.gz 58512371 BLAKE2B 
6b56930c620e25948a6f1d662c7fb5632d3ca0a6476b605e9623d9b96e1c29e400bb3e17613e32aaf79bda5f6e7451867d0a14b7f9c1f4d47e8f92c13a226311
 SHA512 
b260616f0df47ce97084648d392a405b78ada4ff3aa8c8414da463ad865549e3118ab084cbba6edb7e427109dc19a5ab1ecc723d28a564e98d654df4dbb92b64
-DIST grafana-bin-6.3.0.tar.gz 58757508 BLAKE2B 
ab927f448a46b5433a8afa6ea63fdb3b11fac33de6b75bb0f342329cf9ac36a3ff31e652627175b386c757db85cfd42c64f470e0c3b1533d6fd953651051e473
 SHA512 
d6522b576e96a2fbb5243d2e8f6055113d6205e18b0db905c6cd49bc1dce7215889e313b794c5f2e79640983a171326d2b046ab479fee8fa6aa5f93df47d60fd
 DIST grafana-bin-6.3.2.tar.gz 58757623 BLAKE2B 
91fc5a6af7076d121673d76ca13e47884dd498cdc6c9a53dfdf068f4710a8f802a64a5f81dc0c311f696285cd50d0490b5baf123a9f43eb2e5ea2e2387113852
 SHA512 
d758b57755a30af3eee86e8c3e302c9288473c947edbedace7dabbfa125faeb9453aa3e37ae983cd6c6954edb97235a4d4df26ea5ff65cdc903c3ef6b8c62958

diff --git a/www-apps/grafana-bin/grafana-bin-6.2.1.ebuild 
b/www-apps/grafana-bin/grafana-bin-6.2.1.ebuild
deleted file mode 100644
index ed520bacd97..000
--- a/www-apps/grafana-bin/grafana-bin-6.2.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit user systemd
-
-MY_PN=${PN/-bin/}
-MY_PV=${PV/_beta/-beta}
-S=${WORKDIR}/${MY_PN}-${MY_PV}
-
-DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB 
& OpenTSDB"
-HOMEPAGE="https://grafana.org;
-SRC_URI="https://dl.grafana.com/oss/release/grafana-${PV}.linux-amd64.tar.gz 
-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-   media-libs/fontconfig"
-
-QA_EXECSTACK="usr/share/grafana/tools/phantomjs/phantomjs"
-QA_PREBUILT="usr/bin/grafana-* ${QA_EXECSTACK}"
-QA_PRESTRIPPED=${QA_PREBUILT}
-
-pkg_setup() {
-   enewgroup grafana
-   enewuser grafana -1 -1 /usr/share/grafana grafana
-}
-
-src_install() {
-   keepdir /etc/grafana
-   insinto /etc/grafana

[gentoo-commits] repo/gentoo:master commit in: net-irc/quasselgrep/

2019-08-07 Thread Joonas Niilola
commit: 9db722cfda7669d6bb4114c2b8dcf3de3ff819fc
Author: Joonas Niilola  gentoo  org>
AuthorDate: Wed Aug  7 16:10:40 2019 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Aug  7 16:11:27 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9db722cf

net-irc/quasselgrep: remove redundant RDEPEND

Package-Manager: Portage-2.3.71, Repoman-2.3.16
Signed-off-by: Joonas Niilola  gentoo.org>

 net-irc/quasselgrep/quasselgrep-0_p20190211.ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/net-irc/quasselgrep/quasselgrep-0_p20190211.ebuild 
b/net-irc/quasselgrep/quasselgrep-0_p20190211.ebuild
index 83e67c38a6b..b4bd7c87639 100644
--- a/net-irc/quasselgrep/quasselgrep-0_p20190211.ebuild
+++ b/net-irc/quasselgrep/quasselgrep-0_p20190211.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 PYTHON_REQ_USE=( sqlite )
 
-inherit distutils-r1 eutils python-r1
+inherit distutils-r1 eutils
 
 DESCRIPTION="Tool for searching quassel logs from the commandline"
 HOMEPAGE="https://github.com/fish-face/quasselgrep;
@@ -25,8 +25,7 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 
-RDEPEND="dev-lang/python[${PYTHON_REQ_USE}]
-   dev-python/future[${PYTHON_USEDEP}]
+RDEPEND="dev-python/future[${PYTHON_USEDEP}]
dev-python/pycryptodome[${PYTHON_USEDEP}]
dev-python/python-dateutil[${PYTHON_USEDEP}]"
 



[gentoo-commits] repo/gentoo:master commit in: www-apps/grafana-bin/

2019-08-07 Thread Manuel Rüger
commit: e8e3ebace2556f055a78878c47e6e65fc9b608aa
Author: Manuel Rüger  gentoo  org>
AuthorDate: Wed Aug  7 16:10:58 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Wed Aug  7 16:10:58 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8e3ebac

www-apps/grafana-bin: Version bump to 6.3.0

Package-Manager: Portage-2.3.71, Repoman-2.3.16
Signed-off-by: Manuel Rüger  gentoo.org>

 www-apps/grafana-bin/Manifest |  1 +
 www-apps/grafana-bin/grafana-bin-6.3.0.ebuild | 71 +++
 2 files changed, 72 insertions(+)

diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
index 15ff601daf5..4b68bc59a87 100644
--- a/www-apps/grafana-bin/Manifest
+++ b/www-apps/grafana-bin/Manifest
@@ -5,3 +5,4 @@ DIST grafana-bin-6.2.1.tar.gz 58508207 BLAKE2B 
5f543b105768f5151fe868b43927984a9
 DIST grafana-bin-6.2.2.tar.gz 58512782 BLAKE2B 
3c837f1477890995e93d15d86c744e1158b6167b8cde7b101ee579befb0c8577a70fd0fb722999ef30e823f21d89ee525eb20d147327bbc4bbbffc774b67157f
 SHA512 
24a1f685a76b8bdf4876f498daf43ae316a8e6fc89dcc9d3aed67cfd360baff1cb48c1118753afcb845ddebbbebfa195d369036786e09b8ca00d78cb1f60e6f2
 DIST grafana-bin-6.2.4.tar.gz 58513773 BLAKE2B 
1f8e82de6f57ba35f96eb71220634a024574abe30d7389d5f39fadf5c9938b9f7ccf21b48787b068cc187c244cd9707538c5958a3292b683f8cb855898abdb12
 SHA512 
bf3ecf454057fc902df5bafcc227c917b1a16fffde4bf6d5c47e2a6f815bfbe21b5956acdb46549db77e2a0497c268544c87a69df88ec0971ca6b188d6cac77c
 DIST grafana-bin-6.2.5.tar.gz 58512371 BLAKE2B 
6b56930c620e25948a6f1d662c7fb5632d3ca0a6476b605e9623d9b96e1c29e400bb3e17613e32aaf79bda5f6e7451867d0a14b7f9c1f4d47e8f92c13a226311
 SHA512 
b260616f0df47ce97084648d392a405b78ada4ff3aa8c8414da463ad865549e3118ab084cbba6edb7e427109dc19a5ab1ecc723d28a564e98d654df4dbb92b64
+DIST grafana-bin-6.3.0.tar.gz 58757508 BLAKE2B 
ab927f448a46b5433a8afa6ea63fdb3b11fac33de6b75bb0f342329cf9ac36a3ff31e652627175b386c757db85cfd42c64f470e0c3b1533d6fd953651051e473
 SHA512 
d6522b576e96a2fbb5243d2e8f6055113d6205e18b0db905c6cd49bc1dce7215889e313b794c5f2e79640983a171326d2b046ab479fee8fa6aa5f93df47d60fd

diff --git a/www-apps/grafana-bin/grafana-bin-6.3.0.ebuild 
b/www-apps/grafana-bin/grafana-bin-6.3.0.ebuild
new file mode 100644
index 000..ed520bacd97
--- /dev/null
+++ b/www-apps/grafana-bin/grafana-bin-6.3.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit user systemd
+
+MY_PN=${PN/-bin/}
+MY_PV=${PV/_beta/-beta}
+S=${WORKDIR}/${MY_PN}-${MY_PV}
+
+DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB 
& OpenTSDB"
+HOMEPAGE="https://grafana.org;
+SRC_URI="https://dl.grafana.com/oss/release/grafana-${PV}.linux-amd64.tar.gz 
-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+   media-libs/fontconfig"
+
+QA_EXECSTACK="usr/share/grafana/tools/phantomjs/phantomjs"
+QA_PREBUILT="usr/bin/grafana-* ${QA_EXECSTACK}"
+QA_PRESTRIPPED=${QA_PREBUILT}
+
+pkg_setup() {
+   enewgroup grafana
+   enewuser grafana -1 -1 /usr/share/grafana grafana
+}
+
+src_install() {
+   keepdir /etc/grafana
+   insinto /etc/grafana
+   newins "${S}"/conf/sample.ini grafana.ini
+   rm "${S}"/conf/sample.ini || die
+
+   # Frontend assets
+   insinto /usr/share/${MY_PN}
+   doins -r public conf
+
+   dobin bin/grafana-cli
+   dobin bin/grafana-server
+
+   exeinto /usr/share/grafana/tools/phantomjs
+   doexe tools/phantomjs/phantomjs
+
+   insinto /usr/share/grafana/tools/phantomjs
+   doins tools/phantomjs/render.js
+
+   newconfd "${FILESDIR}"/grafana.confd grafana
+   newinitd "${FILESDIR}"/grafana.initd.3 grafana
+   systemd_newunit "${FILESDIR}"/grafana.service grafana.service
+
+   keepdir /var/{lib,log}/grafana
+   keepdir /var/lib/grafana/{dashboards,plugins}
+   fowners grafana:grafana /var/{lib,log}/grafana
+   fowners grafana:grafana /var/lib/grafana/{dashboards,plugins}
+   fperms 0750 /var/{lib,log}/grafana
+   fperms 0750 /var/lib/grafana/{dashboards,plugins}
+}
+
+postinst() {
+   elog "${PN} has built-in log rotation. Please see [log.file] section of"
+   elog "/etc/grafana/grafana.ini for related settings."
+   elog
+   elog "You may add your own custom configuration for app-admin/logrotate 
if you"
+   elog "wish to use external rotation of logs. In this case, you also 
need to make"
+   elog "sure the built-in rotation is turned off."
+}



[gentoo-commits] repo/gentoo:master commit in: net-irc/quasselgrep/

2019-08-07 Thread Joonas Niilola
commit: ed40d3c4d27621fdca2bec1b36fd86f476b764cb
Author: Scott Martin  organizedmagnetism  com>
AuthorDate: Wed Aug  7 16:02:49 2019 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Aug  7 16:06:02 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed40d3c4

net-irc/quasselgrep: bump to 0_p20190211

Signed-off-by: Scott Martin  organizedmagnetism.com>
Closes: https://bugs.gentoo.org/659634
Signed-off-by: Joonas Niilola  gentoo.org>

 net-irc/quasselgrep/Manifest   |  1 +
 net-irc/quasselgrep/quasselgrep-0_p20190211.ebuild | 35 ++
 2 files changed, 36 insertions(+)

diff --git a/net-irc/quasselgrep/Manifest b/net-irc/quasselgrep/Manifest
index 2585c141ad4..2eef5a4a24b 100644
--- a/net-irc/quasselgrep/Manifest
+++ b/net-irc/quasselgrep/Manifest
@@ -1 +1,2 @@
 DIST quasselgrep-0_p20170411.tar.gz 29117 BLAKE2B 
e55ef14015d1139dd967d1855a2994d47f189cb02b0b89dc1130a8d0756b137ddd58366c3cb87927cb6400b715efafe042ec929978a71d527ad640129d50cb71
 SHA512 
b216c49e340cddfeb4fe28046c698a5517a873602a4303c7c6976d6d7f0bfffbb78f170a33126a16089e239a67e1624410f8e727b5ed6ab977f78745362db0e2
+DIST quasselgrep-0_p20190211.tar.gz 29954 BLAKE2B 
33862b642d6a24bd7ab8cc4f3628e19cf332feb24e0dba17849f4ee85af4d1d17a641e6ccaef89bcb44c47f28a674ab620610b8b624f9de71b8460b197953e27
 SHA512 
0d2bfccb87b7463ba032b9515c4a089518a3ca57f9ef6cbb0f00db9c5d0404cc9fe128329b12e1dbe022cbddeb6a3db473564ee734ddc30be56d4c1da5036f56

diff --git a/net-irc/quasselgrep/quasselgrep-0_p20190211.ebuild 
b/net-irc/quasselgrep/quasselgrep-0_p20190211.ebuild
new file mode 100644
index 000..83e67c38a6b
--- /dev/null
+++ b/net-irc/quasselgrep/quasselgrep-0_p20190211.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_REQ_USE=( sqlite )
+
+inherit distutils-r1 eutils python-r1
+
+DESCRIPTION="Tool for searching quassel logs from the commandline"
+HOMEPAGE="https://github.com/fish-face/quasselgrep;
+
+if [[ "${PV}" == "" ]] ; then
+   EGIT_REPO_URI="https://github.com/65278/quasselgrep.git;
+   inherit git-r3
+   KEYWORDS=""
+else
+   MY_COMMIT=9b6b0bc1252daa6e574363d87d04eebd981215a5
+   SRC_URI="https://github.com/fish-face/${PN}/tarball/${MY_COMMIT} -> 
${P}.tar.gz"
+   S="${WORKDIR}/fish-face-${PN}-${MY_COMMIT:0:7}"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND="dev-lang/python[${PYTHON_REQ_USE}]
+   dev-python/future[${PYTHON_USEDEP}]
+   dev-python/pycryptodome[${PYTHON_USEDEP}]
+   dev-python/python-dateutil[${PYTHON_USEDEP}]"
+
+pkg_postinst() {
+   optfeature "access postgres db" dev-python/psycopg:2
+}



[gentoo-commits] proj/genkernel: New tag: v4.0.0_beta11

2019-08-07 Thread Thomas Deutschmann
commit: 
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Aug  7 15:47:33 2019 +

New tag: v4.0.0_beta11




[gentoo-commits] proj/genkernel:master commit in: defaults/

2019-08-07 Thread Thomas Deutschmann
commit: bc7df5ee2b27d04889cacba49bb3339a58ce9de3
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Aug  6 18:21:45 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Aug  7 15:03:44 2019 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=bc7df5ee

Rework resume-boot.sh

- We no longer use $GK_SHELL_LOCKFILE which was removed in
  in previous commit ("initrd.scripts: run_shell(): Use LOCK file").

- We now try to kill all $SH processes allowing to use resume-boot
  in remote and local rescue shell.

Signed-off-by: Thomas Deutschmann  gentoo.org>

 defaults/resume-boot.sh | 25 +++--
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/defaults/resume-boot.sh b/defaults/resume-boot.sh
index cb29831..f4dd4b2 100644
--- a/defaults/resume-boot.sh
+++ b/defaults/resume-boot.sh
@@ -1,15 +1,28 @@
 #!/bin/sh
 
 . /etc/initrd.defaults
+. /etc/initrd.scripts
 
-if [ -s "${GK_SHELL_LOCKFILE}" ]
+GK_INIT_LOG_PREFIX=${0}
+if [ -n "${SSH_CLIENT_IP}" ] && [ -n "${SSH_CLIENT_PORT}" ]
 then
-   kill -9 "$(cat "${GK_SHELL_LOCKFILE}")"
+   GK_INIT_LOG_PREFIX="${0}[${SSH_CLIENT_IP}:${SSH_CLIENT_PORT}]"
 fi
 
-if [ -f "${GK_SSHD_LOCKFILE}" ]
-then
-   rm "${GK_SSHD_LOCKFILE}"
-fi
+# We don't want to kill init script (PID 1),
+# ourselves and parent process yet...
+pids_to_keep="1 ${$} ${PPID}"
+
+for pid in $(pgrep sh)
+do
+   if ! echo " ${pids_to_keep} " | grep -q " ${pid} "
+   then
+   kill -9 ${pid}
+   fi
+done
+
+good_msg "Resuming boot process ..."
+[ -f "${GK_SSHD_LOCKFILE}" ] && run rm "${GK_SSHD_LOCKFILE}"
+[ "${PPID}" != '1' ] && kill -9 ${PPID}
 
 exit 0



[gentoo-commits] proj/genkernel:master commit in: doc/

2019-08-07 Thread Thomas Deutschmann
commit: 3c86ab829d04a3c7637f63091f3416b5015acd6d
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Aug  6 21:52:11 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Aug  7 15:03:45 2019 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=3c86ab82

manpage: Add documentation about initramfs.mounts file

Bug: https://bugs.gentoo.org/560710
Signed-off-by: Thomas Deutschmann  gentoo.org>

 doc/genkernel.8.txt | 14 ++
 1 file changed, 14 insertions(+)

diff --git a/doc/genkernel.8.txt b/doc/genkernel.8.txt
index 3ebd320..82da1e1 100644
--- a/doc/genkernel.8.txt
+++ b/doc/genkernel.8.txt
@@ -877,6 +877,18 @@ make sure that this mountpoint is accessible, see 
*initramfs.mounts*.
 Loop-mount an ISO file from the boot device to get the filesystem image.
 Useful with chain-loading environments and USB keys.
 
+initramfs.mounts
+
+By default, genkernel's initramfs will only mount *root* device. But
+sometimes additional mounts are required before initramfs can switch to
+real root (for example on systems with a seperate '/usr' mount).
+
+Therefore genkernel package contains '/etc/initramfs.mounts' file which
+will allow you to specify additional mounts which should be mounted before
+initramfs will switch to real root.
+
+NOTE: This file will not be included in initramfs. Instead, booted initramfs
+will check for this file on specified *root* device.
 
 NETBOOTING
 --
@@ -930,6 +942,8 @@ AUTHORS
 
 SEE ALSO
 
+'/etc/initramfs.mounts' - additional required mounts before switching to real 
root
+
 '/etc/genkernel.conf' - genkernel configuration file
 
 // vim: ft=asciidoc et tw=72 sts=4 ts=4 :



[gentoo-commits] proj/genkernel:master commit in: defaults/

2019-08-07 Thread Thomas Deutschmann
commit: 91d64dbf8aa34a27653baebba77a10979a4a2f30
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Aug  6 20:09:05 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Aug  7 15:03:44 2019 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=91d64dbf

initrd.scripts: wait_sshd(): Make use of good_msg_n()

Signed-off-by: Thomas Deutschmann  gentoo.org>

 defaults/initrd.scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index febdadf..1d2fa20 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -2198,7 +2198,7 @@ wait_sshd() {
return
fi
 
-   printf "%b" "${GOOD}>>${NORMAL}${BOLD} gk.sshd.wait set; Waiting 
${GK_SSHD_WAIT} seconds for SSH connection ${NORMAL}..."
+   good_msg_n "gk.sshd.wait set; Waiting ${GK_SSHD_WAIT} seconds for SSH 
connection ..."
 
local last_cmd="run last -W 2>/dev/null | head -n 3"
is_log_enabled && last_cmd="${last_cmd} | tee -a '${GK_INIT_LOG}'"



[gentoo-commits] proj/genkernel:master commit in: /

2019-08-07 Thread Thomas Deutschmann
commit: 70de004ed8550d2c1f9b81140659fee005c2b33f
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Aug  7 15:38:10 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Aug  7 15:45:19 2019 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=70de004e

gen_cmdline.sh: parse_cmdline(): We no longer require /sbin/mdadm to be present 
on host system

In addition, this will remove an invalid call to print_warning.

Bug: https://bugs.gentoo.org/691686
Signed-off-by: Thomas Deutschmann  gentoo.org>

 gen_cmdline.sh | 8 ++--
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index dcf479b..7e74182 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -366,15 +366,11 @@ parse_cmdline() {
;;
--mdadm|--no-mdadm)
CMD_MDADM=$(parse_optbool "$*")
-   print_info 3 "CMD_MDADM: $CMD_MDADM"
-   if isTrue "${CMD_MDADM}" && [ ! -e /sbin/mdadm ]
-   then
-   print_warning 'Warning: --mdadm generally 
requires sys-fs/mdadm present on the host system'
-   fi
+   print_info 3 "CMD_MDADM: ${CMD_MDADM}"
;;
--mdadm-config=*)
CMD_MDADM_CONFIG="${*#*=}"
-   print_info 3 "CMD_MDADM_CONFIG: $CMD_MDADM_CONFIG"
+   print_info 3 "CMD_MDADM_CONFIG: ${CMD_MDADM_CONFIG}"
;;
--busybox|--no-busybox)
CMD_BUSYBOX=$(parse_optbool "$*")



[gentoo-commits] proj/genkernel:master commit in: defaults/

2019-08-07 Thread Thomas Deutschmann
commit: e0cf0e07688cd3991f6af20f2f27c0d278ebf069
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Aug  6 20:08:07 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Aug  7 15:03:44 2019 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=e0cf0e07

initrd.scripts: kill_network(): Make use of good_msg_n()

Signed-off-by: Thomas Deutschmann  gentoo.org>

 defaults/initrd.scripts | 16 ++--
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 88046b4..febdadf 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -2047,8 +2047,7 @@ kill_network() {
# interface.
if ipv6_tentative
then
-   [ -z "${QUIET}" ] && \
-   printf "%b" "${WARN}**${NORMAL}${BOLD} Waiting for tentative 
IPv6 addresses to complete DAD ${NORMAL}..."
+   [ -z "${QUIET}" ] && good_msg_n "Waiting for tentative IPv6 
addresses to complete DAD ..."
 
local dad_timeout=10
while [ ${dad_timeout} -gt 0 ]
@@ -2056,11 +2055,10 @@ kill_network() {
ipv6_tentative || break
sleep 1
: $(( dad_timeout -= 1 ))
-   [ -z "${QUIET}" ] && \
-   printf "."
+   [ -z "${QUIET}" ] && printf "."
done
 
-   echo ""
+   [ -z "${QUIET}" ] && echo ''
 
if [ ${dad_timeout} -le 0 ]
then
@@ -2068,8 +2066,7 @@ kill_network() {
fi
fi
 
-   [ -z "${QUIET}" ] && \
-   printf "%b" "${GOOD}>>${NORMAL}${BOLD} Bringing down interface 
${GK_NET_IFACE} ${NORMAL}..."
+   [ -z "${QUIET}" ] && good_msg_n "Bringing down interface 
${GK_NET_IFACE} ..."
 
local deconfiguration_timeout=${GK_NET_TIMEOUT_DECONFIGURATION}
while [ ${deconfiguration_timeout} -gt 0 ]
@@ -2083,11 +2080,10 @@ kill_network() {
fi
sleep 1
: $(( deconfiguration_timeout -= 1 ))
-   [ -z "${QUIET}" ] && \
-   printf "."
+   [ -z "${QUIET}" ] && printf "."
done
 
-   echo ""
+   [ -z "${QUIET}" ] && echo ''
 
if [ ${deconfiguration_timeout} -le 0 ]
then



[gentoo-commits] proj/genkernel:master commit in: defaults/

2019-08-07 Thread Thomas Deutschmann
commit: 6a9db059ae26b4d38f12fc76ce33e41ca1d1e4bf
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Aug  4 16:10:57 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Aug  6 20:40:25 2019 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=6a9db059

linuxrc: Make shell startup output more beautiful and useful

- Hide busybox version

- Show genkernel version

- Show running kernel version

- Use emphasis (bold format) in text

Signed-off-by: Thomas Deutschmann  gentoo.org>

 defaults/busy-config |  2 +-
 defaults/initrd.scripts  |  5 +
 defaults/login-remote.sh | 22 --
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/defaults/busy-config b/defaults/busy-config
index 7830c83..39c3010 100644
--- a/defaults/busy-config
+++ b/defaults/busy-config
@@ -1136,7 +1136,7 @@ CONFIG_CTTYHACK=y
 #
 CONFIG_FEATURE_SH_MATH=y
 CONFIG_FEATURE_SH_MATH_64=y
-# CONFIG_FEATURE_SH_EXTRA_QUIET is not set
+CONFIG_FEATURE_SH_EXTRA_QUIET=y
 # CONFIG_FEATURE_SH_STANDALONE is not set
 # CONFIG_FEATURE_SH_NOFORK is not set
 CONFIG_FEATURE_SH_HISTFILESIZE=y

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 4c8955d..f27c02f 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -809,6 +809,11 @@ run_shell() {
 
export PS1='rescueshell \w \# '
 
+   echo
+   GOOD=${BLUE} good_msg "${NORMAL}Welcome to ${BOLD}${gk_ver}${NORMAL} 
(${gk_build_date}) ${BOLD}rescue shell${NORMAL}!"
+   GOOD=${BLUE} good_msg "${NORMAL}...running Linux kernel 
${BOLD}${kernel_ver}${NORMAL}"
+   echo
+
if [ -n "${CONSOLE}" ] && [ -c "/dev/${CONSOLE}" ]
then
setsid ${SH} -c "exec sh --login /dev/${CONSOLE} 2>&1"

diff --git a/defaults/login-remote.sh b/defaults/login-remote.sh
index 7f711da..f8c4d08 100644
--- a/defaults/login-remote.sh
+++ b/defaults/login-remote.sh
@@ -66,23 +66,33 @@ then
exit 1
esac
 else
+   gk_ver="$(cat /etc/build_id)"
+   gk_build_date="$(cat /etc/build_date)"
+   kernel_ver="$(uname -r)"
+
export PS1='remote rescueshell \w \# '
touch "${GK_SSHD_LOCKFILE}"
-   good_msg "The lockfile '${GK_SSHD_LOCKFILE}' was created."
-   good_msg "In order to resume boot process, run 'resume-boot'."
-   good_msg "Be aware that it will kill your connection which means"
-   good_msg "you will no longer be able work in this shell."
+
+   GOOD=${BLUE} good_msg "${NORMAL}Welcome to ${BOLD}${gk_ver}${NORMAL} 
(${gk_build_date}) ${BOLD}remote rescue shell${NORMAL}!"
+   GOOD=${BLUE} good_msg "${NORMAL}...running Linux kernel 
${BOLD}${kernel_ver}${NORMAL}"
+   echo
+   good_msg "${NORMAL}The lockfile '${BOLD}${GK_SSHD_LOCKFILE}${NORMAL}' 
was created."
+   good_msg "${NORMAL}In order to resume boot process, run 
'${BOLD}resume-boot${NORMAL}'."
+   good_msg "${NORMAL}Be aware that it will kill your connection which 
means"
+   good_msg "${NORMAL}you will no longer be able to work in this shell."
 
if [ -n "${CRYPT_ROOT}" -a ! -f "${CRYPT_ROOT_OPENED_LOCKFILE}" ]
then
-   good_msg "To remote unlock LUKS-encrypted root device, run 
'unlock-luks root'."
+   good_msg "${NORMAL}To remote unlock LUKS-encrypted root device, 
run '${BOLD}unlock-luks root${NORMAL}'."
fi
 
if [ -n "${CRYPT_SWAP}" -a ! -f "${CRYPT_ROOT_OPENED_LOCKFILE}" ]
then
-   good_msg "To remote unlock LUKS-encrypted swap device, run 
'unlock-luks swap'."
+   good_msg "${NORMAL}To remote unlock LUKS-encrypted swap device, 
run '${BOLD}unlock-luks swap${NORMAL}'."
fi
 
+   echo
+
[ -x /bin/sh ] && SH=/bin/sh || SH=/bin/ash
exec ${SH} --login
 fi



[gentoo-commits] proj/genkernel:master commit in: /

2019-08-07 Thread Thomas Deutschmann
commit: 86dcf9aa5faa2ecd11c8303d6e551db858afe7c5
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Aug  7 15:39:40 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Aug  7 15:45:44 2019 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=86dcf9aa

gen_determineargs.sh: determine_real_args(): Move GK_TIME_START initialization 
to genkernel

We maybe trigger a failure before determine_real_args() was called
and therefore need this value very early.

Signed-off-by: Thomas Deutschmann  gentoo.org>

 gen_determineargs.sh | 1 -
 genkernel| 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index d2fbd86..d3669b8 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -375,7 +375,6 @@ determine_real_args() {
small_die "Cannot write to '${LOGFILE}'!"
fi
 
-   GK_TIME_START=$(date +%s)
echo ">>> Started genkernel v${GK_V} on: $(date +"%Y-%m-%d %H:%M:%S")" 
> "${LOGFILE}" 2>/dev/null || small_die "Could not write to '${LOGFILE}'!"
 
dump_debugcache

diff --git a/genkernel b/genkernel
index 6db8133..ff79e44 100755
--- a/genkernel
+++ b/genkernel
@@ -4,6 +4,8 @@
 PATH="${PATH}:/sbin:/usr/sbin"
 GK_V='4.0.0_beta11'
 
+GK_TIME_START=$(date +%s)
+
 TODEBUGCACHE=yes # Until an error occurs or LOGFILE is fully qualified.
 
 small_die() {



[gentoo-commits] proj/genkernel:master commit in: defaults/

2019-08-07 Thread Thomas Deutschmann
commit: 4dae613a3907917393f52e016b0377f5d1e1b926
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Aug  6 15:25:10 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Aug  6 20:40:32 2019 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=4dae613a

unlock-lucks.sh: Kill running cryptsetup prompt with SIGINT

When using SIGTERM, running terminal would require a "reset"
because cryptsetup cannot restore fds.

Using SIGINT will end cryptsetup prompt gracefully allowing
cryptsetup to restore fds and keep terminal working.

Signed-off-by: Thomas Deutschmann  gentoo.org>

 defaults/unlock-luks.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/defaults/unlock-luks.sh b/defaults/unlock-luks.sh
index e8f28f6..16e654c 100644
--- a/defaults/unlock-luks.sh
+++ b/defaults/unlock-luks.sh
@@ -116,8 +116,9 @@ main() {
 
if [ "${crypt_filter_ret}" = '0' ]
then
-   # Kill any running cryptsetup prompt for this device
-   pkill -9 -f "luksOpen.*${LUKS_NAME}\$" >/dev/null 2>&1
+   # Kill any running cryptsetup prompt for this device.
+   # But SIGINT only to keep shell functional.
+   pkill -2 -f "luksOpen.*${LUKS_NAME}\$" >/dev/null 2>&1
fi
 }
 



[gentoo-commits] proj/genkernel:master commit in: defaults/, patches/busybox/1.31.0/

2019-08-07 Thread Thomas Deutschmann
commit: 834b72e8151ee6e17a8de8fc37c07bd70990144c
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Aug  6 18:01:13 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Aug  7 15:03:44 2019 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=834b72e8

busybox: Use raidautorun instead of mdstart

raidautorun applet is upstream's replacement for mdstart.

Signed-off-by: Thomas Deutschmann  gentoo.org>

 defaults/busy-config   |  2 -
 defaults/initrd.scripts|  2 +-
 .../busybox/1.31.0/busybox-1.26.0-mdstart.patch| 80 --
 3 files changed, 1 insertion(+), 83 deletions(-)

diff --git a/defaults/busy-config b/defaults/busy-config
index 39c3010..0a2456a 100644
--- a/defaults/busy-config
+++ b/defaults/busy-config
@@ -1,5 +1,3 @@
-# Gentoo patch:
-CONFIG_MDSTART=y
 # Options to match older versions of busybox:
 CONFIG_ASH_BUILTIN_ECHO=y
 CONFIG_ASH_BUILTIN_PRINTF=y

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index f95f434..68adfb9 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -2332,7 +2332,7 @@ setup_md_device() {
run mknod /dev/md${MD_NUMBER} b 9 ${MD_NUMBER} 
>/dev/null 2>&1
[ $? -ne 0 ] && bad_msg "Creation of 
/dev/md${MD_NUMBER} failed ..."
fi
-   run mdstart ${MDPART} /dev/md${MD_NUMBER}
+   run raidautorun /dev/md${MD_NUMBER}
fi
 }
 

diff --git a/patches/busybox/1.31.0/busybox-1.26.0-mdstart.patch 
b/patches/busybox/1.31.0/busybox-1.26.0-mdstart.patch
deleted file mode 100644
index 35057b6..000
--- a/patches/busybox/1.31.0/busybox-1.26.0-mdstart.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff --git a/util-linux/mdStart.c b/util-linux/mdStart.c
 util-linux/mdStart.c   1969-12-31 18:00:00.0 -0600
-+++ util-linux/mdStart.c   2017-01-01 18:25:14.582737879 -0600
-@@ -0,0 +1,76 @@
-+/*
-+ * Linux 2.6(+) RAID Autostarter
-+ *
-+ * Copyright (C) 2005 by Tim Yamin  
-+ * Copyright (C) 2012 by Sebastian Pipping 
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ *
-+ */
-+//config:config MDSTART
-+//config: bool "mdstart"
-+//config: default n
-+//config: help
-+//config:   Allows you to autostart /dev/md devices if using an initramfs 
to
-+//config:   boot.
-+
-+//applet:IF_MDSTART(APPLET(mdstart, BB_DIR_SBIN, BB_SUID_DROP))
-+
-+//kbuild:lib-$(CONFIG_MDSTART) += mdStart.o
-+
-+//usage:#define mdstart_trivial_usage
-+//usage:  "[PARTITION] MD-NODE [[PARTITION] MD-NODE ...]"
-+//usage:
-+//usage:#define mdstart_full_usage "\n\n"
-+//usage:  "Run the RAID_AUTORUN ioctl on the given MD number"
-+
-+#include 
-+#include 
-+#include 
-+#include 
-+#include 
-+#include 
-+
-+extern int
-+mdstart_main(int argc, char *argv[])
-+{
-+  int i, fd, part = 0, retval = 0;
-+
-+  if(argc < 2)
-+  {
-+  bb_show_usage();
-+  }
-+
-+  for(i = 1; i < argc; i++)
-+  {
-+  if(sscanf(argv[i], "%d", ) == 1)
-+  continue;
-+
-+  fd = open(argv[i], 0, 0);
-+  if (fd >= 0)
-+  {
-+  ioctl(fd, RAID_AUTORUN, part);
-+  close(fd);
-+  } else
-+  {
-+  printf("Error: Failed to open %s!\n", argv[i]);
-+  retval=1;
-+  }
-+
-+  part = 0;
-+  }
-+
-+  return retval;
-+}



[gentoo-commits] proj/genkernel:master commit in: defaults/, doc/

2019-08-07 Thread Thomas Deutschmann
commit: 1d79338fa7391f8bc41bb74411c9a955e24d81cd
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Aug  6 18:04:20 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Aug  7 15:03:44 2019 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=1d79338f

initrd.scripts: prompt_user(): Read answer from $GK_PROMPT_FILE on timeout

This commit will bring back read timeout which was removed in
Commit a280829. Read timeout is still disabled by default but
can now be controlled via gk.prompt.timeout kernel command-line
argument.

When gk.prompt.timeout is != 0, the current prompt will be written
to $GK_PROMPT_FILE. This will allow remote user to notice that
there's a prompt.

In addition, on timeout, $GK_PROMPT_FILE will be read allowing
remote user to answer prompt and hopefully to fix the problem
and resume booting.

To make this work, gk.prompt.timeout will be set to 30 seconds
by default when SSH usage is enabled.

Signed-off-by: Thomas Deutschmann  gentoo.org>

 defaults/initrd.defaults |  2 ++
 defaults/initrd.scripts  | 36 ++--
 defaults/linuxrc | 10 ++
 doc/genkernel.8.txt  |  9 +
 4 files changed, 51 insertions(+), 6 deletions(-)

diff --git a/defaults/initrd.defaults b/defaults/initrd.defaults
index 553600d..06057d7 100644
--- a/defaults/initrd.defaults
+++ b/defaults/initrd.defaults
@@ -85,6 +85,8 @@ GK_NET_TIMEOUT_DAD=10
 GK_NET_TIMEOUT_DECONFIGURATION=10
 GK_NET_TIMEOUT_DHCP=10
 GK_NET_TIMEOUT_INTERFACE=10
+GK_PROMPT_FILE='/tmp/current_prompt'
+GK_PROMPT_TIMEOUT=0
 GK_SHELL_LOCKFILE='/tmp/rescueshell.lock'
 GK_SSHD_LOCKFILE='/tmp/remote-rescueshell.lock'
 GK_SSHD_PIDFILE='/var/run/dropbear.pid'

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 68adfb9..88046b4 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1108,12 +1108,30 @@ prompt_user() {
bad_msg '- type "shell" for a shell'
bad_msg '- type "q" to skip ...'
printf "%s" "${2}(${oldvalue}) :: "
-   read ${1}
-   #if [ $? -gt 0 ]
-   #then
-   #   # prompt timed out
-   #   printf "\n"
-   #fi
+
+   if [ "${GK_PROMPT_TIMEOUT}" = '0' ]
+   then
+   read ${1}
+   else
+   local read_timeout_timestamp
+   let read_timeout_timestamp=$(date +%s)+${GK_PROMPT_TIMEOUT}
+
+   echo "# Could not find the ${2} in ${oldvalue}${explnt}" > 
"${GK_PROMPT_FILE}"
+   echo "# Please specify another value (file will be processed at 
$(date -d @${read_timeout_timestamp}):" >> "${GK_PROMPT_FILE}"
+   echo "${1}=${oldvalue}" >> "${GK_PROMPT_FILE}"
+   read -t ${GK_PROMPT_TIMEOUT} ${1}
+   if [ $? -gt 0 ]
+   then
+   # prompt timed out
+   printf "\n"
+
+   if [ -f "${GK_PROMPT_FILE}" ]
+   then
+   warn_msg "Timeout! Trying to read answer from 
'${GK_PROMPT_FILE}' ..."
+   . "${GK_PROMPT_FILE}" && run rm 
"${GK_PROMPT_FILE}"
+   fi
+   fi
+   fi
 
case $(eval echo '$'${1}) in
'q')
@@ -2145,6 +2163,12 @@ start_sshd() {
return
fi
 
+   if [ "${GK_PROMPT_TIMEOUT}" = '0' ]
+   then
+   warn_msg "Changing gk.prompt.timeout=0 to 30 ..."
+   GK_PROMPT_TIMEOUT=30
+   fi
+
if [ ! -x "/usr/sbin/dropbear" ]
then
bad_msg "/usr/sbin/dropbear not found! Did you call genkernel 
with --ssh parameter?"

diff --git a/defaults/linuxrc b/defaults/linuxrc
index b2ac54e..a57de1c 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -336,6 +336,16 @@ do
fi
unset tmp_wait
;;
+   gk.prompt.timeout=*)
+   tmp_timeout=${x#*=}
+   if is_int "${tmp_timeout}"
+   then
+   GK_PROMPT_TIMEOUT=${tmp_timeout}
+   else
+   warn_msg "'${x}' does not look like a valid 
time (second) value -- ignored!"
+   fi
+   unset tmp_timeout
+   ;;
real_rootflags=*)
REAL_ROOTFLAGS=${x#*=}
;;

diff --git a/doc/genkernel.8.txt b/doc/genkernel.8.txt
index 3ab28ce..3ebd320 100644
--- a/doc/genkernel.8.txt
+++ b/doc/genkernel.8.txt
@@ -687,6 +687,15 @@ recognized by the kernel itself.
 *gk.net.timeout.interface*=<...>::
 By default we will wait up to 10 seconds for interface to show up.
 
+*gk.prompt.timeout*=<...>::
+By default a prompt within genkernel initramfs like shown when set
+*root* could not be found will never timeout. Use this option to set
+a timeout.
+
+NOTE: When *dosshd* is used, 

[gentoo-commits] proj/genkernel:master commit in: defaults/

2019-08-07 Thread Thomas Deutschmann
commit: a1f719112f02feb8e7c854a5095c7cebb6d0bf4a
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Aug  6 17:17:20 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Aug  6 20:40:32 2019 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=a1f71911

login-remote.sh: Make shellcheck happy

Signed-off-by: Thomas Deutschmann  gentoo.org>

 defaults/login-remote.sh | 28 ++--
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/defaults/login-remote.sh b/defaults/login-remote.sh
index ca85b06..12596b9 100644
--- a/defaults/login-remote.sh
+++ b/defaults/login-remote.sh
@@ -15,31 +15,31 @@ receivefile() {
swap)
file=${CRYPT_KEYFILE_SWAP}
;;
+   '')
+   bad_msg "No keyfile specified." "${CRYPT_SILENT}"
+   exit 1
+   ;;
*)
-   bad_msg "Unknown '${1}' keyfile received." 
${CRYPT_SILENT}
+   bad_msg "Unknown '${1}' keyfile received." 
"${CRYPT_SILENT}"
exit 1
;;
esac
 
# limit maximum stored bytes to 1M to avoid killing the server
-   dd of=${file} count=1k bs=1k 2>/dev/null
+   run dd of="${file}" count=1k bs=1k 2>/dev/null
return $?
 }
 
-
-
 if [ "x${1}" = "x-c" ]
 then
-   command=$(echo ${2} | awk -F" " '{print $1}')
-   type=$(echo ${2} | awk -F" " '{print $2}')
+   command=$(echo "${2}" | awk '{ print $1 }')
+   type=$(echo "${2}" | awk '{ print $2 }')
 
case ${command} in 
post)
-   receivefile ${type}
-   if [ $? -eq 0 ]
+   if receivefile "${type}"
then
-   unlock-luks ${type}
-   if [ $? -eq 0 ]
+   if unlock-luks "${type}"
then
if [ "${type}" = 'root' ]
then
@@ -53,12 +53,12 @@ then
exit 1
fi
else
-   bad_msg "Keyfile was not properly received!" 
${CRYPT_SILENT}
+   bad_msg "Keyfile was not properly received!" 
"${CRYPT_SILENT}"
exit 1
fi
;;
*)
-   bad_msg "Command '${command}' is not supported!" 
${CRYPT_SILENT}
+   bad_msg "Command '${command}' is not supported!" 
"${CRYPT_SILENT}"
exit 1
esac
 else
@@ -77,12 +77,12 @@ else
good_msg "${NORMAL}Be aware that it will kill your connection which 
means"
good_msg "${NORMAL}you will no longer be able to work in this shell."
 
-   if [ -n "${CRYPT_ROOT}" -a ! -f "${CRYPT_ROOT_OPENED_LOCKFILE}" ]
+   if [ -n "${CRYPT_ROOT}" ] && [ ! -f "${CRYPT_ROOT_OPENED_LOCKFILE}" ]
then
good_msg "${NORMAL}To remote unlock LUKS-encrypted root device, 
run '${BOLD}unlock-luks root${NORMAL}'."
fi
 
-   if [ -n "${CRYPT_SWAP}" -a ! -f "${CRYPT_ROOT_OPENED_LOCKFILE}" ]
+   if [ -n "${CRYPT_SWAP}" ] && [ ! -f "${CRYPT_ROOT_OPENED_LOCKFILE}" ]
then
good_msg "${NORMAL}To remote unlock LUKS-encrypted swap device, 
run '${BOLD}unlock-luks swap${NORMAL}'."
fi



[gentoo-commits] proj/genkernel:master commit in: defaults/

2019-08-07 Thread Thomas Deutschmann
commit: 3022031a3824aedb923aac17e6817e158f6775ed
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Aug  6 17:19:50 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Aug  6 20:40:32 2019 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=3022031a

unlock-luks.sh: Make shellcheck happy

Signed-off-by: Thomas Deutschmann  gentoo.org>

 defaults/unlock-luks.sh | 19 +--
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/defaults/unlock-luks.sh b/defaults/unlock-luks.sh
index 16e654c..ebcd2ca 100644
--- a/defaults/unlock-luks.sh
+++ b/defaults/unlock-luks.sh
@@ -39,11 +39,11 @@ main() {
 
eval local LUKS_DEVICE='"${CRYPT_'${TYPE}'}"' LUKS_NAME="${NAME}" 
LUKS_KEY='"${CRYPT_KEYFILE_'${TYPE}'}"'
eval local LUKS_TRIM='"${CRYPT_'${TYPE}'_TRIM}"' 
OPENED_LOCKFILE='"${CRYPT_'${TYPE}'_OPENED_LOCKFILE}"'
-   local cryptsetup_options=
+   local cryptsetup_options
 
while true
do
-   local gpg_cmd= crypt_filter_ret=
+   local gpg_cmd crypt_filter_ret
 
if [ -e "${OPENED_LOCKFILE}" ]
then
@@ -53,15 +53,14 @@ main() {
LUKS_DEVICE=$(find_real_device "${LUKS_DEVICE}")
if [ -z "${LUKS_DEVICE}" ]
then
-   bad_msg "Looks like CRYPT_${TYPE} kernel 
cmdline argument is not set." ${CRYPT_SILENT}
+   bad_msg "Looks like CRYPT_${TYPE} kernel 
cmdline argument is not set." "${CRYPT_SILENT}"
exit 1
fi
 
-   setup_md_device ${LUKS_DEVICE}
-   cryptsetup isLuks ${LUKS_DEVICE}
-   if [ $? -ne 0 ]
+   setup_md_device "${LUKS_DEVICE}"
+   if ! cryptsetup isLuks "${LUKS_DEVICE}"
then
-   bad_msg "The LUKS device ${LUKS_DEVICE} does 
not contain a LUKS header" ${CRYPT_SILENT}
+   bad_msg "The LUKS device ${LUKS_DEVICE} does 
not contain a LUKS header" "${CRYPT_SILENT}"
 
# User has SSH access and is able to call 
script again or
# able to investigate the problem on its own.
@@ -69,7 +68,7 @@ main() {
else
if [ "x${LUKS_TRIM}" = "xyes" ]
then
-   good_msg "Enabling TRIM support for 
${LUKS_NAME} ..." ${CRYPT_SILENT}
+   good_msg "Enabling TRIM support for 
${LUKS_NAME} ..." "${CRYPT_SILENT}"

cryptsetup_options="${cryptsetup_options} --allow-discards"
fi
 
@@ -91,10 +90,10 @@ main() {
if [ ${crypt_filter_ret} -eq 0 ]
then
touch "${OPENED_LOCKFILE}"
-   good_msg "LUKS device ${LUKS_DEVICE} 
opened" ${CRYPT_SILENT}
+   good_msg "LUKS device ${LUKS_DEVICE} 
opened" "${CRYPT_SILENT}"
break
else
-   bad_msg "Failed to open LUKS device 
${LUKS_DEVICE}" ${CRYPT_SILENT}
+   bad_msg "Failed to open LUKS device 
${LUKS_DEVICE}" "${CRYPT_SILENT}"
 
# We need to stop here with a non-zero 
exit code to prevent
# a loop when invalid keyfile was sent.



[gentoo-commits] proj/genkernel:master commit in: defaults/

2019-08-07 Thread Thomas Deutschmann
commit: 7c8515a1c53a988bfdc73b47c599d3df3e0354c8
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Aug  6 20:13:06 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Aug  7 15:03:44 2019 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=7c8515a1

linuxrc: Remove dead code

This code shouldn't work (anymore) because $CHROOT is read-only at
this stage.

Signed-off-by: Thomas Deutschmann  gentoo.org>

 defaults/linuxrc | 5 -
 1 file changed, 5 deletions(-)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 6e01209..b2ac54e 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -1255,11 +1255,6 @@ fi
 
 cleanup
 
-good_msg "Booting (initramfs)"
-
-cd "${CHROOT}"
-mkdir "${CHROOT}/proc" "${CHROOT}/sys" "${CHROOT}/run" 2>/dev/null
-
 # If devtmpfs is mounted, try move it to the new root
 # If that fails, try to unmount all possible mounts of
 # devtmpfs as stuff breaks otherwise



[gentoo-commits] proj/genkernel:master commit in: defaults/

2019-08-07 Thread Thomas Deutschmann
commit: 40350b36f2b22241fdf28789336e98ae7757
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Aug  4 16:08:58 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Aug  4 16:08:58 2019 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=4035

busyy-config: Update

- Enable FEATURE_FAST_TOP by default

- Unset SVOK by default

- Enable WALL by default

Signed-off-by: Thomas Deutschmann  gentoo.org>

 defaults/busy-config | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/defaults/busy-config b/defaults/busy-config
index 1184633..7830c83 100644
--- a/defaults/busy-config
+++ b/defaults/busy-config
@@ -111,7 +111,7 @@ CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
 CONFIG_PASSWORD_MINLEN=6
 CONFIG_MD5_SMALL=1
 CONFIG_SHA3_SMALL=1
-# CONFIG_FEATURE_FAST_TOP is not set
+CONFIG_FEATURE_FAST_TOP=y
 # CONFIG_FEATURE_ETC_NETWORKS is not set
 CONFIG_FEATURE_EDITING=y
 CONFIG_FEATURE_EDITING_MAX_LEN=1024
@@ -353,7 +353,7 @@ CONFIG_BASE64=y
 CONFIG_WC=y
 CONFIG_FEATURE_WC_LARGE=y
 CONFIG_WHOAMI=y
-# CONFIG_WHO is not set
+CONFIG_WHO=y
 # CONFIG_W is not set
 # CONFIG_USERS is not set
 CONFIG_YES=y
@@ -1054,6 +1054,7 @@ CONFIG_FEATURE_SHOW_THREADS=y
 # CONFIG_FEATURE_RUNSVDIR_LOG is not set
 # CONFIG_SV is not set
 CONFIG_SV_DEFAULT_SERVICE_DIR=""
+# CONFIG_SVOK is not set
 # CONFIG_SVC is not set
 # CONFIG_SVLOGD is not set
 # CONFIG_CHCON is not set



[gentoo-commits] proj/genkernel:master commit in: defaults/

2019-08-07 Thread Thomas Deutschmann
commit: b54d7057a3ea2d192275d3376e891a6ead8872c3
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon Aug  5 13:51:57 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Aug  6 20:40:31 2019 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=b54d7057

initrd.scripts: Move splash() function to initrd.scripts

Signed-off-by: Thomas Deutschmann  gentoo.org>

 defaults/initrd.scripts  | 4 
 defaults/linuxrc | 4 
 defaults/login-remote.sh | 4 
 defaults/unlock-luks.sh  | 4 
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index f27c02f..1f7dc94 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1152,6 +1152,10 @@ waitForZFS() {
exit 1
 }
 
+splash() {
+   return 0
+}
+
 start_volumes() {
# Here, we check for /dev/device-mapper, and if it exists, we setup a
# a symlink, which should hopefully fix bug #142775 and bug #147015

diff --git a/defaults/linuxrc b/defaults/linuxrc
index e21e555..d729806 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -3,10 +3,6 @@
 . /etc/initrd.defaults
 . /etc/initrd.scripts
 
-splash() {
-   return 0
-}
-
 [ -e /etc/initrd.splash ] && . /etc/initrd.splash
 
 # Basic /dev content, we need it as fast as possible.

diff --git a/defaults/login-remote.sh b/defaults/login-remote.sh
index f8c4d08..ca85b06 100644
--- a/defaults/login-remote.sh
+++ b/defaults/login-remote.sh
@@ -5,10 +5,6 @@
 . /etc/initrd.scripts
 . "${CRYPT_ENV_FILE}"
 
-splash() {
-   return 0
-}
-
 [ -e /etc/initrd.splash ] && . /etc/initrd.splash
 
 receivefile() {

diff --git a/defaults/unlock-luks.sh b/defaults/unlock-luks.sh
index ef6b816..cae5269 100644
--- a/defaults/unlock-luks.sh
+++ b/defaults/unlock-luks.sh
@@ -4,10 +4,6 @@ print_usage() {
echo "Usage: $0 root|swap" >&2
 }
 
-splash() {
-   return 0
-}
-
 if [ -z "${1}" ]
 then
print_usage



[gentoo-commits] proj/genkernel:master commit in: defaults/

2019-08-07 Thread Thomas Deutschmann
commit: f49a899ce13f9e41bdf592187e0d157b071bf82d
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Aug  6 15:43:40 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Aug  6 20:40:32 2019 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=f49a899c

linuxrc: Fix console support

- Make sure we set console after processing CMDLINE so that we will
  use last set console which matches kernel documentation.

- Strip any set option from console= value.

- Regain control after spawning a shell.

Bug: https://bugs.gentoo.org/473128
Signed-off-by: Thomas Deutschmann  gentoo.org>

 defaults/initrd.scripts | 15 ---
 defaults/linuxrc| 25 +
 2 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 2452f5f..6f7530f 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -827,9 +827,14 @@ run_shell() {
GOOD=${BLUE} good_msg "${NORMAL}...running Linux kernel 
${BOLD}${kernel_ver}${NORMAL}"
echo
 
-   if [ -n "${CONSOLE}" ] && [ -c "/dev/${CONSOLE}" ]
-   then
-   setsid ${SH} -c "exec sh --login /dev/${CONSOLE} 2>&1"
+   # Avoid /dev/{console,tty0} due to "can't access tty; job control 
turned off" problem;
+   # cttyhack will handle this for us...
+   if [ -n "${CONSOLE}" ] \
+   && [ "${CONSOLE}" != "/dev/console" ] \
+   && [ "${CONSOLE}" != "/dev/tty0" ] \
+   && [ -c "${CONSOLE}" ]
+   then
+   setsid ${SH} -c "exec sh --login <${CONSOLE} >${CONSOLE} 2>&1"
elif command -v cttyhack 1>/dev/null 2>&1
then
setsid cttyhack ${SH} --login
@@ -843,6 +848,10 @@ run_shell() {
rm "${GK_SHELL_LOCKFILE}"
 
echo
+
+   # We maybe have called exec and dettached from main script; We
+   # must restore control...
+   exec >${CONSOLE} <${CONSOLE} 2>&1
 }
 
 fs_type_in_use() {

diff --git a/defaults/linuxrc b/defaults/linuxrc
index dcae3cc..e3d5a2b 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -11,11 +11,13 @@
 [ ! -e /dev/tty ]  && mknod /dev/tty c 5 0
 [ ! -e /dev/tty0 ] && mknod /dev/tty0 c 4 0
 [ ! -e /dev/tty1 ] && mknod /dev/tty1 c 4 1
+[ ! -e /dev/ttyS0 ]&& mknod /dev/ttyS0 c 4 64
+[ ! -e /dev/ttyS1 ]&& mknod /dev/ttyS1 c 4 65
 [ ! -e /dev/urandom ]  && mknod /dev/urandom c 1 9
 [ ! -e /dev/random ]   && mknod /dev/random c 1 8
 [ ! -e /dev/zero ] && mknod /dev/zero c 1 5
 
-# Clean input/output
+# Take control
 exec >${CONSOLE} <${CONSOLE} 2>&1
 
 if [ "$$" != '1' ]
@@ -184,9 +186,9 @@ do
;;
# Redirect output to a specific tty
CONSOLE=*|console=*)
-   CONSOLE=${x#*=}
-   CONSOLE=$(basename ${CONSOLE})
-#  exec >${CONSOLE} <${CONSOLE} 2>&1
+   NEW_CONSOLE=${x#*=}
+   NEW_CONSOLE=$(basename ${NEW_CONSOLE})
+   NEW_CONSOLE=${NEW_CONSOLE%%,*}
;;
# /dev/md
lvmraid=*)
@@ -362,6 +364,21 @@ do
esac
 done
 
+if [ -n "${NEW_CONSOLE}" ]
+then
+   # We cannot update console while processing CMDLINE because we
+   # are only interested in last console= value.
+   [ ! -c "${NEW_CONSOLE}" ] && NEW_CONSOLE="/dev/${NEW_CONSOLE}"
+   if [ -c "${NEW_CONSOLE}" ]
+   then
+   exec >${NEW_CONSOLE} <${NEW_CONSOLE} 2>&1
+   good_msg "Console switched from '${CONSOLE}' to 
'${NEW_CONSOLE}'!"
+   CONSOLE="${NEW_CONSOLE}"
+   else
+   bad_msg "Unable to switch console: '${NEW_CONSOLE}' not found 
or not a character device!"
+   fi
+fi
+
 quiet_kmsg
 
 if [ "${CDROOT}" = '0' ]



[gentoo-commits] proj/genkernel:master commit in: defaults/, doc/

2019-08-07 Thread Thomas Deutschmann
commit: e7735c6b2e2cbfb44ce550fa8e7f4359ab5f073c
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Aug  6 17:45:19 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Aug  7 15:03:40 2019 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=e7735c6b

linuxrc: Log initramfs output/commands

By default, any {bad,good,warn}_msg output and external command calls
will now be logged to /tmp/init.log in initramfs. This can be turned
off via gk.log.disabled={1,yes} kernel command-line argument.

This is especially helpful when working with remote servers when you
can access initramfs system through SSH.

In addition, initramfs' log file can be preserved, i.e. copied to
real system just before switch_root call. This can be controlled
via gk.log.keep kernel command-line argument: When just enabled,
initramfs will copy log to $NEWROOT/genkernel-boot.log. Keep in my
that the file path must be accessible for initramfs and by default,
initramfs will only mount / as $NEWROOT and no additional mountpoints.

Signed-off-by: Thomas Deutschmann  gentoo.org>

 defaults/initrd.defaults |   4 +
 defaults/initrd.scripts  | 535 ---
 defaults/linuxrc | 142 -
 defaults/login-remote.sh |  27 ++-
 defaults/unlock-luks.sh  |  18 +-
 doc/genkernel.8.txt  |  16 ++
 6 files changed, 522 insertions(+), 220 deletions(-)

diff --git a/defaults/initrd.defaults b/defaults/initrd.defaults
index fdf948e..553600d 100644
--- a/defaults/initrd.defaults
+++ b/defaults/initrd.defaults
@@ -71,6 +71,10 @@ VERIFY=0
 
 IP='dhcp'
 GK_DEBUGMODE_STATEFILE="/tmp/debug.enabled"
+GK_INIT_LOG='/tmp/init.log'
+GK_INIT_LOG_COPYTO=
+GK_INIT_LOG_DISABLED='/tmp/no-init.log'
+GK_INIT_LOG_PREFIX=
 GK_NET_DHCP_PIDFILE='/var/run/udhcpc.pid'
 GK_NET_DHCP_RETRIES=3
 GK_NET_GW=

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 6f7530f..f95f434 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -34,6 +34,17 @@ modules_scan() {
[ -n "${MODS}" ] && [ -z "${QUIET}" ] && \
printf "%b" "${BOLD}   ::${NORMAL} Loading from ${1}: "
 
+   if [ -z "${MODULES_SCAN_WARNING_SHOWN}" ]
+   then
+   local note_msg="NOTE: Due to how genkernel auto-detects your"
+   note_msg="${note_msg} hardware you will now see a lot of failed 
modprobe" \
+   note_msg="${note_msg} attempts which you can ignore:"
+
+   log_msg "${note_msg}"
+
+   MODULES_SCAN_WARNING_SHOWN=yes
+   fi
+
for x in ${MODS}
do
MLOAD=$(echo ${MLIST} | sed -e "s/.*${x}.*/${x}/")
@@ -55,7 +66,7 @@ modules_scan() {
printf "%b" "Scanning for ${x} ..."
fi
 
-   modprobe ${x} >/dev/null 2>&1
+   run modprobe ${x} >/dev/null 2>&1
loaded=${?}
 
is_debug && [ "${loaded}" = "0" ] && \
@@ -79,7 +90,6 @@ uppercase() {
echo $1 | tr 'a-z' 'A-Z'
 }
 
-
 findmediamount() {
# $1 = mount dir name / media name
# $2 = recognition file
@@ -130,14 +140,14 @@ findmediamount() {
fi
good_msg "Attempting to mount media: ${x}" 
${CRYPT_SILENT}
 
-   mount -t ${CDROOT_TYPE} ${x} ${mntcddir} 
>/dev/null 2>&1
+   run mount -t ${CDROOT_TYPE} ${x} ${mntcddir} 
>/dev/null 2>&1
if [ $? -eq 0 ]
then
if [ -n "${ISOBOOT}" ]
then
if [ -f 
"${mntcddir}/${ISOBOOT}" ]
then
-   mount -o loop 
"${mntcddir}/${ISOBOOT}" "${mntdir}"
+   run mount -o loop 
"${mntcddir}/${ISOBOOT}" "${mntdir}"
if [ $? -eq 0 ]
then
good_msg "iso 
mounted on ${mntdir}"
@@ -153,7 +163,7 @@ findmediamount() {
good_msg "Media found on ${x}" 
${CRYPT_SILENT}
break
else
-   umount ${mntcddir}
+   run umount ${mntcddir}
fi
fi
fi
@@ -203,37 +213,37 @@ bootstrapFS() {

aufs_branch=${aufs_memory}/aufs-rw-branch/${aufs_dev_uid}
fi
 
-   mkdir -p ${aufs_memory} 

[gentoo-commits] proj/genkernel:master commit in: defaults/

2019-08-07 Thread Thomas Deutschmann
commit: 2906b025dbc60ef1f53427950a8d2cbd14dcc5b9
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Aug  4 16:06:12 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Aug  4 16:06:12 2019 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=2906b025

linuxrc: Create /dev/tty{0,1}

/dev/tty1 is used by local debug shell for example.

Fixes: cf85138 ("initramfs: Don't call mknod when --busybox is used")
Signed-off-by: Thomas Deutschmann  gentoo.org>

 defaults/linuxrc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 4113b63..e21e555 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -13,6 +13,8 @@ splash() {
 [ ! -e /dev/console ]  && mknod /dev/console c 5 1
 [ ! -e /dev/null ] && mknod /dev/null c 1 3
 [ ! -e /dev/tty ]  && mknod /dev/tty c 5 0
+[ ! -e /dev/tty0 ] && mknod /dev/tty0 c 4 0
+[ ! -e /dev/tty1 ] && mknod /dev/tty1 c 4 1
 [ ! -e /dev/urandom ]  && mknod /dev/urandom c 1 9
 [ ! -e /dev/random ]   && mknod /dev/random c 1 8
 [ ! -e /dev/zero ] && mknod /dev/zero c 1 5



[gentoo-commits] proj/genkernel:master commit in: defaults/

2019-08-07 Thread Thomas Deutschmann
commit: 865109b62c15e77dee1ff4b449f970faa25813d0
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Aug  6 20:23:06 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Aug  7 15:03:45 2019 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=865109b6

linuxrc: Remove dead code

Call to verbose_kmsg() was moved in commit 5842219. No need to keep this
any longer.

Signed-off-by: Thomas Deutschmann  gentoo.org>

 defaults/linuxrc | 2 --
 1 file changed, 2 deletions(-)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index a57de1c..1bd6dc9 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -922,8 +922,6 @@ do
 done
 # End determine root device
 
-#verbose_kmsg
-
 # If CD root is set determine the looptype to boot
 if [ "${CDROOT}" = '1' ]
 then



[gentoo-commits] proj/genkernel:master commit in: defaults/

2019-08-07 Thread Thomas Deutschmann
commit: 6b129aca406333e440079a3861883a44b8a200b0
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Aug  6 14:59:28 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Aug  6 20:40:31 2019 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=6b129aca

initrd.defaults: Remove duplicated definition of $NORMAL

Signed-off-by: Thomas Deutschmann  gentoo.org>

 defaults/initrd.defaults | 1 -
 1 file changed, 1 deletion(-)

diff --git a/defaults/initrd.defaults b/defaults/initrd.defaults
index c617064..704a5a2 100644
--- a/defaults/initrd.defaults
+++ b/defaults/initrd.defaults
@@ -6,7 +6,6 @@ PATH="/usr/sbin:/usr/bin:/sbin:/bin"
 # ctrl-V then esc will print ^[
 # ctrl-V then ctrl-shift-m will print ^M
 BACK_UP="\033[1K\033[0G"
-NORMAL="\033[0m"
 WARN="\033[33;1m"
 BAD="\033[31;1m"
 BOLD="\033[1m"



[gentoo-commits] proj/genkernel:master commit in: defaults/

2019-08-07 Thread Thomas Deutschmann
commit: 5124ba044c454c112e756c5e8024650a64008609
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Aug  6 15:11:39 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Aug  6 20:40:31 2019 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=5124ba04

linuxrc: Rework debug mode

This commit will introduce $GK_DEBUGMODE_STATEFILE and a new
function is_debug() to check if debug mode is enabled or not.

Using a state file instead of a variable will allow us to
enable/disable debug mode from outside:

I.e. when you have booted in debug mode and are working remotely,
you can now remove the state file, which will disable debug mode.
This will allow you to resume booting without dropping in
another local debug shell.

It works the other way, too: When you did NOT boot in debug
mode but experiencing a problem and want to drop in another
debug shell after next step, you can now enable debug mode by
creating the state file.

Signed-off-by: Thomas Deutschmann  gentoo.org>

 defaults/initrd.defaults |  1 +
 defaults/initrd.scripts  | 34 --
 defaults/linuxrc |  2 +-
 defaults/unlock-luks.sh  |  2 +-
 4 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/defaults/initrd.defaults b/defaults/initrd.defaults
index 704a5a2..89d13ac 100644
--- a/defaults/initrd.defaults
+++ b/defaults/initrd.defaults
@@ -70,6 +70,7 @@ CDROOT_MARKER='/livecd'
 VERIFY=0
 
 IP='dhcp'
+GK_DEBUGMODE_STATEFILE="/tmp/debug.enabled"
 GK_NET_DHCP_PIDFILE='/var/run/udhcpc.pid'
 GK_NET_DHCP_RETRIES=3
 GK_NET_GW=

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 1f7dc94..994f0f0 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -49,7 +49,7 @@ modules_scan() {
break
fi
 
-   if [ -n "${DEBUG}" ]
+   if is_debug
then
printf "%b" "${BOLD}   ::${NORMAL} "
printf "%b" "Scanning for ${x} ..."
@@ -58,12 +58,12 @@ modules_scan() {
modprobe ${x} >/dev/null 2>&1
loaded=${?}
 
-   [ -n "${DEBUG}" -a "${loaded}" = "0" ] && \
+   is_debug && [ "${loaded}" = "0" ] && \
echo "loaded"
-   [ -n "${DEBUG}" -a "${loaded}" != "0" ] && \
+   is_debug && [ "${loaded}" != "0" ] && \
echo "not loaded"
 
-   [ -z "${DEBUG}" -a "${loaded}" = "0" ] && \
+   ! is_debug && [ "${loaded}" = "0" ] && \
[ -z "${QUIET}" ] && \
printf "%b" "${x} "
else
@@ -462,6 +462,17 @@ conf_rc_no_umounts() {
fi
 }
 
+is_debug() {
+   is_debug=1
+
+   if [ -f "${GK_DEBUGMODE_STATEFILE}" ]
+   then
+   is_debug=0
+   fi
+
+   return ${is_debug}
+}
+
 # is_int "${A}" ["${B}"..]
 # NOTE we consider a leading 0 false as it would be interpreted as octal
 is_int() {
@@ -880,7 +891,7 @@ test_success() {
 # $2 hide flag
 
 good_msg() {
-   [ -n "${QUIET}" ] && [ -z "${DEBUG}" ] && return 0
+   [ -n "${QUIET}" ] && ! is_debug && return 0
 
msg_string=${1}
msg_string="${msg_string:-...}"
@@ -888,7 +899,7 @@ good_msg() {
 }
 
 good_msg_n() {
-   [ -n "${QUIET}" ] && [ -z "${DEBUG}" ] && return 0
+   [ -n "${QUIET}" ] && ! is_debug && return 0
 
msg_string=${1}
msg_string="${msg_string:-...}"
@@ -1943,7 +1954,7 @@ start_sshd() {
# setup environment variables for the ssh login shell
local varname= varvalue=
touch "${CRYPT_ENV_FILE}"
-   for varname in CRYPT_ROOT CRYPT_ROOT_TRIM CRYPT_SILENT CRYPT_SWAP DEBUG
+   for varname in CRYPT_ROOT CRYPT_ROOT_TRIM CRYPT_SILENT CRYPT_SWAP
do
eval varvalue=\$${varname}
echo "${varname}=${varvalue}" >> "${CRYPT_ENV_FILE}"
@@ -2106,12 +2117,15 @@ setup_md_device() {
 }
 
 rundebugshell() {
-   if [ -n "${DEBUG}" ]
+   if is_debug
then
good_msg 'Starting debug shell as requested by "debug" option.'
-   good_msg "Stopping by: ${1}"
-   run_shell
+   else
+   return 0
fi
+
+   good_msg "Stopping by: ${1}"
+   run_shell
 }
 
 do_resume() {

diff --git a/defaults/linuxrc b/defaults/linuxrc
index d729806..dcae3cc 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -153,7 +153,7 @@ do
;;
# Debug Options
debug)
-   DEBUG='yes'
+   touch "${GK_DEBUGMODE_STATEFILE}"
;;
# Scan delay options
scandelay=*)

diff --git a/defaults/unlock-luks.sh b/defaults/unlock-luks.sh
index 

[gentoo-commits] proj/genkernel:master commit in: defaults/

2019-08-07 Thread Thomas Deutschmann
commit: d218502dd92b79e7920152d17843620d56d00756
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Aug  6 15:34:53 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Aug  6 20:40:32 2019 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=d218502d

initrd.scripts: run_shell(): Use LOCK file

We cannot write PID because we use exec and don't return
before the shell we just spawned was closed.

Signed-off-by: Thomas Deutschmann  gentoo.org>

 defaults/initrd.defaults | 2 +-
 defaults/initrd.scripts  | 6 --
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/defaults/initrd.defaults b/defaults/initrd.defaults
index 89d13ac..fdf948e 100644
--- a/defaults/initrd.defaults
+++ b/defaults/initrd.defaults
@@ -81,7 +81,7 @@ GK_NET_TIMEOUT_DAD=10
 GK_NET_TIMEOUT_DECONFIGURATION=10
 GK_NET_TIMEOUT_DHCP=10
 GK_NET_TIMEOUT_INTERFACE=10
-GK_SHELL_LOCKFILE='/var/run/rescueshell.pid'
+GK_SHELL_LOCKFILE='/tmp/rescueshell.lock'
 GK_SSHD_LOCKFILE='/tmp/remote-rescueshell.lock'
 GK_SSHD_PIDFILE='/var/run/dropbear.pid'
 GK_SSHD_PORT=22

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 994f0f0..2452f5f 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -818,6 +818,8 @@ check_loop() {
 run_shell() {
[ -x /bin/sh ] && SH=/bin/sh || SH=/bin/ash
 
+   touch "${GK_SHELL_LOCKFILE}"
+
export PS1='rescueshell \w \# '
 
echo
@@ -838,9 +840,9 @@ run_shell() {
${SH} --login
fi
 
-   echo
+   rm "${GK_SHELL_LOCKFILE}"
 
-   :> "${GK_SHELL_LOCKFILE}"
+   echo
 }
 
 fs_type_in_use() {



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

2019-08-07 Thread Michał Górny
commit: 97e1cb50de6970e95e926dc0dc408db918f90269
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Aug  7 13:26:44 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Aug  7 15:41:51 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97e1cb50

dev-python/cython: Enable pypy{,3}

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

 dev-python/cython/cython-0.29.13.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/cython/cython-0.29.13.ebuild 
b/dev-python/cython/cython-0.29.13.ebuild
index fde90453842..5af794bfd50 100644
--- a/dev-python/cython/cython-0.29.13.ebuild
+++ b/dev-python/cython/cython-0.29.13.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 toolchain-funcs elisp-common



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

2019-08-07 Thread Michał Górny
commit: 91fc5273c4066cbbe2176d7b31841c9460f7c48d
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Aug  7 13:32:50 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Aug  7 15:41:53 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91fc5273

dev-python/numpy: Enable pypy{,3}

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

 dev-python/numpy/numpy-1.16.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/numpy/numpy-1.16.1.ebuild 
b/dev-python/numpy/numpy-1.16.1.ebuild
index 1ec2abd0447..89aa5f73430 100644
--- a/dev-python/numpy/numpy-1.16.1.ebuild
+++ b/dev-python/numpy/numpy-1.16.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
 PYTHON_REQ_USE="threads(+)"
 
 FORTRAN_NEEDED=lapack



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

2019-08-07 Thread Michał Górny
commit: 4c7ab8c68c60fe91dc3d05be7db8774da9055f4d
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Aug  7 13:22:05 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Aug  7 15:41:54 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c7ab8c6

dev-python/lxml: Bump to 4.4.0

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

 dev-python/lxml/Manifest  |  1 +
 dev-python/lxml/lxml-4.4.0.ebuild | 80 +++
 2 files changed, 81 insertions(+)

diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index a5f3f80baef..2d5cc7cc0f3 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -1,3 +1,4 @@
 DIST lxml-4.2.5.tar.gz 4414081 BLAKE2B 
c1c75a0a0c33011e2becb729de2c15dd786dd12bddeba4f2f26032d0d17104f258b471f5f961cbf96340df66cbce3e874d7a16c59731af280a309132b669d1b9
 SHA512 
4cf336d3e1471e8a26492760a143881517d12eb1c2dad82f8786540471bfabd68f8c795d97b7362166418c2be3c7996816638fdbd5a594536b9981478b90fdfe
 DIST lxml-4.3.3.tar.gz 4378439 BLAKE2B 
30c2a29e58951164fbff1c9d23362d46987c86b671e0cfa6cf15cbbb3db23ead856786babe57ce553f7b8a66d8ac333410ea1bb3b8b521aac43a038b90daf488
 SHA512 
cbc1cd30bac4b9ac845d99949c8c231a7870398f942695df5a00586d70d0f6b6ebd457a1a9306806af7d0fd521a14c54d266902943263927a0d940abc3cdf5c0
 DIST lxml-4.3.4.tar.gz 2488557 BLAKE2B 
5059ea45d3d833955636216a7c096322496882de4592a0d19604885dca8dffbc763afb7dc804b7a34561d0c94dfa2130a61835d6c12b97dc83008e8fa33e098a
 SHA512 
7349cb4805e538da5b11edcb79fcd09ddedf0d52e50273a4e587f209e6b147b50737c45dcfc8eb3ee8e7be8f99769046f704c5fc8c35cee74d5d22ef72d503ed
+DIST lxml-4.4.0.tar.gz 939001 BLAKE2B 
9fc473729286e98cd73e4b39d7acf22ccb957dd4b366924dc171a6c89c2e435a3dae771342eb3b143451b0550960cb821430de3e8f6470dc87e3a85efc389314
 SHA512 
23e7b5157a6520f3e1dab76b023e828a5afe9d0103e2d3ff8fd1a8791000ed8f859e26fe9809676b89d4ef9fa4b27a6f1662a2b0f54e5ae04776643f5b06c0c3

diff --git a/dev-python/lxml/lxml-4.4.0.ebuild 
b/dev-python/lxml/lxml-4.4.0.ebuild
new file mode 100644
index 000..e7c16048171
--- /dev/null
+++ b/dev-python/lxml/lxml-4.4.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+
+inherit distutils-r1 eutils toolchain-funcs
+
+DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
+HOMEPAGE="https://lxml.de/ https://pypi.org/project/lxml/ 
https://github.com/lxml/lxml;
+SRC_URI="https://github.com/lxml/lxml/archive/${P}.tar.gz;
+
+LICENSE="BSD ElementTree GPL-2 PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc examples +threads test"
+
+# Note: lib{xml2,xslt} are used as C libraries, not Python modules.
+RDEPEND="
+   >=dev-libs/libxml2-2.9.5
+   >=dev-libs/libxslt-1.1.28"
+DEPEND="${RDEPEND}"
+BDEPEND="
+   virtual/pkgconfig
+   $(python_gen_cond_dep 'dev-python/cython[${PYTHON_USEDEP}]' python2_7 
'python3*')
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   test? ( dev-python/cssselect[${PYTHON_USEDEP}] )
+   "
+
+DISTUTILS_IN_SOURCE_BUILD=1
+S=${WORKDIR}/lxml-${P}
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-3.5.0-cross-compile.patch
+)
+
+python_prepare_all() {
+   # avoid replacing PYTHONPATH in tests.
+   sed -i -e '/sys\.path/d' test.py || die
+
+   # don't use some random SDK on Darwin
+   sed -i -e '/_ldflags =/s/=.*isysroot.*darwin.*None/= None/' \
+   setupinfo.py || die
+
+   distutils-r1_python_prepare_all
+}
+
+python_compile() {
+   if ! python_is_python3; then
+   local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+   fi
+   tc-export PKG_CONFIG
+   distutils-r1_python_compile
+}
+
+python_test() {
+   cp -r -l src/lxml/tests "${BUILD_DIR}"/lib/lxml/ || die
+   cp -r -l src/lxml/html/tests "${BUILD_DIR}"/lib/lxml/html/ || die
+   ln -s "${S}"/doc "${BUILD_DIR}"/ || die
+
+   "${EPYTHON}" test.py -vv --all-levels -p || die "Test ${test} fails 
with ${EPYTHON}"
+}
+
+python_install_all() {
+   if use doc; then
+   local DOCS=( README.rst *.txt doc/*.txt )
+   local HTML_DOCS=( doc/html/. )
+   fi
+   if use examples; then
+   dodoc -r samples
+   fi
+
+   distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+   optfeature "Support for BeautifulSoup as a parser backend" 
dev-python/beautifulsoup
+   optfeature "Translates CSS selectors to XPath 1.0 expressions" 
dev-python/cssselect
+}



[gentoo-commits] repo/gentoo:master commit in: games-server/minecraft-server/

2019-08-07 Thread Joonas Niilola
commit: bb3a5d92d47e34f5739579e067be2981a873a8df
Author: Conrad Kostecki  kostecki  com>
AuthorDate: Tue Aug  6 18:42:33 2019 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Aug  7 15:34:52 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb3a5d92

games-server/minecraft-server: drop old version

Package-Manager: Portage-2.3.70, Repoman-2.3.16
Signed-off-by: Conrad Kostecki  kostecki.com>
Closes: https://github.com/gentoo/gentoo/pull/12490
Signed-off-by: Joonas Niilola  gentoo.org>

 games-server/minecraft-server/Manifest |  1 -
 .../minecraft-server-1.14.2.ebuild | 57 --
 2 files changed, 58 deletions(-)

diff --git a/games-server/minecraft-server/Manifest 
b/games-server/minecraft-server/Manifest
index 22dc6af96c1..ab9e6c34163 100644
--- a/games-server/minecraft-server/Manifest
+++ b/games-server/minecraft-server/Manifest
@@ -1,3 +1,2 @@
 DIST minecraft-server-1.13.2.jar 33835116 BLAKE2B 
4d92068d51555ab44a2efcdbb1676ef34a7085e4d666a7915c4c5a3d1f9502536df4bf67909d27b7b94cb8ebb483dc55f935f21930d4bc454645ed44ef8e6ed8
 SHA512 
c9a98f1d224519369d6c4882cfe93a94983661c0c0b8a7f0b2f271af752fde5693025b684a01665992b3c70b37ac891ce1747f062bd86354777c416219629b64
-DIST minecraft-server-1.14.2.jar 35932967 BLAKE2B 
1dbba4ae065a05539db59412c393de9c183384ce5c4edf2f19ffd702c60e1f85c10362abd3f75c01bff08d764bdcab2783c569ea722d582ef1049d7a688f2448
 SHA512 
9670c1038aa23c3012241a5a103ab5a3e989efcb13edd45f318f92e9968f5f2e99314d3edd0c6851238772e2e1cc5b4bdaeac686a7622e321ac81bf40e2a3cf7
 DIST minecraft-server-1.14.4.jar 35958734 BLAKE2B 
058d6609296394e4714a159976d4de0261a552a919e33db1e54d97e3d2ee90cd4356b60190b807050d3c7ab336149d1c9be55093ba002735ccc6a162706c6ee3
 SHA512 
b3d2852c6fa1b996bbf2fa9fc1fb860c6bca5136bcc5ddd3d236d85789c6bce81620f6b2d69eaa10c41d020fe0bb54de2fa601b3df3093af2691853a4445e1f8

diff --git a/games-server/minecraft-server/minecraft-server-1.14.2.ebuild 
b/games-server/minecraft-server/minecraft-server-1.14.2.ebuild
deleted file mode 100644
index 3d9540765c0..000
--- a/games-server/minecraft-server/minecraft-server-1.14.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PV="808be3869e2ca6b62378f9f4b33c946621620019"
-
-inherit readme.gentoo-r1 java-pkg-2 user
-
-DESCRIPTION="The official server for the sandbox video game"
-HOMEPAGE="https://www.minecraft.net/;
-SRC_URI="https://launcher.mojang.com/v1/objects/${MY_PV}/server.jar -> 
${P}.jar"
-
-LICENSE="Mojang"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-   app-misc/screen
-   >=virtual/jre-1.8
-"
-
-RESTRICT="bindist mirror strip"
-
-S="${WORKDIR}"
-
-pkg_setup() {
-   enewgroup minecraft
-   enewuser minecraft -1 -1 /var/lib/minecraft-server minecraft
-}
-
-src_unpack() {
-   # Don't unpack that jar, just copy it to WORKDIR
-   cp "${DISTDIR}"/${A} "${WORKDIR}" || die
-}
-
-src_compile() {
-   :;
-}
-
-src_install() {
-   java-pkg_newjar minecraft-server-${PV}.jar minecraft-server.jar
-   java-pkg_dolauncher minecraft-server --jar minecraft-server.jar 
--java_args "\${JAVA_OPTS}"
-
-   newinitd "${FILESDIR}"/minecraft-server.initd-r2 minecraft-server
-   newconfd "${FILESDIR}"/minecraft-server.confd minecraft-server
-
-   diropts -o minecraft -g minecraft
-   keepdir /var/lib/minecraft-server
-   keepdir /var/log/minecraft-server
-
-   readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-   readme.gentoo_print_elog
-}



[gentoo-commits] repo/gentoo:master commit in: games-server/minecraft-server/

2019-08-07 Thread Joonas Niilola
commit: d5a6f5dba0004999aaac2987cd7b7cae9d7c000b
Author: Conrad Kostecki  kostecki  com>
AuthorDate: Tue Aug  6 18:42:01 2019 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Aug  7 15:34:52 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5a6f5db

games-server/minecraft-server: bump to version 1.14.4

Also updated to EAPI=7 and dropped user eclass
in favour of acct-* packages.

Package-Manager: Portage-2.3.70, Repoman-2.3.16
Signed-off-by: Conrad Kostecki  kostecki.com>
Signed-off-by: Joonas Niilola  gentoo.org>

 games-server/minecraft-server/Manifest |  1 +
 .../minecraft-server-1.14.4.ebuild | 57 ++
 2 files changed, 58 insertions(+)

diff --git a/games-server/minecraft-server/Manifest 
b/games-server/minecraft-server/Manifest
index 56408723aea..22dc6af96c1 100644
--- a/games-server/minecraft-server/Manifest
+++ b/games-server/minecraft-server/Manifest
@@ -1,2 +1,3 @@
 DIST minecraft-server-1.13.2.jar 33835116 BLAKE2B 
4d92068d51555ab44a2efcdbb1676ef34a7085e4d666a7915c4c5a3d1f9502536df4bf67909d27b7b94cb8ebb483dc55f935f21930d4bc454645ed44ef8e6ed8
 SHA512 
c9a98f1d224519369d6c4882cfe93a94983661c0c0b8a7f0b2f271af752fde5693025b684a01665992b3c70b37ac891ce1747f062bd86354777c416219629b64
 DIST minecraft-server-1.14.2.jar 35932967 BLAKE2B 
1dbba4ae065a05539db59412c393de9c183384ce5c4edf2f19ffd702c60e1f85c10362abd3f75c01bff08d764bdcab2783c569ea722d582ef1049d7a688f2448
 SHA512 
9670c1038aa23c3012241a5a103ab5a3e989efcb13edd45f318f92e9968f5f2e99314d3edd0c6851238772e2e1cc5b4bdaeac686a7622e321ac81bf40e2a3cf7
+DIST minecraft-server-1.14.4.jar 35958734 BLAKE2B 
058d6609296394e4714a159976d4de0261a552a919e33db1e54d97e3d2ee90cd4356b60190b807050d3c7ab336149d1c9be55093ba002735ccc6a162706c6ee3
 SHA512 
b3d2852c6fa1b996bbf2fa9fc1fb860c6bca5136bcc5ddd3d236d85789c6bce81620f6b2d69eaa10c41d020fe0bb54de2fa601b3df3093af2691853a4445e1f8

diff --git a/games-server/minecraft-server/minecraft-server-1.14.4.ebuild 
b/games-server/minecraft-server/minecraft-server-1.14.4.ebuild
new file mode 100644
index 000..c0814321c97
--- /dev/null
+++ b/games-server/minecraft-server/minecraft-server-1.14.4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_COMMIT="3dc3d84a581f14691199cf6831b71ed1296a9fdf"
+
+inherit readme.gentoo-r1 java-pkg-2
+
+DESCRIPTION="The official server for the sandbox video game"
+HOMEPAGE="https://www.minecraft.net/;
+SRC_URI="https://launcher.mojang.com/v1/objects/${EGIT_COMMIT}/server.jar -> 
${P}.jar"
+
+LICENSE="Mojang"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+   acct-group/minecraft
+   acct-user/minecraft
+   app-misc/screen
+   || (
+   >=virtual/jre-1.8
+   >=virtual/jdk-1.8
+   )
+"
+
+RESTRICT="bindist mirror strip"
+
+S="${WORKDIR}"
+
+src_unpack() {
+   # Don't unpack that jar, just copy it to WORKDIR
+   cp "${DISTDIR}"/${A} "${WORKDIR}" || die
+}
+
+src_compile() {
+   :;
+}
+
+src_install() {
+   java-pkg_newjar minecraft-server-${PV}.jar minecraft-server.jar
+   java-pkg_dolauncher minecraft-server --jar minecraft-server.jar 
--java_args "\${JAVA_OPTS}"
+
+   newinitd "${FILESDIR}"/minecraft-server.initd-r2 minecraft-server
+   newconfd "${FILESDIR}"/minecraft-server.confd minecraft-server
+
+   diropts -o minecraft -g minecraft
+   keepdir /var/lib/minecraft-server
+   keepdir /var/log/minecraft-server
+
+   readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+   readme.gentoo_print_elog
+}



[gentoo-commits] repo/gentoo:master commit in: acct-group/minecraft/

2019-08-07 Thread Joonas Niilola
commit: 27e0bc11dd18d9d55aa2b67b7303c4f7d5b74de0
Author: Conrad Kostecki  kostecki  com>
AuthorDate: Tue Aug  6 18:30:15 2019 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Aug  7 15:34:46 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27e0bc11

acct-group/minecraft: add group for games-server/minecraft-server

GID 490 will be used, as its the next available.
Arch and Fedora don't have a GID for the minecraft group.

Package-Manager: Portage-2.3.70, Repoman-2.3.16
Signed-off-by: Conrad Kostecki  kostecki.com>
Signed-off-by: Joonas Niilola  gentoo.org>

 acct-group/minecraft/metadata.xml   | 12 
 acct-group/minecraft/minecraft-0.ebuild | 10 ++
 2 files changed, 22 insertions(+)

diff --git a/acct-group/minecraft/metadata.xml 
b/acct-group/minecraft/metadata.xml
new file mode 100644
index 000..54d5423c406
--- /dev/null
+++ b/acct-group/minecraft/metadata.xml
@@ -0,0 +1,12 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   ck+gen...@bl4ckb0x.de
+   Conrad Kostecki
+   
+   
+   proxy-ma...@gentoo.org
+   Proxy Maintainers
+   
+

diff --git a/acct-group/minecraft/minecraft-0.ebuild 
b/acct-group/minecraft/minecraft-0.ebuild
new file mode 100644
index 000..4b075b5967f
--- /dev/null
+++ b/acct-group/minecraft/minecraft-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for the Minecraft server"
+
+ACCT_GROUP_ID="490"



[gentoo-commits] repo/gentoo:master commit in: acct-user/minecraft/

2019-08-07 Thread Joonas Niilola
commit: c2547f538a0f3f07aad35aacee690f09c441c342
Author: Conrad Kostecki  kostecki  com>
AuthorDate: Tue Aug  6 18:31:13 2019 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Aug  7 15:34:51 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2547f53

acct-user/minecraft: add user for games-server/minecraft-server

UID 490 will be used, as its available.
Arch and Fedora don't have a UID for the minecraft user.

Package-Manager: Portage-2.3.70, Repoman-2.3.16
Signed-off-by: Conrad Kostecki  kostecki.com>
Signed-off-by: Joonas Niilola  gentoo.org>

 acct-user/minecraft/metadata.xml   | 12 
 acct-user/minecraft/minecraft-0.ebuild | 14 ++
 2 files changed, 26 insertions(+)

diff --git a/acct-user/minecraft/metadata.xml b/acct-user/minecraft/metadata.xml
new file mode 100644
index 000..54d5423c406
--- /dev/null
+++ b/acct-user/minecraft/metadata.xml
@@ -0,0 +1,12 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   ck+gen...@bl4ckb0x.de
+   Conrad Kostecki
+   
+   
+   proxy-ma...@gentoo.org
+   Proxy Maintainers
+   
+

diff --git a/acct-user/minecraft/minecraft-0.ebuild 
b/acct-user/minecraft/minecraft-0.ebuild
new file mode 100644
index 000..8762fb77e5a
--- /dev/null
+++ b/acct-user/minecraft/minecraft-0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for the Minecraft server"
+
+ACCT_USER_GROUPS=( "minecraft" )
+ACCT_USER_HOME="/var/lib/minecraft-server"
+ACCT_USER_ID="490"
+
+acct-user_add_deps



[gentoo-commits] repo/gentoo:master commit in: acct-group/mysql/

2019-08-07 Thread Mikle Kolyada
commit: 9f907b74bf5082d71e68d3271f37fa8c89e55f98
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Wed Aug  7 15:09:34 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Wed Aug  7 15:11:21 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f907b74

acct-group/mysql: [QA] Drop keywords

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Mikle Kolyada  gentoo.org>

 acct-group/mysql/mysql-0.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/acct-group/mysql/mysql-0.ebuild b/acct-group/mysql/mysql-0.ebuild
index 5d035f87795..e6012a6461f 100644
--- a/acct-group/mysql/mysql-0.ebuild
+++ b/acct-group/mysql/mysql-0.ebuild
@@ -8,4 +8,3 @@ inherit acct-group
 DESCRIPTION="MySQL program group"
 ACCT_GROUP_ID=60
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh 
sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"



[gentoo-commits] repo/gentoo:master commit in: acct-user/mysql/

2019-08-07 Thread Mikle Kolyada
commit: 231754cd538f0318d43d3dd2a7a2d0907166c8c3
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Wed Aug  7 15:10:53 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Wed Aug  7 15:11:21 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=231754cd

acct-user/mysql: [QA] Drop keywords

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Mikle Kolyada  gentoo.org>

 acct-user/mysql/mysql-0.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/acct-user/mysql/mysql-0.ebuild b/acct-user/mysql/mysql-0.ebuild
index 3062dd5c5fa..567a061bd14 100644
--- a/acct-user/mysql/mysql-0.ebuild
+++ b/acct-user/mysql/mysql-0.ebuild
@@ -10,4 +10,3 @@ ACCT_USER_ID=60
 ACCT_USER_GROUPS=( mysql )
 acct-user_add_deps
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh 
sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"



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

2019-08-07 Thread Guilherme Amadio
commit: f96b62c309fb60ff7df1122e01ba31726ecf349a
Author: Guilherme Amadio  gentoo  org>
AuthorDate: Wed Aug  7 14:36:53 2019 +
Commit: Guilherme Amadio  gentoo  org>
CommitDate: Wed Aug  7 14:48:48 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f96b62c3

dev-util/perf: fix ${D} vs ${ED} for prefix

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Guilherme Amadio  gentoo.org>

 dev-util/perf/perf-4.14.33-r1.ebuild | 4 ++--
 dev-util/perf/perf-4.20.3.ebuild | 6 +++---
 dev-util/perf/perf-5.1.15.ebuild | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dev-util/perf/perf-4.14.33-r1.ebuild 
b/dev-util/perf/perf-4.14.33-r1.ebuild
index 6eb3fa30238..62f2873092f 100644
--- a/dev-util/perf/perf-4.14.33-r1.ebuild
+++ b/dev-util/perf/perf-4.14.33-r1.ebuild
@@ -163,8 +163,8 @@ src_install() {
perf_make -f Makefile.perf install DESTDIR="${D}"
 
if use gtk; then
-   mv "${D}"/usr/$(get_libdir)/libperf-gtk.so \
-   "${D}"/usr/libexec/perf-core || die
+   mv "${ED}"/usr/$(get_libdir)/libperf-gtk.so \
+   "${ED}"/usr/libexec/perf-core || die
fi
 
dodoc CREDITS

diff --git a/dev-util/perf/perf-4.20.3.ebuild b/dev-util/perf/perf-4.20.3.ebuild
index 5439d2b00ec..04e3df46fcb 100644
--- a/dev-util/perf/perf-4.20.3.ebuild
+++ b/dev-util/perf/perf-4.20.3.ebuild
@@ -198,11 +198,11 @@ src_test() {
 src_install() {
perf_make -f Makefile.perf install DESTDIR="${D}"
 
-   rm -rv "${D}"/usr/share/doc/perf-tip || die
+   rm -rv "${ED}"/usr/share/doc/perf-tip || die
 
if use gtk; then
-   mv "${D}"/usr/$(get_libdir)/libperf-gtk.so \
-   "${D}"/usr/libexec/perf-core || die
+   mv "${ED}"/usr/$(get_libdir)/libperf-gtk.so \
+   "${ED}"/usr/libexec/perf-core || die
fi
 
dodoc CREDITS

diff --git a/dev-util/perf/perf-5.1.15.ebuild b/dev-util/perf/perf-5.1.15.ebuild
index 269c7c597ef..791892da875 100644
--- a/dev-util/perf/perf-5.1.15.ebuild
+++ b/dev-util/perf/perf-5.1.15.ebuild
@@ -212,11 +212,11 @@ src_test() {
 src_install() {
perf_make -f Makefile.perf install DESTDIR="${D}"
 
-   rm -rv "${D}"/usr/share/doc/perf-tip || die
+   rm -rv "${ED}"/usr/share/doc/perf-tip || die
 
if use gtk; then
-   mv "${D}"/usr/$(get_libdir)/libperf-gtk.so \
-   "${D}"/usr/libexec/perf-core || die
+   mv "${ED}"/usr/$(get_libdir)/libperf-gtk.so \
+   "${ED}"/usr/libexec/perf-core || die
fi
 
dodoc CREDITS



[gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-new/

2019-08-07 Thread Michael Orlitzky
commit: c06cd310cdb05ed117dbd2c486827732d48eead9
Author: Ralph Seichter  seichter  de>
AuthorDate: Tue Jul 30 17:09:53 2019 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Wed Aug  7 14:09:21 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c06cd310

mail-filter/amavisd-new: Upstream release 2.12.0

This ebuild uses EAPI 7 and introduces USE flags 'rspamd' and
'rspamd-https' to support Amavis' new Rspamd extension.

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Ralph Seichter  seichter.de>
Signed-off-by: Michael Orlitzky  gentoo.org>

 mail-filter/amavisd-new/Manifest  |   1 +
 mail-filter/amavisd-new/amavisd-new-2.12.0.ebuild | 193 ++
 mail-filter/amavisd-new/metadata.xml  |   6 +
 3 files changed, 200 insertions(+)

diff --git a/mail-filter/amavisd-new/Manifest b/mail-filter/amavisd-new/Manifest
index 276f10f8e9d..e9ebe5f421b 100644
--- a/mail-filter/amavisd-new/Manifest
+++ b/mail-filter/amavisd-new/Manifest
@@ -1 +1,2 @@
 DIST amavis-amavisd-new-2.11.1.tar.gz 1093467 BLAKE2B 
1e43ddea86ff269b02cbbcd125d913c51b66728b1063cde6ca3f3f24f1bd36f9f3c7f51a8baf509d2aca0d41a07a00bb9abe08dd70724391c552634715d01a75
 SHA512 
6ef291868908bd13d6ce913f5c8c3898b35eba490877e8eded3951a32be7549145df5db1409f124a3631ec88dd7eeb9457ce2b063ae3e3bccd76cc2a9b8741ae
+DIST amavis-v2.12.0.tar.bz2 873702 BLAKE2B 
cae44bb9cfa9125f44b1ef548947a5f826e91fc349b12a52f0267933e65c450a708c7a18e5ae90ee1a0d452d0b3d30a6c1cabcc310e3609de1eda8c35f222306
 SHA512 
f8d2dfb6e7d694c76c0ebca7592a3c85ff9b4911cbe43b3eb6d5002541bf036adfbf47c18df4b10c72bcceee0d8701b8c474e6432c5c136ca25170e42098d844

diff --git a/mail-filter/amavisd-new/amavisd-new-2.12.0.ebuild 
b/mail-filter/amavisd-new/amavisd-new-2.12.0.ebuild
new file mode 100644
index 000..6648dadf9c1
--- /dev/null
+++ b/mail-filter/amavisd-new/amavisd-new-2.12.0.ebuild
@@ -0,0 +1,193 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit systemd user
+
+DESCRIPTION="High-performance interface between the MTA and content checkers"
+HOMEPAGE="https://gitlab.com/amavis/amavis;
+SRC_URI="${HOMEPAGE}/-/archive/v${PV}/amavis-v${PV}.tar.bz2"
+
+LICENSE="GPL-2 BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE="clamav courier dkim ldap mysql postgres qmail razor rspamd rspamd-https 
snmp spamassassin zmq"
+
+MY_RSPAMD_DEPEND="( dev-perl/JSON dev-perl/HTTP-Message 
dev-perl/LWP-UserAgent-Determined )"
+RDEPEND=">=dev-lang/perl-5.10.0
+   app-arch/arc
+   app-arch/bzip2
+   app-arch/cabextract
+   app-arch/cpio
+   app-arch/gzip
+   app-arch/lha
+   app-arch/lrzip
+   app-arch/lzop
+   app-arch/ncompress
+   app-arch/p7zip
+   app-arch/pax
+   app-arch/unarj
+   app-arch/unrar
+   app-arch/xz-utils
+   app-arch/zoo
+   clamav? ( app-antivirus/clamav )
+   >=dev-perl/Archive-Zip-1.14
+   dev-perl/BerkeleyDB
+   dev-perl/Convert-BinHex
+   dev-perl/File-LibMagic
+   dev-perl/IO-Socket-SSL
+   dev-perl/IO-stringy
+   >=dev-perl/Mail-DKIM-0.31
+   >=dev-perl/MailTools-1.58
+   >=dev-perl/MIME-tools-5.415
+   dev-perl/Net-LibIDN
+   >=dev-perl/Net-Server-0.91
+   dev-perl/Net-SSLeay
+   dev-perl/Unix-Syslog
+   ldap? ( >=dev-perl/perl-ldap-0.33 )
+   mysql? ( dev-perl/DBD-mysql )
+   net-mail/ripole
+   net-mail/tnef
+   postgres? ( dev-perl/DBD-Pg )
+   razor? ( mail-filter/razor )
+   rspamd? ( ${MY_RSPAMD_DEPEND} )
+   rspamd-https? ( ${MY_RSPAMD_DEPEND} dev-perl/LWP-Protocol-https 
dev-perl/Net-SSLeay )
+   snmp? ( net-analyzer/net-snmp[perl] )
+   spamassassin? ( mail-filter/spamassassin dev-perl/Image-Info )
+   >=sys-apps/coreutils-5.0-r3
+   >=sys-libs/db-4.4.20
+   virtual/mta
+   >=virtual/perl-Compress-Raw-Zlib-2.017
+   virtual/perl-Digest-MD5
+   virtual/perl-File-Temp
+   >=virtual/perl-IO-Compress-1.35
+   virtual/perl-IO-Socket-IP
+   virtual/perl-MIME-Base64
+   >=virtual/perl-Time-HiRes-1.49
+   zmq? ( dev-perl/ZMQ-LibZMQ3 )"
+
+AMAVIS_ROOT="/var/amavis"
+S="${WORKDIR}/amavis-v${PV}"
+
+pkg_setup() {
+   # Create the user beforehand so that we can install the config file
+   # (and some directories) with group "amavis" in src_install().
+   enewgroup amavis
+   enewuser amavis -1 -1 "${AMAVIS_ROOT}" amavis
+}
+
+src_prepare() {
+   if use courier ; then
+   eapply -p0 amavisd-new-courier.patch
+   fi
+
+   if use qmail ; then
+   eapply -p0 amavisd-new-qmqpqq.patch
+   fi
+
+   # We need to fix the daemon_user and daemon_group in amavis-mc even
+   # though we're going to run it in the foreground, because it calls
+   # "drop_priv" unconditionally and will crash if its user/group
+   # doesn't exist.
+   sed -i  \
+

[gentoo-commits] repo/gentoo:master commit in: media-fonts/terminus-font/

2019-08-07 Thread Lars Wendler
commit: 19c8f65b6603a28fb6c6cac4756de90eab8dc6ac
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Aug  7 12:31:58 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Aug  7 13:44:15 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19c8f65b

media-fonts/terminus-font: Bump to version 4.48

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Lars Wendler  gentoo.org>

 media-fonts/terminus-font/Manifest |  1 +
 .../terminus-font/terminus-font-4.48.ebuild| 91 ++
 2 files changed, 92 insertions(+)

diff --git a/media-fonts/terminus-font/Manifest 
b/media-fonts/terminus-font/Manifest
index d7f7326206f..29b28b6ce3d 100644
--- a/media-fonts/terminus-font/Manifest
+++ b/media-fonts/terminus-font/Manifest
@@ -1,2 +1,3 @@
 DIST terminus-font-4.46.tar.gz 590210 BLAKE2B 
427b4878afd47cc6c1a0ba6b6116568630a618e313c24744b3465b3e301e142ccbb9bd5e336bed7d98f3d1e01a0a61c6fbdd17912f4d9332ed5430ef47bca4fe
 SHA512 
ae221920ecff54b9575a25d30a429feee6e19ef1e9669896c34f86f80d5495c3654f5423ff1df76e86bc999d1f37c306048b44d8ca55144f0f299926d3d33b58
 DIST terminus-font-4.47.tar.gz 620344 BLAKE2B 
10eaac6ff4880652ee7373374735629cada73e1cb63344b75b579532fad154b10322a7cb3691c2270c2b4d1aee0914c64338d3650625883752c7e33e5205212a
 SHA512 
09455d107a09c422f4fedfcc70ae1483063c844fb01b0adfa3d2a0e28c9502e9ca922542b5ad735cbebb491d148c453d0213d61ebebf64c79f16cb582964fa47
+DIST terminus-font-4.48.tar.gz 620561 BLAKE2B 
8ab977a0b4b529faa38d082969e10a8f0ca3860b745441ed8f45761b95869194226446c487bc7c5490d2a88d1836aa6152424d6646b63b9fbc11e43dc8e255d6
 SHA512 
5f45f7d0e7396f02158f4751aaafb3f0a3fb68dbe3e5501f86a5138c6d52f5106053e38c368d560e5979e29250074dbde5165702b8905a564d029663a2219af4

diff --git a/media-fonts/terminus-font/terminus-font-4.48.ebuild 
b/media-fonts/terminus-font/terminus-font-4.48.ebuild
new file mode 100644
index 000..88a3b1caad3
--- /dev/null
+++ b/media-fonts/terminus-font/terminus-font-4.48.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+inherit font python-any-r1
+
+DESCRIPTION="A clean fixed font for the console and X11"
+HOMEPAGE="http://terminus-font.sourceforge.net/;
+SRC_URI="mirror://sourceforge/${PN}/${P}/${P}.tar.gz"
+
+LICENSE="OFL-1.1 GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="a-like-o +center-tilde distinct-l +pcf +pcf-unicode-only +psf quote
+   ru-dv +ru-g ru-i ru-k"
+
+DEPEND="app-arch/gzip
+   ${PYTHON_DEPEND}
+   virtual/awk
+   pcf? ( x11-apps/bdftopcf )"
+RDEPEND=""
+
+FONTDIR=/usr/share/fonts/terminus
+FONT_CONF=( 75-yes-terminus.conf )
+DOCS=( README README-BG AUTHORS CHANGES )
+
+REQUIRED_USE="X? ( pcf )"
+
+pkg_setup() {
+   python_setup
+}
+
+src_prepare() {
+   default
+
+   # Upstream patches. Some of them are suggested to be applied by default
+   # dv - de NOT like latin g, but like caps greek delta
+   #  ve NOT like greek beta, but like caps latin B
+   # ge - ge NOT like "mirrored" latin s, but like caps greek gamma
+   # ka - small ka NOT like minimised caps latin K, but like small latin k
+   use a-like-o&& eapply "${S}"/alt/ao2.diff
+   use center-tilde&& eapply "${S}"/alt/td1.diff
+   use distinct-l  && eapply "${S}"/alt/ll2.diff
+   use ru-i&& eapply "${S}"/alt/ij1.diff
+   use ru-k&& eapply "${S}"/alt/ka2.diff
+   use ru-dv   && eapply "${S}"/alt/dv1.diff
+   use ru-g&& eapply "${S}"/alt/ge2.diff
+   use quote   && eapply "${S}"/alt/gq2.diff
+}
+
+src_configure() {
+   local configure_args=(
+   --prefix="${EPREFIX}"/usr
+   --psfdir="${EPREFIX}"/usr/share/consolefonts
+   --x11dir="${EPREFIX}"/${FONTDIR}
+   )
+   # selfwritten configure script
+   ./configure "${configure_args[@]}" || die
+}
+
+src_compile() {
+   local args=(
+   $(usex psf 'psf psf-vgaw' '')
+   $(usex pcf 'pcf pcf-8bit' '')
+   )
+   [[ ${#args[@]} -gt 0 ]] && emake "${args[@]}"
+}
+
+src_install() {
+   local args=(
+   $(usex psf 'install-psf install-psf-vgaw install-psf-ref' '')
+   $(usex pcf 'install-pcf' '')
+   )
+   # Set the CHECKDIR to a dummy location so we always get the same set of
+   # files installed regardless of what is in / or ROOT or wherever.
+   [[ ${#args[@]} -gt 0 ]] && emake DESTDIR="${D}" CHECKDIR="${D}" 
"${args[@]}"
+
+   # Remove trans files that the kbd package takes care of installing.
+   rm -f "${ED}"/usr/share/consoletrans/*.trans
+
+   if use pcf-unicode-only; then
+   # Only the ter-x* fonts 

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

2019-08-07 Thread Lars Wendler
commit: 2a20d0eddf595a0962b895099ca2c6ad656e8575
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Aug  7 13:44:02 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Aug  7 13:44:16 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a20d0ed

media-libs/flac: Bump to version 1.3.3

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Lars Wendler  gentoo.org>

 media-libs/flac/Manifest  |  1 +
 media-libs/flac/flac-1.3.3.ebuild | 58 +++
 2 files changed, 59 insertions(+)

diff --git a/media-libs/flac/Manifest b/media-libs/flac/Manifest
index 64ea4e8e9c8..21a5f90a300 100644
--- a/media-libs/flac/Manifest
+++ b/media-libs/flac/Manifest
@@ -1 +1,2 @@
 DIST flac-1.3.2.tar.xz 776192 BLAKE2B 
ff09df3fc4f985a00fcf6d497be675ceeda85cc57ea73b4f8ad6679cd40a33640f8502adc80c0a571d01fa0a17b8fcb6bfd8df7474620099d4f34bbc073bc7a3
 SHA512 
63910e8ebbe508316d446ffc9eb6d02efbd5f47d29d2ea7864da9371843c8e671854db6e89ba043fe08aef1845b8ece70db80f1cce853f591ca30d56ef7c3a15
+DIST flac-1.3.3.tar.xz 1044472 BLAKE2B 
14acf10e5bce54767a8e3c9bfd0b80c388011e35c7e6a814672f8048d5350b4e6f54c6df4f704e611fa4a796fcfcb6aca1ed798f542cd6abe181210f9f6e33f6
 SHA512 
d6417e14fab0c41b2df369e5e39ce62a5f588e491af4d465b0162f74e171e5549b2f061867f344bfbf8aaccd246bf5f2acd697e532a2c7901c920c69429b1a28

diff --git a/media-libs/flac/flac-1.3.3.ebuild 
b/media-libs/flac/flac-1.3.3.ebuild
new file mode 100644
index 000..77a1ef44f65
--- /dev/null
+++ b/media-libs/flac/flac-1.3.3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+DESCRIPTION="free lossless audio encoder and decoder"
+HOMEPAGE="https://xiph.org/flac/;
+SRC_URI="https://downloads.xiph.org/releases/${PN}/${P}.tar.xz;
+
+LICENSE="BSD FDL-1.2 GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc 
~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="altivec +cxx debug ogg cpu_flags_x86_sse static-libs"
+
+RDEPEND="ogg? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+   abi_x86_32? ( dev-lang/nasm )
+"
+BDEPEND="
+   app-arch/xz-utils
+   virtual/pkgconfig
+   !elibc_uclibc? ( sys-devel/gettext )
+"
+
+multilib_src_configure() {
+   local myeconfargs=(
+   --disable-doxygen-docs
+   --disable-examples
+   --disable-xmms-plugin
+   $([[ ${CHOST} == *-darwin* ]] && echo 
"--disable-asm-optimizations")
+   $(use_enable altivec)
+   $(use_enable cpu_flags_x86_sse sse)
+   $(use_enable cxx cpplibs)
+   $(use_enable debug)
+   $(use_enable ogg)
+   $(use_enable static-libs static)
+
+   # cross-compile fix (bug #521446)
+   # no effect if ogg support is disabled
+   --with-ogg
+   )
+   ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+   if [[ ${UID} != 0 ]]; then
+   emake -j1 check
+   else
+   ewarn "Tests will fail if ran as root, skipping."
+   fi
+}
+
+multilib_src_install_all() {
+   einstalldocs
+   find "${ED}" -type f -name '*.la' -delete || die
+}



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

2019-08-07 Thread Lars Wendler
commit: a4157b897aaa756e4a731652b290bfdeef02
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Aug  7 13:05:31 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Aug  7 13:44:16 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4157b89

net-libs/liblockfile: Removed old.

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Lars Wendler  gentoo.org>

 net-libs/liblockfile/Manifest|  1 -
 net-libs/liblockfile/liblockfile-1.13.ebuild | 48 
 net-libs/liblockfile/liblockfile-1.14.ebuild | 48 
 3 files changed, 97 deletions(-)

diff --git a/net-libs/liblockfile/Manifest b/net-libs/liblockfile/Manifest
index 0e46f540804..a0d13e20200 100644
--- a/net-libs/liblockfile/Manifest
+++ b/net-libs/liblockfile/Manifest
@@ -1,4 +1,3 @@
 DIST liblockfile_1.09.orig.tar.gz 32178 BLAKE2B 
b78f632e3bf1ed926596abf9fb0450cc325f888ba245d724f6c02800d939f2d5933b0f90bac92d543cdc5ee6b27f8c4fb70901742e83e8d5becbdbc60e20e5b3
 SHA512 
8577f8bfa9c78983d6a409bc449be0d981e599a6a5f2fc8b43f76a238810ec5e3c180e27280719398f31041ed837fe8ba61df208ce77db77a354453e4579848a
-DIST liblockfile_1.13.orig.tar.gz 67720 BLAKE2B 
c42248c652fda4604a0b4210f77046c2bbb50fc63459da03e1302d436abc21f34e77d17ca9f1e0f80abf674ac9942656014b2ea74bbf9ee92ab17d3c0b2e08cc
 SHA512 
509b00e6841ecdbd6bef0fdf620a31f49b2e07d29c7dd2407297a3e92ded568933d75390f7cab43dd514949c6ccf8924e621324a8d4bbde4c71847b7b257318a
 DIST liblockfile_1.14.orig.tar.gz 67856 BLAKE2B 
1b83c79217c533ed3f5ef0e3ee33877d541670e14eaa2003b37b5a9b0ae544611f88beb28ecb527d82295e41744e1dfc653b7822436a314c25444a686f30b89d
 SHA512 
d6d75a1ddb55bae8ee63bd0cbacf7ab8cd6d28b29a7d3c2e4a5c31c76c6743ed517cdebd42e3ef5c44698faebfd1537b023510c692b54a1275e7114605fe6550
 DIST liblockfile_1.15.orig.tar.gz 68238 BLAKE2B 
3819e6f391467073836ed790ce9b8bbac8e9887d0aea19b1bb083c1020a2e18d3364a087a8c0e962aac66a904768dd843be28e6364b8b150049b6348cfaa944a
 SHA512 
048bbe2c87e85e6ec9b0347809c07183e4210cd565b38653dd1d967106209ccef4146db97afe5a5b7a6d3c58579d4d17f7e241e87be085791bad65b9eeed23f0

diff --git a/net-libs/liblockfile/liblockfile-1.13.ebuild 
b/net-libs/liblockfile/liblockfile-1.13.ebuild
deleted file mode 100644
index 5e227dcd565..000
--- a/net-libs/liblockfile/liblockfile-1.13.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools multilib user
-
-DESCRIPTION="Implements functions designed to lock the standard mailboxes"
-HOMEPAGE="http://www.debian.org/;
-SRC_URI="mirror://debian/pool/main/libl/${PN}/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-S="${WORKDIR}/${PN}"
-
-DOCS=( Changelog README )
-
-PATCHES=(
-   "${FILESDIR}/${PN}-1.13-makefile.patch"
-)
-
-pkg_setup() {
-   enewgroup mail 12
-}
-
-src_prepare() {
-   default
-
-   # I don't feel like making the Makefile portable
-   [[ ${CHOST} == *-darwin* ]] \
-   && cp "${FILESDIR}"/Makefile.Darwin.in Makefile.in
-
-   eautoreconf
-}
-
-src_configure() {
-   local grp=mail
-   if use prefix ; then
-   # we never want to use LDCONFIG
-   export LDCONFIG=${EPREFIX}/bin/true
-   # in unprivileged installs this is "mail"
-   grp=$(id -g)
-   fi
-   econf --with-mailgroup=${grp} --enable-shared
-}

diff --git a/net-libs/liblockfile/liblockfile-1.14.ebuild 
b/net-libs/liblockfile/liblockfile-1.14.ebuild
deleted file mode 100644
index 5e227dcd565..000
--- a/net-libs/liblockfile/liblockfile-1.14.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools multilib user
-
-DESCRIPTION="Implements functions designed to lock the standard mailboxes"
-HOMEPAGE="http://www.debian.org/;
-SRC_URI="mirror://debian/pool/main/libl/${PN}/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-S="${WORKDIR}/${PN}"
-
-DOCS=( Changelog README )
-
-PATCHES=(
-   "${FILESDIR}/${PN}-1.13-makefile.patch"
-)
-
-pkg_setup() {
-   enewgroup mail 12
-}
-
-src_prepare() {
-   default
-
-   # I don't feel like making the Makefile portable
-   [[ ${CHOST} == *-darwin* ]] \
-   && cp "${FILESDIR}"/Makefile.Darwin.in Makefile.in
-
-   eautoreconf
-}
-
-src_configure() {
-   local grp=mail
-   if use prefix ; then
-   # we never want to use 

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

2019-08-07 Thread Lars Wendler
commit: 1b8aed1847c90bb5d40d91c0c0b10592c63ae338
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Aug  7 13:04:40 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Aug  7 13:44:16 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b8aed18

net-libs/liblockfile: Bump to version 1.15

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Lars Wendler  gentoo.org>

 net-libs/liblockfile/Manifest|  1 +
 net-libs/liblockfile/liblockfile-1.15.ebuild | 45 
 2 files changed, 46 insertions(+)

diff --git a/net-libs/liblockfile/Manifest b/net-libs/liblockfile/Manifest
index 0fd9eed430d..0e46f540804 100644
--- a/net-libs/liblockfile/Manifest
+++ b/net-libs/liblockfile/Manifest
@@ -1,3 +1,4 @@
 DIST liblockfile_1.09.orig.tar.gz 32178 BLAKE2B 
b78f632e3bf1ed926596abf9fb0450cc325f888ba245d724f6c02800d939f2d5933b0f90bac92d543cdc5ee6b27f8c4fb70901742e83e8d5becbdbc60e20e5b3
 SHA512 
8577f8bfa9c78983d6a409bc449be0d981e599a6a5f2fc8b43f76a238810ec5e3c180e27280719398f31041ed837fe8ba61df208ce77db77a354453e4579848a
 DIST liblockfile_1.13.orig.tar.gz 67720 BLAKE2B 
c42248c652fda4604a0b4210f77046c2bbb50fc63459da03e1302d436abc21f34e77d17ca9f1e0f80abf674ac9942656014b2ea74bbf9ee92ab17d3c0b2e08cc
 SHA512 
509b00e6841ecdbd6bef0fdf620a31f49b2e07d29c7dd2407297a3e92ded568933d75390f7cab43dd514949c6ccf8924e621324a8d4bbde4c71847b7b257318a
 DIST liblockfile_1.14.orig.tar.gz 67856 BLAKE2B 
1b83c79217c533ed3f5ef0e3ee33877d541670e14eaa2003b37b5a9b0ae544611f88beb28ecb527d82295e41744e1dfc653b7822436a314c25444a686f30b89d
 SHA512 
d6d75a1ddb55bae8ee63bd0cbacf7ab8cd6d28b29a7d3c2e4a5c31c76c6743ed517cdebd42e3ef5c44698faebfd1537b023510c692b54a1275e7114605fe6550
+DIST liblockfile_1.15.orig.tar.gz 68238 BLAKE2B 
3819e6f391467073836ed790ce9b8bbac8e9887d0aea19b1bb083c1020a2e18d3364a087a8c0e962aac66a904768dd843be28e6364b8b150049b6348cfaa944a
 SHA512 
048bbe2c87e85e6ec9b0347809c07183e4210cd565b38653dd1d967106209ccef4146db97afe5a5b7a6d3c58579d4d17f7e241e87be085791bad65b9eeed23f0

diff --git a/net-libs/liblockfile/liblockfile-1.15.ebuild 
b/net-libs/liblockfile/liblockfile-1.15.ebuild
new file mode 100644
index 000..bcfa527efdc
--- /dev/null
+++ b/net-libs/liblockfile/liblockfile-1.15.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib
+
+DESCRIPTION="Implements functions designed to lock the standard mailboxes"
+HOMEPAGE="http://www.debian.org/;
+SRC_URI="mirror://debian/pool/main/libl/${PN}/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="acct-group/mail"
+DEPEND="${RDEPEND}"
+
+DOCS=( Changelog README )
+
+PATCHES=(
+   "${FILESDIR}/${PN}-1.13-makefile.patch"
+)
+
+src_prepare() {
+   default
+
+   # I don't feel like making the Makefile portable
+   [[ ${CHOST} == *-darwin* ]] \
+   && cp "${FILESDIR}"/Makefile.Darwin.in Makefile.in
+
+   eautoreconf
+}
+
+src_configure() {
+   local grp=mail
+   if use prefix ; then
+   # we never want to use LDCONFIG
+   export LDCONFIG=${EPREFIX}/bin/true
+   # in unprivileged installs this is "mail"
+   grp=$(id -g)
+   fi
+   econf --with-mailgroup=${grp} --enable-shared
+}



[gentoo-commits] repo/gentoo:master commit in: app-emulation/faudio/files/, app-emulation/faudio/

2019-08-07 Thread Guilherme Amadio
commit: 2f4920ceed44312716ce5ba4850b26ce3e89b875
Author: Guilherme Amadio  gentoo  org>
AuthorDate: Fri Aug  2 09:03:16 2019 +
Commit: Guilherme Amadio  gentoo  org>
CommitDate: Wed Aug  7 13:35:32 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f4920ce

app-emulation/faudio: fix prefix installation for 19.06

Package-Manager: Portage-2.3.70, Repoman-2.3.16
Signed-off-by: Guilherme Amadio  gentoo.org>

 app-emulation/faudio/faudio-19.06.ebuild | 7 +--
 app-emulation/faudio/files/faudio.pc | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app-emulation/faudio/faudio-19.06.ebuild 
b/app-emulation/faudio/faudio-19.06.ebuild
index 295da563249..82959acb733 100644
--- a/app-emulation/faudio/faudio-19.06.ebuild
+++ b/app-emulation/faudio/faudio-19.06.ebuild
@@ -52,7 +52,7 @@ multilib_src_configure() {
"-DXNASONG=$(usex xnasong ON OFF)"
)
if use ffmpeg; then
-   mycmakeargs+=( 
"-DFFmpeg_LIBRARY_DIRS=${PREFIX%/}/usr/$(get_libdir)"  )
+   mycmakeargs+=( 
"-DFFmpeg_LIBRARY_DIRS=${EPREFIX%/}/usr/$(get_libdir)"  )
fi
cmake-utils_src_configure
 }
@@ -70,7 +70,10 @@ multilib_src_install() {
# FIXME: do we want to install the FAudio tools?
cmake-utils_src_install
 
-   sed -e "s/%LIB%/$(get_libdir)/g" "${FILESDIR}/faudio.pc" \
+   sed -e \
+   "s@%LIB%@$(get_libdir)@g" \
+   "s@%PREFIX%@${EPREFIX}/usr@g" \
+   "${FILESDIR}/faudio.pc" \
> "${T}/faudio.pc" \
|| die "sed failed"
insinto "/usr/$(get_libdir)/pkgconfig"

diff --git a/app-emulation/faudio/files/faudio.pc 
b/app-emulation/faudio/files/faudio.pc
index c632922c1f6..cdb3bf49e64 100644
--- a/app-emulation/faudio/files/faudio.pc
+++ b/app-emulation/faudio/files/faudio.pc
@@ -1,4 +1,4 @@
-prefix=/usr
+prefix=%PREFIX%
 exec_prefix=${prefix}
 libdir=${prefix}/%LIB%
 includedir=${prefix}/include/FAudio



[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-vanilla/

2019-08-07 Thread Guilherme Amadio
commit: 738ec2a42dee7491d1198a20f5ade88df22f8b39
Author: Guilherme Amadio  gentoo  org>
AuthorDate: Fri Aug  2 08:59:53 2019 +
Commit: Guilherme Amadio  gentoo  org>
CommitDate: Wed Aug  7 13:35:32 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=738ec2a4

app-emulation/wine-vanilla: fix prefix support

Package-Manager: Portage-2.3.70, Repoman-2.3.16
Signed-off-by: Guilherme Amadio  gentoo.org>

 app-emulation/wine-vanilla/wine-vanilla-4.12.1.ebuild | 7 +--
 app-emulation/wine-vanilla/wine-vanilla-4.13.ebuild   | 7 +--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.12.1.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-4.12.1.ebuild
index 2c4c919612c..42d4ca69bfa 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.12.1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.12.1.ebuild
@@ -368,7 +368,7 @@ multilib_src_configure() {
--libexecdir="${MY_LIBEXECDIR}"
--localstatedir="${MY_LOCALSTATEDIR}"
--mandir="${MY_MANDIR}"
-   --sysconfdir=/etc/wine
+   --sysconfdir="${EPREFIX}/etc/wine"
$(use_with alsa)
$(use_with capi)
$(use_with lcms cms)
@@ -481,6 +481,9 @@ multilib_src_install_all() {
use abi_x86_32 && pax-mark psmr 
"${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
use abi_x86_64 && pax-mark psmr 
"${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
 
+   # Avoid double prefix from dosym and make_wrapper
+   MY_PREFIX=${MY_PREFIX#${EPREFIX}}
+
if use abi_x86_64 && ! use abi_x86_32; then
dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
@@ -491,7 +494,7 @@ multilib_src_install_all() {
# Make wrappers for binaries for handling multiple variants
# Note: wrappers instead of symlinks because some are shell which use 
basename
local b
-   for b in "${D%/}${MY_PREFIX}"/bin/*; do
+   for b in "${ED%/}${MY_PREFIX}"/bin/*; do
make_wrapper "${b##*/}-${WINE_VARIANT}" 
"${MY_PREFIX}/bin/${b##*/}"
done
eshopts_pop

diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.13.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-4.13.ebuild
index 2c4c919612c..42d4ca69bfa 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.13.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.13.ebuild
@@ -368,7 +368,7 @@ multilib_src_configure() {
--libexecdir="${MY_LIBEXECDIR}"
--localstatedir="${MY_LOCALSTATEDIR}"
--mandir="${MY_MANDIR}"
-   --sysconfdir=/etc/wine
+   --sysconfdir="${EPREFIX}/etc/wine"
$(use_with alsa)
$(use_with capi)
$(use_with lcms cms)
@@ -481,6 +481,9 @@ multilib_src_install_all() {
use abi_x86_32 && pax-mark psmr 
"${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
use abi_x86_64 && pax-mark psmr 
"${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
 
+   # Avoid double prefix from dosym and make_wrapper
+   MY_PREFIX=${MY_PREFIX#${EPREFIX}}
+
if use abi_x86_64 && ! use abi_x86_32; then
dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
@@ -491,7 +494,7 @@ multilib_src_install_all() {
# Make wrappers for binaries for handling multiple variants
# Note: wrappers instead of symlinks because some are shell which use 
basename
local b
-   for b in "${D%/}${MY_PREFIX}"/bin/*; do
+   for b in "${ED%/}${MY_PREFIX}"/bin/*; do
make_wrapper "${b##*/}-${WINE_VARIANT}" 
"${MY_PREFIX}/bin/${b##*/}"
done
eshopts_pop



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

2019-08-07 Thread Ben Kohler
commit: 465633841a4257bdae1f938a66243c87bb818084
Author: Ben Kohler  gentoo  org>
AuthorDate: Wed Aug  7 13:32:12 2019 +
Commit: Ben Kohler  gentoo  org>
CommitDate: Wed Aug  7 13:32:48 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46563384

app-admin/mcelog: bump to 164

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Ben Kohler  gentoo.org>

 app-admin/mcelog/Manifest  |  1 +
 app-admin/mcelog/mcelog-164.ebuild | 58 ++
 2 files changed, 59 insertions(+)

diff --git a/app-admin/mcelog/Manifest b/app-admin/mcelog/Manifest
index fa95c2af915..f58988e5509 100644
--- a/app-admin/mcelog/Manifest
+++ b/app-admin/mcelog/Manifest
@@ -1 +1,2 @@
 DIST mcelog-162.tar.gz 308347 BLAKE2B 
bd438e85ea793c6c5ce4d561f0400e91b101a010cce7f937751a11a0a974fec49db7e9d768fc50db68a91c973c90c8ab1b4ffa80964cb6fde860b9f2ac217435
 SHA512 
d61a0b7ad3974098963edde1e9e9acdf4dbd1a025577b7044bafc17302abd19080c8145a2700c691400af0768ff4b6833d47697e1478c5bef8831f7f8b61ae48
+DIST mcelog-164.tar.gz 308393 BLAKE2B 
da1f425faa88eb8377eb11c3e13aa6fd4c0b4f4d3b02afc2fba8e4137979bb5619b075b0d0ecd80ec6059c9eb912376291e56e667bf7b838bd2f641c4a6c175f
 SHA512 
10c8c580b10caa6d40c2a4887cb9e9ec07eb81a353d24a4d1a89ad8ec5cc29f7976c26335f077393794b060e62b5cbbe348c64567a3cf3fabc3ec5c3fe59da5a

diff --git a/app-admin/mcelog/mcelog-164.ebuild 
b/app-admin/mcelog/mcelog-164.ebuild
new file mode 100644
index 000..557b542b3a9
--- /dev/null
+++ b/app-admin/mcelog/mcelog-164.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info systemd toolchain-funcs
+
+DESCRIPTION="A tool to log and decode Machine Check Exceptions"
+HOMEPAGE="http://mcelog.org/;
+SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="selinux"
+
+RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
+
+# TODO: add mce-inject to the tree to support test phase
+RESTRICT="test"
+
+pkg_pretend() {
+   if [[ ${MERGE_TYPE} != buildonly ]]; then
+   local CONFIG_CHECK="~X86_MCE"
+   kernel_is -ge 4 12 && CONFIG_CHECK+=" ~X86_MCELOG_LEGACY"
+   check_extra_config
+   fi
+}
+
+src_prepare() {
+   eapply "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch \
+   "${FILESDIR}"/${PN}-129-debugflags.patch
+   eapply_user
+   tc-export CC
+}
+
+src_install() {
+   default
+
+   insinto /etc/cron.daily
+   newins ${PN}.cron ${PN}
+
+   insinto /etc/logrotate.d/
+   newins ${PN}.logrotate ${PN}
+
+   newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
+   systemd_dounit "${FILESDIR}"/${PN}.service
+
+   dodoc *.pdf
+}
+
+pkg_postinst() {
+   einfo "The default configuration set is now installed in /etc/${PN}"
+   einfo "you might want to edit those files."
+   einfo
+   einfo "A sample cronjob is installed into /etc/cron.daily"
+   einfo "without executable bit (system service is the preferred method 
now)"
+}



[gentoo-commits] proj/linux-patches: New branch: 5.3

2019-08-07 Thread Mike Pagano
commit: 
Commit: Mike Pagano  gentoo  org>
CommitDate: Wed Aug  7 12:51:53 2019 +

New branch: 5.3




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

2019-08-07 Thread Mike Pagano
commit: c06588b6dfcbf141151a676a7d126155e1f5bc44
Author: Mike Pagano  gentoo  org>
AuthorDate: Wed Aug  7 12:38:53 2019 +
Commit: Mike Pagano  gentoo  org>
CommitDate: Wed Aug  7 12:38:53 2019 +
URL:https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=c06588b6

Update Gentoo Kernel Linux distro patch

Signed-off-by: Mike Pagano  gentoo.org>

 4567_distro-Gentoo-Kconfig.patch | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/4567_distro-Gentoo-Kconfig.patch b/4567_distro-Gentoo-Kconfig.patch
index d6e791a..6ac8208 100644
--- a/4567_distro-Gentoo-Kconfig.patch
+++ b/4567_distro-Gentoo-Kconfig.patch
@@ -1,9 +1,9 @@
 a/Kconfig  2018-09-28 08:08:05.058882080 -0400
-+++ b/Kconfig  2018-09-28 08:09:17.869573745 -0400
-@@ -30,3 +30,5 @@ source "crypto/Kconfig"
- source "lib/Kconfig"
- 
+--- a/Kconfig  2019-08-07 08:33:43.669367779 -0400
 b/Kconfig  2019-08-07 08:34:29.669657000 -0400
+@@ -32,3 +32,5 @@ source "lib/Kconfig"
  source "lib/Kconfig.debug"
+ 
+ source "Documentation/Kconfig"
 +
 +source "distro/Kconfig"
 --- /dev/null  2018-12-28 10:40:34.08934 -0500



  1   2   >