gentoo resync : 29.01.2021

5 files changed, 106 insertions, 66 deletions

diff --git a/x11-themes/gtk-engines/Manifest b/x11-themes/gtk-engines/Manifest
index 0f332d244f5f..1af990813810 100644
--- a/x11-themes/gtk-engines/Manifest
+++ b/x11-themes/gtk-engines/Manifest
@@ -1,10 +1,11 @@
 AUX gtk-engines-2.20.2-auto-mnemonics.patch 615 BLAKE2B 80f41a0b2b9d7cd863cb264f6535ed81f69600bd93f69ef1818d624935cae0f6011d29e29dd0ac8e7399969503613b7e1c11e229c996198054d8deca8e59638b SHA512 10951784f8e2c03e83cf63ff15ba596281d2fc870466e9018036b3c876b1abe3eb3774bcb98bd47fbd4d7037223bde7cbb4db11ab1186aae6b76a27d1b1e878b
+AUX gtk-engines-2.20.2-automake-1.14.patch 2105 BLAKE2B 281714d925f0f0d4f65069cc2e11b574bb21937ba8601a14b6c5251e972de38a372dd33a37047ed2db4f16f7891af10ffc183b5b5ed9a551c57217c79346a87c SHA512 744b0c2011b001a8b3d37079e2bcf03f61cd05be6ff036660fb3420352d79eaf1f371f9294ce1d5b459a6ae2608387c78e8d843548dcb6b01c6eee2bd48905bf
 AUX gtk-engines-2.20.2-change-bullet.patch 372 BLAKE2B e8618b970c139924a1b223fe0a93b0f6628eb4300be3e724ff6eba328e5cb7ad86eaf151b3355b51264c6c2ed2f51491f9a26e2d09bef18103b190033482ce30 SHA512 b9848c95d40fd18e0a9877d1f4d314330b806fce101f6032761d61afc1303ff9b6ffaeb9502ce8c5d867553b4fdad17981b811a175dcc84feb10509c6edf88a5
 AUX gtk-engines-2.20.2-glib.h.patch 729 BLAKE2B c5aee267866e93fa3c806ac02df9822fbe8871e1c9ac0160a90ad3f42ba85a43e2ebef149c0e6c25b133edf3fb0bd4f3f41e2aad821f12713ad30b06e2d6bf63 SHA512 4e9f6bdf42b5c4a8695f2d529ed57d345539eec1af8672181dc8c050b507f492d92fb0b902246b8ecaa8cd8e2c14042207ef36fa25d86e4792a8e51a7579a4af
 AUX gtk-engines-2.20.2-java-look.patch 602 BLAKE2B bd9625acae0c7ce7f81089c716b2d1d662ef97ace9124e15b50d6bee9553de41a6bd7790e4e648e4ce1464da9a308ea2a70852bf030420718d8497c248a39ecc SHA512 b2ff1ecd1981d704e86802a878286ddc153317796d805578da7f7a8c411257c964a18aafa93e47e75f8753b207e40495c30c13f2d56c092e9f0bfd9bb07fca2e
+AUX gtk-engines-2.20.2-slibtool.patch 2028 BLAKE2B a92115b28523fc359eb8c4b1aa5086ebc0273d31504a116752e192852602d95db4a49583dd1010c5cfd2ba0295e05aaa3ddc93a6858e413ac4b5e365213b2b22 SHA512 a2c36f5e83a8072d52b05e298386fbe5f68f9e134f83776dc7c666b9923502eeb5280b69aba64b7d9b2e1c579666d991d62c6c597d5252a48b2cb949fb2f8311
 AUX gtk-engines-2.20.2-tooltips.patch 1116 BLAKE2B ad050dbff4bba6c7172a449eec7b001d3f9cffc0c79043356ad1fda851d94aac8c1322caa1aedde9cb8931e6f73ac8e1f411e17c9e363a420f7612c8a6ad3ecf SHA512 0e89d704f883f0dce086f83b4dc27decc3e022f1ad7ec46e9a0ca9d5ab2e3a997826c8ca3d1340e3e51ed3e4433c7e30eac833b02f76409f66a08b178cdd3b30
 AUX gtk-engines-2.20.2-window-dragging.patch 466 BLAKE2B 851f633db234986b9855dffae2cdda3b812f48e9e221f14b601c1f65764fac0d88f5dd70cc96a50949725da52e64fb60ba59ab491856279b468dc255201cdebb SHA512 4f3f20c007a1b3fc001485fdd0c84450f8bbf3c2e95decd058b552adfeecc75a84ae2be7da3984c058df940bcb87ce6cd149d24a5e86486befd085d339c65a77
 DIST gtk-engines-2.20.2.tar.bz2 688171 BLAKE2B 1eb80f1bfa7f58cdcde6d461bcd6a41d7fe8b7ca20e11f1f59b350b3b5ce8c196c5f35330ec027d0ff1d9de19f28d412e0e3c6460487ac7ea61284fc1858a90c SHA512 049ae20d47a28b60fe5b0484e3c11bc6cd62d6167478f1d83df3066d618827ca9204767ab1b7a9ca02f542c3fc7929efc1bb85f65d66aaf5d5b15718b6de19e9
-EBUILD gtk-engines-2.20.2-r100.ebuild 1738 BLAKE2B ee12827839b3a155ef9275d690cfde8efc601a4d8e6cc1e6fe9e7a2582769535ec024236342d38f356d97245b9605b6335a7db34a0644832d2bc5eb037c5d4ad SHA512 1ef2608e8e99f6b663850ee9e3ec31be53f5b8ff4920252440514af26056b68d03b30a7d16d46c63a112d5e717a7db0a605f7112bf717aa436e4ee9639e8ea22
-EBUILD gtk-engines-2.20.2-r2.ebuild 1372 BLAKE2B a601d0e384fc36159b4afc87b20e37415ac41e767acba88b0b040b17f0ddf3dea4abea048c23fba1ecda844091131b54d073d7fe6ad33a4933128c64dfa82844 SHA512 4bf4966c4aa68977ddba75613ab72451fe1b8fcb8f457ea00c86ecf9b5d6dd01dd7cf8b341929a789093b1e3165211e3cbc30c68f264e413319865523f59f225
+EBUILD gtk-engines-2.20.2-r100.ebuild 1746 BLAKE2B 9d103df0cc4c1eabef300ac89433557cea18e2fa17b7a22cad4b757df1a2ee868506e94d717ccb6a3eaedcd8ad7213cff61752799b66b6ba92921ec11721049b SHA512 4cb1f29c29ecb3ffc20781803ef5ee8540e46c8bd94570f8283539707ca8af5014f8a1d26e4a4a40920454eccec3e5a3c58c9ec8ee96fec4512edfc2beed135a
 MISC metadata.xml 667 BLAKE2B 4f110a2598845c8930ca8567655e34e87c9517cd68b41957d1450367b7e0ed783848bd7ce1213b407229fd7eea3b4a36760ddc7b921424821ae55fcb664e2788 SHA512 62bb1508fe80e89238a57dffb44b7e8951f5d5b8c50ddd412fdf84778e77a2e13c16bb6ff1045802fbd71a1dea038695b76febd024cb50b96258bfd67b32ad47
diff --git a/x11-themes/gtk-engines/files/gtk-engines-2.20.2-automake-1.14.patch b/x11-themes/gtk-engines/files/gtk-engines-2.20.2-automake-1.14.patch
new file mode 100644
index 000000000000..f23f929bbfbe
--- /dev/null
+++ b/x11-themes/gtk-engines/files/gtk-engines-2.20.2-automake-1.14.patch
@@ -0,0 +1,49 @@
+Description: Work around FTBFS due to automake 1.14 bug
+ Automake generates invalid Makefiles when patsubst is used in
+ Makefile.am. To work around this problem configure injects the
+ patsubsts to the Makefile now.
+ .
+Author: Balint Reczey <balint@balintreczey.hu>
+Bug-Debian: http://bugs.debian.org/713353
+--- gtk2-engines-2.20.2.orig/configure.ac
++++ gtk2-engines-2.20.2/configure.ac
+@@ -142,6 +142,8 @@ fi
+ AC_SUBST(BUILD_ENGINES)
+ AC_SUBST(BUILD_THEMES)
+ AC_SUBST(BUILD_SCHEMAS)
++AC_SUBST([auto_find_tests], ['$(patsubst %,exported_%,$(BUILD_ENGINES)) torture_buildin $(patsubst %,torture_%,$(TORTURE_TEST_ENGINES))'])
++
+ 
+ if test $animation = "yes"; then
+ 	AC_DEFINE_UNQUOTED(HAVE_ANIMATION, 1, [Defines whether to compile with animation support])
+--- gtk2-engines-2.20.2.orig/test/Makefile.am
++++ gtk2-engines-2.20.2/test/Makefile.am
+@@ -64,9 +64,10 @@ VALGRIND_ENV=G_SLICE=always-malloc G_DEB
+ # Exported Symbols Test - Tests all engines unconditionally
+ #############################################################
+ # Prefix with exported_
+-EXPORTED_SYMBOLS_TESTS = $(patsubst %,exported_%,$(BUILD_ENGINES))
++# disabled to work around automake bug #14561
++# EXPORTED_SYMBOLS_TESTS = $(patsubst %,exported_%,$(BUILD_ENGINES))
+ 
+-TESTS += $(EXPORTED_SYMBOLS_TESTS)
++#TESTS += $(EXPORTED_SYMBOLS_TESTS)
+ 
+ 
+ #############################################################
+@@ -85,10 +86,13 @@ SUPPORTED_TORTURE_TEST_ENGINES = \
+ # Filter engines that are not build from the set of engines
+ TORTURE_TEST_ENGINES = $(filter $(SUPPORTED_TORTURE_TEST_ENGINES),$(BUILD_ENGINES))
+ # Prefix with torture_
+-TORTURE_TEST_TESTS = torture_buildin $(patsubst %,torture_%,$(TORTURE_TEST_ENGINES))
++# disabled to work around automake bug #14561
++# TORTURE_TEST_TESTS = torture_buildin $(patsubst %,torture_%,$(TORTURE_TEST_ENGINES))
+ 
+ # Add TORTURE_TEST_ENGINES to list of tests
+-TESTS += $(TORTURE_TEST_TESTS)
++# disabled to work around automake bug #14561
++#TESTS += $(TORTURE_TEST_TESTS)
++TESTS += @auto_find_tests@
+ 
+ # Possible other tests:
+ #  - An extensive theme switch tests that loads/unloads the engine
diff --git a/x11-themes/gtk-engines/files/gtk-engines-2.20.2-slibtool.patch b/x11-themes/gtk-engines/files/gtk-engines-2.20.2-slibtool.patch
new file mode 100644
index 000000000000..69c409c9e7e3
--- /dev/null
+++ b/x11-themes/gtk-engines/files/gtk-engines-2.20.2-slibtool.patch
@@ -0,0 +1,47 @@
+This fixes build with sys-devel/slibtool
+
+--- gtk-engines-2.20.2/configure.ac
++++ gtk-engines-2.20.2/configure.ac
+@@ -27,6 +27,9 @@
+ AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package])
+ AM_GLIB_GNU_GETTEXT
+ 
++AC_CHECK_LIBM
++AC_SUBST([LIBM])
++
+ AC_ARG_ENABLE(all, 		[  --disable-all           skip all engines/themes by default], [defaultval=$enableval], 	[defaultval="yes"])
+ AC_ARG_ENABLE(clearlooks, 	[  --disable-clearlooks    skip ClearLooks engine/theme], 	[clearlooks=$enableval], 	[clearlooks="$defaultval"])
+ AC_ARG_ENABLE(crux, 		[  --disable-crux          skip Crux engine/theme], 		[crux=$enableval], 		[crux="$defaultval"])
+--- gtk-engines-2.20.2/engines/hc/Makefile.am
++++ gtk-engines-2.20.2/engines/hc/Makefile.am
+@@ -38,7 +38,7 @@
+ 	./src/hc-style.c
+ 
+ libhcengine_la_LDFLAGS = -module -avoid-version -no-undefined -export-symbols $(top_srcdir)/engines/engine.symbols
+-libhcengine_la_LIBADD = $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS)
++libhcengine_la_LIBADD = $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS) $(LIBM)
+ 
+ -include $(top_srcdir)/git.mk
+ 
+--- gtk-engines-2.20.2/engines/mist/Makefile.am
++++ gtk-engines-2.20.2/engines/mist/Makefile.am
+@@ -16,7 +16,7 @@
+ 	./src/mist.c
+ 
+ libmist_la_LDFLAGS = -module -avoid-version -no-undefined -export-symbols $(top_srcdir)/engines/engine.symbols
+-libmist_la_LIBADD = $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS)
++libmist_la_LIBADD = $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS) $(LIBM)
+ 
+ -include $(top_srcdir)/git.mk
+ 
+--- gtk-engines-2.20.2/engines/thinice/Makefile.am
++++ gtk-engines-2.20.2/engines/thinice/Makefile.am
+@@ -18,7 +18,7 @@
+ 	./src/thinice_main.c
+ 
+ libthinice_la_LDFLAGS = -module -avoid-version -no-undefined -export-symbols $(top_srcdir)/engines/engine.symbols
+-libthinice_la_LIBADD = $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS)
++libthinice_la_LIBADD = $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS) $(LIBM)
+ 
+ -include $(top_srcdir)/git.mk
+ 
diff --git a/x11-themes/gtk-engines/gtk-engines-2.20.2-r100.ebuild b/x11-themes/gtk-engines/gtk-engines-2.20.2-r100.ebuild
index ea8b1c8467e4..c5622f9a10ac 100644
--- a/x11-themes/gtk-engines/gtk-engines-2.20.2-r100.ebuild
+++ b/x11-themes/gtk-engines/gtk-engines-2.20.2-r100.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+GNOME2_EAUTORECONF="yes"
 GNOME2_LA_PUNT="yes"
 GNOME_TARBALL_SUFFIX="bz2"
 LUA_COMPAT=( lua5-{1..4} )
@@ -14,7 +15,7 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="accessibility lua"
 
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
@@ -38,15 +39,16 @@ PATCHES=(
 	"${FILESDIR}"/${P}-change-bullet.patch
 	"${FILESDIR}"/${P}-tooltips.patch
 	"${FILESDIR}"/${P}-window-dragging.patch
+	"${FILESDIR}"/${P}-slibtool.patch #766680
+	"${FILESDIR}"/${P}-automake-1.14.patch # taken from Debian
 )
 
 src_prepare() {
-	gnome2_src_prepare
 	# pkgconfig wrapper set up by lua-single.eclass is not multilib-compatible
 	# at present so point Autoconf directly to the correct implementation.
-	# We patch configure rather than configure.ac because running 'eautoreconf'
-	# results for some reason in corrupted test Makefiles.
-	sed -i -e "s|\"lua\"|\"${ELUA}\"|g" configure || die
+	sed -i -e "/PKG_CHECK_MODULES(LUA,/s|lua|${ELUA}|" configure.ac || die
+
+	gnome2_src_prepare
 }
 
 multilib_src_configure() {
diff --git a/x11-themes/gtk-engines/gtk-engines-2.20.2-r2.ebuild b/x11-themes/gtk-engines/gtk-engines-2.20.2-r2.ebuild
deleted file mode 100644
index 2a380d0be67b..000000000000
--- a/x11-themes/gtk-engines/gtk-engines-2.20.2-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-GNOME_TARBALL_SUFFIX="bz2"
-
-inherit eutils gnome2 multilib-minimal
-
-DESCRIPTION="GTK+2 standard engines and themes"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2.1"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="accessibility lua"
-
-RDEPEND="
-	>=x11-libs/gtk+-2.24.23:2[${MULTILIB_USEDEP}]
-	lua? ( dev-lang/lua:0[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.31
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Patch from 2.21.x, fixes building with glib-2.32, bug #410455
-	epatch "${FILESDIR}/${P}-glib.h.patch"
-
-	# Fix java apps look, bug #523074
-	epatch "${FILESDIR}/${P}-java-look.patch"
-
-	# Apply Fedora fixes/improvements
-	epatch "${FILESDIR}"/${P}-auto-mnemonics.patch
-	epatch "${FILESDIR}"/${P}-change-bullet.patch
-	epatch "${FILESDIR}"/${P}-tooltips.patch
-	epatch "${FILESDIR}"/${P}-window-dragging.patch
-
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		--enable-animation \
-		$(use_enable lua) \
-		$(use_with lua system-lua) \
-		$(use_enable accessibility hc)
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-}