commit:     617da85f3e3a3c6e3c36d2ec774246dec7a2286d
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo 
<DOT> org>
AuthorDate: Sun Jun 15 05:42:31 2014 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sun Jun 15 05:42:31 2014 +0000
URL:        
http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=617da85f

Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/releng


 releases/2008.0/scripts/livecd.sh                  |    1 -
 releases/weekly/scripts/livecd.sh                  |    1 -
 .../specs/amd64/hardened/admincd-stage1.spec       |    1 +
 .../weekly/specs/x86/hardened/admincd-stage1.spec  |    1 +
 tools-musl/.gitignore                              |    4 +-
 {tools-hardened => tools-musl}/clean.sh            |    0
 tools-musl/portage.amd64.hardened/bashrc           |   15 +
 tools-musl/portage.amd64.hardened/env/libintl.conf |    2 +
 .../env/parallel.conf                              |    0
 .../package.env                                    |    4 +-
 tools-musl/portage.amd64.hardened/package.keywords |    2 +
 .../package.mask                                   |    0
 tools-musl/portage.amd64.hardened/package.unmask   |    1 +
 tools-musl/portage.amd64.hardened/package.use      |    1 +
 tools-musl/portage.amd64.vanilla/bashrc            |   15 +
 tools-musl/portage.amd64.vanilla/env/libintl.conf  |    2 +
 .../env/parallel.conf                              |    0
 .../package.env                                    |    4 +-
 tools-musl/portage.amd64.vanilla/package.keywords  |    2 +
 .../package.mask                                   |    0
 tools-musl/portage.amd64.vanilla/package.unmask    |    1 +
 tools-musl/portage.amd64.vanilla/package.use       |    1 +
 .../portage.amd64.vanilla/profile/use.mask         |    0
 tools-musl/portage.armv7a.hardened/bashrc          |   15 +
 .../portage.armv7a.hardened/env/libintl.conf       |    2 +
 .../env/parallel.conf                              |    0
 .../package.env                                    |    4 +-
 .../portage.armv7a.hardened/package.keywords       |    2 +
 .../package.mask                                   |    0
 tools-musl/portage.armv7a.hardened/package.unmask  |    1 +
 tools-musl/portage.armv7a.hardened/package.use     |    1 +
 tools-musl/portage.armv7a.vanilla/bashrc           |   15 +
 tools-musl/portage.armv7a.vanilla/env/libintl.conf |    2 +
 .../env/parallel.conf                              |    0
 .../package.env                                    |    4 +-
 tools-musl/portage.armv7a.vanilla/package.keywords |    2 +
 .../package.mask                                   |    0
 tools-musl/portage.armv7a.vanilla/package.unmask   |    1 +
 tools-musl/portage.armv7a.vanilla/package.use      |    1 +
 .../portage.armv7a.vanilla}/profile/use.mask       |    0
 tools-musl/portage.i686.hardened/bashrc            |   15 +
 tools-musl/portage.i686.hardened/env/libintl.conf  |    2 +
 .../env/parallel.conf                              |    0
 .../package.env                                    |    4 +-
 tools-musl/portage.i686.hardened/package.keywords  |    2 +
 .../package.mask                                   |    0
 tools-musl/portage.i686.hardened/package.unmask    |    1 +
 tools-musl/portage.i686.hardened/package.use       |    1 +
 tools-musl/portage.i686.vanilla/bashrc             |   15 +
 tools-musl/portage.i686.vanilla/env/libintl.conf   |    2 +
 .../env/parallel.conf                              |    0
 .../package.env                                    |    4 +-
 tools-musl/portage.i686.vanilla/package.keywords   |    2 +
 .../{portage => portage.i686.vanilla}/package.mask |    0
 tools-musl/portage.i686.vanilla/package.unmask     |    1 +
 tools-musl/portage.i686.vanilla/package.use        |    1 +
 .../portage.i686.vanilla}/profile/use.mask         |    0
 tools-musl/portage/env/libintl.conf                |    1 -
 tools-musl/portage/make.conf                       |   16 -
 tools-musl/portage/package.accept_keywords         |    4 -
 tools-musl/portage/package.use                     |    3 -
 tools-musl/portage/repos.conf/gentoo.conf          |    7 -
 .../portage/savedconfig/sys-apps/busybox-1.21.0    | 1031 ------
 {tools-uclibc => tools-musl}/run-armv7a.sh         |   32 +-
 tools-musl/run.sh                                  |  214 +-
 tools-musl/stage-all.conf.template                 |   12 +
 tools-musl/{ => stage4}/README                     |    0
 .../{ => stage4}/portage.mips/env/libintl.conf     |    0
 .../{ => stage4}/portage.mips/env/parallel.conf    |    0
 tools-musl/{ => stage4}/portage.mips/make.conf     |    0
 tools-musl/{ => stage4}/portage.mips/package.env   |    0
 tools-musl/{ => stage4}/portage.mips/package.mask  |    0
 tools-musl/{ => stage4}/portage.mips/package.use   |    0
 .../portage.mips/repos.conf/gentoo.conf            |    0
 .../savedconfig/sys-apps/busybox-1.22.1-r99        |    0
 tools-musl/{ => stage4}/run.sh                     |    0
 tools-uclibc/desktop/config                        |  351 +-
 .../{cups-filters.conf => gnome-doc-utils.conf}    |    0
 tools-uclibc/desktop/portage/make.conf.2           |    2 +-
 tools-uclibc/desktop/portage/make.conf.3           |    2 +-
 .../portage/package.accept_keywords/alsa-plugins   |    1 +
 .../desktop/portage/package.accept_keywords/boost  |    2 -
 .../desktop/portage/package.accept_keywords/elfix  |    2 -
 .../desktop/portage/package.accept_keywords/nettle |    1 -
 .../desktop/portage/package.accept_keywords/uclibc |    1 +
 .../portage/package.accept_keywords/xorg-cf-files  |    1 -
 tools-uclibc/desktop/portage/package.env           |    1 +
 .../desktop/portage/package.mask/webkit-gtk        |    1 -
 .../desktop/portage/package.unmask/alsa-plugins    |    1 +
 .../sys-libs/uclibc/99-libc-add-isfdtype.patch     |    0
 tools-uclibc/desktop/resolv.conf                   |    2 +-
 tools-uclibc/desktop/run.sh                        |    4 +-
 tools-uclibc/hardened-amd64.config                 | 3546 --------------------
 tools-uclibc/hardened-i686.config                  | 3526 -------------------
 ...vecd-stage1-amd64-uclibc-hardened.conf.template |   11 -
 ...ivecd-stage1-i686-uclibc-hardened.conf.template |   11 -
 tools-uclibc/livecd-stage1_template.spec           |   11 -
 ...vecd-stage2-amd64-uclibc-hardened.conf.template |   45 -
 ...ivecd-stage2-i686-uclibc-hardened.conf.template |   45 -
 tools-uclibc/livecd-stage2_template.spec           |   45 -
 .../portage.amd64.hardened/package.use/eudev       |    2 -
 .../portage.amd64.vanilla/package.use/eudev        |    2 -
 .../portage.i686.hardened/package.use/eudev        |    2 -
 .../portage.i686.vanilla/package.use/eudev         |    2 -
 .../portage.mips32r2.hardened/package.mask/udev    |    1 -
 .../package.mask/util-linux                        |    1 -
 .../portage.mips32r2.hardened/package.use/eudev    |    1 -
 .../portage.mips32r2.hardened/package.use/hwids    |    1 -
 .../sys-libs/uclibc/0001-mount.h-update.patch      |   91 -
 .../portage.mips32r2.vanilla/package.mask/udev     |    1 -
 .../package.mask/util-linux                        |    1 -
 .../portage.mips32r2.vanilla/package.use/eudev     |    1 -
 .../portage.mips32r2.vanilla/package.use/hwids     |    1 -
 .../sys-libs/uclibc/0001-mount.h-update.patch      |   91 -
 .../portage.mipsel3.hardened/package.mask/udev     |    1 -
 .../package.mask/util-linux                        |    1 -
 .../portage.mipsel3.hardened/package.use/eudev     |    1 -
 .../portage.mipsel3.hardened/package.use/hwids     |    1 -
 .../sys-libs/uclibc/0001-mount.h-update.patch      |   91 -
 .../portage.mipsel3.vanilla/package.mask/udev      |    1 -
 .../package.mask/util-linux                        |    1 -
 .../portage.mipsel3.vanilla/package.use/eudev      |    1 -
 .../portage.mipsel3.vanilla/package.use/hwids      |    1 -
 .../sys-libs/uclibc/0001-mount.h-update.patch      |   91 -
 124 files changed, 541 insertions(+), 8937 deletions(-)

Reply via email to