summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Farina <zerochaos@gentoo.org>2013-07-07 16:41:47 +0000
committerRichard Farina <zerochaos@gentoo.org>2013-07-07 16:41:47 +0000
commit7dc3e92841c8655dc63e73d65522a5914680521f (patch)
tree6d58ecf72b5ebd3595d2260ced8413b58cd4f814 /profiles
parentmasking gnuradio-3.7 (diff)
downloadhistorical-7dc3e92841c8655dc63e73d65522a5914680521f.tar.gz
historical-7dc3e92841c8655dc63e73d65522a5914680521f.tar.bz2
historical-7dc3e92841c8655dc63e73d65522a5914680521f.zip
masking gnuradio-3.7
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog3
-rw-r--r--profiles/package.mask6
2 files changed, 6 insertions, 3 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index af35b2936931..a355d4545896 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,6 +1,6 @@
# ChangeLog for profile directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8007 2013/07/07 16:41:24 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8008 2013/07/07 16:41:47 zerochaos 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
@@ -27,7 +27,6 @@
03 Jul 2013; Pacho Ramos <pacho@gentoo.org> package.mask:
Clean gtkmm mask as broken version was removed
->>>>>>> 1.8006
03 Jul 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
package.mask:
Mask syslinux prerelease.
diff --git a/profiles/package.mask b/profiles/package.mask
index 803f1f4c1146..2fba6225d496 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,6 +1,6 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14895 2013/07/04 06:04:58 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14896 2013/07/07 16:41:24 zerochaos 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
@@ -32,6 +32,10 @@
#--- END OF EXAMPLES ---
+# Rick Farina <zerochaos@gentoo.org> (07 Jun 2013)
+# incompatible with near everything available at this time
+=net-wireless/gnuradio-3.7.0
+
# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (25 Jun 2013)
# Prerelease ebuild, mostly untested and held together by duct tape.
=sys-boot/syslinux-6.01_pre*