summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Hill <dirtyepic@gentoo.org>2011-03-13 05:08:06 +0000
committerRyan Hill <dirtyepic@gentoo.org>2011-03-13 05:08:06 +0000
commite1348b1783d014335adca488a15420224a064b30 (patch)
treef72067a8d3f4b0cea1f62b35ece48a8242f50a57 /profiles
parentVersion bump and remove old. (diff)
downloadgentoo-2-e1348b1783d014335adca488a15420224a064b30.tar.gz
gentoo-2-e1348b1783d014335adca488a15420224a064b30.tar.bz2
gentoo-2-e1348b1783d014335adca488a15420224a064b30.zip
Revert bittorrent mask temporarily for bug #358485.
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask5
2 files changed, 7 insertions, 3 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 8e17520e8726..5acbf44c935a 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
# ChangeLog for profile directory
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5138 2011/03/12 20:50:14 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5139 2011/03/13 05:08:06 dirtyepic 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!
+ 13 Mar 2011; Ryan Hill <dirtyepic@gentoo.org> package.mask:
+ Revert bittorrent mask temporarily for bug #358485.
+
12 Mar 2011; Joerg Bornkessel <hd_brummy@gentoo.org> package.mask:
cleanup for removal bug 352558, 358552
diff --git a/profiles/package.mask b/profiles/package.mask
index a35c00a1b0f6..d3c74639bf4c 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.12550 2011/03/12 20:50:15 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.12551 2011/03/13 05:08:06 dirtyepic 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
@@ -63,7 +63,8 @@ dev-ruby/ruby-gnomeprintui
# Mask net-p2p/bittorrent for removal 20110412 (#336166)
# Dead upstream. Requires wxpython-2.6 which is being removed.
# Doesn't build with python-2.6. Doesn't start.
-net-p2p/bittorrent
+# (temp unmasked for bug #358485)
+#net-p2p/bittorrent
# Torsten Veller <tove@gentoo.org> (11 Mar 2011)
# Mask deprecated dev-perl/gnome2-print for removal (#358423)