x11-plugins/bubblemon: EAPI7, improve ebuild

diff --git a/x11-plugins/bubblemon/bubblemon-1.46-r3.ebuild b/x11-plugins/bubblemon/bubblemon-1.46-r3.ebuild
new file mode 100644 (file)
index 0000000..7650a4f
--- /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 3988f3796964daf2736fad657e810a433a46b017..15f323fc471da1fe23d3c6cd22297a4120f552ff 100644 (file)
--- 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 3383c9f5baede569e0dbf010ee2b349849a863aa..5a57624061c29a5c0bda12ee567d24ffe092c3a5 100644 (file)
--- 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 f50d4f50d5ec53fdfe016637b2705029d7188503..3d52cbb43c0670e23a7f85737fe9324772523728 100644 (file)
--- 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