gentoo resync : 22.10.2018

4 files changed, 5 insertions, 42 deletions

diff --git a/x11-plugins/docker/Manifest b/x11-plugins/docker/Manifest
index df645de3742d..b3b8c2d78e69 100644
--- a/x11-plugins/docker/Manifest
+++ b/x11-plugins/docker/Manifest
@@ -1,7 +1,6 @@
 AUX docker-1.5-makefile.patch 1437 BLAKE2B 2b21739cfed306b73d4e7041eaffbc5456118d70f828a36b6519f4d2cabd62ad8ffcc0842707b378b2046a1b367685fc1162f6e0865c45ff8b5ad46fd347324f SHA512 c48a8926b49d34fe7c794380d63c240e60d1df7c3d38c2e3ad8762593f36b478f6e90ce2acd4028491f2ad6b615cca3d81be503e60361ca607bef0f617645834
 AUX docker-1.5-makefile_rename.patch 1484 BLAKE2B e5543ba0aa9557f76164f271b01ce1252ccdcbcb633b605c5250b698bbcf7b3e07476d1c474b716db75bfcda3f98dc29e820dfe581a578faa54db5502575c821 SHA512 6299d1bdea793d68212b65525b9b0f0548bdc379b7cd020c2f3d384fe629df42e2be4c29c3a26d06aa7f03abab83e82a33e9aba7edbe34dd1896604a2695622d
 DIST docker-1.5.tar.gz 14863 BLAKE2B 258e0a8a4fbf5246480bb833bf8eca83a983d256b70b02f41123c3788a1381e93a793332b8e857a03bc8afd27aba2201825d290d1d3f3b42decac5fe9b1f06e6 SHA512 71b47156c31e5db5620612d3444eb298489fb33da296742c10543838e65677daa1b81bb054e6a7f57b9e2adef47406c32040983cb09988d93778a555e72cd861
-EBUILD docker-1.5-r1.ebuild 789 BLAKE2B 6b47f8794d0e65bcc924c9c587285cdb8a882108fc13ad731c42b731e99abd1e9a11b784e61f8fbfa1ee4e2baad234b620a4617e215c45664ca8a038de1ef0e9 SHA512 9a3c449bacb800e4c08c9a8a9f799e913d332aad5a4bb30f68223679590b8f8f8259f79b37957299c3e5e6a728de4cfca47f6eb52ca364c00de1560d84eae7e5
-EBUILD docker-1.5-r2.ebuild 703 BLAKE2B e917f3994bb201dec8c1a73a49f488880c53574ede23c8490cf45623b3dffaaf61e58712d81c895f18a0ff11fe650553b2c6194ade0eefa66f47a7bc8d01df29 SHA512 d99e69e96e3b040c7d389db6101c19839047beba8da292f628a9afb092b99c1927eb01693f5aea19049858f6d7adfb35e32fb7655904b4386cf63fefaf51aee5
-EBUILD docker-1.5.ebuild 771 BLAKE2B 42795ce2e264a5368340781f97a31e52a0be2c76ef448555fd3e41a9201ddb5d00615adc0001a952210a0f4562c740eb8d07d03a012c9b92f8ea4242876632e2 SHA512 d47992ff6c593309d4962e26df3f58eb8f482a4c33e055e374e19c02e774f9b6d145da650b53eed9cbecc15df8894e0a9f0b78840b7ae89b58fbc77535a2bc4f
+EBUILD docker-1.5-r1.ebuild 785 BLAKE2B ae97ad0ab29796e3c08451d339dd5fa8cf5033f97e7af4f54fa714cb8d331b7d21d589ac5491ba460808071cb0fa5a0056dd9e5d29ca114a9192ceb22cafeb9f SHA512 b00b0efb4868d2cf60d252ffaa2d8270dfee634287707068f9750b99edafb8dabc460f8504b682f4ab0111363b0eab47a5be457c1f2267e8777a56ddec9c8af9
+EBUILD docker-1.5-r2.ebuild 702 BLAKE2B cc3809bbc6af3dcdc3df2badddd9b44ffaacd7b545bbef4972a3988cb9ea71664aa00281f89f5183e427033a3a0c519f87def0f006524a9db6288ceeb95ecf6c SHA512 2ea6b692a16986a515b327de9fd8ef60bdc19d68bb05102237c8c95c7819eb44c0c8f36dce883f761b9fec2f158b9717b6d7084a7eec494375e01e4d3d555f79
 MISC metadata.xml 353 BLAKE2B daba7749ff12a604d50b655d91edc03ea4b2259e871f42275ac69b9ce2587ecb6f98f0bd33d664f5b1029bbef88e4575b3a35b102df0999dd8e6d456382a5b96 SHA512 4a9684de4ffe83fb609b3c36e721cf0033814ab4f5d664725d1af8caa9c77e095c03d61c33dd7a0f9458a37c184bd8606235f74cbbc6f5c25665681a6e5c0fb3
diff --git a/x11-plugins/docker/docker-1.5-r1.ebuild b/x11-plugins/docker/docker-1.5-r1.ebuild
index 124debd82e1c..94b0e79967ce 100644
--- a/x11-plugins/docker/docker-1.5-r1.ebuild
+++ b/x11-plugins/docker/docker-1.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="https://icculus.org/openbox/2/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.0.4
diff --git a/x11-plugins/docker/docker-1.5-r2.ebuild b/x11-plugins/docker/docker-1.5-r2.ebuild
index 40f8b0626264..ba8e36d2e952 100644
--- a/x11-plugins/docker/docker-1.5-r2.ebuild
+++ b/x11-plugins/docker/docker-1.5-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://icculus.org/openbox/2/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha ~amd64 ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.0.4
diff --git a/x11-plugins/docker/docker-1.5.ebuild b/x11-plugins/docker/docker-1.5.ebuild
deleted file mode 100644
index 3059159f7eb4..000000000000
--- a/x11-plugins/docker/docker-1.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Openbox app which acts as a system tray for KDE and GNOME2"
-HOMEPAGE="https://icculus.org/openbox/2/docker/"
-SRC_URI="https://icculus.org/openbox/2/${PN}/${P}.tar.gz"
-
-RDEPEND=">=dev-libs/glib-2.0.4
-	x11-libs/libX11
-	!app-emulation/docker"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-makefile.patch"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README
-}