diff options
| author |   Julian Ospald <hasufell@gentoo.org> | 2012-05-28 18:09:17 +0000 |
|---|---|---|
| committer | Julian Ospald <hasufell@gentoo.org> | 2012-05-28 18:09:17 +0000 |
| commit | ce259c5f4411d791f77d79664a3b0266c9266650 (patch) | |
| tree | 2821db1a097a9c79bd4e2ab0adad7e316ecd2324 /profiles | |
| parent | arm stable, bug #416655 (diff) | |
| download | gentoo-2-ce259c5f4411d791f77d79664a3b0266c9266650.tar.gz gentoo-2-ce259c5f4411d791f77d79664a3b0266c9266650.tar.bz2 gentoo-2-ce259c5f4411d791f77d79664a3b0266c9266650.zip | |
remove =net-im/pidgin-2.10.3-r100 from package.mask since it's removed from portage
Diffstat (limited to 'profiles')
| -rw-r--r-- | profiles/ChangeLog | 5 | ||||
| -rw-r--r-- | profiles/package.mask | 5 |
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* |