summaryrefslogtreecommitdiff
path: root/cnf
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-08-01 02:22:06 +0000
committerZac Medico <zmedico@gentoo.org>2008-08-01 02:22:06 +0000
commitb04b06a4184b3355f87f8436cc2a96dbff302d54 (patch)
tree904c7b207b30fd811df5ffb8277c685b99b9089d /cnf
parentRemove the list of FEATURES descriptions from make.conf.example and replace (diff)
downloadportage-idfetch-b04b06a4184b3355f87f8436cc2a96dbff302d54.tar.gz
portage-idfetch-b04b06a4184b3355f87f8436cc2a96dbff302d54.tar.bz2
portage-idfetch-b04b06a4184b3355f87f8436cc2a96dbff302d54.zip
Fix new rejects in cnf/make.conf.*.diff.
svn path=/main/trunk/; revision=11306
Diffstat (limited to 'cnf')
-rw-r--r--cnf/make.conf.sparc-fbsd.diff10
-rw-r--r--cnf/make.conf.x86-fbsd.diff10
2 files changed, 0 insertions, 20 deletions
diff --git a/cnf/make.conf.sparc-fbsd.diff b/cnf/make.conf.sparc-fbsd.diff
index 4ca3a50c..f3d3bca8 100644
--- a/cnf/make.conf.sparc-fbsd.diff
+++ b/cnf/make.conf.sparc-fbsd.diff
@@ -23,13 +23,3 @@
# Portage Directories
# ===================
-@@ -272,7 +286,8 @@
- # 'preserve-libs'
- # keep libraries around that would normally removed by an upgrade,
- # but are still needed by other packages
--# 'sandbox' enables sandboxing when running emerge and ebuild.
-+# 'sandbox' enables sandboxing when running emerge and ebuild. Doesn't
-+# work on *BSD-based systems.
- # 'splitdebug' Prior to stripping ELF etdyn and etexec files, the debugging
- # info is stored for later use by various debuggers. This
- # feature is disabled by 'nostrip'. For installation of source
diff --git a/cnf/make.conf.x86-fbsd.diff b/cnf/make.conf.x86-fbsd.diff
index a71e5403..1a49edc6 100644
--- a/cnf/make.conf.x86-fbsd.diff
+++ b/cnf/make.conf.x86-fbsd.diff
@@ -63,13 +63,3 @@
# Portage Directories
# ===================
-@@ -272,7 +313,8 @@
- # 'preserve-libs'
- # keep libraries around that would normally removed by an upgrade,
- # but are still needed by other packages
--# 'sandbox' enables sandboxing when running emerge and ebuild.
-+# 'sandbox' enables sandboxing when running emerge and ebuild. Doesn't
-+# work on *BSD-based systems.
- # 'splitdebug' Prior to stripping ELF etdyn and etexec files, the debugging
- # info is stored for later use by various debuggers. This
- # feature is disabled by 'nostrip'. For installation of source