Permalink
Browse files

Merge branch 'master' of git.funtoo.org:funtoo-overlay

  • Loading branch information...
2 parents 5debce1 + ae05d6e commit 8e0d6ffaea90f65009674ec5516a974f5395334d @psychopatch psychopatch committed Dec 9, 2012
Showing with 1,083 additions and 21 deletions.
  1. +1 −1 funtoo/scripts/merge.py
  2. +21 −0 metadata/news/2012-12-01-funtoo-stable-toolchain/2012-12-01-funtoo-stable-toolchain.en.txt
  3. +0 −3 profiles/default/linux/package.use/funtoo-use
  4. +1 −1 profiles/eapi
  5. +1 −1 profiles/funtoo/1.0/linux-gnu/build/stable/package.mask/funtoo
  6. +4 −0 profiles/package.mask/funtoo-staging
  7. +0 −1 profiles/package.unmask/funtoo-perl
  8. +0 −1 profiles/package.unmask/funtoo-toolchain
  9. +3 −0 profiles/package.use.force/funtoo
  10. +5 −0 profiles/package.use/funtoo-use
  11. +2 −0 sys-apps/coreutils/Manifest
  12. +177 −0 sys-apps/coreutils/coreutils-8.20.ebuild
  13. +6 −0 sys-apps/net-tools/Manifest
  14. +8 −0 sys-apps/net-tools/metadata.xml
  15. +87 −0 sys-apps/net-tools/net-tools-1.60_p20110409135728.ebuild
  16. +101 −0 sys-apps/net-tools/net-tools-1.60_p20111120203157.ebuild
  17. +98 −0 sys-apps/net-tools/net-tools-1.60_p20120127084908-r1.ebuild
  18. +98 −0 sys-apps/net-tools/net-tools-1.60_p20120127084908.ebuild
  19. +97 −0 sys-apps/net-tools/net-tools-9999.ebuild
  20. +2 −2 sys-apps/portage/Manifest
  21. +355 −0 sys-apps/portage/portage-2.3.5-r4.ebuild
  22. +1 −1 sys-devel/binutils/binutils-2.22-r1.ebuild
  23. +1 −1 sys-devel/gcc/gcc-4.6.3.ebuild
  24. +3 −2 sys-kernel/debian-sources/debian-sources-3.2.23.ebuild
  25. +3 −2 sys-kernel/debian-sources/debian-sources-3.2.29.ebuild
  26. +6 −3 sys-kernel/debian-sources/files/config-extract
  27. +1 −1 sys-kernel/linux-headers/linux-headers-3.4-r2.ebuild
  28. +1 −1 sys-libs/glibc/glibc-2.15-r3.ebuild
View
@@ -33,7 +33,7 @@
"profiles/default/linux/package.use.mask":"profiles/funtoo/1.0/linux-gnu/package.use.mask/01-gentoo"
}),
InsertEbuilds(funtoo_overlay, select="all", skip=None, replace=True),
- InsertEbuilds(foo_overlay, select="all", skip=["sys-fs/mdev-bb"], replace=["app-shells/rssh","net-misc/unison"]),
+ InsertEbuilds(foo_overlay, select="all", skip=["sys-fs/mdev-bb", "media-video/handbrake"], replace=["app-shells/rssh","net-misc/unison"]),
InsertEbuilds(bar_overlay, select="all", skip=["app-emulation/qemu"], replace=True),
InsertEbuilds(flora_overlay, select="all", skip=None, replace=False),
InsertEbuilds(mythtv_overlay, select='all', skip=["media-tv/miro", "media-tv/mythtv-bindings"], replace=True, merge=["dev-libs/libcec", "media-tv/mythtv", "www-apps/mythweb"], ebuildloc="Gentoo"),
@@ -0,0 +1,21 @@
+Title: Funtoo stable branch toolchain update
+Author: Oleg Vinichenko <oleg@funtoo.org>
+Content-Type: text/plain
+Posted: 2012-12-01
+Revision: 1
+News-Item-Format: 1.0
+Display-If-Installed: >=sys-apps/portage-2.3.4-r8
+
+Starting from December 4, 2012, following toolchain packages to be
+stabilized:
+
+=sys-devel/binutils-2.22-r1
+=sys-kernel/linux-headers-3.4-r2
+=sys-libs/glibc-2.15-r3
+=sys-devel/gcc-4.6.3
+
+bug reports:
+
+http://bugs.funtoo.org/browse/FL-253
+http://bugs.funtoo.org/browse/FL-250
+
@@ -1,3 +0,0 @@
-dev-lang/php gd
-dev-lang/python sqlite
-virtual/python-sqlite external
View
@@ -1 +1 @@
-5-progress
+4-python
@@ -1,4 +1,4 @@
# Ryan Harris <rh1@funtoo.org> (3 Jun 2012)
# >=libreoffice-3.5.4.2 needs >=gcc-4.5
->=app-office/libreoffice-3.5.4.2
+>=app-office/libreoffice-3.6.4
@@ -1,6 +1,10 @@
# Keep the most recent masks in a reverse chrono order
# newest on top
+# Alexander 'shiin' Reitzel (3 Dec 2012)
+# FL-256, masked for testing
+=sys-apps/net-tools-1.60_p20120127084908-r1
+
# Patrick Creech (27 Nov 2012)
# FL-182, FL-183 eselect fix, masked for testing
=app-admin/eselect-1.3.1.1_rc3
@@ -1 +0,0 @@
-#=dev-lang/perl-5.14.2*
@@ -1 +0,0 @@
-=sys-devel/gcc-4.6.2*
@@ -0,0 +1,3 @@
+# Move from unused default/linux profile
+# to fix issue with stage1 builds. We need threads.
+dev-lang/python threads
@@ -4,3 +4,8 @@ dev-lang/php gd intl
# New version of net-tools (still 1.60) have new syntax which may break scripts and more.
# Current wicd (net-misc/wicd-1.7.1_beta2-r7) is also affected.
sys-apps/net-tools old-output
+
+# FL-261. sqlalchemy need virtual/python-sqlite external. Move package.use from unused default/linux/ profile.
+dev-lang/php gd
+dev-lang/python sqlite
+virtual/python-sqlite external
@@ -0,0 +1,2 @@
+DIST coreutils-8.20-patches-1.1.tar.xz 19504 SHA256 0a1a3cc578e8872ebc93113edd76d1f1d88fb4d6596a047cfbb6c5fd4e82c22d SHA512 258116ff52d1d28acbedd2383c8d0f488c272b297c4f146231ea45fb76902bb56c9fad2d74d50c22371e67a4178dcff7b65950fcc034f56fc02c3c2ff290224f WHIRLPOOL ae4436a6ae655affbc02ee2d3d6a87345dc7b63b67aaecf01e034d2e40237c6e76b00a909d852f6ea96e348ef43e8e3f6f4c5bdb01aaf6d30a1b51036cbfe31b
+DIST coreutils-8.20.tar.xz 5273788 SHA256 dbcb798764827a0f74be738662ecb516705cf520330cd3d7b2640fdffa499eb2 SHA512 adbeab5af780ae70d2a98a81e96ad2cdfbcbc20153372b0085f6ac75ae9fadff82bd09b460400820057692b4145d7f2d276630b76b0ed509303587972ed175cd WHIRLPOOL 3cf911cf785c6e6acab4f37bc75805687f91fe74d5727782903d242669ee6b7ad444b18395d6808b1f2569703cca1992983d3bfef41f65ea461f6d0aa25908e2
@@ -0,0 +1,177 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-8.20.ebuild,v 1.8 2012/12/08 19:40:53 vapier Exp $
+
+EAPI="3"
+
+inherit eutils flag-o-matic toolchain-funcs
+
+PATCH_VER="1.1"
+DESCRIPTION="Standard GNU file utilities (chmod, cp, dd, dir, ls...), text utilities (sort, tr, head, wc..), and shell utilities (whoami, who,...)"
+HOMEPAGE="http://www.gnu.org/software/coreutils/"
+SRC_URI="mirror://gnu-alpha/coreutils/${P}.tar.xz
+ mirror://gnu/${PN}/${P}.tar.xz
+ mirror://gentoo/${P}.tar.xz
+ mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz
+ http://dev.gentoo.org/~ryao/dist/${P}-patches-${PATCH_VER}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="*"
+IUSE="acl caps gmp nls selinux static userland_BSD vanilla xattr"
+
+LIB_DEPEND="acl? ( sys-apps/acl[static-libs] )
+ caps? ( sys-libs/libcap )
+ gmp? ( dev-libs/gmp[static-libs] )
+ xattr? ( !userland_BSD? ( sys-apps/attr[static-libs] ) )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs]} )
+ selinux? ( sys-libs/libselinux )
+ nls? ( >=sys-devel/gettext-0.15 )
+ !app-misc/realpath
+ !<sys-apps/util-linux-2.13
+ !sys-apps/stat
+ !net-mail/base64
+ !sys-apps/mktemp
+ !<app-forensics/tct-1.18-r1
+ !<net-fs/netatalk-2.0.3-r4
+ !<sci-chemistry/ccp4-6.1.1"
+DEPEND="${RDEPEND}
+ static? ( ${LIB_DEPEND} )
+ app-arch/xz-utils"
+
+src_prepare() {
+ if ! use vanilla ; then
+ use_if_iuse unicode || rm -f "${WORKDIR}"/patch/000_all_coreutils-i18n.patch
+ EPATCH_SUFFIX="patch" \
+ PATCHDIR="${WORKDIR}/patch" \
+ EPATCH_EXCLUDE="001_all_coreutils-gen-progress-bar.patch" \
+ epatch
+ fi
+
+ # Since we've patched many .c files, the make process will try to
+ # re-build the manpages by running `./bin --help`. When doing a
+ # cross-compile, we can't do that since 'bin' isn't a native bin.
+ # Also, it's not like we changed the usage on any of these things,
+ # so let's just update the timestamps and skip the help2man step.
+ set -- man/*.x
+ touch ${@/%x/1}
+
+ # Avoid perl dep for compiled in dircolors default #348642
+ if ! has_version dev-lang/perl ; then
+ touch src/dircolors.h
+ touch ${@/%x/1}
+ fi
+}
+
+src_configure() {
+ local myconf=''
+ if tc-is-cross-compiler && [[ ${CHOST} == *linux* ]] ; then
+ export fu_cv_sys_stat_statfs2_bsize=yes #311569
+ export gl_cv_func_realpath_works=yes #416629
+ fi
+
+ export gl_cv_func_mknod_works=yes #409919
+ use static && append-ldflags -static && sed -i '/elf_sys=yes/s:yes:no:' configure #321821
+ use selinux || export ac_cv_{header_selinux_{context,flash,selinux}_h,search_setfilecon}=no #301782
+ use userland_BSD && myconf="${myconf} -program-prefix=g --program-transform-name=s/stat/nustat/"
+ # kill/uptime - procps
+ # groups/su - shadow
+ # hostname - net-tools
+ econf \
+ --with-packager="Gentoo" \
+ --with-packager-version="${PVR} (p${PATCH_VER:-0})" \
+ --with-packager-bug-reports="http://bugs.gentoo.org/" \
+ --enable-install-program="arch" \
+ --enable-no-install-program="groups,hostname,kill,su,uptime" \
+ --enable-largefile \
+ $(use caps || echo --disable-libcap) \
+ $(use_enable nls) \
+ $(use_enable acl) \
+ $(use_enable xattr) \
+ $(use_with gmp) \
+ ${myconf}
+}
+
+src_test() {
+ # Non-root tests will fail if the full path isnt
+ # accessible to non-root users
+ chmod -R go-w "${WORKDIR}"
+ chmod a+rx "${WORKDIR}"
+
+ # coreutils tests like to do `mount` and such with temp dirs
+ # so make sure /etc/mtab is writable #265725
+ # make sure /dev/loop* can be mounted #269758
+ mkdir -p "${T}"/mount-wrappers
+ mkwrap() {
+ local w ww
+ for w in "$@" ; do
+ ww="${T}/mount-wrappers/${w}"
+ cat <<-EOF > "${ww}"
+ #!/bin/sh
+ exec env SANDBOX_WRITE="\${SANDBOX_WRITE}:/etc/mtab:/dev/loop" $(type -P $w) "\$@"
+ EOF
+ chmod a+rx "${ww}"
+ done
+ }
+ mkwrap mount umount
+
+ addwrite /dev/full
+ #export RUN_EXPENSIVE_TESTS="yes"
+ #export FETISH_GROUPS="portage wheel"
+ env PATH="${T}/mount-wrappers:${PATH}" \
+ emake -j1 -k check || die "make check failed"
+}
+
+src_install() {
+ emake install DESTDIR="${D}" || die
+ dodoc AUTHORS ChangeLog* NEWS README* THANKS TODO
+
+ insinto /etc
+ newins src/dircolors.hin DIR_COLORS || die
+
+ if [[ ${USERLAND} == "GNU" ]] ; then
+ cd "${D}"/usr/bin
+ dodir /bin
+ # move critical binaries into /bin (required by FHS)
+ local fhs="cat chgrp chmod chown cp date dd df echo false ln ls
+ mkdir mknod mv pwd rm rmdir stty sync true uname"
+ mv ${fhs} ../../bin/ || die "could not move fhs bins"
+ # move critical binaries into /bin (common scripts)
+ local com="basename chroot cut dir dirname du env expr head mkfifo
+ mktemp readlink seq sleep sort tail touch tr tty vdir wc yes"
+ mv ${com} ../../bin/ || die "could not move common bins"
+ # create a symlink for uname in /usr/bin/ since autotools require it
+ local x
+ for x in ${com} uname ; do
+ dosym /bin/${x} /usr/bin/${x} || die
+ done
+ else
+ # For now, drop the man pages, collides with the ones of the system.
+ rm -rf "${D}"/usr/share/man
+ fi
+}
+
+pkg_postinst() {
+ ewarn "Make sure you run 'hash -r' in your active shells."
+ ewarn "You should also re-source your shell settings for LS_COLORS"
+ ewarn " changes, such as: source /etc/profile"
+
+ # /bin/dircolors sometimes sticks around #224823
+ if [ -e "${ROOT}/usr/bin/dircolors" ] && [ -e "${ROOT}/bin/dircolors" ] ; then
+ if strings "${ROOT}/bin/dircolors" | grep -qs "GNU coreutils" ; then
+ einfo "Deleting orphaned GNU /bin/dircolors for you"
+ rm -f "${ROOT}/bin/dircolors"
+ fi
+ fi
+
+ # Help out users using experimental filesystems
+ if grep -qs btrfs "${ROOT}"/etc/fstab /proc/mounts ; then
+ case $(uname -r) in
+ 2.6.[12][0-9]|2.6.3[0-7]*)
+ ewarn "You are running a system with a buggy btrfs driver."
+ ewarn "Please upgrade your kernel to avoid silent corruption."
+ ewarn "See: https://bugs.gentoo.org/353907"
+ ;;
+ esac
+ fi
+}
@@ -0,0 +1,6 @@
+DIST net-tools-1.60_p20110409135728-patches-1.tar.xz 3976 SHA256 6ec48e4e97f64734747c5a1639203179ab12a83faceaada739fa576e0a01df73 SHA512 22261c33860f3becc776e8f8da106052520096f482f7845ce687c5f8cbfd2ff467723ce83a0c0a95a0b8adb9dc9c27ebd97d75646f9728ab179e20a02d8817b7 WHIRLPOOL 29a9172791a4e52bd6b81e2ad1c9b0c34b69636a99fbcd019465cab6bc9b5058ef72a92fd541e8b1b71881d7800d37de111f3ce0c60d78698056b4c023024e2b
+DIST net-tools-1.60_p20110409135728.tar.xz 223168 SHA256 2379dab69c68c0b6755cd063c9cb170d4b3862be9f0154cf4c28d749d232b98f SHA512 17658210e27cf966b71dc89b7ec1b881490612b6919cba2c232edf04cffeef54b13a7dab5825466b46b366d079f72c43746c8df69c1250c9f3cecfa3ae02874c WHIRLPOOL 4d4bbbc2a9df8bc7fe5b47569738b6855de234c9f63799648261b2315128a158013577ad75c0940d48dfbaaab2e0b2752230cb79f5f9ba66b44d29886c7ca3ee
+DIST net-tools-1.60_p201111202031570500-patches-1.tar.xz 3348 SHA256 98a5e20f4cc6aca911e3b24cc04a071bff0f694023013755dc195da26089f837 SHA512 9ec31a8df3a812bac3ef505a0bc3d092d1b8e6fb7665f23f9eacb2d14e30044db4cf46c1bc8362ff3a6aa39fe89b7a860781a6449441176495057410c15dac08 WHIRLPOOL 28ec1f2980d627f05e778fc53b05436c83c0a655d86797bf1e7e10d84c9e843f58bab9ae4bd2bd5fefc7bcf1c863a63c294692a245840d516f9871b14fc89f88
+DIST net-tools-1.60_p201111202031570500.tar.xz 223532 SHA256 58bd85bd7d4776635754dc4ca2b2b164346967bad67cf661d4c9933e7d6b5474 SHA512 f894f59d4fce76cab97496df6d3dcc5cbca7b4146fd7e5daea95cb447e3460e448ad20398eb5a6b805b80f6050f30aa47e133c166b63f7a4cdfe9256383322d4 WHIRLPOOL d651b6f455faa5ffeb103aab08f0b28a95ff42fb8b77a73a1f8b1f9f0a9c3f39b5405c339696558a341c888e19c7486a807f83287cc6b4333dc72ed0480cee8a
+DIST net-tools-1.60_p20120127084908-patches-1.tar.xz 3332 SHA256 1240a3c139b684da195f665447a80e1d05f0d6f3c2319dbf340dfcbb78b01501 SHA512 97602993e273d2fadac2bf3df892e09ba7c7cda44a7825209a644ada4d203e0c3d2248cbf976545afb07113976694fb581511641725ce1b95b00688d357d0a02 WHIRLPOOL 4fd537e042ab368795ff0db55717c424ef3bd7bc37302c5fa64936c4ffe4772557c25c83224f9ee0017f812817143b7168e70b2fdcf146abab06d18cafe3448d
+DIST net-tools-1.60_p20120127084908.tar.xz 224992 SHA256 408a51964aa142a4f45c4cffede2478abbd5630a7c7346ba0d3611059a2a3c94 SHA512 1237a4bb0bba5273a25d707493d5bdb16f267bfa6731c526329cff459e06923e0d54aef6eded458d3cb72994bf4382f216212c34ad9329f5f1573a4228445996 WHIRLPOOL b14f24c13f2950fd92eb6b897cd14c5aa4d52e40062943fcb84de7e13555f98008db1aa6ec6fb6ca8f899a5bfdfc685f8822da2f3c0e5e002b9d20aec4d8b73c
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>base-system</herd>
+<use>
+ <flag name='old-output'>use old ifconfig output style (useful for when new output breaks scripts)</flag>
+</use>
+</pkgmetadata>
@@ -0,0 +1,87 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/net-tools-1.60_p20110409135728.ebuild,v 1.10 2012/07/23 01:12:43 vapier Exp $
+
+EAPI="3"
+
+inherit flag-o-matic toolchain-funcs eutils
+
+PATCH_VER="1"
+DESCRIPTION="Standard Linux networking tools"
+HOMEPAGE="http://net-tools.berlios.de/"
+SRC_URI="mirror://gentoo/${P}.tar.xz
+ mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-linux"
+IUSE="nls static"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ app-arch/xz-utils"
+
+maint_pkg_create() {
+ cd /usr/local/src/net-tools/git
+ #git-update
+ local stamp=$(git log -n1 --pretty=format:%ai master | sed -e 's:[- :]::g' -e 's:+.*::')
+ local pv="${PV/_p*}_p${stamp}"
+ local p="${PN}-${pv}"
+ git archive --prefix="nt/" master | tar xf - -C "${T}"
+ pushd "${T}" >/dev/null
+ pushd nt >/dev/null
+ sed -i "/^RELEASE/s:=.*:=${pv}:" Makefile || die
+ emake dist >/dev/null
+ popd >/dev/null
+ zcat ${p}.tar.gz | xz > ${p}.tar.xz
+ rm -f ${p}.tar.gz
+ popd >/dev/null
+
+ local patches="${p}-patches-${PATCH_VER}"
+ local d="${T}/${patches}"
+ mkdir "${d}"
+ git format-patch -o "${d}" master..gentoo > /dev/null
+ echo "From http://git.overlays.gentoo.org/gitweb/?p=proj/net-tools.git" > "${d}"/README
+ tar cf - -C "${T}" ${d##*/} | xz > "${T}"/${patches}.tar.xz
+ rm -rf "${d}"
+
+ du -b "${T}"/*.tar.xz
+}
+
+pkg_setup() { [[ -n ${VAPIER_LOVES_YOU} ]] && maint_pkg_create ; }
+
+set_opt() {
+ local opt=$1 ans
+ shift
+ ans=$("$@" && echo y || echo n)
+ einfo "Setting option ${opt} to ${ans}"
+ sed -i \
+ -e "/^bool.* ${opt} /s:[yn]$:${ans}:" \
+ config.in || die
+}
+
+src_prepare() {
+ EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch "${WORKDIR}"/${P}-patches-${PATCH_VER}
+}
+
+src_configure() {
+ set_opt I18N use nls
+ set_opt HAVE_HWIB has_version '>=sys-kernel/linux-headers-2.6'
+ set_opt HAVE_HWTR has_version '<sys-kernel/linux-headers-3.5'
+ if use static ; then
+ append-flags -static
+ append-ldflags -static
+ fi
+ tc-export AR CC
+ yes "" | ./configure.sh config.in || die
+}
+
+src_install() {
+ emake DESTDIR="${ED}" install || die
+ dodoc README README.ipv6 TODO
+}
+
+pkg_postinst() {
+ ln -s /bin/ifconfig /sbin/ifconfig
+ einfo "etherwake and such have been split into net-misc/ethercard-diag"
+}
Oops, something went wrong.

0 comments on commit 8e0d6ff

Please sign in to comment.