gentoo resync : 28.09.2019

5 files changed, 51 insertions, 2 deletions

diff --git a/sys-apps/inxi/Manifest b/sys-apps/inxi/Manifest
index 559099960b5b..b9e4b0e50a26 100644
--- a/sys-apps/inxi/Manifest
+++ b/sys-apps/inxi/Manifest
@@ -1,5 +1,7 @@
 DIST inxi-3.0.33.1.tar.gz 306370 BLAKE2B 9ebd8d6e00fe241d5fdf52ddbfc01bdb03682f10baf79cf600a4ad94d36870cd5676fb74cbaebd5edfe9288df3c8f649e4f99dd6bbcd12681663423554f74114 SHA512 7239920311e8066f08a6d81525f3608bb555d229bc4f9e33d45442cef4ee219266bdd7c4a7a25de386db8079d1ef496e3fc22620ada772ce6a51c04cb7023256
 DIST inxi-3.0.34.1.tar.gz 308373 BLAKE2B 290a0887a7885b040f614140a99cbd7e0a8f8b89943e2f39cf00f033fb88fbe6a65dd4b5848f4ff7758f5fe81112404abef6102c44f4732308cda0e4ce887766 SHA512 cfc221ce5cd87dd2418ef0a6f916b17ed4a90aa9c6485ffc40a37d87d337f18d1ad98ae53fa366dc56b5250f2e95dc14c528b14d8f796b6d1b26b982cbf0b22b
+DIST inxi-3.0.36.1.tar.gz 311680 BLAKE2B 95c9ab57a9af50ace8fdacebb42a94017b1506a9215f8f70ff35f281dd207685d570fe257abc5446b57dd9b9a7ce28e568a4ebf9d664731dde437a6cfd64647f SHA512 1b242878b9a5180ed63dedcac7381ce41380a1bd95ba7f85bfb2c97b635fdc7700162373078963ef708fa5cd47084aa6f5c71b212042fe1acd87e01a85599296
 EBUILD inxi-3.0.33.1.ebuild 812 BLAKE2B 45822e1ef6a20bf7680aa2b271ce51b7188bf36f30258a537cb57e31edc2e1dc93d12461c038cee37d8484d1d82d5883399c0dcd681a9b7a6b34e805fb4f3415 SHA512 2c43a3b5264058f0854603c3cdf149549749940daeed273da814422435d58fecd7227c22f2947dec52401348c4dd1a60f9b5adf144eb9a7a42c561e1364a0053
-EBUILD inxi-3.0.34.1.ebuild 812 BLAKE2B 45822e1ef6a20bf7680aa2b271ce51b7188bf36f30258a537cb57e31edc2e1dc93d12461c038cee37d8484d1d82d5883399c0dcd681a9b7a6b34e805fb4f3415 SHA512 2c43a3b5264058f0854603c3cdf149549749940daeed273da814422435d58fecd7227c22f2947dec52401348c4dd1a60f9b5adf144eb9a7a42c561e1364a0053
+EBUILD inxi-3.0.34.1.ebuild 940 BLAKE2B a0df1d5c79accdfa98e336565fcd56b617fdac1f3620db6eb37656641eec27994152b9c69c857b2ffd0400d11e8ad564f3605ba6c80cb8aea2f82870b0f5c11e SHA512 9db372af1f597c3ecd81d2a2c17094931ea0c634b0adaf88973ce8cee5bf272ae870219a83252eb0e8c325f562ba60900d512e94043ee7b3f71c1e79487df597
+EBUILD inxi-3.0.36.1.ebuild 940 BLAKE2B a0df1d5c79accdfa98e336565fcd56b617fdac1f3620db6eb37656641eec27994152b9c69c857b2ffd0400d11e8ad564f3605ba6c80cb8aea2f82870b0f5c11e SHA512 9db372af1f597c3ecd81d2a2c17094931ea0c634b0adaf88973ce8cee5bf272ae870219a83252eb0e8c325f562ba60900d512e94043ee7b3f71c1e79487df597
 MISC metadata.xml 444 BLAKE2B 0b67e0f6a42d8b68edcb1fc907729e80cee8ccb0a77fbf768cb40f62e1d665852bf17897466f76b578e2c4225dd5180ccecce899588be420064c5af4b89e99c8 SHA512 f44e29945d98ff44784623624a9c891942c0b69b6272322bd4665a5d49684cc16ee9b01b7a6f60872286a0a96aa437f7b9605aa6820435016e84d92fc96d6fd0
diff --git a/sys-apps/inxi/inxi-3.0.34.1.ebuild b/sys-apps/inxi/inxi-3.0.34.1.ebuild
index 430ac49c150b..4a987eacb4f9 100644
--- a/sys-apps/inxi/inxi-3.0.34.1.ebuild
+++ b/sys-apps/inxi/inxi-3.0.34.1.ebuild
@@ -31,3 +31,8 @@ src_install() {
 	dobin ${PN}
 	doman ${PN}.1
 }
+
+pkg_postinst() {
+	elog "Some features of inxi depend on additional packages. Get a full list with"
+	elog "inxi --recommends"
+}
diff --git a/sys-apps/inxi/inxi-3.0.36.1.ebuild b/sys-apps/inxi/inxi-3.0.36.1.ebuild
new file mode 100644
index 000000000000..4a987eacb4f9
--- /dev/null
+++ b/sys-apps/inxi/inxi-3.0.36.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV=$(ver_rs 3 '-')
+# 2.3.56 was the last version with no tagged release.
+# It was also the last Bash based release. Later versions are Perl based
+
+DESCRIPTION="The CLI inxi collects and prints hardware and system information"
+HOMEPAGE="https://github.com/smxi/inxi"
+SRC_URI="https://github.com/smxi/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="bluetooth hddtemp opengl"
+
+DEPEND=""
+RDEPEND="dev-lang/perl
+	sys-apps/pciutils
+	sys-apps/usbutils
+	bluetooth? ( net-wireless/bluez )
+	hddtemp? ( app-admin/hddtemp )
+	opengl? ( x11-apps/mesa-progs )
+	"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+}
+
+pkg_postinst() {
+	elog "Some features of inxi depend on additional packages. Get a full list with"
+	elog "inxi --recommends"
+}
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 0c010c7aac64..6b377eb28c10 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -11,7 +11,11 @@ DIST iproute2-5.2.0.tar.xz 729540 BLAKE2B 72d082b4f39b6b9f0040149ea14d3c5c6d999e
 DIST iproute2-5.3.0.tar.xz 742660 BLAKE2B e2152eb6c7d443f54bad0aec0cba23656c1defafc53f10130b63288f070e6e77c27a78a3f9bf6f6d14be3490eadd583a779f5d44ec23d16535e14abe04feb848 SHA512 c20ce477cb3ec24194ea56d3d9037795e26975ffde188b63ba974a0aa671dd169f356e9446bf43dc56523e01c0bafa442b91d83da9b2302daee18e237f2f3157
 EBUILD iproute2-4.19.0-r1.ebuild 4375 BLAKE2B 478751ceebaef4c53e975120662b7e5e35b845ca0568cd5866107265c976332661448c0fac1ea6277ef57392ab69ac8012d027e190508dc241821c8ad584f7b4 SHA512 630d8677750918d24be161edf6a8793f5c01ab120fd9b538cf3fde75704d52254e117782d30f70145f741a6d0cc6fd99025bfcb4714c8ce9466130c90f5ec277
 EBUILD iproute2-5.1.0.ebuild 4425 BLAKE2B cd695ac496f8b0bb3e017b5b8d2f074902366fa3185db992070984a83300d72851cce584ad8446530d0f303358afe104ad41d640b1188a753aa25349ce267ecb SHA512 21fcf629dd959d8fea205fcb4fd0fcb1ffa1bfe249ddfc68247350a7c9ee5ec7cf9d6d1b36c0282ce0a5791c0f55ee594b465dfa944e05f7725bc00f5f480f7c
+<<<<<<< HEAD
 EBUILD iproute2-5.2.0-r1.ebuild 4482 BLAKE2B ac9ef5f32153c27d562bde81dca9178f72a511f0c6eac0974f3e6592e1e2d03173a196088080d2acba576fd31a769a91a0e49aa5f62633c0255c6a29ad1947af SHA512 d6585fdc96f7fe03e177a636edfbd2de98650d5fd28f4e7a1f9126e0f0b2a896fe52055d77f211a6808f91e82e98ead9c77e916e39cf132b9fa26c404e667ac1
+=======
+EBUILD iproute2-5.2.0-r1.ebuild 4477 BLAKE2B 82eecea5c98fd3ea3bf2063b32325506defa3001ce4dfb7fe5b9a3d0364f89d95ce0bd99cedcc9c30333880288bc85d9f1a25e3105ebe889ad3ad786de975d93 SHA512 68af3ab9ef46d0224a77a61d94f43744237e1f80bf1a50b0e3cda26f197b5e072896af87d90b08c152a7e28128a1ca37392ca52570584e4818737b90638fc0f9
+>>>>>>> next
 EBUILD iproute2-5.3.0.ebuild 4425 BLAKE2B cd695ac496f8b0bb3e017b5b8d2f074902366fa3185db992070984a83300d72851cce584ad8446530d0f303358afe104ad41d640b1188a753aa25349ce267ecb SHA512 21fcf629dd959d8fea205fcb4fd0fcb1ffa1bfe249ddfc68247350a7c9ee5ec7cf9d6d1b36c0282ce0a5791c0f55ee594b465dfa944e05f7725bc00f5f480f7c
 EBUILD iproute2-9999.ebuild 4380 BLAKE2B 37d298a23f7a6906fcfb6738f37b01af7adf62e51d78200dea1dc21c4fa5ba6d90774b53824c78e3ac8f465df5a4f7aa78cbc1fa501bd87c42da54eafe0bc285 SHA512 642d47e5287d3c5253ae2908ddb47041e398a7460896458f22ca5ad5371511696a05d8dd7f96b0d04bb99336c2cdf72b04ee7a3520ef133678a3fc8fe0b788f3
 MISC metadata.xml 672 BLAKE2B d27b6af84b177e8b12f64470dbac0e8fdcf45091681ced6d5ebd02414849c221e608a6a4bb8ce6aae305475e086cf140836b943a9e5380f10c368ac359397a98 SHA512 d71c5077fcf769520048a46b0fdd3563b974b65afdc68eb73fc0816d2c87dd9a73bca72e25d7e8f3c9f2ceb23c473bb92a1a92d8d5f43a7e15f965669226f0a2
diff --git a/sys-apps/iproute2/iproute2-5.2.0-r1.ebuild b/sys-apps/iproute2/iproute2-5.2.0-r1.ebuild
index a9648404f627..50ea11ec9fec 100644
--- a/sys-apps/iproute2/iproute2-5.2.0-r1.ebuild
+++ b/sys-apps/iproute2/iproute2-5.2.0-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh ~sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"