=== modified file 'conf/chroot.sh-amd64' --- conf/chroot.sh-amd64 2012-03-20 13:21:43 +0000 +++ conf/chroot.sh-amd64 2012-03-01 22:00:47 +0000 @@ -53,8 +53,6 @@ [[ -d var/portage/ccache ]] && \ trymount --bind /var/prosys/ccache/amd64 var/portage/ccache -[[ -f ./chroot_conf ]] && source ./chroot_conf - #trymount -t tmpfs -o size=3G tmpfs var/tmp #trymount -t tmpfs -o size=100M tmpfs tmp === modified file 'conf/chroot.sh-x86' --- conf/chroot.sh-x86 2012-03-20 13:21:43 +0000 +++ conf/chroot.sh-x86 2012-03-01 22:00:47 +0000 @@ -53,8 +53,6 @@ [[ -d var/portage/ccache ]] && \ trymount --bind /var/prosys/ccache/amd64 var/portage/ccache -[[ -f ./chroot_conf ]] && source ./chroot_conf - #trymount -t tmpfs -o size=7G tmpfs var/tmp #trymount -t tmpfs -o size=500M tmpfs tmp === modified file 'conf/gentoo_scripts/rebuild_stage3.sh' --- conf/gentoo_scripts/rebuild_stage3.sh 2012-03-20 13:21:43 +0000 +++ conf/gentoo_scripts/rebuild_stage3.sh 2012-01-18 17:27:32 +0000 @@ -2,24 +2,8 @@ emerge() { /usr/bin/emerge --quiet-build=y --verbose --keep-going $@ } -CB=/etc/portage/package.use/circlebreak -CB_SRC=/root/prosys/circlebreak -finalize_circlebreak() { - if [[ -f "$CB" ]]; then - rm "$CB" && \ - emerge -uDN @world || \ - return 1 - fi - return 0 -} - PS4='+\t \s> ' set -x - -if [[ -f "$CB_SRC" ]]; then - cp "$CB_SRC" "$CB" -fi - env-update && \ source /etc/profile && \ emerge portage ccache && \ @@ -27,7 +11,6 @@ gcc-config `gcc-config -l | awk '{p=$2} END{print p}'` && \ source /etc/profile && \ emerge -e @world && \ -finalize_circlebreak && \ emerge -n gentoolkit && \ /usr/bin/emerge --depclean && \ emerge @preserved-rebuild && \ === modified file 'conf/make.conf' --- conf/make.conf 2012-03-20 13:21:43 +0000 +++ conf/make.conf 2012-03-01 22:00:47 +0000 @@ -2,7 +2,7 @@ MAKEOPTS="-j6 -l7" LINGUAS="en cs" -FEATURES="sandbox usersandbox userpriv userfetch -ccache config-protect-if-modified parallel-fetch parallel-install -preserve-libs unknown-features-warn -news buildpkg" +FEATURES="sandbox usersandbox userpriv userfetch -ccache config-protect-if-modified parallel-fetch parallel-install -preserve-libs unknown-features-warn -news" GENTOO_MIRRORS=" ftp://ftp.fi.muni.cz/pub/linux/gentoo/ === modified file 'overlay/ccx-meta/base-x11/Manifest' --- overlay/ccx-meta/base-x11/Manifest 2012-03-20 13:21:43 +0000 +++ overlay/ccx-meta/base-x11/Manifest 2011-11-26 08:33:09 +0000 @@ -1,2 +1,1 @@ EBUILD base-x11-1.ebuild 669 RMD160 b2b32556c37d365c22d99009fa6bccc7fed0f1de SHA1 31feb3d02ef1ec699453b74a638c508bf520b9d4 SHA256 268ae7c284304d1efb573ede9beb8082a9119c27a19825622558d41fd4a409c6 -EBUILD base-x11-2.ebuild 673 RMD160 40ac6056afaa9e84569465fdc37736539c156e25 SHA1 810b3aaaa34fc3f78374524cced2a1704117fbcb SHA256 8d03e7286aeb237ff0090f7a44de9c244a2976f57ffb42ebfaaa2b2a37b9fb7e === removed file 'overlay/ccx-meta/base-x11/base-x11-2.ebuild' --- overlay/ccx-meta/base-x11/base-x11-2.ebuild 2012-03-20 13:21:43 +0000 +++ overlay/ccx-meta/base-x11/base-x11-2.ebuild 1970-01-01 00:00:00 +0000 @@ -1,44 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3 - -DESCRIPTION="" -HOMEPAGE="" -SRC_URI="" - -LICENSE="" -SLOT="0" -KEYWORDS="x86 amd64" -IUSE="" - -DEPEND="" -RDEPEND=" -app-text/epdfview -app-text/zathura -media-gfx/comix -media-gfx/geeqie -media-gfx/scrot -media-gfx/xli -www-client/icecat -www-client/w3m -www-client/luakit -x11-apps/mesa-progs -x11-base/xorg-x11 -x11-misc/dmenu -x11-misc/dzen -x11-misc/numlockx -x11-misc/parcellite -x11-misc/slim -x11-misc/sux -x11-misc/trayer -x11-misc/xscreensaver -x11-terms/eterm -x11-terms/rxvt-unicode -x11-wm/fluxbox -x11-wm/xmonad -x11-wm/xmonad-contrib -lxde-base/lxappearance -" - === modified file 'scripts/elogread.py' --- scripts/elogread.py 2012-03-20 13:21:43 +0000 +++ scripts/elogread.py 2012-01-18 00:23:46 +0000 @@ -3,7 +3,6 @@ import re import argparse from collections import namedtuple, deque -from pprint import pprint RE_PACKAGE = re.compile( r"^>>> Messages generated by process (\d+) on (.+) for package ([^:]+):" @@ -46,11 +45,8 @@ self.parse_line(line.rstrip('\n')) parser = argparse.ArgumentParser() -parser.add_argument('--ignore-other', action='store_true', - help="Ignore errors in phase 'other' which seems to mean unmet" - " dependendencies") parser.add_argument('action', choices=[ - 'dump', 'errors' + 'errors' ]) parser.add_argument('logfile', type=argparse.FileType('r'), help='summary.log file') @@ -60,16 +56,8 @@ packages = ElogSummaryParser(args.logfile).packages if args.action == 'errors': for pkg in packages: - if any(( - True for msg in pkg.messages - if msg.cls == 'ERROR' and ( - not args.ignore_other or msg.phase != 'other' - ) - )): + if any(( True for msg in pkg.messages if msg.cls == 'ERROR' )): print pkg.package - elif args.action == 'dump': - for pkg in packages: - pprint(pkg) else: print "unknown action %r"%args.action === modified file 'scripts/mask_failed_packages' --- scripts/mask_failed_packages 2012-03-20 13:21:43 +0000 +++ scripts/mask_failed_packages 2012-01-18 00:23:46 +0000 @@ -5,12 +5,11 @@ set -x mask=$1/etc/portage/package.mask [[ -d $mask ]] && mask=$mask/failed -pkg_list="$( ${0:h}/elogread.py --ignore-other errors $1/var/log/portage/elog/summary.log | sort -u )" -pkg_arr=( ${(f)pkg_list} ) -for pkg in $pkg_arr ; do +for pkg in ${(f)$( \ + ${0:h}/elogread.py errors $1/var/log/portage/elog/summary.log )} +do if ! [[ -d $1/var/db/pkg/$pkg ]] then atom="=$pkg" grep -qFwe $atom $mask || echo $atom >> $mask - fi done === modified file 'stagebuilder.pl' --- stagebuilder.pl 2012-03-20 13:21:43 +0000 +++ stagebuilder.pl 2012-03-09 13:35:26 +0000 @@ -22,7 +22,6 @@ downloads_dir(Work +/+ downloads) :- work_dir(Work). stages_dir(Work +/+ stages ) :- work_dir(Work). script_dir(Work +/+ scripts ) :- work_dir(Work). - package_dir(Work +/+ packages ) :- work_dir(Work). %%%%%%%%%%%%%%%%%%%%%%%%% % Shell code generation % @@ -224,11 +223,10 @@ package_world('ccx-meta/base-x11'), package_use('dev-libs/libxml2 python'), package_use('x11-libs/libdrm libkms'), - circlebreak_use('net-print/cups -filters'), % break circular dependency with foomatic - circlebreak_use('dev-lang/python -tk') % break circular dependency with dev-tcltk/blt and xcb + package_use('net-print/cups -filters') % break circular dependency with foomatic ], [ '256-color', 'X', apng, cairo, exif, gif, gstreamer, gtk, imlib, jpeg, - opengl, png, sdl, 'sdl-image', tcl, tk, tiff, truetype, webkit, xcb, xpm, g3dvl + opengl, png, sdl, 'sdl-image', tcl, tk, tiff, truetype, webkit, xcb, xpm ]). gentoo_package(filesystem_utilities, [ package_world('ccx-meta/filesystem-utilities') @@ -331,7 +329,7 @@ echo_append(String, '/etc/portage/package.unmask') ). echo_package(package_use(String), - echo_append(String, '/etc/portage/package.use/prosys') + echo_append(String, '/etc/portage/package.use') ). echo_package(package_keywords(String), echo_append(String, '/etc/portage/package.keywords') @@ -339,9 +337,6 @@ echo_package(package_world(String), echo_append(String, '/root/prosys/world') ). -echo_package(circlebreak_use(String), - echo_append(String, '/root/prosys/circlebreak') - ). extract_package_echo([ ], [ ]). extract_package_echo([Pkg|Rest], List) :- @@ -380,7 +375,7 @@ {join(' ', Packages, PackagesJoined)}, [ comment('configure packages: ' + PackagesJoined), echo_append('USE="' + JoinedUse + '"', Make_conf), - run([mkdir, '-p', Dir +/+ 'etc/portage/package.use']) + run([mkdir, '-p', Dir +/+ 'etc/portage/']) ], { format_package_use(Packages, JoinedUse), gentoo_package_echos(Packages, Dir, Commands), @@ -432,11 +427,7 @@ {gentoo_stage(Name, ArchName, _)}, download_gentoo_stage(Tarball, Name), prepend([comment('prepare build directory') - ,run([mkdir, '-p' - ,Dir +/+ 'usr/portage' - ,Dir +/+ 'var/portage/ccache' - ,Dir +/+ 'var/portage/packages' - ]) + ,run([mkdir, '-p', Dir +/+ 'usr/portage', Dir +/+ 'var/portage/ccache']) ]), unpack_tarball(Tarball, Dir), create_chroot_script(Dir, ArchName), @@ -455,17 +446,6 @@ set_timezone(Dir, 'Europe/Prague'), set_locale(Dir, 'en_US.UTF-8'). -gentoo_create_pkgdir(Name, Dir) --> - {package_dir(PkgDir)}, - [comment('prepare binpkg directory'), - run(['mkdir', '-p', PkgDir +/+ Name]), - echo_append('trymount --bind ' + - PkgDir +/+ Name + - ' var/portage/packages', - Dir +/+ chroot_conf - ) - ]. - gentoo_build_stage3(Name, Dir) --> get_portage_timestamp(Dir, PortageVer), [chroot(Dir, ['/root/prosys/rebuild_stage3.sh'])], @@ -614,7 +594,6 @@ run_append([cat, Site_conf], Make_conf) ]), {appendn(BaseName, '_stable', Name)}, - gentoo_create_pkgdir(Name, Dir), gentoo_build_stages(Name, Dir, StageMax, 0, _). target(Name, Dir) --> % testing @@ -628,7 +607,6 @@ run_append([cat, Site_conf], Make_conf) ]), {appendn(BaseName, '_testing', Name)}, - gentoo_create_pkgdir(Name, Dir), gentoo_build_stages(Name, Dir, StageMax, 1, _). gentoo_build_stages(Name, Dir, 3, 0, PortageVer) --> @@ -688,10 +666,8 @@ reset_make_conf(Dir, '-Os -march=prescott -pipe -fomit-frame-pointer' , '${CFLAGS}', 'i686-pc-linux-gnu'), prepend(AddCommands), - {dir_make_conf(Dir, Make_conf)}, - [echo_append('VIDEO_CARDS="dummy fbdev vesa intel"', Make_conf)], configure_gentoo_packages(Dir ,[ - portage22, vim, mc, nokit, + portage22, nopy3k, vim, mc, nokit, portage_utilities, base_utilities, base_system, base_network, network_utilities, filesystem_utilities,