summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBertrand Jacquin (Beber) <beber@setibzh.com>2006-02-27 19:42:52 +0100
committerBertrand Jacquin (Beber) <beber@setibzh.com>2006-02-27 19:42:52 +0100
commitf060bdd1d0c09e8ca65e7d71c4d9a659cbd20fd0 (patch)
tree8ff9dc48b4c0895fd1eaec3b8ebf1268ec2f4628
parentHW_MON (diff)
downloadconfig-f060bdd1d0c09e8ca65e7d71c4d9a659cbd20fd0.tar.gz
Portages misc things
and confcache
-rw-r--r--portage/make.conf31
-rw-r--r--portage/package.mask1
-rw-r--r--portage/package.use13
3 files changed, 29 insertions, 16 deletions
diff --git a/portage/make.conf b/portage/make.conf
index 933b369..9dd82c0 100644
--- a/portage/make.conf
+++ b/portage/make.conf
@@ -23,11 +23,11 @@
# Example:
#USE="X gtk gnome -alsa"
USE="3dnow 3dnowex acl acpi alsa apache2 dvd ethereal imagemagick imap ipv6 \
- lcms -mad -cups maildir memlimit mmx mmx2 mozilla msn ntpl nvidia ppds \
- -slp snmp -ruby sse sse2 usb videos xml xsl -gnome -svga \
- -directfb berkdb tetex -nas -postgres cddb unicode -guile -oss -flac \
- -motif -mikmod -aalib kdexdeltas -tcltk -ldap -fortran lm_sensors \
- -arts -vidix -tiff svg gif sdl xprint jikes -esd -xmms exif"
+ lcms -mad -cups maildir memlimit mmx mmx2 mozilla msn ntpl nvidia ppds \
+ -slp snmp -ruby sse sse2 usb videos xml xsl -gnome -svga \
+ -directfb berkdb tetex -nas -postgres cddb unicode -guile -oss -flac \
+ -motif -mikmod -aalib kdexdeltas -tcltk -ldap -fortran lm_sensors \
+ -arts -vidix -tiff svg gif sdl xprint jikes -esd -xmms exif"
# Host Setting
# ============
@@ -190,13 +190,13 @@ RESUMECOMMAND="/usr/bin/wget -c -t 5 --passive-ftp \${URI} -P \${DISTDIR} --no-c
#GENTOO_MIRRORS="<your_mirror_here> http://distfiles.gentoo.org http://www.ibiblio.org/pub/Linux/distributions/gentoo"
#LOCAL_GENTOO_MIRRORS="http://mirror.melee/pub/gentoo/ https://ross.melee"
GENTOO_MIRRORS="$LOCAL_GENTOO_MIRRORS \
- ftp://ftp.proxad.net/mirrors/ftp.gentoo.org/ \
http://gentoo.osuosl.org/ \
http://www.ibiblio.org/pub/Linux/distributions/gentoo \
http://ftp-stud.fht-esslingen.de/pub/Mirrors/gentoo/ \
http://gentoo.inode.at/ \
http://ftp.rhnet.is/pub/gentoo/ \
http://ftp.ntua.gr/pub/linux/gentoo/"
+ #ftp://ftp.proxad.net/mirrors/ftp.gentoo.org/ \
#
# Portage uses PORTAGE_BINHOST to specify mirrors for prebuilt-binary packages.
# The list is a single entry specifying the full address of the directory
@@ -253,6 +253,13 @@ RSYNC_TIMEOUT=180
# Advanced Features
# =================
#
+# EMERGE_DEFAULT_OPTS allows emerge to act as if certain options are
+# specified on every run. Useful options include --ask, --verbose,
+# --usepkg and many others. Options that are not useful, such as --help,
+# are not filtered.
+#EMERGE_DEFAULT_OPTS=""
+EMERGE_DEFAULT_OPTS="--verbose"
+#
# MAKEOPTS provides extra options that may be passed to 'make' when a
# program is compiled. Presently the only use is for specifying
# the number of parallel makes (-j) to perform. The suggested number
@@ -296,6 +303,8 @@ PORTAGE_TMPFS="/dev/shm"
# 'collision-protect'
# prevents packages from overwriting files that are owned by
# another package or by no package at all.
+# 'confcache' enable confcache support; speeds up autotool based configure
+# calls
# 'cvs' causes portage to enable all cvs features (commits, adds),
# and to apply all USE flags in SRC_URI for digests -- for
# developers only.
@@ -314,7 +323,7 @@ PORTAGE_TMPFS="/dev/shm"
# 'keeptemp' prevents the clean phase from deleting the temp files ($T)
# from a merge.
# 'keepwork' prevents the clean phase from deleting the WORKDIR.
-# 'maketest' causes ebuilds to perform testing phases if they are capable
+# 'test' causes ebuilds to perform testing phases if they are capable
# of it. Some packages support this automaticaly via makefiles.
# 'noauto' causes ebuild to perform only the action requested and
# not any other required actions like clean or unpack -- for
@@ -332,7 +341,7 @@ PORTAGE_TMPFS="/dev/shm"
# 'usersandbox' enables sandboxing while portage is running under userpriv.
#FEATURES="sandbox buildpkg ccache distcc userpriv usersandbox notitles noclean noauto cvs keeptemp keepwork autoaddcvs"
#FEATURES="sandbox ccache distcc distlocks autoaddcvs"
-FEATURES="ccache sandbox distlocks fixpackages digest parallel-fetch"
+FEATURES="ccache sandbox distlocks fixpackages digest parallel-fetch confcache"
#
# CCACHE_SIZE sets the space use limitations for ccache. The default size is
# 2G, and will be set if not defined otherwise and ccache is in features.
@@ -381,13 +390,13 @@ DISTCC_DIR="${PORTAGE_TMPDIR}/.distcc"
#PORTAGE_ELOG_COMMAND="/path/to/logprocessor -p '${PACKAGE}' -f '${LOGFILE}'"
# PORTAGE_ELOG_MAILURI: this variable holds all important settings for the mail
-# module. In most cases listing the recipient adress and
+# module. In most cases listing the recipient address and
# the receiving mailserver should be sufficient, but you can
# also use advanced settings like authentication or TLS. The
# full syntax is:
-# adress [[user:passwd@]mailserver[:port]]
+# address [[user:passwd@]mailserver[:port]]
# where
-# adress: recipient adress
+# address: recipient adress
# user: username for smtp auth (defaults to none)
# passwd: password for smtp auth (defaults to none)
# mailserver: smtp server that should be used to deliver the mail (defaults to localhost)
diff --git a/portage/package.mask b/portage/package.mask
index aa6741b..1adacdf 100644
--- a/portage/package.mask
+++ b/portage/package.mask
@@ -2,7 +2,6 @@
app-editors/nano
>=app-text/ghostscript-esp-8
->=app-text/poppler-0.5.0-r1
>=dev-db/mysql-5.0
>=dev-db/sqlite-3.3
diff --git a/portage/package.use b/portage/package.use
index 13654b2..ee10ab5 100644
--- a/portage/package.use
+++ b/portage/package.use
@@ -37,6 +37,7 @@ app-doc/ebook-sed -kde
app-doc/ebook-zvt -kde
app-editors/vim cscope vim-pager
+app-editors/kile -kde
app-emulation/qemu-softmmu kqemu
@@ -68,12 +69,13 @@ dev-java/blackdown-jre browserplugin nsplugin
dev-lang/mono nptl
dev-lang/php gd -gdbm -berkdb curl truetype session xsl xpm soap mime ftp iconv tidy tokenizer sockets bzlib -sasl bcmath -sqlite -snmp -soap -qt bzip2 curlwrappers pcre sqlite mysql
dev-lang/python ucs2
+dev-lang/ruby examples
+dev-lang/swig -java
dev-libs/cyrus-sasl gdbm
dev-libs/eet doc
dev-libs/embryo doc
dev-libs/engrave doc
-dev-lang/swig -java
dev-php/mod_php gd -gdbm -berkdb curl truetype session xsl xpm soap mime ftp iconv tidy tokenizer sockets bzlib -sasl bcmath -sqlite -qt -snmp -soap -X -java mysql
dev-php/php gd -gdbm -berkdb curl truetype session xsl xpm soap mime ftp iconv tidy tokenizer sockets bzlib -sasl bcmath -sqlite -snmp -soap -qt -java mysql
@@ -85,7 +87,7 @@ dev-util/cogito doc
dev-util/devhelp firefox
dev-util/eclipse-sdk gtk -kde
dev-util/git gitsendemail webdav tcltk doc curl
-dev-util/subversion -berkdb -java nowebdav -apache2
+dev-util/subversion -berkdb -java -apache2
games-misc/fortune-mod-gentoo-forums offensive
games-misc/fortune-mod-it offensive
@@ -108,6 +110,7 @@ mail-client/sylpheed-claws -dillo -imlib -kde
mail-mta/exim exiscan exiscan-acl lmtp -X -mysql
media-gfx/imagemagick bzip2
+media-gfx/inkscape jabber
media-gfx/gimp -gtkhtml
media-libs/edje doc
@@ -129,14 +132,16 @@ media-sound/vorbis-tools flac
media-sound/xmms2 ruby -python samba flac aac curl
#media-sound/xmms mp3 sndfile
+media-tv/mythtv dvb oggvorbis opengl -nvidia
+
media-video/avifile divx vid divx4linux -qt xvid win32codecs
media-video/ffmpeg xvid theora network aac a52
media-video/mjpegtools -quicktime
-media-video/mplayer rtc network divx4linux nvidia xvid dvdread cdparanoia real -gtk live mmxext 3dnowext matroska win32codecs -xmms theora aac dv bidi
+media-video/mplayer rtc network divx4linux nvidia xvid dvdread cdparanoia real -gtk live mmxext 3dnowext matroska win32codecs -xmms theora aac dv bidi dvb v4l v4l2
#media-video/nvidia-glx dlloader
media-video/realplayer -mozilla
media-video/transcode xvid divx4linux dvdread network -quicktime theora dv a52 ffmpeg
-media-video/vlc win32codecs gnutls real theora flac stream aac -cdda -ncurses -xml2 -samba -dvd
+media-video/vlc win32codecs gnutls real theora flac stream aac -ncurses-samba ffmpeg live v4l wxwindows a52 cdda dvb httpd daap matroska xml2 vlm shout skins speex screen
net-analyzer/ethereal -snmp
net-analyzer/nagios-core -mysql