gentoo resync : 10.11.2017

3 files changed, 7 insertions, 8 deletions

diff --git a/app-emulation/dosemu/Manifest b/app-emulation/dosemu/Manifest
index dceaed73e9ef..62a5b4e44690 100644
--- a/app-emulation/dosemu/Manifest
+++ b/app-emulation/dosemu/Manifest
@@ -2,11 +2,11 @@ AUX dosemu-1.4.1_pre20091009-dash.patch 395 SHA256 75581a12062da86b199ae9b3a4a24
 AUX dosemu-1.4.1_pre20130107-fix-inline.patch 560 SHA256 4579c5dfbe7b535e1596dc48facd436c400a39ffb1767b867aef617a2ebfabc1 SHA512 66f3e9a119fb0f80d311d46af6e980ce2f519f389317391746805b875eaecf2f0f714f726e2d6306345c7f68c3e2b2432f8adb16a72a51faf49067ac618e1424 WHIRLPOOL 8b708af81f446820349a4dadc7fe92367cfdfca7d3e5603de847e0b7248d7cfca4808350b79455cee92b4ddc091e7bd67a3fc77534b168810440922c5f3cbd3e
 AUX dosemu-1.4.1_pre20130107-flex-2.6.3.patch 463 SHA256 8ebcc3b50a6128e1401f7d05ec44c05fef2435b2d7e307356970ef9ccf40ac21 SHA512 51674b60fb341f56c7120a9349c9890a9770cdef524ae3ccf6795769fde31823b2b57aaaafd6111c236550c16caf53246773dda1cd71639887ffaa7093d95cc0 WHIRLPOOL 95ee2eb2ae5d15b1837de1aa463ffc25607436d0e6580323cb77094f8ec73dc8dc010ae7ca0eb0b217e67bcaf158cac85ba4614bb3d180f9f12593b3f78f31ca
 AUX dosemu-1.4.1_pre20130107-fortify.patch 1961 SHA256 fdb67267e5fc45de64567605078a29738ad507a16716ae0d77a70a1815166790 SHA512 90a5dbc6b00d2b13086c15997cf056e1a54721518a76a85425c7adb6d859782e26391c28386e847fd914a01f0c243615c21c1317a58c19ed9603133e0256971a WHIRLPOOL 62bbfb3de8d26101b220757af27d1c80c0401e270aaf545b2be9fe0002d38062b81517e49a809b88bfb3e82e14691c0693f556b272c630a05e59e2bdf4dd93d5
-AUX dosemu-1.4.1_pre20130107-ia16-ldflags.patch 1688 SHA256 5fdc3975d0c764204369697f1099451f58ba6acc16f61fd70be5782e69de95a3 SHA512 7f88cfb8719061ead6fd7200c768263346bb7b1f8ce7a8f091607e445b53c468edc1bfc55d30c44513ba8361acad8c05d161774fdc90dae01ebc09a567e02bab WHIRLPOOL e5fa1b8108a6723a9dbb3c79eb8d6908ada248d9f6215a29e805cddaf604550d1c3251b0679dbba67e44983250425ff3f637419be11aa6618ddce31c7077c789
+AUX dosemu-1.4.1_pre20130107-ia16-ldflags.patch 1787 SHA256 73c4ab3b9d6793eb4982030e5c1dead6d0336d3919d819cde5fe12d919b6c3b3 SHA512 53fe8b40bc57a2459dcd16d3fba9d81d1cdab498232afe0c19f612737861f88b2f98c584d4fa1a4548e273a38fc17d254f890a64f3112cb0433d7679e7afcdb3 WHIRLPOOL d29b2d29403aed96d10e68516717a512706c63edeb687b121753e34e1d75c0ed0bdef5cf109ff6295114a1e06b38eda63eca456fcd3584380dae82659fb29d99
 AUX dosemu-1.4.1_pre20130107-no-glibc.patch 559 SHA256 29e59d4049e0af0ff8d97478a1e06091bea5ec700503877c4814d538fdaf70b7 SHA512 c53e3f7ed1b7a74e1112ea5507d0912ef1d16ff657aa5a03132f6b4c35ddb638ecde40ef554254f429316ffd74fc2d8afb59548d97547eeed231c80c0c057eed WHIRLPOOL 1a08dafc08d01bc168a8bcc760966246c34003ebf271fc7b13a44afaabcff8fc8efa7d4a6b4fb72a67ea9800618adae75573ee2a602bd1d08cd26c5789d73fd5
 DIST dosemu-1.4.1_pre20130107.zip 2767256 SHA256 072e1d8ea9c574b02e556d926a287c9c55b82384ed652bb8dd6f3488801901aa SHA512 eb8dcb914a74b235f2b37ff4dd5c1c84b4916ff195c7bf76cdbe6a4d5e6247c57297eef0c579f219ff7f475e727d66fa5a0f314da46d79cc97a0d794e9ad5864 WHIRLPOOL d2835f82515e40d3c85c1ee53c7add5ba055637864ee63997ec912f53862006e33b4139a253b98cb76ca3cdbd7bdca6614609d9e8e716b074283e77cd8105e3c
 DIST dosemu-freedos-1.0-bin.tgz 1205628 SHA256 080c306a1b611e1861fd64466062f268eb44d2bf38082b8a57efadb5a9c0ebc7 SHA512 d0c4235ceac55de63ce5f72e51b7d57a82b8104f4bf2df6f4dc25c9889d3337b40d75665c2dfc98492ec7123e0959a725f5c7579e145895024bd80a07036e3bd WHIRLPOOL 9e6acf38dc8fafe95a49baaaac2a97fdd02c508b7c30c60823f8af7f44aa62b8d82c92661640b4cef05fcdbea401fafea752ec4a0e439a8eff361dd41aa392d3
-EBUILD dosemu-1.4.1_pre20130107-r4.ebuild 2526 SHA256 bd2402537d7061191ecc5b46b65d135f68631b2ee8e07712a23e8b32eb4a821d SHA512 bb92985c30a089cd06bcb5221e5f6e7ade17b98e7a98fdbb51a18ac6fdcbc412cd4ab834dfebfb2b8f16097796fbe8c56f3c4abda902bb2a1a4e0a8463ac4c02 WHIRLPOOL ae783002547bd3244c465e57505e54caa396aae8c1060e1b909b43b209112ac56ed3b43017e23c4ef4b5907fd4345a27f3c51a81393216eee3f85345708accd5
+EBUILD dosemu-1.4.1_pre20130107-r5.ebuild 2526 SHA256 bd2402537d7061191ecc5b46b65d135f68631b2ee8e07712a23e8b32eb4a821d SHA512 bb92985c30a089cd06bcb5221e5f6e7ade17b98e7a98fdbb51a18ac6fdcbc412cd4ab834dfebfb2b8f16097796fbe8c56f3c4abda902bb2a1a4e0a8463ac4c02 WHIRLPOOL ae783002547bd3244c465e57505e54caa396aae8c1060e1b909b43b209112ac56ed3b43017e23c4ef4b5907fd4345a27f3c51a81393216eee3f85345708accd5
 MISC ChangeLog 4068 SHA256 b2fbf8843568f1ac97c02c178d3299d7e15a72c4d30e52162d741cac620e5f42 SHA512 37e3c8d1f247d2b7a54ce1537ad70f46fe97d53a0acacdba3f8c53c455a365d5feada5c0fa5f9195898a6876e665d6316bb592381dbc0891c828d2d0529933bc WHIRLPOOL 7bd2a2608b06a0a14152102d9a286fdfca527b807824c65f7d50c99502dc56952f281b0880f3d85d3052d8d6de3a36413bf9edbaeb1c405b441baf0bf7cc8aee
 MISC ChangeLog-2015 9124 SHA256 29bdd1f0271a8d9bb3cb211565ce34d27738229d11c12c4a52e54906d9ede5ac SHA512 9b70931aed528f1279c4e9e726fae2fad45b5fc6c8c6c28e46ca2048fae1b089fab8f36dc0bb285fa85f2b445d52620e38c16337a58b08571ccae5e4705b50a3 WHIRLPOOL 344e78ca239fd94b030fa076ed23395f01c09be31825caf89c7c558ab4a43ef49e134ddd4ebd124a1a8fd070f00766f8f25365fe38c1d98a831c246befc36fab
 MISC metadata.xml 432 SHA256 eee767a8db09c9f12d83195219073e5895d157b096d59308ea31c2d9313a93bc SHA512 da0538836dc326d714141ab6c7b9f00bc1604fa5b51df7d9d548a8e3d889072b3ee8890a25705e2a7c2c1c31645c0b9af85ce6a2d1e4aa142a4d83a08fd6f9d8 WHIRLPOOL 70837a0b55b4b70b260844cb6f5a69e4e12994d3aa7533c7f4638ee09caad18ccbaf02a2c51503c68a1982b89a803b6a0b1017ef59db1ced562b6b51c1c6e4b4
diff --git a/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r4.ebuild b/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild
index 8b5fcdc0a693..8b5fcdc0a693 100644
--- a/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r4.ebuild
+++ b/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild
diff --git a/app-emulation/dosemu/files/dosemu-1.4.1_pre20130107-ia16-ldflags.patch b/app-emulation/dosemu/files/dosemu-1.4.1_pre20130107-ia16-ldflags.patch
index 0e2393cc2741..f8c05622571c 100644
--- a/app-emulation/dosemu/files/dosemu-1.4.1_pre20130107-ia16-ldflags.patch
+++ b/app-emulation/dosemu/files/dosemu-1.4.1_pre20130107-ia16-ldflags.patch
@@ -7,10 +7,9 @@ diff --git a/Makefile.conf.in b/Makefile.conf.in
 index cd4b34d..cc29931 100644
 --- a/Makefile.conf.in
 +++ b/Makefile.conf.in
-@@ -55,2 +55,4 @@ ALL_LDFLAGS:=@DOSEMU_LDFLAGS@ ${LDFLAGS}
+@@ -55,2 +55,3 @@ ALL_LDFLAGS:=@DOSEMU_LDFLAGS@ ${LDFLAGS}
  DOSBIN_LDFLAGS:=@DOSBIN_LDFLAGS@
-+# flags to "link" 16-bit .com files
-+IA16_LDFLAGS:=-Wl,-Ttext,0x100,-e,_start16,--oformat,binary -nostdlib -s @IA16_LDFLAGS_EXTRA@
++IA16_LDFLAGS_EXTRA:=@IA16_LDFLAGS_EXTRA@
  LIBS:=@LIBS@
 diff --git a/configure.ac b/configure.ac
 index 0f06f57..a86208e 100644
@@ -27,12 +26,12 @@ index 3139b85..c5c4607 100644
 @@ -56,3 +56,3 @@ dosbin: $(COM1) $(COM2) $(SYS)
  $(D)/%.sys: %.o
 -	$(LD) $(ALL_LDFLAGS) -Wl,-Ttext,0,-e,_start16,--oformat,binary -nostdlib -s -o $@ $<
-+	$(LD) $(ALL_LDFLAGS) $(IA16_LDFLAGS) -o $@ $<
++	$(LD) $(ALL_LDFLAGS) -Wl,-Ttext,0,-e,_start16,--oformat,binary -nostdlib -s $(IA16_LDFLAGS_EXTRA) -o $@ $<
  	chmod -x $@ 
 @@ -60,3 +60,3 @@ $(D)/%.sys: %.o
  $(D)/%.com: %.o
 -	$(LD) $(ALL_LDFLAGS) -Wl,-Ttext,100,-e,_start16,--oformat,binary -nostdlib -s -o $@ $<
-+	$(LD) $(ALL_LDFLAGS) $(IA16_LDFLAGS) -o $@ $<
++	$(LD) $(ALL_LDFLAGS) -Wl,-Ttext,100,-e,_start16,--oformat,binary -nostdlib -s $(IA16_LDFLAGS_EXTRA) -o $@ $<
  	chmod -x $@
 diff --git a/src/plugin/commands/Makefile b/src/plugin/commands/Makefile
 index 48f49d5..d3a5667 100644
@@ -41,5 +40,5 @@ index 48f49d5..d3a5667 100644
 @@ -57,3 +57,3 @@ $(STUBFULL): $(D)/generic.com ./mkcomstub
  $(D)/%.com: %.o
 -	$(LD) $(ALL_LDFLAGS) -Wl,-Ttext,0x100,-e,_start16,--oformat,binary -nostdlib -s -o $@ $<
-+	$(LD) $(ALL_LDFLAGS) $(IA16_LDFLAGS) -o $@ $<
++	$(LD) $(ALL_LDFLAGS) -Wl,-Ttext,0x100,-e,_start16,--oformat,binary -nostdlib -s $(IA16_LDFLAGS_EXTRA) -o $@ $<
  	chmod -x $@