Rename upnp USE flag to upnp-av (bug #435770, thanks to Michał Górny).

(Portage version: 2.2.0_alpha148/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

5 files changed, 18 insertions, 15 deletions

diff --git a/gnome-extra/nautilus-sendto/ChangeLog b/gnome-extra/nautilus-sendto/ChangeLog
index 68cbf6bf3f06..f251bc2a71f8 100644
--- a/gnome-extra/nautilus-sendto/ChangeLog
+++ b/gnome-extra/nautilus-sendto/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/nautilus-sendto
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-sendto/ChangeLog,v 1.61 2012/09/27 10:44:00 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-sendto/ChangeLog,v 1.62 2012/12/15 18:52:58 tetromino Exp $
+
+  15 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  nautilus-sendto-2.32.0.ebuild, nautilus-sendto-3.0.2.ebuild,
+  nautilus-sendto-3.0.3.ebuild, metadata.xml:
+  Rename upnp USE flag to upnp-av (bug #435770, thanks to Michał Górny).
 
   27 Sep 2012; Anthony G. Basile <blueness@gentoo.org>
   nautilus-sendto-3.0.3.ebuild:
diff --git a/gnome-extra/nautilus-sendto/metadata.xml b/gnome-extra/nautilus-sendto/metadata.xml
index 2e05f5b7fcd4..8157556b1496 100644
--- a/gnome-extra/nautilus-sendto/metadata.xml
+++ b/gnome-extra/nautilus-sendto/metadata.xml
@@ -7,8 +7,6 @@
 		<flag name='mail'>Enables support for mailto using
 			<pkg>gnome-extra/evolution-data-server</pkg></flag>
 		<flag name='pidgin'>Enables support for <pkg>net-im/pidgin</pkg></flag>
-		<flag name='upnp'>Enables support for sending files over upnp using
-			<pkg>net-libs/gupnp-av</pkg></flag>
 	</use>
 </pkgmetadata>
 
diff --git a/gnome-extra/nautilus-sendto/nautilus-sendto-2.32.0.ebuild b/gnome-extra/nautilus-sendto/nautilus-sendto-2.32.0.ebuild
index 922886bcf78f..0999ce72a184 100644
--- a/gnome-extra/nautilus-sendto/nautilus-sendto-2.32.0.ebuild
+++ b/gnome-extra/nautilus-sendto/nautilus-sendto-2.32.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-sendto/nautilus-sendto-2.32.0.ebuild,v 1.6 2012/05/05 06:25:21 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-sendto/nautilus-sendto-2.32.0.ebuild,v 1.7 2012/12/15 18:52:58 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.gnome.org"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ia64 ppc sparc x86"
-IUSE="cdr doc gajim +mail pidgin upnp"
+IUSE="cdr doc gajim +mail pidgin upnp-av"
 
 RDEPEND=">=x11-libs/gtk+-2.18:2
 	>=dev-libs/glib-2.25.9:2
@@ -26,7 +26,7 @@ RDEPEND=">=x11-libs/gtk+-2.18:2
 	pidgin? (
 		>=net-im/pidgin-2.0.0
 		>=dev-libs/dbus-glib-0.60 )
-	upnp? ( >=net-libs/gupnp-0.13.0 )"
+	upnp-av? ( >=net-libs/gupnp-0.13.0 )"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig
@@ -50,7 +50,7 @@ pkg_setup() {
 	_use_plugin mail evolution
 	_use_plugin pidgin
 	_use_plugin gajim
-	_use_plugin upnp
+	_use_plugin upnp-av upnp
 }
 
 src_install() {
diff --git a/gnome-extra/nautilus-sendto/nautilus-sendto-3.0.2.ebuild b/gnome-extra/nautilus-sendto/nautilus-sendto-3.0.2.ebuild
index fa4bde7d8ef9..41bc9c82434f 100644
--- a/gnome-extra/nautilus-sendto/nautilus-sendto-3.0.2.ebuild
+++ b/gnome-extra/nautilus-sendto/nautilus-sendto-3.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-sendto/nautilus-sendto-3.0.2.ebuild,v 1.2 2012/05/05 06:25:21 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-sendto/nautilus-sendto-3.0.2.ebuild,v 1.3 2012/12/15 18:52:58 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.gnome.org"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="cdr doc gajim +mail pidgin upnp"
+IUSE="cdr doc gajim +mail pidgin upnp-av"
 
 COMMON_DEPEND=">=x11-libs/gtk+-2.90.3:3[X(+)]
 	>=dev-libs/glib-2.25.9:2
@@ -26,7 +26,7 @@ COMMON_DEPEND=">=x11-libs/gtk+-2.90.3:3[X(+)]
 	pidgin? (
 		>=net-im/pidgin-2.0.0
 		>=dev-libs/dbus-glib-0.60 )
-	upnp? ( >=net-libs/gupnp-0.13.0 )"
+	upnp-av? ( >=net-libs/gupnp-0.13.0 )"
 RDEPEND="${COMMON_DEPEND}
 	>=gnome-base/nautilus-2.91.1[sendto]"
 DEPEND="${COMMON_DEPEND}
@@ -53,7 +53,7 @@ pkg_setup() {
 	_use_plugin mail evolution
 	_use_plugin pidgin
 	_use_plugin gajim
-	_use_plugin upnp
+	_use_plugin upnp-av upnp
 }
 
 src_prepare() {
diff --git a/gnome-extra/nautilus-sendto/nautilus-sendto-3.0.3.ebuild b/gnome-extra/nautilus-sendto/nautilus-sendto-3.0.3.ebuild
index 7ae1f19d7198..3d429ee37ed7 100644
--- a/gnome-extra/nautilus-sendto/nautilus-sendto-3.0.3.ebuild
+++ b/gnome-extra/nautilus-sendto/nautilus-sendto-3.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-sendto/nautilus-sendto-3.0.3.ebuild,v 1.3 2012/09/27 10:44:00 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-sendto/nautilus-sendto-3.0.3.ebuild,v 1.4 2012/12/15 18:52:58 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.gnome.org"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="cdr doc gajim +mail pidgin upnp"
+IUSE="cdr doc gajim +mail pidgin upnp-av"
 
 COMMON_DEPEND=">=x11-libs/gtk+-2.90.3:3[X(+)]
 	>=dev-libs/glib-2.25.9:2
@@ -26,7 +26,7 @@ COMMON_DEPEND=">=x11-libs/gtk+-2.90.3:3[X(+)]
 	pidgin? (
 		>=net-im/pidgin-2.0.0
 		>=dev-libs/dbus-glib-0.60 )
-	upnp? ( >=net-libs/gupnp-0.13.0 )"
+	upnp-av? ( >=net-libs/gupnp-0.13.0 )"
 RDEPEND="${COMMON_DEPEND}
 	>=gnome-base/nautilus-2.91.1[sendto]"
 DEPEND="${COMMON_DEPEND}
@@ -53,7 +53,7 @@ pkg_setup() {
 	_use_plugin mail evolution
 	_use_plugin pidgin
 	_use_plugin gajim
-	_use_plugin upnp
+	_use_plugin upnp-av upnp
 }
 
 src_prepare() {