From 2d2d293703312d154d2e43c359fdeaa426a4ae0e Mon Sep 17 00:00:00 2001
From: David Guglielmi <david.guglielmi@gmail.com>
Date: Tue, 12 Jul 2022 19:17:01 +0200
Subject: [PATCH] net-im/cawbird: rebase to gentoo-x86 version

---
 net-im/cawbird/Manifest                       |  4 +-
 ...ird-1.4.2.ebuild => cawbird-1.5-r2.ebuild} | 67 ++++++++++---------
 2 files changed, 39 insertions(+), 32 deletions(-)
 rename net-im/cawbird/{cawbird-1.4.2.ebuild => cawbird-1.5-r2.ebuild} (56%)

diff --git a/net-im/cawbird/Manifest b/net-im/cawbird/Manifest
index 036ec61..1913eea 100644
--- a/net-im/cawbird/Manifest
+++ b/net-im/cawbird/Manifest
@@ -1,3 +1,3 @@
 AUX corebird.svg 38093 BLAKE2B 88131214eac57aa1a932e4a371d96f8c6a7de3535522256d98b72b3b0c1e96ac7794724d701edcbfe8ad92a587bd62a11dce3ab4a9ea31f1c1e510449ba93955 SHA512 640601d43a373441e725a26d49a574c18804af8761860ff2c89a55a2e48d1e5010ad8dec04fcac40edec8cfe5468483512dc250f2f79ab2c86492b985be3ed60
-DIST cawbird-1.4.2.tar.gz 653216 BLAKE2B c05008a310152c5d190233a7251cf0ca7104f5ca564a1c0f2ac06fb23ded9eb6429965624ae7b7a0b0b763db19ebcb159a138cbed8dac36c3fcaa56d2ead62ee SHA512 409d2b838b9c14c45fb6aa2b04dc1ccaaf76baab7394d630d254dc9a4001f7f53321b88f600e2c3f9c39e19da38dd717f46abb4a63b11696f41e61b9ab8e6452
-EBUILD cawbird-1.4.2.ebuild 1807 BLAKE2B 2daf2ff3775a171516c1cedc159d81990d788bb5e66c0e648a750a27d7c7c13a4030072c2b83db3113dec0753063d55d9888cdf3cdd54afe075070619a93fa9e SHA512 85ec3470f47eb01150e4722daa931f0a0a68b1464d8311566ce1bc5bca54a3c46a09d13e84ea1a2b1f9c20ea5696a50b0921fb47ecb9038b303f61851c886cba
+DIST cawbird-1.5.tar.gz 675527 BLAKE2B d94bf61faba01fc1159fabbf0da24ab49a697112ccd5bb631133c21f52ffe29e9ede214c9eccf553cbbb039b08e487467e4ecc56d0e0ef63f68d4c23d39414aa SHA512 917480ac79606a1ab572f0837fd48e100bbb6d70ad3551a8d86486843d9bfb0e4814c75c56ff0e2aa41fd7d32a614bbff4e6121831b3da7da7614fb5a0d3f6e1
+EBUILD cawbird-1.5-r2.ebuild 1850 BLAKE2B b626f46bbeffe33aceef7240cb86b46af14aa2670ef1b7962615fc5cf16c338c11d912fd5854722cf698739189c0e37ef3844f6b94356db33aca1057d6551d5e SHA512 b5f310540f3f4164e5b7c4ec33bed2ed8e147006b22f56de9890b334d29cb2318e9388d81d5835eb2b37375967376983e4affe67192632ce5cef6b552c55807c
diff --git a/net-im/cawbird/cawbird-1.4.2.ebuild b/net-im/cawbird/cawbird-1.5-r2.ebuild
similarity index 56%
rename from net-im/cawbird/cawbird-1.4.2.ebuild
rename to net-im/cawbird/cawbird-1.5-r2.ebuild
index 293fbe3..5db7706 100644
--- a/net-im/cawbird/cawbird-1.4.2.ebuild
+++ b/net-im/cawbird/cawbird-1.5-r2.ebuild
@@ -1,41 +1,49 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-VALA_MIN_API_VERSION=0.48
+EAPI=8
 
-inherit gnome2-utils meson vala xdg-utils
+inherit gnome2-utils meson vala xdg
 
-DESCRIPTION="Cawbird is a Linux Twitter client"
-HOMEPAGE="https://github.com/IBBoard/cawbird"
-SRC_URI="https://github.com/IBBoard/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="Twitter client"
+HOMEPAGE="https://ibboard.co.uk/cawbird/ https://github.com/IBBoard/cawbird"
+SRC_URI="https://github.com/IBBoard/cawbird/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${P}
 
-LICENSE="GPL-3"
+LICENSE="CC-BY-3.0 GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="corebird-icons gstreamer spellcheck"
+KEYWORDS="amd64"
+IUSE="corebird-icons gstreamer spell"
 
-DEPEND="dev-libs/glib
-	x11-libs/gtk+:3
-	net-libs/rest:0.7
+RDEPEND="
+	dev-db/sqlite:3
+	dev-libs/atk
+	dev-libs/glib:2
 	dev-libs/json-glib
-	dev-db/sqlite
-	net-libs/libsoup:2.4
 	net-libs/liboauth
+	net-libs/libsoup:2.4
+	net-libs/rest:0.7
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/pango
 	gstreamer? (
-		media-libs/gstreamer
 		media-plugins/gst-plugins-gtk
-		media-plugins/gst-plugins-libav
 		media-plugins/gst-plugins-hls
+		media-plugins/gst-plugins-meta[ffmpeg,http,X]
 	)
-	spellcheck? ( app-text/gspell )"
-RDEPEND="${DEPEND}"
-BDEPEND="$(vala_depend)
-	corebird-icons? ( gnome-base/librsvg )"
+	spell? ( app-text/gspell:=[vala] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	$(vala_depend)
+	virtual/pkgconfig
+"
 
 src_prepare() {
 	default
-	vala_src_prepare
+	vala_setup
 
 	if use corebird-icons; then
 		for size in 16 24 32 64 96; do
@@ -50,24 +58,23 @@ src_prepare() {
 
 src_configure() {
 	local emesonargs=(
-		$(meson_use gstreamer video)
-		$(meson_use spellcheck)
-		-Dx11=true
-		-Dmswindows=false
+		# these keys are taken from the readme of cawbird
 		-Dconsumer_key_base64='VmY5dG9yRFcyWk93MzJEZmhVdEk5Y3NMOA=='
 		-Dconsumer_secret_base64='MThCRXIxbWRESDQ2Y0podzVtVU13SGUyVGlCRXhPb3BFRHhGYlB6ZkpybG5GdXZaSjI='
+		-Dexamples=false
+		$(meson_use spell spellcheck)
+		$(meson_use gstreamer video)
+		-Dx11=true
 	)
 	meson_src_configure
 }
 
 pkg_postinst() {
 	gnome2_schemas_update
-	xdg_desktop_database_update
-	xdg_icon_cache_update
+	xdg_pkg_postinst
 }
 
 pkg_postrm() {
 	gnome2_schemas_update
-	xdg_desktop_database_update
-	xdg_icon_cache_update
+	xdg_pkg_postrm
 }