gentoo resync : 22.01.2021

4 files changed, 73 insertions, 42 deletions

diff --git a/xfce-base/exo/Manifest b/xfce-base/exo/Manifest
index 206787ea9ce5..d8e766fa5334 100644
--- a/xfce-base/exo/Manifest
+++ b/xfce-base/exo/Manifest
@@ -1,7 +1,6 @@
+AUX exo-4.16.0-allow-cross.patch 2264 BLAKE2B b59456418bfc355aae39841adc530b2303faa1e7f6f3ead6d0657aa7ce5861ed9ce6aa4275335d468a89742cdd8dbf3cbac84412d5a764e6b5aab623082de129 SHA512 69cc01d7780c9cc488a32aab1a4246c7a7933c4c2cf45ac88cbfd6e9259a682ee7f31c079d103f9e86030cdb585eda86e9342c63cfcaed0ef1b249f4ad020ec8
 DIST exo-0.12.11.tar.bz2 1333227 BLAKE2B 4e95809c58b6db26ecdf524663c06df9cd70007726091e381a1f0dd58be52efee85ad9721c421c0df6438073bb9de97d56cd039f520e2f7c0f5722a1839ba167 SHA512 ecbf20feddf86178d34a5c70212f0c2310ab1d6ce25291846d6d1d3045270ae3e68102065d7b3d8840137406f826f9bc37fed92a16c1268c3d14f2833a97d533
-DIST exo-4.15.3.tar.bz2 994455 BLAKE2B 9c62b31a2f5cba4853263ea0b155fc3e5439170c7cc3011c03022a5419a9a0910c4b47431cf916f6e6ad4a5d2580e488ba8a18e4bbaa4d97d35a61711fd4a93a SHA512 3da0a0aadd15e140e43eece56bb92872e05f90b0da88368a84f3d3bc8d53c19d12549693fe00518937a691a3af559d1dba3170fa2490a64dbc26fa2f7faf13ea
 DIST exo-4.16.0.tar.bz2 966143 BLAKE2B ee2175d2d5087e948a6fb9bd4ffed2ecfe54be7078d2f1c55a6b30a0f3920689a46372af749035b1454e74ef5c75037996f3601d76adf1d0067eceba6775df76 SHA512 8fff640c4a229e77911cf091866f265e1f0d7f0b9274b1a879f46061644dd6aec07ae3f8fc43ac7277429ea98bdde8d0ee010da7ed398cddc7d755fea91b964c
 EBUILD exo-0.12.11.ebuild 1036 BLAKE2B 12fc8c5a693166a7672750259cf9b3061b24c104ad3aeaf234ce5fc3d189ca552502eefaf08b24836f1b4f8f356f181469c805929fa0fefdde652cf1c38218b2 SHA512 5e6486e6cabb66870995aa41337730f7dcc6f5dff787b2fb7eba254d11fa69ba1309fbfc7926fec4aba8f287c55f8d777210eb1fe523ceed42c9e1282184b733
-EBUILD exo-4.15.3.ebuild 880 BLAKE2B 4c42d53b2f5ad9a5b3e663f2bb1c5543ab013ac3c034c3d3497f9a0b450572b6c1330abc035cd81c4be2ee8232412779d2581bf766e778e867f9e1b8084ef36b SHA512 8cecf712555a726ed2c5fdb2fcd3f8f92213a0027046403461a8a5b9a23fda3d6fc17a13c13333187601294237ed9c25f3246a76ff3af7cdb575f912064b5fee
-EBUILD exo-4.16.0.ebuild 891 BLAKE2B bb6f693e21902960b69f46241dda994daf2565e1dde34162003d5cc39f0272f90d75cd45e56823b73f38a37e4a56c3231d2ee552872d2b2a5449094ee40b76d3 SHA512 e03d105d81ecb310af50dde4d30dc079687dac43c0bd49337c6c3f0356120ae1e39d488bb8d463e67131f973e66dfe3e70eb87de637632dfb3191f65806e6b66
+EBUILD exo-4.16.0.ebuild 1036 BLAKE2B 98eaad351a5ed893c52e0de1e43e708e0a5edb75fbebd10532e3f637f7f03f3cb846b6c03bc026da44ac898ba3b6d76ce1bd61a2e7e2d15567ff26517c65eec1 SHA512 ed593fd1f3c8cfc6791e22a062dc8f7a60bd664bf1e9df55759ccb54ef8a348b4796c5aae5fdb5b7bf267cf77d32525b581e441a9c5c5ac49766313201b72b57
 MISC metadata.xml 334 BLAKE2B 0d61ecd7415a1a60ea5f53fdc29fae2ebf9c286822bd7ee5c10629fae5da0102687c3b07fdd5f81b123aa79e5d04905da705177402c491aad574dccc4e6d18ce SHA512 158e0c248e2d8f235fdb105f2342d0a3c4ca3f15b8938a73bfbc1da823d573a178857433e68a7b36cccc7449ba29cfb3fd4c3856b02c231bd5736d9f5932b6d7
diff --git a/xfce-base/exo/exo-4.15.3.ebuild b/xfce-base/exo/exo-4.15.3.ebuild
deleted file mode 100644
index aa7befedb775..000000000000
--- a/xfce-base/exo/exo-4.15.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg-utils
-
-DESCRIPTION="Extensions, widgets and framework library with session support for Xfce"
-HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-
-RDEPEND=">=dev-libs/glib-2.42
-	>=x11-libs/gtk+-3.22:3
-	>=xfce-base/libxfce4ui-4.15.1:=[gtk3(+)]
-	>=xfce-base/libxfce4util-4.12:="
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/exo/exo-4.16.0.ebuild b/xfce-base/exo/exo-4.16.0.ebuild
index f67b97867965..2cfa5d5ce161 100644
--- a/xfce-base/exo/exo-4.16.0.ebuild
+++ b/xfce-base/exo/exo-4.16.0.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 xdg-utils
+inherit autotools xdg-utils
 
 DESCRIPTION="Extensions, widgets and framework library with session support for Xfce"
 HOMEPAGE="https://www.xfce.org/projects/"
@@ -21,9 +21,19 @@ DEPEND="${RDEPEND}"
 BDEPEND="
 	dev-util/gtk-doc-am
 	dev-util/intltool
+	>=dev-util/xfce4-dev-tools-4.16.0
 	sys-devel/gettext
 	virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-4.16.0-allow-cross.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_install() {
 	default
 	find "${D}" -name '*.la' -delete || die
diff --git a/xfce-base/exo/files/exo-4.16.0-allow-cross.patch b/xfce-base/exo/files/exo-4.16.0-allow-cross.patch
new file mode 100644
index 000000000000..098a0b23d645
--- /dev/null
+++ b/xfce-base/exo/files/exo-4.16.0-allow-cross.patch
@@ -0,0 +1,59 @@
+From c3e6d0a34d9b2be550994c39c264e3f96a2cc43a Mon Sep 17 00:00:00 2001
+From: David Michael <fedora.dm0@gmail.com>
+Date: Fri, 8 Jan 2021 18:35:16 -0500
+Subject: [PATCH] configure.ac: Allow cross-compiling
+
+AC_TRY_RUN fails by default when cross-compiling if it does not
+have the fourth parameter.  This implements a new cache variable
+ac_cv_have_strftime_extension for that test which allows overriding
+the result to specify the target system behavior.  It defaults to
+supporting the extension when cross-compiling.
+
+Signed-off-by: David Michael <fedora.dm0@gmail.com>
+---
+ configure.ac.in | 22 ++++++++++++++++------
+ 1 file changed, 16 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac.in b/configure.ac.in
+index b98fce6e..0483c8fa 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -133,10 +133,16 @@
+ dnl ************************************
+ AC_FUNC_MMAP()
+ 
+-dnl ***************************************
+-dnl *** Check for strftime() extensions ***
+-dnl ***************************************
+-AC_TRY_RUN([
++dnl ***************************************************************************
++dnl *** Check for strftime() extensions                                     ***
++dnl ***                                                                     ***
++dnl *** AC_TRY_RUN must be able to build and execute programs natively on   ***
++dnl *** the build system, so it fails when cross-compiling unless given an  ***
++dnl *** action in the fourth parameter.  This sets its results in a cache   ***
++dnl *** variable that users can override to specify target system behavior. ***
++dnl ***************************************************************************
++AC_CACHE_CHECK([for strftime %E and %O modifiers],
++  [ac_cv_have_strftime_extension], [AC_TRY_RUN([
+   #include <string.h>
+   #include <time.h>
+   int
+@@ -149,9 +155,13 @@
+       return 0;
+     return 1;
+   }
+-], [
++    ],
++    [ac_cv_have_strftime_extension=yes],
++    [ac_cv_have_strftime_extension=no],
++    [ac_cv_have_strftime_extension=cross])])
++if test x"$ac_cv_have_strftime_extension" != x"no"; then
+   AC_DEFINE([HAVE_STRFTIME_EXTENSION], 1, [Define if strftime supports %E and %O modifiers.])
+-])
++fi
+ 
+ dnl ******************************
+ dnl *** Check for i18n support ***
+-- 
+GitLab