Gentoo Archives: gentoo-commits

From: "Andreas Hüttel" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/ushare/
Date: Sun, 02 Oct 2016 15:11:48
Message-Id: 1475421086.5e0acd18927ced72fbbefe20629924513e255221.dilfridge@gentoo
1 commit: 5e0acd18927ced72fbbefe20629924513e255221
2 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
3 AuthorDate: Sun Oct 2 15:10:32 2016 +0000
4 Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 2 15:11:26 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e0acd18
7
8 media-video/ushare: Remove use-flag dlna and hard-disable functionality and dependency, see bug 540214
9
10 Package-Manager: portage-2.3.1
11
12 media-video/ushare/metadata.xml | 3 ---
13 media-video/ushare/ushare-1.1a-r5.ebuild | 9 ++++-----
14 media-video/ushare/ushare-1.1a-r6.ebuild | 9 ++++-----
15 3 files changed, 8 insertions(+), 13 deletions(-)
16
17 diff --git a/media-video/ushare/metadata.xml b/media-video/ushare/metadata.xml
18 index 2511815..ccb32db 100644
19 --- a/media-video/ushare/metadata.xml
20 +++ b/media-video/ushare/metadata.xml
21 @@ -5,7 +5,4 @@
22 <email>hwoarang@g.o</email>
23 <name>Markos Chandras</name>
24 </maintainer>
25 -<use>
26 - <flag name="dlna">Add DLNA (<pkg>media-libs/libdlna</pkg>) support</flag>
27 -</use>
28 </pkgmetadata>
29
30 diff --git a/media-video/ushare/ushare-1.1a-r5.ebuild b/media-video/ushare/ushare-1.1a-r5.ebuild
31 index 3c9ec8e..6fe5136 100644
32 --- a/media-video/ushare/ushare-1.1a-r5.ebuild
33 +++ b/media-video/ushare/ushare-1.1a-r5.ebuild
34 @@ -1,4 +1,4 @@
35 -# Copyright 1999-2013 Gentoo Foundation
36 +# Copyright 1999-2016 Gentoo Foundation
37 # Distributed under the terms of the GNU General Public License v2
38 # $Id$
39
40 @@ -12,10 +12,9 @@ SRC_URI="http://ushare.geexbox.org/releases/${P}.tar.bz2"
41 LICENSE="GPL-2"
42 SLOT="0"
43 KEYWORDS="amd64 x86"
44 -IUSE="dlna nls"
45 +IUSE="nls"
46
47 -RDEPEND=">=net-libs/libupnp-1.6.14
48 - dlna? ( >=media-libs/libdlna-0.2.4 )"
49 +RDEPEND=">=net-libs/libupnp-1.6.14"
50 DEPEND="${RDEPEND}
51 virtual/pkgconfig"
52
53 @@ -30,7 +29,7 @@ src_prepare() {
54
55 src_configure() {
56 local myconf
57 - myconf="--prefix=/usr --disable-sysconf --disable-strip $(use_enable dlna)"
58 + myconf="--prefix=/usr --disable-sysconf --disable-strip --disable-dlna"
59 # nls can only be disabled, on by default.
60 use nls || myconf="${myconf} --disable-nls"
61
62
63 diff --git a/media-video/ushare/ushare-1.1a-r6.ebuild b/media-video/ushare/ushare-1.1a-r6.ebuild
64 index 52f57db..d77a088 100644
65 --- a/media-video/ushare/ushare-1.1a-r6.ebuild
66 +++ b/media-video/ushare/ushare-1.1a-r6.ebuild
67 @@ -1,4 +1,4 @@
68 -# Copyright 1999-2013 Gentoo Foundation
69 +# Copyright 1999-2016 Gentoo Foundation
70 # Distributed under the terms of the GNU General Public License v2
71 # $Id$
72
73 @@ -12,10 +12,9 @@ SRC_URI="http://ushare.geexbox.org/releases/${P}.tar.bz2"
74 LICENSE="GPL-2"
75 SLOT="0"
76 KEYWORDS="amd64 x86"
77 -IUSE="dlna nls"
78 +IUSE="nls"
79
80 -RDEPEND=">=net-libs/libupnp-1.6.14
81 - dlna? ( >=media-libs/libdlna-0.2.4 )"
82 +RDEPEND=">=net-libs/libupnp-1.6.14"
83 DEPEND="${RDEPEND}
84 virtual/pkgconfig"
85
86 @@ -31,7 +30,7 @@ src_prepare() {
87
88 src_configure() {
89 local myconf
90 - myconf="--prefix=/usr --sysconfdir=/etc --disable-strip $(use_enable dlna)"
91 + myconf="--prefix=/usr --sysconfdir=/etc --disable-strip --disable-dlna"
92 # nls can only be disabled, on by default.
93 use nls || myconf="${myconf} --disable-nls"