Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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

  • Loading branch information...
commit b07f6fdc7486995a84d0dfd12c34b956fa884900 2 parents ae16507 + efcc6e5
anak1n authored
View
2  funtoo/scripts/merge.py
@@ -35,7 +35,7 @@
InsertEbuilds(funtoo_overlay, select="all", skip=None, replace=True),
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(flora_overlay, select="all", skip=["sys-fs/spl", "sys-fs/zfs"], 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"),
SyncDir(mythtv_overlay.root, "eclass"),
SyncDir(progress_overlay.root, "eclass"),
View
4 profiles/package.mask/funtoo-staging
@@ -1,6 +1,10 @@
# Keep the most recent masks in a reverse chrono order
# newest on top
+# Scott/anak1n (29 Dec 2012)
+# FL-237, FL-233 test boot-update ebuild
+=sys-boot/boot-update-1.6.8
+
# Patrick Creech (20 Dec 2012)
# FL-279, eselect version bump upstream
# masked for testing
View
9 sys-apps/util-linux/Manifest
@@ -1,4 +1,5 @@
-DIST util-linux-2.20-20110905.diff.bz2 47914 RMD160 6ef3f3ae958d9e3856fae3fae8917f4b0a4d25ff SHA1 76ee9dd2411d1b3e4f7028790ec90fbcd7d1fda1 SHA256 7d8f78cda817c745f88fb951fa0e9ab852f215cdb931e97dedb87a623fc042b6
-DIST util-linux-2.20.1.tar.bz2 4614302 RMD160 4ab3435dbd8b83a0c353301b6e0f89a91aa3ca2c SHA1 b5a9468b933743d2f15d41062c19830a5f804f15 SHA256 d16ebcda3e64ab88ed363d9c1242cdb7ccfd5e1f56c83d0c3b0638c23793bbe0
-DIST util-linux-2.21-20120228.diff.bz2 43809 RMD160 dd2b5610ad01e6788de45c2532ca69eb41ec7ded SHA1 c716020ca8df7b8871a54abf7a4effa9437d83ea SHA256 fc28d4f0e2737b53a4db59072ab0fcf4180a8ece28c79219a21780124798572a
-DIST util-linux-2.21.tar.xz 2954504 RMD160 0e0a5b16ef13fb2e0f238e1332dc31e14e358ea6 SHA1 0ee465519bbe6aad3a22f83bf92221e85c4e2e51 SHA256 5192e8ba7dcf3cf0dc447f07b3d177f6cb3fb49dfae54ac45d6c8c7d86eeab0f
+DIST util-linux-2.20-20110905.diff.bz2 47914 SHA256 7d8f78cda817c745f88fb951fa0e9ab852f215cdb931e97dedb87a623fc042b6
+DIST util-linux-2.20.1.tar.bz2 4614302 SHA256 d16ebcda3e64ab88ed363d9c1242cdb7ccfd5e1f56c83d0c3b0638c23793bbe0
+DIST util-linux-2.21-20120228.diff.bz2 43809 SHA256 fc28d4f0e2737b53a4db59072ab0fcf4180a8ece28c79219a21780124798572a
+DIST util-linux-2.21.2.tar.xz 2985668 SHA256 39b25765a02385dc73580ab5edc3c5a2cecd03c92b42e41b03fd037b1c7cefe6 SHA512 f9632c1383eff9f875fa7e29063d2c053d0e3af1680644ce84afd72890a50b037a4a3ed80519d496248f7703ad920806b6420a340ff37747adeb233c675c0822 WHIRLPOOL 5477fd107c877c88fa2b07919b650a6f1a901479025d8da1be548cc771a73c2190a8b43e069486d4b7b3b4180c8f6bfa152d67626d1cb145155113c211efe0e3
+DIST util-linux-2.21.tar.xz 2954504 SHA256 5192e8ba7dcf3cf0dc447f07b3d177f6cb3fb49dfae54ac45d6c8c7d86eeab0f SHA512 aab384db2d1a3e08fd560a3e4d7ed7d6b2ceac61386db94eecae65bd540200a8549e141b99d8dad5c6f96587940b574d0544984acef6a35d1f24870e0072c552 WHIRLPOOL 1968ddd63fd21ef9542bb8afc77292ed2bad6f83e1cd67aa4159db8b320abd80ee0d20a062df35ae2ad91e0bc9068168b9f9e44aa39eaf4861d436dd855bea5d
View
28 sys-apps/util-linux/files/util-linux-2.21.1-cal-nl.patch
@@ -0,0 +1,28 @@
+From 69cabd7204e39c5e6055b6a53cf882b9f48f3c60 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@aura-online.co.uk>
+Date: Mon, 16 Apr 2012 11:05:27 +0100
+Subject: [PATCH] cal: Fix building under uClibc.
+
+Commit fbc333fec09394bf4e47707de08a65e8c0e9c288 broke building under uClibc because HAVE_DECL macros are set to 0, not undefined.
+
+Signed-off-by: James Le Cuirot <chewi@aura-online.co.uk>
+---
+ misc-utils/cal.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/misc-utils/cal.c b/misc-utils/cal.c
+index 918cbab..2de7164 100644
+--- a/misc-utils/cal.c
++++ b/misc-utils/cal.c
+@@ -299,7 +299,7 @@ main(int argc, char **argv) {
+ * the locale database, which can be overridden with the
+ * -s (Sunday) or -m (Monday) options.
+ */
+-#ifdef HAVE_DECL__NL_TIME_WEEK_1STDAY
++#if HAVE_DECL__NL_TIME_WEEK_1STDAY
+ /*
+ * You need to use 2 locale variables to get the first day of the week.
+ * This is needed to support first_weekday=2 and first_workday=1 for
+--
+1.7.8.5
+
View
108 sys-apps/util-linux/files/util-linux-2.21.1-no-printf-alloc.patch
@@ -0,0 +1,108 @@
+for systems that don't support latest POSIX standard: %as
+
+https://bugs.gentoo.org/406303
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -688,7 +688,6 @@ AC_ARG_ENABLE([libmount],
+ UL_BUILD_INIT([libmount])
+ UL_REQUIRES_LINUX([libmount])
+ UL_REQUIRES_BUILD([libmount], [libblkid])
+-UL_REQUIRES_HAVE([libmount], [scanf_alloc_modifier], [scanf string alloc modifier])
+ AM_CONDITIONAL(BUILD_LIBMOUNT, test "x$build_libmount" = xyes)
+
+ AC_SUBST([LIBMOUNT_VERSION])
+--- a/libmount/src/tab_parse.c
++++ b/libmount/src/tab_parse.c
+@@ -22,6 +22,10 @@
+ #include "pathnames.h"
+ #include "strutils.h"
+
++#ifndef HAVE_SCANF_MS_MODIFIER
++# define UL_SCNsA "%s"
++#endif
++
+ static inline char *skip_spaces(char *s)
+ {
+ assert(s);
+@@ -61,16 +65,31 @@ static int mnt_parse_table_line(struct libmnt_fs *fs, char *s)
+ int rc, n = 0, xrc;
+ char *src = NULL, *fstype = NULL, *optstr = NULL;
+
++#ifndef HAVE_SCANF_MS_MODIFIER
++ size_t len = strlen(s) + 1;
++ src = malloc(len);
++ fstype = malloc(len);
++ fs->target = malloc(len);
++ optstr = malloc(len);
++#endif
++
+ rc = sscanf(s, UL_SCNsA" " /* (1) source */
+ UL_SCNsA" " /* (2) target */
+ UL_SCNsA" " /* (3) FS type */
+ UL_SCNsA" " /* (4) options */
+ "%n", /* byte count */
+
++#ifdef HAVE_SCANF_MS_MODIFIER
+ &src,
+ &fs->target,
+ &fstype,
+ &optstr,
++#else
++ src,
++ fs->target,
++ fstype,
++ optstr,
++#endif
+ &n);
+ xrc = rc;
+
+@@ -136,6 +155,16 @@ static int mnt_parse_mountinfo_line(struct libmnt_fs *fs, char *s)
+ unsigned int maj, min;
+ char *fstype = NULL, *src = NULL, *p;
+
++#ifndef HAVE_SCANF_MS_MODIFIER
++ size_t len = strlen(s) + 1;
++ fs->root = malloc(len);
++ fs->target = malloc(len);
++ fs->vfs_optstr = malloc(len);
++ fs->fs_optstr = malloc(len);
++ fstype = malloc(len);
++ src = malloc(len);
++#endif
++
+ rc = sscanf(s, "%u " /* (1) id */
+ "%u " /* (2) parent */
+ "%u:%u " /* (3) maj:min */
+@@ -147,9 +175,15 @@ static int mnt_parse_mountinfo_line(struct libmnt_fs *fs, char *s)
+ &fs->id,
+ &fs->parent,
+ &maj, &min,
++#ifdef HAVE_SCANF_MS_MODIFIER
+ &fs->root,
+ &fs->target,
+ &fs->vfs_optstr,
++#else
++ fs->root,
++ fs->target,
++ fs->vfs_optstr,
++#endif
+ &end);
+
+ if (rc >= 7 && end > 0)
+@@ -167,9 +201,15 @@ static int mnt_parse_mountinfo_line(struct libmnt_fs *fs, char *s)
+ UL_SCNsA" " /* (9) source */
+ UL_SCNsA, /* (10) fs options (fs specific) */
+
++#ifdef HAVE_SCANF_MS_MODIFIER
+ &fstype,
+ &src,
+ &fs->fs_optstr);
++#else
++ fstype,
++ src,
++ fs->fs_optstr);
++#endif
+
+ if (rc >= 10) {
+ fs->flags |= MNT_FS_KERNEL;
View
121 sys-apps/util-linux/util-linux-2.21.2.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.21.2.ebuild,v 1.11 2012/11/28 23:03:40 ssuominen Exp $
+
+EAPI="3"
+
+EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
+AUTOTOOLS_AUTO_DEPEND="no"
+inherit eutils toolchain-funcs libtool flag-o-matic autotools
+if [[ ${PV} == "9999" ]] ; then
+ inherit git-2 autotools
+ #KEYWORDS=""
+else
+ KEYWORDS="*"
+fi
+
+MY_PV=${PV/_/-}
+MY_P=${PN}-${MY_PV}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="Various useful Linux utilities"
+HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux/"
+if [[ ${PV} == "9999" ]] ; then
+ SRC_URI=""
+else
+ SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
+fi
+
+LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
+SLOT="0"
+IUSE="+cramfs crypt ddate ncurses nls old-linux perl selinux slang static-libs uclibc udev unicode"
+
+RDEPEND="!sys-process/schedutils
+ !sys-apps/setarch
+ !<sys-apps/sysvinit-2.88-r3
+ !<sys-libs/e2fsprogs-libs-1.41.8
+ !<sys-fs/e2fsprogs-1.41.8
+ cramfs? ( sys-libs/zlib )
+ ncurses? ( >=sys-libs/ncurses-5.2-r2 )
+ perl? ( dev-lang/perl )
+ selinux? ( sys-libs/libselinux )
+ slang? ( sys-libs/slang )
+ udev? ( virtual/udev )"
+DEPEND="${RDEPEND}
+ nls? ( sys-devel/gettext )
+ virtual/os-headers
+ uclibc? ( ${AUTOTOOLS_DEPEND} )"
+
+src_prepare() {
+ if [[ ${PV} == "9999" ]] ; then
+ po/update-potfiles
+ eautoreconf
+ fi
+ if use uclibc ; then
+ epatch "${FILESDIR}"/${PN}-2.21.1-no-printf-alloc.patch #406303
+ eautoreconf
+ fi
+ elibtoolize
+}
+
+lfs_fallocate_test() {
+ # Make sure we can use fallocate with LFS #300307
+ cat <<-EOF > "${T}"/fallocate.c
+ #define _GNU_SOURCE
+ #include <fcntl.h>
+ main() { return fallocate(0, 0, 0, 0); }
+ EOF
+ append-lfs-flags
+ $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.c -o /dev/null >/dev/null 2>&1 \
+ || export ac_cv_func_fallocate=no
+ rm -f "${T}"/fallocate.c
+}
+
+src_configure() {
+ lfs_fallocate_test
+ econf \
+ --enable-fs-paths-extra=/usr/sbin \
+ $(use_enable nls) \
+ --enable-agetty \
+ $(use_enable cramfs) \
+ $(use_enable ddate) \
+ $(use_enable old-linux elvtune) \
+ --with-ncurses=$(usex ncurses $(usex unicode auto yes) no) \
+ --disable-kill \
+ --disable-last \
+ --disable-mesg \
+ --enable-partx \
+ --enable-raw \
+ --enable-rename \
+ --disable-reset \
+ --disable-login-utils \
+ --enable-schedutils \
+ --disable-wall \
+ --enable-write \
+ $(use_with selinux) \
+ $(use_with slang) \
+ $(use_enable static-libs static) \
+ $(use_with udev) \
+ $(tc-has-tls || echo --disable-tls)
+}
+
+src_install() {
+ emake install DESTDIR="${D}" || die
+ dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt}
+
+ if ! use perl ; then #284093
+ rm "${ED}"/usr/bin/chkdupexe || die
+ rm "${ED}"/usr/share/man/man1/chkdupexe.1 || die
+ fi
+
+ # need the libs in /
+ gen_usr_ldscript -a blkid mount uuid
+ # e2fsprogs-libs didnt install .la files, and .pc work fine
+ find "${ED}" -name '*.la' -delete
+
+ if use crypt ; then
+ newinitd "${FILESDIR}"/crypto-loop.initd crypto-loop || die
+ newconfd "${FILESDIR}"/crypto-loop.confd crypto-loop || die
+ fi
+}
+
View
7 sys-boot/boot-update/Manifest
@@ -1,3 +1,4 @@
-DIST boot-update-1.5.2.tar.bz2 27681 RMD160 8db09990b47b0d1d760794c7f28f41c4da11f6c2 SHA1 6eafc8d17cdd3a08b4cb1e7595df94ca628e702f SHA256 5cbe499ba0e3b25174d128bdbc19e601db2be64c646f8805182bd68bdec01660
-DIST boot-update-1.6.4.tar.gz 34753 RMD160 0d09b14709d38070cca824d1cd4245ff7ea07e38 SHA1 b6e8fb89f61066e5331dd8bacc522f0798ea7d8f SHA256 60991dd85ff8eb7887837edbbe2db7c414e1da0aef6ab3a3e1bc97609386e9f2
-DIST boot-update-1.6.7.tar.gz 34896 RMD160 d7bf38d5fffdd6b42c4066a54440b337e55f07e3 SHA1 7ff6121fd58ad4d9475896af0e4d4afae4a36371 SHA256 8153becfe3d7089c924ea080bcb5821a8419ba5b08be15792e4591dc8bbf34b1
+DIST boot-update-1.5.2.tar.bz2 27681 SHA256 5cbe499ba0e3b25174d128bdbc19e601db2be64c646f8805182bd68bdec01660
+DIST boot-update-1.6.4.tar.gz 34753 SHA256 60991dd85ff8eb7887837edbbe2db7c414e1da0aef6ab3a3e1bc97609386e9f2
+DIST boot-update-1.6.7.tar.gz 34896 SHA256 8153becfe3d7089c924ea080bcb5821a8419ba5b08be15792e4591dc8bbf34b1
+DIST boot-update-1.6.8.tar.gz 35005 SHA256 d4f7886ae93c048745226b4d89158da14af8f7b2090050ac99aebb1f6436739a SHA512 0c95bc557a3c88254e4f32bbad3fa2c2fb6db8ee5a7cf9fcbb66f0ab31c3793c82d144961e6196ae1f56ff09fe174184b95a5d0f257c2b29d27f1d8c2efabda5 WHIRLPOOL 714c87b1bc73f0a2967f338570f2c108fc7988b56c4faffc69f541b5cf735684b6cb57a512df6683d5fcec94d83f0bf424e9aa992806a99d89bd0d07f9da9738
View
56 sys-boot/boot-update/boot-update-1.6.8.ebuild
@@ -0,0 +1,56 @@
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4-python"
+
+PYTHON_MULTIPLE_ABIS="1"
+PYTHON_RESTRICTED_ABIS="2.5 3.1 *-jython *-pypy-*"
+inherit multilib python
+
+DESCRIPTION="Funtoo Core Boot Framework for global boot loader configuration"
+HOMEPAGE="http://www.funtoo.org/en/funtoo/core/boot"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="*"
+RESTRICT="mirror"
+GITHUB_REPO="boot-update"
+GITHUB_USER="funtoo"
+GITHUB_TAG="${PV}"
+SRC_URI="https://www.github.com/${GITHUB_USER}/${GITHUB_REPO}/tarball/${GITHUB_TAG} -> boot-update-${GITHUB_TAG}.tar.gz"
+
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=sys-boot/grub-1.98-r2"
+
+src_unpack() {
+ unpack ${A}
+ mv "${WORKDIR}/${GITHUB_USER}-${PN}"-??????? "${S}" || die
+}
+
+install_into_site_packages() {
+ insinto $(python_get_sitedir)
+ cd ${S}/python/modules
+ doins -r .
+}
+
+src_install() {
+ python_execute_function install_into_site_packages
+
+ dodoc doc/*.rst
+
+ doman doc/boot-update.8
+ doman doc/boot.conf.5
+
+ into /
+ dosbin sbin/boot-update
+
+ dodoc etc/boot.conf.example
+ insinto /etc
+ doins etc/boot.conf
+ doins etc/boot.conf.defaults
+ doins etc/boot.conf.example
+}
+
+src_compile() {
+ return
+}
Please sign in to comment.
Something went wrong with that request. Please try again.