From db147650f000c71ac9bb19897086212d936a2d3d Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Wed, 18 Sep 2013 21:27:52 +0200 Subject: [PATCH] Current state --- config-archive/etc/portage/make.conf | 91 +++++++++++++++++ config-archive/etc/portage/make.conf.dist | 97 +++++++++++++++++++ .../etc/portage/repos.conf/gentoo.conf.dist | 7 ++ portage | 2 +- 4 files changed, 196 insertions(+), 1 deletion(-) create mode 100644 config-archive/etc/portage/make.conf create mode 100644 config-archive/etc/portage/make.conf.dist create mode 100644 config-archive/etc/portage/repos.conf/gentoo.conf.dist diff --git a/config-archive/etc/portage/make.conf b/config-archive/etc/portage/make.conf new file mode 100644 index 0000000..15c8e08 --- /dev/null +++ b/config-archive/etc/portage/make.conf @@ -0,0 +1,91 @@ +# These settings were set by the catalyst build script that automatically +# built this stage. +# Please consult /usr/share/portage/config/make.conf.example for a more +# detailed example. +CFLAGS="-O2 -pipe -march=opteron" +CXXFLAGS="${CFLAGS}" + +# WARNING: Changing your CHOST is not something that should be done lightly. +# Please consult http://www.gentoo.org/doc/en/change-chost.xml before changing. +CHOST="x86_64-pc-linux-gnu" + +# These are the USE flags that were used in addition to what is provided by the +# profile used for building. +USE="3dnow X acl apache2 audit bash-completion bazaar bzip2 caps cgi curl cvs \ + djvu doc examples expat fam fastcgi fontconfig ftp gd geoip gif git gmp \ + gnome-keyring gnutls gpg gpm graphviz gs gsl gsm gtk guile hscolour html i18n \ + icu idn imagemagick imap ipv6 ithreads jadetex java javascript jbig jpeg \ + jpeg2k json kerberos lasi ldap libwww lua lzma lzo maildir mailwrapper \ + mercurial mmx mmxext mod modperl modplug motif mp3 mysql \ + nis nss odbc ogg openexr openldap openssl pam pch pcre pdf perl php pic png postgres \ + postscript python rar samba sasl session smtp snmp soap spamassassin \ + speex spell sqlite sqlite3 sse sse2 ssh subversion svg syslog theora tiff tk \ + truetype unicode vhosts vim-syntax vorbis wmf x264 xattr xml xmlrpc xpm \ + xsl xslt xvid zlib + -development" +#USE="3dnow X acl apache2 audit bash-completion bazaar bzip2 caps cgi cvs curl \ +# darcs djvu doc examples expat fam fastcgi fontconfig ftp gd gif git gmp gnome-keyring \ +# gnutls gpg graphviz gs gsl gtk guile hscolour html icu idn imagemagick imap ipv6 ithreads \ +# jadetex java javascript jbig jpeg jpeg2k kerberos lasi ldap libwww lua \ +# lzma lzo maildir mailwrapper mercurial mmx mmxext modperl modplug motif mp3 mysql \ +# nis odbc ogg openexr openldap pam pch pcre pdf perl pic png php python rar samba sasl \ +# session smtp snmp soap spamassassin spell sqlite sqlite3 sse sse2 ssh \ +# subversion svg syslog theora tiff tk truetype unicode vhosts vim-syntax \ +# vorbis wmf x264 xattr xml xmlrpc xpm xsl xvid zlib" + + +I_KNOW_WHAT_I_AM_DOING=yes + +ACCEPT_LICENSE="DOOM3 PUEL RTCW RTCW-ETEULA" + +APACHE2_MODULES="actions alias asis auth_basic auth_digest authn_alias + authn_anon authn_dbd authn_dbm authn_default authn_file + authz_dbm authz_default authz_groupfile authz_host + authz_owner authz_user autoindex cache cern_meta cgi cgid + charset_lite dav dav_fs dav_lock dbd deflate dir disk_cache + dumpio env expires ext_filter file_cache filter headers icu + ident imagemap include info log_config log_forensic logio + mem_cache mime mime_magic negotiation proxy proxy_ajp + proxy_balancer proxy_connect proxy_ftp proxy_http proxy_scgi + reqtimeout rewrite setenvif speling status substitute + unique_id userdir usertrack version vhost_alias " + +#APACHE2_MPMS="-event% -itk% -peruser% -prefork% -worker%" +APACHE2_MPMS="prefork" + +VIDEO_CARDS="intel mach64 r128 radeon savage via svga" + +PHP_TARGETS="php5-3" + +CONFIG_PROTECT="/var/www/ldap/htdocs/config \ + /var/www/ldap/htdocs/templates \ + /var/www/bautagebuch/htdocs/wp-config.php \ + /var/www/myadmin/htdocs/config.inc.php \ + /var/www/webmail/htdocs/horde/config \ + /usr/share/logwatch/default.conf \ + " +#CONFIG_PROTECT_MASK="/etc/init.d" + +PORTAGE_NICENESS=3 + +AUTOCLEAN="yes" + +PORTDIR_OVERLAY="/usr/local/portage" + +#FETCHCOMMAND="/usr/bin/wget -t 5 --passive-ftp -P \${DISTDIR} \${URI}" +#FETCHCOMMAND="mv -v \${DISTDIR}/.old/\${FILE} \${DISTDIR}/" + +FEATURES="parallel-fetch" +#MAKEOPTS="-j3" +EMERGE_DEFAULT_OPTS="--with-bdeps y --complete-graph=y --quiet-build=y --jobs=4 --load-average=6" + +LINGUAS="de de_AT de_BE de_CH de_DE de_LU en en_AG en_AU en_BW en_CA en_DK en_GB en_HK en_IE en_IN en_NG en_NZ en_PH en_SG en_ZA en_ZW en_US ru_RU ru_UA" + +#GENTOO_MIRRORS="ftp://mirror.netcologne.de/gentoo/ ftp://mirror.muntinternet.net/pub/gentoo/ http://mirror.muntinternet.net/pub/gentoo/ http://gentoo.supp.name/" +#GENTOO_MIRRORS="http://mirror.opteamax.de/gentoo/ http://gentoo.mneisen.org/ http://gentoo.mirror.dkm.cz/pub/gentoo/ http://de-mirror.org/gentoo/ http://gentoo.wheel.sk/" +GENTOO_MIRRORS="http://gentoo.mneisen.org/ http://gentoo.wheel.sk/ http://mirror.netcologne.de/gentoo/ http://gentoo.tiscali.nl/ ftp://ftp.free.fr/mirrors/ftp.gentoo.org/" + + +#PORT_LOGDIR="/var/log/portage" +source /var/lib/layman/make.conf + diff --git a/config-archive/etc/portage/make.conf.dist b/config-archive/etc/portage/make.conf.dist new file mode 100644 index 0000000..2e890ef --- /dev/null +++ b/config-archive/etc/portage/make.conf.dist @@ -0,0 +1,97 @@ +# These settings were set by the catalyst build script that automatically +# built this stage. +# Please consult /usr/share/portage/config/make.conf.example for a more +# detailed example. +CFLAGS="-O2 -pipe -march=opteron" +CXXFLAGS="${CFLAGS}" + +# WARNING: Changing your CHOST is not something that should be done lightly. +# Please consult http://www.gentoo.org/doc/en/change-chost.xml before changing. +CHOST="x86_64-pc-linux-gnu" + +# These are the USE flags that were used in addition to what is provided by the +# profile used for building. +USE="3dnow X acl apache2 audit bash-completion bazaar bzip2 caps cgi curl cvs \ + djvu doc examples expat fam fastcgi fontconfig ftp gd geoip gif git gmp \ + gnome-keyring gnutls gpg gpm graphviz gs gsl gsm gtk guile hscolour html i18n \ + icu idn imagemagick imap ipv6 ithreads jadetex java javascript jbig jpeg \ + jpeg2k json kerberos lasi ldap libwww lua lzma lzo maildir mailwrapper \ + mercurial mmx mmxext mod modperl modplug motif mp3 mysql \ + nis nss odbc ogg openexr openldap openssl pam pch pcre pdf perl php pic png postgres \ + postscript python rar samba sasl session smtp snmp soap spamassassin \ + speex spell sqlite sqlite3 sse sse2 ssh subversion svg syslog theora tiff tk \ + truetype unicode vhosts vim-syntax vorbis wmf x264 xattr xml xmlrpc xpm \ + xsl xslt xvid zlib + -development" +#USE="3dnow X acl apache2 audit bash-completion bazaar bzip2 caps cgi cvs curl \ +# darcs djvu doc examples expat fam fastcgi fontconfig ftp gd gif git gmp gnome-keyring \ +# gnutls gpg graphviz gs gsl gtk guile hscolour html icu idn imagemagick imap ipv6 ithreads \ +# jadetex java javascript jbig jpeg jpeg2k kerberos lasi ldap libwww lua \ +# lzma lzo maildir mailwrapper mercurial mmx mmxext modperl modplug motif mp3 mysql \ +# nis odbc ogg openexr openldap pam pch pcre pdf perl pic png php python rar samba sasl \ +# session smtp snmp soap spamassassin spell sqlite sqlite3 sse sse2 ssh \ +# subversion svg syslog theora tiff tk truetype unicode vhosts vim-syntax \ +# vorbis wmf x264 xattr xml xmlrpc xpm xsl xvid zlib" + + +I_KNOW_WHAT_I_AM_DOING=yes + +ACCEPT_LICENSE="DOOM3 PUEL RTCW RTCW-ETEULA" + +APACHE2_MODULES="actions alias asis auth_basic auth_digest authn_alias + authn_anon authn_dbd authn_dbm authn_default authn_file + authz_dbm authz_default authz_groupfile authz_host + authz_owner authz_user autoindex cache cern_meta cgi cgid + charset_lite dav dav_fs dav_lock dbd deflate dir disk_cache + dumpio env expires ext_filter file_cache filter headers icu + ident imagemap include info log_config log_forensic logio + mem_cache mime mime_magic negotiation proxy proxy_ajp + proxy_balancer proxy_connect proxy_ftp proxy_http proxy_scgi + reqtimeout rewrite setenvif speling status substitute + unique_id userdir usertrack version vhost_alias " + +#APACHE2_MPMS="-event% -itk% -peruser% -prefork% -worker%" +APACHE2_MPMS="prefork" + +VIDEO_CARDS="intel mach64 r128 radeon savage via svga" + +PHP_TARGETS="php5-3" + +CONFIG_PROTECT="/var/www/ldap/htdocs/config \ + /var/www/ldap/htdocs/templates \ + /var/www/bautagebuch/htdocs/wp-config.php \ + /var/www/myadmin/htdocs/config.inc.php \ + /var/www/webmail/htdocs/horde/config \ + /usr/share/logwatch/default.conf \ + " +#CONFIG_PROTECT_MASK="/etc/init.d" + +PORTAGE_NICENESS=3 + +AUTOCLEAN="yes" + +PORTDIR_OVERLAY="/usr/local/portage" + +#FETCHCOMMAND="/usr/bin/wget -t 5 --passive-ftp -P \${DISTDIR} \${URI}" +#FETCHCOMMAND="mv -v \${DISTDIR}/.old/\${FILE} \${DISTDIR}/" + +FEATURES="parallel-fetch" +#MAKEOPTS="-j3" +EMERGE_DEFAULT_OPTS="--with-bdeps y --complete-graph=y --quiet-build=y --jobs=4 --load-average=6" + +LINGUAS="de de_AT de_BE de_CH de_DE de_LU en en_AG en_AU en_BW en_CA en_DK en_GB en_HK en_IE en_IN en_NG en_NZ en_PH en_SG en_ZA en_ZW en_US ru_RU ru_UA" + +#GENTOO_MIRRORS="ftp://mirror.netcologne.de/gentoo/ ftp://mirror.muntinternet.net/pub/gentoo/ http://mirror.muntinternet.net/pub/gentoo/ http://gentoo.supp.name/" +#GENTOO_MIRRORS="http://mirror.opteamax.de/gentoo/ http://gentoo.mneisen.org/ http://gentoo.mirror.dkm.cz/pub/gentoo/ http://de-mirror.org/gentoo/ http://gentoo.wheel.sk/" +GENTOO_MIRRORS="http://gentoo.mneisen.org/ http://gentoo.wheel.sk/ http://mirror.netcologne.de/gentoo/ http://gentoo.tiscali.nl/ ftp://ftp.free.fr/mirrors/ftp.gentoo.org/" + + +#PORT_LOGDIR="/var/log/portage" +source /var/lib/layman/make.conf + + +# Set PORTDIR for backward compatibility with various tools: +# gentoo-bashcomp - bug #478444 +# euse - bug #474574 +# euses and ufed - bug #478318 +PORTDIR="/usr/portage" diff --git a/config-archive/etc/portage/repos.conf/gentoo.conf.dist b/config-archive/etc/portage/repos.conf/gentoo.conf.dist new file mode 100644 index 0000000..8c657da --- /dev/null +++ b/config-archive/etc/portage/repos.conf/gentoo.conf.dist @@ -0,0 +1,7 @@ +[DEFAULT] +main-repo = gentoo + +[gentoo] +location = /usr/portage +sync-type = rsync +sync-uri = rsync://rsync.gentoo.org/gentoo-portage diff --git a/portage b/portage index 7c6b4fd..9356b98 160000 --- a/portage +++ b/portage @@ -1 +1 @@ -Subproject commit 7c6b4fd6b1c95c9924891097a64759098ea5d35b +Subproject commit 9356b98c10f0d44e38a0e515ad0cd15c2271b4a3 -- 2.39.5