gentoo resync : 28.04.2019

3 files changed, 35 insertions, 30 deletions

diff --git a/sys-apps/inxi/Manifest b/sys-apps/inxi/Manifest
index 3cbbdeb5e906..c74255858a2f 100644
--- a/sys-apps/inxi/Manifest
+++ b/sys-apps/inxi/Manifest
@@ -1,13 +1,13 @@
-DIST inxi-2.3.37.tar.gz 454862 BLAKE2B f1eae662a2b33b4c3a50f3a9a0a500c9c3d2055f61d8a5096c24bc58f92884ca2e53822953e80ba79e435e7fbfc1c33f65a076145f5eda23fa701782987e3c40 SHA512 0a47cd920e80c518d6d6987945eb9526ee1ce7f6bf62754196e05736db44fbced615d29b6e12787bf55f769ed9963dff0088c96f9dbe13dae7f57744b0172802
 DIST inxi-2.3.43.tar.gz 457941 BLAKE2B cbcdb3061643ba3516c93dc13e5e0e25d0740e4aa39519643467b03913a10e4ad1eed9cd52f62e7dd344b70f41124f248e48e7d1abacd55dbcb1401b07b1a88b SHA512 33c9ae788ab139f5a2511a3b5bd51276dafb3b847920345b02ad717e1da71f9a78fffc9e55b1085c91d014c2da940b1c64f72db9b59f7bb8d7e442bbbc0bd947
 DIST inxi-2.3.47.tar.gz 462826 BLAKE2B c825b80b5b05fabfad22cbcee685d5c5caa7835493555f1e930dfc11aac35fbe7529fa4738d41dfaae4c6130211d42f576d77ba9f764864bfe89b70a4c0d602a SHA512 be2e0f1880e1b7604acd1f7b8f6595536e12fbe0998f85a195e0892bf1b9942c08f791779f99526a337d097259ea8d3cd0b04da465f8deb1b30bbba9fea4dc4e
 DIST inxi-2.3.50.tar.gz 467912 BLAKE2B e4d42fbcf073c5815451848d55ad24b782a0851d7701ca87f88ec97467a7968577d6ebe3818cd2b5a59017fecc11baa686d23ffaf0f18ab086bdba0393a07fba SHA512 5f32abb56f8466b5c166616680bc7b6ab5d38b76720ecf3d7d065c5ae08de0bdcf14c31b9ab207adaa7c46f4f292c9971022f27aabe5aa14bb3e828a01bff97c
 DIST inxi-2.3.55.tar.gz 471764 BLAKE2B 0615ab13b4d3164ea180b3c34ec6e2d4cacad9712d1c7d3161821398498ee31515db8a84019ac64f7e5c8bfda12473341869432dada4649d4d0e65f411eb0903 SHA512 4b5ca427bfe77bbce95f2889e118cc051c7219328f26c1281d8c4fff5b6de1a34c9813367a79d1a92f5808cbd13c669e463d6a5b965def7c3d4ed29c2aa91148
 DIST inxi-2.3.56.tar.gz 227754 BLAKE2B e3edc0cbe2bc98304b950f420f39f25d52717f7ebda83e7106b35e6b04c8fcef118108f95ebce53140ef50a017d3be1c02dd58653940c23b5e3049c3731c3b5b SHA512 db14a63f59cecf490cc456a4b9d7d7d42ee8c1041785c4635611634e3fbe653d2bcd39eeec3becb42e85d100bcb2d2fadba806566eeb8a6182cd0485e97ac1cd
-EBUILD inxi-2.3.37.ebuild 682 BLAKE2B 04680e7cfe7484c592f47222753684436ee0e15bc8cdcdba1886e11cf25fa39c9b38d6faad71558856554793c29e83a78edb9ea7b6291801d3d59b4a7c8e41dd SHA512 8eb8387e4530484bd717b0449ecba493b0551328789afa5b742b9eec6c67d96fa1a5600385e32bf7521f2e4e9f279bcdafbcfb03e2efa3aae7659e287f9d6044
+DIST inxi-3.0.33.1.tar.gz 306370 BLAKE2B 9ebd8d6e00fe241d5fdf52ddbfc01bdb03682f10baf79cf600a4ad94d36870cd5676fb74cbaebd5edfe9288df3c8f649e4f99dd6bbcd12681663423554f74114 SHA512 7239920311e8066f08a6d81525f3608bb555d229bc4f9e33d45442cef4ee219266bdd7c4a7a25de386db8079d1ef496e3fc22620ada772ce6a51c04cb7023256
 EBUILD inxi-2.3.43.ebuild 801 BLAKE2B 5d96bf7434461c805136f71af2f8cbe29455aea670309ef8502a2fda215d2a682532d1bddbcdc720abea7b11e32abb1b6352476dc388dedc0f9ce951dcf4d993 SHA512 d7b716fabac1c5ca6e00fb3baa49c5563a7eade4dd06bd15f87016d41c93caf19903e342bc96284a16d48cf5fb0301e39f65818a9bfaf4b90024ccc8a9720cf3
 EBUILD inxi-2.3.47.ebuild 801 BLAKE2B c4ad47cdced83771be89576fbe0f67f0696335db10111390987c8f690d75027e2bec0ad560b0dea0c88ea0cc4ec142c5ea24aff658597337c4c50cfca4d522aa SHA512 610b8fad3e0c45416edf0b0e313461b7beefcfd8321624209995fec0af9c29c68b0816853931dc665cc7db33d18fe7fec01830bd8d79ad1bd04b074564a5342a
 EBUILD inxi-2.3.50.ebuild 801 BLAKE2B 76fb610a56e89e59f823f63459c8b25f1b1de1e94d20f348b005d3c2100157cb1ee3f952c81facc762950fc9af14dac3cf1da09a944bcd0180cdb3a6a2b5c1cf SHA512 00fb80778b5510756ac782f17c81e57efb6f8aeb35cf30c8cd460b69993a7664795a22ea83954a8fc4775455d10e240878c0896c861f67315198f8ad67b2e616
 EBUILD inxi-2.3.55.ebuild 801 BLAKE2B abb1c53cb6a091142fdc7357a88e1808399c144a131cf1a593fe07961893d7a9d5ccb80583c9cd9624c4c6f50d013e0933b13a3a8c445871b0f4e56dd0b9f62c SHA512 408a987ff2be27b1f0e59a7269cd9b05c4ea60703c9ad385ef75760cf9406ce9f8f11acf8b0d626193b725ce2a3521f877f0723d92d4ca59175f517240b537a3
 EBUILD inxi-2.3.56.ebuild 875 BLAKE2B 9e5145e256cbf92de2e449678fd433195ae3f7f74a20f1a77b7bf251b54b56afdb38865c6cfa270d84f6a5996a27dca7a2fe9e162b5749b52990d5729ed902ce SHA512 a4ee67b58ee48ce462dee98ff3255409fbd0252e516bcdcb78e0bd9cede4c2ffb9e7906fb44a5b0e0c1f9ab062b7540d3d1608965c8ac2c2f39c8670d0514015
+EBUILD inxi-3.0.33.1.ebuild 812 BLAKE2B 45822e1ef6a20bf7680aa2b271ce51b7188bf36f30258a537cb57e31edc2e1dc93d12461c038cee37d8484d1d82d5883399c0dcd681a9b7a6b34e805fb4f3415 SHA512 2c43a3b5264058f0854603c3cdf149549749940daeed273da814422435d58fecd7227c22f2947dec52401348c4dd1a60f9b5adf144eb9a7a42c561e1364a0053
 MISC metadata.xml 444 BLAKE2B 0b67e0f6a42d8b68edcb1fc907729e80cee8ccb0a77fbf768cb40f62e1d665852bf17897466f76b578e2c4225dd5180ccecce899588be420064c5af4b89e99c8 SHA512 f44e29945d98ff44784623624a9c891942c0b69b6272322bd4665a5d49684cc16ee9b01b7a6f60872286a0a96aa437f7b9605aa6820435016e84d92fc96d6fd0
diff --git a/sys-apps/inxi/inxi-2.3.37.ebuild b/sys-apps/inxi/inxi-2.3.37.ebuild
deleted file mode 100644
index dd00c31e2e57..000000000000
--- a/sys-apps/inxi/inxi-2.3.37.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_COMMIT="2b4e89b21ffd06e888d89a38aaedb797ecea4403"
-# ^^ because upstream refuses to tag commits with version numbers
-
-DESCRIPTION="The CLI inxi collects and prints hardware and system information"
-HOMEPAGE="https://github.com/smxi/inxi"
-SRC_URI="https://github.com/smxi/${PN}/tarball/${MY_COMMIT} -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="sys-apps/pciutils
-	sys-apps/usbutils
-	"
-S="${WORKDIR}/smxi-${PN}-${MY_COMMIT:0:7}"
-
-src_install() {
-	dobin "${PN}"
-	unpack "./${PN}.1.gz"
-	doman "${PN}.1"
-}
diff --git a/sys-apps/inxi/inxi-3.0.33.1.ebuild b/sys-apps/inxi/inxi-3.0.33.1.ebuild
new file mode 100644
index 000000000000..430ac49c150b
--- /dev/null
+++ b/sys-apps/inxi/inxi-3.0.33.1.ebuild
@@ -0,0 +1,33 @@
+# 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
+}