gentoo resync : 30.06.2018

5 files changed, 40 insertions, 10 deletions

diff --git a/x11-plugins/docker/Manifest b/x11-plugins/docker/Manifest
index 9a2c576c160b..4e82681f9100 100644
--- a/x11-plugins/docker/Manifest
+++ b/x11-plugins/docker/Manifest
@@ -1,6 +1,7 @@
 AUX docker-1.5-makefile.patch 1437 BLAKE2B 2b21739cfed306b73d4e7041eaffbc5456118d70f828a36b6519f4d2cabd62ad8ffcc0842707b378b2046a1b367685fc1162f6e0865c45ff8b5ad46fd347324f SHA512 c48a8926b49d34fe7c794380d63c240e60d1df7c3d38c2e3ad8762593f36b478f6e90ce2acd4028491f2ad6b615cca3d81be503e60361ca607bef0f617645834
-AUX docker-1.5-makefile_rename.patch 1485 BLAKE2B 9eb850af5f9d28aeddccf8823e55983b334c953df956f28fef45eb9a18934887871ae5b5f8c987d4bada689a00a64e12e4e4d45003b9e7f7b73802a8ab73bcce SHA512 17652b5ea6051264288bdb02dd5936b490a39ed1ce37d6ae00cc41b6b5ebc66fd1532bb60d35182db08776b948ff944cbc7a5ec5d9b067d73afd29827a19f7af
+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 787 BLAKE2B 17c7e90de7035a4debc6bdbbc0bcf3262f3a1f7463d51a9a0b8b3f14ddd9e52d3ab451b699a83b4258cd605e2a2931807deea3c64ffcdabd80f179344753638d SHA512 4435130417c3a40cfcc82e605e72b42c4f9befdc9be4d9bd0025007fbfcdd1b55cae22c55f56cd913978de1907525d291f3d0ad3614dd367973b9c143d0a51f9
-EBUILD docker-1.5.ebuild 769 BLAKE2B 38998e4e03e105ad1fbdd094d8cb0784e7d4f6fe2768897eb9c8ca644a4d788fa7f0c5a9338d171a6fa94c97c5c7144cd1bec91172907cd8a921707981105e25 SHA512 13cc5b076c0725cd789c3bd5cbf8e36560e9444aae56ff75f452648c94263561f51e28cf514ec99f72c03ec15575e4d52303b7956c3b59cd6836de4559717a44
+EBUILD docker-1.5-r1.ebuild 789 BLAKE2B 6b47f8794d0e65bcc924c9c587285cdb8a882108fc13ad731c42b731e99abd1e9a11b784e61f8fbfa1ee4e2baad234b620a4617e215c45664ca8a038de1ef0e9 SHA512 9a3c449bacb800e4c08c9a8a9f799e913d332aad5a4bb30f68223679590b8f8f8259f79b37957299c3e5e6a728de4cfca47f6eb52ca364c00de1560d84eae7e5
+EBUILD docker-1.5-r2.ebuild 705 BLAKE2B d94ef35cde47f5e5fdd383370d0792dff0d19bd7786ee2a0873f956f6f41dda6e32ab998cfdd1d039930bc50632d51831820033434ae53929a6cb03d5b802ec0 SHA512 50a345bea26672c61a2e7ee48a7a89dcf9fe003b68f8be4d9225a95f7c5eb8f9d9c9d751552c31cb871b15d14146213dba03d8f4d37fd753c0586cf649099ce1
+EBUILD docker-1.5.ebuild 771 BLAKE2B 42795ce2e264a5368340781f97a31e52a0be2c76ef448555fd3e41a9201ddb5d00615adc0001a952210a0f4562c740eb8d07d03a012c9b92f8ea4242876632e2 SHA512 d47992ff6c593309d4962e26df3f58eb8f482a4c33e055e374e19c02e774f9b6d145da650b53eed9cbecc15df8894e0a9f0b78840b7ae89b58fbc77535a2bc4f
 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 e8e20671cf35..124debd82e1c 100644
--- a/x11-plugins/docker/docker-1.5-r1.ebuild
+++ b/x11-plugins/docker/docker-1.5-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Openbox app which acts as a system tray for KDE and GNOME2"
-HOMEPAGE="http://icculus.org/openbox/2/docker/"
-SRC_URI="http://icculus.org/openbox/2/${PN}/${P}.tar.gz"
+HOMEPAGE="https://icculus.org/openbox/2/docker/"
+SRC_URI="https://icculus.org/openbox/2/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-plugins/docker/docker-1.5-r2.ebuild b/x11-plugins/docker/docker-1.5-r2.ebuild
new file mode 100644
index 000000000000..8999156d944e
--- /dev/null
+++ b/x11-plugins/docker/docker-1.5-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit 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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.0.4
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${P}-makefile_rename.patch" )
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+pkg_postinst() {
+	einfo "To avoid collision with app-emulation/docker, binary was renamed to wmdocker"
+}
diff --git a/x11-plugins/docker/docker-1.5.ebuild b/x11-plugins/docker/docker-1.5.ebuild
index 2efe733241e0..3059159f7eb4 100644
--- a/x11-plugins/docker/docker-1.5.ebuild
+++ b/x11-plugins/docker/docker-1.5.ebuild
@@ -6,8 +6,8 @@ EAPI=0
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Openbox app which acts as a system tray for KDE and GNOME2"
-HOMEPAGE="http://icculus.org/openbox/2/docker/"
-SRC_URI="http://icculus.org/openbox/2/${PN}/${P}.tar.gz"
+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
diff --git a/x11-plugins/docker/files/docker-1.5-makefile_rename.patch b/x11-plugins/docker/files/docker-1.5-makefile_rename.patch
index 2e742661b11d..cf20a9135aa5 100644
--- a/x11-plugins/docker/files/docker-1.5-makefile_rename.patch
+++ b/x11-plugins/docker/files/docker-1.5-makefile_rename.patch
@@ -1,5 +1,5 @@
---- Makefile.orig	2015-01-19 20:10:47.762522964 +0100
-+++ Makefile	2015-01-19 20:11:11.463545692 +0100
+--- a/Makefile	2015-01-19 20:10:47.762522964 +0100
++++ b/Makefile	2015-01-19 20:11:11.463545692 +0100
 @@ -5,12 +5,10 @@
  #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#