gentoo resync : 25.11.2020

6 files changed, 317 insertions, 2 deletions

diff --git a/media-sound/sc2mpd/Manifest b/media-sound/sc2mpd/Manifest
index 9a3cd7e1ea63..8a4d21ed741f 100644
--- a/media-sound/sc2mpd/Manifest
+++ b/media-sound/sc2mpd/Manifest
@@ -2,11 +2,17 @@ AUX ohnet.makefile.patch 1233 BLAKE2B 1a877c58ec3b37c96dd4ea3830159de8bc3c34cd99
 AUX ohnet.optionparser.patch 449 BLAKE2B 55133d193ebb7dc249f71ad8d249b22569c03456e0ad687e3af27e88ed0502e134b8e70128cae4fe1d92b503e52f94c8d567159fca9ff6133f99b25c791044f9 SHA512 fe723ee9f734b5ae3a5d1a2ee3c0cb22b887d154314cc776253d14adff20de86d51a8563ba1dfb2b0f37a9c77e24277d961c45941e23a644f2769a17d050d665
 AUX ohnetgenerated.commonmk.patch 1473 BLAKE2B 6d2d8497fcd7e4e9e0f2210fc24308eab4559f8974f3e6f2d6e39163a54fb7b848455d496b0191e7260c83dc27bdb96e0f1bcbaa124165b3de603b22e5adabea SHA512 a9b6b8e2d23ca661c7590fb55c34b02a248fb4b95b843e4d87fd11ec08b360fcc386d7738fd3a6433bec22cdaaa81932b81342c19d99ac5673dcfb6c29215c9f
 AUX ohnetgenerated.makefile.patch 1138 BLAKE2B a65ff04a64c64ad86625f635990615271a206cb4657fb7eef423a0b04d1718b113eaab0aa57b1b52f7235ec8a1f41dcd6a8f2e949ae45336dd1c55380a19f791 SHA512 4bcd0e5044fd89a51a9be29f2f445f59292a8b36a249f09a74aa9a7ff215b6359be8a526e1ddf9b1c7fab56f6e2453afe5841b543552fe3abf78ce5c84b25e9c
+AUX sc2mpd-1.1.5-werror.patch 4448 BLAKE2B d41c363b6db9ab7b3170e7adf6ebd9e72d94d8e708ecc5a273765ba922b8098f7f706a2245b9f23f8146d253d6c7ad2ac00b28199eb8609be6af121b42c32150 SHA512 ea7805a2a572bd8995418115ea5c256a6897d787dbacc7d31482b39672c78b3b25bc087acb6cf1d0945bacaebed4112e1de19e9484e556978c6c851dac2cac30
+AUX sc2mpd-1.1.7-python.patch 4186 BLAKE2B 8037ab9b33d25a65ec4b72b616de23c8ab12f3e93d6fe3b607039b0ad3f69f3aa37d6e7b39dc0b91767b953307464c7bd9066dc8210ef2a4c3090ad01ece220c SHA512 45b17410a6499cefd7b596c08e5fee288f16a3057e1c84da96e6388132a2fb56060f2010b65ffa38cbef0d179f8fe1c6f88da9d355f177e5524ca674bbdf0b75
+AUX sc2mpd-1.1.7-werror.patch 4237 BLAKE2B f3922de425df679e9b9e7c5249994a39e9fcda6a539f1b3d084ece8f44c8e81546b975375ca3fd8d0e81504bb712791bc99e1aa139d422805ef7dd16d79d8f16 SHA512 28d6ca71fc41ed11fab780f48861f04b28d853240107db2eed6911f3e58710e50e31bbc3f3d5c047599c1d1e544a921bc4ea4bc37e5900a02a4092c7de520fe5
 DIST ohdevtools.d35861.tar.gz 1187475 BLAKE2B 82138d9b64f3172d540402e99b716e9b56bde2133b2565b442bfe6ae6b0e2235226027c4b43b17e3eb005b6f52a4d6a278e0895d267222a63f910ea556e4d76c SHA512 25188c3ae837db12e5c7f349ab01a315f8c68909e3eaa530dc9ba09fb2bcb3cd0a671676b3dd4902ef019b7e331d2acac0978649bce29df585e54d13158ff162
 DIST ohnet.1dd641.tar.gz 20831753 BLAKE2B 82724b7f2cd5cd0dcaa54786394a2560b965f5f16df7bb84037795f1334b8052a4cfeff8f5f39bdc5d7a0ccb2093190c38de987957463d10cac407d9694a6a92 SHA512 67ccdbee6d909df30acb7c89aeba75d3accdbb533dda5abc02c66f867e2fad9a360696d5e28dd1decdc575a1396d026824329450e85e3a3b3e4f7af2e144140a
 DIST ohnetgenerated.e3edb9.tar.gz 1887473 BLAKE2B 1b878dd743f0b45f69c3eb018ddbd64db60285ee8743bb039f9a794a9e0ecdb516e1138ac622fc7cde3462fe5c3cfc006d71d0b22048496c1bc190cc4f34a906 SHA512 9b48d0ff496acfa4313c1efc90e73f1050fee011b1ab301b9268ba4009fca9a47978cbe2f1f0a1d05d7c939f95b4a38560b9f63464305032c20d36af3ade8811
 DIST ohsongcast.3299ea.tar.gz 831313 BLAKE2B aaa5590af288bbf2b358bad613b983418f6648219bba046113a8c712f3a369fee2894c8aa42f96ead16582b96b982d1696b478950e0e3d0ef6c8e3325e5a3214 SHA512 ac1e81166e5b73a943f78c930ef89fc5b71447c7eb8c4cc509c50c686a360a25f75f1651061a653bf995c15377bee4cb98a97665bf27f04f947940a249e12661
 DIST ohtopology.cc09c0.tar.gz 118703 BLAKE2B ef5b560cb2a272586e8755117b5021d67562bda962b0c6240072ad42876ae71f21c81611521d31b01212d2175637244b8513332858aec3d7e713546587111ed0 SHA512 46f1e4ba6b7553b81c939c2ae691ab89e0bf9b565820e8c65b14b6534f3a9240580cb9fd69f46568c5f0c8d105da825b6f9abbf61a64289a4f553a47902b38d4
+DIST openhome-sc2-20200704.tar.gz 22352681 BLAKE2B a5131f3b5c3400ff0ca58f0ce9b45c25db6fc13dcf6827ed9e4531effd3b35026d59495adf690ba65c09624c12f7755b9373ec4e4309de73f17fdeb866beeba7 SHA512 04586fbfd8053c7f01d2c3dbf421f75d0d93ac179cf5f58bc7966d364a3477a87985a1a2db1b35018aa5193a07977b7b4be60d317e7c10b275234adf9a2bd5d2
 DIST sc2mpd-1.1.5.tar.gz 219031 BLAKE2B ac8a3b4da6caff58db4948c32d643bf9244efa4ad77e29c18aa7e10036715a9a84c9f69478f5a2eabf6769112fb61ea15e1d7e8e613fbae05794cef609f21247 SHA512 8ea47b8bda62b8e97b95b0ddf0ab7979a54ae8bc599c67ef7bdd16ea876254446c8be440fade7355be93742c94c6f20b56e40a5756cc3c0dbe0409612dc3788e
-EBUILD sc2mpd-1.1.5.ebuild 4562 BLAKE2B fbecb9f945afb3d1ba06e15cdcabefc762cd4a68919208001843fbf6dac4b5b52bd773934b8db7f685f31e9f2508a4d06e4c05223c69fb3658a2a681ceaf3a2a SHA512 c2f91e7fb6b48cda77c204c631d44f6765433d7d9f01872a17a99f588f3fe09dc2827cbc48104b8752defb27b607612dc7bbd20fc478748a9f52fba435c221c8
+DIST sc2mpd-1.1.7.tar.gz 238674 BLAKE2B 35fd57797612e3883ad5cc04be3f5328dbf4ec9aedb0461a801fe79566ef20de4026ad653eec6e7d932ffcd0385bb618331a519ec54838fd856d09c20f1971b8 SHA512 0b39e200f013602c851bec1ba41210c40d1a984638c86bd8dd5d61286aff19b315f282182753426e4470c8e6ccb60265b16dc6ba2e5117f59a3d40194464b4b3
+EBUILD sc2mpd-1.1.5.ebuild 4603 BLAKE2B 7d06773dce9de0204ffa7c32663b4dd169236ebfafd08a5d7a0790c920d659303451b392ba7bb1b2365139cb520f75dc45fcb202c83942ae5dc1ac6ea251ee0a SHA512 2bb100f9816c88d41cb8f8c01d0d768c79426d63bb6a5e6eff3f99b1f8a6608d080fb6451a574cb3ff39711ad1a79331cbf68fe7c74013aa87843d8be4b11d07
+EBUILD sc2mpd-1.1.7.ebuild 3255 BLAKE2B 9d132bf0e35d92ead2f130fd377c080ebd29b01b9a1092d82ad5b92ad98a6c68f526053f8c7c599f3c87e9e1cd6981dd4c409063f9647e5826aa6eaa6e419f4f SHA512 2cd018f872c01aa7e2417e8d0e22b655bb5a8a3a3e3fbb14d57f7c2d5018d4c3aedfe96919ad45602a506e6830dc0ba59dd5a59258c8c8f889a79a12388d328c
 MISC metadata.xml 217 BLAKE2B c0bbfd196fa82f939049ba60f8a1ea7fffccb97a821373c8ba9d8265585e7cdd81f6cd1623ff0704fbb52a8109d9e31c7872949ac7f5910f646bfb766392e717 SHA512 e09835e34c3f35da82048705a28fcde46e7cc04e4cc8d6118e211bec65666ee1a7f3d6c440c8de99b4a3326ea826ef75b29e0a8898b7d6a2a71a2533e43b1f9d
diff --git a/media-sound/sc2mpd/files/sc2mpd-1.1.5-werror.patch b/media-sound/sc2mpd/files/sc2mpd-1.1.5-werror.patch
new file mode 100644
index 000000000000..ecc415f91b54
--- /dev/null
+++ b/media-sound/sc2mpd/files/sc2mpd-1.1.5-werror.patch
@@ -0,0 +1,72 @@
+diff -ur sc2mpd-1.1.5/work/openhome/ohNet/Makefile sc2mpd-1.1.5.altered/work/openhome/ohNet/Makefile
+--- a/openhome/ohNet/Makefile   2020-11-16 20:49:27.220636318 -0600
++++ b/openhome/ohNet/Makefile   2020-11-16 20:46:19.822974263 -0600
+@@ -310,13 +310,13 @@
+ cflags_base = -fexceptions -Wall $(version_specific_cflags_third_party) -pipe -D_GNU_SOURCE -D_REENTRANT -DDEFINE_$(endian)_ENDIAN -DDEFINE_TRACE $(debug_specific_cflags) -fvisibility=hidden $(platform_cflags)
+ cflags_third_party = $(cflags_base) -Wno-int-to-pointer-cast
+ ifeq ($(nocpp11), yes)
+-    cppflags = $(cflags_base) -Werror
++    cppflags = $(cflags_base)
+ else ifeq ($(platform),IntelMac)
+-    cppflags = $(cflags_base) -std=c++11 -Werror
++    cppflags = $(cflags_base) -std=c++11
+ else
+-    cppflags = $(cflags_base) -std=c++0x -Werror
++    cppflags = $(cflags_base) -std=c++0x
+ endif
+-cflags = $(cflags_base) -Werror
++cflags = $(cflags_base)
+ inc_build = Build/Include
+ includes = -IBuild/Include/ $(version_specific_includes)
+ bundle_build = Build/Bundles
+@@ -371,7 +371,7 @@
+        jar = $(JAVA_HOME)/bin/jar
+ endif
+
+-java_cflags = -fexceptions -Wall $(platform_java_cflags) $(version_specific_java_cflags) -Werror -pipe -D_GNU_SOURCE -D_REENTRANT -DDEFINE_$(endian)_ENDIAN -DDEFINE_TRACE $(debug_specific_cflags) $(platform_cflags)
++java_cflags = -fexceptions -Wall $(platform_java_cflags) $(version_specific_java_cflags) -pipe -D_GNU_SOURCE -D_REENTRANT -DDEFINE_$(endian)_ENDIAN -DDEFINE_TRACE $(debug_specific_cflags) $(platform_cflags)
+ jarflags = cf
+ dirsep = /
+ prefix = /usr/local
+diff -ur sc2mpd-1.1.5/work/openhome/ohNetGenerated/Makefile sc2mpd-1.1.5.altered/work/openhome/ohNetGenerated/Makefile
+--- a/openhome/ohNetGenerated/Makefile  2020-11-16 20:49:27.262636458 -0600
++++ b/openhome/ohNetGenerated/Makefile  2020-11-16 20:45:36.594809974 -0600
+@@ -273,13 +273,13 @@
+ cflags_base = -fexceptions -Wall $(version_specific_cflags_third_party) -pipe -D_GNU_SOURCE -D_REENTRANT -DDEFINE_$(endian)_ENDIAN -DDEFINE_TRACE $(debug_specific_cflags) -fvisibility=hidden $(platform_cflags)
+ cflags_third_party = $(cflags_base) -Wno-int-to-pointer-cast
+ ifeq ($(nocpp11), yes)
+-    cppflags = $(cflags_base) -Werror
++    cppflags = $(cflags_base)
+ else ifeq ($(platform),IntelMac)
+-    cppflags = $(cflags_base) -std=c++11 -Werror
++    cppflags = $(cflags_base) -std=c++11
+ else
+-    cppflags = $(cflags_base) -std=c++0x -D__STDC_VERSION__=199901L -Werror
++    cppflags = $(cflags_base) -std=c++0x -D__STDC_VERSION__=199901L
+ endif
+-cflags = $(cflags_base) -Werror
++cflags = $(cflags_base)
+ depsPlatform = ${openhome_system}-${openhome_architecture}
+ header_install = Build/Include
+ inc_build = dependencies/$(depsPlatform)/ohNet-$(depsPlatform)-Release/include/ohnet
+@@ -334,7 +334,7 @@
+        jar = $(JAVA_HOME)/bin/jar
+ endif
+
+-java_cflags = -fexceptions -Wall $(version_specific_java_cflags) -Werror -pipe -D_GNU_SOURCE -D_REENTRANT -DDEFINE_$(endian)_ENDIAN -DDEFINE_TRACE $(debug_specific_cflags) $(platform_cflags)
++java_cflags = -fexceptions -Wall $(version_specific_java_cflags) -pipe -D_GNU_SOURCE -D_REENTRANT -DDEFINE_$(endian)_ENDIAN -DDEFINE_TRACE $(debug_specific_cflags) $(platform_cflags)
+ jarflags = cf
+ dirsep = /
+ prefix = /usr/local
+diff -ur sc2mpd-1.1.5/work/openhome/ohSongcast/Makefile sc2mpd-1.1.5.altered/work/openhome/ohSongcast/Makefile
+--- a/openhome/ohSongcast/Makefile      2016-10-18 02:34:33.000000000 -0500
++++ b/openhome/ohSongcast/Makefile      2020-11-16 20:46:57.123112193 -0600
+@@ -38,7 +38,7 @@
+ # Macros used by Common.mak
+
+ ar = ${CROSS_COMPILE}ar rc $(objdir)
+-cflags = -fexceptions -Wall -Werror -pipe -std=c++11 -D_GNU_SOURCE -D_REENTRANT -DDEFINE_LITTLE_ENDIAN -DDEFINE_TRACE $(debug_specific_flags) -fvisibility=hidden -DDllImport="__attribute__ ((visibility(\"default\")))" -DDllExport="__attribute__ ((visibility(\"default\")))" -DDllExportClass="__attribute__ ((visibility(\"default\")))" $(platform_cflags)
++cflags = -fexceptions -Wall -pipe -std=c++11 -D_GNU_SOURCE -D_REENTRANT -DDEFINE_LITTLE_ENDIAN -DDEFINE_TRACE $(debug_specific_flags) -fvisibility=hidden -DDllImport="__attribute__ ((visibility(\"default\")))" -DDllExport="__attribute__ ((visibility(\"default\")))" -DDllExportClass="__attribute__ ((visibility(\"default\")))" $(platform_cflags)
+ ohnetdir = ../ohNet/Build/Obj/$(osdir)/$(build_dir)/
+ ohnetgenerateddir = ../ohNetGenerated/Build/Obj/$(osdir)/$(build_dir)/
+ ohtopologydir = ../ohTopology/build/
diff --git a/media-sound/sc2mpd/files/sc2mpd-1.1.7-python.patch b/media-sound/sc2mpd/files/sc2mpd-1.1.7-python.patch
new file mode 100644
index 000000000000..d4103a522451
--- /dev/null
+++ b/media-sound/sc2mpd/files/sc2mpd-1.1.7-python.patch
@@ -0,0 +1,64 @@
+diff -ur work.orig/ohNet/bundle_binaries.py work/ohNet/bundle_binaries.py
+--- a/openhome/ohNet/bundle_binaries.py	2020-11-10 00:24:29.640122646 -0600
++++ b/openhome/ohNet/bundle_binaries.py	2020-11-10 00:26:38.441470487 -0600
+@@ -121,22 +121,22 @@
+     parser.add_option("-m", "--managed-only", default=False, action="store_true", help="Package only the managed assembly.")

+     options, args = parser.parse_args()

+     if len(args)>0:

+-        print "Too many arguments."

++        print("Too many arguments.")

+         sys.exit(1)

+     if options.system not in ALL_SYSTEMS:

+-        print "Please specify --system from one of {0}.".format(", ".join(sorted(ALL_SYSTEMS)))

++        print("Please specify --system from one of {0}.".format(", ".join(sorted(ALL_SYSTEMS))))

+         sys.exit(1)

+     if options.architecture not in ALL_ARCHITECTURES:

+-        print "Please specify --architecture from one of {0}.".format(", ".join(sorted(set(tgt.architecture for tgt in ALL_TARGETS.keys() if tgt.system == options.system))))

++        print("Please specify --architecture from one of {0}.".format(", ".join(sorted(set(tgt.architecture for tgt in ALL_TARGETS.keys() if tgt.system == options.system)))))

+         sys.exit(1)

+     if options.configuration not in ALL_CONFIGURATIONS:

+-        print "Please specify --configuration from one of {0}.".format(", ".join(sorted(ALL_CONFIGURATIONS)))

++        print("Please specify --configuration from one of {0}.".format(", ".join(sorted(ALL_CONFIGURATIONS))))

+         sys.exit(1)

+     target = BuildTarget(options.system, options.architecture, options.configuration)

+     if target not in ALL_TARGETS:

+-        print "Unrecognized target combination. Valid combinations are:"

++        print("Unrecognized target combination. Valid combinations are:")

+         for valid_target in sorted(ALL_TARGETS.keys()):

+-            print "    " + get_target_as_option_string(valid_target)

++            print("    " + get_target_as_option_string(valid_target))

+         sys.exit(1)

+ 

+     buildinfo = ALL_TARGETS[target]

+diff -ur work.orig/ohNetGenerated/bundle_binaries.py work/ohNetGenerated/bundle_binaries.py
+--- a/openhome/ohNetGenerated/bundle_binaries.py	2020-11-10 00:24:29.847123204 -0600
++++ b/openhome/ohNetGenerated/bundle_binaries.py	2020-11-10 00:26:11.793398395 -0600
+@@ -96,22 +96,22 @@
+     parser.add_option("-m", "--managed-only", default=False, action="store_true", help="Package only the managed assembly.")

+     options, args = parser.parse_args()

+     if len(args)>0:

+-        print "Too many arguments."

++        print("Too many arguments.")

+         sys.exit(1)

+     if options.system not in ALL_SYSTEMS:

+-        print "Please specify --system from one of {0}.".format(", ".join(sorted(ALL_SYSTEMS)))

++        print("Please specify --system from one of {0}.".format(", ".join(sorted(ALL_SYSTEMS))))

+         sys.exit(1)

+     if options.architecture not in ALL_ARCHITECTURES:

+-        print "Please specify --architecture from one of {0}.".format(", ".join(sorted(set(tgt.architecture for tgt in ALL_TARGETS.keys() if tgt.system == options.system))))

++        print("Please specify --architecture from one of {0}.".format(", ".join(sorted(set(tgt.architecture for tgt in ALL_TARGETS.keys() if tgt.system == options.system)))))

+         sys.exit(1)

+     if options.configuration not in ALL_CONFIGURATIONS:

+-        print "Please specify --configuration from one of {0}.".format(", ".join(sorted(ALL_CONFIGURATIONS)))

++        print("Please specify --configuration from one of {0}.".format(", ".join(sorted(ALL_CONFIGURATIONS))))

+         sys.exit(1)

+     target = BuildTarget(options.system, options.architecture, options.configuration)

+     if target not in ALL_TARGETS:

+-        print "Unrecognized target combination. Valid combinations are:"

++        print("Unrecognized target combination. Valid combinations are:")

+         for valid_target in sorted(ALL_TARGETS.keys()):

+-            print "    " + get_target_as_option_string(valid_target)

++            print("    " + get_target_as_option_string(valid_target))

+         sys.exit(1)

+ 

+     buildinfo = ALL_TARGETS[target]

diff --git a/media-sound/sc2mpd/files/sc2mpd-1.1.7-werror.patch b/media-sound/sc2mpd/files/sc2mpd-1.1.7-werror.patch
new file mode 100644
index 000000000000..fd079e26fb8a
--- /dev/null
+++ b/media-sound/sc2mpd/files/sc2mpd-1.1.7-werror.patch
@@ -0,0 +1,72 @@
+diff -ur ohNet/Makefile ohNet/Makefile
+--- a/openhome/ohNet/Makefile	2020-11-09 23:46:21.295605850 -0600
++++ b/openhome/ohNet/Makefile	2020-11-09 23:48:05.977868337 -0600
+@@ -344,13 +344,13 @@
+ cflags_base = -fexceptions -Wall $(version_specific_cflags_third_party) -pipe -D_GNU_SOURCE -D_REENTRANT -DDEFINE_$(endian)_ENDIAN -DDEFINE_TRACE $(debug_specific_cflags) -fvisibility=hidden $(platform_cflags)
+ cflags_third_party = $(cflags_base) -Wno-int-to-pointer-cast
+ ifeq ($(nocpp11), yes)
+-    cppflags = $(cflags_base) -Werror
++    cppflags = $(cflags_base)
+ else ifeq ($(platform),IntelMac)
+-    cppflags = $(cflags_base) -std=c++11 -Werror
++    cppflags = $(cflags_base) -std=c++11
+ else
+-    cppflags = $(cflags_base) -std=c++0x -Werror
++    cppflags = $(cflags_base) -std=c++0x
+ endif
+-cflags = $(cflags_base) -Werror
++cflags = $(cflags_base)
+ inc_build = Build/Include
+ includes = -IBuild/Include/ $(version_specific_includes)
+ bundle_build = Build/Bundles
+@@ -407,7 +407,7 @@
+ 	jar = $(JAVA_HOME)/bin/jar
+ endif
+ 
+-java_cflags = -fexceptions -Wall $(platform_java_cflags) $(version_specific_java_cflags) -Werror -pipe -D_GNU_SOURCE -D_REENTRANT -DDEFINE_$(endian)_ENDIAN -DDEFINE_TRACE $(debug_specific_cflags) $(platform_cflags)
++java_cflags = -fexceptions -Wall $(platform_java_cflags) $(version_specific_java_cflags) -pipe -D_GNU_SOURCE -D_REENTRANT -DDEFINE_$(endian)_ENDIAN -DDEFINE_TRACE $(debug_specific_cflags) $(platform_cflags)
+ jarflags = cf
+ dirsep = /
+ prefix = /usr/local
+diff -ur ohNetGenerated/Makefile ohNetGenerated/Makefile
+--- a/openhome/ohNetGenerated/Makefile	2020-11-09 23:46:21.344605971 -0600
++++ b/openhome/ohNetGenerated/Makefile	2020-11-09 23:47:44.656814158 -0600
+@@ -276,13 +276,13 @@
+ cflags_base = -fexceptions -Wall $(version_specific_cflags_third_party) -pipe -D_GNU_SOURCE -D_REENTRANT -DDEFINE_$(endian)_ENDIAN -DDEFINE_TRACE $(debug_specific_cflags) -fvisibility=hidden $(platform_cflags)
+ cflags_third_party = $(cflags_base) -Wno-int-to-pointer-cast
+ ifeq ($(nocpp11), yes)
+-    cppflags = $(cflags_base) -Werror
++    cppflags = $(cflags_base)
+ else ifeq ($(platform),IntelMac)
+-    cppflags = $(cflags_base) -std=c++11 -Werror
++    cppflags = $(cflags_base) -std=c++11
+ else
+-    cppflags = $(cflags_base) -std=c++0x -D__STDC_VERSION__=199901L -Werror
++    cppflags = $(cflags_base) -std=c++0x -D__STDC_VERSION__=199901L
+ endif
+-cflags = $(cflags_base) -Werror
++cflags = $(cflags_base)
+ depsPlatform = ${openhome_system}-${openhome_architecture}
+ header_install = Build/Include
+ inc_build = dependencies/$(depsPlatform)/ohNet-$(depsPlatform)-Release/include/ohnet
+@@ -337,7 +337,7 @@
+ 	jar = $(JAVA_HOME)/bin/jar
+ endif
+ 
+-java_cflags = -fexceptions -Wall $(version_specific_java_cflags) -Werror -pipe -D_GNU_SOURCE -D_REENTRANT -DDEFINE_$(endian)_ENDIAN -DDEFINE_TRACE $(debug_specific_cflags) $(platform_cflags)
++java_cflags = -fexceptions -Wall $(version_specific_java_cflags) -pipe -D_GNU_SOURCE -D_REENTRANT -DDEFINE_$(endian)_ENDIAN -DDEFINE_TRACE $(debug_specific_cflags) $(platform_cflags)
+ jarflags = cf
+ dirsep = /
+ prefix = /usr/local
+diff -ur ohSongcast/Makefile ohSongcast/Makefile
+--- a/openhome/ohSongcast/Makefile	2020-11-09 23:46:21.256605754 -0600
++++ b/openhome/ohSongcast/Makefile	2020-11-09 23:47:23.130759816 -0600
+@@ -38,7 +38,7 @@
+ # Macros used by Common.mak
+ 
+ ar = ${CROSS_COMPILE}ar rc $(objdir)
+-cflags = -fexceptions -Wall -Werror -pipe -std=c++11 -D_GNU_SOURCE -D_REENTRANT -DDEFINE_LITTLE_ENDIAN -DDEFINE_TRACE $(debug_specific_flags) -fvisibility=hidden -DDllImport="__attribute__ ((visibility(\"default\")))" -DDllExport="__attribute__ ((visibility(\"default\")))" -DDllExportClass="__attribute__ ((visibility(\"default\")))" $(platform_cflags)
++cflags = -fexceptions -Wall -pipe -std=c++11 -D_GNU_SOURCE -D_REENTRANT -DDEFINE_LITTLE_ENDIAN -DDEFINE_TRACE $(debug_specific_flags) -fvisibility=hidden -DDllImport="__attribute__ ((visibility(\"default\")))" -DDllExport="__attribute__ ((visibility(\"default\")))" -DDllExportClass="__attribute__ ((visibility(\"default\")))" $(platform_cflags)
+ ohnetdir = ../ohNet/Build/Obj/$(osdir)/$(build_dir)/
+ ohnetgenerateddir = ../ohNetGenerated/Build/Obj/$(osdir)/$(build_dir)/
+ ohtopologydir = ../ohTopology/build/
diff --git a/media-sound/sc2mpd/sc2mpd-1.1.5.ebuild b/media-sound/sc2mpd/sc2mpd-1.1.5.ebuild
index 88eb814868c4..dd5733ae60e6 100644
--- a/media-sound/sc2mpd/sc2mpd-1.1.5.ebuild
+++ b/media-sound/sc2mpd/sc2mpd-1.1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -47,6 +47,8 @@ src_prepare() {
 	mv ohTopology-${sha_topology} openhome/ohTopology || die "Couldn't mv ohTopology"
 	mv ohSongcast-${sha_songcast} openhome/ohSongcast || die "Couldn't mv ohSongcast"
 
+	eapply "${FILESDIR}/${P}-werror.patch"
+
 	cd "${WORKDIR}/openhome/ohNet" || die "Couldn't cd to ohNet dir"
 	epatch "${FILESDIR}/ohnet.makefile.patch"
 	epatch "${FILESDIR}/ohnet.optionparser.patch"
diff --git a/media-sound/sc2mpd/sc2mpd-1.1.7.ebuild b/media-sound/sc2mpd/sc2mpd-1.1.7.ebuild
new file mode 100644
index 000000000000..5e598bc0f586
--- /dev/null
+++ b/media-sound/sc2mpd/sc2mpd-1.1.7.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils
+
+DESCRIPTION="Implements the SongCast protocol for use by upmpdcli and mpd"
+HOMEPAGE="https://www.lesbonscomptes.com/upmpdcli/index.html"
+
+openhome_packageversion="20200704"
+
+SRC_URI="
+	https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz
+	https://www.lesbonscomptes.com/upmpdcli/downloads/openhome-sc2-${openhome_packageversion}.tar.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	dev-libs/expat
+	media-libs/alsa-lib
+	media-libs/libsamplerate
+	media-libs/libmpdclient
+	<=net-libs/libmicrohttpd-0.9.70
+"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	mkdir openhome || die "Can't create openhome directory"
+	cd openhome || die "Can't enter openhome directory"
+	unpack openhome-sc2-${openhome_packageversion}.tar.gz
+}
+
+src_prepare() {
+	cd "${WORKDIR}" || die "Couldn't cd to WORKDIR"
+	eapply "${FILESDIR}/${P}-python.patch"
+	eapply "${FILESDIR}/${P}-werror.patch"
+	eapply_user
+}
+
+src_configure() {
+	econf "--with-openhome=${WORKDIR}/openhome"
+}
+
+src_compile() {
+
+	#### Begin ohbuild.sh reverse engineer
+
+	# build_ohNet
+	cd "${WORKDIR}/openhome/ohNet" || die "Couldn't cd to ohNet dir"
+	make native_only=yes || die "ohnet make failed"
+
+	# build_ohNetGenerated
+	cd "${WORKDIR}/openhome/ohNetGenerated" || die "Couldn't cd to ohNetGenerated dir"
+	# TODO: get from environment/make target
+	deps="${WORKDIR}/openhome/ohNetGenerated/dependencies/Linux-x64/ohNet-Linux-x64-Release"
+	mkdir -p $deps/{include/ohnet,lib/{ohnet,t4,ui,PyOhNet}} || die "Couldn't mkdir deps"
+	cd $deps || die "Couldn't cd to deps dir"
+
+	ohnet="${WORKDIR}/openhome/ohNet"
+	find "$ohnet/Build" \( -name '*.a' -o -name '*.so' \) \
+		 -exec cp '{}' lib ';' \
+		|| die "Couldn't cp binary libs"
+
+	cd "$ohnet/Build/Include" || die "Couldn't cd to include"
+	cp -R * "${deps}/include/ohnet" || die "Couldn't cp include"
+	# cd "$ohnet/Build/Tools" || die "Couldn't cd to tools"
+	# cp -R * "${deps}/lib/t4" || die "Couldn't cp tools"
+	cd "$ohnet/OpenHome/Net/T4/Templates" || die "Couldn't cd to templates"
+	cp -R * "${deps}/lib/t4" || die "Couldn't cp templates"
+	cd "$ohnet/OpenHome/Net/Bindings/Js/ControlPoint" || die "Couldn't cd to ui"
+	cp -R * "${deps}/lib/ui" || die "Couldn't cp ui"
+	cd "$ohnet/OpenHome/Net/Bindings/Python/PyOhNet" || die "Couldn't cd to py"
+	cp -R * "${deps}/lib/PyOhNet" || die "Couldn't cp py"
+
+	cd "${WORKDIR}/openhome/ohNetGenerated" || die "Couldn't cd later to ohNetGenerated dir"
+	make native_only=yes || die "ohnetgenerated make failed"
+
+	cd "Build/Include" || die "Couldn't cd later to include"
+	cp -R * "$ohnet/Build/Include" || die "Couldn't cp generated includes"
+
+	# build_ohTopology
+	cd "${WORKDIR}/openhome/ohTopology" || die "Couldn't cd to ohTopology dir"
+	mkdir -p build/Include/OpenHome/Av || die "Couldn't mkdir av"
+	cp -p OpenHome/Av/*.h build/Include/OpenHome/Av/ || die "Couldn't cp to av"
+
+	# build_ohSongcast
+	cd "${WORKDIR}/openhome/ohSongcast" || die "Couldn't cd to ohSongcast dir"
+	make release=1 library_static || die "Failed to build ohSongcast"
+
+	#### End ohbuild.sh reverse engineer
+
+	cd "${S}" || die "Failed to cd to source directory"
+	make || die "Failed to make sc2mpd"
+}