diff --git a/bin/antimatter-digest b/bin/antimatter-digest new file mode 100755 index 0000000..d62a1f8 --- /dev/null +++ b/bin/antimatter-digest @@ -0,0 +1,28 @@ +#!/bin/sh + +. /etc/profile + +set -e + +TMPL_PATH="$(dirname "${0}")/antimatter" +HEADER_PATH="${TMPL_PATH}/antimatter.html.header" +FOOTER_PATH="${TMPL_PATH}/antimatter.html.footer" +ANTIMATTER="${ANTIMATTER:-antimatter}" + +( + cat "${HEADER_PATH}" + + # Upgradable packages + "${ANTIMATTER}" -u --quiet --extended --html + + # Dead packages (dropped by upstream) + "${ANTIMATTER}" -e --quiet --extended --html + + # New packages - temp disabled + # "${ANTIMATTER}" -n --quiet --extended --html + # cat "${FOOTER_PATH}" + +) | sed \ + -e "s|class='rt'|style='color: green;'|g" \ + -e "s|class='frompkg'|style='color: brown;'|g" \ + -e "s|class='topkg'|style='font-weight: bold; color: red;'|g" diff --git a/bin/antimatter/antimatter.html.footer b/bin/antimatter/antimatter.html.footer new file mode 100644 index 0000000..308b1d0 --- /dev/null +++ b/bin/antimatter/antimatter.html.footer @@ -0,0 +1,2 @@ + + diff --git a/bin/antimatter/antimatter.html.header b/bin/antimatter/antimatter.html.header new file mode 100644 index 0000000..53dd3c4 --- /dev/null +++ b/bin/antimatter/antimatter.html.header @@ -0,0 +1,27 @@ + + + + + diff --git a/bin/buildrc b/bin/buildrc index 61ce2d3..ed2ffe5 100644 --- a/bin/buildrc +++ b/bin/buildrc @@ -1,9 +1,15 @@ #!/bin/bash -# Emerge wrapper, uses matter lock file support to avoid -# concurrent execution + _exec_locked() { - snapshot_lock_file="/var/tmp/.emerge.snapshot.lock" - matter_lock_file="/var/tmp/.matter_resource.lock" + local tmp_dir="/var/tmp" + local lvm_snapshot_lock_file="/.entropy_locks/vg_chroots-lv_chroots-snapshot.lock" + local snapshot_lock_file="${tmp_dir}/.emerge.snapshot.lock" + local matter_lock_file="${tmp_dir}/.matter_resource.lock" + + if [ ! -d "${tmp_dir}" ]; then + echo "${tmp_dir} is missing, creating it..." >&2 + mkdir -p "${tmp_dir}" + fi flock -x -n "${matter_lock_file}" true rc=${?} @@ -15,7 +21,7 @@ _exec_locked() { echo "Snapshot lock file = ${snapshot_lock_file}" >&2 echo "Matter lock file = ${matter_lock_file}" >&2 echo >&2 - echo "this emerge instance will terminate NOW" >&2 + echo "This ${1} instance will terminate NOW" >&2 echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" >&2 echo >&2 return 1 @@ -24,21 +30,37 @@ _exec_locked() { ( flock -s -n 9 || { echo "Hello there," >&2; - echo "a chroot snapshot is in progress..." >%2; + echo "a chroot snapshot is in progress..." >&2; echo "Try again later." >&2; exit 1; } - # eval $(portageq envvar -v FETCHCOMMAND RESUMECOMMAND PORTAGE_RSYNC_OPTS) - # add bandwidth limit here + + flock -s --timeout=120 10 + if [ "${?}" != "0" ]; then + echo >&2 + echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" >&2 + echo "The LVM lock of the Backup Script is being held for 2 minutes" >&2 + echo "This should not happen. Please contact lxnay@sabayon.org and" >&2 + echo "stop any activity NOW. However, if you're in an emergency" >&2 + echo "Just rm ${lvm_snapshot_lock_file} and continue." >&2 + echo "Please note that this will cause inconsistent backups." >&2 + echo >&2 + echo "This instance will terminate NOW" >&2 + echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" >&2 + echo >&2 + exit 1 + fi + "${@}" exit ${?} - ) 9> "${snapshot_lock_file}" - return "${?}" + + ) 9> "${snapshot_lock_file}" 10>"${lvm_snapshot_lock_file}" + return ${?} fi } emerge() { - _exec_locked "/usr/bin/emerge" "${@}" + _exec_locked "/usr/bin/emerge" --quiet-build=y --oneshot "${@}" return ${?} } @@ -46,3 +68,6 @@ eit() { _exec_locked "/usr/bin/eit" "${@}" return ${?} } + +# Alias configuration +alias cosmos=/particles/cosmos/cosmos diff --git a/bin/bump_crossdev b/bin/bump_crossdev new file mode 100644 index 0000000..668b817 --- /dev/null +++ b/bin/bump_crossdev @@ -0,0 +1,20 @@ +#!/bin/bash + +ARCHES=( + armv7a-hardfloat-linux-gnueabi + armv7a-unknown-linux-gnueabi + armv6j-hardfloat-linux-gnueabi +) + +GCC_VER="--g ~4.7.3" +LIBC_VER="--l ~2.17" +K_VER="--k ~3.7" +BINUTILS_VER="--b =2.23*" + +for a in "${ARCHES[@]}"; do + # USE="-fortran" or glibc will fail to compile + USE="-fortran -gtk" crossdev -t "${a}" \ + -oS "/usr/local/portage" \ + -oO "/usr/local/portage" \ + ${GCC_VER} ${LIBC_VER} ${K_VER} ${BINUTILS_VER} || exit 1 +done diff --git a/bin/bump_injected_nvidia_drivers b/bin/bump_injected_nvidia_drivers index c2905be..24b7b06 100755 --- a/bin/bump_injected_nvidia_drivers +++ b/bin/bump_injected_nvidia_drivers @@ -2,12 +2,12 @@ . /sabayon/bin/kernels.inc -packages="~x11-drivers/nvidia-drivers-173.14.35" # ~x11-drivers/nvidia-drivers-96.43.20" -non_injected_packages="~x11-drivers/nvidia-userspace-173.14.35" # ~x11-drivers/nvidia-userspace-96.43.20" +packages="=x11-drivers/nvidia-drivers-173* =x11-drivers/nvidia-drivers-304*" +non_kernel_packages="=x11-drivers/nvidia-userspace-173* =x11-drivers/nvidia-userspace-304*" ETP_REPO="${ETP_REPO:-sabayon-limbo}" rm -rf /usr/portage/packages/x11-drivers/* -emerge -B ${non_injected_packages} || exit 1 +emerge -B ${non_kernel_packages} || exit 1 eit inject --to ${ETP_REPO} /usr/portage/packages/x11-drivers/* || exit 1 for kernel in $kernels; do diff --git a/bin/bump_kernel_package b/bin/bump_kernel_package index 2844ca1..0b9b75f 100755 --- a/bin/bump_kernel_package +++ b/bin/bump_kernel_package @@ -11,7 +11,7 @@ fi # build for latest kernel KERNEL_DIR="/usr/src/linux-${running_kernel}" emerge "${@}" || exit 1 echo -5 | etc-update -eit commit || exit 1 +eit add "${@}" || exit 1 for kernel in $kernels; do if [ "${kernel}" = "${running_kernel}" ]; then diff --git a/bin/bump_kernel_packages b/bin/bump_kernel_packages index 705ae5e..30d8fc4 100755 --- a/bin/bump_kernel_packages +++ b/bin/bump_kernel_packages @@ -1,108 +1,246 @@ #!/usr/bin/python2 -import sys -import subprocess + +import argparse +import atexit import os +import pwd +import subprocess +import shutil +import sys import tempfile -args = sys.argv[1:] - -only_injected = "--only-injected" in args -if only_injected: - args.remove("--only-injected") -do_spm_repo = "--no-spm-repo" not in args -if not do_spm_repo: - args.remove("--no-spm-repo") -keyslot = "--keyslot" in args -if keyslot: - args.remove("--keyslot") - -if len(args) < 3: - print("bump_kernel_tag_mods [--only-injected] [--no-spm-repo] [--keyslot]") - raise SystemExit(1) - -kernel_tag = args.pop(0) -compile_tag = args.pop(0) -source_repo = args.pop(0) -dest_repo = args.pop(0) - -sys.argv.append("--no-pid-handling") - -os.environ['KERNEL_DIR'] = "/usr/src/linux-" + compile_tag -os.environ['ETP_REPO'] = source_repo -import entropy.dep from entropy.server.interfaces import Server -srv = Server() -pkgs_map = {} -try: - repo = srv.open_repository(srv.repository()) - pkg_ids = repo.searchTaggedPackages(kernel_tag) - if not pkg_ids: - print("!!! no packages for kernel_tag") - injected_pkgs = [] - normal_pkgs = [] - for pkg_id in pkg_ids: - injected = repo.isInjected(pkg_id) - if injected: - injected_pkgs.append(pkg_id) - else: - normal_pkgs.append(pkg_id) - normal_atoms = [] - injected_atoms = [] - for lst, dst in ((normal_pkgs, normal_atoms), (injected_pkgs, injected_atoms)): - for pkg_id in lst: - if keyslot: - atom_str = entropy.dep.remove_tag_from_slot(repo.retrieveKeySlotAggregated(pkg_id)) - else: - atom_str = "~" + entropy.dep.remove_tag(repo.retrieveAtom(pkg_id)) - if do_spm_repo: - spm_repo = repo.retrieveSpmRepository(pkg_id) - if spm_repo is not None: - atom_str += "::" + spm_repo - dst.append(atom_str) -finally: - srv.shutdown() +import entropy.dep -if not only_injected: - if normal_atoms: - print("normal packages: %s" % (' '.join(normal_atoms),)) -if injected_atoms: - print("injected packages: %s" % (' '.join(injected_atoms),)) -if not (normal_atoms or injected_atoms): - print("nothing to do !!") - raise SystemExit(0) +if __name__ == "__main__": -if normal_atoms and not only_injected: - rc = subprocess.call(["emerge", "-av", "--keep-going"] + [x for x in normal_atoms]) - if rc != 0: - raise SystemExit(rc) - subprocess.call(["etc-update"], shell = True) - os.environ['ETP_REPO'] = dest_repo - rc = subprocess.call(["eit", "add"] + normal_atoms) - if rc != 0: - raise SystemExit(rc) + srv = Server() -if injected_atoms: - tmp_dir = tempfile.mkdtemp() - os.environ['PKGDIR'] = tmp_dir - rc = subprocess.call(["emerge", "-Bav", "--nodeps"] + [x for x in injected_atoms]) - if rc != 0: - raise SystemExit(rc) - tbz2s = [] - for category in os.listdir(tmp_dir): - path = os.path.join(tmp_dir, category) - if not os.path.isdir(path): - continue - for sub_file in os.listdir(path): - if not sub_file.endswith(".tbz2"): + def ValidString(arg): + if not arg: + raise ValueError("invalid string") + return arg + + def ValidRepository(arg): + if arg not in srv.repositories(): + raise ValueError("invalid repository %s" % (arg,)) + return arg + + parser = argparse.ArgumentParser( + description="Bump Kernel Packages for Entropy Server") + + parser.add_argument( + "query_version", metavar="", + help="the uname version to query", + type=ValidString) + parser.add_argument( + "build_version", metavar="", + help="the uname version to build packages for", + type=ValidString) + + parser.add_argument( + "build_repo", metavar="", + help="the repository to place packages into", + type=ValidRepository) + + parser.add_argument( + "--only-injected", action="store_true", default=False, + help="only consider injected packages") + parser.add_argument( + "--no-spm-repo", action="store_true", default=False, + help=("do not include the SPM repository suffix " + "in dependency atoms")) + parser.add_argument( + "--keyslot", action="store_true", default=False, + help=("do not use the exact package version but " + "rather key:slot")) + parser.add_argument( + "--canfail", action="store_true", default=False, + help="if emerge can fail and you want to ignore it") + + parser.add_argument( + "--non-interactive", action="store_true", default=False, + help="if set, the script will run in non-interactive mode") + + parser.add_argument( + "--disable-shell-wrap", action="store_true", default=False, + help="if set, the script will not source .bashrc") + + nsargs = parser.parse_args(sys.argv[1:]) + + known_multiple_injected_versions = set([ + "x11-drivers/nvidia-drivers:0", + "x11-drivers/ati-drivers:0", + ]) + + pkgs_map = {} + try: + + pkg_matches = {} + repository_ids = srv.repositories() + for repository_id in repository_ids: + repo = srv.open_repository(repository_id) + pkg_ids = repo.searchTaggedPackages(nsargs.query_version) + + for pkg_id in pkg_ids: + key_slot = repo.retrieveKeySlotAggregated(pkg_id) + obj = pkg_matches.setdefault(key_slot, set()) + obj.add((pkg_id, repository_id)) + + injected_pkgs = [] + normal_pkgs = [] + for key_slot, candidates in pkg_matches.items(): + candidate = srv.atom_match(key_slot + "#" + nsargs.query_version) + if candidate not in candidates: + print("%s (%s) not in candidates %s, skipping" % ( + candidate, key_slot, candidates)) continue - tbz2s.append(os.path.join(path, sub_file)) + pkg_id, repository_id = candidate + repo = srv.open_repository(repository_id) + if repo.isInjected(pkg_id): + injected_pkgs.append(candidate) + else: + normal_pkgs.append(candidate) - if tbz2s: - os.environ['ETP_REPO'] = dest_repo - rc = subprocess.call(["eit", "inject"] + tbz2s) + # address other injected pkgs, like older nvidia drivers + for other_candidate in candidates: + if other_candidate != candidate: + pkg_id, repository_id = other_candidate + repo = srv.open_repository(repository_id) + if repo.isInjected(pkg_id): + clean_key_slot = entropy.dep.remove_tag_from_slot( + key_slot) + # filter out packages that we know we don't handle multiple + # versions of them. + if clean_key_slot in known_multiple_injected_versions: + injected_pkgs.append(other_candidate) + + normal_atoms = [] + injected_atoms = [] + data = ( + (normal_pkgs, normal_atoms), + (injected_pkgs, injected_atoms) + ) + + spm = srv.Spm() + + for lst, dst in data: + for pkg_id, repository_id in lst: + repo = srv.open_repository(repository_id) + if nsargs.keyslot: + atom_str = entropy.dep.remove_tag_from_slot( + repo.retrieveKeySlotAggregated(pkg_id)) + else: + atom_str = "~" + entropy.dep.remove_tag( + repo.retrieveAtom(pkg_id)) + if not nsargs.no_spm_repo: + spm_repo = repo.retrieveSpmRepository(pkg_id) + if spm_repo is not None: + atom_str += "::" + spm_repo + + if not spm.match_package(atom_str): + print("%s not found in Portage, skipping" % (atom_str,)) + continue + + dst.append(atom_str) + finally: + srv.shutdown() + + if not nsargs.only_injected: + if normal_atoms: + print("normal packages: %s" % ( + " ".join(normal_atoms),)) + if injected_atoms: + print("injected packages: %s" % ( + " ".join(injected_atoms),)) + + if not (normal_atoms or injected_atoms): + print("nothing to do !!") + raise SystemExit(0) + + def clean_dirs(xdirs): + for directory in xdirs: + try: + shutil.rmtree(directory, True) + except shutil.Error: + pass + + dirs = [] + atexit.register(clean_dirs, dirs) + + os.environ['KERNEL_DIR'] = "/usr/src/linux-%s" % ( + nsargs.build_version,) + + portage_tmpdir = tempfile.mkdtemp( + dir="/var/tmp", prefix="bump_kernel_packages.portage_tmpdir") + os.chmod(portage_tmpdir, 0o775) + + try: + pass_s = pwd.getpwnam("portage") + os.chown(portage_tmpdir, pass_s.pw_uid, pass_s.pw_gid) + except KeyError: + pass + + dirs.append(portage_tmpdir) + os.environ["PORTAGE_TMPDIR"] = portage_tmpdir + cmd_prefix = "" + if not nsargs.disable_shell_wrap: + cmd_prefix = "test -e ~/.bashrc && source ~/.bashrc;" + + if normal_atoms and not nsargs.only_injected: + args = ["emerge", "-v", "--keep-going"] + if not nsargs.non_interactive: + args.append("-a") + args += [x for x in normal_atoms] + # emerge is a shell function in bashrc + rc = subprocess.call(cmd_prefix + " ".join(args), shell=True) + if rc != 0 and not nsargs.canfail: + raise SystemExit(rc) + subprocess.call(["/usr/sbin/etc-update"]) + + args = ["eit", "add", "--to", nsargs.build_repo] + if nsargs.non_interactive: + args.append("--quick") + + args += normal_atoms + # eit is a shell function in bashrc + rc = subprocess.call(cmd_prefix + " ".join(args), shell=True) if rc != 0: raise SystemExit(rc) -raise SystemExit(0) + if injected_atoms: + tmp_dir = tempfile.mkdtemp( + dir="/var/tmp", prefix="bump_kernel_packages") + dirs.append(tmp_dir) + os.environ['PKGDIR'] = tmp_dir + + args = ["emerge", "-Bv", "--nodeps", "--keep-going"] + if not nsargs.non_interactive: + args.append("-a") + args += [x for x in injected_atoms] + # emerge is a shell function in .bashrc + rc = subprocess.call(cmd_prefix + " ".join(args), shell=True) + if rc != 0 and not nsargs.canfail: + raise SystemExit(rc) + + tbz2s = [] + for category in os.listdir(tmp_dir): + path = os.path.join(tmp_dir, category) + if not os.path.isdir(path): + continue + for sub_file in os.listdir(path): + if not sub_file.endswith(".tbz2"): + continue + tbz2s.append(os.path.join(path, sub_file)) + + if tbz2s: + args = ["eit", "inject", "--to", nsargs.build_repo] + args += tbz2s + # eit is a shell function in bashrc + rc = subprocess.call(cmd_prefix + " ".join(args), shell=True) + if rc != 0: + raise SystemExit(rc) + + raise SystemExit(0) diff --git a/bin/bump_kernel_packages_inject b/bin/bump_kernel_packages_inject deleted file mode 100755 index eca3a8b..0000000 --- a/bin/bump_kernel_packages_inject +++ /dev/null @@ -1,80 +0,0 @@ -#!/usr/bin/python2 -import sys -import subprocess -import os -import tempfile - -args = sys.argv[1:] -do_spm_repo = "--no-spm-repo" not in args -if not do_spm_repo: - args.remove("--no-spm-repo") -keyslot = "--keyslot" in args -if keyslot: - args.remove("--keyslot") - -if len(args) < 3: - print("bump_kernel_tag_mods [--no-spm-repo] [--keyslot]") - raise SystemExit(1) - -kernel_tag = args.pop(0) -compile_tag = args.pop(0) -source_repo = args.pop(0) -dest_repo = args.pop(0) - -sys.argv.append("--no-pid-handling") - -os.environ['KERNEL_DIR'] = "/usr/src/linux-" + compile_tag -os.environ['ETP_REPO'] = source_repo -import entropy.dep -from entropy.server.interfaces import Server -srv = Server() -pkgs_map = {} -try: - repo = srv.open_repository(srv.repository()) - pkg_ids = repo.searchTaggedPackages(kernel_tag) - if not pkg_ids: - print("!!! no packages for kernel_tag") - - injected_atoms = [] - for pkg_id in injected_atoms: - atom_str = entropy.dep.remove_tag(repo.retrieveAtom(pkg_id)) - if do_spm_repo: - spm_repo = repo.retrieveSpmRepository(pkg_id) - if spm_repo is not None: - atom_str += "::" + spm_repo - injected_atoms.append(atom_str) - if keyslot: - injected_atoms = [entropy.dep.remove_tag_from_slot(repo.retrieveKeySlotAggregated(pkg_id)) for pkg_id in pkg_ids] - else: - injected_atoms = ["~" + entropy.dep.remove_tag(repo.retrieveAtom(pkg_id)) for pkg_id in pkg_ids] -finally: - srv.shutdown() - -if injected_atoms: - print("packages: %s" % (' '.join(injected_atoms),)) -else: - print("nothing to do !!") - raise SystemExit(0) - -tmp_dir = tempfile.mkdtemp() -os.environ['PKGDIR'] = tmp_dir -rc = subprocess.call(["emerge", "-Bav", "--keep-going"] + [x for x in injected_atoms]) -if rc != 0: - raise SystemExit(rc) -tbz2s = [] -for category in os.listdir(tmp_dir): - path = os.path.join(tmp_dir, category) - if not os.path.isdir(path): - continue - for sub_file in os.listdir(path): - if not sub_file.endswith(".tbz2"): - continue - tbz2s.append(os.path.join(path, sub_file)) - -if tbz2s: - os.environ['ETP_REPO'] = dest_repo - rc = subprocess.call(["eit", "inject"] + tbz2s) - if rc != 0: - raise SystemExit(rc) - -raise SystemExit(0) diff --git a/bin/bump_kernel_video_drivers b/bin/bump_kernel_video_drivers index 9bd87aa..9b8b149 100755 --- a/bin/bump_kernel_video_drivers +++ b/bin/bump_kernel_video_drivers @@ -7,7 +7,7 @@ . /sabayon/bin/kernels.inc -packages="~x11-drivers/nvidia-drivers-173.14.31 ~x11-drivers/nvidia-drivers-96.43.20" +packages="=x11-drivers/nvidia-drivers-173* =x11-drivers/nvidia-drivers-304* =x11-drivers/nvidia-drivers-313*" non_injected_packages="x11-drivers/nvidia-drivers x11-drivers/ati-drivers x11-drivers/xf86-video-virtualbox" general_purpose_packages="media-video/amdcccle" ETP_REPO="${ETP_REPO:-sabayon-limbo}" diff --git a/bin/bump_misc b/bin/bump_misc index 167c68b..7923dfd 100755 --- a/bin/bump_misc +++ b/bin/bump_misc @@ -3,41 +3,58 @@ # script that makes it easier to bump split packages # (and perhaps other fun stuff) -list="git subversion transmission" +. /sabayon/bin/buildrc || exit 2 + +list="git [sub]version [tra]nsmission" cmd="emerge -av" +default_overlay="sabayon-distro" +overlay= + +if [ "$1" = "--repo" ]; then + overlay=$2 + if [ -z "$overlay" ]; then + echo "--repo requires an argument" >&2 + exit 1 + fi + shift; shift +fi + +overlay=${overlay:-$default_overlay} what=$1 if [ -z "$what" ]; then - echo "What to compile? [$list]" + echo "What to compile? [ $list ]" read what fi case $what in git) $cmd \ - dev-vcs/git::sabayon-distro \ + dev-vcs/git::"$overlay" \ dev-vcs/git-cvs \ dev-vcs/git-gui-tools \ dev-vcs/git-subversion \ www-apps/gitweb ;; -subversion) +subversion|sub) $cmd \ - dev-vcs/subversion::sabayon-distro \ - dev-vcs/subversion-java + dev-vcs/subversion::"$overlay" \ + dev-vcs/subversion-java \ + www-apache/mod_dav_svn ;; -transmission) +transmission|tra) $cmd \ net-p2p/transmission-base \ net-p2p/transmission-cli \ net-p2p/transmission-daemon \ net-p2p/transmission-gtk \ net-p2p/transmission-qt4 \ - net-p2p/transmission::sabayon-distro + net-p2p/transmission::"$overlay" ;; *) echo "Excuse me, but I non capisco." >&2 + echo "Use --repo to use different overlay (default: $default_overlay)." >&2 [ -n "$1" ] && echo "Run without any parameter for interactive use." >&2 exit 1 esac diff --git a/bin/clean_old_injected_packages b/bin/clean_old_injected_packages new file mode 100755 index 0000000..03d4a94 --- /dev/null +++ b/bin/clean_old_injected_packages @@ -0,0 +1,91 @@ +#!/usr/bin/python + +import sys +sys.path.insert(0, "/usr/lib/matter") +sys.path.insert(0, "/usr/lib/entropy/lib") + +import os + +from entropy.server.interfaces import Server +from entropy.i18n import _ + +from matter.spec import SpecParser +import matter.binpms.entropysrv # plugin registration + + +PARTICLES_DIR = "/particles" + + +if __name__ == "__main__": + + # collect particles + particles = [] + for root, dirs, files in os.walk(PARTICLES_DIR): + for name in files: + if name.endswith(".particle"): + particles.append(os.path.join(root, name)) + + packages = set() + for particle in particles: + with open(particle, "r") as f: + spec = SpecParser(f) + data = spec.parse() + if not data: + continue + + if data.get("build-only", "no") != "yes": + continue + + drop_injected = data.get("drop-old-injected", "no") == "yes" + if not drop_injected: + continue + for p_packages in data.get("packages", []): + packages.update(p_packages) + + packages = sorted(packages) + + srv = Server() + for repository in srv.repositories(): + + repo = srv.open_repository(repository) + for package in packages: + + latest_package_id, _mrc = repo.atomMatch(package) + if latest_package_id == -1: + continue + + package_ids, _mrc = repo.atomMatch(package, multiMatch=True) + if not package_ids: + continue + + key_slots = set() + for package_id in package_ids: + key, slot = repo.retrieveKeySlot(package_id) + key_slots.add((key, slot)) + + key_slot_package_ids = set() + for key, slot in key_slots: + ks_package_ids = [x for x in repo.searchKeySlot(key, slot) \ + if repo.isInjected(x)] + key_slot_package_ids.update(ks_package_ids) + + key_slot_package_ids.discard(latest_package_id) + if key_slot_package_ids: + key_slot_package_ids = sorted(key_slot_package_ids) + atoms = [repo.retrieveAtom(x) for x in key_slot_package_ids] + atoms.sort() + + latest_atom = repo.retrieveAtom(latest_package_id) + srv.output("%s is the latest package" % (latest_atom)) + srv.output("removing old packages:") + for atom in atoms: + srv.output(" %s" % (atom,)) + resp = srv.ask_question("Really remove?") + if resp != _("Yes"): + continue + + srv.remove_packages( + repository, key_slot_package_ids) + srv.commit_repositories() + + srv.destroy() diff --git a/bin/get_preserved_libs b/bin/get_preserved_libs new file mode 100755 index 0000000..6f66cb9 --- /dev/null +++ b/bin/get_preserved_libs @@ -0,0 +1,126 @@ +#!/usr/bin/python + +import sys + +from _emerge.actions import load_emerge_config +import portage.dep + +settings, trees, mtimedb = load_emerge_config() +vardb = trees[settings["ROOT"]]["vartree"].dbapi + +linkmap = vardb._linkmap +reg = vardb._plib_registry + +reg.lock() +try: + plibdata = reg.getPreservedLibs() + + if plibdata: + sys.stdout.write("# list of bumped libraries:\n") + + for cpv, paths in plibdata.items(): + sys.stdout.write("%s\n" % (cpv,)) + for path in sorted(paths): + sys.stderr.write(" %s\n" % (path,)) + + if plibdata: + sys.stdout.write("# list of inverse deps:\n") + + # taken from display_preserved_libs.py, Portage + linkmap.rebuild() # can raise CommandNotFound + consumer_map = {} + search_for_owners = set() + for cpv in plibdata: + internal_plib_keys = set(linkmap._obj_key(f) for f in plibdata[cpv]) + for f in plibdata[cpv]: + if f in consumer_map: + continue + + consumers = [] + for c in linkmap.findConsumers(f): + # Filter out any consumers that are also preserved libs + # belonging to the same package as the provider. + if linkmap._obj_key(c) not in internal_plib_keys: + consumers.append(c) + consumers.sort() + consumer_map[f] = consumers + search_for_owners.update(consumers) + + owners = {} + for f in search_for_owners: + owner_set = set() + for owner in linkmap.getOwners(f): + owner_dblink = vardb._dblink(owner) + if owner_dblink.exists(): + owner_set.add(owner_dblink) + if owner_set: + owners[f] = owner_set + + all_preserved = set() + all_preserved.update(*plibdata.values()) + owners_map = {} + + for cpv in plibdata: + sys.stdout.write("%s\n" % (cpv,)) + samefile_map = {} + for f in plibdata[cpv]: + obj_key = linkmap._obj_key(f) + alt_paths = samefile_map.get(obj_key) + if alt_paths is None: + alt_paths = set() + samefile_map[obj_key] = alt_paths + alt_paths.add(f) + + for alt_paths in samefile_map.values(): + alt_paths = sorted(alt_paths) + for p in alt_paths: + sys.stderr.write(" - %s" % (p,)) + f = alt_paths[0] + consumers = consumer_map.get(f, []) + + consumers_non_preserved = [c for c in consumers + if c not in all_preserved] + if consumers_non_preserved: + # Filter the consumers that are preserved libraries, since + # they don't need to be rebuilt (see bug #461908). + consumers = consumers_non_preserved + + for c in consumers: + owner_pkgs = [] + if c in all_preserved: + # The owner is displayed elsewhere due to having + # its libs preserved, so distinguish this special + # case (see bug #461908). + owners_desc = "preserved" + else: + owner_cpvs = [x.mycpv for x in owners.get(c, [])] + owner_pkgs.extend(owner_cpvs) + owners_desc = ", ".join(owner_cpvs) + + sys.stderr.write(" used by %s (%s)\n" % (c, owners_desc)) + + for owner_pkg in owner_pkgs: + cp_slot = "%s:%s" % ( + portage.dep.dep_getkey("=" + owner_pkg), + vardb.aux_get(owner_pkg, ["SLOT"])[0] + ) + obj = owners_map.setdefault(cp_slot, set()) + obj.add(c) + + sys.stdout.flush() + sys.stderr.flush() + + if owners_map: + sys.stdout.write("# grouped list of rebuilds:\n") + + for owner_pkg in sorted(owners_map.keys()): + owner_files = sorted(owners_map[owner_pkg]) + sys.stdout.write("%s\n" % (owner_pkg,)) + for owner_file in owner_files: + sys.stderr.write(" %s\n" % (owner_file,)) + + sys.stdout.flush() + sys.stderr.flush() + +finally: + reg.unlock() diff --git a/bin/glsa-digest b/bin/glsa-digest new file mode 100755 index 0000000..d340b76 --- /dev/null +++ b/bin/glsa-digest @@ -0,0 +1,5 @@ +#!/bin/bash + +. /etc/profile + +exec /usr/bin/glsa-check --verbose --nocolor -t all diff --git a/bin/kernel-autobump b/bin/kernel-autobump new file mode 100755 index 0000000..3b6a21a --- /dev/null +++ b/bin/kernel-autobump @@ -0,0 +1,150 @@ +#!/bin/bash + +# Variables +REPO_PATH=${1} +PULL_REMOTE=${2} +PUSH_REMOTE=${3} +BRANCH=${4} +PREFIX=${5} +REGEX=${6} + +show_help() { + echo "${0} v" >&2 + echo "Example: ${0} ~/repos/kernel stable origin 3.12 sabayon- 3\.12\.[0-9999]" >&2 +} + +if [ ! -d "${REPO_PATH}" ]; then + show_help + exit 1 +fi + +if [ -z "${PULL_REMOTE}" ]; then + show_help + exit 1 +fi + +if [ -z "${PUSH_REMOTE}" ]; then + show_help + exit 1 +fi + +if [ -z "${BRANCH}" ]; then + show_help + exit 1 +fi + +if [ -z "${PREFIX}" ]; then + show_help + exit 1 +fi + +if [ -z "${REGEX}" ]; then + show_help + exit 1 +fi + +rollback() { + cd "${REPO_PATH}" || return 1 + git rebase --abort || true + git reset --hard "${PUSH_REMOTE}/${BRANCH}" || return 1 +} + +start() { + cd "${REPO_PATH}" || return 1 + + echo "Fetching ${PULL_REMOTE}" + git fetch --quiet "${PULL_REMOTE}" || { + rollback + return 1; + } + + echo "Fetching ${PUSH_REMOTE}" + git fetch --quiet "${PUSH_REMOTE}" || { + rollback + return 1; + } + + local tags=$(git tag | grep -e "v${REGEX}") + echo "Tracking tags:" + echo -e "${tags}" + if [ -z "${tags}" ]; then + echo "No tags to track for: ${REGEX} in ${REPO_PATH}" + return 0 + fi + + local bumps=() + local tag= tracked_tag= + for tag in ${tags}; do + tracked_tag="${PREFIX}${tag/v}" + echo "Checking tag: ${tag}, ${tracked_tag}" + if ! git tag | grep -q -e "^${tracked_tag}$"; then + echo "Not tracked: ${tag}, ${tracked_tag}" + bumps+=( "${tag}" ) + fi + done + + if [ -z "${bumps[*]}" ]; then + echo "Nothing to do." + return 0 + fi + + if ! git show-branch "${BRANCH}" > /dev/null; then + echo "Creating branch: ${BRANCH}" + git checkout -q "${PUSH_REMOTE}/${BRANCH}" -b "${BRANCH}" || { + rollback + return 1; + } + else + echo "Checking out branch: ${BRANCH}" + git checkout -q "${BRANCH}" || { + rollback + return 1; + } + fi + + echo "Updating branch" + git rebase --quiet "${PUSH_REMOTE}/${BRANCH}" || { + rollback + return 1; + } + + for tag in "${bumps[@]}"; do + echo "Working on tag: ${tag}" + git merge --quiet "${tag}" -m "Automatic merge of tag ${PULL_REMOTE}/${tag}" || { + rollback + return 1; + } + bash sabayon/bump-configs.sh || { + rollback + return 1; + } + + local changed=$(git ls-files -m -d -o --exclude-standard sabayon/config) + if [ -n "${changed}" ]; then + git commit --quiet sabayon/config -m "sabayon: bump configs" || { + rollback + return 1; + } + fi + + git push --quiet || { + rollback + return 1; + } + git push --quiet --tags || { + rollback + return 1; + } + + tracked_tag="${PREFIX}${tag/v}" + bash sabayon/tag-version.sh "${tracked_tag}" || { + rollback + return 1; + } + + echo "Released ${tracked_tag}" + done +} + + +start diff --git a/bin/kernel-autobump-tracker b/bin/kernel-autobump-tracker new file mode 100755 index 0000000..bff4769 --- /dev/null +++ b/bin/kernel-autobump-tracker @@ -0,0 +1,13 @@ +#!/bin/bash + +. /etc/profile + +cd $(dirname "${0}") || exit 1 + +# Tracked kernels +./kernel-autobump /home/fabio/repos/kernel stable origin 3.10 sabayon- "3\.10\.[0-9999]" +./kernel-autobump /home/fabio/repos/kernel stable origin 3.12 sabayon- "3\.12\.[0-9999]" +./kernel-autobump /home/fabio/repos/kernel stable origin 3.14 sabayon- "3\.14\.[0-9999]" +./kernel-autobump /home/fabio/repos/kernel stable origin 3.15 sabayon- "3\.15\.[0-9999]" +./kernel-autobump /home/fabio/repos/kernel stable origin 3.16 sabayon- "3\.16\.[0-9999]" +./kernel-autobump /home/fabio/repos/kernel stable origin 3.17 sabayon- "3\.17\.[0-9999]" diff --git a/bin/kernels.inc b/bin/kernels.inc index b2b90a4..97ee47b 100644 --- a/bin/kernels.inc +++ b/bin/kernels.inc @@ -1,2 +1,3 @@ -kernels="3.2.0-sabayon 3.3.0-sabayon 3.4.0-sabayon 3.5.0-sabayon 3.6.0-sabayon" -running_kernel="3.6.0-sabayon" +kernels="$(for d in $(find /usr/src -maxdepth 1 -name "linux-*-sabayon" -type d -print); do d=$(basename $d); echo ${d/linux-}; done | sort)" + +running_kernel="$(d=$(basename $(readlink /usr/src/linux)); echo ${d/linux-})" diff --git a/bin/matter-scheduler-chroot b/bin/matter-scheduler-chroot new file mode 100755 index 0000000..356bbb8 --- /dev/null +++ b/bin/matter-scheduler-chroot @@ -0,0 +1,33 @@ +#!/bin/bash + +safe_exec() { + echo "safe_exec: ${*}" + local tries=5 + + for ((i=0; i < ${tries}; i++)); do + "${@}" && return 0 + + if [ "${i}" = "0" ]; then + sleep 10 + continue + else + sleep 60 + continue + fi + done + return 1 +} + +cd "${PARTICLES_DIR}" || exit 1 +safe_exec git pull || exit 1 +cd "${BUILD_GIT_DIR}" || exit 1 +safe_exec git pull || exit 1 + +particles=$(find "${PARTICLES_DIR}" -name "*.particle" | sort) +if [ -n "${particles}" ]; then + /usr/sbin/env-update + . /etc/profile + matter ${MATTER_ARGS} ${particles} + exit ${?} +fi +exit 1 diff --git a/bin/sshd_wrapper b/bin/sshd_wrapper new file mode 100755 index 0000000..7ea8331 --- /dev/null +++ b/bin/sshd_wrapper @@ -0,0 +1,3 @@ +#!/bin/bash + +exec /usr/sbin/sshd -e "${@}" 2> /.sshd.log diff --git a/conf/armarch/portage/package.keywords/package.keywords b/conf/armarch/portage/package.keywords/package.keywords new file mode 100644 index 0000000..0647f0d --- /dev/null +++ b/conf/armarch/portage/package.keywords/package.keywords @@ -0,0 +1,111 @@ +# Only use stable versions of these libs +sys-kernel/linux-headers -~arm +sys-libs/glibc -~arm +=sys-libs/glibc-2.17* ~arm +sys-fs/udev-171-r5 diff --git a/conf/armarch/portage/package.unmask/package.unmask b/conf/armarch/portage/package.unmask/package.unmask new file mode 100644 index 0000000..baa2347 --- /dev/null +++ b/conf/armarch/portage/package.unmask/package.unmask @@ -0,0 +1,4 @@ +# Unmask GNOME 3.8 +=dev-libs/glib-2.36* +=dev-libs/gobject-introspection-common-1.36* +=dev-libs/gobject-introspection-1.36* diff --git a/conf/armv7l/portage/package.use/00-sabayon.package.use b/conf/armarch/portage/package.use/00-sabayon.package.use similarity index 72% rename from conf/armv7l/portage/package.use/00-sabayon.package.use rename to conf/armarch/portage/package.use/00-sabayon.package.use index 83de0aa..71c7c7c 100644 --- a/conf/armv7l/portage/package.use/00-sabayon.package.use +++ b/conf/armarch/portage/package.use/00-sabayon.package.use @@ -3,6 +3,7 @@ dev-lang/python sqlite sys-apps/file python dev-libs/boost python dev-db/sqlite soundex +sys-libs/glibc suid nscd # GCC sys-devel/gcc gcj objc objc-gc objc++ graphite @@ -20,7 +21,7 @@ media-libs/freetype auto-hinter media-gfx/imagemagick truetype fontconfig corefonts png # Required by several stuff -sys-auth/pambase consolekit +sys-auth/pambase -consolekit systemd sys-auth/consolekit policykit # doesn't compile with epoll @@ -33,7 +34,8 @@ dev-libs/libxml2 icu xfce-base/xfce4-session policykit udev # required by xfce4 and upower stuff # extras is required by net-wireless/bluez -sys-fs/udev gudev extras +sys-apps/systemd -gtk plymouth cryptsetup static-libs lzma xattr openrc gudev extras hwdb keymap +virtual/udev hwdb gudev keymap # LXDE stuff x11-misc/obconf lxde @@ -42,7 +44,9 @@ x11-misc/obconf lxde media-libs/imlib2 X # Firefox stuff -media-libs/libpng apng +# -neon: /usr/lib/libpng16.so.16: undefined symbol: png_read_filter_row_avg4_neon +media-libs/libpng apng -neon +www-client/chromium -system-ffmpeg # Language packs! sys-apps/man-pages -linguas_da -linguas_de -linguas_fr -linguas_it -linguas_ja -linguas_nl -linguas_pl -linguas_ro -linguas_ru -linguas_zh_CN @@ -69,15 +73,29 @@ sys-apps/man-pages -linguas_da -linguas_de -linguas_fr -linguas_it -linguas_ja - #app-text/hunspell linguas_te linguas_th linguas_tr linguas_uk linguas_vi linguas_zh # KDE stuff -x11-libs/qt-core qt3support ssl +app-text/poppler qt4 +dev-qt/qtcore qt3support ssl +dev-qt/qtsql qt3support mysql +dev-qt/qtgui qt3support mng +dev-qt/qtopengl qt3support +dev-qt/qthelp qt3support +dev-qt/qtdeclarative qt3support +dev-qt/qtdemo qt3support +dev-qt/qtwebkit icu +kde-base/kdepimlibs semantic-desktop +kde-base/kdelibs semantic-desktop opengl +kde-base/kwin opengl gles +dev-python/PyQt4 script svg declarative sql webkit X +kde-base/kde-l10n linguas_be linguas_csb linguas_ne linguas_th linguas_wa # GNOME stuff +app-accessibility/orca python_targets_python3_3 +app-crypt/gcr gtk app-text/poppler cairo -sys-fs/udev hwdb +app-text/poppler-glib cairo sys-apps/pciutils -zlib -gnome-base/gvfs cdda +gnome-base/gvfs cdda gtk x11-libs/gdk-pixbuf jpeg -x11-libs/qt-core -qt3support sys-apps/dbus X net-libs/gtk-vnc gtk3 net-print/cups dbus @@ -86,12 +104,17 @@ gnome-base/gvfs gdu gnome-base/gnome-settings-daemon packagekit policykit gnome-base/gconf policykit net-im/empathy gnome-online-accounts +net-im/mcabber otr mail-client/evolution networkmanager x11-libs/gtk+ X gnome-base/gnome-menus python # required by Sulfur x11-libs/vte:0 python -dev-libs/folks eds +dev-libs/folks eds vala +gnome-extra/evolution-data-server vala +app-i18n/ibus dconf +# required by sabayon-artwork-gnome +x11-themes/elementary-icon-theme monochrome # MATE stuff app-arch/mate-file-archiver caja @@ -108,7 +131,7 @@ app-text/mate-document-viewer caja mate mate-keyring app-office/libreoffice -nsplugin -gnome -java templates -kde pdfimport # Multimedia! -media-libs/libsdl X opengl +media-libs/libsdl directfb X opengl media-libs/sdl-image gif jpeg png media-video/mplayer jpeg png pulseaudio -dvdnav media-video/mplayer2 jpeg png pulseaudio -cpudetection -dvdnav @@ -138,13 +161,55 @@ media-libs/evas X dev-python/pygobject cairo # Do not user thread worker -=sys-apps/portage-2.2.0_alpha142 +>sys-libs/glibc-2.16.9999 diff --git a/conf/armv5tel/repo/sabayonlinux.org/packages.db.fallback_mirrors b/conf/armv5tel/repo/sabayonlinux.org/packages.db.fallback_mirrors new file mode 100644 index 0000000..4e5447d --- /dev/null +++ b/conf/armv5tel/repo/sabayonlinux.org/packages.db.fallback_mirrors @@ -0,0 +1,6 @@ +# Our fallback mirror is pkg.sabayon.org +pkg.sabayon.org +best.sabayon.org +dl.sabayon.org +r.sabayon.org +redir.sabayon.org diff --git a/conf/armv5tel/repo/sabayonlinux.org/packages.db.keywords b/conf/armv5tel/repo/sabayonlinux.org/packages.db.keywords new file mode 100644 index 0000000..c2229fd --- /dev/null +++ b/conf/armv5tel/repo/sabayonlinux.org/packages.db.keywords @@ -0,0 +1,129 @@ +app-accessibility/at-spi2-core ~arm +app-accessibility/caribou ~arm +app-admin/apg ~arm +app-admin/packagekit ~arm +app-admin/packagekit-gtk ~arm +app-crypt/seahorse ~arm +app-editors/gedit ~arm +app-misc/geoclue ~arm +app-office/abiword ~arm +app-text/libexttextcat ~arm +app-text/libwpd ~arm +app-text/libwpg ~arm +app-text/libwps ~arm +app-text/mythes ~arm +app-text/tofrodos ~arm +app-txt/epdfview ~arm +dev-libs/folks ~arm +dev-libs/gjs ~arm +dev-libs/hyphen ~arm +dev-libs/json-glib ~arm +dev-libs/libgdata ~arm +dev-libs/libpeas ~arm +dev-python/pyatspi ~arm +dev-util/itstool ~arm +dev-util/mdds ~arm +games-board/aisleriot ~arm +gnome-base/gnome-core-libs ~arm +gnome-base/gnome-keyring ~arm +gnome-base/gnome-session ~arm +gnome-base/libgnome-keyring ~arm +gnome-extra/avant-window-navigator ~arm +gnome-extra/gnome-games ~arm +gnome-extra/gnome-power-manager ~arm +gnome-extra/gnome-screensaver ~arm +gnome-extra/gnome-system-monitor ~arm +gnome-extra/nm-applet ~arm +gnome-extra/yelp-xsl ~arm +media-gfx/eog ~arm +media-gfx/shotwell ~arm +media-libs/clutter ~arm +media-libs/clutter-gtk ~arm +media-libs/cogl ~arm +media-libs/gexiv2 ~arm +media-libs/libbluray ~arm +media-libs/libchamplain ~arm +media-libs/libgnome-media-profiles ~arm +media-libs/libgphoto2 ~arm +media-libs/libprojectm ~arm +media-libs/libraw ~arm +media-libs/memphis ~arm +media-libs/sdl-gfx ~arm +media-libs/sdl-sound ~arm +media-libs/vigra ~arm +media-plugins/gst-plugins-cdparanoia ~arm +media-plugins/gst-plugins-lame ~arm +media-sound/sound-juicer ~arm +media-video/cheese ~arm +media-video/gnome-video-effects ~arm +net-im/telepathy-connection-managers ~arm +net-im/telepathy-logger ~arm +net-im/telepathy-mission-control ~arm +net-libs/gtk-vnc ~arm +net-libs/libmicrohttpd ~arm +net-libs/liboauth ~arm +net-libs/rest ~arm +net-libs/telepathy-farsight ~arm +net-misc/vinagre ~arm +sci-libs/colamd ~arm +sci-libs/hdf5 ~arm +sci-libs/ufconfig ~arm +sci-mathematics/lpsolve ~arm +sys-apps/ifplugd ~arm +sys-apps/lsb-release ~arm +sys-apps/portage ~arm +virtual/ffmpeg ~arm +x11-libs/libdesktop-agnostic ~arm +x11-libs/mx ~arm +x11-themes/gnome-icon-theme-extras ~arm +x11-themes/sabayon-artwork-loo ~arm +lxde-base/lxpolkit ~arm +xfce-extra/xfce4-notifyd ~arm +app-accessibility/at-spi2-core ~arm +net-libs/liboauth ~arm +media-libs/libraw ~arm +dev-util/itstool ~arm +dev-libs/json-glib ~arm +media-plugins/gst-plugins-lame ~arm +media-video/gnome-video-effects ~arm +app-admin/apg ~arm +net-im/telepathy-connection-managers ~arm +sys-apps/lsb-release ~arm +gnome-base/gnome ~arm +dev-libs/eeze ~arm +net-libs/gnome-online-accounts ~arm +gnome-base/gnome-core-apps ~arm +gnome-extra/gnome-tweak-tool ~arm +gnome-extra/nm-applet ~arm +dev-libs/efreet ~arm +media-libs/evas ~arm +x11-wm/muffin ~arm +gnome-extra/yelp ~arm +media-libs/edje ~arm +gnome-extra/gnome-contacts ~arm +media-video/totem ~arm +net-im/empathy ~arm +net-wireless/gnome-bluetooth ~arm +dev-libs/eina ~arm +gnome-base/gnome-shell ~arm +gnome-extra/sushi ~arm +sys-devel/make ~arm +dev-libs/ecore ~arm +gnome-base/gdm ~arm +x11-wm/mutter ~arm +gnome-extra/evolution-data-server ~arm +dev-libs/e_dbus ~arm +gnome-base/gnome-fallback ~arm +www-client/epiphany ~arm +dev-libs/eet ~arm +gnome-base/gnome-control-center ~arm +dev-libs/embryo ~arm +gnome-extra/nemo ~arm +x11-libs/libdesktop-agnostic ~arm +media-libs/libprojectm ~arm +x11-themes/gtk-engines-murrine ~arm +www-servers/nginx ~arm +media-libs/vigra ~arm +gnome-extra/nemo ~arm +x11-wm/muffin ~arm +x11-themes/murrine-themes ~arm diff --git a/conf/armv5tel/repo/sabayonlinux.org/packages.db.mirrors b/conf/armv5tel/repo/sabayonlinux.org/packages.db.mirrors new file mode 100644 index 0000000..e8275eb --- /dev/null +++ b/conf/armv5tel/repo/sabayonlinux.org/packages.db.mirrors @@ -0,0 +1,8 @@ +# these are all the same +http://dl.sabayon.org/entropy +http://best.sabayon.org/entropy +http://redir.sabayon.org/entropy +# This will be used as last resort, and must stay here +http://pkg.sabayon.org +# this is in case our DNS goes down +http://na.mirror.garr.it/mirrors/sabayonlinux/entropy diff --git a/conf/armv5tel/repo/sabayonlinux.org/packages.db.system_mask b/conf/armv5tel/repo/sabayonlinux.org/packages.db.system_mask new file mode 100644 index 0000000..4d24d97 --- /dev/null +++ b/conf/armv5tel/repo/sabayonlinux.org/packages.db.system_mask @@ -0,0 +1,15 @@ +app-admin/equo +app-misc/sabayon-version +dev-db/sqlite +sys-apps/entropy +sys-devel/base-gcc:4.7 +sys-libs/db:4.8 +virtual/cron +# virtual/linux-binary +sys-auth/pambase + +# glibc cannot be removed, it's part of the system +# nowadays it's not even a system pkg because +# virtual/libc wraps it. +# This makes sure we always block glibc +sys-libs/glibc diff --git a/conf/armv5tel/repo/sabayonlinux.org/packages.db.webservices b/conf/armv5tel/repo/sabayonlinux.org/packages.db.webservices new file mode 100644 index 0000000..3059b1e --- /dev/null +++ b/conf/armv5tel/repo/sabayonlinux.org/packages.db.webservices @@ -0,0 +1 @@ +https://packages.sabayon.org/service diff --git a/conf/armv6l/portage/make.conf b/conf/armv6l/portage/make.conf new file mode 100644 index 0000000..077e6d5 --- /dev/null +++ b/conf/armv6l/portage/make.conf @@ -0,0 +1,43 @@ +CFLAGS="-O2 -pipe -march=armv6j -mfpu=vfp -mfloat-abi=hard" +CXXFLAGS="${CFLAGS}" +CHOST="armv6j-hardfloat-linux-gnueabi" + +### COMMON PART (besides USE=neon) +################################################# +# Portage configuration +ACCEPT_KEYWORDS="arm ~arm" +FEATURES="ccache distcc parallel-fetch protect-owned compressdebug splitdebug" +# temp disabled: distcc-pump +MAKEOPTS="-j6 -s" +CCACHE_SIZE="5G" +CCACHE_DIR="/var/ccache" +# Global USE flags +USE="cpudetection cups goom joystick jpeg opengl png svg theora fontconfig truetype xvid" +# Sound USE flags +USE="${USE} pulseaudio alsa flac mp3 vorbis ogg" +# System USE flags +USE="${USE} -consolekit dbus introspection logind perl policykit python systemd threads udev xattr xcb" +# Video OpenGL stuff +# Note: GLES2 is disabled globally atm. mesa-9.1.2 has bugs if both gl, and gles2 are enabled. +# The bug is in the GL{ES2,} headers (name clash), and gnome-shell fails to build because of that. +USE="${USE} -gles2" + +LINGUAS="en en_US af ar az bg bn br bs ca cs cy da de el en_GB eo es et eu fa fi fr" +LINGUAS="${LINGUAS} fy ga gl he hi hr hu ia is it ja kk km ko lt lv mk mn ms nb nds nl" +LINGUAS="${LINGUAS} nn pa pl pt pt_BR ro ru rw se si sk sl sr sr@Latn ss sv ta tg tr uk" +LINGUAS="${LINGUAS} uz vi zh_CN zh_TW es_AR es_ES fy_NL ga_IE gu gu_IN nb_NO nn_NO pt_PT sv_SE ug zh" + +# distcc configuration +DISTCC_HOSTS="localhost/1 172.16.255.1/5" +# DISTCC_VERBOSE=1 + +# Package specific configuration +APACHE2_MPMS="prefork" +# No Python3 Noooo +PYTHON_TARGETS="python2_7" +USE_PYTHON="2.7" + +################################################# +### END COMMON PART -- cut here + +source /var/lib/layman/make.conf diff --git a/conf/armv6l/portage/package.keywords b/conf/armv6l/portage/package.keywords new file mode 120000 index 0000000..a75be88 --- /dev/null +++ b/conf/armv6l/portage/package.keywords @@ -0,0 +1 @@ +../../armarch/portage/package.keywords \ No newline at end of file diff --git a/conf/armv6l/portage/package.license b/conf/armv6l/portage/package.license new file mode 120000 index 0000000..23284d2 --- /dev/null +++ b/conf/armv6l/portage/package.license @@ -0,0 +1 @@ +../../armarch/portage/package.license \ No newline at end of file diff --git a/conf/armv6l/portage/package.mask b/conf/armv6l/portage/package.mask new file mode 120000 index 0000000..4e5ec8d --- /dev/null +++ b/conf/armv6l/portage/package.mask @@ -0,0 +1 @@ +../../armarch/portage/package.mask \ No newline at end of file diff --git a/conf/armv6l/portage/package.unmask b/conf/armv6l/portage/package.unmask new file mode 120000 index 0000000..852343a --- /dev/null +++ b/conf/armv6l/portage/package.unmask @@ -0,0 +1 @@ +../../armarch/portage/package.unmask \ No newline at end of file diff --git a/conf/armv6l/portage/package.use b/conf/armv6l/portage/package.use new file mode 120000 index 0000000..5637cdd --- /dev/null +++ b/conf/armv6l/portage/package.use @@ -0,0 +1 @@ +../../armarch/portage/package.use \ No newline at end of file diff --git a/conf/armv6l/repo/sabayonlinux.org/packages.db.critical b/conf/armv6l/repo/sabayonlinux.org/packages.db.critical new file mode 100644 index 0000000..6374c23 --- /dev/null +++ b/conf/armv6l/repo/sabayonlinux.org/packages.db.critical @@ -0,0 +1,3 @@ +sys-devel/base-gcc:4.7 +>=sys-apps/portage-2.2.0_alpha142 +>sys-libs/glibc-2.16.9999 diff --git a/conf/armv6l/repo/sabayonlinux.org/packages.db.fallback_mirrors b/conf/armv6l/repo/sabayonlinux.org/packages.db.fallback_mirrors new file mode 100644 index 0000000..4e5447d --- /dev/null +++ b/conf/armv6l/repo/sabayonlinux.org/packages.db.fallback_mirrors @@ -0,0 +1,6 @@ +# Our fallback mirror is pkg.sabayon.org +pkg.sabayon.org +best.sabayon.org +dl.sabayon.org +r.sabayon.org +redir.sabayon.org diff --git a/conf/armv6l/repo/sabayonlinux.org/packages.db.keywords b/conf/armv6l/repo/sabayonlinux.org/packages.db.keywords new file mode 100644 index 0000000..c2229fd --- /dev/null +++ b/conf/armv6l/repo/sabayonlinux.org/packages.db.keywords @@ -0,0 +1,129 @@ +app-accessibility/at-spi2-core ~arm +app-accessibility/caribou ~arm +app-admin/apg ~arm +app-admin/packagekit ~arm +app-admin/packagekit-gtk ~arm +app-crypt/seahorse ~arm +app-editors/gedit ~arm +app-misc/geoclue ~arm +app-office/abiword ~arm +app-text/libexttextcat ~arm +app-text/libwpd ~arm +app-text/libwpg ~arm +app-text/libwps ~arm +app-text/mythes ~arm +app-text/tofrodos ~arm +app-txt/epdfview ~arm +dev-libs/folks ~arm +dev-libs/gjs ~arm +dev-libs/hyphen ~arm +dev-libs/json-glib ~arm +dev-libs/libgdata ~arm +dev-libs/libpeas ~arm +dev-python/pyatspi ~arm +dev-util/itstool ~arm +dev-util/mdds ~arm +games-board/aisleriot ~arm +gnome-base/gnome-core-libs ~arm +gnome-base/gnome-keyring ~arm +gnome-base/gnome-session ~arm +gnome-base/libgnome-keyring ~arm +gnome-extra/avant-window-navigator ~arm +gnome-extra/gnome-games ~arm +gnome-extra/gnome-power-manager ~arm +gnome-extra/gnome-screensaver ~arm +gnome-extra/gnome-system-monitor ~arm +gnome-extra/nm-applet ~arm +gnome-extra/yelp-xsl ~arm +media-gfx/eog ~arm +media-gfx/shotwell ~arm +media-libs/clutter ~arm +media-libs/clutter-gtk ~arm +media-libs/cogl ~arm +media-libs/gexiv2 ~arm +media-libs/libbluray ~arm +media-libs/libchamplain ~arm +media-libs/libgnome-media-profiles ~arm +media-libs/libgphoto2 ~arm +media-libs/libprojectm ~arm +media-libs/libraw ~arm +media-libs/memphis ~arm +media-libs/sdl-gfx ~arm +media-libs/sdl-sound ~arm +media-libs/vigra ~arm +media-plugins/gst-plugins-cdparanoia ~arm +media-plugins/gst-plugins-lame ~arm +media-sound/sound-juicer ~arm +media-video/cheese ~arm +media-video/gnome-video-effects ~arm +net-im/telepathy-connection-managers ~arm +net-im/telepathy-logger ~arm +net-im/telepathy-mission-control ~arm +net-libs/gtk-vnc ~arm +net-libs/libmicrohttpd ~arm +net-libs/liboauth ~arm +net-libs/rest ~arm +net-libs/telepathy-farsight ~arm +net-misc/vinagre ~arm +sci-libs/colamd ~arm +sci-libs/hdf5 ~arm +sci-libs/ufconfig ~arm +sci-mathematics/lpsolve ~arm +sys-apps/ifplugd ~arm +sys-apps/lsb-release ~arm +sys-apps/portage ~arm +virtual/ffmpeg ~arm +x11-libs/libdesktop-agnostic ~arm +x11-libs/mx ~arm +x11-themes/gnome-icon-theme-extras ~arm +x11-themes/sabayon-artwork-loo ~arm +lxde-base/lxpolkit ~arm +xfce-extra/xfce4-notifyd ~arm +app-accessibility/at-spi2-core ~arm +net-libs/liboauth ~arm +media-libs/libraw ~arm +dev-util/itstool ~arm +dev-libs/json-glib ~arm +media-plugins/gst-plugins-lame ~arm +media-video/gnome-video-effects ~arm +app-admin/apg ~arm +net-im/telepathy-connection-managers ~arm +sys-apps/lsb-release ~arm +gnome-base/gnome ~arm +dev-libs/eeze ~arm +net-libs/gnome-online-accounts ~arm +gnome-base/gnome-core-apps ~arm +gnome-extra/gnome-tweak-tool ~arm +gnome-extra/nm-applet ~arm +dev-libs/efreet ~arm +media-libs/evas ~arm +x11-wm/muffin ~arm +gnome-extra/yelp ~arm +media-libs/edje ~arm +gnome-extra/gnome-contacts ~arm +media-video/totem ~arm +net-im/empathy ~arm +net-wireless/gnome-bluetooth ~arm +dev-libs/eina ~arm +gnome-base/gnome-shell ~arm +gnome-extra/sushi ~arm +sys-devel/make ~arm +dev-libs/ecore ~arm +gnome-base/gdm ~arm +x11-wm/mutter ~arm +gnome-extra/evolution-data-server ~arm +dev-libs/e_dbus ~arm +gnome-base/gnome-fallback ~arm +www-client/epiphany ~arm +dev-libs/eet ~arm +gnome-base/gnome-control-center ~arm +dev-libs/embryo ~arm +gnome-extra/nemo ~arm +x11-libs/libdesktop-agnostic ~arm +media-libs/libprojectm ~arm +x11-themes/gtk-engines-murrine ~arm +www-servers/nginx ~arm +media-libs/vigra ~arm +gnome-extra/nemo ~arm +x11-wm/muffin ~arm +x11-themes/murrine-themes ~arm diff --git a/conf/armv6l/repo/sabayonlinux.org/packages.db.mirrors b/conf/armv6l/repo/sabayonlinux.org/packages.db.mirrors new file mode 100644 index 0000000..e8275eb --- /dev/null +++ b/conf/armv6l/repo/sabayonlinux.org/packages.db.mirrors @@ -0,0 +1,8 @@ +# these are all the same +http://dl.sabayon.org/entropy +http://best.sabayon.org/entropy +http://redir.sabayon.org/entropy +# This will be used as last resort, and must stay here +http://pkg.sabayon.org +# this is in case our DNS goes down +http://na.mirror.garr.it/mirrors/sabayonlinux/entropy diff --git a/conf/armv6l/repo/sabayonlinux.org/packages.db.system_mask b/conf/armv6l/repo/sabayonlinux.org/packages.db.system_mask new file mode 100644 index 0000000..4d24d97 --- /dev/null +++ b/conf/armv6l/repo/sabayonlinux.org/packages.db.system_mask @@ -0,0 +1,15 @@ +app-admin/equo +app-misc/sabayon-version +dev-db/sqlite +sys-apps/entropy +sys-devel/base-gcc:4.7 +sys-libs/db:4.8 +virtual/cron +# virtual/linux-binary +sys-auth/pambase + +# glibc cannot be removed, it's part of the system +# nowadays it's not even a system pkg because +# virtual/libc wraps it. +# This makes sure we always block glibc +sys-libs/glibc diff --git a/conf/armv6l/repo/sabayonlinux.org/packages.db.webservices b/conf/armv6l/repo/sabayonlinux.org/packages.db.webservices new file mode 100644 index 0000000..3059b1e --- /dev/null +++ b/conf/armv6l/repo/sabayonlinux.org/packages.db.webservices @@ -0,0 +1 @@ +https://packages.sabayon.org/service diff --git a/conf/armv7l/entropy/triggers/sys-devel/base-gcc/trigger b/conf/armv7l/entropy/triggers/sys-devel/base-gcc/trigger deleted file mode 100644 index 8bccc1c..0000000 --- a/conf/armv7l/entropy/triggers/sys-devel/base-gcc/trigger +++ /dev/null @@ -1,35 +0,0 @@ -def configure_correct_gcc(): - import re - import subprocess - import os - from entropy.const import etpConst - - gcc_targets = ["4.8", "4.7", "4.6"] - uname_arch = os.uname()[4] - gcc_dir = etpConst['systemroot'] + "/etc/env.d/gcc" - gcc_profile_file = None - for gcc_target in gcc_targets: - gcc_profile_file_pfx = uname_arch + "-pc-linux-gnu-" + gcc_target - regex = re.compile(gcc_profile_file_pfx + "((.[0-30])?)$") - - for curdir, subs, files in os.walk(gcc_dir): - for fname in files: - if regex.match(fname): - gcc_profile_file = os.path.join(curdir, fname) - break - break - if gcc_profile_file is not None: - break - if gcc_profile_file is not None: - # if we're hardened, we want the vanilla one by default - # to avoid stressing the user too much - vanilla_profile_file = gcc_profile_file + "-vanilla" - if os.path.isfile(vanilla_profile_file): - gcc_profile_file = vanilla_profile_file - profile_name = os.path.basename(gcc_profile_file) - subprocess.call(("gcc-config", profile_name)) - -if stage == "postinstall": - configure_correct_gcc() - -my_ext_status = 0 diff --git a/conf/armv7l/portage/env/no-distcc-ccache.conf b/conf/armv7l/portage/env/no-distcc-ccache.conf index 7c4b2ea..5a04099 100644 --- a/conf/armv7l/portage/env/no-distcc-ccache.conf +++ b/conf/armv7l/portage/env/no-distcc-ccache.conf @@ -1 +1 @@ -FEATURES="-distcc -distcc-pump parallel-fetch protect-owned splitdebug -ccache" +FEATURES="-distcc -distcc-pump parallel-fetch protect-owned compressdebug splitdebug -ccache" diff --git a/conf/armv7l/portage/env/no-distcc.conf b/conf/armv7l/portage/env/no-distcc.conf index 3a78156..8688451 100644 --- a/conf/armv7l/portage/env/no-distcc.conf +++ b/conf/armv7l/portage/env/no-distcc.conf @@ -1 +1 @@ -FEATURES="-distcc parallel-fetch protect-owned splitdebug" +FEATURES="-distcc parallel-fetch protect-owned compressdebug splitdebug" diff --git a/conf/armv7l/portage/make.conf b/conf/armv7l/portage/make.conf new file mode 100644 index 0000000..02a3d81 --- /dev/null +++ b/conf/armv7l/portage/make.conf @@ -0,0 +1,48 @@ +# Temp disable Graphite due to known x11-libs/qt bugs +FPUABI="-mfloat-abi=hard" + +CFLAGS="-O2 -pipe -march=armv7-a -mfpu=vfpv3-d16 ${FPUABI}" +CXXFLAGS="${CFLAGS}" +LDFLAGS="-Wl,-O1 -Wl,--as-needed" +CHOST="armv7a-hardfloat-linux-gnueabi" + +### COMMON PART +################################################# +# Portage configuration +ACCEPT_KEYWORDS="arm ~arm" +FEATURES="ccache distcc parallel-fetch protect-owned compressdebug splitdebug" +# temp disabled: distcc-pump +MAKEOPTS="-j6 -s" +CCACHE_SIZE="5G" +CCACHE_DIR="/var/ccache" +# Global USE flags +USE="cpudetection cups goom joystick jpeg opengl png neon theora truetype xvid fontconfig jpeg png" +# Sound USE flags +USE="${USE} pulseaudio alsa flac mp3 vorbis ogg" +# System USE flags +USE="${USE} -consolekit dbus introspection logind perl policykit python systemd threads udev xattr xcb" +# Video OpenGL stuff +# Note: GLES2 is disabled globally atm. mesa-9.1.2 has bugs if both gl, and gles2 are enabled. +# The bug is in the GL{ES2,} headers (name clash), and gnome-shell fails to build because of that. +USE="${USE} -gles2" + +LINGUAS="en en_US af ar az bg bn br bs ca cs cy da de el en_GB eo es et eu fa fi fr" +LINGUAS="${LINGUAS} fy ga gl he hi hr hu ia is it ja kk km ko lt lv mk mn ms nb nds nl" +LINGUAS="${LINGUAS} nn pa pl pt pt_BR ro ru rw se si sk sl sr sr@Latn ss sv ta tg tr uk" +LINGUAS="${LINGUAS} uz vi zh_CN zh_TW es_AR es_ES fy_NL ga_IE gu gu_IN nb_NO nn_NO pt_PT sv_SE ug zh" + +# distcc configuration +DISTCC_HOSTS="localhost/1 172.16.255.1/5" +# DISTCC_VERBOSE=1 + +# Package specific configuration +APACHE2_MPMS="prefork" +# No Python3 Noooo +PYTHON_TARGETS="python2_7" +USE_PYTHON="2.7" + +################################################# +### END COMMON PART -- cut here + +source /var/lib/layman/make.conf + diff --git a/conf/armv7l/portage/make.conf.hardfp b/conf/armv7l/portage/make.conf.hardfp deleted file mode 100644 index b86b787..0000000 --- a/conf/armv7l/portage/make.conf.hardfp +++ /dev/null @@ -1,40 +0,0 @@ -# Temp disable Graphite due to known x11-libs/qt bugs -GRAPHITE="-floop-interchange -ftree-loop-distribution -floop-strip-mine -floop-block" -FPUABI="-mfloat-abi=hard" - -CFLAGS="-O2 -pipe -march=armv7-a -mfpu=vfpv3-d16 ${FPUABI}" -CXXFLAGS="${CFLAGS}" -LDFLAGS="-Wl,-O1 -Wl,--as-needed" -CHOST="armv7a-hardfloat-linux-gnueabi" - -### COMMON PART -################################################# -# Portage configuration -ACCEPT_KEYWORDS="~arm arm" -FEATURES="ccache distcc distcc-pump parallel-fetch protect-owned splitdebug" -MAKEOPTS="-j16 -s" -CCACHE_SIZE="50G" -CCACHE_DIR="/var/ccache" -# Global USE flags -USE="alsa cpudetection dbus flac goom joystick mp3 theora threads truetype xvid vorbis vorbis" - -# distcc configuration -DISTCC_SSH="/etc/distcc/distcc-ssh" -# / -# Works with QEMU warnings (damn) -# DISTCC_HOSTS="localhost/1 distcc@localhost/15,lzo,cpp" -# Works -DISTCC_HOSTS="localhost/1 127.0.0.1/15,lzo,cpp" -# DISTCC_VERBOSE=1 - -# Package specific configuration -APACHE2_MPMS="prefork" - -# Filter out crap from packages -INSTALL_MASK="usr/share/gtk-doc/html/*" -PKG_INSTALL_MASK="${INSTALL_MASK}" -################################################# -### END COMMON PART -- cut here - -source /var/lib/layman/make.conf - diff --git a/conf/armv7l/portage/make.conf.softfp b/conf/armv7l/portage/make.conf.softfp deleted file mode 100644 index 67490d8..0000000 --- a/conf/armv7l/portage/make.conf.softfp +++ /dev/null @@ -1,39 +0,0 @@ -# Temp disable Graphite due to known x11-libs/qt-* bugs -GRAPHITE="-floop-interchange -ftree-loop-distribution -floop-strip-mine -floop-block" -FPUABI="-mfloat-abi=softfp" - -CFLAGS="-O2 -pipe -march=armv7-a -mfpu=vfpv3-d16 ${FPUABI}" -CXXFLAGS="${CFLAGS}" -LDFLAGS="-Wl,-O1 -Wl,--as-needed" -CHOST="armv7a-unknown-linux-gnueabi" - -### COMMON PART -################################################# -# Portage configuration -ACCEPT_KEYWORDS="~arm arm" -FEATURES="ccache distcc distcc-pump parallel-fetch protect-owned splitdebug" -MAKEOPTS="-j16 -s" -CCACHE_SIZE="50G" -CCACHE_DIR="/var/ccache" -# Global USE flags -USE="alsa cpudetection dbus flac goom joystick mp3 theora threads truetype xvid vorbis vorbis" - -# distcc configuration -DISTCC_SSH="/etc/distcc/distcc-ssh" -# / -# Works with QEMU warnings (damn) -# DISTCC_HOSTS="localhost/1 distcc@localhost/15,lzo,cpp" -# Works -DISTCC_HOSTS="localhost/1 127.0.0.1/15,lzo,cpp" -# DISTCC_VERBOSE=1 - -# Package specific configuration -APACHE2_MPMS="prefork" - -# Filter out crap from packages -INSTALL_MASK="usr/share/gtk-doc/html/*" -PKG_INSTALL_MASK="${INSTALL_MASK}" -################################################# -### END COMMON PART -- cut here - -source /var/lib/layman/make.conf diff --git a/conf/armv7l/portage/package.env b/conf/armv7l/portage/package.env index 1fee19f..37d9ec6 100644 --- a/conf/armv7l/portage/package.env +++ b/conf/armv7l/portage/package.env @@ -11,6 +11,7 @@ media-tv/xbmc xbmc.conf dev-lang/spidermonkey neon.conf x11-drivers/xf86-video-omapfb neon.conf www-client/chromium neon.conf +media-sound/pulseaudio neon.conf # force MAKEOPTS="-j1" x11-libs/cairo makeopts-j1.conf diff --git a/conf/armv7l/portage/package.keywords b/conf/armv7l/portage/package.keywords deleted file mode 100644 index 54a76a5..0000000 --- a/conf/armv7l/portage/package.keywords +++ /dev/null @@ -1,139 +0,0 @@ -# hardfloat is only supported since gcc-4.5 -# We force gcc-4.5 because this stage should be closer to stable -# When gcc-4.5 is stable this could be removed -=sys-devel/gcc-4.5* -# <3.0 doesn't build with gcc-4.5 -sys-apps/diffutils - -# We want Portage 2.2 -sys-fs/udev-171-r5 diff --git a/conf/armv7l/portage/package.mask b/conf/armv7l/portage/package.mask new file mode 120000 index 0000000..4e5ec8d --- /dev/null +++ b/conf/armv7l/portage/package.mask @@ -0,0 +1 @@ +../../armarch/portage/package.mask \ No newline at end of file diff --git a/conf/armv7l/portage/package.unmask b/conf/armv7l/portage/package.unmask deleted file mode 100644 index 7df8c94..0000000 --- a/conf/armv7l/portage/package.unmask +++ /dev/null @@ -1,79 +0,0 @@ -# sys-devel/gcc:4.6 is fine for us -sys-devel/gcc:4.6 - -# Nirbheek Chauhan (25 Mar 2012) -# This is now the GNOME 3.4 mask -# Masked for testing, clutter-1.10, and bugs in some packages: -=app-accessibility/accerciser-3.4* -=app-accessibility/at-spi2-atk-2.4* -=app-accessibility/at-spi2-core-2.4* -=app-accessibility/orca-3.4* -=app-admin/gnome-system-log-3.4* -=app-crypt/gcr-3.4* -=app-crypt/seahorse-3.4* -=app-dicts/gnome-dictionary-3.4* -=app-misc/tracker-0.14* ->=dev-libs/folks-0.6.8 -=dev-libs/libgdata-0.12* -=dev-libs/totem-pl-parser-3* -=dev-util/gnome-devel-docs-3.4* -=dev-python/pyatspi-2.4* -=gnome-base/gdm-3.4* -=gnome-base/gnome-control-center-3.4* -=gnome-base/gnome-core-apps-3.4* -=gnome-base/gnome-core-libs-3.4* -=gnome-base/gnome-desktop-3.4* -=gnome-base/gnome-extra-apps-3.4* -=gnome-base/gnome-fallback-3.4* -=gnome-base/gnome-3.4* -=gnome-base/gnome-keyring-3.4* -=gnome-base/gnome-light-3.4* -=gnome-base/gnome-menus-3.4* -=gnome-base/gnome-panel-3.4* -=gnome-base/gnome-power-manager-3.4* -=gnome-base/gnome-session-3.4* -=gnome-base/gnome-settings-daemon-3.4* -=gnome-base/gnome-shell-3.4* -=gnome-base/libgnome-keyring-3.4* -=gnome-base/libgnomekbd-3.4* -=gnome-base/nautilus-3.4* -=gnome-extra/evolution-data-server-3.4* -=gnome-extra/evolution-ews-3.4* -=gnome-extra/evolution-exchange-3.4* -=gnome-extra/evolution-groupwise-3.4* -=gnome-extra/gnome-color-manager-3.4* -=gnome-extra/gnome-contacts-3.4* -=gnome-extra/gnome-documents-0.4* -=gnome-extra/gnome-games-3.4* -=gnome-extra/gnome-search-tool-3.4* -=gnome-extra/gnome-shell-extensions-3.4* ->=gnome-extra/gnome-tweak-tool-3.3 -=gnome-extra/gnome-user-docs-3.4* -=gnome-extra/gnome-utils-3.4* -=gnome-extra/mousetweaks-3.4* -=gnome-extra/nautilus-tracker-tags-0.14* -=gnome-extra/seahorse-nautilus-3.4* -=gnome-extra/sushi-0.4* -=mail-client/evolution-3.4* -=media-gfx/gnome-font-viewer-3.4* -=media-gfx/gnome-screenshot-3.4* -=media-video/cheese-3.4* -=media-video/totem-3.4* -=net-im/empathy-3.4* -=net-libs/gnome-online-accounts-3.4* ->=net-libs/telepathy-farstream-0.2 -=net-wireless/gnome-bluetooth-3.4* -=sys-apps/baobab-3.4* -=x11-libs/libcryptui-3.4* -=x11-libs/libwnck-3.4* ->=x11-wm/metacity-2.34.2 -=x11-wm/mutter-3.4* ->=x11-themes/zukitwo-shell-2012.04.24 -# New clutter API breaks almost everything -=media-libs/cogl-1.10* -=media-libs/clutter-1.10* -=media-libs/clutter-gtk-1.2* -=media-libs/clutter-gst-1.5* -=media-libs/clutter-gst-1.6* -# Needs gst-plugins-flac-0.10.31 + commit 265a5bfa to write seekable flac files -=media-sound/sound-juicer-3.4* diff --git a/conf/armv7l/portage/package.unmask b/conf/armv7l/portage/package.unmask new file mode 120000 index 0000000..852343a --- /dev/null +++ b/conf/armv7l/portage/package.unmask @@ -0,0 +1 @@ +../../armarch/portage/package.unmask \ No newline at end of file diff --git a/conf/armv7l/portage/package.use b/conf/armv7l/portage/package.use new file mode 120000 index 0000000..5637cdd --- /dev/null +++ b/conf/armv7l/portage/package.use @@ -0,0 +1 @@ +../../armarch/portage/package.use \ No newline at end of file diff --git a/conf/armv7l/repo/sabayon-limbo/packages.db.critical b/conf/armv7l/repo/sabayon-limbo/packages.db.critical new file mode 100644 index 0000000..6374c23 --- /dev/null +++ b/conf/armv7l/repo/sabayon-limbo/packages.db.critical @@ -0,0 +1,3 @@ +sys-devel/base-gcc:4.7 +>=sys-apps/portage-2.2.0_alpha142 +>sys-libs/glibc-2.16.9999 diff --git a/conf/armv7l/repo/sabayon-limbo/packages.db.fallback_mirrors b/conf/armv7l/repo/sabayon-limbo/packages.db.fallback_mirrors new file mode 100644 index 0000000..4e5447d --- /dev/null +++ b/conf/armv7l/repo/sabayon-limbo/packages.db.fallback_mirrors @@ -0,0 +1,6 @@ +# Our fallback mirror is pkg.sabayon.org +pkg.sabayon.org +best.sabayon.org +dl.sabayon.org +r.sabayon.org +redir.sabayon.org diff --git a/conf/armv7l/repo/sabayon-limbo/packages.db.keywords b/conf/armv7l/repo/sabayon-limbo/packages.db.keywords new file mode 100644 index 0000000..c2229fd --- /dev/null +++ b/conf/armv7l/repo/sabayon-limbo/packages.db.keywords @@ -0,0 +1,129 @@ +app-accessibility/at-spi2-core ~arm +app-accessibility/caribou ~arm +app-admin/apg ~arm +app-admin/packagekit ~arm +app-admin/packagekit-gtk ~arm +app-crypt/seahorse ~arm +app-editors/gedit ~arm +app-misc/geoclue ~arm +app-office/abiword ~arm +app-text/libexttextcat ~arm +app-text/libwpd ~arm +app-text/libwpg ~arm +app-text/libwps ~arm +app-text/mythes ~arm +app-text/tofrodos ~arm +app-txt/epdfview ~arm +dev-libs/folks ~arm +dev-libs/gjs ~arm +dev-libs/hyphen ~arm +dev-libs/json-glib ~arm +dev-libs/libgdata ~arm +dev-libs/libpeas ~arm +dev-python/pyatspi ~arm +dev-util/itstool ~arm +dev-util/mdds ~arm +games-board/aisleriot ~arm +gnome-base/gnome-core-libs ~arm +gnome-base/gnome-keyring ~arm +gnome-base/gnome-session ~arm +gnome-base/libgnome-keyring ~arm +gnome-extra/avant-window-navigator ~arm +gnome-extra/gnome-games ~arm +gnome-extra/gnome-power-manager ~arm +gnome-extra/gnome-screensaver ~arm +gnome-extra/gnome-system-monitor ~arm +gnome-extra/nm-applet ~arm +gnome-extra/yelp-xsl ~arm +media-gfx/eog ~arm +media-gfx/shotwell ~arm +media-libs/clutter ~arm +media-libs/clutter-gtk ~arm +media-libs/cogl ~arm +media-libs/gexiv2 ~arm +media-libs/libbluray ~arm +media-libs/libchamplain ~arm +media-libs/libgnome-media-profiles ~arm +media-libs/libgphoto2 ~arm +media-libs/libprojectm ~arm +media-libs/libraw ~arm +media-libs/memphis ~arm +media-libs/sdl-gfx ~arm +media-libs/sdl-sound ~arm +media-libs/vigra ~arm +media-plugins/gst-plugins-cdparanoia ~arm +media-plugins/gst-plugins-lame ~arm +media-sound/sound-juicer ~arm +media-video/cheese ~arm +media-video/gnome-video-effects ~arm +net-im/telepathy-connection-managers ~arm +net-im/telepathy-logger ~arm +net-im/telepathy-mission-control ~arm +net-libs/gtk-vnc ~arm +net-libs/libmicrohttpd ~arm +net-libs/liboauth ~arm +net-libs/rest ~arm +net-libs/telepathy-farsight ~arm +net-misc/vinagre ~arm +sci-libs/colamd ~arm +sci-libs/hdf5 ~arm +sci-libs/ufconfig ~arm +sci-mathematics/lpsolve ~arm +sys-apps/ifplugd ~arm +sys-apps/lsb-release ~arm +sys-apps/portage ~arm +virtual/ffmpeg ~arm +x11-libs/libdesktop-agnostic ~arm +x11-libs/mx ~arm +x11-themes/gnome-icon-theme-extras ~arm +x11-themes/sabayon-artwork-loo ~arm +lxde-base/lxpolkit ~arm +xfce-extra/xfce4-notifyd ~arm +app-accessibility/at-spi2-core ~arm +net-libs/liboauth ~arm +media-libs/libraw ~arm +dev-util/itstool ~arm +dev-libs/json-glib ~arm +media-plugins/gst-plugins-lame ~arm +media-video/gnome-video-effects ~arm +app-admin/apg ~arm +net-im/telepathy-connection-managers ~arm +sys-apps/lsb-release ~arm +gnome-base/gnome ~arm +dev-libs/eeze ~arm +net-libs/gnome-online-accounts ~arm +gnome-base/gnome-core-apps ~arm +gnome-extra/gnome-tweak-tool ~arm +gnome-extra/nm-applet ~arm +dev-libs/efreet ~arm +media-libs/evas ~arm +x11-wm/muffin ~arm +gnome-extra/yelp ~arm +media-libs/edje ~arm +gnome-extra/gnome-contacts ~arm +media-video/totem ~arm +net-im/empathy ~arm +net-wireless/gnome-bluetooth ~arm +dev-libs/eina ~arm +gnome-base/gnome-shell ~arm +gnome-extra/sushi ~arm +sys-devel/make ~arm +dev-libs/ecore ~arm +gnome-base/gdm ~arm +x11-wm/mutter ~arm +gnome-extra/evolution-data-server ~arm +dev-libs/e_dbus ~arm +gnome-base/gnome-fallback ~arm +www-client/epiphany ~arm +dev-libs/eet ~arm +gnome-base/gnome-control-center ~arm +dev-libs/embryo ~arm +gnome-extra/nemo ~arm +x11-libs/libdesktop-agnostic ~arm +media-libs/libprojectm ~arm +x11-themes/gtk-engines-murrine ~arm +www-servers/nginx ~arm +media-libs/vigra ~arm +gnome-extra/nemo ~arm +x11-wm/muffin ~arm +x11-themes/murrine-themes ~arm diff --git a/conf/armv7l/repo/sabayon-limbo/packages.db.mirrors b/conf/armv7l/repo/sabayon-limbo/packages.db.mirrors new file mode 100644 index 0000000..e8275eb --- /dev/null +++ b/conf/armv7l/repo/sabayon-limbo/packages.db.mirrors @@ -0,0 +1,8 @@ +# these are all the same +http://dl.sabayon.org/entropy +http://best.sabayon.org/entropy +http://redir.sabayon.org/entropy +# This will be used as last resort, and must stay here +http://pkg.sabayon.org +# this is in case our DNS goes down +http://na.mirror.garr.it/mirrors/sabayonlinux/entropy diff --git a/conf/armv7l/repo/sabayon-limbo/packages.db.system_mask b/conf/armv7l/repo/sabayon-limbo/packages.db.system_mask new file mode 100644 index 0000000..4d24d97 --- /dev/null +++ b/conf/armv7l/repo/sabayon-limbo/packages.db.system_mask @@ -0,0 +1,15 @@ +app-admin/equo +app-misc/sabayon-version +dev-db/sqlite +sys-apps/entropy +sys-devel/base-gcc:4.7 +sys-libs/db:4.8 +virtual/cron +# virtual/linux-binary +sys-auth/pambase + +# glibc cannot be removed, it's part of the system +# nowadays it's not even a system pkg because +# virtual/libc wraps it. +# This makes sure we always block glibc +sys-libs/glibc diff --git a/conf/armv7l/repo/sabayon-limbo/packages.db.webservices b/conf/armv7l/repo/sabayon-limbo/packages.db.webservices new file mode 100644 index 0000000..3059b1e --- /dev/null +++ b/conf/armv7l/repo/sabayon-limbo/packages.db.webservices @@ -0,0 +1 @@ +https://packages.sabayon.org/service diff --git a/conf/armv7l/repo/sabayonlinux.org/packages.db.critical b/conf/armv7l/repo/sabayonlinux.org/packages.db.critical new file mode 100644 index 0000000..6374c23 --- /dev/null +++ b/conf/armv7l/repo/sabayonlinux.org/packages.db.critical @@ -0,0 +1,3 @@ +sys-devel/base-gcc:4.7 +>=sys-apps/portage-2.2.0_alpha142 +>sys-libs/glibc-2.16.9999 diff --git a/conf/armv7l/repo/sabayonlinux.org/packages.db.fallback_mirrors b/conf/armv7l/repo/sabayonlinux.org/packages.db.fallback_mirrors new file mode 100644 index 0000000..4e5447d --- /dev/null +++ b/conf/armv7l/repo/sabayonlinux.org/packages.db.fallback_mirrors @@ -0,0 +1,6 @@ +# Our fallback mirror is pkg.sabayon.org +pkg.sabayon.org +best.sabayon.org +dl.sabayon.org +r.sabayon.org +redir.sabayon.org diff --git a/conf/armv7l/repo/sabayonlinux.org/packages.db.keywords b/conf/armv7l/repo/sabayonlinux.org/packages.db.keywords index e9db903..c2229fd 100644 --- a/conf/armv7l/repo/sabayonlinux.org/packages.db.keywords +++ b/conf/armv7l/repo/sabayonlinux.org/packages.db.keywords @@ -121,3 +121,9 @@ dev-libs/embryo ~arm gnome-extra/nemo ~arm x11-libs/libdesktop-agnostic ~arm media-libs/libprojectm ~arm +x11-themes/gtk-engines-murrine ~arm +www-servers/nginx ~arm +media-libs/vigra ~arm +gnome-extra/nemo ~arm +x11-wm/muffin ~arm +x11-themes/murrine-themes ~arm diff --git a/conf/armv7l/repo/sabayonlinux.org/packages.db.mirrors b/conf/armv7l/repo/sabayonlinux.org/packages.db.mirrors new file mode 100644 index 0000000..e8275eb --- /dev/null +++ b/conf/armv7l/repo/sabayonlinux.org/packages.db.mirrors @@ -0,0 +1,8 @@ +# these are all the same +http://dl.sabayon.org/entropy +http://best.sabayon.org/entropy +http://redir.sabayon.org/entropy +# This will be used as last resort, and must stay here +http://pkg.sabayon.org +# this is in case our DNS goes down +http://na.mirror.garr.it/mirrors/sabayonlinux/entropy diff --git a/conf/armv7l/repo/sabayonlinux.org/packages.db.system_mask b/conf/armv7l/repo/sabayonlinux.org/packages.db.system_mask new file mode 100644 index 0000000..4d24d97 --- /dev/null +++ b/conf/armv7l/repo/sabayonlinux.org/packages.db.system_mask @@ -0,0 +1,15 @@ +app-admin/equo +app-misc/sabayon-version +dev-db/sqlite +sys-apps/entropy +sys-devel/base-gcc:4.7 +sys-libs/db:4.8 +virtual/cron +# virtual/linux-binary +sys-auth/pambase + +# glibc cannot be removed, it's part of the system +# nowadays it's not even a system pkg because +# virtual/libc wraps it. +# This makes sure we always block glibc +sys-libs/glibc diff --git a/conf/armv7l/repo/sabayonlinux.org/packages.db.webservices b/conf/armv7l/repo/sabayonlinux.org/packages.db.webservices new file mode 100644 index 0000000..3059b1e --- /dev/null +++ b/conf/armv7l/repo/sabayonlinux.org/packages.db.webservices @@ -0,0 +1 @@ +https://packages.sabayon.org/service diff --git a/conf/home/.bash_profile b/conf/home/.bash_profile new file mode 100644 index 0000000..ebd6cb0 --- /dev/null +++ b/conf/home/.bash_profile @@ -0,0 +1,4 @@ +# Do this or ssh localhost:123 screen -Rx won't source bashrc +if [ -f ~/.bashrc ]; then + . ~/.bashrc +fi diff --git a/conf/home/eixrc b/conf/home/eixrc new file mode 100644 index 0000000..c8859d2 --- /dev/null +++ b/conf/home/eixrc @@ -0,0 +1,6 @@ +# Don't clobber screen status! +# STRING +# If the beginning of TERM matches a word of this space-separated list, +# it is assumed that the terminal supports a status line. +#TERM_STATUSLINE="xterm screen rxvt aterm konsole gnome Eterm eterm kterm interix" +TERM_STATUSLINE="" diff --git a/conf/intel/entropy/packages/packages.server.sets b/conf/intel/entropy/packages/packages.server.sets index 8692ede..1da4c74 100644 --- a/conf/intel/entropy/packages/packages.server.sets +++ b/conf/intel/entropy/packages/packages.server.sets @@ -19,7 +19,7 @@ sabayonlinux.org entropy packagekit # Sabayon stuff sabayonlinux.org sabayon-artwork # Desktop environments -sabayonlinux.org X e17 xfce lxde fluxbox gnome +sabayonlinux.org X enlightenment xfce lxde fluxbox gnome # gst plugins for GNOME, KDE, Xfce sabayonlinux.org gst-plugins gst-plugins-extra # IME fonts stuff diff --git a/conf/intel/entropy/triggers/sys-devel/base-gcc/trigger b/conf/intel/entropy/triggers/sys-devel/base-gcc/trigger deleted file mode 100644 index 8bccc1c..0000000 --- a/conf/intel/entropy/triggers/sys-devel/base-gcc/trigger +++ /dev/null @@ -1,35 +0,0 @@ -def configure_correct_gcc(): - import re - import subprocess - import os - from entropy.const import etpConst - - gcc_targets = ["4.8", "4.7", "4.6"] - uname_arch = os.uname()[4] - gcc_dir = etpConst['systemroot'] + "/etc/env.d/gcc" - gcc_profile_file = None - for gcc_target in gcc_targets: - gcc_profile_file_pfx = uname_arch + "-pc-linux-gnu-" + gcc_target - regex = re.compile(gcc_profile_file_pfx + "((.[0-30])?)$") - - for curdir, subs, files in os.walk(gcc_dir): - for fname in files: - if regex.match(fname): - gcc_profile_file = os.path.join(curdir, fname) - break - break - if gcc_profile_file is not None: - break - if gcc_profile_file is not None: - # if we're hardened, we want the vanilla one by default - # to avoid stressing the user too much - vanilla_profile_file = gcc_profile_file + "-vanilla" - if os.path.isfile(vanilla_profile_file): - gcc_profile_file = vanilla_profile_file - profile_name = os.path.basename(gcc_profile_file) - subprocess.call(("gcc-config", profile_name)) - -if stage == "postinstall": - configure_correct_gcc() - -my_ext_status = 0 diff --git a/conf/intel/portage/env/O3.amd64.conf b/conf/intel/portage/env/O3.amd64.conf index 6d497b3..90787c5 100644 --- a/conf/intel/portage/env/O3.amd64.conf +++ b/conf/intel/portage/env/O3.amd64.conf @@ -1,5 +1,5 @@ # Set -O3 for perf. critical packages -FEATURES="test splitdebug" +FEATURES="test compressdebug splitdebug" CFLAGS="-O3 -march=x86-64 -pipe ${GRAPHITE}" #CFLAGS="-O3 -ffast-math -march=x86-64 -pipe ${GRAPHITE}" CXXFLAGS="${CFLAGS}" diff --git a/conf/intel/portage/env/O3.amd64.notest.conf b/conf/intel/portage/env/O3.amd64.notest.conf new file mode 100644 index 0000000..52b5a87 --- /dev/null +++ b/conf/intel/portage/env/O3.amd64.notest.conf @@ -0,0 +1,5 @@ +# Set -O3 for perf. critical packages +FEATURES="compressdebug splitdebug" +CFLAGS="-O3 -march=x86-64 -pipe ${GRAPHITE}" +#CFLAGS="-O3 -ffast-math -march=x86-64 -pipe ${GRAPHITE}" +CXXFLAGS="${CFLAGS}" diff --git a/conf/intel/portage/env/O3.x86.conf b/conf/intel/portage/env/O3.x86.conf index 4cae41e..7b2e009 100644 --- a/conf/intel/portage/env/O3.x86.conf +++ b/conf/intel/portage/env/O3.x86.conf @@ -1,5 +1,5 @@ # Set -O3 for perf. critical packages -FEATURES="test splitdebug" +FEATURES="test compressdebug splitdebug" CFLAGS="-O3 -march=i686 -pipe ${GRAPHITE}" #CFLAGS="-O3 -ffast-math -march=i686 -pipe ${GRAPHITE}" CXXFLAGS="${CFLAGS}" diff --git a/conf/intel/portage/env/disable.debug+userpriv.conf b/conf/intel/portage/env/disable.debug+userpriv.conf new file mode 100644 index 0000000..f3fe9c6 --- /dev/null +++ b/conf/intel/portage/env/disable.debug+userpriv.conf @@ -0,0 +1 @@ +FEATURES="parallel-fetch protect-owned -debug -compressdebug -splitdebug -userpriv" diff --git a/conf/intel/portage/env/disable.debug.conf b/conf/intel/portage/env/disable.debug.conf index e914643..610b188 100644 --- a/conf/intel/portage/env/disable.debug.conf +++ b/conf/intel/portage/env/disable.debug.conf @@ -1 +1 @@ -FEATURES="parallel-fetch protect-owned -debug -splitdebug" +FEATURES="parallel-fetch protect-owned -debug -compressdebug -splitdebug" diff --git a/conf/intel/portage/env/disable.userpriv.conf b/conf/intel/portage/env/disable.userpriv.conf new file mode 100644 index 0000000..acacbdb --- /dev/null +++ b/conf/intel/portage/env/disable.userpriv.conf @@ -0,0 +1 @@ +FEATURES="parallel-fetch protect-owned -userpriv" diff --git a/conf/intel/portage/env/ggdb.amd64.conf b/conf/intel/portage/env/ggdb.amd64.conf new file mode 100644 index 0000000..ab79c15 --- /dev/null +++ b/conf/intel/portage/env/ggdb.amd64.conf @@ -0,0 +1,2 @@ +CFLAGS="-O2 -march=x86-64 -pipe -ggdb" +CXXFLAGS="${CFLAGS}" diff --git a/conf/intel/portage/env/ggdb.x86.conf b/conf/intel/portage/env/ggdb.x86.conf new file mode 100644 index 0000000..42b2ca8 --- /dev/null +++ b/conf/intel/portage/env/ggdb.x86.conf @@ -0,0 +1,2 @@ +CFLAGS="-O2 -march=i686 -pipe -ggdb" +CXXFLAGS="${CFLAGS}" diff --git a/conf/intel/portage/env/linguas-en.conf b/conf/intel/portage/env/linguas-en.conf new file mode 100644 index 0000000..b8a76e0 --- /dev/null +++ b/conf/intel/portage/env/linguas-en.conf @@ -0,0 +1 @@ +LINGUAS="en" diff --git a/conf/intel/portage/make.conf.amd64 b/conf/intel/portage/make.conf.amd64 index 832e8fb..f3faf2c 100644 --- a/conf/intel/portage/make.conf.amd64 +++ b/conf/intel/portage/make.conf.amd64 @@ -12,17 +12,17 @@ MAKEOPTS="-j16 -s" # Portage stuff ACCEPT_KEYWORDS="~amd64" -FEATURES="ccache parallel-fetch protect-owned splitdebug" +FEATURES="parallel-fetch protect-owned compressdebug splitdebug" CCACHE_SIZE="2G" CCACHE_DIR="/var/ccache" LINGUAS="en en_US af ar az bg bn br bs ca cs cy da de el en_GB eo es et eu fa fi fr fy ga gl he hi hr hu is it ja kk km ko lt lv mk mn ms nb nds nl nn pa pl pt pt_BR ro ru rw se sk sl sr sr@Latn ss sv ta tg tr uk uz vi zh_CN zh_TW es_AR es_ES fy_NL ga_IE gu gu_IN nb_NO nn_NO pt_PT sv_SE zh" -## USE ARRAYS ## +## USE ## SAB_BAD="-kdeprefix -arts -qt3 -beagle -gnome -evo -mono -eds -apm -oss -branding -esd" -SAB_MEDIA="musicbrainz sdl pulseaudio wmf fame cdr dvi mp3rtp xine cddb alsa dvb dvd network dvdread ipod audiofile artswrappersuid dvdr jack dri cdda mjpeg mmx joystick xvmc cpudetection v4l v4l2" +SAB_MEDIA="musicbrainz sdl pulseaudio wmf fame cdr dvi mp3rtp xine cddb alsa dvb dvd bluray network dvdread ipod audiofile artswrappersuid dvdr jack dri cdda mjpeg mmx joystick xvmc cpudetection v4l v4l2" SAB_CODECS="x264 gsm lame dv mp3 stream live openal theora ogg a52 win32codecs matroska xvid flac ffmpeg aac speex real dts musepack" -SAB_SYSTEM="cjk unicode gnutls nptl gcj udev kerberos acl dbus bash-completion lzo rar policykit xcb bzip2 bidi wifi lm_sensors acpi usb pcmcia bluetooth irda ieee1394 perl python" +SAB_SYSTEM="cjk unicode gnutls nptl gcj udev systemd logind -consolekit kerberos acl dbus bash-completion lzo rar policykit xcb bzip2 bidi wifi lm_sensors acpi usb pcmcia bluetooth irda ieee1394 perl python" SAB_FILESYS="fat hfs jfs xfs ntfs reiserfs sysfs inotify" SAB_PRINT="cups ppds foomatic-db gimpprint freetype xprint scanner" SAB_XSYS="cairo X opengl png gif gtk qt4 qt3support xpm tiff xinerama aiglx svg gphoto2 dga lcd openexr" @@ -34,7 +34,7 @@ USE="${SAB_BAD} ${SAB_MEDIA} ${SAB_CODECS} ${SAB_SYSTEM} ${SAB_FILESYS} ${SAB_PR ## DEVICES ## INPUT_DEVICES="evdev void" -VIDEO_CARDS="fbdev vesa radeonhd" +VIDEO_CARDS="fbdev vesa radeonsi radeon" LIRC_DEVICES="audio audio_alsa serial pctv" ALSA_CARDS="emu10k1x darla20 darla24 emu10k1 gina20 gina24 hdsp hdspm ice1712 indigo indigoio layla20 layla24 mia mixart mona pcxhr rme32 rme96 sb16 sbawe sscape usbusx2y vx222 usb-usx2y" CAMERAS="agfa_cl20 casio_qv dimagev dimera3500 kodak_dc120 kodak_dc210 kodak_dc240 kodak_dc3200 kodak_ez200 konica_qm150 panasonic_coolshot panasonic_dc1000 panasonic_dc1580 panasonic_l859 polaroid_pdc320 polaroid_pdc640 polaroid_pdc700 ricoh_g3 sipix_blink sipix_blink2 sipix_web2 sony_dscf1 sony_dscf55 toshiba_pdrm11 adc65 aox barbie canon clicksmart310 digigr8 digita directory enigma13 fuji gsmart300 hp215 iclick jamcam jd11 konica largan lg_gsm mars mustek pccam300 pccam600 ptp2 ricoh samsung sierra smal sonix soundvision spca50x sq905 stv0674 stv0680 sx330z template" @@ -47,22 +47,34 @@ QEMU_USER_TARGETS="alpha arm armeb cris i386 m68k microblaze mips mipsel ppc ppc QEMU_SOFTMMU_TARGETS="x86_64 arm cris i386 m68k microblaze mips mips64 mips64el mipsel ppc ppc64 ppcemb sh4 sh4eb sparc sparc64" ## PORTAGE CONFIG ## +PORTDIR_OVERLAY="/usr/local/portage" source /var/lib/layman/make.conf CONFIG_PROTECT="/usr/share/config/kdm /etc /etc/conf.d /etc/init.d" -CONFIG_PROTECT_MASK="/etc/skel" +# /lib/modules mask is useful for our internal tinderbox +CONFIG_PROTECT_MASK="/etc/skel /lib/modules" SYNC="rsync://rsync.europe.gentoo.org/gentoo-portage" APACHE2_MPMS="prefork" -GENTOO_MIRRORS="ftp://mirrors.tera-byte.com/pub/gentoo ftp://ftp.spline.inf.fu-berlin.de/mirrors/gentoo/ http://archive.mmu.edu.my/gentoo rsync://gentoo.bloodhost.ru/gentoo-distfiles ftp://gentoo.mirrors.tds.net/gentoo ftp://ftp.halifax.rwth-aachen.de/gentoo/ rsync://mirror.neolabs.kz/gentoo http://ftp.gentoo.bg/ http://ftp.cc.uoc.gr/mirrors/linux/gentoo/ ftp://ftp.cc.uoc.gr/mirrors/linux/gentoo/" +GENTOO_MIRRORS="ftp://ftp.spline.inf.fu-berlin.de/mirrors/gentoo/ http://archive.mmu.edu.my/gentoo rsync://gentoo.bloodhost.ru/gentoo-distfiles ftp://gentoo.mirrors.tds.net/gentoo ftp://ftp.halifax.rwth-aachen.de/gentoo/ rsync://mirror.neolabs.kz/gentoo http://ftp.gentoo.bg/ http://ftp.cc.uoc.gr/mirrors/linux/gentoo/ ftp://ftp.cc.uoc.gr/mirrors/linux/gentoo/ ftp://mirrors.tera-byte.com/pub/gentoo" -## FUCK KILL PYTHON 3 WITH FIRE ## -# Avoids python.eclass to compile stuff for Python 3 USE_PYTHON="2.7" -PYTHON_TARGETS="python2_7" +PYTHON_TARGETS="python2_7 python3_3" # Some more forced targets -PHP_TARGETS="php5-3" +PHP_TARGETS="php5-5" RUBY_TARGETS="ruby19" # Apache suEXEC default UMASK # See bug 3544 SUEXEC_UMASK=022 + +# Setup GRUB platforms +GRUB_PLATFORMS="efi-32 efi-64 pc" + +# Support both 64bit and 32bit +ABI_X86="64 32" + +# 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/conf/intel/portage/make.conf.x86 b/conf/intel/portage/make.conf.x86 index ae65144..9e87ae5 100644 --- a/conf/intel/portage/make.conf.x86 +++ b/conf/intel/portage/make.conf.x86 @@ -11,19 +11,19 @@ LDFLAGS="-Wl,-O1 -Wl,--as-needed" MAKEOPTS="-j16 -s" # Portage stuff -FEATURES="ccache parallel-fetch protect-owned splitdebug" +FEATURES="parallel-fetch protect-owned compressdebug splitdebug" ACCEPT_KEYWORDS="~x86" CCACHE_SIZE="2G" CCACHE_DIR="/var/ccache" LINGUAS="en en_US af ar az bg bn br bs ca cs cy da de el en_GB eo es et eu fa fi fr fy ga gl he hi hr hu is it ja kk km ko lt lv mk mn ms nb nds nl nn pa pl pt pt_BR ro ru rw se sk sl sr sr@Latn ss sv ta tg tr uk uz vi zh_CN zh_TW es_AR es_ES fy_NL ga_IE gu gu_IN nb_NO nn_NO pt_PT sv_SE zh" -## USE ARRAYS ## +## USE ## SAB_BAD="-kdeprefix -arts -qt3 -beagle -gnome -evo -mono -eds -apm -oss -branding -esd" -SAB_MEDIA="musicbrainz sdl pulseaudio wmf fame cdr mp3rtp xine cddb alsa dvb dvd network dvdread ipod audiofile artswrappersuid dvdr jack dri cdda mjpeg mmx joystick xvmc cpudetection v4l v4l2" +SAB_MEDIA="musicbrainz sdl pulseaudio wmf fame cdr mp3rtp xine cddb alsa dvb dvd bluray network dvdread ipod audiofile artswrappersuid dvdr jack dri cdda mjpeg mmx joystick xvmc cpudetection v4l v4l2" #dvi SAB_CODECS="x264 gsm lame dv mp3 stream live openal theora ogg a52 win32codecs matroska xvid flac ffmpeg aac speex real dts musepack" -SAB_SYSTEM="cjk unicode gnutls nptl gcj udev kerberos acl dbus bash-completion lzo rar policykit xcb bzip2 bidi wifi lm_sensors acpi usb pcmcia bluetooth irda ieee1394 perl python" +SAB_SYSTEM="cjk unicode gnutls nptl gcj udev systemd logind -consolekit kerberos acl dbus bash-completion lzo rar policykit xcb bzip2 bidi wifi lm_sensors acpi usb pcmcia bluetooth irda ieee1394 perl python" SAB_FILESYS="fat hfs jfs xfs ntfs reiserfs sysfs inotify" SAB_PRINT="cups ppds foomatic-db gimpprint freetype xprint scanner" SAB_XSYS="cairo X opengl gif gtk qt4 qt3support xpm tiff xinerama aiglx svg gphoto2 dga lcd openexr" @@ -36,7 +36,7 @@ USE="${SAB_BAD} ${SAB_MEDIA} ${SAB_CODECS} ${SAB_SYSTEM} ${SAB_FILESYS} ${SAB_PR ## DEVICES ## INPUT_DEVICES="evdev void" -VIDEO_CARDS="fbdev vesa radeonhd" +VIDEO_CARDS="fbdev vesa radeonsi radeon" LIRC_DEVICES="audio audio_alsa serial pctv" ALSA_CARDS="emu10k1x darla20 darla24 emu10k1 gina20 gina24 hdsp hdspm ice1712 indigo indigoio layla20 layla24 mia mixart mona pcxhr rme32 rme96 sb16 sbawe sscape usbusx2y vx222 usb-usx2y" CAMERAS="agfa_cl20 casio_qv dimagev dimera3500 kodak_dc120 kodak_dc210 kodak_dc240 kodak_dc3200 kodak_ez200 konica_qm150 panasonic_coolshot panasonic_dc1000 panasonic_dc1580 panasonic_l859 polaroid_pdc320 polaroid_pdc640 polaroid_pdc700 ricoh_g3 sipix_blink sipix_blink2 sipix_web2 sony_dscf1 sony_dscf55 toshiba_pdrm11 adc65 aox barbie canon clicksmart310 digigr8 digita directory enigma13 fuji gsmart300 hp215 iclick jamcam jd11 konica largan lg_gsm mars mustek pccam300 pccam600 ptp2 ricoh samsung sierra smal sonix soundvision spca50x sq905 stv0674 stv0680 sx330z template" @@ -51,21 +51,30 @@ QEMU_USER_TARGETS="alpha arm armeb cris i386 m68k microblaze mips mipsel ppc ppc QEMU_SOFTMMU_TARGETS="x86_64 arm cris i386 m68k microblaze mips mips64 mips64el mipsel ppc ppc64 ppcemb sh4 sh4eb sparc sparc64" ## PORTAGE CONFIG ## +PORTDIR_OVERLAY="/usr/local/portage" source /var/lib/layman/make.conf CONFIG_PROTECT="/usr/share/config/kdm /etc /etc/conf.d /etc/init.d" -CONFIG_PROTECT_MASK="/etc/skel" +# /lib/modules mask is useful for our internal tinderbox +CONFIG_PROTECT_MASK="/etc/skel /lib/modules" SYNC="rsync://rsync.europe.gentoo.org/gentoo-portage" GENTOO_MIRRORS="http://ftp.heanet.ie/pub/gentoo/ ftp://ftp.halifax.rwth-aachen.de/gentoo/ ftp://mirror.cambrium.nl/pub/os/linux/gentoo/ ftp://mirror.opteamax.de/gentoo/ http://ftp.heanet.ie/pub/gentoo/" -## FUCK KILL PYTHON 3 WITH FIRE ## -# Avoids python.eclass to compile stuff for Python 3 USE_PYTHON="2.7" -PYTHON_TARGETS="python2_7" +PYTHON_TARGETS="python2_7 python3_3" # Other forced targets -PHP_TARGETS="php5-3" +PHP_TARGETS="php5-4" RUBY_TARGETS="ruby19" # Apache suEXEC default UMASK # See bug 3544 SUEXEC_UMASK=022 + +# Setup GRUB platforms +GRUB_PLATFORMS="pc" + +# 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/conf/intel/portage/package.env.amd64 b/conf/intel/portage/package.env.amd64 index 62ed8f8..56a0f69 100644 --- a/conf/intel/portage/package.env.amd64 +++ b/conf/intel/portage/package.env.amd64 @@ -1,24 +1,27 @@ media-video/ffmpeg O3.amd64.conf -media-video/libav O3.amd64.conf +media-video/libav O3.amd64.notest.conf games-fps/nexuiz O3.amd64.conf games-fps/xonotic O3.amd64.conf games-fps/quake3 O3.amd64.conf games-fps/openarena O3.amd64.conf games-fps/warsow O3.amd64.conf www-servers/apache apache.conf -sys-kernel/linux-fusion disable.debug.conf -sys-kernel/linux-openvz disable.debug.conf -sys-kernel/linux-rt disable.debug.conf -sys-kernel/linux-sabayon disable.debug.conf -sys-kernel/linux-server disable.debug.conf -sys-kernel/linux-vserver disable.debug.conf -sys-kernel/linux-xen-dom0 disable.debug.conf -sys-kernel/linux-xen-domU disable.debug.conf + +# kernels, portage 2.2 enables FEATURES=userpriv, genkernel fails +sys-kernel/linux-openvz disable.debug+userpriv.conf +sys-kernel/linux-ec2 disable.debug+userpriv.conf +sys-kernel/linux-sabayon disable.debug+userpriv.conf +sys-kernel/linux-server disable.debug+userpriv.conf + # micia: nvidia toolkit packages require GCC 4.4 # as of 05/jan/2012 disable graphite on it dev-util/nvidia-cuda-sdk nographite.amd64.conf dev-util/nvidia-cuda-toolkit nographite.amd64.conf +net-print/pnm2ppa linguas-en.conf +# separate language packages are used +www-client/firefox linguas-en.conf + # Enable hardening app-admin/osiris hardened.conf app-admin/sudo hardened.conf diff --git a/conf/intel/portage/package.env.x86 b/conf/intel/portage/package.env.x86 index c7a099e..5e0288b 100644 --- a/conf/intel/portage/package.env.x86 +++ b/conf/intel/portage/package.env.x86 @@ -5,21 +5,25 @@ games-fps/xonotic O3.x86.conf games-fps/quake3 O3.x86.conf games-fps/openarena O3.x86.conf games-fps/warsow O3.x86.conf +games-strategy/0ad damn.sse.conf media-gfx/darktable damn.sse.conf www-servers/apache apache.conf -sys-kernel/linux-fusion disable.debug.conf -sys-kernel/linux-openvz disable.debug.conf -sys-kernel/linux-rt disable.debug.conf -sys-kernel/linux-sabayon disable.debug.conf -sys-kernel/linux-server disable.debug.conf -sys-kernel/linux-vserver disable.debug.conf -sys-kernel/linux-xen-dom0 disable.debug.conf -sys-kernel/linux-xen-domU disable.debug.conf + +# kernels, portage 2.2 enables FEATURES=userpriv, genkernel fails +sys-kernel/linux-openvz disable.debug+userpriv.conf +sys-kernel/linux-ec2 disable.debug+userpriv.conf +sys-kernel/linux-sabayon disable.debug+userpriv.conf +sys-kernel/linux-server disable.debug+userpriv.conf + # micia: nvidia toolkit packages require GCC 4.4 # as of 05/jan/2012 disable graphite on it dev-util/nvidia-cuda-sdk nographite.x86.conf dev-util/nvidia-cuda-toolkit nographite.x86.conf +net-print/pnm2ppa linguas-en.conf +# separate language packages are used +www-client/firefox linguas-en.conf + # Enable hardening app-admin/osiris hardened.conf app-admin/sudo hardened.conf diff --git a/conf/intel/portage/package.env/.keep b/conf/intel/portage/package.env/.keep new file mode 100644 index 0000000..e69de29 diff --git a/conf/intel/portage/package.keywords b/conf/intel/portage/package.keywords deleted file mode 100644 index 5cce27b..0000000 --- a/conf/intel/portage/package.keywords +++ /dev/null @@ -1,33 +0,0 @@ -# Only use stable versions of these libs -# sys-kernel/linux-headers -~amd64 -~x86 -sys-libs/glibc -~amd64 -~x86 -=gnome-extra/gnome-dvb-daemon-0.2.5 ** ~amd64 ~x86 -# required by gnome-extra/gnome-dvb-daemon-0.2.5, required by gnome-extra/gnome-dvb-daemon (argument) ->=media-libs/gst-rtsp-server-0.10.8 ** ~amd64 ~x86 - - -# gst-plugins missing x86 keywords -media-plugins/gst-plugins-assrender ** -# ~x86 arch missing -media-video/hwdecode-demos ** ~x86 ~amd64 diff --git a/conf/intel/portage/package.keywords/00-sabayon.package.keywords b/conf/intel/portage/package.keywords/00-sabayon.package.keywords new file mode 100644 index 0000000..379b27c --- /dev/null +++ b/conf/intel/portage/package.keywords/00-sabayon.package.keywords @@ -0,0 +1,194 @@ +# Only use stable versions of these libs +# sys-kernel/linux-headers -~amd64 -~x86 +sys-libs/glibc -~amd64 -~x86 +# Allow glibc 2.17, it's good enough and: +# https://bugs.sabayon.org/show_bug.cgi?id=4182 +=sys-libs/glibc-2.17* ~amd64 ~x86 +=gnome-extra/gnome-dvb-daemon-0.2.5 ** ~amd64 ~x86 +# required by gnome-extra/gnome-dvb-daemon-0.2.5, required by gnome-extra/gnome-dvb-daemon (argument) +>=media-libs/gst-rtsp-server-0.10.8 ** ~amd64 ~x86 + + +# gst-plugins missing x86 keywords +media-plugins/gst-plugins-assrender ** +# ~x86 arch missing +media-video/hwdecode-demos ** ~x86 ~amd64 + +# using only stable versions +www-client/chromium -~amd64 -~x86 + +# From the bumblebee overlay +=x11-misc/primus-9999 ** ~amd64 ~x86 + +# Keeps being pulled in while qgis still needs an older version +>=x11-libs/qwtpolar-1.0 -~amd64 -~x86 + +# Python 3.3, add keywords +dev-lang/python:3.3 ** ~amd64 ~x86 + +# OpenEXR 2.0.0 causes a huge breakage, keep stable, mask unstable +media-libs/ilmbase -~amd64 -~x86 +media-libs/openexr -~amd64 -~x86 +media-gfx/openexr_viewers -~amd64 -~x86 + +# leechcraft only stable versions +app-leechcraft/leechcraft-meta -~amd64 -~x86 + +# These are a pain in the ass when they abi break +net-libs/libosip -~amd64 -~x86 +# net-libs/libeXosip -~amd64 -~x86 + +# Keyword libsdl2 required by steam on amd64 +=media-libs/libsdl2-2.0.0-r1 ** ~amd64 + +# 7.6.3-r1 (stable) does not compile on x86 +# (related to Sabayon hardening) +=dev-lang/ghc-7.6.3 ** + +# Force stable, since shorewall{6,}-lite +# inverse deps are not updated with the same freq. +net-firewall/shorewall-core -~amd64 -~x86 + +# Accept any libav-0.8* and virtual/ffmpeg-0.10* +# This is what we currently support +=virtual/ffmpeg-0.10* ~amd64 ~x86 +=media-video/libav-9* ~amd64 ~x86 +=virtual/ffmpeg-9* ~amd64 ~x86 + +# new libvirt may break virtinst revdep, force stable +app-emulation/libvirt -~amd64 -~x86 + +# Latest libgcrypt may break a gazillion of pkgs, +# wait for it to be stabilized +dev-libs/libgcrypt -~amd64 -~x86 +# allow 1.5 and 1.6 on amd64, mainly due to true multilib +=dev-libs/libgcrypt-1.5* ~amd64 +=dev-libs/libgcrypt-1.6* ~amd64 + +# Force stable, due to Gentoo bug #495236 +dev-python/tempita -~amd64 -~x86 + +# GNOME 3.10/3.12 crap for x86 +# required by =gnome-base/gnome-3.10* (argument) +=gnome-base/gnome-3.12* ** ~x86 +=gnome-extra/gnome-documents-3.12* ** ~x86 +# required by =gnome-base/gnome-extra-apps-3.10* (argument) +=gnome-base/gnome-extra-apps-3.12* ** ~x86 +=net-misc/gnome-online-miners-3.12* ** ~x86 +# required by gnome-weather (argument) +=gnome-extra/gnome-weather-3.12* ** ~x86 +# required by gnome-music (argument) +=media-sound/gnome-music-3.12* ** ~x86 +# required by gnome-photos (argument) +=media-gfx/gnome-photos-3.12* ** ~x86 +# required by gnome-maps (argument) +=sci-geosciences/gnome-maps-3.12* ** ~x86 + +# vlc fails configure with unstable libdvbpsi +media-libs/libdvbpsi -~amd64 -~x86 + +# singular fails with unstable ntl +dev-libs/ntl -~amd64 -~x86 + +# we want stable systemd stack +virtual/udev -~amd64 -~x86 +# accept udev-208-r2 since it provides true multilib support +=virtual/udev-208-r2 ~amd64 +sys-apps/systemd -~amd64 -~x86 +# except systemd-208 +=sys-apps/systemd-208* ~amd64 ~x86 + +# Allow any openssl 0.9.8y revision as well +=dev-libs/openssl-0.9.8* ~amd64 ~x86 +# Allow any openssl 1.0.1 as well, this includes +# true multilib aware versions, only needed for amd64 +=dev-libs/openssl-1.0.1* ~amd64 + +# required by x11-wm/mutter-3.12.1 +# required by gnome-base/gnome-shell-3.12.1 +# required by gnome-shell (argument) +=sys-power/upower-0.99* ** ~amd64 ~x86 +=sys-power/upower-0.100* ** ~amd64 ~x86 + +# required by net-misc/gnome-online-miners-3.12.0 +# required by gnome-extra/gnome-documents-3.12.0 +# required by gnome-documents (argument) +=net-libs/libgfbgraph-0.2* ** ~amd64 ~x86 + +# keep xdebug-client to stable, since devs tend to update +# xdebug and xdebug-client separately +dev-php/xdebug-client -~amd64 -~x86 + +# Prefer a stable and reliable version of freetype +media-libs/freetype -~amd64 -~x86 + +# Allow systemd and upower-0.99 friendly version +=xfce-extra/xfce4-power-manager-1.2.0_p20140527 ** ~amd64 ~x86 amd64 x86 + +# Use stable clhep to avoid breaking geant +sci-physics/clhep -~amd64 -~x86 +# Allow 2.1.4.2 as it works fine +~sci-physics/clhep-2.1.4.2 ~amd64 ~x86 amd64 x86 + +# Use stable libgit2 to allow reverse deps to catch up +dev-libs/libgit2 -~amd64 -~x86 + +# Force stable pyparsing since unstable 2.0.x introduces incompatible changes +dev-python/pyparsing -~amd64 -~x86 + diff --git a/conf/intel/portage/package.license b/conf/intel/portage/package.license index b5d8f82..38b8859 100644 --- a/conf/intel/portage/package.license +++ b/conf/intel/portage/package.license @@ -8,6 +8,8 @@ dev-lang/icc Intel-SDP dev-lang/idb Intel-SDP dev-lang/ifc Intel-SDP dev-libs/intel-common Intel-SDP +dev-util/intel-ocl-sdk Intel-SDP +dev-util/nvidia-cuda-toolkit NVIDIA-CUDA games-action/mutantstorm-demo POMPOM games-action/spacetripper-demo POMPOM games-arcade/thinktanks-demo THINKTANKS @@ -17,6 +19,7 @@ games-fps/quake3-data Q3AEULA games-fps/quake3-demo Q3AEULA games-fps/quake4-demo QUAKE4 games-fps/enemy-territory RTCW-ETEULA +games-fps/urbanterror Q3AEULA Q3AEULA-20000111 games-fps/ut2004 ut2003 games-fps/ut2004-data ut2003 games-server/ut2004-ded ut2003 @@ -26,16 +29,21 @@ games-strategy/darwinia-demo Introversion games-strategy/darwinia Introversion app-cdr/nero Nero-EULA-US games-simulation/bcs-demo BCS +media-sound/google-musicmanager Google-TOS Apache-2.0 MIT LGPL-2.1 gSOAP BSD FDL-1.2 MPL-1.1 openssl ZLIB libtiff net-wireless/broadcom-sta Broadcom app-emulation/virtualbox-bin PUEL -media-sound/google-musicmanager google-talkplugin Apache-2.0 MIT LGPL-2.1 gSOAP BSD FDL-1.2 MPL-1.1 openssl ZLIB as-is -media-tv/livestation Livestation-EULA +media-sound/neroaac Nero-AAC-EULA media-video/makemkv MakeMKV-EULA games-action/heretic2-demo LOKI-EULA -net-im/skype >=net-im/skype-4.0.0.7-r2 skype-4.0.0.7-copyright +net-im/skype >=net-im/skype-4.0.0.7-r2 skype-4.0.0.7-copyright sci-electronics/eagle cadsoft sci-geosciences/googleearth googleearth -www-plugins/adobe-flash AdobeFlash-10.3 -www-plugins/google-talkplugin google-talkplugin +sci-misc/mendeleydesktop Mendeley-EULA +www-client/google-chrome google-chrome +www-plugins/adobe-flash AdobeFlash-10.3 AdobeFlash-11.x +www-plugins/chrome-binary-plugins google-chrome +www-plugins/google-talkplugin Google-TOS dev-java/oracle-jdk-bin Oracle-BCLA-JavaSE dev-java/oracle-jre-bin Oracle-BCLA-JavaSE +sys-firmware/b43-firmware Broadcom +net-misc/teamviewer TeamViewer diff --git a/conf/intel/portage/package.mask b/conf/intel/portage/package.mask deleted file mode 100644 index 08e8579..0000000 --- a/conf/intel/portage/package.mask +++ /dev/null @@ -1,189 +0,0 @@ -# Masked because it requires a flag change. - -# Temp. masked -app-i18n/anthy-ss -app-i18n/atokx2 -app-vim/cvscommand -app-vim/vcscommand -sci-biology/mira ->dev-lang/erlang-13.2.4 -x11-misc/bumblebee::gentoo -x11-plugins/compiz-plugins-main::gentoo -=dev-libs/libxml2-2.8.0_rc1::gentoo - - -# Joost Ruis: Masked because on our overlay, prevent pulling in Portage versions -x11-drivers/ati-drivers::gentoo -media-gfx/splashutils::gentoo -sys-apps/baselayout::gentoo -# remove mask to pull in sys-fs/udev::gentoo for testing -# sys-fs/udev::gentoo - -# Joost Ruis: Needed by masked python:3.1 ->=dev-python/simpletal-5.0 ->=dev-util/eric-5.0.2 ->=net-irc/znc-0.098 ->=net-zope/zope-interface-3.6.1 - -# Sławomir Nizio: needs Python 3 ->=app-text/nfoview-1.10 - -# Joost Ruis: Old as wolfden! -x11-libs/gtk+:1 - -### Blockers - -# 2010-10-29 Joost Ruis: Blocks sci-biology/emboss -sys-devel/cons -dev-java/emma - -# Joost Ruis: Blocks bash -app-shells/bashdb - -# Joost Ruis: Blocks media-gfx/hugin -dev-util/cocom - -# Joost Ruis: We use KDE and want the KDE phonon package -#x11-libs/qt-phonon - -# Joost Ruis: Requires mesa +motif -media-libs/openinventor -sci-biology/arb - -# Joost Ruis: needs pciutils with zlib, but we have it in package.use with -zlib no idea why. -xfce-extra/xfce4-cellmodem-plugin - -### Temp masked due a bug - -### Slotted packages -=www-client/dillo-3 - -### net-misc - -# Joost Ruis: We have Openswan in our tree so we must mask this -net-misc/strongswan - -# Joost Ruis: We have tightvnc in our tree so we must mask this -net-misc/tigervnc - -# Joost Ruis: This package cannot be in tree with distcc -net-misc/pump - -# Joost Ruis: This package cannot be in tree with sys-apps/iproute2 -net-misc/arpd - -#Joost Ruis: Wants >=dev-lang/perl-5.6.1[-ithreads] never going to happen. -net-irc/epic4 - -# Joost Ruis: We use net-misc/ntp so we want to mask this -net-misc/openntpd - -# Joost Ruis: We use net-misc/netkit-telnetd so we want to mask -net-misc/telnet-bsd - -# Joost Ruis: Seems to be incompatible with latest net-misc/asterisk -=net-misc/asterisk-rate_engine-0.5.4 - -# Joost Ruis: We use dev-texlive/texlive-latexextra so we want to mask this -dev-tex/prosper - -# Joost Ruis: wants dev-python/imaging +tk compiled, ain't going to happen -=media-sound/lilycomp-1.0.2-r1 -media-gfx/skencil -media-gfx/asymptote - -### Games - -# Joost Ruis: Requires media-libs/sdl-mixer[timidity] -games-rpg/xu4 -games-arcade/rocksndiamonds - -# Joost Ruis: Wants gd-external for PHP, not want -net-analyzer/pnp4nagios - -# 2010-05-07 Be careful, these versions made xbmc+vdpau go boom -# >media-video/ffmpeg-0.5_p20373 - -# 2010-10-02 Joost Ruis: Needs PHP with +mssql -dev-php/PEAR-MDB2_Driver_mssql - -# 2010-10-02 Joost Ruis: Needs PHP with +firebird -dev-php/PEAR-MDB2_Driver_ibase - -# 2010-10-02 Joost Ruis: Needs PHP with +oci8 -dev-php/PEAR-MDB2_Driver_oci8 - -# 2010-07-26 Joost Ruis: Needs PHP with +xsl -# move dev-php5/phing dev-php/phing -dev-php/phing -dev-php/agavi - -# 2010-10-29 Joost Ruis: Needs media-libs/mesa +motif -sci-chemistry/molmol - -# 2010-10-29 Joost Ruis: collision with sci-libs/gdal -sci-astronomy/cpl -sci-astronomy/esorex - -# 2010-11-16 Joost Ruis: Needs qt-gui with +gtk (What the hell??) -media-sound/qtractor - -# 2010-11-18 Joost Ruis: Blocks media-fonts/jsmath-extra-dark -media-fonts/jsmath-extra-light - -# 2010-11-18 Joost Ruis: Blocks media-fonts/culmus -media-fonts/culmus-ancient - -# 2010-11-26 Fabio Erculiani: Keep networkmanager from our overlay -net-misc/networkmanager::gentoo - -# 2010-12-28 Joost Ruis: Needs vdr with -noepg -media-plugins/vdr-noepgmenu - -# 2010-12-28 Joost Ruis: Needs vdr +setup, but we cannot enable that flag. -media-plugins/vdr-setup - -# 2011-01-08 Fabio Erculiani: broken, resolv.conf issue -# see http://forum.sabayon.org/viewtopic.php?f=52&t=22717 ->net-dns/openresolv-3.4 - -# 2011-08-16 Fabio Erculiani: Cruft we don't want -dev-php/eaccelerator -dev-php/xcache - -# udevadm settle bug on LiveCD boot -# reported upstream... -# Upstream is LAME -# Kay Sievers !! -# >=sys-fs/udev-168 - -# 2011-08-17 Joost Ruis: Wants pulseaudio +gnome -media-sound/paprefs - -# 2011-08-17 Fabio Erculiani: Conflicts with x11-terms/terminal -gnustep-apps/terminal - -# 2011-11-02 Joost Ruis: Breaks games-arcade/smc. See Gentoo bug #357761 ->dev-games/cegui-0.6.2b - -# Fabio Erculiani, matter masks (preserved-libs bullshit): ->app-i18n/fcitx-4.1 ->app-i18n/fcitx-configtool-0.3 - -# 2012-02-15 Joost Ruis: Only use pymol from our overlay since it has depends on python-tk -sci-chemistry/pymol::gentoo diff --git a/conf/intel/portage/package.mask/00-sabayon.package.mask b/conf/intel/portage/package.mask/00-sabayon.package.mask new file mode 100644 index 0000000..8ff8976 --- /dev/null +++ b/conf/intel/portage/package.mask/00-sabayon.package.mask @@ -0,0 +1,284 @@ +# Joost Ruis: Old as wolfden! +x11-libs/gtk+:1 + +### Blockers + +# 2010-10-29 Joost Ruis: Blocks sci-biology/emboss +sys-devel/cons +dev-java/emma + +# Joost Ruis: Blocks bash +app-shells/bashdb + +# Joost Ruis: Blocks media-gfx/hugin +dev-util/cocom + +# Joost Ruis: Requires mesa +motif +sci-biology/arb + +# Joost Ruis: needs pciutils with zlib, but we have it in package.use with -zlib no idea why. +xfce-extra/xfce4-cellmodem-plugin + +### Temp masked due a bug + +### Slotted packages +=www-client/dillo-3 + +### net-misc + +# Joost Ruis: This package cannot be in tree with distcc +net-misc/pump + +# Joost Ruis: This package cannot be in tree with sys-apps/iproute2 +net-misc/arpd + +#Joost Ruis: Wants >=dev-lang/perl-5.6.1[-ithreads] never going to happen. +net-irc/epic4 + +# Joost Ruis: We use net-misc/ntp so we want to mask this +net-misc/openntpd + +# Joost Ruis: We use net-misc/netkit-telnetd so we want to mask +net-misc/telnet-bsd + +# Joost Ruis: Seems to be incompatible with latest net-misc/asterisk +=net-misc/asterisk-rate_engine-0.5.4 + +# Joost Ruis: We use dev-texlive/texlive-latexextra so we want to mask this +dev-tex/prosper + +# Joost Ruis: wants dev-python/imaging +tk compiled, ain't going to happen +=media-sound/lilycomp-1.0.2-r1 +media-gfx/skencil +media-gfx/asymptote + +### Games + +# Joost Ruis: Requires media-libs/sdl-mixer[timidity] +games-rpg/xu4 +games-arcade/rocksndiamonds + +# Joost Ruis: Wants gd-external for PHP, not want +net-analyzer/pnp4nagios + +# 2010-10-02 Joost Ruis: Needs PHP with +mssql +dev-php/PEAR-MDB2_Driver_mssql + +# 2010-10-02 Joost Ruis: Needs PHP with +firebird +dev-php/PEAR-MDB2_Driver_ibase + +# 2010-10-02 Joost Ruis: Needs PHP with +oci8 +dev-php/PEAR-MDB2_Driver_oci8 + +# 2010-07-26 Joost Ruis: Needs PHP with +xsl +# move dev-php5/phing dev-php/phing +dev-php/phing +dev-php/agavi + +# 2010-10-29 Joost Ruis: Needs media-libs/mesa +motif +sci-chemistry/molmol + +# 2010-10-29 Joost Ruis: collision with sci-libs/gdal +sci-astronomy/cpl +sci-astronomy/esorex + +# 2010-11-16 Joost Ruis: Needs qt-gui with +gtk (What the hell??) +media-sound/qtractor + +# 2010-11-18 Joost Ruis: Blocks media-fonts/jsmath-extra-dark +media-fonts/jsmath-extra-light + +# 2010-11-18 Joost Ruis: Blocks media-fonts/culmus +media-fonts/culmus-ancient + +# 2010-11-26 Fabio Erculiani: Keep networkmanager from our overlay +net-misc/networkmanager::gentoo + +# 2010-12-28 Joost Ruis: Needs vdr with -noepg +media-plugins/vdr-noepgmenu + +# 2010-12-28 Joost Ruis: Needs vdr +setup, but we cannot enable that flag +media-plugins/vdr-setup + +# 2011-08-16 Fabio Erculiani: Cruft we don't want +dev-php/eaccelerator +dev-php/xcache + +# udevadm settle bug on LiveCD boot +# reported upstream... +# Upstream is LAME +# Kay Sievers !! +# >=sys-fs/udev-168 + +# 2011-08-17 Joost Ruis: Wants pulseaudio +gnome +media-sound/paprefs + +# 2011-08-17 Fabio Erculiani: Conflicts with x11-terms/terminal +gnustep-apps/terminal + +# 2012-12-14 Fabio Erculiani: it is causing annoying sh errors on chroots +>=app-shells/autojump-21.1.0 + +# 2013-01-13 Fabio Erculiani: we use media-video/libav +media-video/ffmpeg + +# 2013-02-08 Fabio Erculiani: we use man-db +sys-apps/man + +# 2013-04-03 Fabio Erculiani: we are currently supporting 1.14 +>=x11-base/xorg-server-1.15 + +# 2013-06-26 Fabio Erculiani: migrated to logind +sys-auth/consolekit + +# 2013-08-12 Fabio Erculiani: oyranos 0.9.4 wants elektra 0.7 +# stop matter from bumping it for now. +>=app-admin/elektra-0.8 + +# 2013-08-12 Fabio Erculiani: dev-python/python-novaclient and +# dev-python/python-glanceclient want older prettytable and +# matter keeps pulling it it. +# 2013-04-18 Sławomir Nizio: bump masked version to avoid this +# problem, even though 0.7 is the latest currently (relevant +# mask is now: =dev-python/prettytable-0.8 + +# 2013-08-12 Fabio Erculiani: dev-python/sqlalchemy-migrate-0.7 +# requires an older version of sqlalchemy (of course!) +>=dev-python/sqlalchemy-0.8 + +# 2013-08-12 Fabio Erculiani: dev-perl/math-pari wants exactly +# sci-mathematics/pari-2.3.5 +sci-mathematics/pari-2.3.5 + +# 2013-08-20 Fabio Erculiani: dev-python/warlock needs it and matter +# keeps bumping it. +>dev-python/jsonpatch-0.10 + +# 2013-08-26 Fabio Erculiani: mask the gamerlay version of osg +# osg has a very unstable API. +dev-games/openscenegraph::gamerlay + +# 2013-09-16 Fabio Erculiani: wtf? live ebuild with keywords? +>=dev-python/python-keystoneclient-9999 + +# 2013-09-26 Fabio Erculiani: we're shipping with ruby:1.9 atm +>=dev-lang/ruby-2.0 + +# 2013-10-21 Fabio Erculiani: avoid libsdl from gamerlay, since +# version 2 is in the main tree under a different PN (libsdl2). +media-libs/libsdl::gamerlay +games-util/steam-games-meta::gamerlay +games-util/steam-client-meta::gamerlay + +# 2013-11-13 Sławomir Nizio: this package (v. 2013.1.4, 2013.2) +# depends directly or indirectly on packages older than we already +# provide. It cannot be supported properly (easily), and seems to +# be unpopular. +app-admin/glance + +# 2014-03-26 Fabui Erculiani: we now use systemd from sabayon-distro +sys-apps/systemd::systemd-love +sys-apps/systemd::gentoo + +# 2014-04-04 Fabio Erculiani: migrated to dev-python/pillow +dev-python/imaging + +# 2014-04-15 Fabio Erculiani: no tomcat 7.0.53 yet +~dev-java/tomcat-servlet-api-7.0.53 + +# 2014-05-26 Fabio Erculiani: we are still using cpufrequtils +sys-power/cpupower + +# 2014-06-01 Fabio Erculiani: always prefer stable chrome-binary-plugins +www-plugins/chrome-binary-plugins:beta +www-plugins/chrome-binary-plugins:unstable + +# 2014-07-24 Fabio Erculiani: mwlib wants an old pyparsing +>=dev-python/pyparsing-1.6 + +# 2014-08-02 Fabio Erculiani: plymouth 0.9.0 simply does not work +>=sys-boot/plymouth-0.9.0 +>=sys-boot/plymouth-extras-0.9.0 + +# 2014-08-31 Sławomir Nizio: we cannot support it properly, bug 3776 +app-portage/g-octave + +# 2014-09-30 Joost Ruis: Do not pull xbmc from Portage +media-tv/xbmc::gentoo + +# 2014-09-30 Joost Ruis: Do not pull poppler from Portage +app-text/poppler::gentoo + +# 2014-09-30 Joost Ruis: Masked because we bump to latest stable pull and not want to pull in unstable +>virtual/perl-AutoLoader-5.730.0-r2 +>virtual/perl-Package-Constants-0.20.0-r4 +>virtual/perl-CPAN-Meta-2.120.921-r2 +>virtual/perl-CPAN-Meta-YAML-0.8.0-r2 +>virtual/perl-CPAN-Meta-Requirements-2.122.0-r2 +>virtual/perl-ExtUtils-Command-1.170.0-r5 +>virtual/perl-ExtUtils-MakeMaker-6.660.0-r1 +>virtual/perl-ExtUtils-CBuilder-0.280.210-r1 +>virtual/perl-File-Spec-3.400.0-r2 +>virtual/perl-Exporter-5.680.0-r2 +>virtual/perl-DB_File-1.829.0 +>virtual/perl-bignum-0.330.0 +>virtual/perl-Module-Load-0.240.0-r1 +>virtual/perl-Module-Load-Conditional-0.580.0 +>virtual/perl-CGI-3.630.0-r2 +>virtual/perl-Attribute-Handlers-0.940.0-r1 +>virtual/perl-I18N-LangTags-0.390.0 +>virtual/perl-Math-BigInt-FastCalc-0.300.0-r3 +>virtual/perl-Module-Metadata-1.0.11-r1 +>virtual/perl-Net-Ping-2.41-r1 +>virtual/perl-if-0.60.200-r1 +>virtual/perl-IPC-Cmd-0.800.0-r1 +>virtual/perl-JSON-PP-2.272.20-r1 +>virtual/perl-Encode-2.490.0-r2 +>virtual/perl-Socket-2.9.0-r2 +>virtual/perl-Storable-2.410.0-r1 +>virtual/perl-Parse-CPAN-Meta-1.440.400-r1 +>virtual/perl-Time-Piece-1.20-r1 +>virtual/perl-IO-Compress-2.60.0-r1 +>virtual/perl-Compress-Raw-Bzip2-2.60.0-r2 +>virtual/perl-ExtUtils-ParseXS-3.180.0-r2 +>virtual/perl-Pod-Parser-1.600.0 +>virtual/perl-Pod-Escapes-1.40.0-r4 +>virtual/perl-Scalar-List-Utils-1.350.0 +>virtual/perl-Module-Build-0.400.300-r1 +>virtual/perl-Digest-SHA-5.850.0 +>virtual/perl-Test-Harness-3.260.0-r2 +>virtual/perl-Archive-Tar-1.900.0-r2 +>virtual/perl-Compress-Raw-Zlib-2.60.0-r2 +>virtual/perl-XSLoader-0.160.0-r1 +>virtual/perl-Math-BigRat-0.260.400 +>virtual/perl-Perl-OSType-1.3.0-r1 +>virtual/perl-Test-Simple-0.980.0-r5 +>virtual/perl-threads-1.860.0-r3 +>virtual/perl-threads-shared-1.430.0-r1 +>virtual/perl-Thread-Queue-3.20.0-r1 +>virtual/perl-Locale-Maketext-1.230.0-r1 +>dev-lang/perl-5.18.2-r1 + +# 10-03-2014 Joost Ruis: Mask libnl-3 +# See bug #4807 +>=dev-libs/libnl-3.2.25 + +# 2014-10-12 Sławomir Nizio: sci-visualization/mayavi (4.3.0) does not build with it +=sci-libs/vtk-6.0.0* diff --git a/conf/intel/portage/package.unmask b/conf/intel/portage/package.unmask deleted file mode 100644 index c020c52..0000000 --- a/conf/intel/portage/package.unmask +++ /dev/null @@ -1,133 +0,0 @@ -media-sound/potamus -=x11-drivers/nvidia-drivers-275.21 - -# GCC 4.6, welcome! -sys-devel/gcc:4.6::sabayon-distro - -# Needed for the >=games-action/teeworlds-0.6.1 ->=dev-util/bam-0.4.0 - -# Our version is fine -media-video/nvidia-settings::sabayon-distro - -# Unmask Gimp 2.7, we want it -<=media-gfx/gimp-2.8 - -# Anaconda uses it (perhaps bundle it?) - (25 Mar 2012) -# This is now the GNOME 3.4 mask -# Masked for testing, clutter-1.10, and bugs in some packages: -=app-accessibility/accerciser-3.4* -=app-accessibility/at-spi2-atk-2.4* -=app-accessibility/at-spi2-core-2.4* -=app-accessibility/orca-3.4* -=app-admin/gnome-system-log-3.4* -=app-crypt/gcr-3.4* -=app-crypt/seahorse-3.4* -=app-dicts/gnome-dictionary-3.4* -=app-misc/tracker-0.14* ->=dev-libs/folks-0.6.8 -=dev-libs/libgdata-0.12* -=dev-libs/totem-pl-parser-3* -=dev-util/gnome-devel-docs-3.4* -=dev-python/pyatspi-2.4* -=gnome-base/gdm-3.4* -=gnome-base/gnome-control-center-3.4* -=gnome-base/gnome-core-apps-3.4* -=gnome-base/gnome-core-libs-3.4* -=gnome-base/gnome-desktop-3.4* -=gnome-base/gnome-extra-apps-3.4* -=gnome-base/gnome-fallback-3.4* -=gnome-base/gnome-3.4* -=gnome-base/gnome-keyring-3.4* -=gnome-base/gnome-light-3.4* -=gnome-base/gnome-menus-3.4* -=gnome-base/gnome-panel-3.4* -=gnome-base/gnome-power-manager-3.4* -=gnome-base/gnome-session-3.4* -=gnome-base/gnome-settings-daemon-3.4* -=gnome-base/gnome-shell-3.4* -=gnome-base/libgnome-keyring-3.4* -=gnome-base/libgnomekbd-3.4* -=gnome-base/nautilus-3.4* -=gnome-extra/evolution-data-server-3.4* -=gnome-extra/evolution-ews-3.4* -=gnome-extra/evolution-exchange-3.4* -=gnome-extra/evolution-groupwise-3.4* -=gnome-extra/gnome-color-manager-3.4* -=gnome-extra/gnome-contacts-3.4* -=gnome-extra/gnome-documents-0.4* -=gnome-extra/gnome-games-3.4* -=gnome-extra/gnome-search-tool-3.4* -=gnome-extra/gnome-shell-extensions-3.4* ->=gnome-extra/gnome-tweak-tool-3.3 -=gnome-extra/gnome-user-docs-3.4* -=gnome-extra/gnome-utils-3.4* -=gnome-extra/mousetweaks-3.4* -=gnome-extra/nautilus-tracker-tags-0.14* -=gnome-extra/seahorse-nautilus-3.4* -=gnome-extra/sushi-0.4* -=mail-client/evolution-3.4* -=media-gfx/gnome-font-viewer-3.4* -=media-gfx/gnome-screenshot-3.4* -=media-video/cheese-3.4* -=media-video/totem-3.4* -=net-im/empathy-3.4* -=net-libs/gnome-online-accounts-3.4* ->=net-libs/telepathy-farstream-0.2 -=net-wireless/gnome-bluetooth-3.4* -=sys-apps/baobab-3.4* -=x11-libs/libcryptui-3.4* -=x11-libs/libwnck-3.4* ->=x11-wm/metacity-2.34.2 -=x11-wm/mutter-3.4* ->=x11-themes/zukitwo-shell-2012.04.24 -# New clutter API breaks almost everything -=media-libs/cogl-1.10* -=media-libs/clutter-1.10* -=media-libs/clutter-gtk-1.2* -=media-libs/clutter-gst-1.5* -=media-libs/clutter-gst-1.6* -# Needs gst-plugins-flac-0.10.31 + commit 265a5bfa to write seekable flac files -=media-sound/sound-juicer-3.4* - -# We want MySQL 5.5, do we? -=dev-db/mariadb-5.5* -=dev-db/mysql-5.5* -=virtual/mysql-5.5* - -# Unmask for us: -# Chí-Thanh Christopher Nguyễn (11 May 2012) -# Nouveau API break, mask until situation becomes palatable for users -# xf86-video-ati-6.14.5 needs new libdrm -=x11-drivers/nvidia-drivers-275.21 + +# GCC 4.6, welcome! +sys-devel/gcc:4.6::sabayon-distro + +# Needed for the >=games-action/teeworlds-0.6.1 +>=dev-util/bam-0.4.0 + +# Our version is fine +media-video/nvidia-settings::sabayon-distro + +# Anaconda uses it (perhaps bundle it?) + (11 May 2012) +# Nouveau API break, mask until situation becomes palatable for users +# xf86-video-ati-6.14.5 needs new libdrm +=qemu-1.2.0 has been masked on x86 due to futile reasons + (04 Aug 2013) +# API break, reverse dependencies need patching; bug #479458. +=sci-geosciences/geocode-glib-3.10.0 +# required by dev-libs/totem-pl-parser-3.10.0::gnome-next[quvi] +# required by media-video/totem-3.10.1::gnome-next +# required by gnome-base/gnome-core-apps-3.10.1::gnome-next +# required by gnome-base/gnome-3.10.1::gnome-next +# required by gnome-base/gnome (argument) +# /usr/portage/profiles/package.mask: +# Tim Harder (22 May 2013) +# masked for testing +=media-libs/libquvi-0.9.3 +=media-libs/quvi-0.9.4 +# required by app-crypt/seahorse-3.10.1::gnome-next +# required by gnome-base/gnome-core-apps-3.10.1::gnome-next +# required by gnome-base/gnome-3.10.1::gnome-next +# required by gnome-base/gnome (argument) +# /usr/portage/profiles/package.mask: +# Alexandre Rostovtsev (02 Sep 2013) +# Silent API/ABI change; mask until seahorse is patched; bug #483414 +=app-crypt/libsecret-0.16 +# required by media-libs/libquvi-0.9.3 +# required by dev-libs/totem-pl-parser-3.10.0::gnome-next[quvi] +# required by media-video/totem-3.10.1::gnome-next +# required by gnome-base/gnome-core-apps-3.10.1::gnome-next +# required by gnome-base/gnome-3.10.1::gnome-next +# required by gnome-base/gnome (argument) +# /usr/portage/profiles/package.mask: +# Tim Harder (22 May 2013) +# masked for testing +=media-libs/libquvi-scripts-0.9.20131104 + +# Gilles Dartiguelongue (27 Apr 2014) +# Gnome 3.12 mask. Also requires: +# * >=upower-0.99 +>=app-accessibility/accerciser-3.12.0 +>=app-accessibility/at-spi2-atk-2.12.1 +>=app-accessibility/at-spi2-core-2.12.0 +>=app-accessibility/orca-3.12.1 +>=app-arch/file-roller-3.12.1 +>=app-cdr/brasero-3.11.3 +>=app-crypt/gcr-3.12.0 +>=app-crypt/libsecret-0.18 +>=app-crypt/seahorse-3.12.0 +>=app-editors/gedit-3.12.1 +>=app-editors/gedit-plugins-3.12.1 +>=app-misc/bijiben-3.12.0 +>=app-misc/geoclue-2.1.8 +>=app-misc/gnote-3.12.0 +>=app-misc/tracker-1.0.0 +>=app-text/evince-3.12.1 +>=app-text/yelp-tools-3.12.1 +>=dev-cpp/glibmm-2.40.0 +>=dev-cpp/gtkmm-3.12.0 +# don't want -r1 because of emul-linux-x86 crap +=dev-libs/atk-2.12.0 +>=dev-libs/folks-0.9.6-r1 +>=dev-libs/gdl-3.12.0 +>=dev-libs/gjs-1.40.1 +>=dev-libs/glib-2.40.0 +>=dev-libs/gobject-introspection-1.40.0 +>=dev-libs/gobject-introspection-common-1.40.0 +>=dev-libs/json-glib-1.0.0 +>=dev-libs/libgee-0.14.0 +>=dev-libs/libgweather-3.12.1 +>=dev-libs/libpeas-1.10.0 +>=dev-python/pyatspi-2.12.0 +>=dev-python/pygobject-3.12.1 +>=dev-util/anjuta-3.12.0 +>=dev-util/devhelp-3.12.1 +>=dev-util/gdbus-codegen-2.40.0 +>=dev-util/glade-3.18.2 +>=dev-util/gnome-devel-docs-3.12.1 +>=games-arcade/gnome-nibbles-3.12.1 +>=games-arcade/gnome-robots-3.12.1 +>=games-board/four-in-a-row-3.12.1 +>=games-board/gnome-chess-3.12.1 +>=games-board/gnome-mahjongg-3.12.1 +>=games-board/gnome-mines-3.12.1 +>=games-board/iagno-3.12.1 +>=games-board/tali-3.12.1 +>=games-puzzle/five-or-more-3.12.1 +>=games-puzzle/gnome-klotski-3.12.1 +>=games-puzzle/gnome-sudoku-3.12.1 +>=games-puzzle/gnome-tetravex-3.12.1 +>=games-puzzle/lightsoff-3.12.1 +>=games-puzzle/quadrapassel-3.12.1 +>=games-puzzle/swell-foop-3.12.1 +>=gnome-base/dconf-0.20.0 +>=gnome-base/gdm-3.12.1 +>=gnome-base/gnome-3.12.0 +>=gnome-base/gnome-common-3.12.0 +>=gnome-base/gnome-control-center-3.12.1 +>=gnome-base/gnome-core-apps-3.12.0 +>=gnome-base/gnome-core-libs-3.12.0 +>=gnome-base/gnome-desktop-3.12.1 +>=gnome-base/gnome-extra-apps-3.12.0 +>=gnome-base/gnome-keyring-3.12.0 +>=gnome-base/gnome-session-3.12.1 +>=gnome-base/gnome-settings-daemon-3.12.1 +>=gnome-base/gnome-shell-3.12.1 +>=gnome-base/gsettings-desktop-schemas-3.12.0 +>=gnome-base/gvfs-1.20.1 +>=gnome-base/libgnome-keyring-3.12.0 +>=gnome-base/nautilus-3.12.0 +>=gnome-extra/at-spi-2.12.0 +>=gnome-extra/evolution-data-server-3.12.1 +>=gnome-extra/evolution-ews-3.12.1 +>=gnome-extra/gnome-boxes-3.12.1 +>=gnome-extra/gnome-calculator-3.12.1 +>=gnome-extra/gnome-clocks-3.12.0 +>=gnome-extra/gnome-color-manager-3.12.1 +>=gnome-extra/gnome-contacts-3.12.0 +>=gnome-extra/gnome-documents-3.12.0 +>=gnome-extra/gnome-packagekit-3.12.1 +>=gnome-extra/gnome-power-manager-3.12.0 +>=gnome-extra/gnome-shell-extensions-3.12.0 +>=gnome-extra/gnome-system-monitor-3.12.1 +>=gnome-extra/gnome-tweak-tool-3.12.0 +>=gnome-extra/gnome-user-docs-3.12.1 +>=gnome-extra/gnome-weather-3.12.0 +>=gnome-extra/gtkhtml-4.8.0 +>=gnome-extra/gucharmap-3.12.0 +>=gnome-extra/mousetweaks-3.12.0 +>=gnome-extra/nautilus-tracker-tags-1.0.0 +>=gnome-extra/nm-applet-0.9.8.10 +>=gnome-extra/sushi-3.12.0 +>=gnome-extra/yelp-3.12.0 +>=gnome-extra/yelp-xsl-3.12.0 +>=mail-client/evolution-3.12.1 +>=media-gfx/eog-3.12.1 +>=media-gfx/eog-plugins-3.12.1 +>=media-gfx/gnome-font-viewer-3.12.0 +>=media-gfx/gnome-photos-3.12.1 +>=media-gfx/gnome-screenshot-3.12.0 +>=media-libs/clutter-1.18.2 +>=media-libs/cogl-1.18.0 +>=media-libs/libmediaart-0.4.0 +>=media-plugins/grilo-plugins-0.2.12 +>=media-sound/gnome-music-3.12.1 +>=media-sound/gnome-sound-recorder-3.12.1 +>=media-sound/sound-juicer-3.11.90 +>=media-video/cheese-3.12.1 +>=media-video/totem-3.12.0 +>=net-im/empathy-3.12.1 +>=net-im/telepathy-mission-control-5.16.1 +>=net-libs/glib-networking-2.40.1 +>=net-libs/gnome-online-accounts-3.12.0 +>=net-libs/libgfbgraph-0.2.2 +>=net-libs/libsoup-2.46.0 +>=net-libs/libsoup-gnome-2.46.0 +>=net-libs/rest-0.7.91 +>=net-libs/webkit-gtk-2.4.1 +>=net-misc/gnome-online-miners-3.12.0 +>=net-misc/networkmanager-0.9.8.10 +>=net-misc/vinagre-3.12.1 +>=net-misc/vino-3.12.0 +>=net-wireless/gnome-bluetooth-3.12.0 +>=sci-geosciences/geocode-glib-3.12.0 +>=sci-geosciences/gnome-maps-3.12.1 +>=sys-apps/baobab-3.12.1 +>=sys-apps/gnome-disk-utility-3.12.1 +>=sys-libs/libosinfo-0.2.10 +>=www-client/epiphany-3.12.0 +>=x11-libs/gnome-pty-helper-0.36.0 +>=x11-libs/gtk+-3.12.1 +>=x11-libs/gtksourceview-3.12.1 +>=x11-libs/vte-0.36.0 +>=x11-terms/gnome-terminal-3.12.0 +>=x11-themes/gnome-backgrounds-3.12.1 +>=x11-themes/gnome-icon-theme-3.12.0 +>=x11-themes/gnome-icon-theme-extras-3.12.0 +>=x11-themes/gnome-icon-theme-symbolic-3.12.0 +>=x11-themes/gnome-themes-standard-3.12.0 +>=x11-wm/mutter-3.12.1 +# required by app-misc/tracker-0.16.4[iso] +# required by gnome-base/nautilus-3.12.0::sabayon-distro +# required by app-text/evince-3.12.1[nautilus] +# required by gnome-extra/gnome-documents-3.12.0 +# required by gnome-documents (argument) +# /usr/portage/profiles/package.mask: +# Gilles Dartiguelongue (27 Apr 2014) +# Gnome 3.12 mask. Also requires: +# * >=upower-0.99 +=sys-libs/libosinfo-0.2* +# required by app-misc/tracker-1.0.0 +# required by gnome-extra/gnome-documents-3.12.0 +# required by gnome-documents (argument) +# /usr/portage/profiles/package.mask: +# Gilles Dartiguelongue (27 Apr 2014) +# Gnome 3.12 mask. Also requires: +# * >=upower-0.99 +=media-libs/libmediaart-0.4* +# required by net-misc/gnome-online-miners-3.10.3 +# required by gnome-extra/gnome-documents-3.12.0 +# required by gnome-documents (argument) +# /usr/portage/profiles/package.mask: +# Gilles Dartiguelongue (27 Apr 2014) +# Gnome 3.12 mask. Also requires: +# * >=upower-0.99 +=app-misc/tracker-1.0* + +# required by gnome-base/nautilus-3.12.0::sabayon-distro[tracker] +# required by nautilus (argument) +# /usr/portage/profiles/package.mask: +# Gilles Dartiguelongue (27 Apr 2014) +# Gnome 3.12 mask. Also requires: +# * >=upower-0.99 +=gnome-extra/nautilus-tracker-tags-1.0* +# required by net-misc/gnome-online-miners-3.12.0 +# required by gnome-extra/gnome-documents-3.12.0 +# required by gnome-documents (argument) +# /usr/portage/profiles/package.mask: +# Gilles Dartiguelongue (27 Apr 2014) +# Gnome 3.12 mask. Also requires: +# * >=upower-0.99 +=net-libs/libgfbgraph-0.2* + +# True multilib aware openal, want! +=media-libs/openal-1.15.1-r1 + +# Michał Górny (28 Feb 2014) +# New multilib conversions for testing, grouped with corresponding +# emul-linux bumps. Please unmask in order, after getting ACK from +# package maintainer. +# +# Note: yngwin explicitly requested 30 days + 1 version bump for cairo. +>=dev-libs/libgcrypt-1.6.1-r1 +dev-libs/libgcrypt:11 +>=dev-libs/lzo-2.06-r1 +>=app-emulation/emul-linux-x86-baselibs-20131008-r20 +>=x11-libs/cairo-1.12.16-r1 +>=app-emulation/emul-linux-x86-gtklibs-20131008-r2 +>=x11-libs/gdk-pixbuf-2.30.5-r1 +>=app-emulation/emul-linux-x86-gtklibs-20131008-r3 +>=media-gfx/graphite2-1.2.4-r1 +>=media-libs/harfbuzz-0.9.26-r1 +>=x11-libs/pango-1.36.2-r1 +>=app-emulation/emul-linux-x86-gtklibs-20131008-r4 +=dev-libs/libxslt-1.1.28-r2 +=sys-libs/slang-2.2.4-r1 +=media-libs/giflib-4.2.3-r1 +=media-libs/libart_lgpl-2.3.21-r2 +=net-libs/libtirpc-0.2.4-r2 +=sys-libs/cracklib-2.9.1-r1 +=sys-libs/pam-1.1.8-r2 +=sys-devel/flex-2.5.39-r1 +=net-libs/neon-0.30.0-r1 +=dev-libs/nspr-4.10.6-r1 +=net-misc/curl-7.37.0-r1 + +# We want LXC 1.0.x +=app-emulation/lxc-1.0* diff --git a/conf/intel/portage/package.use/00-sabayon.package.use b/conf/intel/portage/package.use/00-sabayon.package.use index 2c49ba3..f6ee0ec 100644 --- a/conf/intel/portage/package.use/00-sabayon.package.use +++ b/conf/intel/portage/package.use/00-sabayon.package.use @@ -1,172 +1,303 @@ ## If you dont want to organize it, put new entries in at the very end app-accessibility/dasher gnome +# These two want either one of alsa pulseaudio, etc +app-accessibility/julius -alsa pulseaudio -oss -portaudio +app-accessibility/simon -alsa pulseaudio -oss -portaudio -app-admin/conky audacious hddtemp imlib iostats lua lua-imlib lua-cairo mpd thinkpad -ipv6 +app-admin/conky audacious hddtemp imlib iostats lua lua-imlib lua-cairo mpd thinkpad weather-metar weather-xoap -ipv6 +# eselect-php now contains fpm init script and apache stuff +app-admin/eselect-php fpm apache2 +app-admin/gnome-system-tools nfs +# PackageKit, Sabayon config +app-admin/packagekit entropy cron pm-utils -qt4 -gtk +# PackageKit settings +app-admin/packagekit-base pm-utils entropy -bash-completion app-admin/ulogd mysql app-arch/advancecomp mng -app-arch/file-roller -nautilus -app-arch/mate-file-archiver caja +# GNOME PackageKit support +app-arch/file-roller -nautilus packagekit +app-arch/engrampa caja +app-arch/p7zip -kde -wxwidgets +# vzctl and other packages now require xattr support in tar +app-arch/tar xattr +app-arch/unzip natspec +# Disable KDE on backintime +app-backup/backintime gnome -kde app-backup/bacula sqlite3 app-backup/deja-dup nautilus app-backup/fsarchiver lzma +app-benchmarks/phoronix-test-suite gd -gtk + app-cdr/brasero nautilus app-cdr/cdrdao -gnome +app-cdr/dvd95 sse sse2 app-cdr/k3b taglib +app-cdr/xfburn gstreamer +# required by seahorse +app-crypt/gcr vala +# We really wanted USE=static in order +# to not add many pkgs on 700Mb sized ISO +# images but it turned out to be buggy, +# see bug 2781 +app-crypt/gnupg -static bzip2 smartcard +# required by app-backup/deja-dup +app-crypt/libsecret vala app-crypt/mit-krb5 krb4 openldap +# app-crypt/pinentry is now a meta-package +# enable GTK2 by default, people complaining +# about dependencies, should really use pinentry-base +# instead +app-crypt/pinentry gtk qt4 -app-laptop/pommed -gtk -app-laptop/tp_smapi hdaps app-editors/bluefish gnome app-editors/emacs xft -app-editors/vim vim-pager +app-editors/gedit-plugins terminal +# USE=spell wants Python 3.2, doesn't allow 3.3 +app-editors/retext -spell +app-editors/vim cscope ruby vim-pager app-editors/xemacs xft +app-emacs/auctex preview-latex + # virt stuff -app-emulation/libvirt kvm qemu virt-network lvm caps iscsi nfs parted uml python -app-emulation/qemu-kvm no_kernel_module -app-emulation/qemu-kvm havekernel -modules vde qemu-ifup spice fdt -app-emulation/virtualbox-bin additions vboxwebsrv -chm rdesktop-vrdp +app-emulation/e-uae capslib app-emulation/emul-linux-x86-soundlibs esd +app-emulation/ganeti kvm lxc htools +app-emulation/libvirt kvm qemu virt-network lvm caps iscsi nfs parted uml python xen +app-emulation/qemu fdt spice -gtk virtfs xattr +app-emulation/vice gnome +app-emulation/virtualbox-bin additions vboxwebsrv -chm rdesktop-vrdp +# Wine, more features +app-emulation/wine fontconfig samba udisks +app-emulation/winetricks -gtk +# add HVM +app-emulation/xen-tools hvm qemu # USE flag gtk3 enabled on app-i18n/ibus makes it depend on both slots of Gtk+; it shouldn't # be a real problem though since everyone nowadays has normally both of them installed. # Advantage is that it will be working for applications using either version of the toolkit # which also helps make it just work (bug 2518). It may be revisited in the future if needed. -app-i18n/ibus gtk3 +app-i18n/ibus gtk3 dconf +app-i18n/skk-jisyo cdb app-laptop/pommed -gtk +app-laptop/tp_smapi hdaps + +app-leechcraft/lc-lmp kde + +app-misc/ddccontrol -gtk -gnome +app-misc/gcstar stats + +# Kernel drivers are unwanted for lirc, they're in-kernel +app-misc/lirc -lirc_devices_audio -lirc_devices_audio_alsa -lirc_devices_serial + +app-misc/mc -slang +# app-misc/recoll cannot use both inotify and fam, only one of them. +app-misc/recoll -fam inotify +app-misc/sphinx mysql +app-misc/tuxcmd-modules gnome unrar + +app-mobilephone/gnokii sms -X +app-mobilephone/kannel mysql app-office/abiword plugins +app-office/calligra kdepim semantic-desktop app-office/dia gnome-print app-office/glabels doc app-office/gnucash chipcard hbci ofx quotes sqlite app-office/homebank ofx -app-office/libreoffice -nsplugin gnome java templates -kde pdfimport +app-office/kmymoney hbci ofx +app-office/libreoffice -nsplugin gnome java templates -kde pdfimport binfilter gtk3 gstreamer app-office/libreoffice-l10n-meta linguas_as linguas_as_IN linguas_ast linguas_be linguas_be_BY linguas_bo linguas_brx linguas_ca_XV linguas_dgo linguas_dz linguas_en_ZA linguas_fo linguas_gd linguas_gu linguas_hi_IN linguas_ia linguas_id linguas_ka linguas_kn linguas_kok linguas_ks linguas_ku linguas_ky linguas_lo linguas_mai linguas_mi linguas_ml linguas_ml_IN linguas_mni linguas_mr linguas_mr_IN linguas_my linguas_ne linguas_nr linguas_ns linguas_nso linguas_oc linguas_om linguas_or linguas_or_IN linguas_pa_IN linguas_pap linguas_ps linguas_sa_IN linguas_sat linguas_sd linguas_sh linguas_si linguas_sq linguas_st linguas_sw linguas_sw_TZ linguas_te linguas_te_IN linguas_th linguas_ti linguas_ti_ER linguas_tn linguas_ts linguas_ug linguas_ur_IN linguas_ve linguas_xh linguas_zu app-office/magicpoint mng -app-misc/ddccontrol -gtk -gnome -app-misc/gcstar stats -app-misc/mc -slang - -app-mobilephone/gnokii sms -X - +app-pda/gtkpod gstreamer app-pda/libopensync-plugin-syncml obex app-portage/eix sqlite +app-portage/layman bazaar git mercurial subversion app-text/aspell -linguas_af -linguas_be -linguas_bg -linguas_br -linguas_ca -linguas_cs -linguas_cy -linguas_da -linguas_de -linguas_el -linguas_en -linguas_eo -linguas_es -linguas_et -linguas_fi -linguas_fo -linguas_fr -linguas_ga -linguas_gl -linguas_he -linguas_hr -linguas_is -linguas_it -linguas_lt -linguas_nl -linguas_no -linguas_pl -linguas_pt -linguas_pt_BR -linguas_ro -linguas_ru -linguas_sk -linguas_sl -linguas_sr -linguas_sv -linguas_uk -linguas_vi app-text/hunspell -linguas_af -linguas_be -linguas_bg -linguas_br -linguas_ca -linguas_cs -linguas_cy -linguas_da -linguas_de -linguas_el -linguas_en -linguas_eo -linguas_es -linguas_et -linguas_fi -linguas_fo -linguas_fr -linguas_ga -linguas_gl -linguas_he -linguas_hr -linguas_hu -linguas_is -linguas_it -linguas_lt -linguas_lv -linguas_mk -linguas_ms -linguas_nb -linguas_nl -linguas_nn -linguas_no -linguas_pl -linguas_pt -linguas_ro -linguas_ru -linguas_sk -linguas_sl -linguas_sr -linguas_sv -linguas_uk -linguas_vi app-text/djvu threads -nsplugin app-text/enchant aspell +app-text/evince djvu dvi gnome-keyring nautilus app-text/fbreader -gtk app-text/ghostscript-gpl -cjk -gtk app-text/lcdf-typetools kpathsea -app-text/mate-document-viewer caja mate mate-keyring +app-text/atril caja djvu dvi mate mate-keyring app-text/stardict tools app-text/texlive -truetype +app-text/texlive-core xetex # qt4 is a bit overkill for highlight # our servers don't want qt4 either. app-text/highlight -qt4 +app-text/qpdfview sqlite +# qt4 is overkill for cmake as well +dev-util/cmake -qt4 # Since those are not linker deps, we # can drop then and let users decide # to install the fonts they want app-text/ghostscript-gpl -linguas_ja -linguas_ko -linguas_zh_CN -linguas_zh_TW +# required for blender +dev-cpp/glog gflags + +dev-db/freetds mssql +# dev-db/mongodb should use V8. Allows to fix bug 3069 +# embedded-v8 due to incompatiblity with Chromium - Gentoo bug 471582 +dev-db/mongodb v8 embedded-v8 +dev-db/postgresql-base threads # soundex required by Entropy # secure-delete required by xulrunner -dev-db/sqlite soundex extensions +# unlock-notify required by dev-db/libzdb +dev-db/sqlite soundex extensions unlock-notify +# We don't have Oracle +dev-db/tora -oracle dev-embedded/avr-libc -selinux dev-embedded/openocd ftdi dev-games/cegui devil dev-games/crystalspace mng +dev-games/ode double-precision +dev-games/ogre cg ois +dev-games/physfs hog -dev-java/antlr cxx +dev-java/antlr cxx script dev-java/bsh bsf dev-java/glazedlists java5 +dev-java/gnu-classpath gstreamer -qt4 # micia: disable source inclusion in icedtea, save some space dev-java/icedtea -source +# Needed for Netbeans ide +dev-java/swing-layout source dev-java/swt cairo -xulrunner dev-java/swt -firefox +# net-p2p/vuze requires swt[gnome] in order to work, see bug #3724 +dev-java/swt gnome dev-java/tomcat-servlet-api java5 -dev-lang/fpc source +dev-lang/fpc source ide +# icc doesn't like LINGUAS=ja on ifc +dev-lang/ifc idb -linguas_ja dev-lang/lua deprecated dev-lang/mono moonlight dev-lang/ocaml tk -dev-lang/php apache2 bcmath calendar cgi ctype curl filter fpm ftp gd hash imap json mhash mysql mysqli mysqlnd odbc pcntl pcre pdo posix postgres reflection simplexml snmp soap sockets spl sqlite sqlite3 tidy tokenizer wddx xml xmlreader xmlwriter xsl zip sysvipc -dev-lang/python sqlite +dev-lang/parrot pcre +dev-lang/php -threads apache2 bcmath calendar cgi ctype curl filter fpm ftp gd hash imap intl json mhash mysql mysqli mysqlnd odbc pcntl pcre pdo posix postgres reflection simplexml snmp soap sockets spl sqlite sqlite3 tidy tokenizer wddx xml xmlreader xmlwriter xsl zip sysvipc xslt +dev-lang/python sqlite berkdb dev-libs/beecrypt threads -dev-libs/boost python threads +# Needed by some lisp packages +dev-libs/boehm-gc threads +dev-libs/boost python threads icu +# Enable threading support in botan +dev-libs/botan threads +dev-libs/crypto++ sse3 +# Needed by directvnc +dev-libs/DirectFB dynload fbcon dev-libs/dbus-glib bash-completion -dev-libs/folks eds +# Required by terminology +dev-libs/efl pulseaudio audio -xcb pixman sound X +dev-libs/folks eds vala dev-libs/gdl gnome # 2010-04-6, trying to disable USE="mono" from gmime dev-libs/gmime -mono +# Required by bitcoin-qt +dev-libs/leveldb -snappy +dev-libs/libassuan static-libs +dev-libs/libf2c static-libs +dev-libs/libgcrypt static-libs +# Required by gnome-documents 3.6 +dev-libs/libgdata gnome +dev-libs/libgpg-error static-libs +dev-libs/libksba static-libs dev-libs/libmcs -kde +dev-libs/libxml2 icu +dev-libs/nss utils +dev-libs/popt static-libs dev-libs/pth static-libs dev-libs/soprano clucene redland -java +dev-libs/tinyxml stl +dev-libs/tntnet sdk dev-libs/xerces-c xqilla icu dev-libs/xmlrpc-c curl +dev-libs/xmlsec gcrypt # See Sabayon bug #1020 dev-libs/openct pcsc-lite -dev-ml/camlimages gs +dev-ml/camlimages gs postscript dev-ml/lablgl glut +dev-ml/lablgtk gnomecanvas dev-perl/PDL fftw dev-python/cgkit 3ds -dev-python/imaging tk +# Make possible to have dev-python/epydoc without python compiled with tk +dev-python/epydoc -X +dev-python/ipython -wxwidgets dev-python/matplotlib -wxwindows +# Required by dev-python/graph-tool +dev-python/numpy lapack +# We want sqlite3 support in pypy +dev-python/pypy sqlite dev-python/pyside script +dev-python/pyudev pyqt4 # don't require media-libs/alsa-lib[alisp] dev-python/pyglet -alsa -# we can't have +tk on Python -dev-python/imaging -tk - -# Make possible to have dev-python/epydoc without python compiled with tk -dev-python/epydoc -X +dev-qt/qt-creator autotools cmake git subversion valgrind examples +dev-qt/qt3support kde +dev-qt/qthelp compat +dev-qt/qtwebkit kde icu dev-scheme/guile regex discouraged networking +dev-scheme/racket backtrace futures jit places threads dev-db/sqliteodbc sqlite3 dev-db/mysql -berkdb embedded pic extraengine +dev-db/mariadb -berkdb embedded extraengine virtual/mysql embedded dev-tcltk/tclxml expat -dev-vcs/bzr bash-completion curl sftp +dev-util/anjuta subversion dev-util/biew mmx sse dev-util/codeblocks contrib dev-util/eclipse-sdk java6 +dev-util/geany-plugins enchant gtkspell dev-util/glade -gnome -dev-vcs/git curl webdav -subversion -gtk -dev-vcs/git bash-completion dev-util/jay java -dev-util/qt-creator autotools cmake git subversion valgrind examples +dev-util/kdevelop php qthelp ruby +dev-util/kdevplatform git subversion +dev-util/nvidia-cuda-sdk opencl + +dev-vcs/bzr bash-completion curl sftp +dev-vcs/git curl webdav -subversion -gtk +dev-vcs/qct mercurial subversion dev-vcs/subversion -java -apache2 -dso -kde # use minimal so it doesn't depend on dev-python/imaging[tk] games-board/pysolfc minimal games-emulation/generator sdlaudio +games-emulation/qmc2 sdlmess +# Corsix USE=wxwidgets requires masked (dev) wxGTK 2.9 +games-engines/corsix-th -wxwidgets games-engines/stratagus mng +games-fps/darkplaces textures games-fps/freedoom doomsday games-fps/nexuiz dedicated maps games-fps/worldofpadman maps @@ -183,16 +314,28 @@ games-util/springlobby bittorrent gnome-base/gconf policykit gnome-base/gnome-applets gnome networkmanager gstreamer gnome-base/gvfs ios samba gnome gdu fuse archive gnome-keyring udisks +# Needed by net-analyzer/ehterape +gnome-base/libgnomecanvas glade gnome-base/librsvg gnome gnome-base/nautilus gnome sendto gnome-extra/avant-window-navigator doc gnome xfce gnome-extra/avant-window-navigator-extras gnome -gnome-extra/evolution-data-server ldap kerberos +gnome-extra/evolution-data-server ldap kerberos vala gnome-extra/gnome-games -sudoku gnome-extra/libgsf gnome -gnome-extra/zeitgeist-extensions fts +gnome-extra/nautilus-sendto -cdr +# nm-applet-gtk2 is the bloody version of nm-applet +# used by non-gtk3 DEs, like LXDE, Xfce, E17, ... +# Cannot enable bluetooth because gnome-bluetooth-3.x +# is gtk3 as well +gnome-extra/nm-applet-gtk2 -bluetooth modemmanager +# disable fts because gnome-extra/zeitgeist-extensions[fts] doesn't allow gnome-extra/zeitgeist[fts] +gnome-extra/zeitgeist-extensions -fts +# See bug 3619 +kde-base/ark lzma +kde-base/dolphin semantic-desktop thumbnail kde-base/gwenview kipi semantic-desktop kde-base/kactivities semantic-desktop kde-base/ksnapshot kipi @@ -201,36 +344,58 @@ kde-base/kde-l10n linguas_be linguas_csb linguas_ne linguas_th linguas_wa kde-base/kdebase-runtime-meta semantic-desktop kde-base/kde-meta -nls semantic-desktop kde-base/kdepim-meta -nls +kde-base/kdepimlibs semantic-desktop kde-base/kdebase-kioslaves samba kde-base/kdelibs jpeg2k -pertty acl semantic-desktop +# kill linguas on kdepim-runtime, we ship it in kde-l10n +kde-base/kdepim-runtime -linguas_ar -linguas_be -linguas_ca -linguas_ca@valencia -linguas_cs -linguas_da -linguas_de -linguas_el -linguas_en_GB -linguas_eo -linguas_es -linguas_et -linguas_fi -linguas_fr -linguas_ga -linguas_gl -linguas_hr -linguas_hu -linguas_ia -linguas_it -linguas_ja -linguas_kk -linguas_km -linguas_ko -linguas_lt -linguas_lv -linguas_mai -linguas_nb -linguas_nds -linguas_nl -linguas_nn -linguas_pa -linguas_pl -linguas_pt -linguas_pt_BR -linguas_ro -linguas_ru -linguas_se -linguas_sk -linguas_sl -linguas_sv -linguas_th -linguas_tr -linguas_uk -linguas_zh_CN -linguas_zh_TW google kolab +kde-base/kdeplasma-addons desktopglobe json oauth semantic-desktop +kde-base/kget bittorrent semantic-desktop +kde-base/klipper prison kde-base/kopete addbookmarks alias autoreplace connectionstatus contactnotes gadu groupwise highlight history irc jingle -kdeenablefinal netmeeting nowlistening oscar otr qq sametime skype statistics texteffect translator webpresence winpopup yahoo +kde-base/krdc vnc kde-base/krunner xcomposite kde-base/kwin captury xcomposite -kde-base/solid networkmanager -wicd +# Required by plasma-workspace +kde-base/libplasmaclock semantic-desktop +kde-base/marble plasma kde-base/okular chm djvu ebook crypt kde-base/phonon-kde -xine -kde-base/marble plasma -# See bug 3619 -kde-base/ark lzma +kde-base/plasma-workspace semantic-desktop python +kde-base/pykde4 semantic-desktop +kde-base/superkaramba python -kde-misc/networkmanagement openvpn networksettings +kde-misc/networkmanagement openvpn networksettings -linguas_ar -linguas_bs -linguas_ca -linguas_cs -linguas_da -linguas_de -linguas_el -linguas_es -linguas_et -linguas_fa -linguas_fi -linguas_fr -linguas_ga -linguas_gl -linguas_hu -linguas_it -linguas_ja -linguas_kk -linguas_km -linguas_lt -linguas_nb -linguas_nds -linguas_nl -linguas_nn -linguas_pl -linguas_pt -linguas_pt_BR -linguas_ro -linguas_ru -linguas_se -linguas_sk -linguas_sl -linguas_sr -linguas_sr@Latn -linguas_sv -linguas_tr -linguas_uk -linguas_zh_CN -linguas_zh_TW -mail-client/claws-mail bogofilter -kde -pda +mail-client/claws-mail archive bogofilter calendar networkmanager pdf perl python rss spam-report webkit -kde -pda mail-client/evolution exchange mail-client/mail-notification mozilla pop mbox gmail +mail-client/mutt sasl sidebar smtp mail-client/thunderbird lightning -linguas_en_GB -linguas_es_AR -linguas_es_ES -linguas_fy -linguas_fy_NL -linguas_ga -linguas_ga_IE -linguas_gu_IN -linguas_ka -linguas_ku -linguas_nb -linguas_nb_NO -linguas_nn -linguas_nn_NO linguas_pl -linguas_pt -linguas_pt_BR -linguas_pt_PT -linguas_sv_SE -linguas_zh_CN -linguas_zh_TW -pa_IN mail-filter/dovecot-antispam dspam +mail-filter/maildrop authlib mail-filter/procmail mbox mail-filter/spamassassin-fuzzyocr gocr +mail-mta/netqmail qmail-spp +# More postfix features +mail-mta/postfix mbox sasl + +# We want the MATE NetworkManager applet +mate-base/mate-applets networkmanager +mate-base/caja mate + mate-extra/mate-file-manager-sendto -cdr media-fonts/baekmuk-fonts -X media-gfx/asymptote -latex -media-gfx/blender blender-game verse +# Blender uses Python 3 +media-gfx/blender python_single_target_python3_4 python_targets_python3_4 media-gfx/exiv2 xmp +# l10n issue is handled by entropy dep_rewrite +media-gfx/digikam handbook semantic-desktop media-gfx/gimageview mng media-gfx/gimp aalib mng wmf smp media-gfx/gphoto2 aalib @@ -241,22 +406,59 @@ media-gfx/k3d 3ds media-gfx/kphotoalbum kipi # micia, add documentation for librecad, so that help menu works properly media-gfx/librecad doc +# SSE2 required, otherwise it does not merge +media-gfx/luminance-hdr sse2 +# required for some functionality of Inkscape - bug 2941 +media-gfx/pstoedit plotutils +# Newer kernels do not provide vid4l +media-gfx/sane-backends threads -v4l +media-gfx/sane-frontends gimp media-gfx/splashutils mng fbcondecor media-gfx/xsane tiff media-gfx/zbar imagemagick v4l media-libs/blib aalib +# required by media-sound/picard +media-libs/chromaprint tools +# Needed for gnome-shell +media-libs/clutter opengl introspection +# Needed by freecad +media-libs/coin doc media-libs/devil mng -media-libs/freetype -X -auto-hinter +# move x11-libs/evas media-libs/evas +media-libs/evas fontconfig sse threads +media-libs/freetype -X -auto-hinter adobe-cff +media-libs/gd fontconfig +# LibreOffice wants it +media-libs/harfbuzz icu +# In order to generate files in different formats, we need to enable imlib +media-libs/libcaca imlib media-libs/libgphoto2 exif media-libs/libggi aalib +media-libs/libgpod ios +# Required by media-gfx/darktable +media-libs/libraw demosaic +media-libs/libsamplerate sndfile media-libs/libsdl aalib +# 32bit libs on amd64, list them here +media-libs/libsdl2 abi_x86_32 +media-libs/libsfml doc examples +media-libs/libsoundtouch sse2 media-libs/libxtract fftw media-libs/mediastreamer video -media-libs/mesa g3dvl nptl openvg pic shared-dricore shared-glapi video_cards_i915 video_cards_i965 video_cards_intel video_cards_nouveau video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_via video_cards_vmware video_cards_radeonsi xa vdpau xorg -media-libs/mlt -qt3 melt frei0r kde quicktime python +# www-client/chromium wants media-libs/mesa[gles2] +media-libs/mesa gbm g3dvl nptl openvg pic shared-dricore shared-glapi video_cards_i915 video_cards_i965 video_cards_intel video_cards_nouveau video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_via video_cards_vmware video_cards_radeonsi xa xorg gles2 +media-libs/ming php +media-libs/mlt melt frei0r kdenlive quicktime python media-libs/openexr -video_cards_nvidia +# on amd64, if ABI_X86=32 is set, exif must be unset +media-libs/oyranos -exif media-libs/sdl-mixer midi timidity mod mikmod +# required by games-engines/gargoyle:0 +# USE=mikmod required by gltron +media-libs/sdl-sound modplug mikmod +media-libs/svgalib -kernel-helper +media-libs/swfdec gstreamer media-libs/tiff lzma media-libs/vigra fftw media-libs/vips fftw @@ -264,7 +466,10 @@ media-libs/urt gs media-libs/xine-lib aalib fbcon mng vidix dxr3 -win32codecs -gtk media-plugins/alsa-plugins libsamplerate pulseaudio -media-plugins/audacious-plugins chardet cue ffmpeg gnome -gtk gtk3 icecast libsamplerate sndfile wavpack +media-plugins/audacious-plugins chardet cue gnome -gtk gtk3 icecast libsamplerate sndfile wavpack +# Enable the http plugin +media-plugins/gst-plugins-meta mms http +media-plugins/kipi-plugins calendar gpssync media-plugins/vdr-weatherng dxr3 media-radio/tucnak2 fftw @@ -273,14 +478,29 @@ media-sound/alsa-tools -gtk media-sound/amarok lastfm cdaudio ifp njb mtp musicbrainz -xmms mp4 embedded media-sound/ardour freesound media-sound/asunder wavpack -media-sound/audacity ladspa vamp +media-sound/audacity ladspa vamp soundtouch id3tag midi -ffmpeg media-sound/audacious -gtk gtk3 wma timidity lirc dbus chardet media-sound/banshee podcast -ipod -zeroconf mtp njb +media-sound/cantata replaygain taglib cdparanoia devices +media-sound/clementine lastfm ios moodbar mtp +media-sound/cmus mikmod +media-sound/deadbeef alac ape cover curl lastfm m3u hotkeys sndfile supereq wavpack +media-sound/gmusicbrowser gstreamer +media-sound/gpodder gstreamer media-sound/jack-audio-connection-kit -mmx -cpudetection -ffado -media-sound/leechcraft-lmp kde media-sound/lmms fftw fluidsynth +media-sound/mixxx shout +media-sound/moc curl sndfile +media-sound/mp3splt-gtk gstreamer media-sound/ncmpcpp curl media-sound/qtractor sse +# Enable system-wide pulseaudio, also see bug #4009 +# Disable qt4 +# 2013-07-11: gtk3 is only used to set a proper window icon... +media-sound/pulseaudio system-wide -qt4 -gtk +# 2.92 with USE=cdr requires =app-cdr/brasero-3.4* but +# gnome-base/gnome-core-apps[cdr] depends on >=app-cdr/brasero-3.6.1 +media-sound/rhythmbox -cdr media-sound/snd fftw media-sound/sonic-visualiser fftw >=media-sound/soundkonverter-0.2.90-r1 lame @@ -290,70 +510,106 @@ media-sound/kid3 -mp4 media-tv/freevo lirc matrox media-tv/xawtv aalib -# Disabling vaapi for now, see bug #2221 -media-tv/xbmc vdpau css -vaapi webserver rtmp xrandr - -# 32bit plugin is unwanted, enabling vdpau doesn't change anything actually -www-plugins/adobe-flash -32bit +media-tv/xbmc airplay bluray css goom mysql pvr rtmp upnp webserver xrandr sftp nfs # Disable MMX due to compile failures media-tv/mythtv fftw media-video/blinkensim aalib -# To enable vdpau, video_cards_nvidia USE flag must be enabled -virtual/ffmpeg threads ogg vhook faac faad vdpau video_cards_nvidia amr cpudetection vaapi vpx -media-video/ffmpeg threads ogg vhook faac faad vdpau video_cards_nvidia amr cpudetection vaapi vpx -media-video/libav amr cpudetection faac faad ogg rtmp threads vaapi vdpau vhook video_cards_nvidia vpx -media-video/mplayer 3dnow 3dnowext aalib amr ass bl cddb cdparanoia cpudetection dvdnav -dxr3 ftp ladspa lirc -live md5sum mmxext mng mp2 openal pnm radio rar rtc sse sse2 ssse3 tga tivo vdpau vidix vpx x264 zoran +media-video/dvgrab quicktime +virtual/ffmpeg threads ogg vhook faac faad video_cards_nvidia amr cpudetection vpx jpeg2k +media-video/ffmpeg threads ogg vhook faac faad video_cards_nvidia amr cpudetection vpx +media-video/jubler mplayer +media-video/kino gstreamer quicktime +media-video/libav amr cpudetection faac faad ogg rtmp threads vhook video_cards_nvidia vpx jpeg2k +media-video/miro faac +media-video/mplayer 3dnow 3dnowext aalib amr ass bl cddb cdparanoia cpudetection dvdnav -dxr3 faac rtmp ftp ladspa lirc -live md5sum mmxext mng mp2 openal pnm radio rar rtc sse sse2 ssse3 tga tivo vidix vpx x264 zoran # testing mplayer flags media-video/mplayer fbcon bs2b # Drop dead code, doesn't work with libav media-video/mplayer2 -xvmc -media-video/mkvtoolnix wxwindows +# we have media-video/mkvtoolnix-gui +media-video/mkvtoolnix -qt4 -wxwidgets media-video/ogmrip ogm mp4 srt media-video/totem xulrunner iplayer galago media-video/vdr SetGroupSep-Patch atsc cmdsubmenu dvbsetup dxr3 graphtft iptv menuorg pinplugin rotor submenu subtitles ttxtsubs ttxtsubs yaepg -media-video/vlc aalib egl fontconfig httpd libass live lua rtsp samba skins taglib upnp vaapi vlm +media-video/vlc aalib egl fontconfig httpd libass live lua rtsp samba skins taglib upnp vlm media-video/xine-ui aalib # Drop xine-ui from dvdrip, since # we don't want it on G ISO media-video/dvdrip -xine subtitles fping +net-analyzer/nessus-core -gtk +# Bluetooth dependency is unwanted on servers +# It pulls in a lot of crap +net-analyzer/netcat6 -bluetooth +# No need to have USE=X on net-snmp +# ucd-compat required by net-misc/vmpsd-1.4 +net-analyzer/net-snmp ucd-compat -X +net-analyzer/rrdtool graph net-analyzer/snmptt mysql -net-analyzer/wireshark python +net-analyzer/snort dynamicplugin +net-analyzer/smokeping apache2 +net-analyzer/wireshark python -qt4 +net-analyzer/zabbix frontend agent server mysql ssh snmp proxy -sqlite3 # gtk part is provided by net-analyzer/zenmap net-analyzer/nmap -gtk ncat ndiff nping net-dialup/mgetty -fax net-dialup/ppp atm dhcp radius -gtk +net-dialup/freeradius threads net-dialup/slmodem usb -net-dns/avahi howl-compat mdnsresponder-compat dbus gdbm -gtk python autoipd -qt4 +net-dns/avahi howl-compat mdnsresponder-compat dbus gdbm -gtk python autoipd -qt4 introspection net-dns/avahi-base introspection howl-compat autoipd mdnsresponder-compat -net-dns/dnsmasq -dbus +net-dns/avahi-gtk introspection +net-dns/avahi-gtk3 introspection +net-dns/avahi-mono introspection +net-dns/avahi-qt introspection +net-dns/dnsmasq -dbus tftp conntrack dhcp script dhcp-tools +# We must choose between mysql and postgres +net-dns/mydns mysql -net-fs/cifs-utils ads +net-fs/cifs-utils ads upcall net-fs/samba ads acl oav swat winbind +net-ftp/proftpd authfile openssl + net-im/bitlbee twitter net-im/centerim gadu +# ejabberd, more features! +net-im/ejabberd mod_irc mod_muc mod_pubsub odbc web net-im/ekg2 gadu gpg xmpp +net-im/empathy gnome net-im/gajim -avahi net-im/gyachi gpgme gtkspell gtkhtml -webkit +net-im/jabberd2 mysql net-im/kadu xmpp net-im/pidgin bonjour console gadu groupwise meanwhile msn prediction qq sasl silc -zephyr net-im/psi jingle +net-im/telepathy-connection-managers -icq -yahoo +net-im/mcabber otr net-irc/inspircd mysql sqlite net-irc/kvirc -audiofile dcc_video +net-irc/quassel monolithic +net-irc/znc -python net-libs/aqbanking chipcard ofx +net-libs/c-client chappa +net-libs/glib-networking gnome net-libs/libgadu ssl threads +# Required by XBMC 12.x +net-libs/libmicrohttpd messages +# libproxy is bloatware +net-libs/libproxy -kde -gnome python net-libs/libsoup gnome net-libs/opal sip sipim h323 -net-libs/ptlib video stun wav pipechan dns +net-libs/ptlib video stun wav pipechan dns http dtmf +# Wants an old version of farstream stuff +net-libs/telepathy-qt -farstream net-libs/wvstreams -qt3 # Disable net-wireless/bluez for libpcap to avoid @@ -361,6 +617,8 @@ net-libs/wvstreams -qt3 net-libs/libpcap -bluetooth net-mail/dbmail sqlite3 +# Provide more dovecot features +net-mail/dovecot managesieve mbox sieve sqlite net-mail/notmuch mutt net-mail/tpop3d mbox maildir @@ -369,55 +627,101 @@ net-misc/dropbox librsync-bundled net-misc/aria2 metalink bittorrent xmlrpc net-misc/asterisk jabber gtalk +# Preffer openssl over nss and gnutls for curl +# moreover, nss breaks git https:// checkouts +net-misc/curl ssl -nss -gnutls +# Hylafax features +net-misc/hylafax mgetty +net-misc/mediatomb thumbnail -javascript +net-misc/minidlna netgear readynas net-misc/mosh ufw # bluetooth use flag is useless # wext due to bug 3283 net-misc/networkmanager -bluetooth connection-sharing -dhclient dhcpcd -gnutls introspection modemmanager nss wext wimax +# OLD: to make VPN working with networkmanager (nm-applet) +# NEW: USE=gtk makes these plugins work properly with +# newer nm-applet. Please, don't remove it and see +# bug 3508 +net-misc/networkmanager-openvpn gtk +net-misc/networkmanager-openswan gtk +net-misc/networkmanager-openconnect gtk +net-misc/networkmanager-pptp gtk net-misc/networkmanager-vpnc gnome net-misc/ntp -zeroconf net-misc/nxclient prebuilt net-misc/nxnode prebuilt vnc net-misc/openssh -X net-misc/openssh -ldap +# No more spidermonkey +net-misc/plowshare -javascript +net-misc/ps3mediaserver multiuser tsmuxer +net-misc/remmina vnc vte ssh freerdp +# Add xattr support to rsync +net-misc/rsync xattr net-misc/tightvnc -java server net-misc/tor threads net-misc/vinagre -avahi +net-misc/x2goserver sqlite + +net-nds/openldap -minimal net-nntp/suck perl net-p2p/amule geoip stats remote upnp daemon net-p2p/deluge webinterface net-p2p/eiskaltdcpp json +net-p2p/retroshare -cli net-p2p/vuze source +net-print/cnijfilter-drivers e500 e510 e600 ip100 ip4700 ip4900 ip7200 mg2100 mg2200 mg3100 mg3200 mg4100 mg4200 mg5300 mg5400 mg6200 mg6300 mg8200 mp230 mp250 mp270 mp490 mp550 mp560 mp640 mx370 mx430 mx510 mx710 mx890 net-print/cups -java net-print/gutenprint foomaticdb -gtk net-print/hplip -acl fax hpijs parport snmp static-ppds usb -net-wireless/atmel-firmware pcmcia usb -net-wireless/bluez gstreamer -net-wireless/wpa_supplicant -qt3 -qt4 wimax +net-proxy/privoxy threads +net-proxy/tsocks tordns + +net-voip/ekiga gstreamer + +net-wireless/bluez gstreamer obex +net-wireless/wpa_supplicant -qt3 -qt4 wimax ap p2p eap-sim wps + +# Razorqt lightdm plugin is lagging behind, disable +razorqt-base/razorqt-meta -lightdm + +sci-astronomy/celestia -kde # workaround for https://bugs.gentoo.org/show_bug.cgi?id=361411 sci-biology/transfac -emboss +# temp. disable python support due to sip shit +sci-chemistry/avogadro -python +sci-chemistry/openbabel -perl -python +sci-chemistry/xds-bin smp + sci-electronics/geda doc stroke -sci-astronomy/celestia -kde - sci-geosciences/grass tcl tk fftw -sci-geosciences/mapserver flash threads +# doesn't build with tiff 4.0 +sci-geosciences/mapserver flash threads -tiff +sci-geosciences/qgis grass +# required by media-gfx/luminance-hdr +sci-libs/fftw threads +sci-libs/gdal curl geos +# PQStego requires this USE, see bug 2751 +>=sci-libs/gsl-1.15 cblas-external +sci-libs/hdf5 -cxx -fortran -mpi threads -szip sci-libs/itpp fftw sci-libs/indilib nova -sci-libs/vtk tk mpi +sci-libs/netcdf -fortran hdf5 +sci-libs/plplot -wxwidgets +# -ffmpeg because at this time, with latest libav, build fails +sci-libs/vtk tk tcl rendering mpi -ffmpeg sci-mathematics/maxima latex sci-mathematics/octave fftw curl -# We don't want rtai -sci-misc/emc simulator - # htmldoc, doc, graphviz are required by app-doc/root-docs sci-physics/root htmldoc doc fftw graphviz @@ -426,81 +730,124 @@ sci-visualization/gnuplot gd wxwidgets sci-visualization/grace fftw sci-visualization/gwyddion fftw -sys-auth/pambase consolekit -kerberos - -sys-apps/coreutils -acl +# Disable nautilus integration, it gets pulled in in XFCE spin +sys-apps/gnome-disk-utility -nautilus -avahi sys-apps/groff -X sys-apps/hwdata-gentoo binary-drivers -sys-apps/pciutils -zlib +# Do we really want berkdb? +sys-apps/man-db -berkdb sys-apps/man-pages -linguas_da -linguas_de -linguas_fr -linguas_it -linguas_ja -linguas_nl -linguas_pl -linguas_ro -linguas_ru -linguas_zh_CN +sys-apps/pciutils -zlib +# systemd support +sys-apps/systemd -gtk plymouth cryptsetup lzma xattr -openrc keymap +# Install tty helpers (like wall) +sys-apps/util-linux tty-helpers + sys-auth/consolekit -acl -sys-libs/zlib minizip -sys-block/parted device-mapper +sys-auth/pambase -consolekit -kerberos sys-block/gparted -kde -gtk dmraid mdadm btrfs +sys-block/parted device-mapper + +# Kernel modules not needed +sys-block/open-iscsi -modules # grub2 must be slotted for a while >sys-boot/grub-1 multislot -# efi-32, unwanted -# efi-64, requires anaconda to set this flag to EFI partitions: bios_grub on -sys-boot/grub device-mapper -grub_platforms_coreboot -grub_platforms_efi-32 -grub_platforms_emu -grub_platforms_ieee1275 -grub_platforms_multiboot grub_platforms_pc -grub_platforms_qemu libzfs +sys-boot/grub device-mapper libzfs -sys-devel/distcc -avahi -sys-devel/gcc objc objc++ objc-gc graphite -gtk +sys-cluster/openmpi romio +sys-cluster/torque server +# We support both vanilla and vz kernels +sys-cluster/vzctl vanilla-kernel vz-kernel ploop + +# Disable GTK for distcc, this is a server-side app +# and it's better to not ship with gtk +sys-devel/distcc -avahi -gtk +sys-devel/gcc objc objc++ objc-gc graphite go -gtk sys-devel/base-gcc objc objc++ objc-gc graphite -gtk -sys-fs/cryptsetup static +# No fuck git by default! +sys-devel/gettext -git +# gdb tuning, we want XML +sys-devel/gdb expat python +# clang wants USE=clang for llvm +sys-devel/llvm clang + +sys-fs/evms -gtk sys-fs/mtd-utils xattr sys-fs/ntfs3g suid ntfsprogs -sys-fs/reiser4progs static +# USE=static static-libs must go together in order to have it compiling +sys-fs/reiser4progs static static-libs sys-fs/udev extras +# udisks, we want cryptsetup support +sys-fs/udisks cryptsetup crypt +# We use a builtin kernel module +sys-fs/zfs kernel-builtin + sys-apps/kmod lzma static-libs -sys-fs/lvm2 static-libs sys-libs/e2fsprogs-libs static-libs sys-fs/udev static-libs sys-apps/util-linux static-libs +dev-libs/glib static-libs +dev-libs/elfutils static-libs +sys-libs/gpm static-libs +sys-kernel/dracut device-mapper dracut_modules_biosdevname dracut_modules_btrfs dracut_modules_dmraid dracut_modules_dmsquash-live dracut_modules_gensplash dracut_modules_lvm dracut_modules_mdraid dracut_modules_multipath dracut_modules_nbd dracut_modules_nfs dracut_modules_plymouth dracut_modules_syslog dracut_modules_crypt dracut_modules_crypt-gpg dracut_modules_crypt-loop dracut_modules_iscsi dracut_modules_systemd net sys-kernel/genkernel cryptsetup crypt -sys-kernel/linux-sabayon splash dmraid symlink grub iscsi mdadm luks lvm -sys-kernel/linux-server splash dmraid grub iscsi mdadm luks lvm -sys-kernel/linux-rt splash dmraid grub iscsi mdadm luks lvm -sys-kernel/linux-fusion splash dmraid grub iscsi mdadm luks lvm -sys-kernel/linux-openvz splash dmraid grub iscsi mdadm luks lvm -sys-kernel/linux-hardened splash dmraid grub iscsi mdadm luks lvm +sys-kernel/genkernel-next cryptsetup crypt +sys-kernel/linux-sabayon dmraid symlink grub iscsi mdadm luks lvm zfs plymouth +=x11-themes/elementary-icon-theme-2.7.1 monochrome branding +x11-themes/gnome-colors-common branding x11-themes/gtk-engines-murrine -themes x11-themes/gtk-engines-qtcurve -mozilla +x11-themes/sabayon-artwork-kde ksplash x11-themes/skinenigmang-logos dxr3 +x11-themes/tango-icon-theme branding x11-wm/compiz -gnome -kde x11-wm/compiz-fusion -gnome -kde @@ -559,52 +920,14 @@ xfce-base/xfwm4 xcomposite xfce-extra/tumbler gstreamer raw -# OLD: to make VPN working with networkmanager (nm-applet) -# NEW: USE=gtk makes these plugins work properly with -# newer nm-applet. Please, don't remove it and see -# bug 3508 -net-misc/networkmanager-openvpn gtk -net-misc/networkmanager-pptp gtk -net-misc/networkmanager-openswan gtk -net-misc/networkmanager-openconnect gtk - - -# nm-applet-gtk2 is the bloody version of nm-applet -# used by non-gtk3 DEs, like LXDE, Xfce, E17, ... -# Cannot enable bluetooth because gnome-bluetooth-3.x -# is gtk3 as well -gnome-extra/nm-applet-gtk2 -bluetooth - # added for mythtv -x11-libs/qt-sql mysql -dev-python/PyQt4 webkit sql assistant declarative examples - -# enable Google Gadgets on Plasma -# not yet! -# kde-base/plasma-workspace google-gadgets - -# We want splash and grub with linux-openvz and linux-server -sys-kernel/linux-openvz grub splash dmraid -sys-kernel/linux-server grub splash dmraid -sys-kernel/linux-vserver grub splash dmraid - -# Disable GTK for distcc, this is a server-side app -# and it's better to not ship with gtk -sys-devel/distcc -gtk +dev-qt/qtsql mysql +dev-python/PyQt4 webkit sql assistant declarative examples script help # See Sabayon bug #890 sys-devel/libperl ithreads dev-lang/perl ithreads -# Needed for gnome-shell -media-libs/clutter opengl introspection - -# PackageKit, Sabayon config -app-admin/packagekit entropy cron pm-utils -qt4 -gtk - -# vmware-tools defaults -# app-emulation/vmware-tools vmware_guest_freebsd vmware_guest_linux vmware_guest_netware vmware_guest_solaris vmware_guest_winPre2k vmware_guest_windows - # For safety (no particular reason, but grub requires ncurses) # we also provide libncurses.a sys-libs/ncurses static-libs @@ -612,11 +935,6 @@ sys-libs/ncurses static-libs ## Put new entries after this line if you dont want to organize it. ## ###################################################################### ## Cleaned up 0600Z 10Jan2010 - Az -mail-client/mutt sasl sidebar smtp -app-emulation/vice gnome - -# Our Apache defaults -www-servers/apache apache2_modules_asis apache2_modules_auth_digest apache2_modules_authn_dbd apache2_modules_cern_meta apache2_modules_cgi apache2_modules_cgid apache2_modules_charset_lite apache2_modules_dbd apache2_modules_dumpio apache2_modules_imagemap apache2_modules_log_forensic apache2_modules_proxy apache2_modules_proxy_ajp apache2_modules_proxy_balancer apache2_modules_proxy_connect apache2_modules_proxy_ftp apache2_modules_proxy_http apache2_modules_substitute apache2_modules_version ident suexec # libdvdcss setup media-libs/libdvdread -css @@ -624,71 +942,8 @@ media-libs/xine-lib -css app-cdr/brasero -css media-tv/mythtv -css -# We really wanted USE=static in order -# to not add many pkgs on 700Mb sized ISO -# images but it turned out to be buggy, -# see bug 2781 -app-crypt/gnupg -static bzip2 - -# Inflate lighttpd -www-servers/lighttpd fastcgi lua memcache xattr - -app-emacs/auctex preview-latex -net-analyzer/zabbix frontend agent server mysql ssh snmp proxy -sqlite3 - -# Kernel drivers are unwanted for lirc, they're in-kernel -app-misc/lirc -lirc_devices_audio -lirc_devices_audio_alsa -lirc_devices_serial - -net-proxy/privoxy threads - -dev-util/anjuta subversion - -dev-python/traitsgui wxwidgets qt4 - -net-dialup/freeradius threads - -# Kernel modules not needed -sys-block/open-iscsi -modules - -dev-libs/crypto++ sse3 - -app-cdr/dvd95 sse sse2 - -# No need to have USE=X on net-snmp -# ucd-compat required by net-misc/vmpsd-1.4 -net-analyzer/net-snmp ucd-compat -X - -# app-crypt/pinentry is now a meta-package -# enable GTK2 by default, people complaining -# about dependencies, should really use pinentry-base -# instead -app-crypt/pinentry gtk qt4 - -# required for some functionality of Inkscape - bug 2941 -media-gfx/pstoedit plotutils - -# move x11-libs/evas media-libs/evas -media-libs/evas fontconfig sse threads - -media-video/dvgrab quicktime - media-video/avidemux amr -media-libs/libsoundtouch sse2 - -dev-libs/nss utils - -dev-ml/lablgtk gnomecanvas - -kde-base/kdeplasma-addons desktopglobe json oauth semantic-desktop -kde-base/pykde4 semantic-desktop -kde-base/dolphin semantic-desktop thumbnail -kde-base/plasma-workspace semantic-desktop python -kde-base/superkaramba python - -app-emulation/e-uae capslib -games-emulation/qmc2 sdlmess - # Disable gtk dependency, unwanted for Core dev-python/python-meh -gtk app-admin/system-config-date -gtk @@ -696,176 +951,20 @@ dev-python/python-slip -gtk app-admin/firstboot -gtk app-admin/system-config-users -X -x11-themes/gnome-colors-common branding - -# PackageKit settings -app-admin/packagekit-base pm-utils entropy - -# Add xattr support to rsync -net-misc/rsync xattr - -# Disable KDE on backintime -app-backup/backintime gnome -kde - -# Wine, more features -app-emulation/wine fontconfig samba udisks - -# ejabberd, more features! -net-im/ejabberd mod_irc mod_muc mod_pubsub odbc web - -# gdb tuning, we want XML -sys-devel/gdb expat python - -# Prever openssl over nss and gnutls -# moreover, nss breaks git https:// checkouts -net-misc/curl ssl -nss -gnutls - -gnome-extra/nautilus-sendto -cdr - # Pylons stuff dev-python/paste openid dev-python/pylons genshi jinja -# Provide more dovecot features -net-mail/dovecot managesieve mbox sieve sqlite -# More postfix features -mail-mta/postfix mbox sasl - # openresolv support net-dns/bind dlz resolvconf net-misc/connman resolvconf net-misc/networkmanager resolvconf net-misc/vpnc resolvconf -# add HVM -app-emulation/xen-tools hvm qemu - -# doesn't build with tiff 4.0 -sci-geosciences/mapserver -tiff - -# Hylafax features -net-misc/hylafax mgetty - -# temp. disable python support due to sip shit -sci-chemistry/avogadro -python -sci-geosciences/qgis -python - -# libva coolness -x11-libs/libva video_cards_dummy - -# we provide networkmanager tools for tweaking network settings, -# moreover network-admin is broken and causes massive meltdown -app-admin/gnome-system-tools -network nfs - -# No fuck git by default! -sys-devel/gettext -git - -# libproxy is bloatware -net-libs/libproxy -kde -gnome python - -www-servers/cherokee admin -net-analyzer/snort dynamicplugin -mail-mta/netqmail qmail-spp -app-mobilephone/kannel mysql -dev-libs/libassuan static-libs -media-libs/ming php - -app-arch/p7zip -kde -wxwidgets -x11-misc/keytouch -kde -x11-misc/keytouch-editor -kde -dev-java/gnu-classpath gstreamer -# Disable nautilus integration, it gets pulled in in XFCE spin -sys-apps/gnome-disk-utility -nautilus -avahi -x11-misc/notification-daemon gstreamer -media-video/kino gstreamer quicktime -media-libs/swfdec gstreamer gnome-base/gnome-panel eds -x11-themes/sabayon-artwork-kde ksplash -dev-db/postgresql-base threads -x11-themes/qtcurve-qt4 kde windeco -media-libs/libsamplerate sndfile -app-benchmarks/phoronix-test-suite gd -gtk -net-nds/openldap -minimal -media-libs/libgpod ios -app-emulation/ganeti kvm -app-i18n/skk-jisyo cdb -net-misc/x2goserver sqlite -media-plugins/kipi-plugins calendar gpssync -sci-libs/gdal geos -dev-db/tora oracle -media-sound/moc curl sndfile -kde-base/kdepimlibs semantic-desktop -media-libs/gd fontconfig -x11-libs/qt-webkit kde icu -www-client/uget gstreamer -dev-libs/libf2c static-libs -kde-base/krdc vnc -net-voip/ekiga gstreamer -x11-libs/libdrm video_cards_intel video_cards_nouveau video_cards_radeon video_cards_vmware libkms -app-text/evince djvu dvi gnome-keyring nautilus -dev-lang/ifc idb -app-editors/gedit-plugins terminal -sci-chemistry/xds-bin smp -dev-java/gnu-classpath -qt4 -app-cdr/xfburn gstreamer -x11-libs/qt-qt3support kde -x11-libs/qt-assistant compat -app-text/texlive-core xetex -media-sound/mp3splt-gtk gstreamer -media-sound/gpodder gstreamer -net-proxy/tsocks tordns -sys-kernel/dracut device-mapper dracut_modules_biosdevname dracut_modules_btrfs dracut_modules_dmraid dracut_modules_dmsquash-live dracut_modules_gensplash dracut_modules_lvm dracut_modules_mdraid dracut_modules_multipath dracut_modules_nbd dracut_modules_nfs dracut_modules_plymouth dracut_modules_syslog net -games-fps/darkplaces textures -media-sound/deadbeef cover curl lastfm m3u hotkeys sndfile supereq -net-misc/remmina vnc ssh freerdp -app-misc/gpsdrive speech -media-video/miro faac -media-gfx/sane-frontends gimp -dev-db/freetds mssql -dev-libs/libxml2 icu -media-video/jubler mplayer -dev-libs/xmlsec gcrypt -dev-libs/tntnet sdk -x11-themes/tango-icon-theme branding -dev-games/ode double-precision -dev-util/nvidia-cuda-sdk opencl -sci-chemistry/openbabel -perl -python -media-sound/clementine ios moodbar -dev-libs/tinyxml stl -net-misc/mediatomb thumbnail -javascript - -# Needed for Netbeans ide -dev-java/swing-layout source sys-auth/polkit -kde -gtk -dev-util/geany-plugins enchant gtkspell -kde-base/kdesdk-misc extras -dev-java/antlr script -app-misc/sphinx mysql -x11-misc/shutter drawing webphoto -dev-games/physfs hog -media-libs/svgalib -kernel-helper -app-misc/tuxcmd-modules gnome unrar -media-sound/cmus mikmod -sci-libs/hdf5 -cxx -fortran -mpi threads -szip -virtual/mpi romio -sys-cluster/openmpi romio media-libs/libpng apng -kde-base/kget bittorrent semantic-desktop - -# l10n issue is handled by entropy dep_rewrite -media-gfx/digikam handbook semantic-desktop -dev-util/kdevelop php qthelp ruby -dev-util/kdevplatform git subversion - -dev-libs/libgcrypt static-libs -dev-libs/libgpg-error static-libs -dev-libs/libksba static-libs -sys-fs/evms -gtk -mail-filter/maildrop authlib -dev-python/pyudev pyqt4 -dev-libs/popt static-libs -net-libs/glib-networking gnome # New splashutils wants static-libs see Gentoo bug #356231 media-libs/libpng static-libs @@ -880,9 +979,6 @@ sys-libs/zlib static-libs # We want packages with static-libs (add here) dev-libs/expat static-libs -# Our artwork, blame Ian ->=x11-themes/elementary-icon-theme-2.7.1 monochrome branding - # Prepare for GNOME 3 # cairo pulls in mesa in the end, which is bad for spinbase # however, we have split ebuilds now, so enable cairo @@ -905,83 +1001,180 @@ net-libs/gtk-vnc gtk3 app-misc/tomboy -applet # our is a split package, who cares net-dns/avahi dbus gtk3 -# GNOME 3 wants NetworkManager 0.9 -kde-misc/networkmanagement nm09 # Do not pull in gnome-extra-apps meta package -gnome-base/gnome -extras +# Disable accessibility, since it's just a virtual dependency +gnome-base/gnome -extras -accessibility # Enable some fancy stuff on gdm gnome-base/gdm gnome-keyring smartcard accessibility fprint # required by gnome-extra/synapse-0.2.6, required by gnome-extra/synapse (argument) >=gnome-extra/zeitgeist-0.7.1-r1 fts -# Newer kernels do not provide vid4l -media-gfx/sane-backends threads -v4l - -sys-apps/systemd -gtk plymouth cryptsetup -sys-boot/plymouth video_cards_intel video_cards_nouveau video_cards_radeon - -# kill linguas on kdepim-runtime, we ship it in kde-l10n -kde-base/kdepim-runtime -linguas_ar -linguas_be -linguas_ca -linguas_ca@valencia -linguas_cs -linguas_da -linguas_de -linguas_el -linguas_en_GB -linguas_eo -linguas_es -linguas_et -linguas_fi -linguas_fr -linguas_ga -linguas_gl -linguas_hr -linguas_hu -linguas_ia -linguas_it -linguas_ja -linguas_kk -linguas_km -linguas_ko -linguas_lt -linguas_lv -linguas_mai -linguas_nb -linguas_nds -linguas_nl -linguas_nn -linguas_pa -linguas_pl -linguas_pt -linguas_pt_BR -linguas_ro -linguas_ru -linguas_se -linguas_sk -linguas_sl -linguas_sv -linguas_th -linguas_tr -linguas_uk -linguas_zh_CN -linguas_zh_TW google - -net-im/telepathy-connection-managers -icq -yahoo -net-im/empathy gnome -app-emulation/winetricks -gtk -x11-misc/obconf -lxde -media-plugins/gst-plugins-meta mms -net-ftp/proftpd authfile openssl -dev-lang/parrot pcre -app-office/calligra kdepim -www-apps/postfixadmin mysql -app-office/kmymoney hbci -app-arch/unzip natspec -sci-libs/netcdf hdf5 - -# No more spidermonkey -net-misc/plowshare -javascript -media-libs/libsfml doc examples - -net-analyzer/nessus-core -gtk -media-sound/gmusicbrowser gstreamer - -# Required by media-gfx/darktable -media-libs/libraw demosaic - -# Do we really want berkdb? -sys-apps/man-db -berkdb - -# We don't have Oracle -dev-db/tora -oracle - -# Bumblebee stuff -x11-misc/bumblebee video_cards_nvidia video_cards_nouveau - -# PQStego requires this USE, see bug 2751 ->=sci-libs/gsl-1.15 cblas-external - -# app-misc/recoll cannot use both inotify and fam, only one of them. -app-misc/recoll -fam inotify - -# dev-db/mongodb should use V8. Allows to fix bug 3069 -dev-db/mongodb v8 +sys-boot/plymouth video_cards_intel video_cards_nouveau video_cards_radeon -openrc -gtk -pango static-libs # Enable hardened USE flags sys-devel/base-gcc hardened sys-devel/gcc hardened -sys-libs/glibc hardened - -# Corsix USE=wxwidgets requires masked (dev) wxGTK 2.9 -games-engines/corsix-th -wxwidgets - -# In order to generate files in different formats, we need to enable imlib -media-libs/libcaca imlib - -# We must choose between mysql and postgres -net-dns/mydns mysql - -# Bluetooth dependency is unwanted on servers -# It pulls in a lot of crap -net-analyzer/netcat6 -bluetooth +# keep suid for a while, needs devpts mounted with gid=5 otherwise +sys-libs/glibc hardened suid nscd # add Infinality patches to freetype-2 # See bug 3360 media-libs/freetype infinality + +# Super Google MySQL! +dev-db/google-mysql -embedded +~virtual/mysql-5.1 -embedded +dev-libs/lzo static-libs + +# Enable USE=tk for the Python Imaging stack (and Python) +# We will use our own crafted dev-python/imaging ebuild +# that redirects the tk dependency to python-tk +dev-python/imaging tk +dev-python/pillow tk +virtual/python-imaging tk +dev-lang/python tk + +# This is while we wait for full true multilib support on libav +# Please drop this as soon as the corresponding packages are fixed +media-video/libav -gnutls openssl -test +virtual/ffmpeg -gnutls openssl -test + +## GNOME 3.10 flags +# required by gnome-music +app-misc/tracker gstreamer -ffmpeg -xine +# required by gnome-base/gnome-core-apps-3.10.1::gnome-next[cdr] +# required by gnome-base/gnome-3.10.1::gnome-next +# required by gnome-base/gnome (argument) +app-cdr/brasero tracker +# required by gnome-base/gnome-core-apps-3.10.1::gnome-next +# required by gnome-base/gnome-3.10.1::gnome-next +# required by gnome-base/gnome (argument) +gnome-base/nautilus tracker + +# VAAPI/VDPAU support +media-libs/avidemux-core vaapi vdpau +media-libs/mesa vdpau +# Disabling vaapi for now, see bug #2221, #4069 +# 2013-11-15: retry with USE=vaapi +media-tv/xbmc vaapi vdpau +media-tv/mythtv vaapi vdpau +media-video/avidemux vaapi vdpau +media-video/hwdecode-demos vaapi vdpau +media-video/libav vaapi vdpau +media-video/mplayer vaapi vdpau +media-video/mplayer2 vaapi vdpau +media-video/ffmpeg vaapi vdpau +# TODO: vdpau requires libav-10. Sigh. +media-video/vlc vaapi -vdpau +virtual/ffmpeg vaapi vdpau +www-plugins/gnash vaapi vdpau + +# Use Gtk3 for scim and spice-gtk +app-i18n/scim gtk3 +net-misc/spice-gtk gtk3 + +# Disable plymouth integration in gdm 3.10 +# Disable gdm integration in plymouth +# If enabled, chvt() blocks on tty0 ioctl +# VT_WAITACTIVE +gnome-base/gdm -plymouth +sys-boot/plymouth -gdm + +# This is disabled because the functionality conflicts with RigoDaemon +# Maybe it's time to think about turning RigoDaemon into a PackageKit provider +gnome-base/gnome-settings-daemon -packagekit +gnome-base/nautilus packagekit +gnome-extra/gnome-color-manager packagekit + +# USE=-ffmpeg due to libav-9.10+ requirements, not yet in chroots +media-plugins/audacious-plugins -ffmpeg + +# required by net-analyzer/tcpreplay-4.0.2 +sys-devel/autogen libopts + +# gnome-music is Python3 only, prefer python 3.3 for now +media-sound/gnome-music python_single_target_python3_3 +# same for gnome-sudoku and others +games-puzzle/gnome-sudoku python_single_target_python3_3 +media-gfx/eog-plugins python_single_target_python3_3 + +# required by media-gfx/gnome-photos-3.10.2 +# required by gnome-photos (argument) +media-plugins/grilo-plugins upnp-av + +# required by reiser4progs +sys-libs/readline static-libs + +# threads: required by gitg +dev-libs/libgit2 ssh threads + +# required by media-plugins/grilo-plugins-0.2.10 +# required by media-sound/gnome-music-3.10.3 +# required by gnome-music (argument) +>=media-libs/grilo-0.2.10 playlist +# required by media-sound/gnome-music-3.10.3 +# required by gnome-music (argument) +>=media-plugins/grilo-plugins-0.2.10 tracker + +# required by ktnef +app-office/akonadi-server soprano + +# required by libteam +dev-libs/libnl utils + +# Prefer gtk for media-libs/libmediaart +media-libs/libmediaart gtk -qt4 -qt5 + +# required by kde-base/artikulate-4.13.1[-gstreamer] +# required by kde-base/kdeedu-meta-4.13.1 +# required by kde-base/kde-meta-4.13.1 +# required by kde-meta (argument) +>=dev-qt/qt-mobility-1.2.2_p20130703 multimedia + +# required by kde-base/nepomuk-4.13.1 +# required by media-video/bangarang-2.1-r2 +# required by bangarang (argument) +>=kde-base/kdelibs-4.13.1 nepomuk + +# prefer openssl instead of gnutls +# because lib32 true multilib support in cups is broken +net-print/cups -gnutls + +# commoncpp2 does not build with latest gnutls +dev-cpp/commoncpp2 -gnutls ssl + +# Bug 4726, add UVM support +x11-drivers/nvidia-userspace uvm + +# Use in-kernel modules +app-emulation/vmware-modules -vmci -vsock + +# No modules, thanks. We're bleeding. +net-firewall/ipset -modules + +# Add more docs to lxc +app-emulation/lxc doc + +# Anaconda related USE deps +dev-libs/libreport -gtk +app-admin/anaconda -gtk -gui + +# required by dev-ruby/metasploit_data_models-0.17.2[ruby_targets_ruby19] +# required by net-analyzer/metasploit-4.9.3[ruby_targets_ruby19] +# required by metasploit (argument) +dev-ruby/activerecord postgres + +# Blender Python 3.4 deps +dev-python/setuptools python_targets_python3_4 +dev-python/requests python_targets_python3_4 +dev-python/numpy python_targets_python3_4 +dev-python/chardet python_targets_python3_4 + +# Required by rkhunter +sys-process/lsof rpc + +# Required by reiser4progs +sys-libs/libaal static-libs + +# intel-gpu-tools is Python3 only +x11-apps/intel-gpu-tools python_single_target_python3_3 diff --git a/conf/intel/portage/profile/package.provided b/conf/intel/portage/profile/package.provided index 58fd0d0..e69de29 100644 --- a/conf/intel/portage/profile/package.provided +++ b/conf/intel/portage/profile/package.provided @@ -1,4 +0,0 @@ -x11-plugins/compiz-plugins-main-0.8.6-r1 -x11-plugins/compiz-plugins-unsupported-0.8.8 -x11-plugins/compiz-plugins-extra-0.8.8 -x11-wm/compiz-fusion-0.8.8 diff --git a/conf/intel/portage/profile/package.use.mask b/conf/intel/portage/profile/package.use.mask deleted file mode 100644 index bd1265a..0000000 --- a/conf/intel/portage/profile/package.use.mask +++ /dev/null @@ -1 +0,0 @@ -kde-base/solid -networkmanager diff --git a/conf/intel/portage/profile/package.use.mask/00-sabayon.mask b/conf/intel/portage/profile/package.use.mask/00-sabayon.mask new file mode 100644 index 0000000..55dba35 --- /dev/null +++ b/conf/intel/portage/profile/package.use.mask/00-sabayon.mask @@ -0,0 +1,16 @@ +kde-base/solid -networkmanager + +# media-gfx/blender wants Python 3.3 +# need to unmask its use flag +media-gfx/blender -python_single_target_python3_3 -python_targets_python3_3 + +# http://bugs.sabayon.org/show_bug.cgi?id=4115 +media-sound/audacity -ffmpeg + +# USE=systemd unmasking, no need to keep them masked +sys-auth/polkit -systemd +sys-power/upower -systemd +sys-fs/udisks -systemd + +# We use a builtin module for sys-fs/zfs +sys-fs/zfs -kernel-builtin diff --git a/conf/intel/portage/profile/use.mask b/conf/intel/portage/profile/use.mask index b64b782..70cc550 100644 --- a/conf/intel/portage/profile/use.mask +++ b/conf/intel/portage/profile/use.mask @@ -3,3 +3,15 @@ # Unmask USE=hardened globally -hardened + +# Unmask Python 3.3 stuff +-python_targets_python3_3 + +# Unmask systemd for everything +-systemd + +# packagekit is ready for primetime in Sabayon +-packagekit + +# We want true multilib abi +-abi_x86_32 diff --git a/conf/intel/repo/sabayon-hell/packages.db.critical b/conf/intel/repo/sabayon-hell/packages.db.critical index 0ed0e40..a881010 100644 --- a/conf/intel/repo/sabayon-hell/packages.db.critical +++ b/conf/intel/repo/sabayon-hell/packages.db.critical @@ -1,3 +1,4 @@ -sys-devel/base-gcc:4.6 ->=sys-apps/portage-2.2_alpha13 ->sys-libs/glibc-2.14.9999 +sys-devel/base-gcc:4.8 +>=sys-apps/portage-2.2.0_alpha142 +>sys-libs/glibc-2.16.9999 +>=sys-apps/entropy-205 diff --git a/conf/intel/repo/sabayon-hell/packages.db.keywords b/conf/intel/repo/sabayon-hell/packages.db.keywords new file mode 100644 index 0000000..6d656fd --- /dev/null +++ b/conf/intel/repo/sabayon-hell/packages.db.keywords @@ -0,0 +1,7 @@ +sys-apps/portage ~x86 ~amd64 +dev-lang/python:3.3 ~x86 ~amd64 + +# GNOME 3.12 mask +>=sys-power/upower-0.99.0 ~x86 ~amd64 +# Allow systemd and upower 0.99 friendly version +=xfce-extra/xfce4-power-manager-1.2.0_p20140527 ~amd64 ~x86 amd64 x86 diff --git a/conf/intel/repo/sabayon-hell/packages.db.lic_whitelist b/conf/intel/repo/sabayon-hell/packages.db.lic_whitelist new file mode 100644 index 0000000..a740a3c --- /dev/null +++ b/conf/intel/repo/sabayon-hell/packages.db.lic_whitelist @@ -0,0 +1,770 @@ +3DFX +3proxy +3ware +4F +7plus +9wm +ACME +ACML +aczoom +Adaptec +adobe-ps +AdobePS +Adobe-SourceCode +AECA +aewm +AFL-2.0 +AFL-2.1 +AFL-3.0 +AFTERSTEP +AICCU +Aladdin +Allegro +amiwm +AMPAS +AMS +ANTL +Apache-1.1 +Apache-2.0 +APL-1.0 +appres +APSL-2 +aquafont +arj +Arphic +Artistic +Artistic-2 +as-is +astrolog +astromenace +ATOK +AURA +BAEKMUK +bass +BCS +bdftopcf +BEER-WARE +beforelight +bigresproto +bioapi +bitmap +BitstreamVera +BitTorrent +blackshades +Blitz-Artistic +bonnie +Boost-1.0 +BSD +BSD-2 +BSD-4 +BSD-4 +bungie-marathon +BWidget +BZIP2 +C3 +cadsoft +Caldera +canada-med +CAOSL +ccp4 +CCPL-Attribution-2.0 +CCPL-Attribution-3.0 +CCPL-Attribution-NoDerivs-2.5 +CCPL-Attribution-NonCommercial-NoDerivs-2.0 +CCPL-Attribution-NonCommercial-NoDerivs-2.5 +CCPL-Attribution-ShareAlike-2.0 +CCPL-Attribution-ShareAlike-2.5 +CCPL-Attribution-ShareAlike-3.0 +CCPL-Attribution-ShareAlike-NonCommercial-2.5 +CCPL-ShareAlike-1.0 +CDDL +CDDL-Schily +cdegroot +CDF +CeCILL-2 +Cenon +CGL +charm +chasen +circlemud +cisco-vpn-client +Clarified-Artistic +clustalw +CMake +CMASS-M3 +cmigemo +CNRI +CNRI-QUIXOTE-2.4 +codehaus-classworlds +codehaus-groovy +colt +compositeproto +Conexant +cos +CPL-0.5 +CPL-1.0 +CRACKLIB +crafty +crazney +cryptopp +CS-1.0 +CyberNeko-1.0 +damageproto +DB +dbgphp +DCC +DEC-M3 +DES +dgen-sdl +dlj-1.1 +dmxproto +dom4j +DSL +DSNIFF +DUMB-0.9.2 +dvibook +EAPL +ECWPL +EDB +editres +eGenixPublic +eGenixPublic-1.1 +ElementTree +Elm +Emacs +encodings +EPL +EPL-1.0 +EPSON +eternal_lands +evieext +Exolab +FastCGI +FDL-1.1 +FDL-1.2 +FDL-1.3+ +FESTIVAL +FIPL-1.0 +fixesproto +FLEX +FLTK +FML-1 +fmod +folding-at-home +font-adobe-100dpi +font-adobe-75dpi +font-adobe-utopia-100dpi +font-adobe-utopia-75dpi +font-adobe-utopia-type1 +font-alias +font-arabic-misc +font-bh-100dpi +font-bh-75dpi +font-bh-lucidatypewriter-100dpi +font-bh-lucidatypewriter-75dpi +font-bh-ttf +font-bh-type1 +font-bitstream-100dpi +font-bitstream-75dpi +font-bitstream-speedo +font-bitstream-type1 +fontcacheproto +fontconfig +font-cronyx-cyrillic +font-cursor-misc +font-daewoo-misc +font-dec-misc +font-ibm-type1 +font-isas-misc +font-jis-misc +font-micro-misc +font-misc-cyrillic +font-misc-ethiopic +font-misc-meltho +font-misc-misc +font-mutt-misc +font-schumacher-misc +font-screen-cyrillic +font-sony-misc +fontsproto +font-sun-misc +fonttosfnt +font-util +font-winitzki-cyrillic +font-xfree86-type1 +fping +FreeArt +freedist +freemarker +freetts +Frodo +fslsfonts +fstobdf +FTL +FVWM +galaxyhack +GAlib +gamess +gccmakedep +gcc-runtime-library-exception-3.1 +GDLS +gips_iLBClicense.pdf +glest-data +glimpse +glproto +glut +GLX +GMGPL +gnuplot +GPL-1 +GPL-2 +GPL-2+ +GPL-2-with-exceptions +GPL-2-with-linking-exception +GPL-2-with-MySQL-FLOSS-exception +GPL-3 +GPL-3+ +grass-ipafonts +guild +HPL +HYDRA +hylafax +hyperic +HyperSpec +iASL +IBM +IBM-J1.4 +IBM-J1.5 +ICE +iceauth +ico +icu +IDPL +imagemagick +imake +immon-sflow +Indir +Inform +Info-ZIP +inputproto +Interbase-1.0 +ipadic +IPL-1 +IRPDL +ISC +isc-dhcp +ITS4 +JamesClark +jardinains +JasPer +jaxen +jcraft +jdepend +JDOM +jlex +JNIC +JPython +jrockit +kbproto +KenMacLeod +Kermit +knights-demo +kvirc +lam-mpi +LDP +LDP-1a +less +levee +LFS +LGPL-2 +LGPL-2+ +LGPL-2.1 +LGPL-2.1+ +LGPL-2.1-linking-exception +LGPL-2.1-UUST +LGPL-3 +LGPL-3+ +lha +libdmx +libdomainkeys-1.1 +libdrm +libf2c +libffi +libfontenc +libFS +libgcc +LIBGLOSS +libICE +liblbxutil +liboldX +libSM +libstdc++ +libX11 +libXau +libXaw +libXcomposite +libXcursor +libXdamage +libXdmcp +libXevie +libXext +libXfixes +libXfont +libXfontcache +libXft +libXi +libXinerama +libxkbfile +libxkbui +libXmu +libXp +libXpm +libXprintAppUtil +libXprintUtil +libxproxy +libXrandr +libXrender +libXres +libXScrnSaver +libXt +libXTrap +libXtst +libXv +libXvMC +libXxf86dga +libXxf86misc +libXxf86vm +LICENSE-BITSTREAM +lisp2wish +listres +LLGPL-2.1 +LOKI-EULA +LPPL-1.2 +LPPL-1.3 +LPPL-1.3b +LPPL-1.3c +lsof +luit +maestro +MagickWand +makedepend +MakeIndex +mapm +marginalhacks +mayadoc-5.0 +MBROLA +mekanix +meme +Memonix +metapackage +MILO +mindterm +Mini-XML +MIT +mkfontdir +mkfontscale +mmix +molmol +molscript +MonetDBPL-1.1 +mongrel +mopac7 +Moria +MOTIF +Mozart +MPEG4 +MPL-1.0 +MPL-1.1 +mplus-fonts +mserv +MSF-1.2 +Ms-PL +mx4j +myspell-en_CA-JRossBeresford +myspell-en_CA-KevinAtkinson +myspell-et_EE-IEL +myspell-hyph_sk_SK-TiborBako +myspell-ispell-GeoffKuenning +myspell-lt_LT-AlbertasAgejevas +myspell-ru_RU-ALexanderLebedev +myspell-th_cs_CZ-PavelRychlySmrz +namd +NCSA-HDF +nemerle +nethack +netlogo +netperf +NewArtisans +NEWLIB +newton +nhc98 +No-Problem-Bugroff +Norvig +NPL-1.1 +oclock +OFL +OFL-1.1 +OGL-1.0a +OGTSL +openafs-krb5 +openafs-krb5-a +openknights +OPENLDAP +openmarket +openpbs +OpenSoftware +openspml +openssl +OpenSymphony-1.1 +OPERA-9 +OPL +OracleDB +OSI-Approved +OSIRIS +OSL-1.1 +OSL-2.0 +OTN +otter +Palm-SDK +PAM +Parallels +paraview +PathfinderPL-1.1 +PBZIP2 +PDB +PDFLite +PEL +penguzzle +perforce +petrify +pgasync +PHP +PHP-2.02 +PHP-3 +PHP-3.01 +phrack +PICO +PicoContainer +pixman +pkcrack +PLAN9 +pmd +POMPOM +poster +POSTGRESQL +Princeton +printproto +proxymngr +PSF-2 +PSF-2.2 +PSF-2.3 +PSF-2.4 +PSTT +public-domain +pymol +pysqlite +PYTHON +qeradiant +qlogic-fibre-channel-firmware +qpage +QPL +QPL-1.0 +qpopper +queen +qwt +randrproto +RDist +REALbasic +recordproto +renderproto +Resounding +resourceproto +rgb +RiceBSD +richardson +ringtonetools +Roadrunner +RSA-MD2 +RSA-MD4 +RSA-MD5 +RSA-PKCS11 +rstart +Ruby +ruby-debug +satan +saxpath +scilab +Scintilla +scripts +scrnsaverproto +selfhtml +Sendmail +Sendmail-Open-Source +sessreg +setxkbmap +SGI-B +SGI-B-1.1 +SGMLUG +showfont +SIFT +SIL-freeware +singular +sip +SixXS +Sleepycat +Smart-Link +smproxy +SNNS-4.2 +SOPLA-2.3 +sparky +Spice-1.1 +SPL +Spread-1.0 +ssh +sslwrap +staden +Stanford +stardock-images +stix +Subversion +Sudo +sun-asis-javamake +sun-bcla-j2ee +sun-bcla-j2ee-deployment +sun-bcla-j2me +sun-bcla-jai +sun-bcla-jimi +sun-bcla-jmf +sun-bcla-jmi +sun-bcla-jms +sun-bcla-jsapi +sun-bcla-jsr101 +sun-bcla-jta +sun-bcla-jvmstat +sun-j2sl +sun-j2sl-6 +sun-jrl +sun-jsr67 +sun-jsr93 +sun-openlook +sun-rpc +SVFL +tacc +t-coffee +tcp_wrappers_license +TeX +trac +trapproto +truecrypt-collective-1.0 +truecrypt-collective-1.3 +twm +UCAR-Unidata +unicode +unRAR +ut2003-demo +util-macros +ValveSDK +ventrilo +VGBA +videoproto +vienna-rna +viewres +VIGRA +vim +visual +vlgothic +Volano +VOSTROM +W3C +W3C-document +w3m +WarpPipe +WebMO +Werken-1.1.1.1 +werken.xpath +whitehead +WordNet-1.6 +worldofpadman +WTFPL-2 +wxWinFDL-3 +wxWinLL-3 +X11 +x11perf +XAnim +xauth +xbacklight +xbattle +xbiff +xbitmaps +xboing +xcalc +XCIN +xclipboard +xcmiscproto +xcmsdb +xconsole +xcursorgen +xcursor-themes +xdbedizzy +Xdebug +xditview +xdm +xdpyinfo +xdriinfo +xearth +xedit +XeTeX +xev +xextproto +xeyes +xf86bigfontproto +xf86dga +xf86dgaproto +xf86driproto +xf86-input-acecad +xf86-input-aiptek +xf86-input-calcomp +xf86-input-citron +xf86-input-digitaledge +xf86-input-dmc +xf86-input-dynapro +xf86-input-elo2300 +xf86-input-elographics +xf86-input-evdev +xf86-input-fpit +xf86-input-hyperpen +xf86-input-jamstudio +xf86-input-joystick +xf86-input-keyboard +xf86-input-magellan +xf86-input-magictouch +xf86-input-microtouch +xf86-input-mouse +xf86-input-mutouch +xf86-input-palmax +xf86-input-penmount +xf86-input-spaceorb +xf86-input-summa +xf86-input-tek4957 +xf86-input-ur98 +xf86-input-vmmouse +xf86-input-void +xf86miscproto +xf86rushproto +xf86-video-amd +xf86-video-apm +xf86-video-ark +xf86-video-ati +xf86-video-chips +xf86-video-cirrus +xf86-video-cyrix +xf86-video-dummy +xf86-video-fbdev +xf86-video-glint +xf86-video-i128 +xf86-video-i740 +xf86-video-i810 +xf86-video-impact +xf86-video-imstt +xf86-video-mga +xf86-video-neomagic +xf86-video-newport +xf86-video-nsc +xf86-video-nv +xf86-video-rendition +xf86-video-s3 +xf86-video-s3virge +xf86-video-savage +xf86-video-siliconmotion +xf86-video-sis +xf86-video-sisusb +xf86-video-sunbw2 +xf86-video-suncg14 +xf86-video-suncg3 +xf86-video-suncg6 +xf86-video-sunffb +xf86-video-sunleo +xf86-video-suntcx +xf86-video-tdfx +xf86-video-tga +xf86-video-trident +xf86-video-tseng +xf86-video-v4l +xf86-video-vermilion +xf86-video-vesa +xf86-video-vga +xf86-video-via +xf86-video-vmware +xf86-video-voodoo +xf86-video-xgi +xf86vidmodeproto +xfd +xfindproxy +xfontsel +xfs +xfsinfo +xfwp +xgamma +xgc +xhost +Ximian-logos +xineramaproto +xinit +xkbcomp +xkbdata +xkbevd +xkbprint +xkbutils +xkill +xload +xlogo +xlsatoms +xlsclients +xlsfonts +xmag +xmame +xman +xmessage +xmh +xmlformat +xmodmap +xmore +xorg-cf-files +xorg-docs +xorg-server +xorg-sgml-doctools +xphelloworld +xplsprinters +xpr +xprehashprinterlist +xprop +xproto +xproxymanagementproto +xrandr +xrdb +xref.lisp +xrefresh +xrx +xset +xsetmode +xsetpointer +xsetroot +xshipwars +xsm +xstdcmap +xtrans +xtrap +xvidtune +xvinfo +xwd +xwininfo +xwud +YAZ +ZBL +ZendFramework-1.1 +zend-optimizer +ZLIB +zoo +ZORK +ZPL +ZSH diff --git a/conf/intel/repo/sabayon-hell/packages.db.system_mask b/conf/intel/repo/sabayon-hell/packages.db.system_mask index ba79422..08066b8 100644 --- a/conf/intel/repo/sabayon-hell/packages.db.system_mask +++ b/conf/intel/repo/sabayon-hell/packages.db.system_mask @@ -2,7 +2,7 @@ app-admin/equo app-misc/sabayon-version dev-db/sqlite sys-apps/entropy -sys-devel/base-gcc:4.6 +sys-devel/base-gcc:4.8 sys-libs/db:4.8 virtual/cron # virtual/linux-binary diff --git a/conf/intel/repo/sabayon-limbo/packages.db.critical b/conf/intel/repo/sabayon-limbo/packages.db.critical index 0ed0e40..a881010 100644 --- a/conf/intel/repo/sabayon-limbo/packages.db.critical +++ b/conf/intel/repo/sabayon-limbo/packages.db.critical @@ -1,3 +1,4 @@ -sys-devel/base-gcc:4.6 ->=sys-apps/portage-2.2_alpha13 ->sys-libs/glibc-2.14.9999 +sys-devel/base-gcc:4.8 +>=sys-apps/portage-2.2.0_alpha142 +>sys-libs/glibc-2.16.9999 +>=sys-apps/entropy-205 diff --git a/conf/intel/repo/sabayon-limbo/packages.db.keywords b/conf/intel/repo/sabayon-limbo/packages.db.keywords index 3bba829..6d656fd 100644 --- a/conf/intel/repo/sabayon-limbo/packages.db.keywords +++ b/conf/intel/repo/sabayon-limbo/packages.db.keywords @@ -1,6 +1,7 @@ -media-sound/pulseaudio ~x86 ~amd64 sys-apps/portage ~x86 ~amd64 +dev-lang/python:3.3 ~x86 ~amd64 -# GNOME 3.2 temp keywords -gnome-extra/gnome-contacts ~x86 ~amd64 -net-libs/gnome-online-accounts ~x86 ~amd64 +# GNOME 3.12 mask +>=sys-power/upower-0.99.0 ~x86 ~amd64 +# Allow systemd and upower 0.99 friendly version +=xfce-extra/xfce4-power-manager-1.2.0_p20140527 ~amd64 ~x86 amd64 x86 diff --git a/conf/intel/repo/sabayon-limbo/packages.db.lic_whitelist b/conf/intel/repo/sabayon-limbo/packages.db.lic_whitelist new file mode 100644 index 0000000..a740a3c --- /dev/null +++ b/conf/intel/repo/sabayon-limbo/packages.db.lic_whitelist @@ -0,0 +1,770 @@ +3DFX +3proxy +3ware +4F +7plus +9wm +ACME +ACML +aczoom +Adaptec +adobe-ps +AdobePS +Adobe-SourceCode +AECA +aewm +AFL-2.0 +AFL-2.1 +AFL-3.0 +AFTERSTEP +AICCU +Aladdin +Allegro +amiwm +AMPAS +AMS +ANTL +Apache-1.1 +Apache-2.0 +APL-1.0 +appres +APSL-2 +aquafont +arj +Arphic +Artistic +Artistic-2 +as-is +astrolog +astromenace +ATOK +AURA +BAEKMUK +bass +BCS +bdftopcf +BEER-WARE +beforelight +bigresproto +bioapi +bitmap +BitstreamVera +BitTorrent +blackshades +Blitz-Artistic +bonnie +Boost-1.0 +BSD +BSD-2 +BSD-4 +BSD-4 +bungie-marathon +BWidget +BZIP2 +C3 +cadsoft +Caldera +canada-med +CAOSL +ccp4 +CCPL-Attribution-2.0 +CCPL-Attribution-3.0 +CCPL-Attribution-NoDerivs-2.5 +CCPL-Attribution-NonCommercial-NoDerivs-2.0 +CCPL-Attribution-NonCommercial-NoDerivs-2.5 +CCPL-Attribution-ShareAlike-2.0 +CCPL-Attribution-ShareAlike-2.5 +CCPL-Attribution-ShareAlike-3.0 +CCPL-Attribution-ShareAlike-NonCommercial-2.5 +CCPL-ShareAlike-1.0 +CDDL +CDDL-Schily +cdegroot +CDF +CeCILL-2 +Cenon +CGL +charm +chasen +circlemud +cisco-vpn-client +Clarified-Artistic +clustalw +CMake +CMASS-M3 +cmigemo +CNRI +CNRI-QUIXOTE-2.4 +codehaus-classworlds +codehaus-groovy +colt +compositeproto +Conexant +cos +CPL-0.5 +CPL-1.0 +CRACKLIB +crafty +crazney +cryptopp +CS-1.0 +CyberNeko-1.0 +damageproto +DB +dbgphp +DCC +DEC-M3 +DES +dgen-sdl +dlj-1.1 +dmxproto +dom4j +DSL +DSNIFF +DUMB-0.9.2 +dvibook +EAPL +ECWPL +EDB +editres +eGenixPublic +eGenixPublic-1.1 +ElementTree +Elm +Emacs +encodings +EPL +EPL-1.0 +EPSON +eternal_lands +evieext +Exolab +FastCGI +FDL-1.1 +FDL-1.2 +FDL-1.3+ +FESTIVAL +FIPL-1.0 +fixesproto +FLEX +FLTK +FML-1 +fmod +folding-at-home +font-adobe-100dpi +font-adobe-75dpi +font-adobe-utopia-100dpi +font-adobe-utopia-75dpi +font-adobe-utopia-type1 +font-alias +font-arabic-misc +font-bh-100dpi +font-bh-75dpi +font-bh-lucidatypewriter-100dpi +font-bh-lucidatypewriter-75dpi +font-bh-ttf +font-bh-type1 +font-bitstream-100dpi +font-bitstream-75dpi +font-bitstream-speedo +font-bitstream-type1 +fontcacheproto +fontconfig +font-cronyx-cyrillic +font-cursor-misc +font-daewoo-misc +font-dec-misc +font-ibm-type1 +font-isas-misc +font-jis-misc +font-micro-misc +font-misc-cyrillic +font-misc-ethiopic +font-misc-meltho +font-misc-misc +font-mutt-misc +font-schumacher-misc +font-screen-cyrillic +font-sony-misc +fontsproto +font-sun-misc +fonttosfnt +font-util +font-winitzki-cyrillic +font-xfree86-type1 +fping +FreeArt +freedist +freemarker +freetts +Frodo +fslsfonts +fstobdf +FTL +FVWM +galaxyhack +GAlib +gamess +gccmakedep +gcc-runtime-library-exception-3.1 +GDLS +gips_iLBClicense.pdf +glest-data +glimpse +glproto +glut +GLX +GMGPL +gnuplot +GPL-1 +GPL-2 +GPL-2+ +GPL-2-with-exceptions +GPL-2-with-linking-exception +GPL-2-with-MySQL-FLOSS-exception +GPL-3 +GPL-3+ +grass-ipafonts +guild +HPL +HYDRA +hylafax +hyperic +HyperSpec +iASL +IBM +IBM-J1.4 +IBM-J1.5 +ICE +iceauth +ico +icu +IDPL +imagemagick +imake +immon-sflow +Indir +Inform +Info-ZIP +inputproto +Interbase-1.0 +ipadic +IPL-1 +IRPDL +ISC +isc-dhcp +ITS4 +JamesClark +jardinains +JasPer +jaxen +jcraft +jdepend +JDOM +jlex +JNIC +JPython +jrockit +kbproto +KenMacLeod +Kermit +knights-demo +kvirc +lam-mpi +LDP +LDP-1a +less +levee +LFS +LGPL-2 +LGPL-2+ +LGPL-2.1 +LGPL-2.1+ +LGPL-2.1-linking-exception +LGPL-2.1-UUST +LGPL-3 +LGPL-3+ +lha +libdmx +libdomainkeys-1.1 +libdrm +libf2c +libffi +libfontenc +libFS +libgcc +LIBGLOSS +libICE +liblbxutil +liboldX +libSM +libstdc++ +libX11 +libXau +libXaw +libXcomposite +libXcursor +libXdamage +libXdmcp +libXevie +libXext +libXfixes +libXfont +libXfontcache +libXft +libXi +libXinerama +libxkbfile +libxkbui +libXmu +libXp +libXpm +libXprintAppUtil +libXprintUtil +libxproxy +libXrandr +libXrender +libXres +libXScrnSaver +libXt +libXTrap +libXtst +libXv +libXvMC +libXxf86dga +libXxf86misc +libXxf86vm +LICENSE-BITSTREAM +lisp2wish +listres +LLGPL-2.1 +LOKI-EULA +LPPL-1.2 +LPPL-1.3 +LPPL-1.3b +LPPL-1.3c +lsof +luit +maestro +MagickWand +makedepend +MakeIndex +mapm +marginalhacks +mayadoc-5.0 +MBROLA +mekanix +meme +Memonix +metapackage +MILO +mindterm +Mini-XML +MIT +mkfontdir +mkfontscale +mmix +molmol +molscript +MonetDBPL-1.1 +mongrel +mopac7 +Moria +MOTIF +Mozart +MPEG4 +MPL-1.0 +MPL-1.1 +mplus-fonts +mserv +MSF-1.2 +Ms-PL +mx4j +myspell-en_CA-JRossBeresford +myspell-en_CA-KevinAtkinson +myspell-et_EE-IEL +myspell-hyph_sk_SK-TiborBako +myspell-ispell-GeoffKuenning +myspell-lt_LT-AlbertasAgejevas +myspell-ru_RU-ALexanderLebedev +myspell-th_cs_CZ-PavelRychlySmrz +namd +NCSA-HDF +nemerle +nethack +netlogo +netperf +NewArtisans +NEWLIB +newton +nhc98 +No-Problem-Bugroff +Norvig +NPL-1.1 +oclock +OFL +OFL-1.1 +OGL-1.0a +OGTSL +openafs-krb5 +openafs-krb5-a +openknights +OPENLDAP +openmarket +openpbs +OpenSoftware +openspml +openssl +OpenSymphony-1.1 +OPERA-9 +OPL +OracleDB +OSI-Approved +OSIRIS +OSL-1.1 +OSL-2.0 +OTN +otter +Palm-SDK +PAM +Parallels +paraview +PathfinderPL-1.1 +PBZIP2 +PDB +PDFLite +PEL +penguzzle +perforce +petrify +pgasync +PHP +PHP-2.02 +PHP-3 +PHP-3.01 +phrack +PICO +PicoContainer +pixman +pkcrack +PLAN9 +pmd +POMPOM +poster +POSTGRESQL +Princeton +printproto +proxymngr +PSF-2 +PSF-2.2 +PSF-2.3 +PSF-2.4 +PSTT +public-domain +pymol +pysqlite +PYTHON +qeradiant +qlogic-fibre-channel-firmware +qpage +QPL +QPL-1.0 +qpopper +queen +qwt +randrproto +RDist +REALbasic +recordproto +renderproto +Resounding +resourceproto +rgb +RiceBSD +richardson +ringtonetools +Roadrunner +RSA-MD2 +RSA-MD4 +RSA-MD5 +RSA-PKCS11 +rstart +Ruby +ruby-debug +satan +saxpath +scilab +Scintilla +scripts +scrnsaverproto +selfhtml +Sendmail +Sendmail-Open-Source +sessreg +setxkbmap +SGI-B +SGI-B-1.1 +SGMLUG +showfont +SIFT +SIL-freeware +singular +sip +SixXS +Sleepycat +Smart-Link +smproxy +SNNS-4.2 +SOPLA-2.3 +sparky +Spice-1.1 +SPL +Spread-1.0 +ssh +sslwrap +staden +Stanford +stardock-images +stix +Subversion +Sudo +sun-asis-javamake +sun-bcla-j2ee +sun-bcla-j2ee-deployment +sun-bcla-j2me +sun-bcla-jai +sun-bcla-jimi +sun-bcla-jmf +sun-bcla-jmi +sun-bcla-jms +sun-bcla-jsapi +sun-bcla-jsr101 +sun-bcla-jta +sun-bcla-jvmstat +sun-j2sl +sun-j2sl-6 +sun-jrl +sun-jsr67 +sun-jsr93 +sun-openlook +sun-rpc +SVFL +tacc +t-coffee +tcp_wrappers_license +TeX +trac +trapproto +truecrypt-collective-1.0 +truecrypt-collective-1.3 +twm +UCAR-Unidata +unicode +unRAR +ut2003-demo +util-macros +ValveSDK +ventrilo +VGBA +videoproto +vienna-rna +viewres +VIGRA +vim +visual +vlgothic +Volano +VOSTROM +W3C +W3C-document +w3m +WarpPipe +WebMO +Werken-1.1.1.1 +werken.xpath +whitehead +WordNet-1.6 +worldofpadman +WTFPL-2 +wxWinFDL-3 +wxWinLL-3 +X11 +x11perf +XAnim +xauth +xbacklight +xbattle +xbiff +xbitmaps +xboing +xcalc +XCIN +xclipboard +xcmiscproto +xcmsdb +xconsole +xcursorgen +xcursor-themes +xdbedizzy +Xdebug +xditview +xdm +xdpyinfo +xdriinfo +xearth +xedit +XeTeX +xev +xextproto +xeyes +xf86bigfontproto +xf86dga +xf86dgaproto +xf86driproto +xf86-input-acecad +xf86-input-aiptek +xf86-input-calcomp +xf86-input-citron +xf86-input-digitaledge +xf86-input-dmc +xf86-input-dynapro +xf86-input-elo2300 +xf86-input-elographics +xf86-input-evdev +xf86-input-fpit +xf86-input-hyperpen +xf86-input-jamstudio +xf86-input-joystick +xf86-input-keyboard +xf86-input-magellan +xf86-input-magictouch +xf86-input-microtouch +xf86-input-mouse +xf86-input-mutouch +xf86-input-palmax +xf86-input-penmount +xf86-input-spaceorb +xf86-input-summa +xf86-input-tek4957 +xf86-input-ur98 +xf86-input-vmmouse +xf86-input-void +xf86miscproto +xf86rushproto +xf86-video-amd +xf86-video-apm +xf86-video-ark +xf86-video-ati +xf86-video-chips +xf86-video-cirrus +xf86-video-cyrix +xf86-video-dummy +xf86-video-fbdev +xf86-video-glint +xf86-video-i128 +xf86-video-i740 +xf86-video-i810 +xf86-video-impact +xf86-video-imstt +xf86-video-mga +xf86-video-neomagic +xf86-video-newport +xf86-video-nsc +xf86-video-nv +xf86-video-rendition +xf86-video-s3 +xf86-video-s3virge +xf86-video-savage +xf86-video-siliconmotion +xf86-video-sis +xf86-video-sisusb +xf86-video-sunbw2 +xf86-video-suncg14 +xf86-video-suncg3 +xf86-video-suncg6 +xf86-video-sunffb +xf86-video-sunleo +xf86-video-suntcx +xf86-video-tdfx +xf86-video-tga +xf86-video-trident +xf86-video-tseng +xf86-video-v4l +xf86-video-vermilion +xf86-video-vesa +xf86-video-vga +xf86-video-via +xf86-video-vmware +xf86-video-voodoo +xf86-video-xgi +xf86vidmodeproto +xfd +xfindproxy +xfontsel +xfs +xfsinfo +xfwp +xgamma +xgc +xhost +Ximian-logos +xineramaproto +xinit +xkbcomp +xkbdata +xkbevd +xkbprint +xkbutils +xkill +xload +xlogo +xlsatoms +xlsclients +xlsfonts +xmag +xmame +xman +xmessage +xmh +xmlformat +xmodmap +xmore +xorg-cf-files +xorg-docs +xorg-server +xorg-sgml-doctools +xphelloworld +xplsprinters +xpr +xprehashprinterlist +xprop +xproto +xproxymanagementproto +xrandr +xrdb +xref.lisp +xrefresh +xrx +xset +xsetmode +xsetpointer +xsetroot +xshipwars +xsm +xstdcmap +xtrans +xtrap +xvidtune +xvinfo +xwd +xwininfo +xwud +YAZ +ZBL +ZendFramework-1.1 +zend-optimizer +ZLIB +zoo +ZORK +ZPL +ZSH diff --git a/conf/intel/repo/sabayon-limbo/packages.db.mirrors b/conf/intel/repo/sabayon-limbo/packages.db.mirrors index 11b5cf9..e8275eb 100644 --- a/conf/intel/repo/sabayon-limbo/packages.db.mirrors +++ b/conf/intel/repo/sabayon-limbo/packages.db.mirrors @@ -2,5 +2,7 @@ http://dl.sabayon.org/entropy http://best.sabayon.org/entropy http://redir.sabayon.org/entropy +# This will be used as last resort, and must stay here +http://pkg.sabayon.org # this is in case our DNS goes down http://na.mirror.garr.it/mirrors/sabayonlinux/entropy diff --git a/conf/intel/repo/sabayon-limbo/packages.db.system_mask b/conf/intel/repo/sabayon-limbo/packages.db.system_mask index ba79422..08066b8 100644 --- a/conf/intel/repo/sabayon-limbo/packages.db.system_mask +++ b/conf/intel/repo/sabayon-limbo/packages.db.system_mask @@ -2,7 +2,7 @@ app-admin/equo app-misc/sabayon-version dev-db/sqlite sys-apps/entropy -sys-devel/base-gcc:4.6 +sys-devel/base-gcc:4.8 sys-libs/db:4.8 virtual/cron # virtual/linux-binary diff --git a/conf/intel/repo/sabayonlinux.org/packages.db.critical b/conf/intel/repo/sabayonlinux.org/packages.db.critical index 0ed0e40..a881010 100644 --- a/conf/intel/repo/sabayonlinux.org/packages.db.critical +++ b/conf/intel/repo/sabayonlinux.org/packages.db.critical @@ -1,3 +1,4 @@ -sys-devel/base-gcc:4.6 ->=sys-apps/portage-2.2_alpha13 ->sys-libs/glibc-2.14.9999 +sys-devel/base-gcc:4.8 +>=sys-apps/portage-2.2.0_alpha142 +>sys-libs/glibc-2.16.9999 +>=sys-apps/entropy-205 diff --git a/conf/intel/repo/sabayonlinux.org/packages.db.keywords b/conf/intel/repo/sabayonlinux.org/packages.db.keywords index 3031143..6d656fd 100644 --- a/conf/intel/repo/sabayonlinux.org/packages.db.keywords +++ b/conf/intel/repo/sabayonlinux.org/packages.db.keywords @@ -1,7 +1,7 @@ -media-sound/pulseaudio ~x86 ~amd64 sys-apps/portage ~x86 ~amd64 -media-plugins/gst-plugins-assrender ~x86 ~amd64 +dev-lang/python:3.3 ~x86 ~amd64 -# GNOME 3.2 temp keywords -gnome-extra/gnome-contacts ~x86 ~amd64 -net-libs/gnome-online-accounts ~x86 ~amd64 +# GNOME 3.12 mask +>=sys-power/upower-0.99.0 ~x86 ~amd64 +# Allow systemd and upower 0.99 friendly version +=xfce-extra/xfce4-power-manager-1.2.0_p20140527 ~amd64 ~x86 amd64 x86 diff --git a/conf/intel/repo/sabayonlinux.org/packages.db.lic_whitelist b/conf/intel/repo/sabayonlinux.org/packages.db.lic_whitelist index afe1425..a740a3c 100644 --- a/conf/intel/repo/sabayonlinux.org/packages.db.lic_whitelist +++ b/conf/intel/repo/sabayonlinux.org/packages.db.lic_whitelist @@ -142,6 +142,7 @@ Exolab FastCGI FDL-1.1 FDL-1.2 +FDL-1.3+ FESTIVAL FIPL-1.0 fixesproto @@ -217,10 +218,12 @@ GMGPL gnuplot GPL-1 GPL-2 +GPL-2+ GPL-2-with-exceptions GPL-2-with-linking-exception GPL-2-with-MySQL-FLOSS-exception GPL-3 +GPL-3+ grass-ipafonts guild HPL @@ -274,10 +277,13 @@ less levee LFS LGPL-2 +LGPL-2+ LGPL-2.1 +LGPL-2.1+ LGPL-2.1-linking-exception LGPL-2.1-UUST LGPL-3 +LGPL-3+ lha libdmx libdomainkeys-1.1 @@ -350,6 +356,7 @@ MBROLA mekanix meme Memonix +metapackage MILO mindterm Mini-XML @@ -448,6 +455,7 @@ POSTGRESQL Princeton printproto proxymngr +PSF-2 PSF-2.2 PSF-2.3 PSF-2.4 @@ -551,6 +559,7 @@ truecrypt-collective-1.0 truecrypt-collective-1.3 twm UCAR-Unidata +unicode unRAR ut2003-demo util-macros diff --git a/conf/intel/repo/sabayonlinux.org/packages.db.mirrors b/conf/intel/repo/sabayonlinux.org/packages.db.mirrors index 11b5cf9..e8275eb 100644 --- a/conf/intel/repo/sabayonlinux.org/packages.db.mirrors +++ b/conf/intel/repo/sabayonlinux.org/packages.db.mirrors @@ -2,5 +2,7 @@ http://dl.sabayon.org/entropy http://best.sabayon.org/entropy http://redir.sabayon.org/entropy +# This will be used as last resort, and must stay here +http://pkg.sabayon.org # this is in case our DNS goes down http://na.mirror.garr.it/mirrors/sabayonlinux/entropy diff --git a/conf/intel/repo/sabayonlinux.org/packages.db.system_mask b/conf/intel/repo/sabayonlinux.org/packages.db.system_mask index ba79422..08066b8 100644 --- a/conf/intel/repo/sabayonlinux.org/packages.db.system_mask +++ b/conf/intel/repo/sabayonlinux.org/packages.db.system_mask @@ -2,7 +2,7 @@ app-admin/equo app-misc/sabayon-version dev-db/sqlite sys-apps/entropy -sys-devel/base-gcc:4.6 +sys-devel/base-gcc:4.8 sys-libs/db:4.8 virtual/cron # virtual/linux-binary diff --git a/conf/noarch/entropy/packages/packages.server.dep_blacklist b/conf/noarch/entropy/packages/packages.server.dep_blacklist index eae8f0f..ef13044 100644 --- a/conf/noarch/entropy/packages/packages.server.dep_blacklist +++ b/conf/noarch/entropy/packages/packages.server.dep_blacklist @@ -9,4 +9,13 @@ # See examples below # EXAMPLES: -app-admin/anaconda x11-libs/libXmu:0 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 x11-libs/libXrender:0 x11-libs/pixman:0 x11-libs/pango:0 media-libs/mesa:0 +app-admin/anaconda x11-libs/libXmu:0 x11-libs/gtk+:2 x11-libs/gtk+:3 x11-libs/gdk-pixbuf:2 x11-libs/libXrender:0 x11-libs/pixman:0 x11-libs/pango:0 media-libs/mesa:0 sys-libs/libselinux:0 sys-process/audit:0 + +# it provides its own libwine.so.1 +net-misc/teamviewer app-emulation/wine:0 + +# libcli.so +media-sound/pulseaudio dev-db/fastdb:0 + +# libCore.so, bug 4277 +dev-qt/qt-creator sci-physics/root:0 diff --git a/conf/noarch/entropy/packages/packages.server.dep_rewrite b/conf/noarch/entropy/packages/packages.server.dep_rewrite index b567633..d66e33c 100644 --- a/conf/noarch/entropy/packages/packages.server.dep_rewrite +++ b/conf/noarch/entropy/packages/packages.server.dep_rewrite @@ -1,52 +1,66 @@ # Fix poppler dependencies, we provide our own split deps -media-gfx/pdf2svg (.*)app-text/poppler-(.*)(\[.*\]) \1app-text/poppler-glib-\2 -kde-base/okular (.*)app-text/poppler-(.*)(\[.*\]) \1app-text/poppler-qt4-\2 -media-gfx/inkscape (.*)app-text/poppler-(.*)(\[.*\]) \1app-text/poppler-glib-\2 -gnustep-libs/popplerkit (.*)app-text/poppler-(.*)(\[.*\])? \1app-text/poppler-base-\2 -app-text/texlive-core (.*)app-text/poppler-(.*)(\[.*\])? \1app-text/poppler-base-\2 -media-gfx/gimp (.*)app-text/poppler-(.*)(\[.*\]) \1app-text/poppler-glib-\2 -net-print/cups (.*)app-text/poppler-(.*)(\[.*\])? \1app-text/poppler-base-\2 -app-text/calibre (.*)app-text/poppler-(.*)(\[.*\]) \1app-text/poppler-qt4-\2 -app-text/dvipdfmx (.*)app-text/poppler-(\d.*)(\[.*\])? \1app-text/poppler-base-\2 -dev-tex/luatex (.*)app-text/poppler-(.*)(\[.*\])? \1app-text/poppler-base-\2 -app-misc/beagle (.*)app-text/poppler-(.*)(\[.*\])? \1app-text/poppler-base-\2 -app-misc/tracker (.*)app-text/poppler-(.*)(\[.*\]) \1app-text/poppler-glib-\2 -app-office/krita (.*)app-text/poppler-(.*)(\[.*\]) \1app-text/poppler-qt4-\2 -app-office/openoffice (.*)app-text/poppler-(.*)(\[.*\])? \1app-text/poppler-base-\2 -app-text/evince (.*)app-text/poppler-(.*)(\[.*\]) \1app-text/poppler-glib-\2 -kde-misc/tellico (.*)app-text/poppler-(.*)(\[.*\]) \1app-text/poppler-qt4-\2 -app-text/epdfview (.*)app-text/poppler-(.*)(\[.*\]) \1app-text/poppler-glib-\2 -app-text/xpdf (.*)app-text/poppler-(.*)(\[.*\])? \1app-text/poppler-base-\2 -app-text/xournal app-text/poppler(\[.*\]) app-text/poppler-glib -media-gfx/keyjnote (.*)app-text/poppler-(.*)(\[.*\])? \1app-text/poppler-base-\2 -dev-games/openscenegraph (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-glib\2 -xfce-extra/tumbler (.*)app-text/poppler-(.*)(\[.*\]) \1app-text/poppler-glib-\2 -app-office/texmaker (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-qt4\2 app-editors/gummi (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-glib\2 +app-leechcraft/lc-monocle (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-qt4\2 +app-misc/beagle (.*)app-text/poppler(.*)(\[.*\])? \1app-text/poppler-base\2 +app-misc/pdfpc (.*)app-text/poppler(.*) app-text/poppler-glib +app-misc/recoll (.*)app-text/poppler(.*) \1app-text/poppler-base\2 +app-misc/tracker (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-glib\2 app-office/calligra (.*)app-text/poppler(.*) \1app-text/poppler-base\2 -x11-misc/qcomicbook (.*)app-text/poppler(.*) \1app-text/poppler\2 +app-office/impressive (.*)app-text/poppler(.*)(\[.*\])? \1app-text/poppler-base\2 +app-office/krita (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-qt4\2 +app-office/libreoffice (.*)app-text/poppler(.*)(\[.*\])? \1app-text/poppler-base\2 +app-office/openoffice (.*)app-text/poppler(.*)(\[.*\])? \1app-text/poppler-base\2 +app-office/texmaker (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-qt4\2 app-office/texmakerx (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-qt4\2 -app-office/libreoffice (.*)app-text/poppler-(.*)(\[.*\])? \1app-text/poppler-base-\2 -app-office/impressive (.*)app-text/poppler-(.*)(\[.*\])? \1app-text/poppler-base-\2 -dev-python/python-poppler (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-glib\2 -sci-libs/gdal (.*)app-text/poppler(.*) \1app-text/poppler-base\2 -dev-ruby/ruby-poppler (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-glib\2 -www-apps/dotproject (.*)app-text/poppler-(.*)(\[.*\])? \1app-text/poppler-base-\2 -www-apps/swish-e (.*)app-text/poppler-(.*)(\[.*\])? \1app-text/poppler-base-\2 +app-office/texstudio (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-qt4\2 app-text/apvlv (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-glib\2 +app-text/atril (.*)app-text/poppler(.*)(\[.*\])? \1app-text/poppler-glib\2 +app-text/calibre (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-qt4\2 app-text/diffpdf (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-qt4\2 -app-text/pdf2djvu (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-base\2 +app-text/dvipdfmx (.*)app-text/poppler(\d.*)(\[.*\])? \1app-text/poppler-base\2 +app-text/epdfview (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-glib\2 +app-text/evince (.*)app-text/poppler-(.*)(\[.*\]) \1app-text/poppler-glib-\2 +app-text/kbibtex (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-qt4\2 +app-text/mate-document-viewer (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-glib\2 +app-text/pdf2djvu (.*)app-text/poppler(.*) \1app-text/poppler-base\2 app-text/pdf2oo (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-base\2 app-text/pdfgrep (.*)app-text/poppler(.*) \1app-text/poppler-base\2 -app-text/zathura-pdf-poppler (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-glib\2 -dev-tex/pstplus (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-qt4\2 -app-text/kbibtex (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-qt4\2 -app-misc/recoll (.*)app-text/poppler(.*) \1app-text/poppler-base\2 -gnome-extra/gnome-commander (.*)app-text/poppler(.*) \1app-text/poppler-base\2 -dev-python/python-poppler-qt4 (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-qt4\2 -app-text/mate-document-viewer (.*)app-text/poppler-(.*)(\[.*\]) \1app-text/poppler-glib-\2 app-text/qpdfview (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-qt4\2 -app-text/leechcraft-monocle (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-qt4\2 +app-text/referencer (.*)app-text/poppler(.*) app-text/poppler-glib +app-text/texlive-core (.*)app-text/poppler(.*)(\[.*\])? \1app-text/poppler-base\2 +app-text/xournal app-text/poppler(\[.*\]) app-text/poppler-glib +app-text/xpdf (.*)app-text/poppler(.*)(\[.*\])? \1app-text/poppler-base\2 +app-text/zathura-pdf-poppler (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-glib\2 +dev-games/openscenegraph (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-glib\2 +dev-python/python-poppler (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-glib\2 +dev-python/python-poppler-qt4 (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-qt4\2 +dev-ruby/ruby-poppler (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-glib\2 +dev-tex/luatex (.*)app-text/poppler(.*)(\[.*\])? \1app-text/poppler-base\2 +dev-tex/pstplus (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-qt4\2 +gnome-extra/gnome-commander (.*)app-text/poppler(.*) \1app-text/poppler-base\2 +gnustep-libs/popplerkit (.*)app-text/poppler(.*)(\[.*\])? \1app-text/poppler-base\2 +kde-base/kfilemetadata (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-qt4\2 +kde-base/nepomuk-core (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-qt4\2 +kde-base/okular (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-qt4\2 +kde-misc/tellico (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-qt4\2 +mail-client/claws-mail (.*)app-text/poppler(.*)(\[.*\])? \1app-text/poppler-glib\2 +media-gfx/gimp (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-glib\2 +media-gfx/graphviz (.*)app-text/poppler(.*)(\[.*\])? \1app-text/poppler-glib\2 +media-gfx/inkscape (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-glib\2 +media-gfx/keyjnote (.*)app-text/poppler(.*)(\[.*\])? \1app-text/poppler-base\2 +media-gfx/pdf2svg (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-glib\2 +net-print/cups (.*)app-text/poppler(.*)(\[.*\])? \1app-text/poppler-base\2 +net-print/cups-filters (.*)app-text/poppler(.*)(\[.*\])? \1app-text/poppler-base\2 +sci-libs/gdal (.*)app-text/poppler(.*) \1app-text/poppler-base\2 +www-apps/dotproject (.*)app-text/poppler(.*)(\[.*\])? \1app-text/poppler-base\2 +www-apps/swish-e (.*)app-text/poppler(.*)(\[.*\])? \1app-text/poppler-base\2 +x11-misc/qcomicbook (.*)app-text/poppler(.*) \1app-text/poppler\2 +xfce-extra/tumbler (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-glib\2 + +# lightdm split rewrite +razorqt-base/razorqt-lightdm-greeter (.*)x11-misc/lightdm(.*)\[qt4\] \1x11-misc/lightdm-qt4\2 +x11-misc/lightdm-gtk-greeter (.*)x11-misc/lightdm(.*) \1x11-misc/lightdm-base\2 +x11-misc/lightdm-kde (.*)x11-misc/lightdm(.*)\[qt4\] \1x11-misc/lightdm-qt4\2 # Fix enigmail deps, to point to our split pinentry packages x11-plugins/enigmail (.*)app-crypt/pinentry(.*)\[gtk\] \1app-crypt/pinentry-gtk2\2 @@ -72,15 +86,19 @@ app-emulation/virtualbox-guest-additions#3.3.0-sabayon (.*)x11-drivers/xf86-vide app-emulation/virtualbox-guest-additions#3.4.0-sabayon (.*)x11-drivers/xf86-video-virtualbox-(.*) \1x11-drivers/xf86-video-virtualbox-\2#3.4.0-sabayon app-emulation/virtualbox-guest-additions#3.5.0-sabayon (.*)x11-drivers/xf86-video-virtualbox-(.*) \1x11-drivers/xf86-video-virtualbox-\2#3.5.0-sabayon app-emulation/virtualbox-guest-additions#3.6.0-sabayon (.*)x11-drivers/xf86-video-virtualbox-(.*) \1x11-drivers/xf86-video-virtualbox-\2#3.6.0-sabayon - -# Fix virtualbox shitty dependencies, fusion sources -app-emulation/virtualbox-guest-additions#3.0.0-fusion (.*)x11-drivers/xf86-video-virtualbox-(.*) \1x11-drivers/xf86-video-virtualbox-\2#3.0.0-fusion -app-emulation/virtualbox-guest-additions#3.1.0-fusion (.*)x11-drivers/xf86-video-virtualbox-(.*) \1x11-drivers/xf86-video-virtualbox-\2#3.1.0-fusion -app-emulation/virtualbox-guest-additions#3.2.0-fusion (.*)x11-drivers/xf86-video-virtualbox-(.*) \1x11-drivers/xf86-video-virtualbox-\2#3.2.0-fusion -app-emulation/virtualbox-guest-additions#3.3.0-fusion (.*)x11-drivers/xf86-video-virtualbox-(.*) \1x11-drivers/xf86-video-virtualbox-\2#3.3.0-fusion -app-emulation/virtualbox-guest-additions#3.4.0-fusion (.*)x11-drivers/xf86-video-virtualbox-(.*) \1x11-drivers/xf86-video-virtualbox-\2#3.4.0-fusion -app-emulation/virtualbox-guest-additions#3.5.0-fusion (.*)x11-drivers/xf86-video-virtualbox-(.*) \1x11-drivers/xf86-video-virtualbox-\2#3.5.0-fusion -app-emulation/virtualbox-guest-additions#3.6.0-fusion (.*)x11-drivers/xf86-video-virtualbox-(.*) \1x11-drivers/xf86-video-virtualbox-\2#3.6.0-fusion +app-emulation/virtualbox-guest-additions#3.7.0-sabayon (.*)x11-drivers/xf86-video-virtualbox-(.*) \1x11-drivers/xf86-video-virtualbox-\2#3.7.0-sabayon +app-emulation/virtualbox-guest-additions#3.8.0-sabayon (.*)x11-drivers/xf86-video-virtualbox-(.*) \1x11-drivers/xf86-video-virtualbox-\2#3.8.0-sabayon +app-emulation/virtualbox-guest-additions#3.9.0-sabayon (.*)x11-drivers/xf86-video-virtualbox-(.*) \1x11-drivers/xf86-video-virtualbox-\2#3.9.0-sabayon +app-emulation/virtualbox-guest-additions#3.10.0-sabayon (.*)x11-drivers/xf86-video-virtualbox-(.*) \1x11-drivers/xf86-video-virtualbox-\2#3.10.0-sabayon +app-emulation/virtualbox-guest-additions#3.11.0-sabayon (.*)x11-drivers/xf86-video-virtualbox-(.*) \1x11-drivers/xf86-video-virtualbox-\2#3.11.0-sabayon +app-emulation/virtualbox-guest-additions#3.12.0-sabayon (.*)x11-drivers/xf86-video-virtualbox-(.*) \1x11-drivers/xf86-video-virtualbox-\2#3.12.0-sabayon +app-emulation/virtualbox-guest-additions#3.13.0-sabayon (.*)x11-drivers/xf86-video-virtualbox-(.*) \1x11-drivers/xf86-video-virtualbox-\2#3.13.0-sabayon +app-emulation/virtualbox-guest-additions#3.14.0-sabayon (.*)x11-drivers/xf86-video-virtualbox-(.*) \1x11-drivers/xf86-video-virtualbox-\2#3.14.0-sabayon +app-emulation/virtualbox-guest-additions#3.15.0-sabayon (.*)x11-drivers/xf86-video-virtualbox-(.*) \1x11-drivers/xf86-video-virtualbox-\2#3.15.0-sabayon +app-emulation/virtualbox-guest-additions#3.16.0-sabayon (.*)x11-drivers/xf86-video-virtualbox-(.*) \1x11-drivers/xf86-video-virtualbox-\2#3.16.0-sabayon +app-emulation/virtualbox-guest-additions#3.17.0-sabayon (.*)x11-drivers/xf86-video-virtualbox-(.*) \1x11-drivers/xf86-video-virtualbox-\2#3.17.0-sabayon +app-emulation/virtualbox-guest-additions#3.18.0-sabayon (.*)x11-drivers/xf86-video-virtualbox-(.*) \1x11-drivers/xf86-video-virtualbox-\2#3.18.0-sabayon +app-emulation/virtualbox-guest-additions#3.19.0-sabayon (.*)x11-drivers/xf86-video-virtualbox-(.*) \1x11-drivers/xf86-video-virtualbox-\2#3.19.0-sabayon # drop virtualbox-modules dep from virtualbox-bin # 2011-02-08: DISABLED because vboxusers group is required but not created by virtualbox-bin @@ -92,104 +110,8 @@ app-emulation/virtualbox-guest-additions#3.6.0-fusion (.*)x11-drivers/xf86-video # Force netbeans-ide to use our split subversion-java package dev-java/netbeans-ide (.*)dev-vcs/subversion(.*):0\[java\] \1dev-vcs/subversion-java\2:0 -# Drop kde-l10n* deps -kde-misc/customizable-weather (.*)kde-base/kde-l10n(.*) -media-gfx/digikam (.*)kde-base/kde-l10n(.*) -dev-util/kdevelop (.*)kde-base/kde-l10n(.*) -dev-util/kdevplatform (.*)kde-base/kde-l10n(.*) -net-p2p/ktorrent (.*)kde-base/kde-l10n(.*) -kde-misc/konq-plugins (.*)kde-base/kde-l10n(.*) -net-wireless/bluedevil (.*)kde-base/kde-l10n(.*) -net-libs/libktorrent (.*)kde-base/kde-l10n(.*) -kde-misc/kcm-grub2 (.*)kde-base/kde-l10n(.*) -kde-misc/wacomtablet (.*)kde-base/kde-l10n(.*) -media-video/kaffeine (.*)kde-base/kde-l10n(.*) -kde-misc/krename (.*)kde-base/kde-l10n(.*) -kde-misc/tellico (.*)kde-base/kde-l10n(.*) -media-sound/kwave (.*)kde-base/kde-l10n(.*) -media-video/bangarang (.*)kde-base/kde-l10n(.*) -media-video/kdenlive (.*)kde-base/kde-l10n(.*) -kde-misc/kcm-gtk-config (.*)kde-base/kde-l10n(.*) -kde-misc/smooth-tasks (.*)kde-base/kde-l10n(.*) -kde-misc/plasma-mpd-nowplayin (.*)kde-base/kde-l10n(.*) -kde-misc/wicd-client-kde (.*)kde-base/kde-l10n(.*) -media-video/2mandvd (.*)kde-base/kde-l10n(.*) -app-cdr/k9copy (.*)kde-base/kde-l10n(.*) -net-misc/smb4k (.*)kde-base/kde-l10n(.*) -kde-misc/synaptiks (.*)kde-base/kde-l10n(.*) -kde-base/kdepim-runtime (.*)kde-base/kde-l10n(.*) -kde-misc/kgtk (.*)kde-base/kde-l10n(.*) -kde-misc/skanlite (.*)kde-base/kde-l10n(.*) -media-plugins/kipi-plugins (.*)kde-base/kde-l10n(.*) -kde-misc/krusader (.*)kde-base/kde-l10n(.*) -dev-util/kdevelop-php-docs (.*)kde-base/kde-l10n(.*) -games-board/knights (.*)kde-base/kde-l10n(.*) -kde-misc/kshutdown (.*)kde-base/kde-l10n(.*) -kde-misc/plasma-mpd-nowplaying (.*)kde-base/kde-l10n(.*) -media-sound/kid3 (.*)kde-base/kde-l10n(.*) -media-video/loopy (.*)kde-base/kde-l10n(.*) -x11-themes/nitrogen (.*)kde-base/kde-l10n(.*) -media-sound/amarok (.*)kde-base/kde-l10n(.*) -net-nntp/kwooty (.*)kde-base/kde-l10n(.*) -app-office/skrooge (.*)kde-base/kde-l10n(.*) -app-office/kmymoney (.*)kde-base/kde-l10n(.*) -kde-misc/kdesudo (.*)kde-base/kde-l10n(.*) -dev-vcs/kdesvn (.*)kde-base/kde-l10n(.*) -media-video/kplayer (.*)kde-base/kde-l10n(.*) -kde-misc/yawp (.*)kde-base/kde-l10n(.*) -app-cdr/k3b (.*)kde-base/kde-l10n(.*) -net-misc/knemo (.*)kde-base/kde-l10n(.*) -net-im/choqok (.*)kde-base/kde-l10n(.*) -media-video/kmplayer (.*)kde-base/kde-l10n(.*) -sci-calculators/keurocalc (.*)kde-base/kde-l10n(.*) -media-sound/kradio (.*)kde-base/kde-l10n(.*) -kde-misc/networkmanagement (.*)kde-base/kde-l10n(.*) -kde-misc/eventlist (.*)kde-base/kde-l10n(.*) -net-irc/konversation (.*)kde-base/kde-l10n(.*) -net-wireless/bluedevil (.*)kde-base/kde-l10n(.*) -kde-misc/fancytasks (.*)kde-base/kde-l10n(.*) -app-cdr/kcdemu (.*)kde-base/kde-l10n(.*) -kde-misc/krecipes (.*)kde-base/kde-l10n(.*) -kde-misc/kio-locate (.*)kde-base/kde-l10n(.*) -kde-misc/kio_gopher (.*)kde-base/kde-l10n(.*) -kde-misc/quickaccess (.*)kde-base/kde-l10n(.*) -kde-misc/steamcompanion (.*)kde-base/kde-l10n(.*) -kde-misc/serverstatuswidget (.*)kde-base/kde-l10n(.*) -media-sound/soundkonverter (.*)kde-base/kde-l10n(.*) -sci-mathematics/rkward (.*)kde-base/kde-l10n(.*) -media-gfx/kpovmodeler (.*)kde-base/kde-l10n(.*) -dev-util/kdevelop-php (.*)kde-base/kde-l10n(.*) -net-im/ktp-accounts-kcm (.*)kde-base/kde-l10n(.*) -net-im/ktp-approver (.*)kde-base/kde-l10n(.*) -net-im/ktp-auth-handler (.*)kde-base/kde-l10n(.*) -net-im/ktp-common-internals (.*)kde-base/kde-l10n(.*) -net-im/ktp-contact-applet (.*)kde-base/kde-l10n(.*) -net-im/ktp-contact-list (.*)kde-base/kde-l10n(.*) -net-im/ktp-filetransfer-handler (.*)kde-base/kde-l10n(.*) -net-im/ktp-kded-module (.*)kde-base/kde-l10n(.*) -net-im/ktp-presence-applet (.*)kde-base/kde-l10n(.*) -net-im/ktp-send-file (.*)kde-base/kde-l10n(.*) -net-im/ktp-text-ui (.*)kde-base/kde-l10n(.*) -www-client/rekonq (.*)kde-base/kde-l10n(.*) -app-portage/kportagetray (.*)kde-base/kde-l10n(.*) -kde-misc/takeoff (.*)kde-base/kde-l10n(.*) -kde-misc/kde-gtk-config (.*)kde-base/kde-l10n(.*) -app-backup/kbackup (.*)kde-base/kde-l10n(.*) -kde-misc/colibri (.*)kde-base/kde-l10n(.*) -kde-misc/rsibreak (.*)kde-base/kde-l10n(.*) -media-gfx/kcoloredit (.*)kde-base/kde-l10n(.*) -media-gfx/kfax (.*)kde-base/kde-l10n(.*) -media-gfx/kgraphviewer (.*)kde-base/kde-l10n(.*) -media-gfx/kiconedit (.*)kde-base/kde-l10n(.*) -media-gfx/kphotoalbum (.*)kde-base/kde-l10n(.*) -media-sound/audex (.*)kde-base/kde-l10n(.*) -kde-misc/plasma-applet-daisy (.*)kde-base/kde-l10n(.*) -kde-misc/miniplayer (.*)kde-base/kde-l10n(.*) -media-video/kamerka (.*)kde-base/kde-l10n(.*) -media-sound/kaudiocreator (.*)kde-base/kde-l10n(.*) -net-im/ktp-contact-runner (.*)kde-base/kde-l10n(.*) -kde-misc/yakuake (.*)kde-base/kde-l10n(.*) -media-gfx/kuickshow (.*)kde-base/kde-l10n(.*) +# Drop kde-l10n* deps, always +* (.*)kde-base/kde-l10n(.*) # Drop x11-libs/cairo PDEPEND from dev-libs/gobject-introspection # cairo pulls in mesa (through virtual/opengl) and this is very @@ -229,6 +151,7 @@ net-misc/networkmanager (.*)net-dns/avahi(.*) \1net-dns/avahi-base\2 net-misc/remmina (.*)net-dns/avahi(.*)(\[.*\]) \1net-dns/avahi-gtk3\2 net-misc/vino (.*)net-dns/avahi(.*) \1net-dns/avahi-base\2 net-print/cups (.*)net-dns/avahi(.*) \1net-dns/avahi-base\2 +net-print/cups-filters (.*)net-dns/avahi(.*) \1net-dns/avahi-base\2 net-voip/ekiga (.*)net-dns/avahi(.*) \1net-dns/avahi-base\2 net-voip/telepathy-salut (.*)net-dns/avahi(.*) \1net-dns/avahi-base\2 sci-physics/root (.*)net-dns/avahi(.*) \1net-dns/avahi-base\2 @@ -244,6 +167,8 @@ net-ftp/qshare (.*)net-dns/avahi(.*) \1net-dns/avahi-base\2 net-fs/netatalk (.*)net-dns/avahi(.*) \1net-dns/avahi-base\2 gnome-base/libgdu (.*)net-dns/avahi(.*)(\[.*\]) \1net-dns/avahi-gtk3\2 media-video/miro (.*)net-dns/avahi(.*) \1net-dns/avahi-base\2 +kde-misc/kdeconnect (.*)net-dns/avahi(.*) \1net-dns/avahi-base\2 +media-tv/tvheadend (.*)net-dns/avahi(.*) \1net-dns/avahi-base\2 # Fix gtk-3 deps media-video/kino (.*)x11-libs/gtk(.*) \1x11-libs/gtk\2:2 @@ -251,15 +176,40 @@ media-video/kino (.*)x11-libs/gtk(.*) \1x11-libs/gtk\2:2 # gnome-session-3.0.2 should pull in notification-daemon or it won't start >=gnome-base/gnome-session-3.0 ++>=x11-misc/notification-daemon-0.7.1<2> -# We provide media-video/libav and we want systems to have it pulled in -virtual/ffmpeg (.*)media-video/ffmpeg(.*) \1media-video/libav\2 - # pygobject-cairo rewrite, simple catch-all rewrite # this might not catch all the strings -* (.*)dev-python/pygobject(.*)\[cairo\] \1dev-python/pygobject-cairo\2 +* (.*)dev-python/pygobject(.*)\[cairo(.*)\] \1dev-python/pygobject-cairo\2 # Rewrite almost every standard dev-python/pygobject dependency * (.*)dev-python/pygobject(?!.*-base.*)(?!.*-cairo.*)((?=-[0-9]\.)?)(?!.*-2\*)(?!.*:2)((.*:3)?)(?!.*\[.*cairo.*\].*) \1dev-python/pygobject-base\2\3 # ati-drivers, nvidia-drivers rewrites virtual/opencl (.*)x11-drivers/ati-drivers(.*) \1x11-drivers/ati-userspace\2 virtual/opencl (.*)x11-drivers/nvidia-drivers(.*) \1x11-drivers/nvidia-userspace\2 +dev-util/nvidia-cuda-sdk (.*)x11-drivers/nvidia-drivers(.*) \1x11-drivers/nvidia-userspace\2 +dev-python/pycuda (.*)x11-drivers/nvidia-drivers(.*) \1x11-drivers/nvidia-userspace\2 + +# Drop dracut dependency from plymouth, not needed atm +sys-boot/plymouth (.*)sys-kernel/dracut(.*) + +# drop PyQt4 dependency from pyudev, let runtime stuff deal with it +dev-python/pyudev (.*)dev-python/PyQt4(.*) + +# Steam, don't pull in gcc directly +games-util/steam-launcher (.*)sys-devel/gcc-(.*) \1sys-devel/base-gcc-\2 +games-util/steam-client-meta (.*)sys-devel/gcc-(.*) \1sys-devel/base-gcc-\2 + +# Add conflict to systemd-sysv-utils for eselect-init +sys-apps/systemd-sysv-utils ++!app-admin/eselect-init<2> + +# Replace x11-drivers/ati-drivers with ati-userspace from xvba-video +x11-libs/xvba-video (.*)x11-drivers/ati-drivers(.*) \1x11-drivers/ati-userspace\2 + +# Ensure a smooth migration from libgcrypt-1.5 to 1.6 +=dev-libs/libgcrypt-1.6* ++dev-libs/libgcrypt:11<2> + +# Drop VCS dependencies for app-portage/layman (related to bug 4822) +# keep it aligned with USE flags +app-portage/layman (.*)dev-vcs/bzr(.*) +app-portage/layman (.*)dev-vcs/git(.*) +app-portage/layman (.*)dev-vcs/mercurial(.*) +app-portage/layman (.*)dev-vcs/subversion(.*) diff --git a/conf/noarch/entropy/packages/packages.server.qa.exec b/conf/noarch/entropy/packages/packages.server.qa.exec index de010f5..7ec8f1a 100755 --- a/conf/noarch/entropy/packages/packages.server.qa.exec +++ b/conf/noarch/entropy/packages/packages.server.qa.exec @@ -74,10 +74,10 @@ def check_unwanted_deps(): # You can only declare key or key:slot unwanted_deps = ["app-admin/packagekit", "app-text/poppler", "kde-base/kde-l10n", "net-dns/avahi", "net-p2p/transmission", - "app-crypt/pinentry", "dev-python/pygobject:3"] - warning_deps = ["media-libs/libjpeg-turbo", "media-libs/jpeg", + "app-crypt/pinentry", "dev-python/pygobject:3", "x11-misc/lightdm"] + warning_deps = ["media-libs/jpeg", "dev-lang/gnat-gcc", "dev-lang/gcc", "x11-drivers/nvidia-drivers", - "x11-drivers/ati-drivers"] + "x11-drivers/ati-drivers"] func_rc = 0 pkg_deps_map = dict( @@ -172,6 +172,57 @@ def warn_perl5_bump(): return 0 +def warn_portage_bump(): + """ + Wheneger Portage is bumped, its packages.db.critical entry in build.git + must be raised. + """ + pkg_key = "%s/%s" % (os.getenv("PKG_CATEGORY", ""), + os.getenv("PKG_NAME", "")) + + if pkg_key == "sys-apps/portage": + write_warning_msg( + "So you bumped Portage they told me...\n" + "Have you raised the portage version in packages.db.critical?\n" + "It is inside build.git.") + return 1 + + return 0 + +def warn_sip_bump(): + """ + Wheneger Sip is bumped, we need to manually bump the reverse dependencies. + """ + pkg_key = "%s/%s" % (os.getenv("PKG_CATEGORY", ""), + os.getenv("PKG_NAME", "")) + + if pkg_key == "dev-python/sip": + write_warning_msg( + "So you bumped Sip they told me...\n" + "Have you rebuilt its reverse dependencies?\n" + "# qfile -e /usr/lib/python2.7/site-packages/PyQt4") + return 1 + + return 0 + +def warn_binutils_bump(): + """ + Whenever binutils is bumped, we should rebuild packages + linking explicitly to libbfd-.so :( sigh. + """ + pkg_key = "%s/%s" % (os.getenv("PKG_CATEGORY", ""), + os.getenv("PKG_NAME", "")) + + if pkg_key == "sys-devel/binutils": + write_warning_msg( + "So you bumped binutils they told me...\n" + "Please, no wait... FUCKING CHECK that packages linking to\n" + "libbfd-.so have been rebuilt. You can use:\n" + " # eit query required libbfd-*.so\n") + return 1 + + return 0 + def warn_haskell_bump(): """ Warn in case of bumping dev-lang/ghc. Developer should not @@ -196,6 +247,10 @@ if __name__ == "__main__": if rc != 0: exit_st = rc + rc = warn_portage_bump() + if rc != 0 and rc > exit_st: + exit_st = rc + rc = warn_perl5_bump() if rc != 0 and rc > exit_st: exit_st = rc @@ -204,6 +259,14 @@ if __name__ == "__main__": if rc != 0 and rc > exit_st: exit_st = rc + rc = warn_binutils_bump() + if rc != 0 and rc > exit_st: + exit_st = rc + + rc = warn_sip_bump() + if rc != 0 and rc > exit_st: + exit_st = rc + # more tests here raise SystemExit(exit_st) diff --git a/git-hooks/post-merge b/git-hooks/post-merge index 5a86eaf..6f47f56 100755 --- a/git-hooks/post-merge +++ b/git-hooks/post-merge @@ -13,20 +13,9 @@ case $arch in x86_64) src_make_conf="./conf/intel/portage/make.conf.amd64" ;; - arm*) - if [ -e "/usr/lib/gcc/armv7a-hardfloat-linux-gnueabi" ]; then - src_make_conf="./conf/armv7l/portage/make.conf.hardfp" - elif [ -e "/usr/lib/gcc/armv7a-unknown-linux-gnueabi" ]; then - src_make_conf="./conf/armv7l/portage/make.conf.softfp" - else - echo "UNSUPPORTED ARM ABI, CANNOT COPY make.conf !!!" - fi - ;; esac -if [ -z "$src_make_conf" ]; then - echo "Can't execute post-merge hook. Unknown arch \"$arch\"." >&2 -else +if [ -n "$src_make_conf" ]; then echo "post-merge hook: copying make.conf (from $src_make_conf):" cp --no-target-directory -v "$src_make_conf" /etc/make.conf fi diff --git a/tinderbox/antimatter-scheduler b/tinderbox/antimatter-scheduler new file mode 100755 index 0000000..e362ad5 --- /dev/null +++ b/tinderbox/antimatter-scheduler @@ -0,0 +1,23 @@ +#!/bin/bash + +unset PORTAGE +unset PORTAGE_TMPDIR + +set -e + +if [ "${#}" != "3" ]; then + echo "Invalid arguments." >&2 + exit 1 +fi + +CHROOT_PATH="${1}" +ARCH_NAME="${2}" +CHROOT_PREFIX="${3}" + +( + ${CHROOT_PREFIX} chroot "${CHROOT_PATH}" \ + /sabayon/bin/antimatter-digest +) | mail -a "MIME-Version: 1.0" \ + -a "Content-Type: text/html" \ + -s "AntiMatter tracker of $(date +%Y-%m-%d) for ${ARCH_NAME}" \ + entropy-team@lists.sabayon.org diff --git a/tinderbox/glsa-scheduler b/tinderbox/glsa-scheduler new file mode 100755 index 0000000..9cbb00b --- /dev/null +++ b/tinderbox/glsa-scheduler @@ -0,0 +1,21 @@ +#!/bin/bash + +unset PORTAGE +unset PORTAGE_TMPDIR + +set -e + +if [ "${#}" != "3" ]; then + echo "Invalid arguments." >&2 + exit 1 +fi + +CHROOT_PATH="${1}" +ARCH_NAME="${2}" +CHROOT_PREFIX="${3}" + +( + ${CHROOT_PREFIX} chroot "${CHROOT_PATH}" \ + /sabayon/bin/glsa-digest 2>&1 +) | mail -s "GLSA tracker of $(date +%Y-%m-%d) for ${ARCH_NAME}" \ + entropy-team@lists.sabayon.org diff --git a/tinderbox/matter-build.sh b/tinderbox/matter-build.sh new file mode 100755 index 0000000..9af12da --- /dev/null +++ b/tinderbox/matter-build.sh @@ -0,0 +1,94 @@ +#!/bin/bash + +show_help() { + echo "${0} " +} + +ARGS="${@}" +schedule="${1}" +if [ "${schedule}" != "weekly" ] && [ "${schedule}" != "monthly" ] && [ "${schedule}" != "daily" ]; then + echo "schedule is invalid, must be either weekly, monthly, daily" + show_help + exit 1 +fi +PRE_CHROOT="${2}" +if [ "${PRE_CHROOT}" != "linux32" ] && [ "${PRE_CHROOT}" != "linux64" ]; then + echo "pre-chroot is invalid, must be either linux32, linux64" + show_help + exit 1 +fi +CHROOT_DIR="${3}" +if [ -z "${CHROOT_DIR}" ] || [ ! -d "${CHROOT_DIR}" ]; then + echo "chroot dir is invalid" + show_help + exit 1 +fi +CHROOT_NAME="${4:-unknown}" +shift 4 + +LOCK_FILE="${CHROOT_DIR}/.matter-build.lock" +LVM_LOCK_FILE="/entropy_LOCKS/vg_chroots-lv_chroots-snapshot.lock" +LOG_FILE=/var/log/particles/$(basename "${CHROOT_DIR}")-${schedule}-$(date +%Y%m%d).log + +# Make sure th have these directories in place +mkdir -p /var/log/particles /entropy_LOCKS || exit 1 + +# Drop these settings from the environment as they could interfere +# with interactive processing +unset PORTDIR PORTAGE_TMPDIR + +echo "CHROOT_DIR: ${CHROOT_DIR}" +echo "PRE_CHROOT: ${PRE_CHROOT}" +echo "LOG_FILE: ${LOG_FILE}.bz2" + +echo "Acquiring locks at ${LOCK_FILE} and ${LVM_LOCK_FILE} in blocking mode, waiting until we're ready" +( + flock -s --timeout=$((3600 * 12)) 10 + if [ "${?}" != "0" ]; then + echo "Tried to acquire the LVM lock in shared mode." >&2 + echo "After 12 hours, I give up. This is really wrong," >&2 + echo "since the backup script should not hold the lock for" >&2 + echo "this long." >&2 + exit 1 + fi + + flock -x --timeout=36000 9 + rc="${?}" + if [ "${rc}" != "0" ]; then + echo "CANNOT ACQUIRE LOCK, QUITTING" >&2 + else + echo "Lock acquired, let's go" + echo "Starting matter-scheduler at $(date)..." + export ETP_NO_COLOR="1" + + pre_post="--pre /particles/hooks/pre.sh --post /particles/hooks/post.sh" + # Place standard outout and standard error together to make + # tee happy. Filter out stdout because it gets to mail + PARTICLES_DIR="/particles/${schedule}" \ + MATTER_ARGS="--commit --blocking --gentle --disable-preserved-libs ${pre_post} ${@}" "${PRE_CHROOT}" \ + /build/tinderbox/matter-scheduler "${CHROOT_DIR}" 2>&1 3>&1 | tee "${LOG_FILE}" > /dev/null + rc=${?} + echo "Completed matter-scheduler at $(date) with exit status: ${rc}" + fi + + bzip2 -f -k "${LOG_FILE}" + # send mail + echo "Hello boys and girls, +this is andromeda.sabayon.org informing you that a new matter run has been +eventually executed. + +Call : ${ARGS} +Exit : ${rc} +Log : ${LOG_FILE}.bz2 + +Do not forget to check logs before touching repositories. +Thanks for reading." | mutt -s "${schedule} matter run, $(basename ${LOG_FILE})" -a "${LOG_FILE}.bz2" -- entropy-team@lists.sabayon.org + + # spawn GLSA and ignore any failures + /build/tinderbox/glsa-scheduler "${CHROOT_DIR}" "${CHROOT_NAME}" "${PRE_CHROOT}" > /dev/null + # spawn AntiMatter and ignore any failures + /build/tinderbox/antimatter-scheduler "${CHROOT_DIR}" "${CHROOT_NAME}" "${PRE_CHROOT}" > /dev/null + + exit ${rc} + +) 9> "${LOCK_FILE}" 10> "${LVM_LOCK_FILE}" diff --git a/tinderbox/matter-scheduler b/tinderbox/matter-scheduler new file mode 100755 index 0000000..ef4c06c --- /dev/null +++ b/tinderbox/matter-scheduler @@ -0,0 +1,64 @@ +#!/usr/bin/python + +import os +import sys +import argparse +import subprocess + +if __name__ == "__main__": + + DEFAULT_PARTICLES_DIR = "/particles" + PARTICLES_DIR = os.getenv("PARTICLES_DIR", DEFAULT_PARTICLES_DIR) + DEFAULT_BUILD_DIR = "/sabayon" + BUILD_DIR = os.getenv("BUILD_GIT_DIR", DEFAULT_BUILD_DIR) + DEFAULT_MATTER_ARGS = "--commit --gentle --push --sync --sync-best-effort" + MATTER_ARGS = os.getenv("MATTER_ARGS", DEFAULT_MATTER_ARGS) + + CHROOT_SCRIPT = "/sabayon/bin/matter-scheduler-chroot" # this is in build.git + ENV_VARS_HELP = """\ +Environment variables: +%s = path inside chroot containing Matter spec files (also called particles) + default: %s +%s = path inside chroot containing the build.git repository checkout + default: %s +%s = custom "matter" arguments + default: %s +""" % ( + "PARTICLES_DIR", + DEFAULT_PARTICLES_DIR, + "BUILD_GIT_DIR", + DEFAULT_BUILD_DIR, + "MATTER_ARGS", + DEFAULT_MATTER_ARGS,) + + parser = argparse.ArgumentParser( + description='Entropy Matter, execution scheduler', + epilog=ENV_VARS_HELP, + formatter_class=argparse.RawDescriptionHelpFormatter) + + parser.add_argument("chroot", metavar="", + help="path to chroot") + + nsargs = parser.parse_args(sys.argv[1:]) + + chroot_dir = nsargs.chroot + if not os.path.isdir(chroot_dir): + sys.stderr.write("chroot directory is not available\n") + raise SystemExit(1) + + if os.getuid() != 0: + sys.stderr.write("root access required\n") + raise SystemExit(1) + + os.environ["PARTICLES_DIR"] = PARTICLES_DIR + os.environ["BUILD_GIT_DIR"] = BUILD_DIR + os.environ["MATTER_ARGS"] = MATTER_ARGS + os.chroot(chroot_dir) + os.chdir("/") + try: + rc = subprocess.call(CHROOT_SCRIPT) + except Exception as err: + sys.stderr.write(repr(err) + "\n") + rc = 1 + + raise SystemExit(rc)