Remove gupnp block as we have the newer gupnp-igd

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 6be77acce2cded833db03fa20b0d9f25eee89497..5e6bfbe4ac42fa962a84477d134123a9d46e5f5f 100644 (file)
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
 # ChangeLog for profile directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6081 2012/01/07 00:14:43 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6082 2012/01/07 03:39:15 tester Exp $
 #
 # This ChangeLog should include records for all changes in profiles directory.
 # Only typo fixes which don't affect portage/repoman behaviour could be avoided
 # here. If in doubt put a record here!
 
+  07 Jan 2012; Olivier Crête <tester@gentoo.org> package.mask:
+  Remove gupnp block as we have the newer gupnp-igd
+
   07 Jan 2012; Michael Pagano <mpagano@gentoo.org> package.mask:
   Remove portpeek mask
 

diff --git a/profiles/package.mask b/profiles/package.mask
index 0beff61d20bde7ee10da3a6b7cef26235e6542b9..dec553237d74da7412454d2b88d5dd70cb60da08 100644 (file)
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13380 2012/01/07 00:14:43 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13381 2012/01/07 03:39:15 tester Exp $
 #
 # When you add an entry to the top of this file, add your name, the date, and
 # an explanation of why something is getting masked. Please be extremely
@@ -382,16 +382,6 @@ dev-perl/perl-PBS
 ~dev-libs/soprano-2.6.1
 ~dev-libs/soprano-2.7.1
 
-# Olivier Crete <tester@gentoo.org> (20 Sep 2011)
-# Masked because the API was broken and it will  causes crashes in 
-# Empathy, Pidgin and aMSN
->=net-libs/gupnp-0.17
->=net-libs/gssdp-0.11
->=net-libs/gupnp-av-0.10.1
->=net-libs/gupnp-igd-0.2
->=net-misc/rygel-0.12.0
->=net-libs/gupnp-vala-0.10
-
 # Tim Harder <radhermit@gentoo.org> (19 Sep 2011)
 # Mask development releases
 =app-misc/task-2*