gentoo resync : 16.02.1018

3 files changed, 3 insertions, 66 deletions

diff --git a/media-video/ushare/Manifest b/media-video/ushare/Manifest
index 1df1bd36f105..fb508d531df5 100644
--- a/media-video/ushare/Manifest
+++ b/media-video/ushare/Manifest
@@ -11,6 +11,5 @@ AUX ushare.init.d 2050 BLAKE2B d0a71f1c5db918887b549847471455ae1d4e78b5a08db937e
 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
-EBUILD ushare-1.1a-r6.ebuild 1682 BLAKE2B 8fa412013436189a6d17f50f96a019dcb0ddf6f4b3fbabcfdfc95b08f6ed0cbf12172e78f877fe23348dc85045f4538a1d1190faaddd4fee6bc300154c2a42c0 SHA512 c93023e3d535c06f9f70a5d72a26773ef14d22bb035d805f22636e4d0e0be5a2dde96f269fdc4e5de7fde2ecb73270f6f1f45ef4ed89f0176922ab53d9c95da3
-EBUILD ushare-1.1a-r8.ebuild 1684 BLAKE2B 49216170d85b233309129214ff6323adb6bf1a719be9f89d97cc89484d3640c306fac74f9365ae3bf50678bd88e3fbc9c9dbe95e7e91828af590f624b3749796 SHA512 d14fee0c9502a503d411c5435c1b9a758e0054e5e5c1abf0fec23b0981f3412a13a7e0e614a60ca966e0d2314bb3b5e7bdcbfa18a89f2cd6e33bd1622e508876
+EBUILD ushare-1.1a-r8.ebuild 1679 BLAKE2B 8b58b33b5ec2472727ecb25484b88ccdae67336ab31f6721a06ce2761a1eb6694e4a868eefb0be51c2ee20c0425bbe26c130580302cfa7fd57f35855ca2bf3bb SHA512 e4982b70647f50665eee3318dffc7a333d7b9b989a469164bba4ac408b277af259411d79ca0e4612cd9b06b133852ff08051a2558de596fdd1dd99ba3bbb7e9a
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-video/ushare/ushare-1.1a-r6.ebuild b/media-video/ushare/ushare-1.1a-r6.ebuild
deleted file mode 100644
index b49031658f23..000000000000
--- a/media-video/ushare/ushare-1.1a-r6.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils multilib readme.gentoo toolchain-funcs user systemd
-
-DESCRIPTION="uShare is a UPnP (TM) A/V & DLNA Media Server"
-HOMEPAGE="http://ushare.geexbox.org/"
-SRC_URI="http://ushare.geexbox.org/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-
-RDEPEND=">=net-libs/libupnp-1.6.14: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-r8.ebuild b/media-video/ushare/ushare-1.1a-r8.ebuild
index 9cc622f9ac63..05358c1f6f9f 100644
--- a/media-video/ushare/ushare-1.1a-r8.ebuild
+++ b/media-video/ushare/ushare-1.1a-r8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="http://ushare.geexbox.org/releases/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="nls"
 
 RDEPEND=">=net-libs/libupnp-1.6.14:0"