Permalink
Browse files

glorious funtoo updates

merged:

  funtoo-overlay: 54c92be31dd400ec85b1c5c68d448aa3366759e4
  foo-overlay: ac623317c1476ac0bddf715649d4e9eb2d33e49e
  bar-overlay: f1e9085ee695ff5b6ce57d430d6b224aaf4fa0a6
  flora: 0da67a147d9069ec826c1e37270ef56b327771f0
  mythtv: d5133545c1814f01e74fe9079ba83d3cd21140f4
  • Loading branch information...
1 parent 8a73f41 commit 13839422b4e39f58dd51764e8e8017c206dff629 @danielrobbins danielrobbins committed Nov 28, 2012
Showing 401 changed files with 2,960 additions and 5,336 deletions.
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>apache</herd>
- <maintainer>
- <email>apache-bugs@gentoo.org</email>
- </maintainer>
<maintainer>
<email>pva@gentoo.org</email>
</maintainer>
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>apache</herd>
+<maintainer>
+ <email>neurogeek@gentoo.org</email>
+ <name>Jesus Rivero</name>
+</maintainer>
</pkgmetadata>
@@ -1,4 +1,4 @@
-DIST eselect-1.2.15.tar.bz2 169358 RMD160 9b5c2174786466f6a32e8b823eb4140e2581f945 SHA1 4875545e001904ab6f9a5a8c96150739ee1cff29 SHA256 fa8e3b2af2bc4a951ddb6067ba1e786a04681555ab7e83d50d4eb85047f2e7d7
-DIST eselect-1.2.18.tar.bz2 170120 RMD160 0a2dc01f0c50c03f81b6079b91190859d820ff61 SHA1 5ac5a5049e99d09063da9d99096a146cb22953cd SHA256 68581af8f7ca427dbd726b766071c833918fb5ae25ad03224def7e1599297b3c
-DIST eselect-1.3.1.tar.xz 163908 RMD160 343f297d397952d23e24bd3cc0c6a652178d1a65 SHA1 ba99ce4b93f7268ef7d8ec50cfe85a6a8567eddc SHA256 4fc1c3f1b021dd8d28475ab2115f6a2de843bbbb941a0f70999389d1e0d56444
-DIST eselect-1.3.tar.xz 163724 RMD160 45e30b66e4258ce607a57230956b057dc32c1ba5 SHA1 c63330bede6b6e5f86fa3392feb3abd9f7f23d8d SHA256 1700cc381eb7acbb49204157038be16fb63d9291b7b23612db32897566be506e
+DIST eselect-1.2.15.tar.bz2 169358 SHA256 fa8e3b2af2bc4a951ddb6067ba1e786a04681555ab7e83d50d4eb85047f2e7d7
+DIST eselect-1.2.18.tar.bz2 170120 SHA256 68581af8f7ca427dbd726b766071c833918fb5ae25ad03224def7e1599297b3c
+DIST eselect-1.3.1.tar.xz 163908 SHA256 4fc1c3f1b021dd8d28475ab2115f6a2de843bbbb941a0f70999389d1e0d56444
+DIST eselect-1.3.tar.xz 163724 SHA256 1700cc381eb7acbb49204157038be16fb63d9291b7b23612db32897566be506e
@@ -0,0 +1,72 @@
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=3
+
+inherit bash-completion-r1
+
+DESCRIPTION="Gentoo's multi-purpose configuration and management tool"
+HOMEPAGE="http://www.gentoo.org/proj/en/eselect/"
+SRC_URI="mirror://gentoo/eselect-1.3.1.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="*"
+IUSE="doc"
+S=$WORKDIR/$PN-1.3.1
+
+RDEPEND="sys-apps/sed
+ || (
+ sys-apps/coreutils
+ sys-freebsd/freebsd-bin
+ app-misc/realpath
+ )"
+DEPEND="${RDEPEND}
+ app-arch/xz-utils
+ doc? ( dev-python/docutils )"
+RDEPEND="!app-admin/eselect-news
+ ${RDEPEND}
+ sys-apps/file
+ sys-libs/ncurses"
+
+# Commented out: only few users of eselect will edit its source
+#PDEPEND="emacs? ( app-emacs/gentoo-syntax )
+# vim-syntax? ( app-vim/eselect-syntax )"
+
+src_compile() {
+ emake || die
+
+ if use doc; then
+ emake html || die
+ fi
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die
+ newbashcomp misc/${PN}.bashcomp ${PN} || die
+ dodoc AUTHORS ChangeLog NEWS README TODO doc/*.txt || die
+
+ if use doc; then
+ dohtml *.html doc/* || die
+ fi
+
+ # needed by news module
+ keepdir /var/lib/gentoo/news
+ fowners root:portage /var/lib/gentoo/news || die
+ fperms g+w /var/lib/gentoo/news || die
+
+ # tweaks for funtoo-1.0 profile
+ insinto /usr/share/eselect/modules
+ doins $FILESDIR/$PV/profile.eselect || die
+ doins $FILESDIR/$PV/kernel.eselect || die
+}
+
+pkg_postinst() {
+ # fowners in src_install doesn't work for the portage group:
+ # merging changes the group back to root
+ [[ -z ${EROOT} ]] && local EROOT=${ROOT}
+ chgrp portage "${EROOT}/var/lib/gentoo/news" \
+ && chmod g+w "${EROOT}/var/lib/gentoo/news"
+
+ ewarn "This version of eselect supports using /etc/portage/make.profile along with the new Funtoo 1.0 profiles."
+ ewarn "Please visit http://www.funtoo.org/wiki/Funtoo_1.0_Profile for instructions on how to switch"
+}
@@ -0,0 +1,127 @@
+# -*-eselect-*- vim: ft=eselect
+# Copyright 2005-2012 Gentoo Foundation
+# Distributed under the terms of the GNU GPL version 2 or later
+# $Id: $
+
+# This version was modified by Funtoo to support all kernel sources in /usr/src
+
+DESCRIPTION="Manage the /usr/src/linux symlink"
+MAINTAINER="rh1@funtoo.org"
+VERSION="funtoo-1.1_beta"
+
+# sort function for kernel versions, to be used in a pipe
+sort_kernel_versions() {
+ local vsort="sort --version-sort"
+ # Test if our sort supports the --version-sort option
+ # (should be GNU sort, since the kernel module is GNU/Linux specific)
+ ${vsort} </dev/null &>/dev/null || vsort=sort
+
+ # We sort kernel versions as follows:
+ # 1. Run sed to prepend the version string by the numeric version
+ # and an additional rank indicator that is 0 for release candidates
+ # or 1 otherwise. After this step we have, for example:
+ # 2.6.29 1 linux-2.6.29
+ # 2.6.29 0 linux-2.6.29-rc8
+ # 2. sort --version-sort
+ # 3. Run sed again to remove the prepended keys from step 1.
+ sed -e 's/^\(linux-.*\)\?\([[:digit:].]\+\)[-_]rc/\2 0 &/' \
+ -e 't;s/^\(linux-.*\)\?\([[:digit:].]\+\)/\2 1 &/' \
+ | LC_ALL=C ${vsort} | sed 's/.* //'
+}
+
+# find a list of kernel symlink targets
+find_targets() {
+ local f
+ for f in "${EROOT}"/usr/src/linux-[[:graph:]]*; do
+ [[ -d ${f} ]] && basename "${f}"
+ done | sort_kernel_versions
+}
+
+# remove the kernel symlink
+remove_symlink() {
+ rm "${EROOT}/usr/src/linux"
+}
+
+# set the kernel symlink
+set_symlink() {
+ local target=$1
+
+ if is_number "${target}"; then
+ local targets=( $(find_targets) )
+ target=${targets[target-1]}
+ fi
+
+ if [[ -z ${target} ]]; then
+ die -q "Target \"$1\" doesn't appear to be valid!"
+ elif [[ -d ${EROOT}/usr/src/${target} ]]; then
+ ln -s "${target}" "${EROOT}/usr/src/linux"
+ elif [[ -d ${EROOT}/usr/src/linux-${target} ]]; then
+ ln -s "linux-${target}" "${EROOT}/usr/src/linux"
+ else
+ die -q "Target \"$1\" doesn't appear to be valid!"
+ fi
+}
+
+### show action ###
+
+describe_show() {
+ echo "Show the current kernel symlink"
+}
+
+do_show() {
+ write_list_start "Current kernel symlink:"
+ if [[ -L ${EROOT}/usr/src/linux ]]; then
+ local kernel=$(canonicalise "${EROOT}/usr/src/linux")
+ write_kv_list_entry "${kernel%/}" ""
+ else
+ write_kv_list_entry "(unset)" ""
+ fi
+}
+
+### list action ###
+
+describe_list() {
+ echo "List available kernel symlink targets"
+}
+
+do_list() {
+ local i targets=( $(find_targets) )
+
+ write_list_start "Available kernel symlink targets:"
+ for (( i = 0; i < ${#targets[@]}; i++ )); do
+ [[ ${targets[i]} = \
+ $(basename "$(canonicalise "${EROOT}/usr/src/linux")") ]] \
+ && targets[i]=$(highlight_marker "${targets[i]}")
+ done
+ write_numbered_list -m "(none found)" "${targets[@]}"
+}
+
+### set action ###
+
+describe_set() {
+ echo "Set a new kernel symlink target"
+}
+
+describe_set_parameters() {
+ echo "<target>"
+}
+
+describe_set_options() {
+ echo "target : Target name or number (from 'list' action)"
+}
+
+do_set() {
+ [[ -z $1 ]] && die -q "You didn't tell me what to set the symlink to"
+ [[ $# -gt 1 ]] && die -q "Too many parameters"
+
+ if [[ -L ${EROOT}/usr/src/linux ]]; then
+ # existing symlink
+ remove_symlink || die -q "Couldn't remove existing symlink"
+ set_symlink "$1" || die -q "Couldn't set a new symlink"
+ elif [[ -e ${EROOT}/usr/src/linux ]]; then
+ # we have something strange
+ die -q "${EROOT}/usr/src/linux exists but is not a symlink"
+ else
+ set_symlink "$1" || die -q "Couldn't set a new symlink"
+ fi
+}
Oops, something went wrong.

0 comments on commit 1383942

Please sign in to comment.