From 5370342b17967c7f33bf08eb5414e4ea9889cad5 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Wed, 18 Sep 2013 21:33:25 +0200 Subject: [PATCH] Current state --- config-archive/etc/portage/make.conf | 130 +++++++++++++++++ config-archive/etc/portage/make.conf.dist | 136 ++++++++++++++++++ .../etc/portage/repos.conf/gentoo.conf.dist | 7 + cups/subscriptions.conf | 4 +- portage/make.conf | 6 + portage/package.use | 2 + portage/repos.conf/gentoo.conf | 7 + resolv.conf | 10 +- 8 files changed, 296 insertions(+), 6 deletions(-) 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 create mode 100644 portage/repos.conf/gentoo.conf diff --git a/config-archive/etc/portage/make.conf b/config-archive/etc/portage/make.conf new file mode 100644 index 00000000..ea679837 --- /dev/null +++ b/config-archive/etc/portage/make.conf @@ -0,0 +1,130 @@ +# 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" +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" + +MAKEOPTS="-j5" +#MAKEOPTS="-j1" + +GENTOO_MIRRORS="http://ftp.snt.utwente.nl/pub/os/linux/gentoo http://mirrors.sec.informatik.tu-darmstadt.de/gentoo/" +#GENTOO_MIRRORS="http://linux.rz.ruhr-uni-bochum.de/download/gentoo-mirror/ http://ftp.snt.utwente.nl/pub/os/linux/gentoo http://mirrors.sec.informatik.tu-darmstadt.de/gentoo/" +#GENTOO_MIRRORS="http://gentoo.mirror.web4u.cz/ ftp://ftp.wh2.tu-dresden.de/pub/mirrors/gentoo ftp://gentoo.mirror.dkm.cz/pub/gentoo/ ftp://mirror.bytemark.co.uk/gentoo/" + +PORT_LOGDIR=/var/log/portage + +PORTDIR_OVERLAY="/usr/local/portage" + +PORTAGE_RSYNC_OPTS="${PORTAGE_RSYNC_OPTS} --progress" + +PORTAGE_NICENESS=3 +AUTOCLEAN="yes" + +ACCEPT_LICENSE=" \ + DOOM3 \ + PUEL \ + RTCW \ + RTCW-ETEULA \ + dlj-1.1 \ + sun-bcla-java-vm \ + AdobeFlash-10 \ + AdobeFlash-10.1 \ + AdobeFlash-10.3 \ + AdobeFlash-11.x \ + skype-eula \ + skype-4.0.0.7-copyright \ + Oracle-BCLA-JavaSE \ +" + +EMERGE_DEFAULT_OPTS="--with-bdeps y --quiet-build=y --jobs=4 --load-average=10" +#EMERGE_DEFAULT_OPTS="--with-bdeps y" + +CONFIG_PROTECT="/usr/share/xsessions \ + /var/www/localhost/htdocs/phpmyadmin \ + /var/lib/samba/private \ + /var/www/localhost/htdocs/cacti \ + /var/www/ldap/htdocs/config \ + /var/www/ldap/htdocs/templates \ + /usr/share/genkernel/arch/x86 \ + /usr/share/config/kdm \ +" + +#CONFIG_PROTECT_MASK="/etc/init.d" + +FEATURES="parallel-fetch userpriv usersandbox" + +#FETCHCOMMAND="/usr/bin/wget -t 5 --passive-ftp -P \${DISTDIR} \${URI}" +#FETCHCOMMAND="mv -v \${DISTDIR}/.old/\${FILE} \${DISTDIR}/" + +#LINGUAS="ar bg cs da de el en en_GB en_US es es_ES es_MX fi fr fr_CA fy it ja he hsb hu la nn nn_NO no nds nl oc pl pt pt_BR pt_PT ru sv sv_SE tr uk vi zh_CN zh_HK zh_TW" +LINGUAS="de en en_GB en_US ru vi" + +# These are the USE flags that were used in addition to what is provided by the +# profile used for building. +USE="3dnow 3dnowext X Xaw3d a52 aac aalib acl acpi ads aim alsa altnburgcards + amr ao apache2 archive audiofile avahi bash-completion bazaar bluray branding bzip2 cairo + calendar caps cdda cddb cdparanoia cdr cgi cpudetection cscope css ctype cups curl + curlwrappers cvs dbase dbi dbus dga djvu doc dts dv dvb dvd dvdr dvdread eds examples + encode exif expat fam fastcgi ffmpeg fftw fits flac flatfile fltk fontconfig + foomaticdb ftp gconf gd gd-external geoip ggi gif gimp git glade glib gmp gnome gnome-keyring + gnustep gphoto2 gpm graphviz gsl gsm gstreamer gtk gtk3 gtkhtml handbook hal hscolour html iconv icu id3 id3tag idea + idn ieee1394 imagemagick imap imlib inifile ithreads java javascript + jabber jack java6 jbig jikes jingle jpeg jpeg2k json json-syck json-xs kde kdeenablefinal kdeprefix kerberos + keyring kig-scripting kpathsea lame latex lcms ldap libcaca + libnotify libsamplerate libwww live lm_sensors log4j logrotate lua lzma lzo mad meanwhile mercurial + midi mhash mmx mmxext mng modperl modplug motif mp3 mp4 mpeg mplayer msn mtp + musepack musicbrainz mysql mysqli nas nautilus ncurses next networkmanager nfs nis + nptl nsplugin nss numpy odbc ogg openal openexr opengl openssl opus pango par pch pcntl pcre pdf perl + perlsuid php plasma plotutils png policykit portaudio posix postgres postscript ppds projectm pulseaudio python quicktime real + rdesktop rle samba sasl sdl semantic-desktop session sharedmem sid simplexml sip skype slang slp smtp + sndfile soap sockets sox spamassassin speex spell sqlite sqlite3 srtp sse sse2 ssh + subversion svg sysvipc tetex theora threads thumbnail tidy timidity tiff + tools truetype twolame udev unicode usb v4l v4l2 vala vcd vidix video vim-syntax vorbis wav wavpack + wddx webdav webkit win32codecs wma wmf x264 xattr xcomposite xface xft xine + xinetd xml xmlrpc xmp xosd xpm xprint xscreensaver xsl xslt xulrunner xvid yahoo + yaz yv12 zeroconf zlib + -development" + +# aqua darcs kate qt3 qt4 skey + +APACHE2_MPMS="prefork" +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 + 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 rewrite setenvif so speling + status substitute unique_id userdir usertrack version vhost_alias + " + +INPUT_DEVICES="evdev keyboard mouse" + +VIDEO_CARDS="dummy fbdev radeon radeonhd svga vesa vga v4l" + +CAMERAS="adc65 agfa_cl20 aox ax203 barbie canon casio_qv clicksmart310 digigr8 \ + digita dimagev dimera3500 directory enigma13 fuji gsmart300 hp215 \ + iclick jamcam jd11 jl2005a jl2005c kodak_dc120 kodak_dc210 \ + kodak_dc240 kodak_dc3200 kodak_ez200 konica konica_qm150 largan \ + lg_gsm mars mustek panasonic_coolshot panasonic_dc1000 \ + panasonic_dc1580 panasonic_l859 pccam300 pccam600 polaroid_pdc320 \ + polaroid_pdc640 polaroid_pdc700 ptp2 ricoh ricoh_g3 samsung sierra \ + sipix_blink sipix_blink2 sipix_web2 smal sonix sony_dscf1 sony_dscf55 \ + soundvision spca50x sq905 st2205 stv0674 stv0680 sx330z template \ + topfield toshiba_pdrm11 tp6801" + +LIBREOFFICE_EXTENSIONS="presenter-console presenter-minimizer nlpsolver \ + pdfimport scripting-javascript" +# scripting-beanshell wiki-publisher + +#CURL_SSL="nss" + +PHP_TARGETS="php5-3" + +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 00000000..d67c3db0 --- /dev/null +++ b/config-archive/etc/portage/make.conf.dist @@ -0,0 +1,136 @@ +# 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" +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" + +MAKEOPTS="-j5" +#MAKEOPTS="-j1" + +GENTOO_MIRRORS="http://ftp.snt.utwente.nl/pub/os/linux/gentoo http://mirrors.sec.informatik.tu-darmstadt.de/gentoo/" +#GENTOO_MIRRORS="http://linux.rz.ruhr-uni-bochum.de/download/gentoo-mirror/ http://ftp.snt.utwente.nl/pub/os/linux/gentoo http://mirrors.sec.informatik.tu-darmstadt.de/gentoo/" +#GENTOO_MIRRORS="http://gentoo.mirror.web4u.cz/ ftp://ftp.wh2.tu-dresden.de/pub/mirrors/gentoo ftp://gentoo.mirror.dkm.cz/pub/gentoo/ ftp://mirror.bytemark.co.uk/gentoo/" + +PORT_LOGDIR=/var/log/portage + +PORTDIR_OVERLAY="/usr/local/portage" + +PORTAGE_RSYNC_OPTS="${PORTAGE_RSYNC_OPTS} --progress" + +PORTAGE_NICENESS=3 +AUTOCLEAN="yes" + +ACCEPT_LICENSE=" \ + DOOM3 \ + PUEL \ + RTCW \ + RTCW-ETEULA \ + dlj-1.1 \ + sun-bcla-java-vm \ + AdobeFlash-10 \ + AdobeFlash-10.1 \ + AdobeFlash-10.3 \ + AdobeFlash-11.x \ + skype-eula \ + skype-4.0.0.7-copyright \ + Oracle-BCLA-JavaSE \ +" + +EMERGE_DEFAULT_OPTS="--with-bdeps y --quiet-build=y --jobs=4 --load-average=10" +#EMERGE_DEFAULT_OPTS="--with-bdeps y" + +CONFIG_PROTECT="/usr/share/xsessions \ + /var/www/localhost/htdocs/phpmyadmin \ + /var/lib/samba/private \ + /var/www/localhost/htdocs/cacti \ + /var/www/ldap/htdocs/config \ + /var/www/ldap/htdocs/templates \ + /usr/share/genkernel/arch/x86 \ + /usr/share/config/kdm \ +" + +#CONFIG_PROTECT_MASK="/etc/init.d" + +FEATURES="parallel-fetch userpriv usersandbox" + +#FETCHCOMMAND="/usr/bin/wget -t 5 --passive-ftp -P \${DISTDIR} \${URI}" +#FETCHCOMMAND="mv -v \${DISTDIR}/.old/\${FILE} \${DISTDIR}/" + +#LINGUAS="ar bg cs da de el en en_GB en_US es es_ES es_MX fi fr fr_CA fy it ja he hsb hu la nn nn_NO no nds nl oc pl pt pt_BR pt_PT ru sv sv_SE tr uk vi zh_CN zh_HK zh_TW" +LINGUAS="de en en_GB en_US ru vi" + +# These are the USE flags that were used in addition to what is provided by the +# profile used for building. +USE="3dnow 3dnowext X Xaw3d a52 aac aalib acl acpi ads aim alsa altnburgcards + amr ao apache2 archive audiofile avahi bash-completion bazaar bluray branding bzip2 cairo + calendar caps cdda cddb cdparanoia cdr cgi cpudetection cscope css ctype cups curl + curlwrappers cvs dbase dbi dbus dga djvu doc dts dv dvb dvd dvdr dvdread eds examples + encode exif expat fam fastcgi ffmpeg fftw fits flac flatfile fltk fontconfig + foomaticdb ftp gconf gd gd-external geoip ggi gif gimp git glade glib gmp gnome gnome-keyring + gnustep gphoto2 gpm graphviz gsl gsm gstreamer gtk gtk3 gtkhtml handbook hal hscolour html iconv icu id3 id3tag idea + idn ieee1394 imagemagick imap imlib inifile ithreads java javascript + jabber jack java6 jbig jikes jingle jpeg jpeg2k json json-syck json-xs kde kdeenablefinal kdeprefix kerberos + keyring kig-scripting kpathsea lame latex lcms ldap libcaca + libnotify libsamplerate libwww live lm_sensors log4j logrotate lua lzma lzo mad meanwhile mercurial + midi mhash mmx mmxext mng modperl modplug motif mp3 mp4 mpeg mplayer msn mtp + musepack musicbrainz mysql mysqli nas nautilus ncurses next networkmanager nfs nis + nptl nsplugin nss numpy odbc ogg openal openexr opengl openssl opus pango par pch pcntl pcre pdf perl + perlsuid php plasma plotutils png policykit portaudio posix postgres postscript ppds projectm pulseaudio python quicktime real + rdesktop rle samba sasl sdl semantic-desktop session sharedmem sid simplexml sip skype slang slp smtp + sndfile soap sockets sox spamassassin speex spell sqlite sqlite3 srtp sse sse2 ssh + subversion svg sysvipc tetex theora threads thumbnail tidy timidity tiff + tools truetype twolame udev unicode usb v4l v4l2 vala vcd vidix video vim-syntax vorbis wav wavpack + wddx webdav webkit win32codecs wma wmf x264 xattr xcomposite xface xft xine + xinetd xml xmlrpc xmp xosd xpm xprint xscreensaver xsl xslt xulrunner xvid yahoo + yaz yv12 zeroconf zlib + -development" + +# aqua darcs kate qt3 qt4 skey + +APACHE2_MPMS="prefork" +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 + 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 rewrite setenvif so speling + status substitute unique_id userdir usertrack version vhost_alias + " + +INPUT_DEVICES="evdev keyboard mouse" + +VIDEO_CARDS="dummy fbdev radeon radeonhd svga vesa vga v4l" + +CAMERAS="adc65 agfa_cl20 aox ax203 barbie canon casio_qv clicksmart310 digigr8 \ + digita dimagev dimera3500 directory enigma13 fuji gsmart300 hp215 \ + iclick jamcam jd11 jl2005a jl2005c kodak_dc120 kodak_dc210 \ + kodak_dc240 kodak_dc3200 kodak_ez200 konica konica_qm150 largan \ + lg_gsm mars mustek panasonic_coolshot panasonic_dc1000 \ + panasonic_dc1580 panasonic_l859 pccam300 pccam600 polaroid_pdc320 \ + polaroid_pdc640 polaroid_pdc700 ptp2 ricoh ricoh_g3 samsung sierra \ + sipix_blink sipix_blink2 sipix_web2 smal sonix sony_dscf1 sony_dscf55 \ + soundvision spca50x sq905 st2205 stv0674 stv0680 sx330z template \ + topfield toshiba_pdrm11 tp6801" + +LIBREOFFICE_EXTENSIONS="presenter-console presenter-minimizer nlpsolver \ + pdfimport scripting-javascript" +# scripting-beanshell wiki-publisher + +#CURL_SSL="nss" + +PHP_TARGETS="php5-3" + +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 00000000..8c657daa --- /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/cups/subscriptions.conf b/cups/subscriptions.conf index d3fcb422..bf4e2378 100644 --- a/cups/subscriptions.conf +++ b/cups/subscriptions.conf @@ -1,3 +1,3 @@ # Subscription configuration file for CUPS v1.6.2 -# Written by cupsd on 2013-08-09 00:41 -NextSubscriptionId 184 +# Written by cupsd on 2013-09-04 19:57 +NextSubscriptionId 188 diff --git a/portage/make.conf b/portage/make.conf index ea679837..d67c3db0 100644 --- a/portage/make.conf +++ b/portage/make.conf @@ -128,3 +128,9 @@ PHP_TARGETS="php5-3" 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/portage/package.use b/portage/package.use index 0d44841e..edb49394 100644 --- a/portage/package.use +++ b/portage/package.use @@ -95,6 +95,8 @@ dev-python/pyopenssl -doc dev-python/PyQt4 assistant declarative multimedia qt3support script sql webkit xmlpatterns dev-ruby/hoe -doc +dev-ruby/racc -doc +dev-ruby/rake -doc dev-ruby/rdoc -doc dev-ruby/rubygems server diff --git a/portage/repos.conf/gentoo.conf b/portage/repos.conf/gentoo.conf new file mode 100644 index 00000000..8c657daa --- /dev/null +++ b/portage/repos.conf/gentoo.conf @@ -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/resolv.conf b/resolv.conf index 9a19004e..798c010b 100644 --- a/resolv.conf +++ b/resolv.conf @@ -1,4 +1,6 @@ -# Generated by net-scripts for interface eth0 -domain brehm-online.com -search home.brehm-online.com home.hennig-berlin.org brehm-online.com hennig-berlin.org uhu-banane.de -nameserver 10.12.11.1 +# Hand made by Frank Brehm +domain home.brehm-online.com +search home.brehm-online.com brehm-online.com hennig-berlin.org uhu-banane.de pb.local dc1.pb.local dc2.pb.local +#nameserver 10.12.11.1 +nameserver 192.168.178.30 +nameserver 192.168.178.89 -- 2.39.5