gentoo (valentine's day) resync : 14.02.2021

8 files changed, 2 insertions, 429 deletions

diff --git a/media-video/ushare/Manifest b/media-video/ushare/Manifest
index 1d1e7bd71831..878c365985c6 100644
--- a/media-video/ushare/Manifest
+++ b/media-video/ushare/Manifest
@@ -1,17 +1,10 @@
 AUX 01_all_ushare_build_system.patch 4276 BLAKE2B d5ad1ca4d442d40c1e291c3f5f70af5c03dd85278e26fbc5743de401928abe70650eb013225e855389e17b86190d7f46ff09ac47e5c60b6b1f4f63f37a686394 SHA512 14029031996c030509d2850571bdd94a7bca951d0809c4a034bb2d021a76cc9c15ff3229452ab28322bda25e9e09814bc3dae5fff6cee4ac056eb7a76375a670
 AUX 02_all_ushare_build_warnings.patch 989 BLAKE2B 050edaafe8cd6b359653252046942b05cdc0542c849037ef87b4b4607eae5a11950701c5e0300d90198fc4e97405a771a7749319b2cae1d24727fccde30472df SHA512 236beb2283762d17dc1efa994a8580c8606b1bca0059fd78643f062fa6cdc4df31281cd0b46c2df90b4d1c0cca9b6c4fff93d493084423e91c25809a52a1175d
 AUX 03_all_ushare_mp4_video_mime.patch 971 BLAKE2B 5fffbc4b75a7a2a438608c59c8ef65cc371e934bb8c71347739535918d178880c5b18342311827724bf0feeb356cd22c8a5ef9f7a0d5e3ec37feb0e68879defa SHA512 9eb4d34c7dcb2aaa9b97d74515933a1a31793d4f1630caab23b2243952a908ad257c9fc4304798ee9b5837049e367ae26344745bbcce1e58426c4704278c8d4a
-AUX 04_all_ushare_upnp_build_fix.patch 4617 BLAKE2B 75b64ad4742a18a9e2a944a1699c5dda1dbabcbb73f8078de159b76aca2aadf783aee54d1c0c9d2058954e70de3e4a6d3a86d56b7a4872262c04af5889bde5e3 SHA512 87166b7bf3b371cfaed628dcca3e59a3f0e93efdb5e67bd78f3c3f5930b9fa7bdabbce8849163d3874befb2d248c28f214dc4c63d264673f83e279c077c158e4
-AUX 05_all_missing_headers.patch 1801 BLAKE2B b45875e1a01c14c9828d4d62a520334936b69e9ce72bd1a0a5cd8872ac423eab081cf385daab73cc2ab6f66d1a29a7ecb837f4ef121e91ff71a226ca676b3983 SHA512 0426664cf06e0f1ecf19523bc00c52bded8f4850934484dee0a1dbdd1f4e38a755095046ef155297bfac9938d3784df5e6cf04be95e936b6af38e6096575d87d
-AUX 06_all_ushare_disable_sysconf.patch 656 BLAKE2B 282b0ccbb3bb6855a29b753fbb03139a2f8a6057f3d3760485e49c7c8fdb87f58a7c8f9d16975ca9fe8e36c4b45ea24f83bd4dc4c22b9b24cacaf58939e47661 SHA512 9f2d5a107f42c6259530e1dd6ff06301c69c904974dc14632409c1cd18e7064de8663c56f0da2b5e4329217af36b564c75fa5f76c0191ca1c64db6e1ebdf12dd
 AUX 07_all_drop_optimizations.patch 516 BLAKE2B 2c0f82d9fac9c095d962248c781eabc09c2ff0c12ffbb2e0c9c1a84a6cd3475e31cf1c944c69a7da1f60962a7e143f8797967ca3832df6c1d72d5ac319645ab7 SHA512 0b2fd04608fe74949d7a18d172c66596570c042a204f7665ceac09202d504138813ed700d1f327e1cb5b0601931f34bdb00efbac61979ff9f88735c54ae89770
-AUX 08_all_gcc5.patch 1244 BLAKE2B 653fdf06296ea78f0f845b30cd671ff9b95bf87f46e62fbfed871fae18989bd54e88b62191023cc089fe5716a52cbcf879d5bf931f2b4496132233a0b2f3cfa2 SHA512 97439026ed47d5fbac93bb865091129c317805dcb0705eb1edf270c367cd0509bba7dcd56bdbaa757b6ff7cc03a0821511329dc087d83d28976c991edbd5158b
 AUX ushare.conf.d 781 BLAKE2B 03331d0e3e5d58aae6b8856d7273c8c6f4393c3f4a50f551d1ecfabd0185c393a36d4b4eb944dcc20728ddd062923a86873ac2b5eb831c705fefa7806ef928b9 SHA512 86c7459952f5bfbad3daa960c2412f5dd32d4047db7714d0c990aad77f9aa9e68a49ddc46e8653276c3216f2834aa4334d4bc8c71770866b1a1c124848977dd0
-AUX ushare.init.d 2050 BLAKE2B d0a71f1c5db918887b549847471455ae1d4e78b5a08db937eb3c42f4addf72688431a948b2e53c7282ebb5f76454bd804b358d7c919596c21a238a54933d0638 SHA512 1bb8efbbb29cf468f90329b8dbed3dd6896734907ad90c1bb2bdb99b11b2d17148fafc971569b2c06d7fe86efb7ab289711cb73b1522a1fd207a38577e6f714b
 AUX ushare.init.d.ng 954 BLAKE2B f62f987fcaaa217e0b3a75d225351be4a8d486f4ff025c7fea5dd34a69e58a993fbafb43ab3b7feab474cdd736c6978d8cd149f919b758dc972e33508918376a SHA512 c70e6f47f29a9d555821c3bc2000ebd6533778208b46a7bbe823454e4b26408ab9b6e31ce7449dc84ae32fcc6754c3ca2a5afa0a0393a59888bda294f0e78c98
 AUX ushare.service 189 BLAKE2B 29037c78c7fb3b263e166e06dd82a5785f499db24cfbe8227e1f4695d200fff89f5a1275255f06938d134b3871b1551fee1262eaf0580ec75fb3b87ad1888adf SHA512 141b1f592220d3785af821f085f9c03811a2370e1a8c6bb5d2739b4ae74421323df437d2a6672d943ab8371b6d5ccfb395a4943a10eb5c1e8bc0ff16a3177b15
-DIST ushare-1.1a.tar.bz2 65864 BLAKE2B 2a6d6922ee46c96d89a6f9a3238a1cded04194c4e7b80432e87a1c2344dcbf36484959d4601a7da8dc599531334b15a0547fc571af72630f25562e07a4116ea9 SHA512 2144ef96e58960d4d11bcefcd857c7eb7adab8df4ff815772d3b9d668f9f9daa1312707eb00a770c461b2a316e094e6697a004723ea02e86ee872fbe60b4797c
 DIST ushare-1.1a_p20200824.tar.gz 72751 BLAKE2B 3f9116eab500ad9eb959ded9b1e406100cfbbc32c27b1cc599ef301f8d72e9acb1e053722b8724fc3d350fffda6e5b932eb78cd5fc3f2b5dbe67431f5f5de5b4 SHA512 530fe718e2d52acc27af670d7e44703b34fea33d15fcda3bd1fd4c5702794647576df8a329a11439f0eeca52e75390548a5417776add7b5ab3f09bb0eb85ac11
-EBUILD ushare-1.1a-r9.ebuild 1678 BLAKE2B 30730ff60210edfae2c31b7d8faa4d5e4e01be677574074b495bf3d1615ab75f50505cdb74e57993917cbc6658eb87cd51e9cb2ecbf66fe1b72a317853ac5346 SHA512 c3649b1a3e4c0d8364a6b998e5579c78f1746099dc516fc6c4453f32f92c4939b3eb4ec4d0e4c5fc3f46903bd2ff2916601b8a3fe92746efaf5b7264a0b673e3
-EBUILD ushare-1.1a_p20200824.ebuild 1837 BLAKE2B d53d1a1ac68731cd9fb546a50c4090c35268368737f4657d387ddc88b380909dc9563c00b8264dc238bc17c828fa5b0e80da4af1b8375c3b2f772228330f538c SHA512 9d9d9349b595462f82eed2741f3673df401628b594965c0c1155ad80562c6f1d9e72d7eb96ea10c9dde0fd75a35a211f77387672e7ab2bcf4fce347b2db7f24f
+EBUILD ushare-1.1a_p20200824.ebuild 1836 BLAKE2B a4be959aace10e0e5f4110b9f932774f640bc0da490cf0af891ff743e2df47eb736cbb10a5287a9ffcc8978f40ae9de06dd29d48986297df8154c481cd9d42df SHA512 747848b00f10d41c69a16dcc10c44ba7cb3a41bdc97b0aa3435670820685f029e531c7507191713b0b9c6a55a0d141245db2e8ffad59eec7994b0ef0e24c2c33
 MISC metadata.xml 244 BLAKE2B 24ebafa89c32f799b62237b0d9442143de8ccb86c1625f2a49dd91ec9caa63cadc52000005b5b5ef148df89e907e1407330a8d8411ffb5f4facaf629a3184cb8 SHA512 d7a2290eb2970ef7fb9bea275b209c7ace388daadcf3e317b099767d72c7d9f0b894e23492f02e973d27010a7568e48549e4f502c9628efc3133012680304784
diff --git a/media-video/ushare/files/04_all_ushare_upnp_build_fix.patch b/media-video/ushare/files/04_all_ushare_upnp_build_fix.patch
deleted file mode 100644
index c3ec37a324c5..000000000000
--- a/media-video/ushare/files/04_all_ushare_upnp_build_fix.patch
+++ /dev/null
@@ -1,156 +0,0 @@
-diff -wbBur ushare-1.1a/src/http.c ushare-1.1a.my/src/http.c
---- ushare-1.1a/src/http.c	2007-12-09 13:03:36.000000000 +0000
-+++ ushare-1.1a.my/src/http.c	2010-10-29 11:13:07.000000000 +0000
-@@ -77,8 +77,7 @@
-   info->content_type = ixmlCloneDOMString (content_type);
- }
- 
--static int
--http_get_info (const char *filename, struct File_Info *info)
-+int http_get_info (const char *filename, struct File_Info *info)
- {
-   extern struct ushare_t *ut;
-   struct upnp_entry_t *entry = NULL;
-@@ -197,8 +196,7 @@
-   return ((UpnpWebFileHandle) file);
- }
- 
--static UpnpWebFileHandle
--http_open (const char *filename, enum UpnpOpenFileMode mode)
-+UpnpWebFileHandle http_open (const char *filename, enum UpnpOpenFileMode mode)
- {
-   extern struct ushare_t *ut;
-   struct upnp_entry_t *entry = NULL;
-@@ -251,8 +249,7 @@
-   return ((UpnpWebFileHandle) file);
- }
- 
--static int
--http_read (UpnpWebFileHandle fh, char *buf, size_t buflen)
-+int http_read (UpnpWebFileHandle fh, char *buf, size_t buflen)
- {
-   struct web_file_t *file = (struct web_file_t *) fh;
-   ssize_t len = -1;
-@@ -286,8 +283,7 @@
-   return len;
- }
- 
--static int
--http_write (UpnpWebFileHandle fh __attribute__((unused)),
-+int http_write (UpnpWebFileHandle fh __attribute__((unused)),
-             char *buf __attribute__((unused)),
-             size_t buflen __attribute__((unused)))
- {
-@@ -296,8 +292,7 @@
-   return 0;
- }
- 
--static int
--http_seek (UpnpWebFileHandle fh, off_t offset, int origin)
-+int http_seek (UpnpWebFileHandle fh, off_t offset, int origin)
- {
-   struct web_file_t *file = (struct web_file_t *) fh;
-   off_t newpos = -1;
-@@ -371,8 +366,7 @@
-   return 0;
- }
- 
--static int
--http_close (UpnpWebFileHandle fh)
-+int http_close (UpnpWebFileHandle fh)
- {
-   struct web_file_t *file = (struct web_file_t *) fh;
- 
-@@ -402,13 +396,3 @@
- 
-   return 0;
- }
--
--struct UpnpVirtualDirCallbacks virtual_dir_callbacks =
--  {
--    http_get_info,
--    http_open,
--    http_read,
--    http_write,
--    http_seek,
--    http_close
--  };
-diff -wbBur ushare-1.1a/src/http.h ushare-1.1a.my/src/http.h
---- ushare-1.1a/src/http.h	2007-12-09 13:03:36.000000000 +0000
-+++ ushare-1.1a.my/src/http.h	2010-10-29 11:13:11.000000000 +0000
-@@ -25,6 +25,13 @@
- #include <upnp/upnp.h>
- #include <upnp/upnptools.h>
- 
--struct UpnpVirtualDirCallbacks virtual_dir_callbacks;
-+int http_close (UpnpWebFileHandle fh);
-+int http_write (UpnpWebFileHandle fh __attribute__((unused)),
-+            char *buf __attribute__((unused)),
-+            size_t buflen __attribute__((unused)));
-+int http_seek (UpnpWebFileHandle fh, off_t offset, int origin);
-+UpnpWebFileHandle http_open (const char *filename, enum UpnpOpenFileMode mode);
-+int http_read (UpnpWebFileHandle fh, char *buf, size_t buflen);
-+int http_get_info (const char *filename, struct File_Info *info);
- 
- #endif /* _HTTP_H_ */
-diff -wbBur ushare-1.1a/src/ushare.c ushare-1.1a.my/src/ushare.c
---- ushare-1.1a/src/ushare.c	2007-12-09 13:03:36.000000000 +0000
-+++ ushare-1.1a.my/src/ushare.c	2010-10-29 11:17:45.000000000 +0000
-@@ -188,7 +188,7 @@
-   if (strcmp (request->DevUDN + 5, ut->udn))
-     return;
- 
--  ip = request->CtrlPtIPAddr.s_addr;
-+  ip = (*(struct sockaddr_in*)&request->CtrlPtIPAddr).sin_addr.s_addr;
-   ip = ntohl (ip);
-   sprintf (val, "%d.%d.%d.%d",
-            (ip >> 24) & 0xFF, (ip >> 16) & 0xFF, (ip >> 8) & 0xFF, ip & 0xFF);
-@@ -348,7 +348,47 @@
- 
-   UpnpEnableWebserver (TRUE);
- 
--  res = UpnpSetVirtualDirCallbacks (&virtual_dir_callbacks);
-+  res = UpnpVirtualDir_set_WriteCallback(http_write);
-+  if (res != UPNP_E_SUCCESS)
-+  {
-+    log_error (_("Cannot set virtual directory callbacks\n"));
-+    free (description);
-+    return -1;
-+  }
-+
-+  res = UpnpVirtualDir_set_GetInfoCallback(http_get_info);
-+  if (res != UPNP_E_SUCCESS)
-+  {
-+    log_error (_("Cannot set virtual directory callbacks\n"));
-+    free (description);
-+    return -1;
-+  }
-+
-+  res = UpnpVirtualDir_set_ReadCallback(http_read);
-+  if (res != UPNP_E_SUCCESS)
-+  {
-+    log_error (_("Cannot set virtual directory callbacks\n"));
-+    free (description);
-+    return -1;
-+  }
-+
-+  res = UpnpVirtualDir_set_OpenCallback(http_open);
-+  if (res != UPNP_E_SUCCESS)
-+  {
-+    log_error (_("Cannot set virtual directory callbacks\n"));
-+    free (description);
-+    return -1;
-+  }
-+
-+  res = UpnpVirtualDir_set_SeekCallback(http_seek);
-+  if (res != UPNP_E_SUCCESS)
-+  {
-+    log_error (_("Cannot set virtual directory callbacks\n"));
-+    free (description);
-+    return -1;
-+  }
-+
-+  res = UpnpVirtualDir_set_CloseCallback(http_close);
-   if (res != UPNP_E_SUCCESS)
-   {
-     log_error (_("Cannot set virtual directory callbacks\n"));
diff --git a/media-video/ushare/files/05_all_missing_headers.patch b/media-video/ushare/files/05_all_missing_headers.patch
deleted file mode 100644
index 0d2f0e8faff9..000000000000
--- a/media-video/ushare/files/05_all_missing_headers.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -uNr ushare-1.1a.a/src/cds.c ushare-1.1a.b/src/cds.c
---- ushare-1.1a.a/src/cds.c	2007-12-09 08:03:36.000000000 -0500
-+++ ushare-1.1a.b/src/cds.c	2012-05-27 11:28:42.000000000 -0400
-@@ -19,7 +19,9 @@
-  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-  */
- 
-+#include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- #include <upnp/upnp.h>
- #include <upnp/upnptools.h>
- 
-diff -uNr ushare-1.1a.a/src/cms.c ushare-1.1a.b/src/cms.c
---- ushare-1.1a.a/src/cms.c	2007-12-09 08:03:36.000000000 -0500
-+++ ushare-1.1a.b/src/cms.c	2012-05-27 11:25:03.000000000 -0400
-@@ -20,6 +20,7 @@
-  */
- 
- #include <stdlib.h>
-+#include <string.h>
- #include <upnp/upnp.h>
- #include <upnp/upnptools.h>
- 
-diff -uNr ushare-1.1a.a/src/http.c ushare-1.1a.b/src/http.c
---- ushare-1.1a.a/src/http.c	2012-05-27 11:23:32.000000000 -0400
-+++ ushare-1.1a.b/src/http.c	2012-05-27 11:25:13.000000000 -0400
-@@ -25,6 +25,7 @@
- #include <errno.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- #include <unistd.h>
- #include <errno.h>
- 
-diff -uNr ushare-1.1a.a/src/presentation.c ushare-1.1a.b/src/presentation.c
---- ushare-1.1a.a/src/presentation.c	2007-12-09 08:03:36.000000000 -0500
-+++ ushare-1.1a.b/src/presentation.c	2012-05-27 11:30:08.000000000 -0400
-@@ -18,7 +18,9 @@
-  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-  */
- 
-+#include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- 
- #if HAVE_LANGINFO_CODESET
- # include <langinfo.h>
-diff -uNr ushare-1.1a.a/src/services.c ushare-1.1a.b/src/services.c
---- ushare-1.1a.a/src/services.c	2007-12-09 08:03:36.000000000 -0500
-+++ ushare-1.1a.b/src/services.c	2012-05-27 11:25:26.000000000 -0400
-@@ -20,6 +20,7 @@
-  */
- 
- #include <stdlib.h>
-+#include <string.h>
- #include <upnp/upnp.h>
- #include <upnp/upnptools.h>
- 
diff --git a/media-video/ushare/files/06_all_ushare_disable_sysconf.patch b/media-video/ushare/files/06_all_ushare_disable_sysconf.patch
deleted file mode 100644
index c3adf8e54287..000000000000
--- a/media-video/ushare/files/06_all_ushare_disable_sysconf.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Do not try to parse the default configuration file as everyting
-should be handled by the /etc/conf.d/ushare file in Gentoo
-Index: ushare-1.1a/src/ushare.c
-===================================================================
---- ushare-1.1a.orig/src/ushare.c
-+++ ushare-1.1a/src/ushare.c
-@@ -813,13 +813,6 @@ main (int argc, char **argv)
-     return EXIT_SUCCESS;
-   }
- 
--  if (parse_config_file (ut) < 0)
--  {
--    /* fprintf here, because syslog not yet ready */
--    fprintf (stderr, _("Warning: can't parse file \"%s\".\n"),
--             ut->cfg_file ? ut->cfg_file : SYSCONFDIR "/" USHARE_CONFIG_FILE);
--  }
--
-   if (ut->xbox360)
-   {
-     char *name;
diff --git a/media-video/ushare/files/08_all_gcc5.patch b/media-video/ushare/files/08_all_gcc5.patch
deleted file mode 100644
index d76f8771f5d9..000000000000
--- a/media-video/ushare/files/08_all_gcc5.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Various gcc-5 fixes
-
-https://gcc.gnu.org/gcc-5/porting_to.html
-
-Signed-off-by: Markos Chandras <hwoarang@gentoo.org>
-Index: ushare-1.1a/src/trace.h
-===================================================================
---- ushare-1.1a.orig/src/trace.h
-+++ ushare-1.1a/src/trace.h
-@@ -29,7 +29,7 @@ typedef enum {
- 
- void print_log (log_level level, const char *format, ...)
-   __attribute__ ((format (printf, 2, 3)));
--inline void start_log (void);
-+extern inline void start_log (void);
- 
- /* log_info
-  * Normal print, to replace printf
-Index: ushare-1.1a/src/ushare.h
-===================================================================
---- ushare-1.1a.orig/src/ushare.h
-+++ ushare-1.1a/src/ushare.h
-@@ -127,6 +127,6 @@ struct action_event_t {
-   struct service_t *service;
- };
- 
--inline void display_headers (void);
-+extern inline void display_headers (void);
- 
- #endif /* _USHARE_H_ */
-Index: ushare-1.1a/src/ushare.c
-===================================================================
---- ushare-1.1a.orig/src/ushare.c
-+++ ushare-1.1a/src/ushare.c
-@@ -49,6 +49,10 @@
- #include <ifaddrs.h>
- #endif
- 
-+#ifdef HAVE_LOCALE_H
-+#include <locale.h>
-+#endif
-+
- #if (defined(__unix__) || defined(unix)) && !defined(USG)
- #include <sys/param.h>
- #endif
diff --git a/media-video/ushare/files/ushare.init.d b/media-video/ushare/files/ushare.init.d
deleted file mode 100644
index c1d94b6a9c98..000000000000
--- a/media-video/ushare/files/ushare.init.d
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	use net
-}
-
-start() {
-	ebegin "Starting uShare"
-	
-	# Sanity check to avoid ushare failling on booting with no
-	# shared dirs
-	if [[ -z "${USHARE_DIRS}" ]] ; then
-		eerror "Please set shared dirs in /etc/conf.d/ushare"
-		return 1
-	fi
-
-	if [[ -z "${USHARE_PORT}" ]] ; then
-		einfo "${USHARE_NAME} runs on a dynamic port"
-		local ushare_port=
-	else
-		local ushare_port="--port ${USHARE_PORT}"
-		einfo "${USHARE_NAME} using port ${USHARE_PORT}"
-	fi
-
-	if [[ "${USHARE_TELNET}" == "yes" ]] ; then
-                local ushare_telnet=
-        else
-                local ushare_telnet="--no-telnet"
-        fi
-
-	if [[ -z "${ushare_telnet}" ]] ; then
-		if [[ -z "${USHARE_TELNET_PORT}" ]] ; then
-                	local ushare_telnet_port=
-			einfo "${USHARE_NAME} runs telnet on the default port"
-		else
-			local ushare_telnet_port="--telnet-port ${USHARE_TELNET_PORT}"
-			einfo "${USHARE_NAME} runs telnet on port ${USHARE_TELNET_PORT}"
-		fi
-        else
-                local ushare_telnet_port=
-        fi
-
-	if [[ "${USHARE_WEB}" == "yes" ]] ; then
-                local ushare_web=
-        else
-                local ushare_web="--no-web"
-        fi
-
-	if [[ "${USHARE_XBOX}" == "yes" ]] ; then
-		local ushare_xbox="--xbox"
-	else
-		local ushare_xbox=
-	fi
-
-	if [[ "${USHARE_DLNA}" == "yes" ]] ; then
-		local ushare_dlna="--dlna"
-	else
-		local ushare_dlna=
-	fi
-
-	start-stop-daemon --start --quiet -u ${USHARE_USER:-root} \
-	--exec /usr/bin/ushare -- -D -i ${USHARE_IFACE}           \
-	-n ${USHARE_NAME} ${USHARE_OPTS} ${USHARE_DIRS}           \
-	${ushare_port}                                            \
-	${ushare_telnet} ${ushare_telnet_port}                    \
-	${ushare_web}                                             \
-	${ushare_xbox}                                            \
-	${ushare_dlna}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping uShare"
-	start-stop-daemon --stop --quiet --exec /usr/bin/ushare
-	eend $?
-}
diff --git a/media-video/ushare/ushare-1.1a-r9.ebuild b/media-video/ushare/ushare-1.1a-r9.ebuild
deleted file mode 100644
index 263068d6c15f..000000000000
--- a/media-video/ushare/ushare-1.1a-r9.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils multilib readme.gentoo toolchain-funcs user systemd
-
-DESCRIPTION="uShare is a UPnP (TM) A/V & DLNA Media Server"
-HOMEPAGE="https://ushare.geexbox.org/"
-SRC_URI="https://ushare.geexbox.org/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-
-RDEPEND="=net-libs/libupnp-1.6*:0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	EPATCH_EXCLUDE="06_all_ushare_disable_sysconf.patch"
-	EPATCH_SOURCE="${FILESDIR}" EPATCH_SUFFIX="patch" \
-		EPATCH_OPTS="-p1" epatch
-
-	DOC_CONTENTS="Please edit /etc/ushare.conf to set the shared directories
-		and other important settings. Check system log if ushare is
-		not booting."
-}
-
-src_configure() {
-	local myconf
-	myconf="--prefix=/usr --sysconfdir=/etc --disable-strip --disable-dlna"
-	# nls can only be disabled, on by default.
-	use nls || myconf="${myconf} --disable-nls"
-
-	# I can't use econf
-	# --host is not implemented in ./configure file
-	tc-export CC CXX
-
-	./configure ${myconf} || die "./configure failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	doman src/ushare.1
-	newconfd "${FILESDIR}"/${PN}.conf.d ${PN}
-	newinitd "${FILESDIR}"/${PN}.init.d.ng ${PN}
-	dodoc NEWS README TODO THANKS AUTHORS
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	enewuser ushare
-	readme.gentoo_print_elog
-	elog
-	elog "The config file has been moved to /etc/ushare.conf"
-	elog "Please migrate your settings from /etc/conf.d/ushare"
-	elog "to /etc/ushare.conf in order to use the ushare init script"
-	elog "and systemd unit service."
-	elog
-}
diff --git a/media-video/ushare/ushare-1.1a_p20200824.ebuild b/media-video/ushare/ushare-1.1a_p20200824.ebuild
index 76207b21117a..d84a7ddf0c95 100644
--- a/media-video/ushare/ushare-1.1a_p20200824.ebuild
+++ b/media-video/ushare/ushare-1.1a_p20200824.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/ddugovic/uShare/archive/${COMMIT}.tar.gz -> ${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="nls"
 
 DEPEND=">=net-libs/libupnp-1.14"