gentoo resync : 15.12.2019

5 files changed, 31 insertions, 33 deletions

diff --git a/x11-libs/xbae/Manifest b/x11-libs/xbae/Manifest
index 002811f350a9..dc0d4e83fee6 100644
--- a/x11-libs/xbae/Manifest
+++ b/x11-libs/xbae/Manifest
@@ -1,6 +1,6 @@
-AUX xbae-4.60.4-Makefile.in.patch 824 BLAKE2B 26259c4f52026050921b6aed09307b94acc6d36d222e9ad8be3364c12c0e14d277b98a88a3db0d4875069eda20ace20585cacad76070c3347748a0a489d45568 SHA512 5cae2c85b471324b136957236829f0fd416bc82e654ba752bf0b8de07918ec65e2e6a3879cac5a4508d9ef6d08355069db34e0281af0b56ea36b536201b9c7ba
-AUX xbae-4.60.4-lxmp.patch 437 BLAKE2B fcd694b2f45b3db39d23f371d396bd41a25c02e8ab8aea0cf7f4f53b36a2f0e458901d8ad16689568a3445396a7412f7cb16bb5c035db228bf96be356bcd8800 SHA512 79eae095bc565b67030590bcac0ef1f9e75def35774a8214c5be4227a764e418e9db2e2c1617d2f38f29ea70923e1daad7bc343785800f9e2f96c5a64b11b142
-AUX xbae-4.60.4-tmpl.patch 255 BLAKE2B b7819d868def4094c36c9cc7dece319e2b96e1839b8fc000142654eb6281c82a4a2d008d5c3f6688f87f65c6d571d9bf09125661b94d23f7f49631e72c2d401b SHA512 03bb77bd5ad97b8bf38149a8421ba5cb80e7fdd6488ba69566ba74df1a8025b1078ecff1acffaf19c3d835fc23a44260ed59d2d81fbcfc7ccde5b7d5e678b433
+AUX xbae-4.60.4-Makefile.in.patch 751 BLAKE2B cc40a6d58a1e6ae6c68f2dd989807fedac591c6e107dbda4d9876e93070142e2b8809db93efcf7866cc2adfb1df6e5ad39bb27575e260669606a5c882be13b37 SHA512 0fbbb49dd9dcb5571591ef214fc5318f8a4b09966a8cac6b94d17e1554747714d4aa79387fde970d0e83804397f5fe7e9988ec82164023ab3d2562397ba31308
+AUX xbae-4.60.4-lxmp.patch 364 BLAKE2B c7defbca432abd679c5afbab2e95de3270097617d7a52cf4c781d3d44e36887c18901a045d9ca36d107aa71343e7f1ce974ec0634062318a56c14351335e8425 SHA512 90a348e0f67b3954ce2c1965e4252ef5b1be9b0c6c232981219a79af5a705dcc09bada6e87b7a2ae25e9d9220130c1321af90d079843317cc82d8e2a11dd78fa
+AUX xbae-4.60.4-tmpl.patch 182 BLAKE2B fb68a556359b2825879567ad53e4fcdcb3f5d41198cc8f3bb7626e45251881b8b7e7ebc4f244c4df0973d21e62a797d38b7a429dc94ca84a97700a4f2f9055d8 SHA512 dc360679441f2c8a4642a8b12b624acc739e4e7bd4ccb931d385212e418291eaf8d05501a420cb0407ab953826cd477634938c1b3fb89b3aa5ea1fefa57a8a60
 DIST xbae-4.60.4.tar.gz 1770938 BLAKE2B c9790dae438a4a35ca58274d96b3d4cdcf61191e3c8336e7df3df419a64a790bd010890f88082add21c304ec520ddec3545915c5babf267bd9ebb985b0acf0f4 SHA512 e9c2ea59ab598217a5d6a3df0b86ca9fa084c364116d9789334984a0ac83dec0d5b5e3fb643e067036fca10f13b175f6d5134325eb5041af614a4ed00745ba16
-EBUILD xbae-4.60.4.ebuild 1283 BLAKE2B fb622ebf698f47d970c9dde317661d10150896943a71ae303f0c5e5ffb849e4fe79e9b4f19ad993f581df28bf7c576e134b7974e4beffafad8d2822264f76adb SHA512 5c0b0c13bdc30fcdc7c3f18cb621424709a6366aa2e1ca6d6a4c9eb0fa75ec5c237b55949328fb08870336caddc2e84d5a10a52de34db438a3230268377b6072
+EBUILD xbae-4.60.4.ebuild 1239 BLAKE2B 215b85d42917d33734dc6d5e47f9166e5b5eb26c5c07ae62cad25f4c0415d0fd54c89acbc6362760c466c3f49df8f474a9c6f2caf7cf93fe97bac6609a50f1d6 SHA512 a3e5a9eed9da22beb663b67801ed9f06bd6842faa946dcc4c760e8aea7496a261dccaa6b1532fd625b2ea9c30b823ec36dde085824ecb3f7d34be500f87806f1
 MISC metadata.xml 965 BLAKE2B f76eac30d4f1d0ab6d41cdc26f8cb309936558efba912f56520f2f84ffad4463c8653de937dc2e6cb9757ebd7f60a5e147fea5d3c15dea1dd5f1ee0234a62604 SHA512 ecbdf447ab2b5b6c41888e8d2f7f02547de650fa1ca1bf708195753fc5e76dfc0e43a7a108c9dcc39e176b5456032b2e5d94c492075651267de4499eddc67451
diff --git a/x11-libs/xbae/files/xbae-4.60.4-Makefile.in.patch b/x11-libs/xbae/files/xbae-4.60.4-Makefile.in.patch
index aa0625b815af..2c16bdf489c0 100644
--- a/x11-libs/xbae/files/xbae-4.60.4-Makefile.in.patch
+++ b/x11-libs/xbae/files/xbae-4.60.4-Makefile.in.patch
@@ -1,5 +1,5 @@
---- Makefile.in.orig	2007-04-03 15:06:53.066980500 +0100
-+++ Makefile.in	2007-04-03 15:16:53.795027250 +0100
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -230,14 +230,13 @@
  x_includes = @x_includes@
  x_libraries = @x_libraries@
diff --git a/x11-libs/xbae/files/xbae-4.60.4-lxmp.patch b/x11-libs/xbae/files/xbae-4.60.4-lxmp.patch
index d5b66015eb0c..8d14303d4d78 100644
--- a/x11-libs/xbae/files/xbae-4.60.4-lxmp.patch
+++ b/x11-libs/xbae/files/xbae-4.60.4-lxmp.patch
@@ -1,5 +1,5 @@
---- examples/Mri/Makefile.in.orig	2007-04-03 14:52:55.326625000 +0100
-+++ examples/Mri/Makefile.in	2007-04-03 14:53:12.731712750 +0100
+--- a/examples/Mri/Makefile.in
++++ b/examples/Mri/Makefile.in
 @@ -219,7 +219,7 @@
                  -I$(top_builddir)/include @MOTIF_CFLAGS@ @X_CFLAGS@
  
diff --git a/x11-libs/xbae/files/xbae-4.60.4-tmpl.patch b/x11-libs/xbae/files/xbae-4.60.4-tmpl.patch
index 0e87ba3da39c..671cd3f9218d 100644
--- a/x11-libs/xbae/files/xbae-4.60.4-tmpl.patch
+++ b/x11-libs/xbae/files/xbae-4.60.4-tmpl.patch
@@ -1,5 +1,5 @@
---- Xbae.tmpl.orig	2007-04-03 14:45:54.548519000 +0100
-+++ Xbae.tmpl	2007-04-03 14:46:12.053613000 +0100
+--- a/Xbae.tmpl
++++ b/Xbae.tmpl
 @@ -13,7 +13,7 @@
  
  #define DoNormalLib		YES
diff --git a/x11-libs/xbae/xbae-4.60.4.ebuild b/x11-libs/xbae/xbae-4.60.4.ebuild
index b4d5e7e4ae29..b9fe5e37dde0 100644
--- a/x11-libs/xbae/xbae-4.60.4.ebuild
+++ b/x11-libs/xbae/xbae-4.60.4.ebuild
@@ -1,18 +1,19 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-
-inherit autotools-utils
+EAPI=7
 
 DESCRIPTION="Motif-based widget to display a grid of cells as a spreadsheet"
 HOMEPAGE="http://xbae.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 SLOT="0"
-IUSE="doc examples static-libs"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples"
+# tests need X display
+# and are interactive so virtualx will not help
+RESTRICT="test"
 
 RDEPEND="
 	x11-libs/motif:0
@@ -22,43 +23,40 @@ RDEPEND="
 	x11-libs/libXmu
 	x11-libs/libXpm
 	x11-libs/libXt"
-
 DEPEND="${RDEPEND}"
 
-# tests need X display
-# and are interactive so virtualx will not help
-RESTRICT=test
-
 PATCHES=(
 	"${FILESDIR}"/${P}-tmpl.patch
 	"${FILESDIR}"/${P}-lxmp.patch
 	"${FILESDIR}"/${P}-Makefile.in.patch
-	)
+)
 
 src_configure() {
-	local myeconfargs=( --enable-production )
-	autotools-utils_src_configure
+	econf --enable-production
 }
 
 src_test() {
-	cd ${AUTOTOOLS_BUILD_DIR}/examples
-	emake
-	"${S}"/examples/testall
-	emake clean
+	emake -C examples
+	emake -C examples/testall clean
 }
 
 src_install() {
-	autotools-utils_src_install
+	default
 
 	insinto /usr/share/aclocal
 	doins ac_find_xbae.m4
 
-	 use doc && dohtml -r doc/*
-
 	if use examples; then
 		find examples -name '*akefile*' -delete || die
 		rm examples/{testall,extest} || die
-		insinto /usr/share/doc/${PF}
-		doins -r examples
+		dodoc -r examples
+	fi
+	if use doc; then
+		rm doc/{,images/}Makefile* || die
+		docinto html
+		dodoc -r doc/.
 	fi
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }