summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Ospald <hasufell@gentoo.org>2012-05-28 18:09:17 +0000
committerJulian Ospald <hasufell@gentoo.org>2012-05-28 18:09:17 +0000
commitdbe4fc8d09e0f9df5e923ef3ce7b4c7625b4148d (patch)
tree425c330cb826c54f021a69022a41082d7f423124
parentarm stable, bug #416655 (diff)
downloadhistorical-dbe4fc8d09e0f9df5e923ef3ce7b4c7625b4148d.tar.gz
historical-dbe4fc8d09e0f9df5e923ef3ce7b4c7625b4148d.tar.bz2
historical-dbe4fc8d09e0f9df5e923ef3ce7b4c7625b4148d.zip
remove =net-im/pidgin-2.10.3-r100 from package.mask since it's removed from portage
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask5
2 files changed, 5 insertions, 5 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 9c991a2caaa7..a139d517bd91 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.6604 2012/05/28 13:29:34 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6605 2012/05/28 18:09:17 hasufell 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!
+ 28 May 2012; Julian Ospald <hasufell@gentoo.org> package.mask:
+ =net-im/pidgin-2.10.3-r100 removed from the tree
+
28 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> package.mask:
Remove no-longer needed pmask entries.
diff --git a/profiles/package.mask b/profiles/package.mask
index 1a8b1fc7b992..1f8ffff459c2 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13798 2012/05/28 17:41:01 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13799 2012/05/28 18:09:17 hasufell 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
@@ -502,9 +502,6 @@ sys-auth/tcb
=media-libs/clutter-gtk-1.2*
=media-libs/clutter-gst-1.5*
=media-libs/clutter-gst-1.6*
-# Farsight2 conflicts with Farstream
-# So pidgin needs a patch
-=net-im/pidgin-2.10.3-r100
# Needs gst-plugins-flac-0.10.31 + commit 265a5bfa to write seekable flac files
=media-sound/sound-juicer-3.4*