summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Crête <tester@gentoo.org>2012-01-07 03:39:15 +0000
committerOlivier Crête <tester@gentoo.org>2012-01-07 03:39:15 +0000
commitfcc34452524df789b40d588a6e71d9db94ac5bce (patch)
tree8d32297ddd327a43680d00222989a2cbe5764ce9 /profiles
parentVersion bump. (diff)
downloadgentoo-2-fcc34452524df789b40d588a6e71d9db94ac5bce.tar.gz
gentoo-2-fcc34452524df789b40d588a6e71d9db94ac5bce.tar.bz2
gentoo-2-fcc34452524df789b40d588a6e71d9db94ac5bce.zip
Remove gupnp block as we have the newer gupnp-igd
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask12
2 files changed, 5 insertions, 12 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 6be77acce2cd..5e6bfbe4ac42 100644
--- 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 0beff61d20bd..dec553237d74 100644
--- 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*