commit: 5e0acd18927ced72fbbefe20629924513e255221
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 2 15:10:32 2016 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Oct 2 15:11:26 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e0acd18
media-video/ushare: Remove use-flag dlna and hard-disable functionality and
dependency, see bug 540214
Package-Manager: portage-2.3.1
media-video/ushare/metadata.xml | 3 ---
media-video/ushare/ushare-1.1a-r5.ebuild | 9 ++++-----
media-video/ushare/ushare-1.1a-r6.ebuild | 9 ++++-----
3 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/media-video/ushare/metadata.xml b/media-video/ushare/metadata.xml
index 2511815..ccb32db 100644
--- a/media-video/ushare/metadata.xml
+++ b/media-video/ushare/metadata.xml
@@ -5,7 +5,4 @@
<email>[email protected]</email>
<name>Markos Chandras</name>
</maintainer>
-<use>
- <flag name="dlna">Add DLNA (<pkg>media-libs/libdlna</pkg>)
support</flag>
-</use>
</pkgmetadata>
diff --git a/media-video/ushare/ushare-1.1a-r5.ebuild
b/media-video/ushare/ushare-1.1a-r5.ebuild
index 3c9ec8e..6fe5136 100644
--- a/media-video/ushare/ushare-1.1a-r5.ebuild
+++ b/media-video/ushare/ushare-1.1a-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -12,10 +12,9 @@ SRC_URI="http://ushare.geexbox.org/releases/${P}.tar.bz2";
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 x86"
-IUSE="dlna nls"
+IUSE="nls"
-RDEPEND=">=net-libs/libupnp-1.6.14
- dlna? ( >=media-libs/libdlna-0.2.4 )"
+RDEPEND=">=net-libs/libupnp-1.6.14"
DEPEND="${RDEPEND}
virtual/pkgconfig"
@@ -30,7 +29,7 @@ src_prepare() {
src_configure() {
local myconf
- myconf="--prefix=/usr --disable-sysconf --disable-strip $(use_enable
dlna)"
+ myconf="--prefix=/usr --disable-sysconf --disable-strip --disable-dlna"
# nls can only be disabled, on by default.
use nls || myconf="${myconf} --disable-nls"
diff --git a/media-video/ushare/ushare-1.1a-r6.ebuild
b/media-video/ushare/ushare-1.1a-r6.ebuild
index 52f57db..d77a088 100644
--- a/media-video/ushare/ushare-1.1a-r6.ebuild
+++ b/media-video/ushare/ushare-1.1a-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -12,10 +12,9 @@ SRC_URI="http://ushare.geexbox.org/releases/${P}.tar.bz2";
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 x86"
-IUSE="dlna nls"
+IUSE="nls"
-RDEPEND=">=net-libs/libupnp-1.6.14
- dlna? ( >=media-libs/libdlna-0.2.4 )"
+RDEPEND=">=net-libs/libupnp-1.6.14"
DEPEND="${RDEPEND}
virtual/pkgconfig"
@@ -31,7 +30,7 @@ src_prepare() {
src_configure() {
local myconf
- myconf="--prefix=/usr --sysconfdir=/etc --disable-strip $(use_enable
dlna)"
+ myconf="--prefix=/usr --sysconfdir=/etc --disable-strip --disable-dlna"
# nls can only be disabled, on by default.
use nls || myconf="${myconf} --disable-nls"
