gentoo resync : 11.05.2018

5 files changed, 15 insertions, 62 deletions

diff --git a/app-misc/neofetch/Manifest b/app-misc/neofetch/Manifest
index c1a906a27dd3..a7cd9f5ab1f0 100644
--- a/app-misc/neofetch/Manifest
+++ b/app-misc/neofetch/Manifest
@@ -1,10 +1,6 @@
-DIST neofetch-3.1.0.tar.gz 68930 BLAKE2B 4809b972f0cb3ea641cbda00e7777617808891d4ae12ddfd52670d8ee490f4659540faf55b994d212e047d5926349dbe8478dc7e3caccf0f22c2b97b57cb9cdc SHA512 0a13acadf1841c1e714c07f9643028446a1f4df6a79e7c3189c4c11d8854813dfbb983784d62dc59a9209893ee2339ca5642fe413d1066a5cb6e9e167ae74975
-DIST neofetch-3.2.0.tar.gz 71331 BLAKE2B 073eeaa74691b3d262fcd0da8da76d9264dc012fda89ce045b4ccdbfead490049bd551d3ff95042a21fb0d6073d1120170f889492ec4ee50c57c3ecd786cb9e4 SHA512 790dd282b99437a416f25a895d5a3359be31d162447e2f59863c635c144045a6b81672e4469ca9b6eeba56fc927e787a67f0a317309bbc0f52500b0f9e072764
 DIST neofetch-3.3.0.tar.gz 76325 BLAKE2B c7bd860dd1f89f4b0e64a5a4dcc6551d548103abbdda0606fdbfa5edbe27d91da053198f219e223af56571a87d3af4b93f8f8d615ad4f377b1754da4bee50526 SHA512 aa220f3d177a3f58e7cb665209e6bd70334eb3d2daccf7ec9cb32353b8c23f53e000f7d412422c8d5fcf1132b39f4a9dc51141ed7359f45c1f0f7a189853baf0
 DIST neofetch-3.4.0.tar.gz 82090 BLAKE2B afc00b37d84cdf3ae0fd4037312b1c67fdadcbe99d6d602e8f3b6caa844b3780861c9d2522ec605ba5b7aa08e4e85ef804129da2ce3f6f01ab8b536704cdd182 SHA512 931648e8173eb91fdf5c79b5bb9b6efef132d30cf2f10d6f75dcff42f3661d40ceec712c109e90e2226e1aa85cad7676c438b6cad49e8298a77d990d9a3d197b
-EBUILD neofetch-3.1.0.ebuild 518 BLAKE2B 3b3600dbe4f7256f3df6263d3c59e0d301f85c2e4ba44c52ea2cb03d62ed41a85c5d81e3d7cc02f2587a442b139aaae96afce8053f4ad5dbb5c7df764b03fdb2 SHA512 a47a3a932714aee7e3abb3806bf67992d97f9e66250bf17f2dd90d8507f7d5b1e04b923f0acbfba28a93b7a08f21030f71d19289fd42ca0b3041df636d08faa7
-EBUILD neofetch-3.2.0.ebuild 518 BLAKE2B 3b3600dbe4f7256f3df6263d3c59e0d301f85c2e4ba44c52ea2cb03d62ed41a85c5d81e3d7cc02f2587a442b139aaae96afce8053f4ad5dbb5c7df764b03fdb2 SHA512 a47a3a932714aee7e3abb3806bf67992d97f9e66250bf17f2dd90d8507f7d5b1e04b923f0acbfba28a93b7a08f21030f71d19289fd42ca0b3041df636d08faa7
 EBUILD neofetch-3.3.0.ebuild 528 BLAKE2B 4d3ec0296e70b97d451c01fb64848095e32acef6018b05a3265940ec77a111fa99210c986f7effab4d3c60183a60175b5299271fb203faeab829656489b02219 SHA512 7b2e63056b104e4cf1b42428311d1d20044f5bcfe601a3ab78bb996a3520a9a7b7f38958efcc44318dc0e0dbe02ee5de223e173beb3e720612f107d37088fe0b
-EBUILD neofetch-3.4.0.ebuild 530 BLAKE2B a3b1dbc0febb43f04311498175106da74d5012a4e6692351fc5556bd0fd5e0c224a22359451d15a1df176514ced95a2b57ec038bbfeeb4152c1546ac9c68c802 SHA512 4299594686814ec37e8421f180aa28af7869d0268416633de96789ec9cc8f6ecede7cb3fab95333ee7891b95872ac455865a81f422c8951436317034a9d5ea79
-EBUILD neofetch-9999.ebuild 489 BLAKE2B 133a0e384dc7610bcb2d1b162d9685e0e72607b36f28cf0ab8efdaef19cef8e0715a433fe914c85b4453eae14d3f4bf47b1b33580429c8ffd3b5a22ea8630aff SHA512 e293dea28a15013729353876565e10636de071fae44260180b563324b2b760e189019d39b216cfd0a2912cf09a70cececc2a391cce625c018f0c500e91a6f11b
+EBUILD neofetch-3.4.0.ebuild 530 BLAKE2B 84caeb2243d4c3c7b453ef5db69d50a35fc298dd7314fc1a5dfcb008c19bbf6c9e939b1151ff0cf96c357144ec10ef9de272e2bd2bc091d763fd2538a80f30f3 SHA512 d6ff236ed8c216239ffffe0cbe23b8a877d8ea07cdb98dc93577eccf7efdda05ffabf6c575c0993402d1683ab526fcfa7bdd02bfbcf33f56aafd23f4444aa1a1
+EBUILD neofetch-9999.ebuild 497 BLAKE2B 793b99ff054d95d04540d626558fd57d89378584a0822d231b01f67d177770c6e7abe717bee7c3a7cebfc4d33f8af6df8254005270b68bce442f5228ec5c3b03 SHA512 6e016dd83987b53dd41d90199e6a1cf40d849e033e5f490609fff17d38f21a24756adf88b60ed5f9fe4cbd46a0818dca6d4e20c1aa56d7936a2162c5c6cf0796
 MISC metadata.xml 808 BLAKE2B 8f8f20ac1f262e69c525c9e626c64ea28ae3165982052dcf74fbcf76b8c362fe6407ddb5994d04dbff6f07ead6ad2c0e3bbe7f9a1a73bc194be30346a3f68c4f SHA512 9e28e51cfba1e7c648cc96d32c2c86a0341dc077457e9e62ce42d667f1a689407e65bf0b7d6df87526167b157b16bb7495752932036c9dff12052573c9f9dae3
diff --git a/app-misc/neofetch/neofetch-3.1.0.ebuild b/app-misc/neofetch/neofetch-3.1.0.ebuild
deleted file mode 100644
index 74d58f581757..000000000000
--- a/app-misc/neofetch/neofetch-3.1.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Simple information system script"
-HOMEPAGE="https://github.com/dylanaraps/neofetch"
-SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"
-LICENSE="MIT-with-advertising"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X"
-
-RDEPEND="sys-apps/pciutils
-	X? (
-		x11-apps/xprop
-		x11-apps/xwininfo
-		x11-apps/xrandr
-		www-client/w3m[imlib]
-		media-libs/imlib2
-		media-gfx/imagemagick
-	)"
diff --git a/app-misc/neofetch/neofetch-3.2.0.ebuild b/app-misc/neofetch/neofetch-3.2.0.ebuild
deleted file mode 100644
index 74d58f581757..000000000000
--- a/app-misc/neofetch/neofetch-3.2.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Simple information system script"
-HOMEPAGE="https://github.com/dylanaraps/neofetch"
-SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"
-LICENSE="MIT-with-advertising"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X"
-
-RDEPEND="sys-apps/pciutils
-	X? (
-		x11-apps/xprop
-		x11-apps/xwininfo
-		x11-apps/xrandr
-		www-client/w3m[imlib]
-		media-libs/imlib2
-		media-gfx/imagemagick
-	)"
diff --git a/app-misc/neofetch/neofetch-3.4.0.ebuild b/app-misc/neofetch/neofetch-3.4.0.ebuild
index 0bfd665036b1..02361f6c21ce 100644
--- a/app-misc/neofetch/neofetch-3.4.0.ebuild
+++ b/app-misc/neofetch/neofetch-3.4.0.ebuild
@@ -13,10 +13,10 @@ IUSE="X"
 
 RDEPEND="sys-apps/pciutils
 	X? (
+		media-gfx/imagemagick
+		media-libs/imlib2
+		www-client/w3m[imlib]
 		x11-apps/xprop
-		x11-apps/xwininfo
 		x11-apps/xrandr
-		www-client/w3m[imlib]
-		media-libs/imlib2
-		media-gfx/imagemagick
+		x11-apps/xwininfo
 	)"
diff --git a/app-misc/neofetch/neofetch-9999.ebuild b/app-misc/neofetch/neofetch-9999.ebuild
index 6a5cf4e804aa..2bcaa63beeae 100644
--- a/app-misc/neofetch/neofetch-9999.ebuild
+++ b/app-misc/neofetch/neofetch-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,10 +12,11 @@ SLOT="0"
 IUSE="X"
 
 RDEPEND="sys-apps/pciutils
-	X? ( x11-apps/xprop
-	x11-apps/xwininfo
-	x11-apps/xrandr
-	www-client/w3m[imlib]
-	media-libs/imlib2
-	media-gfx/imagemagick
-)"
+	X? (
+		media-gfx/imagemagick
+		media-libs/imlib2
+		www-client/w3m[imlib]
+		x11-apps/xprop
+		x11-apps/xrandr
+		x11-apps/xwininfo
+	)"