[gentoo-commits] repo/proj/guru:dev commit in: gui-apps/tiramisu/files/, gui-apps/tiramisu/

[gentoo-commits] repo/proj/guru:dev commit in: gui-apps/tiramisu/files/, gui-apps/tiramisu/

[Aisha Tammy]

commit:     3b91a16ee30026156d9c0c422658911a9694a720
Author:     Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Thu Dec 23 16:46:55 2021 +0000
Commit:     Aisha Tammy <gentoo <AT> aisha <DOT> cc>
CommitDate: Thu Dec 23 16:46:55 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3b91a16e

gui-apps/tiramisu: version bump to 2.0.20211107

now builds with vala

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>

 gui-apps/tiramisu/Manifest                         |  1 +
 .../files/tiramisu-2.0.20211107-pkg-config.patch   | 29 ++++++++++++++++++++++
 ...su-9999.ebuild => tiramisu-2.0.20211107.ebuild} | 11 +++++---
 gui-apps/tiramisu/tiramisu-9999.ebuild             | 11 +++++---
 4 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/gui-apps/tiramisu/Manifest b/gui-apps/tiramisu/Manifest
index c641bc93b..ae01e3ab8 100644
--- a/gui-apps/tiramisu/Manifest
+++ b/gui-apps/tiramisu/Manifest
@@ -1 +1,2 @@
 DIST tiramisu-1.0_p20201110.tar.gz 3063380 BLAKE2B 52b8f46478323b401dd5db96a531c86271b38d61991ee9147ccef400f2563fadacc92a289ef6ea2ccc01507cb1af57f0186a1690d39a421dcccb5d1f73ca3825 SHA512 7f8c978e6ead387fc9ccfb9eb15c73f237e10b14c8eb53e537a869402897e89451af371eabdf76506b9fcf51d6080b21d97863978de5e5e43af2b25578535b1d
+DIST tiramisu-2.0.20211107.tar.gz 3061582 BLAKE2B d6ce0e96e7c41223d08c1581377d83c402cee495497c5ddc7aaf152dc569c6ea65ca602c3c06784e92509a64d2312ad8393a2312ac4acc522f209aae42d55c1c SHA512 ac205467e7e4bec1768040455902bed0bb545f8550d8d22c3ed94fec13cee04409bf1f3e49bd3136cd4f36d312fc553e950ce66eaeb20b4ba0ee7fb3160409fc

diff --git a/gui-apps/tiramisu/files/tiramisu-2.0.20211107-pkg-config.patch b/gui-apps/tiramisu/files/tiramisu-2.0.20211107-pkg-config.patch
new file mode 100644
index 000000000..9871eaf01
--- /dev/null
+++ b/gui-apps/tiramisu/files/tiramisu-2.0.20211107-pkg-config.patch
@@ -0,0 +1,29 @@
+diff --git a/Makefile b/Makefile
+index 7660c8b..f009f4c 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,14 +1,15 @@
+-TARGET   = tiramisu
+-SRC     := src/notification.vala src/dbus.vala src/tiramisu.vala
++TARGET      = tiramisu
++SRC        := src/notification.vala src/dbus.vala src/tiramisu.vala
+ 
+-PREFIX  ?= /usr/local
+-INSTALL  = install -Dm755
+-RM      ?= rm -f
++PREFIX     ?= /usr/local
++INSTALL     = install -Dm755
++RM         ?= rm -f
++PKG_CONFIG ?= pkg-config
+ 
+-VALAC   ?= valac
+-CFLAGS  += -Wall -Wno-unused-value
+-IFLAGS   = --pkg gio-2.0
+-LFLAGS   = `pkg-config --libs glib-2.0 gio-2.0`
++VALAC      ?= valac
++CFLAGS     += -Wall -Wno-unused-value
++IFLAGS      = --pkg gio-2.0
++LFLAGS      = `$(PKG_CONFIG) --libs glib-2.0 gio-2.0`
+ 
+ all: $(TARGET)
+ 

diff --git a/gui-apps/tiramisu/tiramisu-9999.ebuild b/gui-apps/tiramisu/tiramisu-2.0.20211107.ebuild
similarity index 75%
copy from gui-apps/tiramisu/tiramisu-9999.ebuild
copy to gui-apps/tiramisu/tiramisu-2.0.20211107.ebuild
index 61e394264..2a8ff0ec9 100644
--- a/gui-apps/tiramisu/tiramisu-9999.ebuild
+++ b/gui-apps/tiramisu/tiramisu-2.0.20211107.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit toolchain-funcs
+inherit vala
 
 DESCRIPTION="minimalistic desktop notifications provider"
 HOMEPAGE="https://github.com/Sweets/tiramisu"
@@ -21,10 +21,13 @@ SLOT="0"
 
 RDEPEND="dev-libs/glib:2[dbus]"
 DEPEND="${RDEPEND}"
+BDEPEND="$(vala_depend)"
 
-src_configure() {
-	tc-export CC
+PATCHES=( "${FILESDIR}/tiramisu-2.0.20211107-pkg-config.patch" )
+
+src_prepare() {
 	default
+	vala_src_prepare
 }
 
 src_install() {

diff --git a/gui-apps/tiramisu/tiramisu-9999.ebuild b/gui-apps/tiramisu/tiramisu-9999.ebuild
index 61e394264..2a8ff0ec9 100644
--- a/gui-apps/tiramisu/tiramisu-9999.ebuild
+++ b/gui-apps/tiramisu/tiramisu-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit toolchain-funcs
+inherit vala
 
 DESCRIPTION="minimalistic desktop notifications provider"
 HOMEPAGE="https://github.com/Sweets/tiramisu"
@@ -21,10 +21,13 @@ SLOT="0"
 
 RDEPEND="dev-libs/glib:2[dbus]"
 DEPEND="${RDEPEND}"
+BDEPEND="$(vala_depend)"
 
-src_configure() {
-	tc-export CC
+PATCHES=( "${FILESDIR}/tiramisu-2.0.20211107-pkg-config.patch" )
+
+src_prepare() {
 	default
+	vala_src_prepare
 }
 
 src_install() {