gentoo resync : 30.06.2018

5 files changed, 51 insertions, 11 deletions

diff --git a/x11-plugins/bubblemon/Manifest b/x11-plugins/bubblemon/Manifest
index 31d349c96a09..d70058722630 100644
--- a/x11-plugins/bubblemon/Manifest
+++ b/x11-plugins/bubblemon/Manifest
@@ -1,6 +1,7 @@
-AUX bubblemon-1.46-asneeded.patch 509 BLAKE2B de70f1c68c900db48a2c567c296a1b27d7e0fd6ff1e42fc843e9b6d1dbd3b06b5db96a64ae382f11ec9e10b32d86d16d3779750ef93025bbbe643f93e8eade46 SHA512 66fc827caeb502f24fdd1da09c3530bfc54d862fb8ecb65d67ddf32c47512ad54276c64420fcea663c66a967ec3ef3eafbd058542270fcc5f6516ef343b674ed
-AUX bubblemon-1.46-gtk.patch 3027 BLAKE2B d4b69d4485c76538e101085ca77329605c38fb359a9daa55c00b171b93f99abd326987da7b2ac6817035716dbaa26e770fa91c067d3ff5b870442a2affcc4c9a SHA512 02d49c26cd7795589de217fac7161733579063fb87e448c7405e20119f57adf557b671fa4bf9603647ce3170d28a20e227ee63c17a4787e44d281d3a7eff9c41
-AUX bubblemon-1.46-no_display.patch 720 BLAKE2B 982139bca9a4a1fdedb2a25f63fa80c9d48cffc5681a7577a0779a0fe2f95112b63c6ac4fb594810ea4f7333b80e1a8746075255f5907f331c7a84565d085980 SHA512 2358c336f1795d02d2e0c143c1622e1fcdd24e4d499152013394cc654dd2d61c0f5f50beab967b1be3e362ccf1aeceea4663a82d696e821eb82a63d2738f5aad
+AUX bubblemon-1.46-asneeded.patch 513 BLAKE2B 28d10b30be6936c0e6df4ce208e3e480a363a590e7cfc61d59ced4d61adabb68d79e84ad68c97a754e10f065eb76c1850785142914dcb28f55cab2410fd3d005 SHA512 2c4585a344ea613ebb4b9aa804d3596b2aac1b44d016a07e7e1631f58fd600022ebe0abc6ab6a0612d69ff71a2a7482d3a2b9e16827ce9511a1744c04a92ae4f
+AUX bubblemon-1.46-gtk.patch 3035 BLAKE2B 409edca6249903ab0e5bf241a9282cc3fedf68ffbab4734e3f180c7ec5b97f123868a919d324c1bf6a9f3dffb25de28660ec7b6f0fb0b8c1d43459b622b625e8 SHA512 2b9b8a62983af72e87720c5ede8f81c73be978753ad7d130d57ea44675c2114dae9399c139a35d4a8a6738d7b35b5fbbf3ab2ec90a4b4b05fb2bf8be3d4d65ed
+AUX bubblemon-1.46-no_display.patch 724 BLAKE2B 964793bc692ec4737e563c828c9a50fe9f71390b21d465dbfe63ecee342341b94da9de7d54f1f93cf831ef654c759afd2db7049474713c051cd36393ddf0ff83 SHA512 d00d43b8d7ba870fee5406b495d6577062e4bebd9864dfbf5a29a691dd85d65fab7956c4750e16aa06a4c85ec5f030c9ce22d2f12e77b816d0a80f7e61b06349
 DIST bubblemon-dockapp-1.46.tar.gz 40001 BLAKE2B 1b4bfb91d19d4e2cd653e7df258b248d0e101b431b5ce79900520d75ad39bd006ef583d148afecc1ba1b3f6ace44387f0f1ddf9ad803b47a9bf6481202353bca SHA512 c3d42f82ea7fb837839787a184a6198d7b092451e629562c90735a22166e75f55e8e1af1026e0314a4f06ff68bc48a22157e62bd19e54a4e38b4c12228396fa3
 EBUILD bubblemon-1.46-r2.ebuild 954 BLAKE2B 7e9dc43979c430ea55bbe1cc4cbbbd6c8062c11c973ea45e65b2f90052cb37cbf5110b915769b22595ac4fdcdeb290df026010b7c74fcb4ef5986070b9b985a7 SHA512 b2af344c0fe6957e2e176ad6dcd89887db1ddf4c33484c274280a990b49ea5c5edbf1efb51b37a263b6bbdfa8261c901438af8de2d3ebf5f42754e64c4bfb608
+EBUILD bubblemon-1.46-r3.ebuild 928 BLAKE2B c40857652504c02667de72ca00c4c2ccbac7140ca7952b77141356397881a1f49b9874f30442863241aa6bdbea17e1528f5c6bac0f30930d9b46b35c8ea42fb5 SHA512 82259af3e8c644e9fd4a81856972dabbd32b2b9732cebe579b0651df6afb2171a346cbf59842c7feb6d3decc92b69b840660e9f2b50b2e9a07862e08f9ab8aff
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/bubblemon/bubblemon-1.46-r3.ebuild b/x11-plugins/bubblemon/bubblemon-1.46-r3.ebuild
new file mode 100644
index 000000000000..7650a4f7fe6c
--- /dev/null
+++ b/x11-plugins/bubblemon/bubblemon-1.46-r3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="A fun monitoring applet for your desktop, complete with swimming duck"
+HOMEPAGE="http://www.ne.jp/asahi/linux/timecop"
+SRC_URI="http://www.ne.jp/asahi/linux/timecop/software/${PN}-dockapp-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${PN}-dockapp-${PV}
+
+PATCHES=( "${FILESDIR}"/${P}-gtk.patch
+	"${FILESDIR}"/${P}-asneeded.patch
+	"${FILESDIR}"/${P}-no_display.patch )
+
+src_compile() {
+	tc-export CC
+	emake GENTOO_CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dobin bubblemon
+	dodoc ChangeLog README doc/Xdefaults.sample
+
+	insinto /usr/share/${PN}
+	doins misc/*.{xcf,wav}
+	exeinto /usr/share/${PN}
+	doexe misc/wakwak.sh
+}
diff --git a/x11-plugins/bubblemon/files/bubblemon-1.46-asneeded.patch b/x11-plugins/bubblemon/files/bubblemon-1.46-asneeded.patch
index 3988f3796964..15f323fc471d 100644
--- a/x11-plugins/bubblemon/files/bubblemon-1.46-asneeded.patch
+++ b/x11-plugins/bubblemon/files/bubblemon-1.46-asneeded.patch
@@ -1,5 +1,5 @@
---- Makefile
-+++ Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -32,14 +32,12 @@
  OBJS = bubblemon.o
  BUBBLEMON = bubblemon
diff --git a/x11-plugins/bubblemon/files/bubblemon-1.46-gtk.patch b/x11-plugins/bubblemon/files/bubblemon-1.46-gtk.patch
index 3383c9f5baed..5a57624061c2 100644
--- a/x11-plugins/bubblemon/files/bubblemon-1.46-gtk.patch
+++ b/x11-plugins/bubblemon/files/bubblemon-1.46-gtk.patch
@@ -1,5 +1,5 @@
---- bubblemon.c
-+++ bubblemon.c
+--- a/bubblemon.c
++++ b/bubblemon.c
 @@ -58,6 +58,7 @@
  #include <gdk/gdk.h>
  #include <gdk/gdkx.h>
@@ -33,8 +33,8 @@
  #ifdef KDE_DOCKAPP
      /* makes the dockapp visible inside KDE wm */
      gdk_window_show(bm.iconwin);
---- Makefile
-+++ Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -11,30 +11,49 @@
  
  # no user serviceable parts below
diff --git a/x11-plugins/bubblemon/files/bubblemon-1.46-no_display.patch b/x11-plugins/bubblemon/files/bubblemon-1.46-no_display.patch
index f50d4f50d5ec..3d52cbb43c06 100644
--- a/x11-plugins/bubblemon/files/bubblemon-1.46-no_display.patch
+++ b/x11-plugins/bubblemon/files/bubblemon-1.46-no_display.patch
@@ -1,7 +1,7 @@
 http://bugs.gentoo.org/310399
 
---- bubblemon.c
-+++ bubblemon.c
+--- a/bubblemon.c
++++ b/bubblemon.c
 @@ -44,7 +44,7 @@
   */
  #define _GNU_SOURCE