gentoo resync : 25.11.2020

3 files changed, 37 insertions, 10 deletions

diff --git a/media-gfx/cellwriter/Manifest b/media-gfx/cellwriter/Manifest
index 3a09f526d158..5d6ba29366b1 100644
--- a/media-gfx/cellwriter/Manifest
+++ b/media-gfx/cellwriter/Manifest
@@ -1,5 +1,6 @@
+AUX cellwriter-1.3.6-fno-common.patch 701 BLAKE2B 9e7dd63b7cda6089c49a9c1b22d0486c082a8a06fe8cb4fe0446c19590914778d2e3ff303e24678858f05ab5569d774f3a0e53c43571786f512500e3073ac964 SHA512 8b852daa731a75edd858faf4ab7a6dc91351f440abdad27b555fdd7cd8d41383fc0bf4ea7f5a34769864370b4641f8ebba926ab9547e5899c6ed2e2250c8f5e4
 DIST cellwriter-1.3.5.tar.gz 293241 BLAKE2B 57d287782af21ae8010dc43ea89a2da081ecee854740cd8c5991de62450929a89f04c1601ff77ac69b945d5997042c8f739defa00614aa0af947655d5251f8ef SHA512 a9b682babda4335ea18716032ac52e73578459e9ab8866b20177f6d0cb606b9da2bf5a3fae2e2547277351db2533c7e92461f5c6a6ebc542ffe5844ff7ae65d6
 DIST cellwriter-1.3.6.tar.gz 434211 BLAKE2B 2734ee3a7e61f626d253613513675a4f3819724d9f9110af08ff4809f7abe68cb897815f5dc74d686ea6e016453117bc4869fd89ef4396446ea2de830cc9ec7f SHA512 0d564b03454a440e27c72323a4dd7943d6f1c84d1ed2db172ca999f62fdafed599559f9a6dff9df5f37820d489bd7ae2c6dd9a91965e308fcb1d1722bce543fa
 EBUILD cellwriter-1.3.5.ebuild 721 BLAKE2B 808b942a5569059c05b3dec134498a4820aae5465a50c292e6853d09169ba508f0caba59c1d6cb8977bec06f9bdc0ba468c998b6e2e19511282840bbf32a3143 SHA512 170049250eb87307cde5583a8a4452c014e208d460758a8b6b0d61472c7ac9f9a97d34b0385d65061ce4857df56b7637a68bb8999911914ebac76d0025e12b53
-EBUILD cellwriter-1.3.6.ebuild 712 BLAKE2B 7b16b1f30f4a619e1c00b00982fe6a4332b1191a7e5f7d3dc98c146462d88c7875028a71c96d65ea51f87e6cc8cf54c85c84a8051f8895b8792b85ff8e56607b SHA512 5506c4754e9d89ebc86c06b6501512114aecca2f9e2ed82c14450789a36727ea2a83f10909cc5e7d3be07faff4786866f3ed1abbc15e72d0054a6a3ba9948c3e
+EBUILD cellwriter-1.3.6.ebuild 677 BLAKE2B 5aa89d739afef7eafa8ce956cd5fa4674e2634a14074d3f993f6c0ec9ead607bb514b405f1984a7b14a36b930dfd98b386655748706d13e5e42fa5a11edaeb22 SHA512 34ac5fc7e7d959c08b4b782469046c0bdc9ca049b5291a7b72acaabb2120b6efd95eb79f17a1f69ae04e1b83f5a817cedf81b7d286a5a716e851d636a23d820b
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-gfx/cellwriter/cellwriter-1.3.6.ebuild b/media-gfx/cellwriter/cellwriter-1.3.6.ebuild
index 467dc084c967..abed385e2f83 100644
--- a/media-gfx/cellwriter/cellwriter-1.3.6.ebuild
+++ b/media-gfx/cellwriter/cellwriter-1.3.6.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
-inherit xdg-utils
+EAPI=7
+
+inherit xdg
 
 DESCRIPTION="Grid-entry natural handwriting input panel"
 HOMEPAGE="http://risujin.org/cellwriter/"
@@ -10,23 +11,23 @@ SRC_URI="https://github.com/risujin/cellwriter/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
+KEYWORDS="amd64 ppc x86"
 
+BDEPEND="virtual/pkgconfig"
 RDEPEND="x11-libs/gtk+:2
 	x11-libs/libX11
 	x11-libs/libXtst"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
 	x11-base/xorg-proto"
 
 DOCS="AUTHORS ChangeLog README TODO" # NEWS is no-op
 
+PATCHES=(
+	"${FILESDIR}/${PN}-1.3.6-fno-common.patch"
+)
+
 src_prepare() {
 	default
 
 	sed -i -e '/Encoding/d' ${PN}.desktop || die
 }
-
-pkg_postinst() { xdg_icon_cache_update; }
-pkg_postrm() { xdg_icon_cache_update; }
diff --git a/media-gfx/cellwriter/files/cellwriter-1.3.6-fno-common.patch b/media-gfx/cellwriter/files/cellwriter-1.3.6-fno-common.patch
new file mode 100644
index 000000000000..54f035339720
--- /dev/null
+++ b/media-gfx/cellwriter/files/cellwriter-1.3.6-fno-common.patch
@@ -0,0 +1,25 @@
+https://sources.debian.org/patches/cellwriter/1.3.6-2/fix_ftbfs.patch/
+https://bugs.gentoo.org/707182
+--- a/src/options.c
++++ b/src/options.c
+@@ -26,9 +26,6 @@ Foundation, Inc., 51 Franklin Street, Fi
+ #include <stdlib.h>
+ #include <string.h>
+ 
+-/* preprocess.c */
+-int ignore_stroke_dir, ignore_stroke_num;
+-
+ /* cellwidget.c */
+ extern int cell_width, cell_height, cell_cols_pref, cell_rows_pref,
+            train_on_input, right_to_left, keyboard_enabled, xinput_enabled;
+--- a/src/recognize.c
++++ b/src/recognize.c
+@@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fi
+ #include "recognize.h"
+ 
+ /* preprocess.c */
+-int prep_examined;
++extern int prep_examined;
+ 
+ void engine_prep(void);
+