From c3884b15d25e645a705fc9115b074c6553831fac Mon Sep 17 00:00:00 2001 From: David Michael Date: Thu, 28 Mar 2019 14:11:12 +0000 Subject: [PATCH] bump(dev-lang/nasm): sync with upstream --- .../portage-stable/dev-lang/nasm/Manifest | 11 +- .../nasm/files/nasm-2.13.01-fix-docdir.patch | 177 ------------------ .../nasm/files/nasm-2.13.03-bsd-cp-doc.patch | 15 ++ .../portage-stable/dev-lang/nasm/metadata.xml | 4 +- .../dev-lang/nasm/nasm-2.11.08.ebuild | 41 ---- .../dev-lang/nasm/nasm-2.12.01.ebuild | 41 ---- .../dev-lang/nasm/nasm-2.13.01.ebuild | 44 ----- .../dev-lang/nasm/nasm-2.14.02.ebuild | 52 +++++ .../metadata/md5-cache/dev-lang/nasm-2.11.08 | 12 -- .../metadata/md5-cache/dev-lang/nasm-2.12.01 | 12 -- .../metadata/md5-cache/dev-lang/nasm-2.13.01 | 12 -- .../metadata/md5-cache/dev-lang/nasm-2.14.02 | 12 ++ 12 files changed, 82 insertions(+), 351 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-lang/nasm/files/nasm-2.13.01-fix-docdir.patch create mode 100644 sdk_container/src/third_party/portage-stable/dev-lang/nasm/files/nasm-2.13.03-bsd-cp-doc.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-lang/nasm/nasm-2.11.08.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-lang/nasm/nasm-2.12.01.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-lang/nasm/nasm-2.13.01.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/dev-lang/nasm/nasm-2.14.02.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/nasm-2.11.08 delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/nasm-2.12.01 delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/nasm-2.13.01 create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/nasm-2.14.02 diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/nasm/Manifest b/sdk_container/src/third_party/portage-stable/dev-lang/nasm/Manifest index d0484bb492..6f0a396d5b 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/nasm/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-lang/nasm/Manifest @@ -1,10 +1 @@ -AUX nasm-2.13.01-fix-docdir.patch 5536 SHA256 886cc7ca0b0bb8652c82f5ce3a6de8792f118b28fa839bea4d3e0ccf75355537 SHA512 22bbfac66b75451345a1f3d19816ecc35397c9b95f16f7dffdf8dbde9055bb035880f5cb081686c42ce3f448e250a29c9440775aad929a7e36c1325e6bbc88d7 WHIRLPOOL b2da2a063fe835c0c75e1d58bb6b3c90afa00cbc2417edb942df6cc90701f95edf8b0f4bce982a21806aca671e2a50273448e83be3faf15b02b4004c2a4cca32 -DIST nasm-2.11.08.tar.xz 764872 SHA256 c99467c7072211c550d147640d8a1a0aa4d636d4d8cf849f3bf4317d900a1f7f SHA512 f7caf42d0fe1b850de13180a1f363e34a6d44a02696312dd8f12f4116ad1c1f3d01e6606c3a79fb881e76fc70d20894d85b333c84a75d60265ff9551f7b8cde4 WHIRLPOOL d13f342d59aedf2510347f847a2f5fb276a3bdb9e7b8c5cac6ac4e204a03ea31e477adc19facbf68f939245aae72971b232f1a0fc461ef554458f8956403c623 -DIST nasm-2.12.01.tar.xz 780112 SHA256 9dbba1ce620512e435ba57e69e811fe8e07d04359e47e0a0b5e94a5dd8367489 SHA512 c016b2b26f2ef00fe8de673dc7b2effa55ddd23d1f15145380c2767a2cd4a5c60c77732faebcd5868b325f780c0bf76a5e0c49eb6189609b21e2493d2af9347c WHIRLPOOL 4659275043c947461a03450efe184a425019aa99b30607c33b1dd302dd02091a9f1dfaf80382c4466b7df295bc09add6ad9587e3050ea4567a4605f956e1bcdd -DIST nasm-2.13.01.tar.xz 800244 SHA256 aa0213008f0433ecbe07bb628506a5c4be8079be20fc3532a5031fd639db9a5e SHA512 6561a2efb3ffea77a1a8cd364edf1ecedb2c14e1902469d7c59d743f25ca612529113d1099818abbe0a9f2592f12604f1810855bbdf8dc9de3648094a83529ae WHIRLPOOL dfc7018acfb51cdd3988da6abd157a29d72fdcd233862de4eb09debd65560280a0d7a7aa8f76f0e0c546861272d533f57d3dacd52add16a894dbc026a913d1c5 -EBUILD nasm-2.11.08.ebuild 823 SHA256 dbbaff01dfbed8747b8e12f00dd2d4882c381a230a7ba6a7191670d12b9959b3 SHA512 d91efdd2f128087650e692210f2f6b50caae8b1364d255854b1592d0cd2e411859d66e2ed2d698de8e4550e8b0c306d73261fa23d344b4b472b241d5928f4ff5 WHIRLPOOL 80a5cce837ba2ea31fbcc8534fab815cd39ed465da2237bec1ca505b8022e85e9dff0192bd593d757f98f84a8023597722f0560b47658b5f3fa05ce47171e584 -EBUILD nasm-2.12.01.ebuild 826 SHA256 12ea2c411ee54729685aea58991ac05da520d2ddd63f5afae10719f031da76ac SHA512 011a6594157b7bd2df8203dd523edf2bd9159e8c606ba0e59a9ebf75a127c0b6c32be00e95f989b274714ab4cdef881b36e9151d475aac7c882806045333671f WHIRLPOOL 5bc7fa797029347a5018d19500a3634ae33c367b65e24129da5c4d7f1335550cb63925ae5518c92dc13cb033bfdc20c77f067bfdfa897eb0604ba87d6b029fb7 -EBUILD nasm-2.13.01.ebuild 807 SHA256 233c71bba2d735be6812925cb64a0d7ed0e7f135f32de41b82279bca3f8add08 SHA512 d25c8d7c6d70982c4140e7ed906d08e1ba6e7c300ea0dd686bc748bcb040a00f217cf837ab11bb65357ec8b32de836ba7fc81d10b4152f8dda13c81e8bb52598 WHIRLPOOL a46eead45d09f2b341c966abe22bb896a97ba4911e1aa06216ad5dafd597002fb0350f21821e994bc10818b995db2c19dff9343658e68ff7d4fff406b4db67f7 -MISC ChangeLog 3607 SHA256 4fc4a23d8f54d5fdee13f0ca83d4a99cc08e33bbdcc31d50281b526208345637 SHA512 9dd7abd0e3d1d2005430fdd264c61bd6f8e7e4bfebf9d2d420f8ad66147836b845f557f270a839f70d769a445486b0597a4207d5d56683acd23f03e0ea4caae0 WHIRLPOOL b9fa8b2f314fef762ad10a0390a72355713a5f1443a7a5cd4556f4efb3ef1cb8618fda78e6b87a6041211771d2377b324f1087e569a47e55bed6b47aaa1175c8 -MISC ChangeLog-2015 16260 SHA256 463417428e7292fe03116c42f47f71a0e4f7c3c2b3f6fe14766c78d95f583c74 SHA512 f281c9f702d3e48bb354310867731065e3cc53f4ef9e757c3d3b4d372ab840f33535358a2c5534846a70c355ac3f08c86c1db0e0e7c30ad06c1707aae7710ebf WHIRLPOOL b8d892c078ec19dd57fbefe585872d82f7be65ab906564f3c9719c2ec6e115dac6f26cad33e3ff0521f45eb4d32d7597283638a0f5f7794b9ccfcdc2b62ad7fd -MISC metadata.xml 870 SHA256 7cff6c25e006b869e6229a3a6ac109d7f37aa7c24a39dfe2bbfeef57528e3623 SHA512 17b926c02760e286ff9ae9b11982560cfecf1c2ad46839ad36956b7e00ad76967dc296ac2457fb617a905b6a338b16b95aebc132a233537e3663340825b5b2d6 WHIRLPOOL db1b0dd7d74afbab6a81bf614b00b5d52e097a1e0d4674093e06e95021133e3c9303c79c46c83f7e13726bb773c8b920f5311015daace8a9dd5c6c76924e4fbe +DIST nasm-2.14.02.tar.xz 827620 BLAKE2B deb1f3c806ffbe48eefe4163271c68f02a782f75f21980331cb03e64de20da61c118621536c1c869c1629e558cab45ce98fed8443d29c1126fb4255cd6a36ce4 SHA512 c7a228095f37321d57f2813d04f58ee66949e8f81fc49ef6c4ecd391301e308217583ce1a265d4fe8c13d54b5b9c72aeb132caa3caee36e31b6555fbfff34c81 diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/nasm/files/nasm-2.13.01-fix-docdir.patch b/sdk_container/src/third_party/portage-stable/dev-lang/nasm/files/nasm-2.13.01-fix-docdir.patch deleted file mode 100644 index aaedc404a2..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-lang/nasm/files/nasm-2.13.01-fix-docdir.patch +++ /dev/null @@ -1,177 +0,0 @@ -From 1c369c46fd2cceeb6abe46b89fc539960a6c0c88 Mon Sep 17 00:00:00 2001 -From: David Seifert -Date: Sat, 1 Jul 2017 19:42:50 -0700 -Subject: [PATCH] Make buildsystem respect GNU conventions - -* CPPFLAGS is a user variable and should be respected - when compiling .c files. Think of -D_FORTIFY_SOURCE=2. -* Pass ALL_CFLAGS when linking too. This is recommended - for certain edge cases (-flto) -* Use DESTDIR instead of INSTALLROOT for staging dir - Every other build system (Automake, CMake, Meson) uses - DESTDIR. This integrates better into distro and other - build systems that have standard hooks for DESTDIR. -* $(MAKE) -C is better than cd'ing into a -* Use Autoconf's ${docdir} and ${htmldir} for installing - the documentation. This makes handling documentation - easier and respects user choice. ---- - Makefile.in | 41 +++++++++++++++++++++-------------------- - doc/Makefile.in | 13 ++++++++----- - 2 files changed, 29 insertions(+), 25 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index a48d980..e7f01e4 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -20,6 +20,7 @@ datarootdir = @datarootdir@ - - CC = @CC@ - CFLAGS = @CFLAGS@ -+CPPFLAGS = @CPPFLAGS@ - BUILD_CFLAGS = $(CFLAGS) @DEFS@ - INTERNAL_CFLAGS = -I$(srcdir) -I$(objdir) \ - -I$(srcdir)/include -I$(objdir)/include \ -@@ -72,13 +73,13 @@ endif - .PHONY: manpages nsis - - .c.$(O): -- $(CC) -c $(ALL_CFLAGS) -o $@ $< -+ $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -o $@ $< - - .c.s: -- $(CC) -S $(ALL_CFLAGS) -o $@ $< -+ $(CC) -S $(CPPFLAGS) $(ALL_CFLAGS) -o $@ $< - - .c.i: -- $(CC) -E $(ALL_CFLAGS) -o $@ $< -+ $(CC) -E $(CPPFLAGS) $(ALL_CFLAGS) -o $@ $< - - .txt.xml: - $(ASCIIDOC) -b docbook -d manpage -o $@ $< -@@ -88,7 +89,7 @@ endif - - # This rule is only used for rdoff, to allow common rules - .$(O)$(X): -- $(CC) $(LDFLAGS) -o $@ $< $(RDFLIB) $(NASMLIB) $(LIBS) -+ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $< $(RDFLIB) $(NASMLIB) $(LIBS) - - #-- Begin File Lists --# - NASM = asm/nasm.$(O) -@@ -152,10 +153,10 @@ $(NASMLIB): $(LIBOBJ) - $(RANLIB) $(NASMLIB) - - nasm$(X): $(NASM) $(NASMLIB) -- $(CC) $(LDFLAGS) -o nasm$(X) $(NASM) $(NASMLIB) $(LIBS) -+ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o nasm$(X) $(NASM) $(NASMLIB) $(LIBS) - - ndisasm$(X): $(NDISASM) $(NASMLIB) -- $(CC) $(LDFLAGS) -o ndisasm$(X) $(NDISASM) $(NASMLIB) $(LIBS) -+ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o ndisasm$(X) $(NDISASM) $(NASMLIB) $(LIBS) - - #-- Begin Generated File Rules --# - -@@ -335,12 +336,12 @@ nsis: nsis/nasm.nsi nsis/arch.nsh nsis/version.nsh - manpages: nasm.1 ndisasm.1 - - install: nasm$(X) ndisasm$(X) -- $(MKDIR) -p $(INSTALLROOT)$(bindir) -- $(INSTALL_PROGRAM) nasm$(X) $(INSTALLROOT)$(bindir)/nasm$(X) -- $(INSTALL_PROGRAM) ndisasm$(X) $(INSTALLROOT)$(bindir)/ndisasm$(X) -- $(MKDIR) -p $(INSTALLROOT)$(mandir)/man1 -- $(INSTALL_DATA) $(srcdir)/nasm.1 $(INSTALLROOT)$(mandir)/man1/nasm.1 -- $(INSTALL_DATA) $(srcdir)/ndisasm.1 $(INSTALLROOT)$(mandir)/man1/ndisasm.1 -+ $(MKDIR) -p $(DESTDIR)$(bindir) -+ $(INSTALL_PROGRAM) nasm$(X) $(DESTDIR)$(bindir)/nasm$(X) -+ $(INSTALL_PROGRAM) ndisasm$(X) $(DESTDIR)$(bindir)/ndisasm$(X) -+ $(MKDIR) -p $(DESTDIR)$(mandir)/man1 -+ $(INSTALL_DATA) $(srcdir)/nasm.1 $(DESTDIR)$(mandir)/man1/nasm.1 -+ $(INSTALL_DATA) $(srcdir)/ndisasm.1 $(DESTDIR)$(mandir)/man1/ndisasm.1 - - clean: - for d in . $(SUBDIRS) $(XSUBDIRS); do \ -@@ -364,7 +365,7 @@ distclean: clean - - cleaner: clean - $(RM_F) $(PERLREQ) *.1 nasm.spec -- cd doc && $(MAKE) clean -+ $(MAKE) -C doc clean - - spotless: distclean cleaner - $(RM_F) doc/Makefile -@@ -386,23 +387,23 @@ cscope: - cscope -b -f cscope.out - - rdf_install install_rdf install_rdoff: -- $(MKDIR) -p $(INSTALLROOT)$(bindir) -+ $(MKDIR) -p $(DESTDIR)$(bindir) - for f in $(RDFPROGS); do \ -- $(INSTALL_PROGRAM) "$$f" '$(INSTALLROOT)$(bindir)'/ ; \ -+ $(INSTALL_PROGRAM) "$$f" '$(DESTDIR)$(bindir)'/ ; \ - done -- cd '$(INSTALLROOT)$(bindir)' && \ -+ cd '$(DESTDIR)$(bindir)' && \ - for f in $(RDF2BINLINKS); do \ - bn=`basename "$$f"` && $(RM_F) "$$bn" && \ - $(LN_S) rdf2bin$(X) "$$bn" ; \ - done -- $(MKDIR) -p $(INSTALLROOT)$(mandir)/man1 -- $(INSTALL_DATA) $(srcdir)/rdoff/*.1 $(INSTALLROOT)$(mandir)/man1/ -+ $(MKDIR) -p $(DESTDIR)$(mandir)/man1 -+ $(INSTALL_DATA) $(srcdir)/rdoff/*.1 $(DESTDIR)$(mandir)/man1/ - - doc: -- cd doc && $(MAKE) all -+ $(MAKE) -C doc all - - doc_install install_doc: -- cd doc && $(MAKE) install -+ $(MAKE) -C doc install - - everything: all manpages doc rdf - -diff --git a/doc/Makefile.in b/doc/Makefile.in -index 2ddfd1e..261a791 100644 ---- a/doc/Makefile.in -+++ b/doc/Makefile.in -@@ -9,7 +9,8 @@ prefix = @prefix@ - exec_prefix = @exec_prefix@ - bindir = @bindir@ - mandir = @mandir@ --docdir = $(prefix)/doc/nasm -+docdir = @docdir@ -+htmldir = @htmldir@ - infodir = @infodir@ - datarootdir = @datarootdir@ - -@@ -21,6 +22,7 @@ PERL = perl -I$(srcdir) - - PDFOPT = @PDFOPT@ - -+MKDIR = mkdir - RM_F = rm -f - RM_RF = rm -rf - CP_F = cp -f -@@ -41,7 +43,7 @@ inslist.src: inslist.pl ../x86/insns.dat - - .PHONY: html - html: $(HTMLAUX) -- mkdir -p html -+ $(MKDIR) -p html - for f in $(HTMLAUX); do $(CP_UF) "$(srcdir)/$$f" html/; done - $(MAKE) html/nasmdoc0.html - -@@ -81,6 +83,7 @@ spotless: clean - -$(RM_F) *.hlp nasmdoc.txt *.inf *.pdf *.dvi - - install: all -- mkdir -p $(INSTALLROOT)$(docdir)/html -- $(INSTALL_DATA) html/* $(INSTALLROOT)$(docdir)/html -- $(INSTALL_DATA) nasmdoc.pdf nasmdoc.txt $(INSTALLROOT)$(docdir) -+ $(MKDIR) -p $(DESTDIR)$(htmldir) -+ $(INSTALL_DATA) html/* $(DESTDIR)$(htmldir) -+ $(MKDIR) -p $(DESTDIR)$(docdir) -+ $(INSTALL_DATA) nasmdoc.pdf nasmdoc.txt $(DESTDIR)$(docdir) --- -2.13.2 - diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/nasm/files/nasm-2.13.03-bsd-cp-doc.patch b/sdk_container/src/third_party/portage-stable/dev-lang/nasm/files/nasm-2.13.03-bsd-cp-doc.patch new file mode 100644 index 0000000000..76c1790da2 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-lang/nasm/files/nasm-2.13.03-bsd-cp-doc.patch @@ -0,0 +1,15 @@ +Avoid 'cp -u' as it's not portable. + +In this case we can unconditionally copy files. + +Reported-by: Michał Górny +Bug: https://bugs.gentoo.org/655444 +diff --git a/doc/Makefile.in b/doc/Makefile.in +index 261a791..bc9da1e 100644 +--- a/doc/Makefile.in ++++ b/doc/Makefile.in +@@ -28,3 +28,3 @@ RM_RF = rm -rf + CP_F = cp -f +-CP_UF = cp -ufv ++CP_UF = cp -fv + diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/nasm/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-lang/nasm/metadata.xml index 5f522331eb..f7462a193d 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/nasm/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-lang/nasm/metadata.xml @@ -2,8 +2,8 @@ - mr_bones_@gentoo.org - Michael Sterrett + slyfox@gentoo.org + Sergei Trofimovich The Netwide Assembler, NASM, is an 80x86 assembler designed for portability diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/nasm/nasm-2.11.08.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/nasm/nasm-2.11.08.ebuild deleted file mode 100644 index 8c9e4ab9d6..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-lang/nasm/nasm-2.11.08.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit flag-o-matic - -DESCRIPTION="groovy little assembler" -HOMEPAGE="http://nasm.sourceforge.net/" -SRC_URI="http://www.nasm.us/pub/nasm/releasebuilds/${PV/_}/${P/_}.tar.xz" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="amd64 ~ia64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos" -IUSE="doc" - -DEPEND="dev-lang/perl - doc? ( app-text/ghostscript-gpl sys-apps/texinfo )" -RDEPEND="" - -S=${WORKDIR}/${P/_} - -src_configure() { - strip-flags - econf -} - -src_compile() { - emake nasmlib.o - emake all - use doc && emake doc -} - -src_install() { - emake INSTALLROOT="${D}" install install_rdf - dodoc AUTHORS CHANGES ChangeLog README TODO - if use doc ; then - doinfo doc/info/* - dohtml doc/html/* - dodoc doc/nasmdoc.* - fi -} diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/nasm/nasm-2.12.01.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/nasm/nasm-2.12.01.ebuild deleted file mode 100644 index 5d34b02484..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-lang/nasm/nasm-2.12.01.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit flag-o-matic - -DESCRIPTION="groovy little assembler" -HOMEPAGE="http://www.nasm.us/" -SRC_URI="http://www.nasm.us/pub/nasm/releasebuilds/${PV/_}/${P/_}.tar.xz" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="amd64 ~ia64 x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos" -IUSE="doc" - -DEPEND="dev-lang/perl - doc? ( app-text/ghostscript-gpl sys-apps/texinfo )" -RDEPEND="" - -S=${WORKDIR}/${P/_} - -src_configure() { - strip-flags - econf -} - -src_compile() { - emake nasmlib.o - emake all - use doc && emake doc -} - -src_install() { - emake INSTALLROOT="${D}" install install_rdf - dodoc AUTHORS CHANGES ChangeLog README TODO - if use doc ; then - doinfo doc/info/* - dohtml doc/html/* - dodoc doc/nasmdoc.* - fi -} diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/nasm/nasm-2.13.01.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/nasm/nasm-2.13.01.ebuild deleted file mode 100644 index 6fc9f52cb0..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-lang/nasm/nasm-2.13.01.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic - -DESCRIPTION="groovy little assembler" -HOMEPAGE="http://www.nasm.us/" -SRC_URI="http://www.nasm.us/pub/nasm/releasebuilds/${PV/_}/${P/_}.tar.xz" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos" -IUSE="doc" - -DEPEND=" - dev-lang/perl - doc? ( - app-text/ghostscript-gpl - dev-perl/Font-TTF - dev-perl/Sort-Versions - media-fonts/clearsans - virtual/perl-File-Spec - ) -" - -S=${WORKDIR}/${P/_} -PATCHES=( "${FILESDIR}"/${PN}-2.13.01-fix-docdir.patch ) - -src_configure() { - strip-flags - default -} - -src_compile() { - default - use doc && emake doc -} - -src_install() { - default - emake DESTDIR="${D}" install_rdf $(usex doc install_doc '') -} diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/nasm/nasm-2.14.02.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/nasm/nasm-2.14.02.ebuild new file mode 100644 index 0000000000..ebe185b58e --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-lang/nasm/nasm-2.14.02.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic + +DESCRIPTION="groovy little assembler" +HOMEPAGE="https://www.nasm.us/" +SRC_URI="https://www.nasm.us/pub/nasm/releasebuilds/${PV/_}/${P/_}.tar.xz" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="amd64 ~ia64 x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos" +IUSE="doc" + +RDEPEND="" +DEPEND="" +# [fonts note] doc/psfonts.ph defines ordered list of font preference. +# Currently 'media-fonts/source-pro' is most preferred and is able to +# satisfy all 6 font flavours: tilt, chapter, head, etc. +BDEPEND=" + dev-lang/perl + doc? ( + app-text/ghostscript-gpl + dev-perl/Font-TTF + dev-perl/Sort-Versions + media-fonts/source-pro + virtual/perl-File-Spec + ) +" + +S=${WORKDIR}/${P/_} + +PATCHES=( + "${FILESDIR}"/${PN}-2.13.03-bsd-cp-doc.patch +) + +src_configure() { + strip-flags + default +} + +src_compile() { + default + use doc && emake doc +} + +src_install() { + default + emake DESTDIR="${D}" install_rdf $(usex doc install_doc '') +} diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/nasm-2.11.08 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/nasm-2.11.08 deleted file mode 100644 index 09f9c13e15..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/nasm-2.11.08 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile configure install -DEPEND=dev-lang/perl doc? ( app-text/ghostscript-gpl sys-apps/texinfo ) -DESCRIPTION=groovy little assembler -EAPI=5 -HOMEPAGE=http://nasm.sourceforge.net/ -IUSE=doc -KEYWORDS=amd64 ~ia64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos -LICENSE=BSD-2 -SLOT=0 -SRC_URI=http://www.nasm.us/pub/nasm/releasebuilds/2.11.08/nasm-2.11.08.tar.xz -_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf -_md5_=35526770216e5befb5b23e3ef679cfab diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/nasm-2.12.01 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/nasm-2.12.01 deleted file mode 100644 index 26adcca3f8..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/nasm-2.12.01 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile configure install -DEPEND=dev-lang/perl doc? ( app-text/ghostscript-gpl sys-apps/texinfo ) -DESCRIPTION=groovy little assembler -EAPI=5 -HOMEPAGE=http://www.nasm.us/ -IUSE=doc -KEYWORDS=amd64 ~ia64 x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos -LICENSE=BSD-2 -SLOT=0 -SRC_URI=http://www.nasm.us/pub/nasm/releasebuilds/2.12.01/nasm-2.12.01.tar.xz -_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf -_md5_=4cc404ae981f6ad79dd1edb90df323d7 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/nasm-2.13.01 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/nasm-2.13.01 deleted file mode 100644 index 0859cfd338..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/nasm-2.13.01 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile configure install -DEPEND=dev-lang/perl doc? ( app-text/ghostscript-gpl dev-perl/Font-TTF dev-perl/Sort-Versions media-fonts/clearsans virtual/perl-File-Spec ) -DESCRIPTION=groovy little assembler -EAPI=6 -HOMEPAGE=http://www.nasm.us/ -IUSE=doc -KEYWORDS=~amd64 ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos -LICENSE=BSD-2 -SLOT=0 -SRC_URI=http://www.nasm.us/pub/nasm/releasebuilds/2.13.01/nasm-2.13.01.tar.xz -_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf -_md5_=bf24b0cc4876aa67264e6da31be05763 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/nasm-2.14.02 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/nasm-2.14.02 new file mode 100644 index 0000000000..1361753e1c --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/nasm-2.14.02 @@ -0,0 +1,12 @@ +BDEPEND=dev-lang/perl doc? ( app-text/ghostscript-gpl dev-perl/Font-TTF dev-perl/Sort-Versions media-fonts/source-pro virtual/perl-File-Spec ) +DEFINED_PHASES=compile configure install +DESCRIPTION=groovy little assembler +EAPI=7 +HOMEPAGE=https://www.nasm.us/ +IUSE=doc +KEYWORDS=amd64 ~ia64 x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos +LICENSE=BSD-2 +SLOT=0 +SRC_URI=https://www.nasm.us/pub/nasm/releasebuilds/2.14.02/nasm-2.14.02.tar.xz +_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e multilib b2f01ad412baf81650c23fcf0975fa33 toolchain-funcs f164325a2cdb5b3ea39311d483988861 +_md5_=8d766e63b6e5d6d1f2685182c94ee303