summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Armak <danarmak@gentoo.org>2001-09-19 08:12:06 +0000
committerDan Armak <danarmak@gentoo.org>2001-09-19 08:12:06 +0000
commit30fd253b774410298a3cfd06001a63d176ffc75b (patch)
treed6284546394f05812f5a9739865e7e84e0733e1b /sys-apps
parentkdm fix (diff)
downloadhistorical-30fd253b774410298a3cfd06001a63d176ffc75b.tar.gz
historical-30fd253b774410298a3cfd06001a63d176ffc75b.tar.bz2
historical-30fd253b774410298a3cfd06001a63d176ffc75b.zip
make.conf: moved objprelink from unstable list to stable off-by-deafult list since kde now has it built-in.
make.globals: added /usr/share/config to protected dirs list since we now install kde into /usr.
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/portage/files/1.5/cnf/make.conf4
-rw-r--r--sys-apps/portage/files/1.5/cnf/make.globals2
2 files changed, 3 insertions, 3 deletions
diff --git a/sys-apps/portage/files/1.5/cnf/make.conf b/sys-apps/portage/files/1.5/cnf/make.conf
index 094944ee13be..3eaba0caaad1 100644
--- a/sys-apps/portage/files/1.5/cnf/make.conf
+++ b/sys-apps/portage/files/1.5/cnf/make.conf
@@ -13,12 +13,12 @@
# Other stable USE flags
# ----------------------
# 3dnow perl python tcltk java guile ruby mysql postgres ldap odbc
-# ggi fbcon svga tex bonobo nas qtmt aalib oss arts libg++
+# ggi fbcon svga tex bonobo nas qtmt aalib oss arts libg++ objprelink
#
# Other experimental/unstable flags
# ---------------------------------
# directfb gd ungif gtkhtml socks5 pdflib qt-embedded jfs
-# mta-tls mta-ldap mta-mysql objprelink
+# mta-tls mta-ldap mta-mysql
#
# Other build related use flags
# -----------------------------
diff --git a/sys-apps/portage/files/1.5/cnf/make.globals b/sys-apps/portage/files/1.5/cnf/make.globals
index 5a281aa204b8..b71477871e1e 100644
--- a/sys-apps/portage/files/1.5/cnf/make.globals
+++ b/sys-apps/portage/files/1.5/cnf/make.globals
@@ -24,7 +24,7 @@ PKGDIR=${PORTDIR}/packages
RPMDIR=${PORTDIR}/rpm
CURRENTFILE=${PORTDIR}/current-packages
PLATFORM=$CHOST
-CONFIG_PROTECT="/etc /var/qmail/control /opt/kde2.1/share/config /opt/kde2.2/share/config"
+CONFIG_PROTECT="/etc /var/qmail/control /opt/kde2.1/share/config /opt/kde2.2/share/config /usr/share/config"
# Options passed to make during the build process
MAKEOPTS="-j2"