gentoo resync : 24.12.2018

3 files changed, 44 insertions, 1 deletions

diff --git a/dev-lang/nasm/Manifest b/dev-lang/nasm/Manifest
index 9776d86362c7..267b1e40d7b4 100644
--- a/dev-lang/nasm/Manifest
+++ b/dev-lang/nasm/Manifest
@@ -1,10 +1,11 @@
 AUX nasm-2.13.01-fix-docdir.patch 5536 BLAKE2B 4eac268b54b33bbf058562ec15870df57af1997530ddf98940abfa67da4e1241a5cf9597261ae9bf7e65c502ce70d0a60834d12dfa9979ac647b9f04fe56c21e SHA512 22bbfac66b75451345a1f3d19816ecc35397c9b95f16f7dffdf8dbde9055bb035880f5cb081686c42ce3f448e250a29c9440775aad929a7e36c1325e6bbc88d7
 AUX nasm-2.13.01-gcc-8.patch 817 BLAKE2B ffe883fa68f9fe29e909df2226fdcc6603b739335051ca43740504b7af75798036b19ce647daaf146ab976bce3e645b3cca65b972adbf29e737c8e6f2c32e026 SHA512 eb1b8a4d0d122a7bc797962aea24eb858ad4f1876981496546059155cdc4fcb719b849f692f003706c623c27d116c9188598ea482d33bf091d59964410fd0e15
 AUX nasm-2.13.03-bsd-cp-doc.patch 357 BLAKE2B 2611aa3e7f817530c8012f1849d5d80f47105a2e35950795826b3b9d128493ab7e8c1da106b9d22e24a025f8bf24f142cad385c5fca13e09423168bc2fc69f65 SHA512 6562f98e08953b5ac667df4f89f401cc520cf24dfaf112121ca0f7a039b96a328316afd62d118ae98ec9d2c1c3f2c1c9b88d2d66f19197637b7b785a48964f9c
+AUX nasm-2.14-default-path-BR-3392529.patch 1437 BLAKE2B 285c2233277092544c3caedee7678f7537cc701d6066f1b5f30bff4a0bfac77d00887ce6b1ed2f3770c00e6c449f2d004fbad0ad99caff01cb41276cb04911ee SHA512 fcf21448a74ae7b8b4d08b908976962bcd71c98fef35ab4875542413fe7c84e696678ff8a5413f37b2b6a0c194b08da84d2ddd9520b6a2e848af33b7aa3600a6
 DIST nasm-2.13.01.tar.xz 800244 BLAKE2B 23a42d9e6c66577cee0e3b6cdff8da7b7b49286011f2d9e2319bd229ca0a1ab5b89a27d71a591777430e577175c935ba2a34b7ba0ca6086853f84fa5f0f648ab SHA512 6561a2efb3ffea77a1a8cd364edf1ecedb2c14e1902469d7c59d743f25ca612529113d1099818abbe0a9f2592f12604f1810855bbdf8dc9de3648094a83529ae
 DIST nasm-2.13.03.tar.xz 806636 BLAKE2B 36187dac080dac17efbc1a2319d989bcb0f883fee80668656a6a87bdd83ee4115ffa2f8519f6d267815590f4809aa293aac500f3a5505a391154cb460cbe94ad SHA512 24e6c72b80a878453baf3b525c1bad607431ff672a927f73e742379fa833b3f5d3fa4479addfcec6d96f354aa90a45905ff9c76ab5217c3bcb7091107b32e2b5
 DIST nasm-2.14.tar.xz 824780 BLAKE2B c246a357896414aa370ded6e42d076d4d56db62e6519cb421000696d65c6e7581f8e0c3c5d55fb27c876139c368bb739863bb5fc0f9bd76610b054f31ec83b5f SHA512 0f7f1b8b0cd4ac62df1dc203789b74670ebe10f3be10af9984331b1c348745ed31a43aca77c5c771016a718fa2c7c8805c1c9edfdd6b0fe83ee0937cb0dd3d23
 EBUILD nasm-2.13.01.ebuild 861 BLAKE2B eff4bea9ce72d6a3d7ade24757a161cfe385cc7fdc6ac86d412c04ec3e5c0ca436e6b23c8d6db3fa48d46a9a7f7cf671ed22a335a78bac5ac1496c4eac66c46f SHA512 4bd6b4573cc9315e605713ae5dd3d0ef5e391d1561df05c710cfe03fa4f94c30ec2d0db4798e1c758b590b931cf078658905806378e182867305ce37dfacd2b2
 EBUILD nasm-2.13.03-r1.ebuild 1114 BLAKE2B 27c9c88846dc205695ca4c3de908cc97dddca3e5592f972b6ae1f3d515931ebd36a878c781d5ca486cbf3af63526ef30aa156db3a0b048e9fd091f7c440076cb SHA512 7313abac2666b113be49bea29e8a22aabb259af787746100fa3323536fc5e4692dc7fb54378ec54812700e917b06021e0200669fc6785531820716e8186c15a2
-EBUILD nasm-2.14.ebuild 1047 BLAKE2B 35d1958b760f749441bbddf404c8ff88bbe1db15111b5c22413f36f852b482e727cffd453c65877a9e2e658f99601481c4aeee92b2bb0068052f590e11417228 SHA512 fb2ee002adcc695e90683d1c3e78540a716bf05715dd663ea5b094b13c47b207d17718a3ee3e54bc558717615ae759be58ab7639bb23d2ac89809b7f1ddd72b3
+EBUILD nasm-2.14-r1.ebuild 1097 BLAKE2B 0e12ff8b2c8f00a6ab03b576c054eb2596ecb919f6b52b69500cda33ca0ef80d97d781d53ead8ac2a06752443e73e1a295fe8c276b056dd126a30f5a3598437d SHA512 9af9a666c851b5c4f18afae7369a1eed9275f7c8fe53ae8b36fe9771cc2a981d8a3f05f7d557389dd00ed2ca57b05dd0a319eb86a5631802cb004a2925601cef
 MISC metadata.xml 869 BLAKE2B 6acbe39b23e071849e6afd42da7ec5a56f017b708745e5efd09a288775da944fbb1185cead3ceaa573398f5874115139834584323e5b4cff360cf6cd9cca4ccd SHA512 a6bf522dfa6c43ea58a432577fbc31bcc9d262f7262c16d165b3cbacf8394a6d9e6d1eea9480cdb27b692cacada0c5fba3906e913259c2809a48159bce53e5bf
diff --git a/dev-lang/nasm/files/nasm-2.14-default-path-BR-3392529.patch b/dev-lang/nasm/files/nasm-2.14-default-path-BR-3392529.patch
new file mode 100644
index 000000000000..57cbb741505a
--- /dev/null
+++ b/dev-lang/nasm/files/nasm-2.14-default-path-BR-3392529.patch
@@ -0,0 +1,41 @@
+https://bugzilla.nasm.us/show_bug.cgi?id=3392529
+https://bugs.gentoo.org/670944
+
+From 7b6371b9d35705ee3800082ca245f8dd289bb216 Mon Sep 17 00:00:00 2001
+From: "H. Peter Anvin (Intel)" <hpa@zytor.com>
+Date: Tue, 20 Nov 2018 10:56:57 -0800
+Subject: [PATCH] BR 3392529: if the default output name is the same as input
+ -> nasm.out
+
+If no output filename is specified, then a default filename is used
+based on the input filename. If that ends up the *same* as the input
+filename, change the output filename to "nasm.out".
+
+Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
+---
+ asm/nasm.c | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+--- a/asm/nasm.c
++++ b/asm/nasm.c
+@@ -514,9 +514,14 @@ int main(int argc, char **argv)
+      * is a preprocess mode, we're perfectly
+      * fine to output into stdout.
+      */
+-    if (!outname) {
+-        if (!(operating_mode & OP_PREPROCESS))
+-            outname = filename_set_extension(inname, ofmt->extension);
++    if (!outname && !(operating_mode & OP_PREPROCESS)) {
++        outname = filename_set_extension(inname, ofmt->extension);
++        if (!strcmp(outname, inname)) {
++            outname = "nasm.out";
++            nasm_error(ERR_WARNING,
++                       "default output file same as input, using `%s' for output\n",
++                       inname, outname);
++        }
+     }
+ 
+     depend_ptr = (depend_file || (operating_mode & OP_DEPEND))
+-- 
+2.19.2
+
diff --git a/dev-lang/nasm/nasm-2.14.ebuild b/dev-lang/nasm/nasm-2.14-r1.ebuild
index 46c8d440a406..7a17a31be972 100644
--- a/dev-lang/nasm/nasm-2.14.ebuild
+++ b/dev-lang/nasm/nasm-2.14-r1.ebuild
@@ -34,6 +34,7 @@ S=${WORKDIR}/${P/_}
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.13.03-bsd-cp-doc.patch
+	"${FILESDIR}"/${P}-default-path-BR-3392529.patch
 )
 
 src_configure() {