x11-misc/tint2: version bump, EAPI 6 bump

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=590798
Closes:#3451

5 files changed, 145 insertions, 0 deletions

diff --git a/x11-misc/tint2/Manifest b/x11-misc/tint2/Manifest
index d69f155a703a..9eaf5c4684e3 100644
--- a/x11-misc/tint2/Manifest
+++ b/x11-misc/tint2/Manifest
@@ -1,2 +1,3 @@
 DIST tint2-0.11.tar.bz2 91716 SHA256 fe106e6a6057d2631abddde9f82d3fd4fb1985c4fb93f10d3886417a9e22471d SHA512 db88c17780d24b82badbedbce4518d736dfcb2a730ff500bcb36f2b32f65271c2424f0c2a34981f9d3af033b84252db0c8217e2dd7ca57f9a0eadbc98796115c WHIRLPOOL 4c497995bc5713199a8e624ebfa463edbd610b6d948f1cbfce11ec78e4cd2cd6fad51bd58937b0fce343bb86a29a35bc40eec2bafb687c6ee89355bceb5486ec
+DIST tint2-0.12.12.tar.gz 469724 SHA256 e4c6ffb67eb1242f19d94037b072602bc751ac71ca61352dea3465168e643450 SHA512 10a1f42df6a66f6e092d69cd0ea3d900dcef57b06391206d950a1d7f576a880829bb44d00828a030d3172184db238a22f205169c12cc32cf42c6321d61929a8c WHIRLPOOL 197b92a93eb0368708824159bde41bd81143d0423a1f9ab83b2af4a11b3e3055a40481b9746f095e10cca84f7d772237a92d06bf267761021be308c0b3b5d553
 DIST tint2-0.12.3.tar.gz 251977 SHA256 655cde38f4d358d69f3628f722c7da7768e193769ac876cc24b59f328bcd3d6c SHA512 8022895617905446bc01e548ece9df63d32ae1ef3bafc2de2c79fb2c0e91ab78d036e8c9165ea4d4224dd70edb510266bbea47baf382abbf27a275b60b7d1465 WHIRLPOOL 057ba74074d5e013d9c882a6cbef1bd75f80b1eba857bda933c5936511b1d2b9a519c770b1a2f31360774232e03962ca47dea73ad5f4ef21bcd6530d2c123662
diff --git a/x11-misc/tint2/files/0.12.12-fix-compilation-without-svg.patch b/x11-misc/tint2/files/0.12.12-fix-compilation-without-svg.patch
new file mode 100644
index 000000000000..c6da687baca8
--- /dev/null
+++ b/x11-misc/tint2/files/0.12.12-fix-compilation-without-svg.patch
@@ -0,0 +1,18 @@
+From 2c42a787257e0801b8454fd8960d6794831cedea Mon Sep 17 00:00:00 2001
+From: o9000 <mrovi9000@gmail.com>
+Date: Sat, 8 Oct 2016 15:02:28 +0200
+Subject: Fix compilation with ENABLE_RSVG=OFF (fixes issue #602)
+
+
+diff --git a/src/launcher/launcher.c b/src/launcher/launcher.c
+index 0b4172f..0052e90 100644
+--- a/src/launcher/launcher.c
++++ b/src/launcher/launcher.c
+@@ -30,7 +30,6 @@
+ #include <glib/gi18n.h>
+ #include <glib.h>
+ #include <glib/gstdio.h>
+-#include <gdk-pixbuf/gdk-pixbuf.h>
+ #include <sys/types.h>
+ 
+ #include "window.h"
diff --git a/x11-misc/tint2/files/0.12.12-no-hardcode-update-icon-cache.patch b/x11-misc/tint2/files/0.12.12-no-hardcode-update-icon-cache.patch
new file mode 100644
index 000000000000..21a80eb36d43
--- /dev/null
+++ b/x11-misc/tint2/files/0.12.12-no-hardcode-update-icon-cache.patch
@@ -0,0 +1,34 @@
+From 6306f9920f639cf092ca3f1935ac7aa202f78c86 Mon Sep 17 00:00:00 2001
+From: Yuri Konotopov <ykonotopov@gnome.org>
+Date: Fri, 13 Jan 2017 19:06:43 +0400
+Subject: [PATCH] cmake: do not hardcode icon cache update
+
+---
+ CMakeLists.txt               | 1 -
+ src/tint2conf/CMakeLists.txt | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b4a1089..ef06393 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -241,7 +241,6 @@ set_target_properties( tint2 PROPERTIES LINK_FLAGS "-pthread -fno-strict-aliasin
+ install( TARGETS tint2 DESTINATION bin )
+ install( FILES tint2.svg DESTINATION ${DATADIR}/icons/hicolor/scalable/apps )
+ install( FILES tint2.desktop DESTINATION ${DATADIR}/applications )
+-install( CODE "execute_process(COMMAND gtk-update-icon-cache -f -t ${DATADIR}/icons/hicolor WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX})" )
+ install( FILES themes/tint2rc DESTINATION ${SYSCONFDIR}/xdg/tint2 )
+ install( FILES default_icon.png DESTINATION ${DATADIR}/tint2 )
+ install( FILES AUTHORS ChangeLog README.md doc/tint2.md doc/manual.html doc/readme.html DESTINATION ${DOCDIR} )
+diff --git a/src/tint2conf/CMakeLists.txt b/src/tint2conf/CMakeLists.txt
+index 9595f6a..fd616fa 100644
+--- a/src/tint2conf/CMakeLists.txt
++++ b/src/tint2conf/CMakeLists.txt
+@@ -72,4 +72,3 @@ add_subdirectory(po)
+ install( TARGETS tint2conf DESTINATION bin )
+ install( FILES tint2conf.svg DESTINATION ${DATADIR}/icons/hicolor/scalable/apps )
+ install( FILES tint2conf.desktop DESTINATION ${DATADIR}/applications )
+-install( CODE "execute_process(COMMAND gtk-update-icon-cache -f -t ${DATADIR}/icons/hicolor WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX})" )
+-- 
+2.10.2
+
diff --git a/x11-misc/tint2/files/0.12.12-relax-pango-includes.patch b/x11-misc/tint2/files/0.12.12-relax-pango-includes.patch
new file mode 100644
index 000000000000..e9e40f305b34
--- /dev/null
+++ b/x11-misc/tint2/files/0.12.12-relax-pango-includes.patch
@@ -0,0 +1,26 @@
+From c3a86e185d548e11bb12bc766a58fd3b617c1c46 Mon Sep 17 00:00:00 2001
+From: o9000 <mrovi9000@gmail.com>
+Date: Sun, 18 Sep 2016 12:53:59 +0200
+Subject: [PATCH] Fix include (fixes issue #596)
+
+---
+ src/config.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/src/config.c b/src/config.c
+index a831ece..13f3b7b 100644
+--- a/src/config.c
++++ b/src/config.c
+@@ -31,8 +31,7 @@
+ #include <string.h>
+ #include <ctype.h>
+ #include <glib/gstdio.h>
+-#include <pango/pangocairo.h>
+-#include <pango/pangoxft.h>
++#include <pango/pango-font.h>
+ #include <Imlib2.h>
+ 
+ #include "config.h"
+--
+libgit2 0.24.0
+
diff --git a/x11-misc/tint2/tint2-0.12.12.ebuild b/x11-misc/tint2/tint2-0.12.12.ebuild
new file mode 100644
index 000000000000..785c1a260d63
--- /dev/null
+++ b/x11-misc/tint2/tint2-0.12.12.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils vcs-snapshot
+
+DESCRIPTION="tint2 is a lightweight panel/taskbar for Linux."
+HOMEPAGE="https://gitlab.com/o9000/tint2"
+SRC_URI="https://gitlab.com/o9000/${PN}/repository/archive.tar.gz?ref=v${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="battery svg startup-notification tint2conf"
+
+DEPEND="
+	dev-libs/glib:2
+	svg? ( gnome-base/librsvg:2 )
+	>=media-libs/imlib2-1.4.2[X,png]
+	x11-libs/cairo[X]
+	x11-libs/pango
+	tint2conf? ( x11-libs/gtk+:2 )
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXinerama
+	>=x11-libs/libXrandr-1.3
+	x11-libs/libXrender
+	startup-notification? ( x11-libs/startup-notification )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PV}-fix-compilation-without-svg.patch"
+	"${FILESDIR}/${PV}-no-hardcode-update-icon-cache.patch"
+	"${FILESDIR}/${PV}-relax-pango-includes.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_BATTERY="$(usex battery)"
+		-DENABLE_TINT2CONF="$(usex tint2conf)"
+		-DENABLE_SN="$(usex startup-notification)"
+		-DENABLE_RSVG="$(usex svg)"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}