summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkos Chandras <hwoarang@gentoo.org>2012-01-21 10:59:41 +0000
committerMarkos Chandras <hwoarang@gentoo.org>2012-01-21 10:59:41 +0000
commit84b753ac72bcb95b9358c7819031ecf2432085e2 (patch)
tree92703b1a6aabb9f217716fa01c3497279b536333 /profiles
parentInitial commit. This is just a package rename for media-sound/minitunes (diff)
downloadgentoo-2-84b753ac72bcb95b9358c7819031ecf2432085e2.tar.gz
gentoo-2-84b753ac72bcb95b9358c7819031ecf2432085e2.tar.bz2
gentoo-2-84b753ac72bcb95b9358c7819031ecf2432085e2.zip
Remove masking. Use portage move instruction instead
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog6
-rw-r--r--profiles/package.mask8
-rw-r--r--profiles/updates/1Q-20121
3 files changed, 7 insertions, 8 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index b506e905606b..3747dda0e740 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,15 @@
# ChangeLog for profile directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6118 2012/01/21 10:29:00 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6119 2012/01/21 10:59:40 hwoarang 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!
+ 21 Jan 2012; Markos Chandras <hwoarang@gentoo.org> updates/1Q-2012,
+ package.mask:
+ Remove masking. Use portage move instruction instead
+
21 Jan 2012; Markos Chandras <hwoarang@gentoo.org> package.mask:
masking media-sound/minitunes for removal
diff --git a/profiles/package.mask b/profiles/package.mask
index 72ad317ecc4b..255f7b3d53eb 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13410 2012/01/21 10:29:00 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13411 2012/01/21 10:59:40 hwoarang 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
@@ -31,12 +31,6 @@
#--- END OF EXAMPLES ---
-# Markos Chandras <hwoarang@gentoo.org> (21 Jan 2012)
-# Package renamed to media-sound/musique
-# http://flavio.tordini.org/minitunes-renamed-to-musique
-# Removal in 30 days
-media-sound/minitunes
-
# Michał Górny <mgorny@gentoo.org> (21 Jan 2012)
# Blocks sysvinit yet doesn't provide all tools provided by it.
# Masking until we get the necessary tools out of sysvinit.
diff --git a/profiles/updates/1Q-2012 b/profiles/updates/1Q-2012
index b5fe6a59883c..68b0f294c78d 100644
--- a/profiles/updates/1Q-2012
+++ b/profiles/updates/1Q-2012
@@ -1,3 +1,4 @@
slotmove kde-misc/kcm-grub2 0 4
slotmove kde-misc/kfilebox 0 4
move x11-misc/synergy-plus x11-misc/synergy
+move media-sound/minitunes media-sound/musique