gentoo resync : 25.11.2020

3 files changed, 26 insertions, 9 deletions

diff --git a/media-gfx/xfig/Manifest b/media-gfx/xfig/Manifest
index cdbad9dd4e44..cdade2829dd9 100644
--- a/media-gfx/xfig/Manifest
+++ b/media-gfx/xfig/Manifest
@@ -1,6 +1,7 @@
 AUX xfig-3.2.6a-app-defaults.patch 502 BLAKE2B e7277af104c8fd9ed652e2ec6b175376157583f60659564f846348dbb5a205669989f7fd31e8069548af32a424be87548b6b3033d004bcd24e1a44d262a53c38 SHA512 4c5b523f17cacc85839eeb287a82192c9c3d8c704cca34c8de87d38aa05fb502afdadb9169a396573fb977e650ca7a1fabbdab067fb128be024dea724cb791be
 AUX xfig-3.2.6a-solaris.patch 523 BLAKE2B eeae0cc11ae6e3fd6e8c157648d8663131d0d11b020f5e64ec1a324f05ee5bd08be8c111c1ebe34065256d64d103619f61ff3f5524aa7636eb8f76e9aa64a714 SHA512 b2eb546b8fdd0d18bab3d9a2c183149fdb4fb278d5e2d8234f040c4fef727bec7461f861391027dea32028b822aa2e540824cb18af09769f32c7a1fb7bf48319
 AUX xfig-3.2.6a-urwfonts.patch 4933 BLAKE2B eb1edf6b30966864dbdf3e932f2cde231ff5777cdc0dff34cf047a169335ba78e493b10817e39aac72221d17d491138c3c28a3b293582d3808255140d5df6762 SHA512 29fea111b6c07f6ea28bc46259c0dc8d20b1bbf86e33d550037744b93d4f4de7ec9c4ea7fa14c5f91a4278848216d183ac841970c798140359e1fc317baac468
-DIST xfig-full-3.2.6a.tar.xz 5502944 BLAKE2B 3a83feeb5647ffa9586b9ce40116e9854a423c0cc90265ad78b27c0c82a15bbda9d9734475aba13f442c259cd0489a667242f319ac758ddbfea1a5b268e12550 SHA512 82e292e050213b6d22be5e174224308b446505e25208f29d4f4c5e760a87ff4104b9dcea0a332241c9bca358e1d44336bb38c316eb3f28130d7c8828c10a805f
-EBUILD xfig-3.2.6a-r1.ebuild 1180 BLAKE2B 9409fdba002eaacf0e5fd75da24e05d8b196ddd2aab2c6a47e173bbe6accbceb7c81050e6a36682b4c8f7b7923ed106ed551f17569d8429d97e9560a5396258a SHA512 1608fda4f8a1d6616a5436bf5d56df08eddeb717944479a3be6032c0fc472b6e485ca9aacf568c7b61cfec1f14fd63d92e43dd132778922860a6edb4744bb3c8
+AUX xfig-3.2.7b-ghostscript.patch 615 BLAKE2B 374bf50e43980ce3de7e60bdc0ddad5ded9306dfff137e2b644ed21dd201c34ab5b2c3ae57eaf102585333321e217a9d09936db247592b0d559f6bc5744235ad SHA512 7343433ce589495dcf653df678bf364d190dad28bd49d4608d589ab9fe6e385ac0c1e3ca040dacf75503dce9441fb741500cbb1143e248fe1893542c970e7d86
+DIST xfig-3.2.7b.tar.xz 5059984 BLAKE2B a22465e16019e9887e302ea308e250ad5d7ba0c49aec8f554a73d3b4489d803a05041cb7d267c543a7c0d3b78eac25077c628283f82767932afcc9d9750ce883 SHA512 f3396ebf8a5961909e58b05b60117fd7bbc8c24fabbd47f108eaea9586f4180af572faffe077b1a5dcbf669ebd69b1c2791f302c126dea62a44aa1592de66f73
+EBUILD xfig-3.2.7b.ebuild 1270 BLAKE2B 586982fcc8aeb6ad63677fa6c025dd2acc4faa2d4404c871d14e3a871ed5f6b9738f7893ac592c48f64a9eea436d23ddc16e355519fc5288af8ea505d0368e11 SHA512 c4bdf0ef73c9433b7bed3c8a9657eb12180342adb832ed0b06d96ace55062da4442aed85f610f9534323dddb2ecb56542305e5d00800c6851ac933a349ac9177
 MISC metadata.xml 238 BLAKE2B 60ff9cbe893ace8f33a3d44ee85a5c73c9bd5553478173bf92c4aa93398ae1140ba28673eb6c7373ac48ede6679546b57ea08b8e676ce5c7a47792a2ba8b3148 SHA512 65918555949ddfef068a9a197dffda69aee483ac55c1b52dcf19376aecf1cb53d8a3fc0931d4ebdbe64ba3341e2a2567d56c2830eb31e6746735449c53a1203c
diff --git a/media-gfx/xfig/files/xfig-3.2.7b-ghostscript.patch b/media-gfx/xfig/files/xfig-3.2.7b-ghostscript.patch
new file mode 100644
index 000000000000..07a7de141ec0
--- /dev/null
+++ b/media-gfx/xfig/files/xfig-3.2.7b-ghostscript.patch
@@ -0,0 +1,13 @@
+diff --git a/src/Makefile.in b/src/Makefile.in
+index 7426253..ae5b045 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -1356,7 +1356,7 @@ splash.xpm: $(top_srcdir)/splash-image/spl_bckgnd.fig.in \
+ 	fig2dev -L xpm $(top_srcdir)/splash-image/spl_bckgnd.fig \
+ 	| sed '2 {s/static //; s/noname/spl_bckgnd_xpm/}' > $@
+ 
+-splash.xbm: $(top_srcdir)/splash-image/spl_bckgnd.fig $(top_srcdir)/version.m4
++splash.xbm: $(top_srcdir)/splash-image/spl_bckgnd.fig.in $(top_srcdir)/version.m4
+ 	fig2dev -L xbm -S 4 $(top_srcdir)/splash-image/spl_bckgnd.fig \
+ 	| sed '1,3 s/noname/spl_bckgnd/; 3 s/char/unsigned &/' > $@
+ 
diff --git a/media-gfx/xfig/xfig-3.2.6a-r1.ebuild b/media-gfx/xfig/xfig-3.2.7b.ebuild
index 2a08fb6f16d8..3280bd7089f4 100644
--- a/media-gfx/xfig/xfig-3.2.6a-r1.ebuild
+++ b/media-gfx/xfig/xfig-3.2.7b.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit xdg
 
 DESCRIPTION="A menu-driven tool to draw and manipulate objects interactively in an X window"
 HOMEPAGE="http://mcj.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mcj/${PN}-full-${PV}.tar.xz"
+SRC_URI="https://downloads.sourceforge.net/project/mcj/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="jpeg nls postscript"
 
 RDEPEND="
@@ -36,12 +36,15 @@ PATCHES=(
 	"${FILESDIR}/${PN}-3.2.6a-urwfonts.patch"
 	"${FILESDIR}/${PN}-3.2.6a-solaris.patch"
 	"${FILESDIR}/${PN}-3.2.6a-app-defaults.patch"
+	"${FILESDIR}/${PN}-3.2.7b-ghostscript.patch"
 )
 
 src_configure() {
-	econf \
-		$(use_enable nls i18n) \
-		$(use_enable jpeg) \
-		$(use_with postscript gs) \
+	local myeconfargs=(
+		$(use_enable nls i18n)
+		$(use_enable jpeg)
+		$(use_with postscript gs)
 		--htmldir="${EPREFIX}/usr/share/doc/${PF}" # it expects docdir...
+	)
+	econf "${myeconfargs[@]}"
 }