Browse files

glorious funtoo updates

merged:

  gentoo: d7ca5d4a7b3c63036157b3493dd06098067e1fa9
  funtoo-overlay: 1d944b31e46161faea8edf1d42811b46df744d34
  foo-overlay: 8298ae4a92dd6e9925442616a6fc83e73c965abf
  bar-overlay: 6c956f1ca6178fed85bda46013da787239706d7c
  flora: 66d990ebf04be11047f2a373f75900b9caf0a355
  • Loading branch information...
1 parent 3916a74 commit e4e99b5937618a970e7b7f111b5ed4beb8381d57 @danielrobbins danielrobbins committed Jun 27, 2012
View
3 app-admin/eselect/eselect-1.3.1.1_beta4.ebuild
@@ -68,4 +68,7 @@ pkg_postinst() {
[[ -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"
}
View
2 dev-python/dbus-python/Manifest
@@ -1 +1 @@
-DIST dbus-python-1.1.0.tar.gz 588706 RMD160 93295d1e35ab83b0c366f755d7685862cb866729 SHA1 0b4582e2c7db1f5b40005267332fac879a700f4d SHA256 2dc30b53cdb2e20f8d0265af3be878e9da68745cf9ccc72f75de869094c4fc60
+DIST dbus-python-1.1.1.tar.gz 596476 RMD160 8e810a15c417541744df68cb01e5d707488bd6e8 SHA1 3c15438a7ec1f0698d50557e3421564564d0e097 SHA256 8917ca4fb8f4d693aee18d200cbad166b2c938dfb88c03bb4ab3d90a7c915e88
View
0 ...bus-python/dbus-python-1.1.0-r1000.ebuild → ...bus-python/dbus-python-1.1.1-r1000.ebuild
File renamed without changes.
View
2 dev-python/pep8/Manifest
@@ -1 +1 @@
-DIST pep8-1.3.2.tar.gz 39833 RMD160 282310531dfd2bd5e13549e70084e4335f7a328a SHA1 0b42a019bc0fc9d0c13c99faff93cd22968cd04f SHA256 54ccf79f31bec7832539696b4c442306b295144ee2c524520258bb043948d3b4
+DIST pep8-1.3.3.tar.gz 39967 RMD160 b9b7141f5f57d08bccb7f4d0c38415442986a22d SHA1 7791690bbbc64ccd797b039eb9aac0fb557bb3cc SHA256 2033a40515a52068dd719857b38ecca651ce84dc9837b99fe500f314cadab634
View
0 dev-python/pep8/pep8-1.3.2-r1000.ebuild → dev-python/pep8/pep8-1.3.3-r1000.ebuild
File renamed without changes.
View
2 metadata/md5-cache/app-admin/eselect-1.3.1.1_beta4
@@ -10,4 +10,4 @@ RDEPEND=!app-admin/eselect-news sys-apps/sed || ( sys-apps/coreutils sys-freebsd
SLOT=0
SRC_URI=mirror://gentoo/eselect-1.3.1.tar.xz
_eclasses_=bash-completion-r1 fff8a4a7ab807c81d9000e0791370cb9
-_md5_=3847b0d550ab3376f5fff0c3fdc68a9f
+_md5_=f46afb91e2e114479eb09b6b537d4dda
View
2 ...-cache/dev-python/dbus-python-1.1.0-r1000 → ...-cache/dev-python/dbus-python-1.1.1-r1000
@@ -9,6 +9,6 @@ LICENSE=MIT
RDEPEND=>=dev-libs/dbus-glib-0.70 >=sys-apps/dbus-1.4 python_abis_2.6? ( dev-lang/python:2.6 ) python_abis_2.7? ( dev-lang/python:2.7 ) python_abis_3.1? ( dev-lang/python:3.1 ) python_abis_3.2? ( dev-lang/python:3.2 ) python_abis_3.3? ( dev-lang/python:3.3 )
REQUIRED_USE=|| ( python_abis_2.6 python_abis_2.7 python_abis_3.1 python_abis_3.2 python_abis_3.3 )
SLOT=0
-SRC_URI=http://dbus.freedesktop.org/releases/dbus-python/dbus-python-1.1.0.tar.gz
+SRC_URI=http://dbus.freedesktop.org/releases/dbus-python/dbus-python-1.1.1.tar.gz
_eclasses_=python 1a2be1ad82e0d83243e3808e4edb70c5
_md5_=54ece271059d5b412073dc87ab87b891
View
2 ...ata/md5-cache/dev-python/pep8-1.3.2-r1000 → ...ata/md5-cache/dev-python/pep8-1.3.3-r1000
@@ -9,6 +9,6 @@ LICENSE=MIT
RDEPEND=dev-python/setuptools[python_abis_2.5?,python_abis_2.6?,python_abis_2.7?,python_abis_3.1?,python_abis_3.2?,python_abis_3.3?,python_abis_2.5-jython?,python_abis_2.7-jython?,python_abis_2.7-pypy-1.8?,python_abis_2.7-pypy-1.9?] python_abis_2.5? ( dev-lang/python:2.5 ) python_abis_2.6? ( dev-lang/python:2.6 ) python_abis_2.7? ( dev-lang/python:2.7 ) python_abis_3.1? ( dev-lang/python:3.1 ) python_abis_3.2? ( dev-lang/python:3.2 ) python_abis_3.3? ( dev-lang/python:3.3 ) python_abis_2.5-jython? ( dev-lang/jython:2.5 ) python_abis_2.7-jython? ( dev-lang/jython:2.7 ) python_abis_2.7-pypy-1.8? ( dev-python/pypy:1.8 ) python_abis_2.7-pypy-1.9? ( dev-python/pypy:1.9 )
REQUIRED_USE=|| ( python_abis_2.5 python_abis_2.6 python_abis_2.7 python_abis_3.1 python_abis_3.2 python_abis_3.3 python_abis_2.5-jython python_abis_2.7-jython python_abis_2.7-pypy-1.8 python_abis_2.7-pypy-1.9 )
SLOT=0
-SRC_URI=mirror://pypi/p/pep8/pep8-1.3.2.tar.gz
+SRC_URI=mirror://pypi/p/pep8/pep8-1.3.3.tar.gz
_eclasses_=distutils 82a876811ffd4907daba6062958daa26 python 1a2be1ad82e0d83243e3808e4edb70c5
_md5_=c239b3a1e42dedda3249ded4716e823b
View
15 metadata/md5-cache/sys-apps/portage-2.3.4-r3
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=python3? ( =dev-lang/python-3* ) !python2? ( !python3? ( build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) !build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] >=dev-lang/python-3 ) ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) ) !build? ( >=sys-apps/sed-4.0.5 ) doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 )
-DESCRIPTION=Portage is the package management and distribution system for Gentoo
-EAPI=2
-HOMEPAGE=http://www.gentoo.org/proj/en/portage/index.xml
-IUSE=build doc epydoc +ipc linguas_pl python2 python3 selinux
-KEYWORDS=*
-LICENSE=GPL-2
-PDEPEND=!build? ( >=net-misc/rsync-1.6.4 userland_GNU? ( >=sys-apps/coreutils-5.4 ) ) >=sys-devel/libtool-2.4-r3
-RDEPEND=python3? ( =dev-lang/python-3* ) !python2? ( !python3? ( build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) !build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] >=dev-lang/python-3 ) ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) ) !build? ( >=sys-apps/sed-4.0.5 >=app-shells/bash-3.2_p17 >=app-admin/eselect-1.2 ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) >=app-misc/pax-utils-0.1.17 selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) ) !<app-shells/bash-3.2_p17
-RESTRICT=mirror
-SLOT=0
-SRC_URI=https://www.github.com/funtoo/portage-funtoo/tarball/funtoo-2.3.4-r3 -> portage-funtoo-2.3.4-r3.tar.gz linguas_pl? ( mirror://gentoo/portage-man-pl-2.1.2.tar.bz2 )
-_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 multilib 5782800349f728f725f9378105c6a2ab python 1a2be1ad82e0d83243e3808e4edb70c5 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=15c8fecd58d496ade7c3fbad1a0df7bd
View
11 metadata/md5-cache/sys-cluster/vzctl-3.3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure install postinst prepare
+DESCRIPTION=OpenVZ Containers control utility
+EAPI=4
+HOMEPAGE=http://openvz.org/
+KEYWORDS=~*
+LICENSE=GPL-2
+RDEPEND=net-firewall/iptables sys-apps/ed sys-apps/iproute2 sys-fs/vzquota sys-cluster/ploop >=sys-apps/openrc-0.6.5-r1
+SLOT=0
+SRC_URI=http://download.openvz.org/utils/vzctl/3.3/src/vzctl-3.3.tar.bz2
+_eclasses_=bash-completion-r1 fff8a4a7ab807c81d9000e0791370cb9 eutils 327b713e2d6949c42cd96bc4898fd280 multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=ea10928ef10bf168c38d9c8a3b006383
View
12 metadata/md5-cache/sys-kernel/linux-headers-2.6.39
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=app-arch/xz-utils
-DESCRIPTION=Linux system headers
-EAPI=3
-HOMEPAGE=http://www.kernel.org/ http://www.gentoo.org/
-KEYWORDS=*
-LICENSE=GPL-2
-RESTRICT=mirror
-SLOT=0
-SRC_URI=http://www.funtoo.org/distfiles/gentoo-headers-base-2.6.39.tar.xz http://www.funtoo.org/distfiles/gentoo-headers-2.6.39-1.tar.xz
-_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 kernel-2 dd451098928ff900df7c254820871c00 multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=e8e43aeacdb6a2cbd4324669a05c89d8
View
14 metadata/md5-cache/sys-kernel/openvz-rhel6-stable-2.6.32.042.055.10
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst prepare setup unpack
-DEPEND=binary? ( >=sys-kernel/genkernel-3.4.12.6-r4 ) =sys-devel/gcc-4.4.5*
-DESCRIPTION=Full Linux kernel sources - RHEL6 kernel with OpenVZ patchset
-EAPI=2
-HOMEPAGE=http://www.openvz.org
-IUSE=binary
-KEYWORDS=x86 amd64
-LICENSE=GPL-2
-RDEPEND=binary? ( >=sys-fs/udev-160 )
-RESTRICT=binchecks strip
-SLOT=2.6.32.042.055.10
-SRC_URI=mirror://kernel/linux/kernel/v./linux-2.6.32.tar.bz2 http://download.openvz.org/kernel/branches/rhel6-2.6.32/042stab055.10/configs/config-2.6.32-042stab055.10.i686 http://download.openvz.org/kernel/branches/rhel6-2.6.32/042stab055.10/configs/config-2.6.32-042stab055.10.x86_64 http://download.openvz.org/kernel/branches/rhel6-2.6.32/042stab055.10/patches/patch-042stab055.10-combined.gz
-_eclasses_=mount-boot 410bdaef41d2c8674e24edfa9d521177
-_md5_=78e8f902f3264df2438feff8a1214eae
View
4 profiles/funtoo/1.0/linux-gnu/mix-ins/gnome/make.defaults
@@ -1 +1,5 @@
+<<<<<<< HEAD
+USE="$USE eds evo gnome gnome-keyring gstreamer nautilus gtk"
+=======
USE="colord eds evo gnome gnome-keyring gstreamer nautilus policykit pulseaudio gtk"
+>>>>>>> master
View
3 profiles/funtoo/1.0/linux-gnu/mix-ins/gnome/package.use
@@ -28,6 +28,8 @@ gnome-base/gvfs cdda
# Required by media-video/cheese
x11-libs/gdk-pixbuf jpeg
+<<<<<<< HEAD
+=======
# Required by app-accessibility/orca-3
app-accessibility/speech-dispatcher python
@@ -67,3 +69,4 @@ gnome-extra/nm-applet bluetooth
# Required by app-misc/tracker
media-gfx/imagemagick png jpeg
+>>>>>>> master
View
6 profiles/package.mask/funtoo-cautionary
@@ -17,6 +17,12 @@
# See b.g.o. 408713
>=sys-auth/consolekit-0.4.5-r3
+# Daniel Robbins (05 Mar 2012)
+# Mask _pre python ebuilds as they require mercurial which breaks metro (could be worked around but is less than ideal anyway)
+# People can unmask 'em if they need them.
+#=dev-lang/python-2.7.3_pre*
+#=dev-lang/python-3.2.3_pre*
+
# Oleg Vinichenko (19 Jan 2012)
# udev-177 is not ready for daily usage
# for adventurous ones!
View
5 profiles/package.mask/funtoo-staging
@@ -27,11 +27,6 @@
=dev-lang/python-3.2.4_pre*
=dev-lang/python-3.3_pre*
-# Daniel Robbins (06 May 2012)
-# Ryan Harris' eselect code for testing
->=app-admin/eselect-1.3.1.1_beta1
-=app-admin/eselect-1.3.1.1_beta2
-
# Martin Scholz (03 May 2012)
# masking newer versions of grub
# included Daniel Robbins old mask
View
3 sys-apps/portage/Manifest
@@ -1,4 +1,7 @@
DIST portage-funtoo-2.3.3-r4.tar.gz 927851 RMD160 6b6d08d813aa489d9b19146046ef147100843fad SHA1 f67db42bb4f2ec11251a2481db7033e0c1461dee SHA256 25d4577c01640e43f61e9402a455d803aa184fc32cc8612b9a3ea1190b950274
+DIST portage-funtoo-2.3.4-r1.tar.gz 936135 RMD160 c0a65e9ffcf8208570c11e2b094141282662d52b SHA1 58674215a06d3217a65829ef9b649fe6d129e72d SHA256 4e4cf2e02f0f9910aa74a39b152518f1e20e000871f61ee9efbbb503a4a76900
+DIST portage-funtoo-2.3.4-r2.tar.gz 936457 RMD160 f1eb5aeac51d663a3da68942b31da3d9cfb89a97 SHA1 8553ca4cab06b9c6804a4850030fbb403d535fb2 SHA256 6beb518fdc519282dcbcee03ff96ef8870cad4561594be0a1637c57acac58fb2
+DIST portage-funtoo-2.3.4-r3.tar.gz 938930 RMD160 477af3ebf90a9157012ad3527435a15359fef4a9 SHA1 79656cf25b3a13a66055e688249b45e00b4f6aff SHA256 2da208a3e2f03948c6fb56aaa5789f94a47966d303321b1e5bba145fc8463688
DIST portage-funtoo-2.3.4-r3.tar.gz 938930 RMD160 477af3ebf90a9157012ad3527435a15359fef4a9 SHA1 79656cf25b3a13a66055e688249b45e00b4f6aff SHA256 2da208a3e2f03948c6fb56aaa5789f94a47966d303321b1e5bba145fc8463688
DIST portage-funtoo-2.3.4-r4.tar.gz 938854 RMD160 188c615ecac19573b5808cbc5d93e7ee1e5c2979 SHA1 a5b4e76d1a38ad38b117baa2de5fd9e4fb580bcc SHA256 4e8b5a8f68c74b7ee5f5666ec06f968da3f3bd4e6f0b476fca4b2996f0c07ff9
DIST portage-funtoo-2.3.4-r6.tar.gz 950679 RMD160 107cde7fed47a5df6e9c1581d233ed567dea5d85 SHA1 4cb886d77590229bc615c2b397e81e293112e5f0 SHA256 6012741bb46628c266199737f0d11a017fd4c34b08bf5d6421808300970169b7
View
0 sys-apps/portage/portage-2.3.4-r3.ebuild → ...ps/portage/portage-2.3.4-r3.ebuild~HEAD_0
File renamed without changes.
View
383 sys-apps/portage/portage-2.3.4-r3.ebuild~master_0
@@ -0,0 +1,383 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha41.ebuild,v 1.1 2011/06/14 00:42:00 zmedico Exp $
+
+# Require EAPI 2 since we now require at least python-2.6 (for python 3
+# syntax support) which also requires EAPI 2.
+EAPI=2
+inherit eutils multilib python
+
+DESCRIPTION="Portage is the package management and distribution system for Gentoo"
+HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
+LICENSE="GPL-2"
+KEYWORDS="*"
+SLOT="0"
+IUSE="build doc epydoc +ipc linguas_pl python2 python3 selinux"
+GITHUB_REPO="portage-funtoo"
+GITHUB_USER="funtoo"
+GITHUB_TAG="funtoo-${PVR}"
+RESTRICT="mirror"
+
+python_dep="python3? ( =dev-lang/python-3* )
+ !python2? ( !python3? (
+ build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) )
+ !build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] >=dev-lang/python-3 ) )
+ ) )
+ python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) )"
+
+# The pysqlite blocker is for bug #282760.
+DEPEND="${python_dep}
+ !build? ( >=sys-apps/sed-4.0.5 )
+ doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
+ epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 )"
+# Require sandbox-2.2 for bug #288863.
+RDEPEND="${python_dep}
+ !build? ( >=sys-apps/sed-4.0.5
+ >=app-shells/bash-3.2_p17
+ >=app-admin/eselect-1.2 )
+ elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
+ elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+ elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
+ >=app-misc/pax-utils-0.1.17
+ selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) )
+ !<app-shells/bash-3.2_p17"
+PDEPEND="
+ !build? (
+ >=net-misc/rsync-1.6.4
+ userland_GNU? ( >=sys-apps/coreutils-5.4 )
+ )
+ >=sys-devel/libtool-2.4-r3"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=install-sources requires debugedit and rsync
+
+SRC_ARCHIVES="http://dev.gentoo.org/~zmedico/portage/archives"
+
+prefix_src_archives() {
+ local x y
+ for x in ${@}; do
+ for y in ${SRC_ARCHIVES}; do
+ echo ${y}/${x}
+ done
+ done
+}
+
+PV_PL="2.1.2"
+PATCHVER_PL=""
+SRC_URI="https://www.github.com/${GITHUB_USER}/${GITHUB_REPO}/tarball/${GITHUB_TAG} -> portage-${GITHUB_TAG}.tar.gz"
+SRC_URI="$SRC_URI linguas_pl? ( mirror://gentoo/${PN}-man-pl-${PV_PL}.tar.bz2 )"
+S_PL="${WORKDIR}"/${PN}-${PV_PL}
+
+compatible_python_is_selected() {
+ [[ $(/usr/bin/python -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x2060000 and "good" or "bad")') = good ]]
+}
+
+src_unpack() {
+ unpack ${A}
+ mv "${WORKDIR}/${GITHUB_USER}-${PN}-funtoo"-??????? "${S}" || die
+}
+
+pkg_setup() {
+ # Bug #359731 - Die early if get_libdir fails.
+ [[ -z $(get_libdir) ]] && \
+ die "get_libdir returned an empty string"
+
+ if use python2 && use python3 ; then
+ ewarn "Both python2 and python3 USE flags are enabled, but only one"
+ ewarn "can be in the shebangs. Using python3."
+ fi
+ if ! use python2 && ! use python3 && ! compatible_python_is_selected ; then
+ ewarn "Attempting to select a compatible default python interpreter"
+ local x success=0
+ for x in /usr/bin/python2.* ; do
+ x=${x#/usr/bin/python2.}
+ if [[ $x -ge 6 ]] 2>/dev/null ; then
+ eselect python set python2.$x
+ if compatible_python_is_selected ; then
+ elog "Default python interpreter is now set to python-2.$x"
+ success=1
+ break
+ fi
+ fi
+ done
+ if [ $success != 1 ] ; then
+ eerror "Unable to select a compatible default python interpreter!"
+ die "This version of portage requires at least python-2.6 to be selected as the default python interpreter (see \`eselect python --help\`)."
+ fi
+ fi
+
+ if use python3; then
+ python_set_active_version 3
+ elif use python2; then
+ python_set_active_version 2
+ fi
+}
+
+src_prepare() {
+ if [ -n "${PATCHVER}" ] ; then
+ if [[ -L $S/bin/ebuild-helpers/portageq ]] ; then
+ rm "$S/bin/ebuild-helpers/portageq" \
+ || die "failed to remove portageq helper symlink"
+ fi
+ epatch "${WORKDIR}/${PN}-${PATCHVER}.patch"
+ fi
+ einfo "Setting portage.VERSION to ${PVR} ..."
+ sed -e "s/^VERSION=.*/VERSION=\"${PVR}\"/" -i pym/portage/__init__.py || \
+ die "Failed to patch portage.VERSION"
+ sed -e "1s/VERSION/${PVR}/" -i doc/fragment/version || \
+ die "Failed to patch VERSION in doc/fragment/version"
+ sed -e "1s/VERSION/${PVR}/" -i man/* || \
+ die "Failed to patch VERSION in man page headers"
+
+ if ! use ipc ; then
+ einfo "Disabling ipc..."
+ sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
+ -i pym/_emerge/AbstractEbuildProcess.py || \
+ die "failed to patch AbstractEbuildProcess.py"
+ fi
+
+ if use python3; then
+ einfo "Converting shebangs for python3..."
+ python_convert_shebangs -r 3 .
+ elif use python2; then
+ einfo "Converting shebangs for python2..."
+ python_convert_shebangs -r 2 .
+ fi
+}
+
+src_compile() {
+ if use doc; then
+ cd "${S}"/doc
+ touch fragment/date
+ make xhtml xhtml-nochunks || die "failed to make docs"
+ fi
+
+ if use epydoc; then
+ einfo "Generating api docs"
+ mkdir "${WORKDIR}"/api
+ local my_modules epydoc_opts=""
+ my_modules="$(find "${S}/pym" -name "*.py" \
+ | sed -e 's:/__init__.py$::' -e 's:\.py$::' -e "s:^${S}/pym/::" \
+ -e 's:/:.:g' | sort)" || die "error listing modules"
+ # workaround for bug 282760
+ > "$S/pym/pysqlite2.py"
+ PYTHONPATH=${S}/pym:${PYTHONPATH:+:}${PYTHONPATH} \
+ epydoc -o "${WORKDIR}"/api \
+ -qqqqq --no-frames --show-imports $epydoc_opts \
+ --name "${PN}" --url "${HOMEPAGE}" \
+ ${my_modules} || die "epydoc failed"
+ rm "$S/pym/pysqlite2.py"
+ fi
+}
+
+src_test() {
+ # make files executable, in case they were created by patch
+ find bin -type f | xargs chmod +x
+ PYTHONPATH=${S}/pym:${PYTHONPATH:+:}${PYTHONPATH} \
+ ./pym/portage/tests/runTests || die "test(s) failed"
+}
+
+src_install() {
+ local libdir=$(get_libdir)
+ local portage_base="/usr/${libdir}/portage"
+ local portage_share_config=/usr/share/portage/config
+
+ cd "${S}"/cnf
+ insinto /etc
+ doins etc-update.conf dispatch-conf.conf || die
+
+ insinto "$portage_share_config/sets"
+ doins "$S"/cnf/sets/*.conf || die
+ insinto "$portage_share_config"
+ doins "$S/cnf/make.globals" || die
+ if [ -f "make.conf.${ARCH}".diff ]; then
+ patch make.conf "make.conf.${ARCH}".diff || \
+ die "Failed to patch make.conf.example"
+ newins make.conf make.conf.example || die
+ else
+ eerror ""
+ eerror "Portage does not have an arch-specific configuration for this arch."
+ eerror "Please notify the arch maintainer about this issue. Using generic."
+ eerror ""
+ newins make.conf make.conf.example || die
+ fi
+
+ dosym ..${portage_share_config}/make.globals /etc/make.globals
+
+ insinto /etc/logrotate.d
+ doins "${S}"/cnf/logrotate.d/elog-save-summary || die
+
+ # BSD and OSX need a sed wrapper so that find/xargs work properly
+ # This does not exist in Funtoo Linux.
+ if use userland_GNU; then
+ if [ -e "${S}"/bin/ebuild-helpers/sed ]; then
+ rm "${S}"/bin/ebuild-helpers/sed || die "Failed to remove sed wrapper"
+ fi
+ fi
+
+ local x symlinks files
+
+ cd "$S" || die "cd failed"
+ for x in $(find bin -type d) ; do
+ exeinto $portage_base/$x || die "exeinto failed"
+ cd "$S"/$x || die "cd failed"
+ files=$(find . -mindepth 1 -maxdepth 1 -type f ! -type l)
+ if [ -n "$files" ] ; then
+ doexe $files || die "doexe failed"
+ fi
+ symlinks=$(find . -mindepth 1 -maxdepth 1 -type l)
+ if [ -n "$symlinks" ] ; then
+ cp -P $symlinks "$D$portage_base/$x" || die "cp failed"
+ fi
+ done
+
+ cd "$S" || die "cd failed"
+ for x in $(find pym/* -type d) ; do
+ insinto $portage_base/$x || die "insinto failed"
+ cd "$S"/$x || die "cd failed"
+ # __pycache__ directories contain no py files
+ [[ "*.py" != $(echo *.py) ]] || continue
+ doins *.py || die "doins failed"
+ symlinks=$(find . -mindepth 1 -maxdepth 1 -type l)
+ if [ -n "$symlinks" ] ; then
+ cp -P $symlinks "$D$portage_base/$x" || die "cp failed"
+ fi
+ done
+
+ # Symlinks to directories cause up/downgrade issues and the use of these
+ # modules outside of portage is probably negligible.
+ for x in "${D}${portage_base}/pym/"{cache,elog_modules} ; do
+ [ ! -L "${x}" ] && continue
+ die "symlink to directory will cause upgrade/downgrade issues: '${x}'"
+ done
+
+ exeinto ${portage_base}/pym/portage/tests
+ doexe "${S}"/pym/portage/tests/runTests
+
+ doman "${S}"/man/*.[0-9]
+ if use linguas_pl; then
+ doman -i18n=pl "${S_PL}"/man/pl/*.[0-9]
+ doman -i18n=pl_PL.UTF-8 "${S_PL}"/man/pl_PL.UTF-8/*.[0-9]
+ fi
+
+ dodoc "${S}"/{NEWS,RELEASE-NOTES}
+ use doc && dohtml -r "${S}"/doc/*
+ use epydoc && dohtml -r "${WORKDIR}"/api
+
+ dodir /usr/bin
+ for x in ebuild egencache emerge portageq quickpkg repoman ; do
+ dosym ../${libdir}/portage/bin/${x} /usr/bin/${x}
+ done
+
+ dodir /usr/sbin
+ local my_syms="archive-conf
+ dispatch-conf
+ emaint
+ env-update
+ etc-update
+ fixpackages
+ regenworld"
+ local x
+ for x in ${my_syms}; do
+ dosym ../${libdir}/portage/bin/${x} /usr/sbin/${x}
+ done
+ dosym env-update /usr/sbin/update-env
+ dosym etc-update /usr/sbin/update-etc
+
+ dodir /etc/portage
+ keepdir /etc/portage
+}
+
+pkg_preinst() {
+ if ! use build && ! has_version dev-python/pycrypto && \
+ ! has_version '>=dev-lang/python-2.6[ssl]' ; then
+ ewarn "If you are an ebuild developer and you plan to commit ebuilds"
+ ewarn "with this system then please install dev-python/pycrypto or"
+ ewarn "enable the ssl USE flag for >=dev-lang/python-2.6 in order"
+ ewarn "to enable RMD160 hash support."
+ ewarn "See bug #198398 for more information."
+ fi
+ if [ -f "${ROOT}/etc/make.globals" ]; then
+ rm "${ROOT}/etc/make.globals"
+ fi
+
+ has_version "<${CATEGORY}/${PN}-2.2_alpha"
+ MINOR_UPGRADE=$?
+
+ has_version "<=${CATEGORY}/${PN}-2.2_pre5"
+ WORLD_MIGRATION_UPGRADE=$?
+
+ # If portage-2.1.6 is installed and the preserved_libs_registry exists,
+ # assume that the NEEDED.ELF.2 files have already been generated.
+ has_version "<=${CATEGORY}/${PN}-2.2_pre7" && \
+ ! ( [ -e "$ROOT"var/lib/portage/preserved_libs_registry ] && \
+ has_version ">=${CATEGORY}/${PN}-2.1.6_rc" )
+ NEEDED_REBUILD_UPGRADE=$?
+
+ [[ -n $PORTDIR_OVERLAY ]] && has_version "<${CATEGORY}/${PN}-2.1.6.12"
+ REPO_LAYOUT_CONF_WARN=$?
+}
+
+pkg_postinst() {
+ # Compile all source files recursively. Any orphans
+ # will be identified and removed in postrm.
+ python_mod_optimize /usr/$(get_libdir)/portage/pym
+
+ if [ $WORLD_MIGRATION_UPGRADE = 0 ] ; then
+ einfo "moving set references from the worldfile into world_sets"
+ cd "${ROOT}/var/lib/portage/"
+ grep "^@" world >> world_sets
+ sed -i -e '/^@/d' world
+ fi
+
+ if [ $NEEDED_REBUILD_UPGRADE = 0 ] ; then
+ einfo "rebuilding NEEDED.ELF.2 files"
+ for cpv in "${ROOT}/var/db/pkg"/*/*; do
+ if [ -f "${cpv}/NEEDED" ]; then
+ rm -f "${cpv}/NEEDED.ELF.2"
+ while read line; do
+ filename=${line% *}
+ needed=${line#* }
+ needed=${needed//+/++}
+ needed=${needed//#/##}
+ needed=${needed//%/%%}
+ newline=$(scanelf -BF "%a;%F;%S;%r;${needed}" $filename)
+ newline=${newline// - }
+ echo "${newline:3}" >> "${cpv}/NEEDED.ELF.2"
+ done < "${cpv}/NEEDED"
+ fi
+ done
+ fi
+
+ if [ $REPO_LAYOUT_CONF_WARN = 0 ] ; then
+ ewarn
+ echo "If you want overlay eclasses to override eclasses from" \
+ "other repos then see the portage(5) man page" \
+ "for information about the new layout.conf and repos.conf" \
+ "configuration files." \
+ | fmt -w 75 | while read -r ; do ewarn "$REPLY" ; done
+ ewarn
+ fi
+
+ einfo
+ einfo "For help with using portage please consult the Gentoo Handbook"
+ einfo "at http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=3"
+ einfo
+
+ if [ $MINOR_UPGRADE = 0 ] ; then
+ elog "If you're upgrading from a pre-2.2 version of portage you might"
+ elog "want to remerge world (emerge -e world) to take full advantage"
+ elog "of some of the new features in 2.2."
+ elog "This is not required however for portage to function properly."
+ elog
+ fi
+
+ if [ -z "${PV/*_alpha*}" ]; then
+ elog "If you always want to use the latest development version of portage"
+ elog "please read http://www.gentoo.org/proj/en/portage/doc/testing.xml"
+ elog
+ fi
+}
+
+pkg_postrm() {
+ python_mod_cleanup /usr/$(get_libdir)/portage/pym
+}
View
1 sys-cluster/vzctl/Manifest
@@ -1,3 +1,4 @@
DIST vzctl-3.0.28.3-funtoo.tar.gz 213655 RMD160 5743d479d80349f9893f295f4dbdc42bffdb46aa SHA1 3bdebd712a580b7d27d9878ef3cc59cd8aa5d7da SHA256 5230bb5951d181363e1981aab3400d2bc39a795593b709e2ff06010432c83be6
DIST vzctl-3.0.30.2-funtoo.tar.gz 218789 RMD160 27b406fa520af30eea5d044991a85c1065b14020 SHA1 903b3b4d138def3f1b0c8709ce68d2e33f6a1dde SHA256 fe8d87c8e70f588e6636673e422928032914a9caa4b39aaed4b60a3ce305f384
+DIST vzctl-3.3.tar.bz2 445649 RMD160 5fd2f205268a351d195b56f0c32becb9ad7bbf99 SHA1 7bb6dc0d8a1e1df084942ed7a6cd36ff55b40c2b SHA256 cc421a2cb61fdf09ef11516c8a22962d07795096487e65382f0cdaedfdfadf63
DIST vzctl-3.3-r3-funtoo.tar.gz 238691 RMD160 a8fea3263275b0e7aaee34fc763d8113d8528df7 SHA1 11c1b54ff4016dfd3ca78f9a62bbecc356a7fb85 SHA256 1c2136edfb4437a186af9da671afad0089aed86dfaebfcf289e9668c70cbd033
View
98 sys-cluster/vzctl/vzctl-3.3.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit bash-completion-r1 eutils
+
+DESCRIPTION="OpenVZ Containers control utility"
+HOMEPAGE="http://openvz.org/"
+SRC_URI="http://download.openvz.org/utils/${PN}/${PV}/src/${P}.tar.bz2"
+
+#GITHUB_USER="funtoo"
+#GITHUB_TAG="${P}-funtoo"
+#SRC_URI="https://github.com/${GITHUB_USER}/${PN}/tarball/${GITHUB_TAG} -> ${GITHUB_TAG}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~*"
+
+RDEPEND="
+ net-firewall/iptables
+ sys-apps/ed
+ sys-apps/iproute2
+ sys-fs/vzquota
+ sys-cluster/ploop
+ >=sys-apps/openrc-0.6.5-r1"
+
+DEPEND=""
+
+#src_unpack() {
+# unpack ${A}
+# mv funtoo-vzctl-??????? vzctl-${PV} || die
+#}
+
+src_prepare() {
+ # Set default OSTEMPLATE on gentoo
+ sed -e 's:=redhat-:=funtoo-:' -i etc/dists/default || die
+}
+
+src_configure() {
+ econf \
+ --localstatedir=/var \
+ --enable-udev \
+ --enable-bashcomp \
+ --enable-logrotate
+}
+
+src_install() {
+ make DESTDIR="${D}" install install-gentoo || die "make install failed"
+
+ # install the bash-completion script into the right location
+ rm -rf "${ED}"/etc/bash_completion.d
+ newbashcomp etc/bash_completion.d/vzctl.sh vzctl
+
+ # We need to keep some dirs
+ keepdir /vz/{dump,lock,root,private,template/cache}
+ keepdir /etc/vz/names /var/lib/vzctl/veip
+
+ # enable bridge auto-add for veth devices:
+ insinto /etc/vz
+ doins ${FILESDIR}/vznet.conf
+
+ # install our tweaked /etc/init.d/vz
+ exeinto /etc/init.d
+ newexe ${FILESDIR}/${PV}/vz.initd vz
+}
+
+pkg_postinst() {
+ local conf_without_OSTEMPLATE
+ for file in \
+ $(find "${EROOT}/etc/vz/conf/" \( -name *.conf -a \! -name 0.conf \)); do
+ if ! grep '^OSTEMPLATE' $file > /dev/null; then
+ conf_without_OSTEMPLATE+=" $file"
+ fi
+ done
+
+ if [[ -n ${conf_without_OSTEMPLATE} ]]; then
+ ewarn
+ ewarn "OSTEMPLATE default was changed from Red Hat to Funtoo."
+ ewarn "This means that any VEID.conf files without explicit or correct"
+ ewarn "OSTEMPLATE set will use Funtoo scripts instead of Red Hat."
+ ewarn "Please check the following configs:"
+ for file in ${conf_without_OSTEMPLATE}; do
+ ewarn "${file}"
+ done
+ ewarn
+ fi
+ ewarn "Starting with 3.0.25 there is new vzeventd service to reboot CTs."
+ ewarn "Please, drop /usr/share/vzctl/scripts/vpsnetclean and"
+ ewarn "/usr/share/vzctl/scripts/vpsreboot from crontab and use"
+ ewarn "/etc/init.d/vzeventd."
+
+ # TODO - when Funtoo has an OpenRC with "condrestart", add an
+ # /etc/init.d/vzeventd condrestart when ROOT = "/" to ensure that the
+ # latest vzeventd is running. Not doing this can result in containers
+ # not rebooting correctly after upgrade or other issues.
+
+}
View
7 sys-kernel/linux-headers/linux-headers-2.6.39.ebuild
@@ -10,8 +10,15 @@ inherit kernel-2
detect_version
PATCH_VER="1"
+<<<<<<< HEAD
+SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz"
+[[ -n ${PATCH_VER} ]] && SRC_URI="${SRC_URI} mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.xz"
+
+KEYWORDS="*"
+=======
SRC_URI="http://www.funtoo.org/distfiles/gentoo-headers-base-${PV}.tar.xz"
[[ -n ${PATCH_VER} ]] && SRC_URI="${SRC_URI} http://www.funtoo.org/distfiles/gentoo-headers-${PV}-${PATCH_VER}.tar.xz"
+>>>>>>> master
KEYWORDS="*"
RESTRICT="mirror"
View
4 sys-kernel/openvz-rhel6-stable/openvz-rhel6-stable-2.6.32.042.055.10.ebuild
@@ -22,7 +22,11 @@ KEYWORDS="x86 amd64"
IUSE="binary"
DEPEND="binary? ( >=sys-kernel/genkernel-3.4.12.6-r4 ) =sys-devel/gcc-4.4.5*"
RDEPEND="binary? ( >=sys-fs/udev-160 )"
+<<<<<<< HEAD
+DESCRIPTION="Full Linux kernel sources - RHEL5 kernel with OpenVZ patchset"
+=======
DESCRIPTION="Full Linux kernel sources - RHEL6 kernel with OpenVZ patchset"
+>>>>>>> master
HOMEPAGE="http://www.openvz.org"
MAINPATCH="patch-${OVZ_KV}-combined.gz"
SRC_URI="${KERNEL_URI}

0 comments on commit e4e99b5

Please sign in to comment.