diff options
| author |   Gilles Dartiguelongue <eva@gentoo.org> | 2011-04-24 17:13:35 +0000 |
|---|---|---|
| committer | Gilles Dartiguelongue <eva@gentoo.org> | 2011-04-24 17:13:35 +0000 |
| commit | fec1c7ca1983371e22b11e518463114e7b1f11df (patch) | |
| tree | 6de5612ec8195fcd4a086a6dc6283abebe67d162 /profiles | |
| parent | Slot revisions. (diff) | |
| download | historical-fec1c7ca1983371e22b11e518463114e7b1f11df.tar.gz historical-fec1c7ca1983371e22b11e518463114e7b1f11df.tar.bz2 historical-fec1c7ca1983371e22b11e518463114e7b1f11df.zip | |
Add slotmoves for media-libs/libwpg and unmask it with libwpd.
Diffstat (limited to 'profiles')
| -rw-r--r-- | profiles/ChangeLog | 6 | ||||
| -rw-r--r-- | profiles/package.mask | 7 | ||||
| -rw-r--r-- | profiles/updates/2Q-2011 | 2 |
3 files changed, 8 insertions, 7 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog index 8d256218a934..7919e02be877 100644 --- a/profiles/ChangeLog +++ b/profiles/ChangeLog @@ -1,11 +1,15 @@ # ChangeLog for profile directory # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5327 2011/04/24 15:23:43 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5328 2011/04/24 17:13:34 eva 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! + 24 Apr 2011; Gilles Dartiguelongue <eva@gentoo.org> updates/2Q-2011, + package.mask: + Add slotmoves for media-libs/libwpg and unmask it with libwpd. + 24 Apr 2011; Gilles Dartiguelongue <eva@gentoo.org> updates/2Q-2011: Slotmove libwpd 0.8 and 0.9. diff --git a/profiles/package.mask b/profiles/package.mask index f623b6448d81..97fd0834f05a 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -1,5 +1,5 @@ #################################################################### -# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.12726 2011/04/23 16:09:53 tampakrap Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.12727 2011/04/24 17:13:34 eva 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 @@ -93,11 +93,6 @@ gnustep-base/gnustep-updater # media-video/ffmpeg >=media-libs/celt-0.10 -# Pacho Ramos <pacho@gentoo.org> (20 Apr 2011) -# Masked until tree is ready for them, bug #361565 and #363699 ->=app-text/libwpd-0.9 ->=media-libs/libwpg-0.2 - # Jeroen Roovers <jer@gentoo.org> (19 Apr 2011) # development branch of argus/-clients =net-analyzer/argus-3.0.5* diff --git a/profiles/updates/2Q-2011 b/profiles/updates/2Q-2011 index da5ad65ebf98..390806c03c94 100644 --- a/profiles/updates/2Q-2011 +++ b/profiles/updates/2Q-2011 @@ -8,3 +8,5 @@ move dev-php5/xcache dev-php/xcache move dev-php5/magickwand dev-php/magickwand slotmove <app-text/libwpd-0.9 0 0.8 slotmove >=app-text/libwpd-0.9 0 0.9 +slotmove <media-libs/libwpg-0.2 0 0.1 +slotmove >=media-libs/libwpg-0.2 0 0.2 |